CVS commit: pkgsrc/shells/bash

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Thu Oct 24 11:52:30 UTC 2019

Modified Files:
        pkgsrc/shells/bash: Makefile PLIST

Log Message:
bash: make nls support optional

pkgsrc changes:
  - remove broken static option
  - add nls option (disable by default)
  - change LOCALBASE to PREFIX (appease pkglint)


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/shells/bash/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/shells/bash/PLIST

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.88 pkgsrc/shells/bash/Makefile:1.89
--- pkgsrc/shells/bash/Makefile:1.88    Sun Sep  1 05:59:21 2019
+++ pkgsrc/shells/bash/Makefile Thu Oct 24 11:52:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2019/09/01 05:59:21 kre Exp $
+# $NetBSD: Makefile,v 1.89 2019/10/24 11:52:30 triaxx Exp $
 
 BASH_VERSION=          5.0
 BASH_PATCHLEVEL=       11
@@ -19,12 +19,11 @@ COMMENT=    The GNU Bourne Again Shell
 LICENSE=       gnu-gpl-v3
 
 USE_TOOLS+=            makeinfo bison
-USE_PKGLOCALEDIR=      yes
 TEXINFO_REQD=          4.1
 GNU_CONFIGURE=         yes
 MAKE_ENV+=             INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
 CONFIGURE_ARGS=                LOCAL_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:M*:Q}
-CPPFLAGS+=             -DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${LOCALBASE}/bin:/usr/local/bin\""
+CPPFLAGS+=             -DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${PREFIX}/bin:/usr/local/bin\""
 TEST_TARGET=           test
 
 PKGCONFIG_OVERRIDE=    support/bash.pc.in
@@ -49,20 +48,7 @@ CONFIGURE_ARGS+=     --enable-brace-expansio
 CONFIGURE_ARGS+=       --enable-array-variables
 
 .include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.bash
-PKG_SUPPORTED_OPTIONS= #static XXX 2017-11-20 broken
-
-.include "../../mk/bsd.options.mk"
-
-##
-## Static link
-##
-.if !empty(PKG_OPTIONS:Mstatic)
-CONFIGURE_ARGS+=               --enable-static-link
-BUILDLINK_DEPMETHOD.gettext=   build
-BUILDLINK_DEPMETHOD.readline=  build
-.endif
+.include "options.mk"
 
 # Minix lacks setpgid() which is needed for job control.
 # bash malloc() is also broken on Minix
@@ -104,5 +90,4 @@ post-install:
        ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/termcap.buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/shells/bash/PLIST
diff -u pkgsrc/shells/bash/PLIST:1.9 pkgsrc/shells/bash/PLIST:1.10
--- pkgsrc/shells/bash/PLIST:1.9        Tue Jan  8 16:24:42 2019
+++ pkgsrc/shells/bash/PLIST    Thu Oct 24 11:52:30 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2019/01/08 16:24:42 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.10 2019/10/24 11:52:30 triaxx Exp $
 bin/bash
 bin/bashbug
 include/bash/alias.h
@@ -102,41 +102,41 @@ share/doc/bash/RBASH
 share/doc/bash/README
 share/doc/bash/bash.html
 share/doc/bash/bashref.html
-share/locale/af/LC_MESSAGES/bash.mo
-share/locale/bg/LC_MESSAGES/bash.mo
-share/locale/ca/LC_MESSAGES/bash.mo
-share/locale/cs/LC_MESSAGES/bash.mo
-share/locale/da/LC_MESSAGES/bash.mo
-share/locale/de/LC_MESSAGES/bash.mo
-share/locale/el/LC_MESSAGES/bash.mo
-share/locale/en@boldquot/LC_MESSAGES/bash.mo
-share/locale/en@quot/LC_MESSAGES/bash.mo
-share/locale/eo/LC_MESSAGES/bash.mo
-share/locale/es/LC_MESSAGES/bash.mo
-share/locale/et/LC_MESSAGES/bash.mo
-share/locale/fi/LC_MESSAGES/bash.mo
-share/locale/fr/LC_MESSAGES/bash.mo
-share/locale/ga/LC_MESSAGES/bash.mo
-share/locale/gl/LC_MESSAGES/bash.mo
-share/locale/hr/LC_MESSAGES/bash.mo
-share/locale/hu/LC_MESSAGES/bash.mo
-share/locale/id/LC_MESSAGES/bash.mo
-share/locale/it/LC_MESSAGES/bash.mo
-share/locale/ja/LC_MESSAGES/bash.mo
-share/locale/lt/LC_MESSAGES/bash.mo
-share/locale/nb/LC_MESSAGES/bash.mo
-share/locale/nl/LC_MESSAGES/bash.mo
-share/locale/pl/LC_MESSAGES/bash.mo
-share/locale/pt/LC_MESSAGES/bash.mo
-share/locale/pt_BR/LC_MESSAGES/bash.mo
-share/locale/ro/LC_MESSAGES/bash.mo
-share/locale/ru/LC_MESSAGES/bash.mo
-share/locale/sk/LC_MESSAGES/bash.mo
-share/locale/sl/LC_MESSAGES/bash.mo
-share/locale/sr/LC_MESSAGES/bash.mo
-share/locale/sv/LC_MESSAGES/bash.mo
-share/locale/tr/LC_MESSAGES/bash.mo
-share/locale/uk/LC_MESSAGES/bash.mo
-share/locale/vi/LC_MESSAGES/bash.mo
-share/locale/zh_CN/LC_MESSAGES/bash.mo
-share/locale/zh_TW/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/af/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/bg/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/ca/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/el/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/en@quot/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/eo/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/et/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/fi/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/ga/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/gl/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/hr/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/hu/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/id/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/lt/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/nb/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/nl/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/pt/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/ro/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/sk/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/sl/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/sr/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/bash.mo