CVS commit: pkgsrc/shells/ksh93

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun May  3 06:21:25 UTC 2026

Modified Files:
        pkgsrc/shells/ksh93: Makefile
        pkgsrc/shells/ksh93/files: kshrc

Log Message:
shells/ksh93: kshrc: use ksh array to source only needed extensions


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/shells/ksh93/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/shells/ksh93/files/kshrc

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

Modified files:

Index: pkgsrc/shells/ksh93/Makefile
diff -u pkgsrc/shells/ksh93/Makefile:1.17 pkgsrc/shells/ksh93/Makefile:1.18
--- pkgsrc/shells/ksh93/Makefile:1.17   Tue Nov  4 18:21:46 2025
+++ pkgsrc/shells/ksh93/Makefile        Sun May  3 06:21:25 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2025/11/04 18:21:46 vins Exp $
+# $NetBSD: Makefile,v 1.18 2026/05/03 06:21:25 vins Exp $
 
 DISTNAME=      ksh93-1.0.10
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ksh93/}
 GITHUB_PROJECT=        ksh
@@ -21,6 +21,7 @@ CFLAGS.SunOS+=                -D__EXTENSIONS__
 
 PKG_SYSCONFSUBDIR=     ksh93
 
+FUNDIR=                        ${PREFIX}/libexec/ksh93
 EGDIR=                 ${PREFIX}/share/examples/ksh93
 CONF_FILES+=           ${EGDIR}/kshrc ${PKG_SYSCONFDIR}/kshrc
 
@@ -31,7 +32,7 @@ SUBST_FILES.conf=     src/cmd/ksh93/Mamfile 
                        src/cmd/ksh93/data/msg.c src/cmd/ksh93/kshrc
 SUBST_SED.conf+=       -e "s:/etc/ksh.kshrc:${PKG_SYSCONFDIR}/kshrc:g"
 SUBST_SED.conf+=       -e "s:/etc/ksh_audit:${PKG_SYSCONFDIR}/ksh_audit:g"
-SUBST_VARS.conf+=      PREFIX
+SUBST_VARS.conf+=      FUNDIR
 SUBST_MESSAGE.conf=    Setting configuration file path
 
 MAKE_FLAGS+=           SHELL=${SH:Q} CC=${CC:Q}        \

Index: pkgsrc/shells/ksh93/files/kshrc
diff -u pkgsrc/shells/ksh93/files/kshrc:1.2 pkgsrc/shells/ksh93/files/kshrc:1.3
--- pkgsrc/shells/ksh93/files/kshrc:1.2 Thu Nov  6 19:08:48 2025
+++ pkgsrc/shells/ksh93/files/kshrc     Sun May  3 06:21:25 2026
@@ -44,7 +44,10 @@ fi
 #
 # Source extentions (pushd, popd and others) provided with ksh93u+m
 #
-for fun in @PREFIX@/libexec/ksh93/*; do
+fundir="@FUNDIR@"
+funcs=(cd dirs man mcd popd pushd)
+
+for fun in  ${funcs[@]/*/$fundir/\0}; do
        [[ ! -f "${fun}" ]] || source $fun
 done