git: 1aaaa79f9c54 - main - chinese/celvis: Mark DEPRECATED

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Sat, 16 Dec 2023 22:21:19 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1aaaa79f9c542ccbc805947eba45963ae6df2925

commit 1aaaa79f9c542ccbc805947eba45963ae6df2925
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-12-16 21:13:45 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-12-16 22:21:01 +0000

    chinese/celvis: Mark DEPRECATED
    
    - Upstream last release was in 2001
    - Set EXPIRATION_DATE 2024-01-16
    - Refresh patches
---
 chinese/celvis/Makefile              |  3 +++
 chinese/celvis/files/patch-Makefile  |  6 +++---
 chinese/celvis/files/patch-blk.c     |  4 ++--
 chinese/celvis/files/patch-cmd1.c    |  8 ++++----
 chinese/celvis/files/patch-config.h  |  6 +++---
 chinese/celvis/files/patch-curses.c  | 14 +++++++-------
 chinese/celvis/files/patch-cut.c     |  6 +++---
 chinese/celvis/files/patch-recycle.c |  4 ++--
 chinese/celvis/files/patch-tmp.c     |  8 ++++----
 chinese/celvis/files/patch-vi.h      |  6 +++---
 10 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/chinese/celvis/Makefile b/chinese/celvis/Makefile
index f792123e4feb..09b852c43f12 100644
--- a/chinese/celvis/Makefile
+++ b/chinese/celvis/Makefile
@@ -7,6 +7,9 @@ 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"
diff --git a/chinese/celvis/files/patch-Makefile b/chinese/celvis/files/patch-Makefile
index 7523bb055ad3..66900b345498 100644
--- a/chinese/celvis/files/patch-Makefile
+++ b/chinese/celvis/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Thu May 16 03:09:50 1991
-+++ Makefile	Sun Apr  2 11:44:47 2000
-@@ -22,7 +22,7 @@
+--- 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=
diff --git a/chinese/celvis/files/patch-blk.c b/chinese/celvis/files/patch-blk.c
index 922b0d371270..b9dbf5296145 100644
--- a/chinese/celvis/files/patch-blk.c
+++ b/chinese/celvis/files/patch-blk.c
@@ -1,5 +1,5 @@
---- blk.c.orig	Tue Nov  6 11:53:55 1990
-+++ blk.c	Thu Aug 15 04:47:18 1996
+--- 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
diff --git a/chinese/celvis/files/patch-cmd1.c b/chinese/celvis/files/patch-cmd1.c
index 6badcd280f92..16ff82e492b7 100644
--- a/chinese/celvis/files/patch-cmd1.c
+++ b/chinese/celvis/files/patch-cmd1.c
@@ -1,6 +1,6 @@
---- cmd1.c.orig	Tue Nov  6 11:53:55 1990
-+++ cmd1.c	Sat Aug 17 15:18:01 1996
-@@ -882,9 +882,6 @@
+--- 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
@@ -10,7 +10,7 @@
  #ifdef CREDIT
  	msg("%s", CREDIT);
  #endif
-@@ -893,6 +890,9 @@
+@@ -893,6 +890,9 @@ void cmd_version(frommark, tomark, cmd, bang, extra)
  #endif
  #ifdef CVERSION
  	msg("%s", CVERSION);
diff --git a/chinese/celvis/files/patch-config.h b/chinese/celvis/files/patch-config.h
index ca841f2f5c76..28e2520f820f 100644
--- a/chinese/celvis/files/patch-config.h
+++ b/chinese/celvis/files/patch-config.h
@@ -1,5 +1,5 @@
---- config.h.orig	Tue Nov  6 11:53:55 1990
-+++ config.h	Thu Aug 15 05:42:16 1996
+--- config.h.orig	1990-11-06 19:53:55 UTC
++++ config.h
 @@ -5,6 +5,10 @@
   */
  
@@ -11,7 +11,7 @@
  
  /* standard unix V (?) */
  #ifdef	M_SYSV
-@@ -175,9 +179,15 @@
+@@ -175,9 +179,15 @@ extern char *malloc();
  #endif
  
  /******************* Names of files and environment vars **********************/
diff --git a/chinese/celvis/files/patch-curses.c b/chinese/celvis/files/patch-curses.c
index 35a4d1e02cf7..abc2f3d774b5 100644
--- a/chinese/celvis/files/patch-curses.c
+++ b/chinese/celvis/files/patch-curses.c
@@ -1,8 +1,8 @@
 The following patch seems to fix celvis on my machine. Just place it in
 the files/ directory.
 
---- curses.c	1991-09-21 23:42:07.000000000 +0200
-+++ curses.c	2007-12-31 15:40:30.000000000 +0100
+--- curses.c.orig	1991-09-21 21:42:07 UTC
++++ curses.c
 @@ -17,8 +17,13 @@
  #include "config.h"
  #include "vi.h"
@@ -18,7 +18,7 @@ the files/ directory.
  #endif
  
  #if BSD || UNIX7 || MINIX
-@@ -86,8 +91,8 @@
+@@ -86,8 +91,8 @@ char	ERASEKEY;	/* backspace key taken from ioctl struc
  char	ERASEKEY;	/* backspace key taken from ioctl structure */
  
  #if UNIXV
@@ -29,7 +29,7 @@ the files/ directory.
  #endif
  
  #if BSD || UNIX7 || MINIX
-@@ -133,7 +138,7 @@
+@@ -133,7 +138,7 @@ initscr()
  
  	/* change the terminal mode to raw/noecho */
  #if UNIXV
@@ -38,7 +38,7 @@ the files/ directory.
  #endif
  
  #if BSD || UNIX7 || MINIX
-@@ -170,7 +175,7 @@
+@@ -170,7 +175,7 @@ suspend_curses()
  
  	/* change the terminal mode back the way it was */
  #if UNIXV
@@ -47,7 +47,7 @@ the files/ directory.
  #endif
  #if BSD || UNIX7 || MINIX
  	ioctl(2, TIOCSETP, &oldsgttyb);
-@@ -190,7 +195,7 @@
+@@ -190,7 +195,7 @@ resume_curses(quietly)
  {	
  	/* change the terminal mode to raw/noecho */
  #if UNIXV
@@ -56,7 +56,7 @@ the files/ directory.
  	ERASEKEY = oldtermio.c_cc[VERASE];
  	newtermio = oldtermio;
  	newtermio.c_iflag &= (IXON|IXOFF|IXANY|ISTRIP|IGNBRK);
-@@ -199,7 +204,7 @@
+@@ -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 */
diff --git a/chinese/celvis/files/patch-cut.c b/chinese/celvis/files/patch-cut.c
index b8ac3779f5ce..8c695c1593d0 100644
--- a/chinese/celvis/files/patch-cut.c
+++ b/chinese/celvis/files/patch-cut.c
@@ -1,6 +1,6 @@
---- cut.c.orig	Wed May 30 19:50:50 2007
-+++ cut.c	Wed May 30 19:51:41 2007
-@@ -36,6 +36,7 @@
+--- 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 */
  
diff --git a/chinese/celvis/files/patch-recycle.c b/chinese/celvis/files/patch-recycle.c
index 19c7eead9320..72aa0eac06c8 100644
--- a/chinese/celvis/files/patch-recycle.c
+++ b/chinese/celvis/files/patch-recycle.c
@@ -1,5 +1,5 @@
---- recycle.c.orig	Tue Nov  6 11:53:56 1990
-+++ recycle.c	Thu Aug 15 04:51:43 1996
+--- 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 */
diff --git a/chinese/celvis/files/patch-tmp.c b/chinese/celvis/files/patch-tmp.c
index 45c094e69013..a27346bf7e90 100644
--- a/chinese/celvis/files/patch-tmp.c
+++ b/chinese/celvis/files/patch-tmp.c
@@ -1,5 +1,5 @@
---- tmp.c.orig	Thu Aug 15 04:45:57 1996
-+++ tmp.c	Thu Aug 15 05:14:50 1996
+--- 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. */
@@ -8,7 +8,7 @@
  
  /* This is the name of the temp file */
  static char	tmpname[80];
-@@ -91,7 +92,7 @@
+@@ -91,7 +92,7 @@ int tmpstart(filename)
  			if (*o_readonly || (statb.st_mode & S_IJRON))
  #endif
  #if OS9
@@ -17,7 +17,7 @@
  #endif
  #if ANY_UNIX
  			if (*o_readonly || !(statb.st_mode &
-@@ -149,7 +150,7 @@
+@@ -149,7 +150,7 @@ int tmpstart(filename)
  	tmpfd = open(tmpname, O_RDWR | O_BINARY);
  	if (tmpfd < 0)
  	{
diff --git a/chinese/celvis/files/patch-vi.h b/chinese/celvis/files/patch-vi.h
index 735ad96ff5c4..a696005f31f0 100644
--- a/chinese/celvis/files/patch-vi.h
+++ b/chinese/celvis/files/patch-vi.h
@@ -1,6 +1,6 @@
---- vi.h.orig	Sun Oct 20 19:08:33 1991
-+++ vi.h	Thu Aug 15 04:45:45 1996
-@@ -101,7 +101,7 @@
+--- 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 */