{,standalone-,static-}tcsh: Update to 6.23.01

Changes since 6.23.00:

  8. V6.23.01 - 20211209
  7. add \cc and \Uhhh, and document escape sequences
  6. add $'string with escapes' ("dollar-single-quotes") (Kimmo Suominen)
  5. don't glob the filetest builtin arguments twice
  4. remove the duplicate echo escape parsing code and use parseescape
  3. add \x{hh} \xhh \uhhh (H.Merijn Brand)
  2. fix and document ln=target
  1. Merge in patches from pkgsrc:
     - Modernize the installation targets so that they use INSTALL_DATA,
       INSTALL_PROGRAM, and MKDIR_P.
     - Enable SYSMALLOC and SHORT_STRINGS on NetBSD.
     - Enable NO_FIX_MALLOC and SHORT_STRINGS on OpenBSD.

For pkgsrc, items 1, 2, and 5 had already been applied via patches.

13 files changed, 10 insertions, 388 deletions

diff --git a/shells/standalone-tcsh/Makefile b/shells/standalone-tcsh/Makefile
index a70b8dd8604..8e530a4d734 100644
--- a/shells/standalone-tcsh/Makefile
+++ b/shells/standalone-tcsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2021/11/18 10:20:47 kim Exp $
+# $NetBSD: Makefile,v 1.38 2021/12/09 19:55:39 kim Exp $
 #
 
 # FIXME: This is because of PREFIX=/ below.
@@ -6,7 +6,6 @@ CHECK_FILES_SUPPORTED=	no
 NOT_FOR_UNPRIVILEGED=	yes
 
 PKGNAME=		standalone-${DISTNAME}
-PKGREVISION=		3
 
 PATCHDIR=		../../shells/tcsh/patches
 PKGDIR=			../../shells/tcsh
diff --git a/shells/static-tcsh/Makefile b/shells/static-tcsh/Makefile
index 55db19be864..6eb31db5803 100644
--- a/shells/static-tcsh/Makefile
+++ b/shells/static-tcsh/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2021/11/18 10:20:47 kim Exp $
+# $NetBSD: Makefile,v 1.17 2021/12/09 19:55:39 kim Exp $
 #
 
 PKGNAME=		static-${DISTNAME}
-PKGREVISION=		3
 
 .include "../../shells/tcsh/Makefile.common"
 
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index ac86814275b..282fa13ed06 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.103 2021/11/18 10:20:47 kim Exp $
+# $NetBSD: Makefile,v 1.104 2021/12/09 19:55:39 kim Exp $
 
 .include "../../shells/tcsh/Makefile.common"
 
-PKGREVISION=	3
+CONFLICTS=	static-tcsh-[0-9]*
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/tcsh/Makefile.common b/shells/tcsh/Makefile.common
index 02b7de9929a..1ec61d74d1d 100644
--- a/shells/tcsh/Makefile.common
+++ b/shells/tcsh/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.2 2021/11/15 17:11:58 kim Exp $
+# $NetBSD: Makefile.common,v 1.3 2021/12/09 19:55:39 kim Exp $
 #
 # used by shells/standalone-tcsh/Makefile
 # used by shells/static-tcsh/Makefile
 # used by shells/tcsh/Makefile
 
-DISTNAME=	tcsh-6.23.00
+DISTNAME=	tcsh-6.23.01
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/
 MASTER_SITES+=	http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/
@@ -14,8 +14,6 @@ HOMEPAGE=	https://www.tcsh.org/
 COMMENT=	Extended C-shell with many useful features
 LICENSE=	original-bsd
 
-CONFLICTS=	static-tcsh-[0-9]*
-
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	autoconf:test perl:test
 
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index 8143617d327..6464ea9cace 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,13 +1,5 @@
-$NetBSD: distinfo,v 1.56 2021/11/18 10:20:47 kim Exp $
+$NetBSD: distinfo,v 1.57 2021/12/09 19:55:39 kim Exp $
 
-BLAKE2s (tcsh-6.23.00.tar.gz) = a61b142efc2ca927cb33ea4eb87c0530cacc0c79ff1c30d5e9022a4404cef72d
-SHA512 (tcsh-6.23.00.tar.gz) = 8ea491e9409f12ab113bf5551398cb827692a50340318b050d0f8278d3cd9c133ba89a407dc692d9c4bd69957ecd6d4d92db7ccfacc7064ace3b09e3bd562f30
-Size (tcsh-6.23.00.tar.gz) = 1010250 bytes
-SHA1 (patch-Makefile.in) = 16ae4c595c8e23be1acbfa0263334df569300a79
-SHA1 (patch-config_f.h) = 715d939e8a8f4917bd219dccd91d5c49ae502939
-SHA1 (patch-nls_Makefile.in) = 58d859e8a50e6436b9bc6514497eb876426d92d7
-SHA1 (patch-sh.exp.c) = c65aeedf8950d2e298d1d0a5dbe2261eba18ff77
-SHA1 (patch-sh.func.c) = f06cddb996915e79e372d56984f3798a68437e05
-SHA1 (patch-sh.h) = 487282e85cd6f21a703d7d5332c47f113ca2fea8
-SHA1 (patch-tcsh.man) = 1265cc74450170f65c282921859c3b29ef6caa39
-SHA1 (patch-tw.color.c) = 39c1f8a0821b8254c6bb4729b5e1504c6a83feb5
+BLAKE2s (tcsh-6.23.01.tar.gz) = 12d0bc4be33bb8ba40ee5ef8f0a1b0339dbb7f6db6d07d0038c09ad021cffaf6
+SHA512 (tcsh-6.23.01.tar.gz) = 7460d86dfedf3f2728dee8fe5b6cddec20020a2c3af374be3f83cbb0835237153e5456f864a259816e56e88edd9e15bc18df92ebe5471a73bbe9ed70656abf92
+Size (tcsh-6.23.01.tar.gz) = 947240 bytes
diff --git a/shells/tcsh/patches/patch-Makefile.in b/shells/tcsh/patches/patch-Makefile.in
deleted file mode 100644
index 3cb49024f52..00000000000
--- a/shells/tcsh/patches/patch-Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.2 2021/11/13 06:50:03 kim Exp $
-
-- Adjust mandir
-- Use INSTALL_DATA, INSTALL_PROGRAM, and MKDIR_P
-
---- Makefile.in.orig	2021-11-11 09:54:05.000000000 +0000
-+++ Makefile.in	2021-11-13 06:25:54.773703072 +0000
-@@ -9,6 +9,10 @@
- ENVCMD=/usr/bin/env
- VERSION=@PACKAGE_VERSION@
- BUILD=tcsh$(EXEEXT)
-+INSTALL=@INSTALL@
-+INSTALL_DATA=@INSTALL_DATA@
-+INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+MKDIR_P?=$(INSTALL) -d
- VPATH=@srcdir@
- srcdir=@srcdir@
- 
-@@ -356,7 +360,8 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- bindir=@bindir@
--mandir=@datarootdir@/man
-+datarootdir=@datarootdir@
-+mandir=@mandir@
- MANSECT=1
- DESTBIN=${DESTDIR}${bindir}
- DESTMAN=${DESTDIR}${mandir}/man${MANSECT}
-@@ -596,19 +601,15 @@
- 	-strip ${DESTBIN}/tcsh$(EXEEXT)
- 
- install: tcsh$(EXEEXT) install.catalogs install.man
--	-mkdir -p ${DESTBIN}
--	-mv -f ${DESTBIN}/tcsh$(EXEEXT)  ${DESTBIN}/tcsh.old
--	cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT)
--	chmod 755 ${DESTBIN}/tcsh$(EXEEXT)
-+	$(MKDIR_P) ${DESTBIN}
-+	$(INSTALL_PROGRAM) tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT)
- 
- install.catalogs:
- 	@test "x${BUILD_CATALOGS}" = "xyes" && (cd nls; ${MAKE} install DESTDIR=${DESTDIR}) || exit 0
- 
- install.man: tcsh.man
--	-mkdir -p ${DESTMAN}
--	-rm -f ${DESTMAN}/tcsh.${MANSECT}
--	cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT}
--	chmod 444 ${DESTMAN}/tcsh.${MANSECT}
-+	$(MKDIR_P) ${DESTMAN}
-+	$(INSTALL_DATA) $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT}
- 
- # Amiga Unix
- #install.man: tcsh.man
diff --git a/shells/tcsh/patches/patch-config_f.h b/shells/tcsh/patches/patch-config_f.h
deleted file mode 100644
index a886383d9f7..00000000000
--- a/shells/tcsh/patches/patch-config_f.h
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-config_f.h,v 1.1 2021/11/11 13:20:13 kim Exp $
-
-Special adaptation for different NetBSD versions and for OpenBSD.
-Turn on SYSMALLOC for NetBSD until tc.alloc.c gets better.
-
---- config_f.h.orig	2019-12-04 09:51:54.000000000 -0800
-+++ config_f.h	2020-07-06 15:21:46.122410962 -0700
-@@ -47,7 +47,18 @@
-  *	         of nls...
-  *
-  */
--#define SHORT_STRINGS
-+#if defined(__NetBSD__)
-+# include <sys/param.h>
-+# if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 200000000)
-+#  define SHORT_STRINGS
-+# else
-+#  undef SHORT_STRINGS
-+# endif
-+#elif defined(__OpenBSD__)
-+# undef SHORT_STRINGS
-+#else
-+# define SHORT_STRINGS
-+#endif
- 
- /*
-  * WIDE_STRINGS	Represent strings using wide characters
-@@ -138,7 +149,7 @@
-  *		This can be much slower and no memory statistics will be
-  *		provided.
-  */
--#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__)
-+#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) || defined(__NetBSD__)
- # define SYSMALLOC
- #else
- # undef SYSMALLOC
diff --git a/shells/tcsh/patches/patch-nls_Makefile.in b/shells/tcsh/patches/patch-nls_Makefile.in
deleted file mode 100644
index 10115bccc94..00000000000
--- a/shells/tcsh/patches/patch-nls_Makefile.in
+++ /dev/null
@@ -1,123 +0,0 @@
-$NetBSD: patch-nls_Makefile.in,v 1.3 2019/05/09 11:32:36 leot Exp $
-
-Use INSTALL_DATA instead of INSTALL to avoid setting executable bits.
-
---- nls/Makefile.in.orig	2019-05-08 18:39:28.000000000 +0000
-+++ nls/Makefile.in
-@@ -4,7 +4,7 @@ CATALOGS=	C.cat et.cat finnish.cat frenc
- 		italian.cat ja.cat pl.cat russian.cat spanish.cat ukrainian.cat
- LOCALES=	${CATALOGS:.cat=}
- GENCAT=		@GENCAT@
--INSTALL=	@INSTALL@
-+INSTALL_DATA=	@INSTALL_DATA@
- RM?=		rm -f
- VPATH=@srcdir@
- srcdir=@srcdir@
-@@ -19,7 +19,7 @@ all: ${CATALOGS}
- INSTALLED+=${localedir}/C/LC_MESSAGES/tcsh.cat
- ${localedir}/C/LC_MESSAGES/tcsh.cat:	C.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $> $^ $@
-+	$(INSTALL_DATA) $> $^ $@
- 
- C.cat: ${srcdir}/C/charset ${srcdir}/C/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -27,7 +27,7 @@ C.cat: ${srcdir}/C/charset ${srcdir}/C/*
- INSTALLED+=${localedir}/et/LC_MESSAGES/tcsh.cat
- ${localedir}/et/LC_MESSAGES/tcsh.cat:	et.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $> $^ $@
-+	$(INSTALL_DATA) $> $^ $@
- 
- et.cat: ${srcdir}/et/charset ${srcdir}/et/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -35,7 +35,7 @@ et.cat: ${srcdir}/et/charset ${srcdir}/e
- INSTALLED+=${localedir}/fi/LC_MESSAGES/tcsh.cat
- ${localedir}/fi/LC_MESSAGES/tcsh.cat:	finnish.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $> $^ $@
-+	$(INSTALL_DATA) $> $^ $@
- 
- finnish.cat: ${srcdir}/finnish/charset ${srcdir}/finnish/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -43,7 +43,7 @@ finnish.cat: ${srcdir}/finnish/charset $
- INSTALLED+=${localedir}/fr/LC_MESSAGES/tcsh.cat
- ${localedir}/fr/LC_MESSAGES/tcsh.cat:	french.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $> $^ $@
-+	$(INSTALL_DATA) $> $^ $@
- 
- french.cat: ${srcdir}/french/charset ${srcdir}/french/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -51,7 +51,7 @@ french.cat: ${srcdir}/french/charset ${s
- INSTALLED+=${localedir}/de/LC_MESSAGES/tcsh.cat
- ${localedir}/de/LC_MESSAGES/tcsh.cat:	german.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $> $^ $@
-+	$(INSTALL_DATA) $> $^ $@
- 
- german.cat: ${srcdir}/german/charset ${srcdir}/german/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -59,7 +59,7 @@ german.cat: ${srcdir}/german/charset ${s
- INSTALLED+=${localedir}/gr/LC_MESSAGES/tcsh.cat
- ${localedir}/gr/LC_MESSAGES/tcsh.cat:	greek.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $> $^ $@
-+	$(INSTALL_DATA) $> $^ $@
- 
- greek.cat: ${srcdir}/greek/charset ${srcdir}/greek/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -67,7 +67,7 @@ greek.cat: ${srcdir}/greek/charset ${src
- INSTALLED+=${localedir}/it/LC_MESSAGES/tcsh.cat
- ${localedir}/it/LC_MESSAGES/tcsh.cat:	italian.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $> $^ $@
-+	$(INSTALL_DATA) $> $^ $@
- 
- italian.cat: ${srcdir}/italian/charset ${srcdir}/italian/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -75,7 +75,7 @@ italian.cat: ${srcdir}/italian/charset $
- INSTALLED+=${localedir}/ja/LC_MESSAGES/tcsh.cat
- ${localedir}/ja/LC_MESSAGES/tcsh.cat:	ja.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $> $^ $@
-+	$(INSTALL_DATA) $> $^ $@
- 
- ja.cat: ${srcdir}/ja/charset ${srcdir}/ja/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -83,7 +83,7 @@ ja.cat: ${srcdir}/ja/charset ${srcdir}/j
- INSTALLED+=${localedir}/pl/LC_MESSAGES/tcsh.cat
- ${localedir}/pl/LC_MESSAGES/tcsh.cat:	pl.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $> $^ $@
-+	$(INSTALL_DATA) $> $^ $@
- 
- pl.cat: ${srcdir}/pl/charset ${srcdir}/pl/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -91,7 +91,7 @@ pl.cat: ${srcdir}/pl/charset ${srcdir}/p
- INSTALLED+=${localedir}/ru/LC_MESSAGES/tcsh.cat
- ${localedir}/ru/LC_MESSAGES/tcsh.cat:	russian.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $> $^ $@
-+	$(INSTALL_DATA) $> $^ $@
- 
- russian.cat: ${srcdir}/russian/charset ${srcdir}/russian/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -99,7 +99,7 @@ russian.cat: ${srcdir}/russian/charset $
- INSTALLED+=${localedir}/es/LC_MESSAGES/tcsh.cat
- ${localedir}/es/LC_MESSAGES/tcsh.cat:	spanish.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $> $^ $@
-+	$(INSTALL_DATA) $> $^ $@
- 
- spanish.cat: ${srcdir}/spanish/charset ${srcdir}/spanish/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -107,7 +107,7 @@ spanish.cat: ${srcdir}/spanish/charset $
- INSTALLED+=${localedir}/ru_UA/LC_MESSAGES/tcsh.cat
- ${localedir}/ru_UA/LC_MESSAGES/tcsh.cat:	ukrainian.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $> $^ $@
-+	$(INSTALL_DATA) $> $^ $@
- 
- ukrainian.cat: ${srcdir}/ukrainian/charset ${srcdir}/ukrainian/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
diff --git a/shells/tcsh/patches/patch-sh.exp.c b/shells/tcsh/patches/patch-sh.exp.c
deleted file mode 100644
index d3518788114..00000000000
--- a/shells/tcsh/patches/patch-sh.exp.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-sh.exp.c,v 1.1 2021/11/18 10:20:47 kim Exp $
-
-Don't glob the filetest builtin arguments twice:    
-    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=905649
-
-https://github.com/tcsh-org/tcsh/commit/8a83d4c717ad4a56450751986b65ccd6ea9eed8a.patch
-
---- sh.exp.c
-+++ sh.exp.c
-@@ -36,9 +36,6 @@
-  * C shell
-  */
- 
--#define TEXP_IGNORE 1	/* in ignore, it means to ignore value, just parse */
--#define TEXP_NOGLOB 2	/* in ignore, it means not to globone */
--
- #define	ADDOP	1
- #define	MULOP	2
- #define	EQOP	4
-@@ -677,7 +674,11 @@ filetest(Char *cp, Char ***vp, int ignore)
-     dp = *(*vp)++;
-     if (ignore & TEXP_IGNORE)
- 	return (Strsave(STRNULL));
--    ep = globone(dp, G_APPEND);
-+    if ((ignore & TEXP_NOGLOB) == 0) {
-+	ep = globone(dp, G_APPEND);
-+    } else {
-+	ep = Strsave(dp);
-+    }
-     cleanup_push(ep, xfree);
-     ft = &cp[1];
-     do
diff --git a/shells/tcsh/patches/patch-sh.func.c b/shells/tcsh/patches/patch-sh.func.c
deleted file mode 100644
index 837f79a85bf..00000000000
--- a/shells/tcsh/patches/patch-sh.func.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-sh.func.c,v 1.3 2021/11/18 10:20:47 kim Exp $
-
-Don't glob the filetest builtin arguments twice:    
-    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=905649
-
-https://github.com/tcsh-org/tcsh/commit/8a83d4c717ad4a56450751986b65ccd6ea9eed8a.patch
-
---- sh.func.c
-+++ sh.func.c
-@@ -227,7 +227,7 @@ dofiletest(Char **v, struct command *c)
-     cleanup_push(globbed, blk_cleanup);
- 
-     while (*(fileptr = v++) != NULL) {
--	res = filetest(ftest, &fileptr, 0);
-+	res = filetest(ftest, &fileptr, TEXP_NOGLOB);
- 	cleanup_push(res, xfree);
- 	xprintf("%S", res);
- 	cleanup_until(res);
diff --git a/shells/tcsh/patches/patch-sh.h b/shells/tcsh/patches/patch-sh.h
deleted file mode 100644
index 4180c66246b..00000000000
--- a/shells/tcsh/patches/patch-sh.h
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-sh.h,v 1.2 2021/11/18 10:20:47 kim Exp $
-
-Add OpenBSD support.
-
-Don't glob the filetest builtin arguments twice:    
-    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=905649
-
-https://github.com/tcsh-org/tcsh/commit/8a83d4c717ad4a56450751986b65ccd6ea9eed8a.patch
-
---- sh.h.orig	2021-11-11 09:54:05.000000000 +0000
-+++ sh.h	2021-11-18 10:03:48.441361892 +0000
-@@ -320,7 +320,7 @@
-  * redefines malloc(), so we define the following
-  * to avoid it.
-  */
--# if defined(SYSMALLOC) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(sgi) || defined(_OSD_POSIX)
-+# if defined(SYSMALLOC) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(sgi) || defined(_OSD_POSIX) || defined(__OpenBSD__)
- #  define NO_FIX_MALLOC
- #  include <stdlib.h>
- # else /* glibc */
-@@ -1299,4 +1299,8 @@
- 
- #include "tc.nls.h"
- 
-+#define TEXP_IGNORE 1	/* in ignore, it means to ignore value, just parse */
-+#define TEXP_NOGLOB 2	/* in ignore, it means not to globone */
-+
-+
- #endif /* _h_sh */
diff --git a/shells/tcsh/patches/patch-tcsh.man b/shells/tcsh/patches/patch-tcsh.man
deleted file mode 100644
index cba4f8698b9..00000000000
--- a/shells/tcsh/patches/patch-tcsh.man
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-tcsh.man,v 1.2 2021/11/18 10:20:47 kim Exp $
-
-Document ln=target
-Add more detail to "jobs -Z" usage.
-
-https://github.com/tcsh-org/tcsh/commit/b98d6544234e9258156f08c8b559ed6253f2bc49.patch
-https://github.com/tcsh-org/tcsh/commit/a81394cfaca1b9cf4d9cf8d3f4d8c0126b8b09d0.patch
-
---- tcsh.man.orig	2021-11-11 09:54:05.000000000 +0000
-+++ tcsh.man	2021-11-18 10:08:01.436706660 +0000
-@@ -2972,16 +2972,22 @@
- .B inlib \fIshared-library\fR ... (+)
- Adds each \fIshared-library\fR to the current environment.  There is no way
- to remove a shared library.  (Domain/OS only)
-+.PP
-+.B jobs \fR[\fB\-l\fR]
-+.PD 0
- .TP 8
--.B jobs \fR[\fB\-lZ\fR]
-+.B jobs \-Z \fR[\fItitle\fR] (+)
- Lists the active jobs.  With \fB\-l\fR, lists process
- IDs in addition to the normal information.  On TCF systems, prints
- the site on which each job is executing.
--The \fB-Z\fR option sets the process title using setproctitle(3)
--where available.
-+.PD
-+.RS +8
-+.PP
-+The \fB-Z\fR option sets the process title to \fItitle\fR using
-+setproctitle(3) where available.
-+If no \fItitle\fR is provided, the process title will be cleared.
-+.RE
- .PP
--.PD 0
--.TP 8
- .B kill \fR[\fB\-s \fIsignal\fR] \fB%\fIjob\fR|\fIpid\fR ...
- .PD 0
- .TP 8
-@@ -5088,6 +5094,9 @@
- properly.  If all text gets colorized after you do a directory
- listing, try changing the \fBno\fR and \fBfi\fR codes from 0 to the
- numerical codes for your standard fore- and background colors.
-+.PP
-+For symbolic links the \fBln\fR keyword can be set to \fBtarget\fR, which makes
-+the file color the same as the color of the link target.
- .RE
- .TP 8
- .B MACHTYPE \fR(+)
diff --git a/shells/tcsh/patches/patch-tw.color.c b/shells/tcsh/patches/patch-tw.color.c
deleted file mode 100644
index 5fb5b9ac543..00000000000
--- a/shells/tcsh/patches/patch-tw.color.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-tw.color.c,v 1.2 2021/11/18 10:20:47 kim Exp $
-
-Fix the ln=target code by NUL terminating the result of readlink(2).
-Fix off-by-one, found by Coverity
-
-https://github.com/tcsh-org/tcsh/commit/247a7d6649621fdc40c31ad81c4967413213b9d2.patch
-https://github.com/tcsh-org/tcsh/commit/92e557e324655906b73bad5253885051bbb7162e.patch
-
---- tw.color.c.orig	2021-11-11 09:54:05.000000000 +0000
-+++ tw.color.c	2021-11-18 09:54:30.997940824 +0000
-@@ -479,13 +479,15 @@
- 	if (suffix == '@' && color_as_referent) {
- 	    char *f = short2str(filename);
- 	    Char c = suffix;
--	    char buf[MAXPATHLEN];
-+	    char buf[MAXPATHLEN + 1];
- 
- 	    while (c == '@') {
--		if (readlink(f, buf, MAXPATHLEN) == -1) {
-+		ssize_t b = readlink(f, buf, MAXPATHLEN);
-+		if (b == -1) {
- 		    c = '&';
- 		    break;
- 		}
-+		buf[b] = '\0';
- 
- 		c = filetype(STRNULL, str2short(buf));
- 		f = buf;