CVS commit: pkgsrc/shells/ksh93

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon Nov  3 21:47:14 UTC 2025

Modified Files:
        pkgsrc/shells/ksh93: Makefile PLIST distinfo
        pkgsrc/shells/ksh93/patches: patch-bin_package
Added Files:
        pkgsrc/shells/ksh93/patches: patch-src_cmd_ksh93_SHOPT.sh

Log Message:
shells/ksh93: include system-wide configuration file


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/shells/ksh93/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/shells/ksh93/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/shells/ksh93/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/shells/ksh93/patches/patch-bin_package
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/shells/ksh93/patches/patch-src_cmd_ksh93_SHOPT.sh

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.15 pkgsrc/shells/ksh93/Makefile:1.16
--- pkgsrc/shells/ksh93/Makefile:1.15   Mon Nov  4 17:01:47 2024
+++ pkgsrc/shells/ksh93/Makefile        Mon Nov  3 21:47:14 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2024/11/04 17:01:47 nia Exp $
+# $NetBSD: Makefile,v 1.16 2025/11/03 21:47:14 vins Exp $
 
 DISTNAME=      ksh93-1.0.10
+PKGREVISION=   1
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ksh93/}
 GITHUB_PROJECT=        ksh
@@ -15,13 +16,28 @@ CONFLICTS+=         ast-ksh-[0-9]* static-ast-k
 
 USE_CC_FEATURES=       c11
 
-CFLAGS.SunOS+= -D__EXTENSIONS__
-
 FORTIFY_SUPPORTED=     no
 MKPIE_SUPPORTED=       no
 
-MAKE_FLAGS+=           SHELL=${SH:Q} CC=${CC:Q} \
-                       CCFLAGS=${CFLAGS:M*:Q}
+CFLAGS.SunOS+=         -D__EXTENSIONS__
+
+PKG_SYSCONFSUBDIR=     ksh93
+
+EGDIR=                 ${PREFIX}/share/examples/ksh93
+CONF_FILES+=           ${EGDIR}/kshrc ${PKG_SYSCONFDIR}/kshrc
+
+SUBST_CLASSES+=                conf
+SUBST_STAGE.conf=      pre-configure
+SUBST_FILES.conf=      src/cmd/ksh93/Mamfile src/cmd/ksh93/SHOPT.sh \
+                       src/cmd/ksh93/data/builtins.c src/cmd/ksh93/sh.1 \
+                       src/cmd/ksh93/data/msg.c
+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_MESSAGE.conf=    Setting configuration file path
+
+MAKE_FLAGS+=           SHELL=${SH:Q} CC=${CC:Q}        \
+                       CCFLAGS=${CFLAGS:M*:Q}          \
+                       LDFLAGS=${LDFLAGS:M*:Q}
 
 INSTALL_ENV+=          MANDIR=${PKGMANDIR}
 

Index: pkgsrc/shells/ksh93/PLIST
diff -u pkgsrc/shells/ksh93/PLIST:1.4 pkgsrc/shells/ksh93/PLIST:1.5
--- pkgsrc/shells/ksh93/PLIST:1.4       Sat Aug 24 13:37:40 2024
+++ pkgsrc/shells/ksh93/PLIST   Mon Nov  3 21:47:14 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2024/08/24 13:37:40 vins Exp $
+@comment $NetBSD: PLIST,v 1.5 2025/11/03 21:47:14 vins Exp $
 bin/ksh93
 bin/shcomp
 include/ast/align.h
@@ -174,3 +174,4 @@ man/man3/tmx.3ast
 man/man3/tok.3ast
 man/man3/touch.3ast
 man/man3/tv.3ast
+share/examples/ksh93/kshrc

Index: pkgsrc/shells/ksh93/distinfo
diff -u pkgsrc/shells/ksh93/distinfo:1.12 pkgsrc/shells/ksh93/distinfo:1.13
--- pkgsrc/shells/ksh93/distinfo:1.12   Mon Nov  4 17:01:47 2024
+++ pkgsrc/shells/ksh93/distinfo        Mon Nov  3 21:47:14 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.12 2024/11/04 17:01:47 nia Exp $
+$NetBSD: distinfo,v 1.13 2025/11/03 21:47:14 vins Exp $
 
 BLAKE2s (ksh93-1.0.10.tar.gz) = 489a3bdc3f5325c1750cf0056a278a9c8c60037103c9691a28f3c3f6b2c06542
 SHA512 (ksh93-1.0.10.tar.gz) = 055bd2cf188c825ed684e6f95991a70f8b672e31a94a2294b8791de96be7d9dbf49e2d1eddb3490559c15736a2e0f40839529253481f1217e5e134f046cbe41f
 Size (ksh93-1.0.10.tar.gz) = 2019536 bytes
-SHA1 (patch-bin_package) = 4fb869ee8de929ff7820c280b324414b90acf004
+SHA1 (patch-bin_package) = 5eb1ea39df00321af0db5a2c16931b384260cd71
+SHA1 (patch-src_cmd_ksh93_SHOPT.sh) = 0e604d5c36649dd1560e61df00e1103bee6dd1b1
 SHA1 (patch-src_lib_libast_features_syscall) = 3da58a2876db9171378574fcf772978db2cd57e0

Index: pkgsrc/shells/ksh93/patches/patch-bin_package
diff -u pkgsrc/shells/ksh93/patches/patch-bin_package:1.2 pkgsrc/shells/ksh93/patches/patch-bin_package:1.3
--- pkgsrc/shells/ksh93/patches/patch-bin_package:1.2   Mon Nov  4 17:01:47 2024
+++ pkgsrc/shells/ksh93/patches/patch-bin_package       Mon Nov  3 21:47:14 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-bin_package,v 1.2 2024/11/04 17:01:47 nia Exp $
+$NetBSD: patch-bin_package,v 1.3 2025/11/03 21:47:14 vins Exp $
 
 install target fixes, for pkgsrc compatibility.
 
@@ -13,7 +13,7 @@ install target fixes, for pkgsrc compati
  
  while :
  do    case $# in
-@@ -2607,8 +2607,8 @@ do_install() # dir [ command ... ]
+@@ -2607,12 +2607,13 @@ do_install() # dir [ command ... ]
        done
        # set install directories
        bindir=$dd/bin
@@ -24,15 +24,23 @@ install target fixes, for pkgsrc compati
        man1dir=$mandir/man1
        man3dir=$mandir/man3
        libdir=$dd/lib
-@@ -2627,9 +2627,10 @@ do_install() # dir [ command ... ]
+       includedir=$dd/include
++      egdir=${dd}/share/examples/ksh93
+       # and off we go
+       trace mkdir -p "$bindir" "$man1dir" || exit
+       for f
+@@ -2627,9 +2628,12 @@ do_install() # dir [ command ... ]
                fi
                # install manual pages and autoloadable functions
                case $f in
 -              ksh)    trace cp "$PACKAGEROOT/src/cmd/ksh93/sh.1" "$man1dir/ksh.1" || exit
+-                      trace mkdir -p "$fundir" || exit
 +              ksh)    trace cp "$PACKAGEROOT/src/cmd/ksh93/sh.1" "$man1dir/ksh93.1" || exit
-                       trace mkdir -p "$fundir" || exit
++                      trace mkdir -p "$fundir" "$egdir" || exit
                        (set +o noglob; trace cp "$PACKAGEROOT"/src/cmd/ksh93/fun/* "$fundir/") || exit
 +                      trace mv "$bindir/ksh" "$bindir/ksh93" || exit
++                      trace cp "$PACKAGEROOT/src/cmd/ksh93/kshrc.sh" "$egdir/kshrc" || exit
++
                        ;;
                *)      # AT&T --man, etc. is a glorified error message: writes to stderr and exits with status 2 :-/
                        # So we cannot reliably check for success; must check the result, too.

Added files:

Index: pkgsrc/shells/ksh93/patches/patch-src_cmd_ksh93_SHOPT.sh
diff -u /dev/null pkgsrc/shells/ksh93/patches/patch-src_cmd_ksh93_SHOPT.sh:1.1
--- /dev/null   Mon Nov  3 21:47:14 2025
+++ pkgsrc/shells/ksh93/patches/patch-src_cmd_ksh93_SHOPT.sh    Mon Nov  3 21:47:14 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_cmd_ksh93_SHOPT.sh,v 1.1 2025/11/03 21:47:14 vins Exp $
+
+Enable sourcing of system-wide configuration.
+
+--- src/cmd/ksh93/SHOPT.sh.orig        2024-08-01 22:54:10.000000000 +0000
++++ src/cmd/ksh93/SHOPT.sh
+@@ -37,7 +37,7 @@ SHOPT REMOTE=                                # enable --rc if runnin
+ SHOPT SCRIPTONLY=0                    # build ksh for running scripts only; compile out the interactive shell
+ SHOPT SPAWN=                          # use spawnveg for fork/exec
+ SHOPT STATS=1                         # add .sh.stats variable
+-SHOPT SYSRC=                          # attempt . /etc/ksh.kshrc if interactive
++SHOPT SYSRC=1                         # attempt . /etc/ksh.kshrc if interactive
+ SHOPT TEST_L=                         # add 'test -l' as an alias for 'test -L'
+ SHOPT TIMEOUT=                                # number of seconds for shell timeout
+ SHOPT VSH=1                           # vi edit mode