CVS commit: pkgsrc/shells/bash

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Nov 25 23:29:47 UTC 2022

Modified Files:
        pkgsrc/shells/bash: Makefile distinfo
Added Files:
        pkgsrc/shells/bash/patches: patch-Makefile.in patch-builtins_printf.def
            patch-builtins_psize.c patch-examples_loadables_Makefile.in
Removed Files:
        pkgsrc/shells/bash/patches: patch-af patch-ag patch-aj

Log Message:
bash: properly install shared objects; pkglint fixes


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/shells/bash/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/shells/bash/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/bash/patches/patch-Makefile.in \
    pkgsrc/shells/bash/patches/patch-builtins_printf.def \
    pkgsrc/shells/bash/patches/patch-builtins_psize.c \
    pkgsrc/shells/bash/patches/patch-examples_loadables_Makefile.in
cvs rdiff -u -r1.8 -r0 pkgsrc/shells/bash/patches/patch-af
cvs rdiff -u -r1.4 -r0 pkgsrc/shells/bash/patches/patch-ag
cvs rdiff -u -r1.2 -r0 pkgsrc/shells/bash/patches/patch-aj

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

Modified files:

Index: pkgsrc/shells/bash/Makefile
diff -u pkgsrc/shells/bash/Makefile:1.107 pkgsrc/shells/bash/Makefile:1.108
--- pkgsrc/shells/bash/Makefile:1.107   Fri Nov 25 18:20:46 2022
+++ pkgsrc/shells/bash/Makefile Fri Nov 25 23:29:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2022/11/25 18:20:46 kre Exp $
+# $NetBSD: Makefile,v 1.108 2022/11/25 23:29:47 adam Exp $
 
 BASH_VERSION=          5.2
 BASH_PATCHLEVEL=       12
@@ -70,7 +70,7 @@ BUILDLINK_API_DEPENDS.readline+=      readlin
 .include "../../devel/readline/buildlink3.mk"
 .endif
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD"
+.if ${USE_CROSS_COMPILE:U:tl} == yes && ${OPSYS} == "NetBSD"
 CONFIGURE_ENV+=                CC_FOR_BUILD=${NATIVE_CC:Q}
 CONFIGURE_ENV+=                ac_cv_c_long_long=yes
 CONFIGURE_ENV+=                ac_cv_c_long_double=yes

Index: pkgsrc/shells/bash/distinfo
diff -u pkgsrc/shells/bash/distinfo:1.75 pkgsrc/shells/bash/distinfo:1.76
--- pkgsrc/shells/bash/distinfo:1.75    Fri Nov 25 18:20:46 2022
+++ pkgsrc/shells/bash/distinfo Fri Nov 25 23:29:47 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.75 2022/11/25 18:20:46 kre Exp $
+$NetBSD: distinfo,v 1.76 2022/11/25 23:29:47 adam Exp $
 
 BLAKE2s (bash-5.2.tar.gz) = 430755ea2af4903dba2bdbeffd4d861edb9f54c248071362f0d14f15171764cd
 SHA512 (bash-5.2.tar.gz) = 5647636223ba336bf33e0c65e516d8ebcf6932de8b44f37bc468eedb87579c628ad44213f78534beb10f47aebb9c6fa670cb0bed3b4e7717e5faf7e9a1ef81ae
@@ -39,11 +39,12 @@ Size (bash52-011) = 1229 bytes
 BLAKE2s (bash52-012) = b980049d0314616909334aa332dbe55e7f2c4be0cab342a2b35342ca98d4c9af
 SHA512 (bash52-012) = 8f969cb36ee81ac47a4c3c6ee7fbe62159192fa4f14cb48973eccd55c458e6a093adc3045ee1c379544d8183d77813977a43cad5d225322d8816540a1cb8893b
 Size (bash52-012) = 9107 bytes
-SHA1 (patch-af) = e26e3209902247263884cfebc11a2f7e43245062
-SHA1 (patch-ag) = cd3b151e3bb045d2bb609c0a03d7d3df2c871f47
-SHA1 (patch-aj) = 2e4c15afd9b50d44967ee8e1f85bdc908c0eeeb0
+SHA1 (patch-Makefile.in) = 2e4c15afd9b50d44967ee8e1f85bdc908c0eeeb0
+SHA1 (patch-builtins_printf.def) = e26e3209902247263884cfebc11a2f7e43245062
+SHA1 (patch-builtins_psize.c) = cd3b151e3bb045d2bb609c0a03d7d3df2c871f47
 SHA1 (patch-builtins_ulimit.def) = 1390069344607204eb3abbd6ddeb148ff590c55e
 SHA1 (patch-configure) = c4e1ab53a1ee85f3e6121047f0aca8ceb85e6e5d
+SHA1 (patch-examples_loadables_Makefile.in) = 0d27f82399c4ae9fae8ac0f8c48c68a23a3dcbd8
 SHA1 (patch-examples_loadables_fdflags.c) = dce409c76b7d6c838eb25c3ccc7a89ee57ca69b8
 SHA1 (patch-examples_loadables_getconf.c) = a71df9f54d77ee14de453b67bd4b3658ad7123eb
 SHA1 (patch-lib_malloc_malloc.c) = 6e500228972eac0cb4d4defb02e9cf573b7fa207

Added files:

Index: pkgsrc/shells/bash/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/shells/bash/patches/patch-Makefile.in:1.1
--- /dev/null   Fri Nov 25 23:29:47 2022
+++ pkgsrc/shells/bash/patches/patch-Makefile.in        Fri Nov 25 23:29:47 2022
@@ -0,0 +1,25 @@
+$NetBSD: patch-Makefile.in,v 1.1 2022/11/25 23:29:47 adam Exp $
+
+This patch fixes the build on MirBSD and OpenBSD, where LIBINTL and
+LIBICONV are incorrectly set.
+
+--- Makefile.in.orig   2014-01-25 21:27:30.000000000 +0000
++++ Makefile.in
+@@ -353,7 +353,7 @@ INTL_LIBDIR = $(dot)/$(LIBSUBDIR)/intl
+ INTL_ABSSRC = ${topdir}/$(INTL_LIB)
+ INTL_BUILDDIR = ${LIBBUILD}/intl
+ 
+-INTL_LIB     = @LIBINTL@
++INTL_LIB     = @LTLIBINTL@
+ INTL_LIBRARY = $(INTL_LIBDIR)/libintl.a
+ INTL_DEP = @INTL_DEP@
+ INTL_INC = @INTL_INC@
+@@ -361,7 +361,7 @@ INTL_INC = @INTL_INC@
+ LIBINTL_H = @LIBINTL_H@
+ 
+ # libiconv
+-LIBICONV = @LIBICONV@
++LIBICONV = @LTLIBICONV@
+ 
+ # tests
+ LIBINTL = @LIBINTL@
Index: pkgsrc/shells/bash/patches/patch-builtins_printf.def
diff -u /dev/null pkgsrc/shells/bash/patches/patch-builtins_printf.def:1.1
--- /dev/null   Fri Nov 25 23:29:47 2022
+++ pkgsrc/shells/bash/patches/patch-builtins_printf.def        Fri Nov 25 23:29:47 2022
@@ -0,0 +1,56 @@
+$NetBSD: patch-builtins_printf.def,v 1.1 2022/11/25 23:29:47 adam Exp $
+
+Fixes PRIdMAX and PRIuMAX on AIX < 5.1.
+
+--- builtins/printf.def.orig   2014-01-03 15:35:33.000000000 +0000
++++ builtins/printf.def
+@@ -95,6 +95,11 @@ $END
+ #  undef PRIdMAX
+ #endif
+ 
++#if defined (_AIX) && !defined (_AIX51)
++   /* AIX defines do not work.  Undefine them.  */
++#  undef PRIdMAX
++#  undef PRIuMAX
++#endif
+ #if !defined (PRIdMAX)
+ #  if HAVE_LONG_LONG
+ #    define PRIdMAX   "lld"
+@@ -102,6 +107,13 @@ $END
+ #    define PRIdMAX   "ld"
+ #  endif
+ #endif
++#if !defined (PRIuMAX) && defined (_AIX)
++#  if HAVE_LONG_LONG
++#    define PRIuMAX "llu"
++#  else
++#    define PRIuMAX "lu"
++#  endif
++#endif
+ 
+ #if !defined (errno)
+ extern int errno;
+@@ -594,7 +606,11 @@ printf_builtin (list)
+               p = pp = getintmax ();
+               if (p != pp)
+                 {
++#if defined (_AIX) && !defined (_AIX51)
++                  f = mklong (start, PRIdMAX, sizeof (intmax_t) - 2);
++#else
+                   f = mklong (start, PRIdMAX, sizeof (PRIdMAX) - 2);
++#endif
+                   PF (f, pp);
+                 }
+               else
+@@ -621,7 +637,11 @@ printf_builtin (list)
+               p = pp = getuintmax ();
+               if (p != pp)
+                 {
++#if defined (_AIX) && !defined (_AIX51)
++                  f = mklong (start, PRIuMAX, sizeof (uintmax_t) - 2);
++#else
+                   f = mklong (start, PRIdMAX, sizeof (PRIdMAX) - 2);
++#endif
+                   PF (f, pp);
+                 }
+               else
Index: pkgsrc/shells/bash/patches/patch-builtins_psize.c
diff -u /dev/null pkgsrc/shells/bash/patches/patch-builtins_psize.c:1.1
--- /dev/null   Fri Nov 25 23:29:47 2022
+++ pkgsrc/shells/bash/patches/patch-builtins_psize.c   Fri Nov 25 23:29:47 2022
@@ -0,0 +1,17 @@
+$NetBSD: patch-builtins_psize.c,v 1.1 2022/11/25 23:29:47 adam Exp $
+
+Use the definition of errno from <errno.h>.
+
+--- builtins/psize.c.orig      2008-08-14 19:56:53.000000000 +0000
++++ builtins/psize.c
+@@ -41,10 +41,6 @@
+ #include "../general.h"
+ #include "../sig.h"
+ 
+-#ifndef errno
+-extern int errno;
+-#endif
+-
+ int nw;
+ 
+ sighandler
Index: pkgsrc/shells/bash/patches/patch-examples_loadables_Makefile.in
diff -u /dev/null pkgsrc/shells/bash/patches/patch-examples_loadables_Makefile.in:1.1
--- /dev/null   Fri Nov 25 23:29:47 2022
+++ pkgsrc/shells/bash/patches/patch-examples_loadables_Makefile.in     Fri Nov 25 23:29:47 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-examples_loadables_Makefile.in,v 1.1 2022/11/25 23:29:47 adam Exp $
+
+Correctly install shared objects (e.g. unstripped on some platforms).
+
+--- examples/loadables/Makefile.in.orig        2022-11-25 23:21:05.000000000 +0000
++++ examples/loadables/Makefile.in
+@@ -281,7 +281,7 @@ install-supported: all installdirs insta
+       @echo installing example loadable builtins in $(DESTDIR)${loadablesdir}
+       @for prog in ${ALLPROG}; do \
+               echo $$prog ; \
+-              $(INSTALL_PROGRAM) $(INSTALLMODE) $$prog $(DESTDIR)$(loadablesdir)/$$prog ;\
++              ${BSD_INSTALL_LIB} $(INSTALLMODE) $$prog $(DESTDIR)$(loadablesdir)/$$prog ;\
+       done
+ 
+ uninstall-dev: