CVS commit: pkgsrc/shells

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Sep  1 08:58:02 UTC 2026

Modified Files:
        pkgsrc/shells/standalone-tcsh: Makefile
        pkgsrc/shells/static-tcsh: Makefile
        pkgsrc/shells/tcsh: Makefile.common

Log Message:
*tcsh: Sanitise path settings.

Avoids constant rebuilds when using bulk build tools.  While here apply
some minor pkglint.  I tested all packages on NetBSD 11/amd64 apart from
the install of the standalone-tcsh binary package due to read-only / in
my build sandboxes.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/shells/standalone-tcsh/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/shells/static-tcsh/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/shells/tcsh/Makefile.common

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.43 pkgsrc/shells/standalone-tcsh/Makefile:1.44
--- pkgsrc/shells/standalone-tcsh/Makefile:1.43 Thu Mar 17 08:27:31 2022
+++ pkgsrc/shells/standalone-tcsh/Makefile      Tue Sep  1 08:58:01 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2022/03/17 08:27:31 nia Exp $
+# $NetBSD: Makefile,v 1.44 2026/09/01 08:58:01 jperkin Exp $
 #
 
 # FIXME: This is because of PREFIX=/ below.
@@ -7,16 +7,14 @@ NOT_FOR_UNPRIVILEGED= yes
 
 PKGNAME=               standalone-${DISTNAME}
 
-PATCHDIR=              ../../shells/tcsh/patches
-PKGDIR=                        ../../shells/tcsh
-DESCR_SRC=             ../../shells/tcsh/DESCR DESCR
+.include "../../shells/tcsh/Makefile.common"
 
 # This package only makes sense on platforms that don't themselves ship tcsh
 # in /bin. Otherwise it clobbers the native copy, which really isn't what
 # anyone wants.
 ONLY_FOR_PLATFORM+=    NetBSD-*-* OpenBSD-*-* SunOS-*-*
 
-MKPIE_SUPPORTED= no
+MKPIE_SUPPORTED=       no
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -24,7 +22,6 @@ MKPIE_SUPPORTED= no
 NOT_FOR_PLATFORM+=     SunOS-*-*
 .endif
 
-.include "../../shells/tcsh/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
 
 COMMENT:=              Standalone version of the Extended C-shell

Index: pkgsrc/shells/static-tcsh/Makefile
diff -u pkgsrc/shells/static-tcsh/Makefile:1.17 pkgsrc/shells/static-tcsh/Makefile:1.18
--- pkgsrc/shells/static-tcsh/Makefile:1.17     Thu Dec  9 19:55:39 2021
+++ pkgsrc/shells/static-tcsh/Makefile  Tue Sep  1 08:58:02 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/12/09 19:55:39 kim Exp $
+# $NetBSD: Makefile,v 1.18 2026/09/01 08:58:02 jperkin Exp $
 #
 
 PKGNAME=               static-${DISTNAME}
@@ -7,9 +7,7 @@ PKGNAME=                static-${DISTNAME}
 
 MAINTAINER=            agc%NetBSD.org@localhost
 
-PATCHDIR=              ../../shells/tcsh/patches
-PKGDIR=                        ../../shells/tcsh
-DESCR_SRC=             ../../shells/tcsh/DESCR DESCR
+DESCR_SRC=             ${.CURDIR}/../../shells/tcsh/DESCR DESCR
 
 CONFLICTS=             tcsh-[0-9]*
 

Index: pkgsrc/shells/tcsh/Makefile.common
diff -u pkgsrc/shells/tcsh/Makefile.common:1.18 pkgsrc/shells/tcsh/Makefile.common:1.19
--- pkgsrc/shells/tcsh/Makefile.common:1.18     Wed Jul  9 07:53:50 2025
+++ pkgsrc/shells/tcsh/Makefile.common  Tue Sep  1 08:58:02 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2025/07/09 07:53:50 kim Exp $
+# $NetBSD: Makefile.common,v 1.19 2026/09/01 08:58:02 jperkin Exp $
 #
 # used by shells/standalone-tcsh/Makefile
 # used by shells/static-tcsh/Makefile
@@ -14,6 +14,10 @@ HOMEPAGE=    https://www.tcsh.org/
 COMMENT=       Extended C-shell with many useful features
 LICENSE=       original-bsd
 
+DISTINFO_FILE= ${.CURDIR}/../../shells/tcsh/distinfo
+PATCHDIR=      ${.CURDIR}/../../shells/tcsh/patches
+PKGDIR=                ${.CURDIR}/../../shells/tcsh
+
 GNU_CONFIGURE= yes
 USE_TOOLS+=    autoconf:test perl:test
 
@@ -26,7 +30,7 @@ EGDIR=                share/examples/tcsh
 LOWER_OPSYS_VERSUFFIX= ${OS_VERSION:S/5./2./}
 .endif
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if ${USE_CROSS_COMPILE:U:tl} == yes
 # XXX Should use CONFIGURE_ENV, but the configure script disregards
 # $CC_FOR_GETHOST in the environment and sets it to cc.
 MAKE_FLAGS+=   CC_FOR_GETHOST=${NATIVE_CC:Q}