git: 4d922006c828 - main - chinese/celvis: Remove expired port

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Wed, 17 Jan 2024 17:24:53 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4d922006c828226b9b416e17ea2ff2efa5b52749

commit 4d922006c828226b9b416e17ea2ff2efa5b52749
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-01-17 17:07:34 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-01-17 17:24:40 +0000

    chinese/celvis: Remove expired port
    
    2024-01-16 chinese/celvis: Last upstream release was in 2001
---
 MOVED                                |   1 +
 chinese/Makefile                     |   1 -
 chinese/celvis/Makefile              |  31 -----------
 chinese/celvis/distinfo              |   2 -
 chinese/celvis/files/celvis.1        | 103 -----------------------------------
 chinese/celvis/files/patch-Makefile  |  11 ----
 chinese/celvis/files/patch-blk.c     |  12 ----
 chinese/celvis/files/patch-cmd1.c    |  22 --------
 chinese/celvis/files/patch-config.h  |  30 ----------
 chinese/celvis/files/patch-curses.c  |  67 -----------------------
 chinese/celvis/files/patch-cut.c     |  10 ----
 chinese/celvis/files/patch-recycle.c |  12 ----
 chinese/celvis/files/patch-tmp.c     |  28 ----------
 chinese/celvis/files/patch-vi.h      |  11 ----
 chinese/celvis/pkg-descr             |   6 --
 chinese/celvis/pkg-plist             |   4 --
 16 files changed, 1 insertion(+), 350 deletions(-)

diff --git a/MOVED b/MOVED
index deadb0a7ab45..6ac1a3473c2e 100644
--- a/MOVED
+++ b/MOVED
@@ -2941,3 +2941,4 @@ devel/appstream-compose||2024-01-15|Became a subpackage of devel/appstream
 devel/appstream-qt|devel/appstream-qt5|2024-01-15|The Qt6 flavor became a subpackage of devel/appstream
 japanese/jed||2024-01-17|Has expired: Upstream site vaporized and returns NXDOMAIN consider using editors/jed
 editors/fte||2024-01-17|Has expired: Upstream last release was in 2001
+chinese/celvis||2024-01-17|Has expired: Last upstream release was in 2001
diff --git a/chinese/Makefile b/chinese/Makefile
index 5d1927cd9af7..e010892130cd 100644
--- a/chinese/Makefile
+++ b/chinese/Makefile
@@ -15,7 +15,6 @@
     SUBDIR += bug5
     SUBDIR += c2t
     SUBDIR += cconv
-    SUBDIR += celvis
     SUBDIR += chiconv
     SUBDIR += chinese-calendar
     SUBDIR += cless
diff --git a/chinese/celvis/Makefile b/chinese/celvis/Makefile
deleted file mode 100644
index f32261d9c758..000000000000
--- a/chinese/celvis/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-PORTNAME=	celvis
-PORTVERSION=	1.3
-CATEGORIES=	chinese editors
-MASTER_SITES=	http://ftp.ist.utl.pt/pub/ctan/language/chinese/chtex/
-DISTNAME=	${PORTNAME}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Vi/ex clone that speaks Chinese
-
-DEPRECATED=	Last upstream release was in 2001
-EXPIRATION_DATE=	2024-01-16
-
-USES=		ncurses
-
-MAKE_ARGS=	LIBS="${LDFLAGS} -lncurses"
-
-CFLAGS+=	-Wno-error=return-type
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
-CFLAGS+=	-Wno-error=incompatible-function-pointer-types
-.endif
-
-do-install:
-	@# install target in celvis Makefile is not too good -- this is easier
-	${INSTALL_PROGRAM} ${WRKSRC}/celvis ${WRKSRC}/virec ${STAGEDIR}${PREFIX}/bin
-	${LN} -s celvis ${STAGEDIR}${PREFIX}/bin/cvi
-	${INSTALL_MAN} ${FILESDIR}/celvis.1 ${STAGEDIR}${PREFIX}/share/man/man1
-
-.include <bsd.port.mk>
diff --git a/chinese/celvis/distinfo b/chinese/celvis/distinfo
deleted file mode 100644
index 432034578ece..000000000000
--- a/chinese/celvis/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (celvis.tar.gz) = 852f30967663d200f20bc1542196ba1ae1050fefab87adb6f71b590fc3a08080
-SIZE (celvis.tar.gz) = 135593
diff --git a/chinese/celvis/files/celvis.1 b/chinese/celvis/files/celvis.1
deleted file mode 100644
index 61fb0e501969..000000000000
--- a/chinese/celvis/files/celvis.1
+++ /dev/null
@@ -1,103 +0,0 @@
-.TH ELVIS 1
-.SH NAME
-celvis, cex, cvi, cview, cinput - The Chinese editor
-.SH SYNOPSIS
-\fBcelvis\fP [\fIflags\fP] [\fB+\fP\fIcmd\fP] [\fIfiles\fP...]
-.SH DESCRIPTION
-\fIElvis\fP is a text editor which emulates \fIvi\fP/\fIex\fP.
-\fICelvis\fP is a Chinese version of \fIelvis\fP.
-It should run on top of some Chinese terminal or Chinese system,
-such as \fIcxterm\fP in X11 window system.
-This version supports both GB encoding and Big5 encoding
-Chinese text.
-.PP
-On systems which pass the program name as an argument, such as Unix and Minix,
-you may also install \fIcelvis\fP under the names
-"cex", "cvi", "cview", and "cinput".
-These extra names would normally be links to celvis;
-see the "ln" shell command.
-.PP
-When \fIcelvis\fP is invoked as "cvi",
-it behaves exactly as though it was invoked as "celvis".
-However, if you invoke \fIcelvis\fP as "cview",
-then the readonly option is set as though you had given it the "-R" flag.
-If you invoke \fIcelvis\fP as "cex",
-then \fIcelvis\fP will start up in the colon command mode
-instead of the visual command mode,
-as though you had given it the "-e" flag.
-If you invoke \fIcelvis\fP as "cinput" or "cedit",
-then \fIcelvis\fP will start up in input mode,
-as though the "-i" flag was given.
-.SH OPTIONS
-.IP \fB-r\fP
-To the real vi, this flag means that a previous edit should be recovered.
-\fICelvis\fP, though, has a separate program, called \fIvirec(1)\fP,
-for recovering files.
-When you invoke \fIcelvis\fP with -r,
-\fIcelvis\fP will tell you to run \fIvirec\fP.
-.IP \fB-R\fP
-This sets the "readonly" option,
-so you won't accidentally overwrite a file.
-.IP "\fB-t\fP \fItag\fP"
-This causes \fIcelvis\fP to start editing at the given tag.
-.IP \fB-e\fP
-\fICelvis\fP will start up in colon command mode.
-.IP \fB-v\fP
-\fICelvis\fP will start up in visual command mode.
-.IP \fB-i\fP
-\fICelvis\fP will start up in input mode.
-.IP "\fB+\fP\fIcommand\fP
-If you use the +\fIcommand\fP parameter,
-then after the first file is loaded
-\fIcommand\fP is executed as an EX command.
-A typical example would be "celvis +237 foo",
-which would cause \fIcelvis\fP to start editing foo and
-then move directly to line 237.
-.SH FILES
-.IP /tmp/elv*
-During editing,
-\fIcelvis\fP stores text in a temporary file.
-For UNIX, this file will usually be stored in the /tmp directory,
-and the first three characters will be "elv".
-For other systems, the temporary files may be stored someplace else;
-see the version-specific section of the documentation.
-.IP tags
-This is the database used by the \fI:tags\fP command and the \fB-t\fP option.
-It is usually created by the \fIctags(1)\fP program.
-.IP ".exrc or elvis.rc"
-On UNIX-like systems, a file called ".exrc" in your home directory
-is executed as a series of \fIex\fR commands.
-A file by the same name may be executed in the current directory, too.
-On non-UNIX systems, ".exrc" is usually an invalid file name;
-there, the initialization file is called "elvis.rc" instead.
-.SH "SEE ALSO"
-ctags(1), ref(1), virec(1), cxterm(1)
-.PP
-\fIElvis - A Clone of Vi/Ex\fP, the complete \fIelvis\fP documentation.
-.SH BUGS
-There is no LISP support.
-Certain other features are missing, too.
-.PP
-Auto-indent mode is not quite compatible with the real vi.
-Among other things, 0^D and ^^D don't do what you might expect.
-.PP
-Long lines are displayed differently.
-The real vi wraps long lines onto multiple rows of the screen,
-but \fIcelvis\fP scrolls sideways.
-.SH AUTHOR
-.nf
-Steve Kirkendall
-kirkenda@cs.pdx.edu
-\&...uunet!tektronix!psueea!eecs!kirkenda
-.fi
-.PP
-Many other people have worked to port \fIelvis\fP to various operating systems.
-To see who deserves credit, run the \fI:version\fP command
-from within \fIcelvis\fP,
-or look in the system-specific section of the complete documentation.
-.PP
-The Chinese version, \fIcelvis\fP, is developed by Man-Chi Pong
-(now with the Hong Kong University of Science and Technology, HK.
-E-mail: mcpong@uxmail.usthk.hk)
-and Yongguang Zhang
-(Purdue University, e-mail: ygz@cs.purdue.edu).
diff --git a/chinese/celvis/files/patch-Makefile b/chinese/celvis/files/patch-Makefile
deleted file mode 100644
index 66900b345498..000000000000
--- a/chinese/celvis/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	1991-05-15 19:09:50 UTC
-+++ Makefile
-@@ -22,7 +22,7 @@ EXTRA=
- SRC5=	regexp.c regexp.h regsub.c sysdos.c system.c tinytcap.c tio.c tmp.c
- SRC6=	vars.c vcmd.c vi.c vi.h ctags.c ref.c virec.c wildcard.c shell.c
- EXTRA=
--CFLAGS=	-O
-+CFLAGS+=	-D_HAVE_PARAM_H
- LIBS=	-ltermcap
- 
- all: $(PROGS)
diff --git a/chinese/celvis/files/patch-blk.c b/chinese/celvis/files/patch-blk.c
deleted file mode 100644
index b9dbf5296145..000000000000
--- a/chinese/celvis/files/patch-blk.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- blk.c.orig	1990-11-06 19:53:55 UTC
-+++ blk.c
-@@ -19,7 +19,9 @@
- # define NBUFS	5		/* must be at least 3 -- more is better */
- #endif
- 
-+#if !(defined(BSD) && (BSD >= 199103))
- extern long lseek();
-+#endif
- 
- /*------------------------------------------------------------------------*/
- 
diff --git a/chinese/celvis/files/patch-cmd1.c b/chinese/celvis/files/patch-cmd1.c
deleted file mode 100644
index 16ff82e492b7..000000000000
--- a/chinese/celvis/files/patch-cmd1.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- cmd1.c.orig	1990-11-06 19:53:55 UTC
-+++ cmd1.c
-@@ -882,9 +882,6 @@ void cmd_version(frommark, tomark, cmd, bang, extra)
- #else
- 	msg("%s  (%s)", VERSION, DATE);
- #endif
--#ifdef COMPILED_BY
--	msg("Compiled by %s", COMPILED_BY);
--#endif
- #ifdef CREDIT
- 	msg("%s", CREDIT);
- #endif
-@@ -893,6 +890,9 @@ void cmd_version(frommark, tomark, cmd, bang, extra)
- #endif
- #ifdef CVERSION
- 	msg("%s", CVERSION);
-+#endif
-+#ifdef COMPILED_BY
-+	msg("Compiled by %s", COMPILED_BY);
- #endif
- #ifdef COPYING
- 	msg("%s", COPYING);
diff --git a/chinese/celvis/files/patch-config.h b/chinese/celvis/files/patch-config.h
deleted file mode 100644
index 28e2520f820f..000000000000
--- a/chinese/celvis/files/patch-config.h
+++ /dev/null
@@ -1,30 +0,0 @@
---- config.h.orig	1990-11-06 19:53:55 UTC
-+++ config.h
-@@ -5,6 +5,10 @@
-  */
- 
- /*************************** autoconf section ************************/
-+/*	Can we tell a little more about this system? */
-+#ifdef _HAVE_PARAM_H
-+# include <sys/param.h>
-+#endif
- 
- /* standard unix V (?) */
- #ifdef	M_SYSV
-@@ -175,9 +179,15 @@ extern char *malloc();
- #endif
- 
- /******************* Names of files and environment vars **********************/
-+#if (defined(BSD) && (BSD >= 199103))
-+# define TMPDIR		"/var/tmp"	/* directory where temp files live */
-+# define COMPILED_BY	"{Free,Net,Open,4.4,4.3/Reno}BSD (ported by David O'Brien)"
-+#endif
- 
- #if ANY_UNIX
--# define TMPDIR		"/usr/tmp"	/* directory where temp files live */
-+# ifndef TMPDIR
-+#  define TMPDIR		"/usr/tmp"	/* directory where temp files live */
-+# endif
- # define TMPNAME	"%s/elvt%04x%03x" /* temp file */
- # define CUTNAME	"%s/elvc%04x%03x" /* cut buffer's temp file */
- # define EXRC		".exrc"		/* init file in current directory */
diff --git a/chinese/celvis/files/patch-curses.c b/chinese/celvis/files/patch-curses.c
deleted file mode 100644
index abc2f3d774b5..000000000000
--- a/chinese/celvis/files/patch-curses.c
+++ /dev/null
@@ -1,67 +0,0 @@
-The following patch seems to fix celvis on my machine. Just place it in
-the files/ directory.
-
---- curses.c.orig	1991-09-21 21:42:07 UTC
-+++ curses.c
-@@ -17,8 +17,13 @@
- #include "config.h"
- #include "vi.h"
- 
-+#undef BSD
-+#undef UNIXV
-+#define BSD	0
-+#define UNIXV	1
-+
- #if UNIXV
--# include	<termio.h>
-+# include	<termios.h>
- #endif
- 
- #if BSD || UNIX7 || MINIX
-@@ -86,8 +91,8 @@ char	ERASEKEY;	/* backspace key taken from ioctl struc
- char	ERASEKEY;	/* backspace key taken from ioctl structure */
- 
- #if UNIXV
--static struct termio	oldtermio;	/* original tty mode */
--static struct termio	newtermio;	/* raw/noecho tty mode */
-+static struct termios	oldtermio;	/* original tty mode */
-+static struct termios	newtermio;	/* raw/noecho tty mode */
- #endif
- 
- #if BSD || UNIX7 || MINIX
-@@ -133,7 +138,7 @@ initscr()
- 
- 	/* change the terminal mode to raw/noecho */
- #if UNIXV
--	ioctl(2, TCGETA, &oldtermio);
-+	tcgetattr(2, &oldtermio);
- #endif
- 
- #if BSD || UNIX7 || MINIX
-@@ -170,7 +175,7 @@ suspend_curses()
- 
- 	/* change the terminal mode back the way it was */
- #if UNIXV
--	ioctl(2, TCSETAW, &oldtermio);
-+	tcsetattr(2, TCSADRAIN, &oldtermio);
- #endif
- #if BSD || UNIX7 || MINIX
- 	ioctl(2, TIOCSETP, &oldsgttyb);
-@@ -190,7 +195,7 @@ resume_curses(quietly)
- {	
- 	/* change the terminal mode to raw/noecho */
- #if UNIXV
--	ospeed = (oldtermio.c_cflag & CBAUD);
-+	ospeed = cfgetospeed(&oldtermio);
- 	ERASEKEY = oldtermio.c_cc[VERASE];
- 	newtermio = oldtermio;
- 	newtermio.c_iflag &= (IXON|IXOFF|IXANY|ISTRIP|IGNBRK);
-@@ -199,7 +204,7 @@ resume_curses(quietly)
- 	newtermio.c_cc[VINTR] = ctrl('C'); /* always use ^C for interrupts */
- 	newtermio.c_cc[VEOF] = 1;	/* minimum # characters to read */
- 	newtermio.c_cc[VEOL] = 2;	/* allow at least 0.2 seconds */
--	ioctl(2, TCSETAW, &newtermio);
-+	tcsetattr(2, TCSADRAIN, &newtermio);
- #endif
- #if BSD || UNIX7 || MINIX
- 	struct tchars	tbuf;
diff --git a/chinese/celvis/files/patch-cut.c b/chinese/celvis/files/patch-cut.c
deleted file mode 100644
index 8c695c1593d0..000000000000
--- a/chinese/celvis/files/patch-cut.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- cut.c.orig	1991-04-03 20:41:47 UTC
-+++ cut.c
-@@ -36,6 +36,7 @@ static char	cbname;	/* name chosen for next cut/paste 
- 
- static char	cbname;	/* name chosen for next cut/paste operation */
- 
-+static cutfree(struct cutbuf *buf);
- 
- #ifndef NO_RECYCLE
- /* This function builds a list of all blocks needed in the current tmp file
diff --git a/chinese/celvis/files/patch-recycle.c b/chinese/celvis/files/patch-recycle.c
deleted file mode 100644
index 72aa0eac06c8..000000000000
--- a/chinese/celvis/files/patch-recycle.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- recycle.c.orig	1990-11-06 19:53:56 UTC
-+++ recycle.c
-@@ -18,7 +18,9 @@
- #ifndef NO_RECYCLE
- /* this whole file would have be skipped if NO_RECYCLE is defined */
- 
-+#if !(defined(BSD) && (BSD >= 199103))
- extern long	lseek();
-+#endif
- 
- #define BTST(bitno, byte)	((byte) & (1 << (bitno)))
- #define BSET(bitno, byte)	((byte) |= (1 << (bitno)))
diff --git a/chinese/celvis/files/patch-tmp.c b/chinese/celvis/files/patch-tmp.c
deleted file mode 100644
index a27346bf7e90..000000000000
--- a/chinese/celvis/files/patch-tmp.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- tmp.c.orig	1991-09-21 21:42:17 UTC
-+++ tmp.c
-@@ -21,6 +21,7 @@
- 
- /* The FAIL() macro prints an error message and then exits. */
- #define FAIL(why,arg)	mode = MODE_EX; msg(why, arg); endwin(); HZ_abort(9)
-+#define FAIL2(why,arg1,arg2)	mode = MODE_EX; msg(why, arg1, arg2); endwin(); HZ_abort(9)
- 
- /* This is the name of the temp file */
- static char	tmpname[80];
-@@ -91,7 +92,7 @@ int tmpstart(filename)
- 			if (*o_readonly || (statb.st_mode & S_IJRON))
- #endif
- #if OS9
--			if we don't have write permission...
-+			/* if we don't have write permission... */
- #endif
- #if ANY_UNIX
- 			if (*o_readonly || !(statb.st_mode &
-@@ -149,7 +150,7 @@ int tmpstart(filename)
- 	tmpfd = open(tmpname, O_RDWR | O_BINARY);
- 	if (tmpfd < 0)
- 	{
--		FAIL("Can't create temporary file, errno=%d", errno);
-+		FAIL2("Can't create temporary file (%s), errno=%d", tmpname, errno);
- 		return 1;
- 	}
- 
diff --git a/chinese/celvis/files/patch-vi.h b/chinese/celvis/files/patch-vi.h
deleted file mode 100644
index a696005f31f0..000000000000
--- a/chinese/celvis/files/patch-vi.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- vi.h.orig	1991-10-21 02:08:33 UTC
-+++ vi.h
-@@ -101,7 +101,7 @@ extern struct _viflags
- #define READONLY	0x0002	/* the file is read-only */
- #define HADNUL		0x0004	/* the file contained NUL characters */
- #define MODIFIED	0x0008	/* the file has been modified */
--#define NOFILE		0x0010	/* no name is known for the current text */
-+#define NOFILENAME	0x0010	/* no name is known for the current text */
- #define ADDEDNL		0x0020	/* newlines were added to the file */
- 
- /* macros used to set/clear/test flags */
diff --git a/chinese/celvis/pkg-descr b/chinese/celvis/pkg-descr
deleted file mode 100644
index cd070614d235..000000000000
--- a/chinese/celvis/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-CElvis is a clone of vi/ex, the standard UNIX editor.  CElvis supports
-nearly all of the vi/ex commands, in both visual mode and colon mode.
-It also allows displaying and editing of documents using the
-Chinese GB (simple) and Big-5 (complex) encodings.
-
-Celvis is based on Elvis version 1.3 by Steve Kirkendall.
diff --git a/chinese/celvis/pkg-plist b/chinese/celvis/pkg-plist
deleted file mode 100644
index fadd5bd9a9b5..000000000000
--- a/chinese/celvis/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/celvis
-bin/cvi
-bin/virec
-share/man/man1/celvis.1.gz