CVS commit: pkgsrc/shells/ksh93

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Tue Nov  4 18:21:47 UTC 2025

Modified Files:
        pkgsrc/shells/ksh93: Makefile distinfo
        pkgsrc/shells/ksh93/patches: patch-bin_package
Added Files:
        pkgsrc/shells/ksh93/files: kshrc

Log Message:
shells/ksh93: use simpler system-wide configuration


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/shells/ksh93/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/shells/ksh93/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/ksh93/files/kshrc
cvs rdiff -u -r1.3 -r1.4 pkgsrc/shells/ksh93/patches/patch-bin_package

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.16 pkgsrc/shells/ksh93/Makefile:1.17
--- pkgsrc/shells/ksh93/Makefile:1.16   Mon Nov  3 21:47:14 2025
+++ pkgsrc/shells/ksh93/Makefile        Tue Nov  4 18:21:46 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2025/11/03 21:47:14 vins Exp $
+# $NetBSD: Makefile,v 1.17 2025/11/04 18:21:46 vins Exp $
 
 DISTNAME=      ksh93-1.0.10
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ksh93/}
 GITHUB_PROJECT=        ksh
@@ -14,8 +14,6 @@ LICENSE=      epl-v1.0
 
 CONFLICTS+=            ast-ksh-[0-9]* static-ast-ksh-[0-9]*
 
-USE_CC_FEATURES=       c11
-
 FORTIFY_SUPPORTED=     no
 MKPIE_SUPPORTED=       no
 
@@ -30,9 +28,10 @@ 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
+                       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_MESSAGE.conf=    Setting configuration file path
 
 MAKE_FLAGS+=           SHELL=${SH:Q} CC=${CC:Q}        \
@@ -43,6 +42,9 @@ INSTALL_ENV+=         MANDIR=${PKGMANDIR}
 
 PKG_SHELL=     bin/ksh93
 
+post-extract:
+       ${RUN} cp ${FILESDIR}/kshrc ${WRKSRC}/src/cmd/ksh93
+
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}           \
                ${SH} ./bin/package make ${MAKE_FLAGS}

Index: pkgsrc/shells/ksh93/distinfo
diff -u pkgsrc/shells/ksh93/distinfo:1.13 pkgsrc/shells/ksh93/distinfo:1.14
--- pkgsrc/shells/ksh93/distinfo:1.13   Mon Nov  3 21:47:14 2025
+++ pkgsrc/shells/ksh93/distinfo        Tue Nov  4 18:21:46 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2025/11/03 21:47:14 vins Exp $
+$NetBSD: distinfo,v 1.14 2025/11/04 18:21:46 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) = 5eb1ea39df00321af0db5a2c16931b384260cd71
+SHA1 (patch-bin_package) = 0f001a0d02891976d95328dab1b09ce3a5ef2388
 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.3 pkgsrc/shells/ksh93/patches/patch-bin_package:1.4
--- pkgsrc/shells/ksh93/patches/patch-bin_package:1.3   Mon Nov  3 21:47:14 2025
+++ pkgsrc/shells/ksh93/patches/patch-bin_package       Tue Nov  4 18:21:47 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-bin_package,v 1.3 2025/11/03 21:47:14 vins Exp $
+$NetBSD: patch-bin_package,v 1.4 2025/11/04 18:21:47 vins Exp $
 
 install target fixes, for pkgsrc compatibility.
 
@@ -39,7 +39,7 @@ install target fixes, for pkgsrc compati
 +                      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
++                      trace cp "$PACKAGEROOT/src/cmd/ksh93/kshrc" "$egdir/kshrc" || exit
 +
                        ;;
                *)      # AT&T --man, etc. is a glorified error message: writes to stderr and exits with status 2 :-/

Added files:

Index: pkgsrc/shells/ksh93/files/kshrc
diff -u /dev/null pkgsrc/shells/ksh93/files/kshrc:1.1
--- /dev/null   Tue Nov  4 18:21:47 2025
+++ pkgsrc/shells/ksh93/files/kshrc     Tue Nov  4 18:21:47 2025
@@ -0,0 +1,67 @@
+#
+# This file is sourced by interactive ksh93 shells before ${HOME}/.kshrc
+#
+
+# Enable "gmacs"+"multiline" editor mode if the user did not set an
+# input mode yet (for example via ${EDITOR}, ${VISUAL} or any
+# "set -o" flag)
+if [[ "$(set +o)" != ~(Er)--(gmacs|emacs|vi)( .*|) ]] ; then
+       set -o gmacs
+       # enable multiline input mode
+       set -o multiline
+       # mark directories with a trailing slash
+       set -o markdirs
+       # enable globstar mode (match subdirs with **/)
+       set -o globstar
+fi
+
+# Set a default prompt (<username>@<hostname>:<path><"($|#) ">) if
+# then variable does not exist in the environment.
+#
+if [[ "$(set)" != ~(E)PS1= && -z "${PS1-}" ]] ; then
+       PS1='$(set +o xtrace +o errexit
+                [[ -v COLUMNS ]] && printf "%*s\r%s" COLUMNS ""
+                printf "%s@%s:" "${LOGNAME-}" "$(/bin/hostname)"
+               ellip="${
+                       [[ "${LC_ALL-}/${LANG-}" == ~(Elr)(.*UTF-8/.*|/.*UTF-8) ]] &&
+                               printf "\u[2026]\n" || print "..." ; }"
+               p="${PWD/~(El)${HOME}/\~}"
+               (( ${#p} > 30 )) &&
+                       print -r -n -- "${ellip}${p:${#p}-30:30}" ||
+                       print -r -n -- "${p}"
+               [[ "${LOGNAME-}" == "root" ]] && print -n "# " || print -n "\$ "
+               )'
+fi
+
+# Source extentions (pushd, popd and others) provided with ksh93u+m
+#
+for fun in @PREFIX@/libexec/ksh93/*; do
+       [[ ! -f "${fun}" ]] || source $fun
+done
+
+# Additional functions
+
+## show history
+hist() {
+       fc -l 1 | sort | uniq;
+}
+
+## clear buffer
+cls() {
+       tput clear; echo $'\e[3J';
+}
+
+## kill process
+stop() {
+       kill -9 "${@:-%%}";
+}
+
+## show pid
+pid() {
+       ps -e | grep $@ | cut -d" " -f1;
+}
+
+## print directory tree
+tree() {
+       exec find -- ${1:-.} | sed -Ee '2,$s:[^/]*/:   :g; s:   ([^ ]+)$:|_ \1:'
+}