CVS commit: pkgsrc/shells

["Kimmo Suominen" <kim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kim
Date:           Sun Nov 14 22:15:13 UTC 2021

Modified Files:
        pkgsrc/shells/standalone-tcsh: Makefile
        pkgsrc/shells/static-tcsh: Makefile
        pkgsrc/shells/tcsh: Makefile distinfo
Added Files:
        pkgsrc/shells/tcsh/patches: patch-tcsh.man patch-tcsh.man.new
            patch-tw.color.c

Log Message:
{,standalone-,static-}tcsh: fix and document ln=target


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/shells/standalone-tcsh/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/shells/static-tcsh/Makefile
cvs rdiff -u -r1.100 -r1.101 pkgsrc/shells/tcsh/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/shells/tcsh/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/tcsh/patches/patch-tcsh.man \
    pkgsrc/shells/tcsh/patches/patch-tcsh.man.new \
    pkgsrc/shells/tcsh/patches/patch-tw.color.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/standalone-tcsh/Makefile
diff -u pkgsrc/shells/standalone-tcsh/Makefile:1.32 pkgsrc/shells/standalone-tcsh/Makefile:1.33
--- pkgsrc/shells/standalone-tcsh/Makefile:1.32 Sun Nov 14 21:53:15 2021
+++ pkgsrc/shells/standalone-tcsh/Makefile      Sun Nov 14 22:15:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2021/11/14 21:53:15 mrg Exp $
+# $NetBSD: Makefile,v 1.33 2021/11/14 22:15:13 kim Exp $
 #
 
 # FIXME: This is because of PREFIX=/ below.
@@ -6,7 +6,7 @@ CHECK_FILES_SUPPORTED=  no
 NOT_FOR_UNPRIVILEGED=  yes
 
 PKGNAME=               standalone-${DISTNAME}
-PKGREVISION=           0       # ALWAYS needs to be set; 0 if none.
+PKGREVISION=           1       # ALWAYS needs to be set; 0 if none.
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}
 PATCHDIR=              ${.CURDIR}/../../shells/tcsh/patches
@@ -22,7 +22,7 @@ ONLY_FOR_PLATFORM+=   NetBSD-*-* OpenBSD-*
 NOT_FOR_PLATFORM+=     SunOS-*-*
 .endif
 
-+# XXX This should use Makefile.common, not Makefile
+# XXX This should use Makefile.common, not Makefile
 .include "../../shells/tcsh/Makefile"
 
 INSTALLATION_DIRS+=    usr/share/man/man1

Index: pkgsrc/shells/static-tcsh/Makefile
diff -u pkgsrc/shells/static-tcsh/Makefile:1.12 pkgsrc/shells/static-tcsh/Makefile:1.13
--- pkgsrc/shells/static-tcsh/Makefile:1.12     Thu Nov 11 22:47:55 2021
+++ pkgsrc/shells/static-tcsh/Makefile  Sun Nov 14 22:15:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/11/11 22:47:55 kim Exp $
+# $NetBSD: Makefile,v 1.13 2021/11/14 22:15:13 kim Exp $
 #
 
 .include "../../shells/tcsh/Makefile.common"
@@ -13,6 +13,7 @@ DESCR_SRC=            ${.CURDIR}/../../shells/tcsh
 CONFLICTS=             tcsh-[0-9]*
 
 PKGNAME=               static-${DISTNAME}
+PKGREVISION=           1
 
 # SunOS 5.10 stopped shipping static libraries.
 NOT_FOR_PLATFORM+=     SunOS-5.1[0-9]-*

Index: pkgsrc/shells/tcsh/Makefile
diff -u pkgsrc/shells/tcsh/Makefile:1.100 pkgsrc/shells/tcsh/Makefile:1.101
--- pkgsrc/shells/tcsh/Makefile:1.100   Thu Nov 11 22:47:55 2021
+++ pkgsrc/shells/tcsh/Makefile Sun Nov 14 22:15:13 2021
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2021/11/11 22:47:55 kim Exp $
+# $NetBSD: Makefile,v 1.101 2021/11/14 22:15:13 kim Exp $
 
 .include "../../shells/tcsh/Makefile.common"
 
+PKGREVISION=1
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/shells/tcsh/distinfo
diff -u pkgsrc/shells/tcsh/distinfo:1.53 pkgsrc/shells/tcsh/distinfo:1.54
--- pkgsrc/shells/tcsh/distinfo:1.53    Sat Nov 13 06:50:03 2021
+++ pkgsrc/shells/tcsh/distinfo Sun Nov 14 22:15:13 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2021/11/13 06:50:03 kim Exp $
+$NetBSD: distinfo,v 1.54 2021/11/14 22:15:13 kim Exp $
 
 BLAKE2s (tcsh-6.23.00.tar.gz) = a61b142efc2ca927cb33ea4eb87c0530cacc0c79ff1c30d5e9022a4404cef72d
 SHA512 (tcsh-6.23.00.tar.gz) = 8ea491e9409f12ab113bf5551398cb827692a50340318b050d0f8278d3cd9c133ba89a407dc692d9c4bd69957ecd6d4d92db7ccfacc7064ace3b09e3bd562f30
@@ -7,3 +7,6 @@ SHA1 (patch-Makefile.in) = 16ae4c595c8e2
 SHA1 (patch-config_f.h) = 715d939e8a8f4917bd219dccd91d5c49ae502939
 SHA1 (patch-nls_Makefile.in) = 58d859e8a50e6436b9bc6514497eb876426d92d7
 SHA1 (patch-sh.h) = ac6211ddd5e552e9baec2d35aed5e7e573cab04e
+SHA1 (patch-tcsh.man) = 7ced0fbcc2bdae180d3e88acda44e189ca37abc6
+SHA1 (patch-tcsh.man.new) = 7669b45129a64a5c0bc5eab39e310ec6ec4ab4c4
+SHA1 (patch-tw.color.c) = 9ad72f83e6ebf21bb587cc6c83657a2b4bdee0e6

Added files:

Index: pkgsrc/shells/tcsh/patches/patch-tcsh.man
diff -u /dev/null pkgsrc/shells/tcsh/patches/patch-tcsh.man:1.1
--- /dev/null   Sun Nov 14 22:15:13 2021
+++ pkgsrc/shells/tcsh/patches/patch-tcsh.man   Sun Nov 14 22:15:13 2021
@@ -0,0 +1,18 @@
+$NetBSD: patch-tcsh.man,v 1.1 2021/11/14 22:15:13 kim Exp $
+
+Document ln=target
+
+https://github.com/tcsh-org/tcsh/commit/b98d6544234e9258156f08c8b559ed6253f2bc49.patch
+
+--- tcsh.man
++++ tcsh.man
+@@ -5088,6 +5088,9 @@ A few terminal programs do not recognize the default end code
+ 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(+)
Index: pkgsrc/shells/tcsh/patches/patch-tcsh.man.new
diff -u /dev/null pkgsrc/shells/tcsh/patches/patch-tcsh.man.new:1.1
--- /dev/null   Sun Nov 14 22:15:13 2021
+++ pkgsrc/shells/tcsh/patches/patch-tcsh.man.new       Sun Nov 14 22:15:13 2021
@@ -0,0 +1,18 @@
+$NetBSD: patch-tcsh.man.new,v 1.1 2021/11/14 22:15:13 kim Exp $
+
+Document ln=target
+
+https://github.com/tcsh-org/tcsh/commit/b98d6544234e9258156f08c8b559ed6253f2bc49.patch
+
+--- tcsh.man.new
++++ tcsh.man.new
+@@ -8997,6 +8997,9 @@ and
+ .Va fi
+ codes from 0 to the
+ numerical codes for your standard fore- and background colors.
++.Pp     
++For symbolic links the "ln" keyword can be set to "target", which makes
++the file color the same as the color of the link target.
+ .RE
+ .TP 8
+ .B MACHTYPE \fR(+)
Index: pkgsrc/shells/tcsh/patches/patch-tw.color.c
diff -u /dev/null pkgsrc/shells/tcsh/patches/patch-tw.color.c:1.1
--- /dev/null   Sun Nov 14 22:15:13 2021
+++ pkgsrc/shells/tcsh/patches/patch-tw.color.c Sun Nov 14 22:15:13 2021
@@ -0,0 +1,22 @@
+$NetBSD: patch-tw.color.c,v 1.1 2021/11/14 22:15:13 kim Exp $
+
+Fix the ln=target code by NUL terminating the result of readlink(2).
+
+https://github.com/tcsh-org/tcsh/commit/247a7d6649621fdc40c31ad81c4967413213b9d2.patch
+
+--- tw.color.c
++++ tw.color.c
+@@ -482,10 +482,12 @@ print_with_color(const Char *filename, size_t len, Char suffix)
+           char buf[MAXPATHLEN];
+ 
+           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;