CVS commit: pkgsrc/shells/ksh93

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Nov  4 17:01:48 UTC 2024

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

Log Message:
ksh93: Honour PKGMANDIR


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/shells/ksh93/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/shells/ksh93/distinfo
cvs rdiff -u -r1.1 -r1.2 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.14 pkgsrc/shells/ksh93/Makefile:1.15
--- pkgsrc/shells/ksh93/Makefile:1.14   Thu Aug 22 17:49:20 2024
+++ pkgsrc/shells/ksh93/Makefile        Mon Nov  4 17:01:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2024/08/22 17:49:20 vins Exp $
+# $NetBSD: Makefile,v 1.15 2024/11/04 17:01:47 nia Exp $
 
 DISTNAME=      ksh93-1.0.10
 CATEGORIES=    shells
@@ -23,6 +23,8 @@ MKPIE_SUPPORTED=      no
 MAKE_FLAGS+=           SHELL=${SH:Q} CC=${CC:Q} \
                        CCFLAGS=${CFLAGS:M*:Q}
 
+INSTALL_ENV+=          MANDIR=${PKGMANDIR}
+
 PKG_SHELL=     bin/ksh93
 
 do-build:

Index: pkgsrc/shells/ksh93/distinfo
diff -u pkgsrc/shells/ksh93/distinfo:1.11 pkgsrc/shells/ksh93/distinfo:1.12
--- pkgsrc/shells/ksh93/distinfo:1.11   Thu Aug 22 17:49:20 2024
+++ pkgsrc/shells/ksh93/distinfo        Mon Nov  4 17:01:47 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2024/08/22 17:49:20 vins Exp $
+$NetBSD: distinfo,v 1.12 2024/11/04 17:01:47 nia 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) = d536c6b4787ef01b456bcf8436a77ec25b98c3a2
+SHA1 (patch-bin_package) = 4fb869ee8de929ff7820c280b324414b90acf004
 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.1 pkgsrc/shells/ksh93/patches/patch-bin_package:1.2
--- pkgsrc/shells/ksh93/patches/patch-bin_package:1.1   Tue Jul 30 15:17:08 2024
+++ pkgsrc/shells/ksh93/patches/patch-bin_package       Mon Nov  4 17:01:47 2024
@@ -1,21 +1,30 @@
-$NetBSD: patch-bin_package,v 1.1 2024/07/30 15:17:08 vins Exp $
+$NetBSD: patch-bin_package,v 1.2 2024/11/04 17:01:47 nia Exp $
 
 install target fixes, for pkgsrc compatibility.
 
---- bin/package.orig   2024-07-02 02:41:19.000000000 +0000
+--- bin/package.orig   2024-08-01 22:54:10.000000000 +0000
 +++ bin/package
-@@ -2666,8 +2666,8 @@ do_install() # dir [ command ... ]
+@@ -356,7 +356,7 @@ verbose=0
+ AUTHORIZE=
+ DEBUG=
+ 
+-unset FIGNORE BINDIR DLLDIR ETCDIR FUNDIR INCLUDEDIR LIBDIR LOCALEDIR MANDIR SHAREDIR 2>/dev/null || true
++unset FIGNORE BINDIR DLLDIR ETCDIR FUNDIR INCLUDEDIR LIBDIR LOCALEDIR SHAREDIR 2>/dev/null || true
+ 
+ while :
+ do    case $# in
+@@ -2607,8 +2607,8 @@ do_install() # dir [ command ... ]
        done
        # set install directories
        bindir=$dd/bin
 -      fundir=${dd:-/usr}/share/fun
 -      mandir=${dd:-/usr}/share/man
 +      fundir=${dd:-/usr}/libexec/ksh93
-+      mandir=${dd:-/usr}/man
++      mandir=${dd}/${MANDIR}
        man1dir=$mandir/man1
        man3dir=$mandir/man3
        libdir=$dd/lib
-@@ -2686,9 +2686,10 @@ do_install() # dir [ command ... ]
+@@ -2627,9 +2627,10 @@ do_install() # dir [ command ... ]
                fi
                # install manual pages and autoloadable functions
                case $f in