Thu Oct 24 11:52:30 2019 UTC ()
bash: make nls support optional

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


(triaxx)
diff -r1.88 -r1.89 pkgsrc/shells/bash/Makefile
diff -r1.9 -r1.10 pkgsrc/shells/bash/PLIST
cvs diff -r1.88 -r1.89 pkgsrc/shells/bash/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/bash/Makefile 2019/09/01 05:59:21 1.88
+++ pkgsrc/shells/bash/Makefile 2019/10/24 11:52:30 1.89
@@ -1,78 +1,64 @@ @@ -1,78 +1,64 @@
1# $NetBSD: Makefile,v 1.88 2019/09/01 05:59:21 kre Exp $ 1# $NetBSD: Makefile,v 1.89 2019/10/24 11:52:30 triaxx Exp $
2 2
3BASH_VERSION= 5.0 3BASH_VERSION= 5.0
4BASH_PATCHLEVEL= 11 4BASH_PATCHLEVEL= 11
5 5
6DISTNAME= bash-${BASH_VERSION} 6DISTNAME= bash-${BASH_VERSION}
7PKGNAME= bash-${BASH_VERSION:C/4\.4\..*/4.4/}.${BASH_PATCHLEVEL} 7PKGNAME= bash-${BASH_VERSION:C/4\.4\..*/4.4/}.${BASH_PATCHLEVEL}
8CATEGORIES= shells 8CATEGORIES= shells
9MASTER_SITES= ${MASTER_SITE_GNU:=bash/} 9MASTER_SITES= ${MASTER_SITE_GNU:=bash/}
10 10
11PATCH_SITES= ${MASTER_SITES:=bash-5.0-patches/} 11PATCH_SITES= ${MASTER_SITES:=bash-5.0-patches/}
12PATCHFILES+= bash50-001 bash50-002 bash50-003 bash50-004 bash50-005 12PATCHFILES+= bash50-001 bash50-002 bash50-003 bash50-004 bash50-005
13PATCHFILES+= bash50-006 bash50-007 bash50-008 bash50-009 bash50-010 13PATCHFILES+= bash50-006 bash50-007 bash50-008 bash50-009 bash50-010
14PATCHFILES+= bash50-011 14PATCHFILES+= bash50-011
15 15
16MAINTAINER= pkgsrc-users@NetBSD.org 16MAINTAINER= pkgsrc-users@NetBSD.org
17HOMEPAGE= http://www.gnu.org/software/bash/bash.html 17HOMEPAGE= http://www.gnu.org/software/bash/bash.html
18COMMENT= The GNU Bourne Again Shell 18COMMENT= The GNU Bourne Again Shell
19LICENSE= gnu-gpl-v3 19LICENSE= gnu-gpl-v3
20 20
21USE_TOOLS+= makeinfo bison 21USE_TOOLS+= makeinfo bison
22USE_PKGLOCALEDIR= yes 
23TEXINFO_REQD= 4.1 22TEXINFO_REQD= 4.1
24GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
25MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} 24MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
26CONFIGURE_ARGS= LOCAL_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:M*:Q} 25CONFIGURE_ARGS= LOCAL_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:M*:Q}
27CPPFLAGS+= -DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${LOCALBASE}/bin:/usr/local/bin\"" 26CPPFLAGS+= -DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${PREFIX}/bin:/usr/local/bin\""
28TEST_TARGET= test 27TEST_TARGET= test
29 28
30PKGCONFIG_OVERRIDE= support/bash.pc.in 29PKGCONFIG_OVERRIDE= support/bash.pc.in
31 30
32INFO_FILES= YES # PLIST 31INFO_FILES= YES # PLIST
33PKG_SHELL= bin/bash 32PKG_SHELL= bin/bash
34INSTALLATION_DIRS= ${PKGMANDIR}/man1 33INSTALLATION_DIRS= ${PKGMANDIR}/man1
35 34
36# All features enabled by default. 35# All features enabled by default.
37CONFIGURE_ARGS+= --enable-readline 36CONFIGURE_ARGS+= --enable-readline
38CONFIGURE_ARGS+= --enable-progcomp 37CONFIGURE_ARGS+= --enable-progcomp
39CONFIGURE_ARGS+= --enable-process-substitution 38CONFIGURE_ARGS+= --enable-process-substitution
40CONFIGURE_ARGS+= --enable-history 39CONFIGURE_ARGS+= --enable-history
41CONFIGURE_ARGS+= --enable-help-builtin 40CONFIGURE_ARGS+= --enable-help-builtin
42CONFIGURE_ARGS+= --enable-extended-glob 41CONFIGURE_ARGS+= --enable-extended-glob
43CONFIGURE_ARGS+= --enable-dparen-arithmetic 42CONFIGURE_ARGS+= --enable-dparen-arithmetic
44CONFIGURE_ARGS+= --enable-directory-stack 43CONFIGURE_ARGS+= --enable-directory-stack
45CONFIGURE_ARGS+= --enable-debugger 44CONFIGURE_ARGS+= --enable-debugger
46CONFIGURE_ARGS+= --enable-cond-regexp 45CONFIGURE_ARGS+= --enable-cond-regexp
47CONFIGURE_ARGS+= --enable-alias 46CONFIGURE_ARGS+= --enable-alias
48CONFIGURE_ARGS+= --enable-brace-expansion 47CONFIGURE_ARGS+= --enable-brace-expansion
49CONFIGURE_ARGS+= --enable-array-variables 48CONFIGURE_ARGS+= --enable-array-variables
50 49
51.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
52 51.include "options.mk"
53PKG_OPTIONS_VAR= PKG_OPTIONS.bash 
54PKG_SUPPORTED_OPTIONS= #static XXX 2017-11-20 broken 
55 
56.include "../../mk/bsd.options.mk" 
57 
58## 
59## Static link 
60## 
61.if !empty(PKG_OPTIONS:Mstatic) 
62CONFIGURE_ARGS+= --enable-static-link 
63BUILDLINK_DEPMETHOD.gettext= build 
64BUILDLINK_DEPMETHOD.readline= build 
65.endif 
66 52
67# Minix lacks setpgid() which is needed for job control. 53# Minix lacks setpgid() which is needed for job control.
68# bash malloc() is also broken on Minix 54# bash malloc() is also broken on Minix
69.if ${OPSYS} == "Minix" 55.if ${OPSYS} == "Minix"
70CONFIGURE_ARGS+= --disable-job-control 56CONFIGURE_ARGS+= --disable-job-control
71CONFIGURE_ARGS+= --with-bash-malloc=no 57CONFIGURE_ARGS+= --with-bash-malloc=no
72.else 58.else
73CONFIGURE_ARGS+= --enable-job-control 59CONFIGURE_ARGS+= --enable-job-control
74.endif 60.endif
75 61
76# Use "readline" package on Darwin to avoid link erros. 62# Use "readline" package on Darwin to avoid link erros.
77.if ${OPSYS} == "Darwin" 63.if ${OPSYS} == "Darwin"
78CONFIGURE_ARGS+= --with-installed-readline 64CONFIGURE_ARGS+= --with-installed-readline
@@ -94,15 +80,14 @@ CONFIGURE_ENV+= bash_cv_sys_named_pipes @@ -94,15 +80,14 @@ CONFIGURE_ENV+= bash_cv_sys_named_pipes
94CONFIGURE_ENV+= bash_cv_unusable_rtsigs=no 80CONFIGURE_ENV+= bash_cv_unusable_rtsigs=no
95CONFIGURE_ENV+= bash_cv_func_ctype_nonascii=yes 81CONFIGURE_ENV+= bash_cv_func_ctype_nonascii=yes
96CONFIGURE_ENV+= bash_cv_wexitstatus_offset=8 82CONFIGURE_ENV+= bash_cv_wexitstatus_offset=8
97.endif 83.endif
98 84
99pre-configure: 85pre-configure:
100 ${RM} -f ${WRKSRC}/y.tab.c 86 ${RM} -f ${WRKSRC}/y.tab.c
101 87
102post-install: 88post-install:
103 ${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 89 ${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
104 ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 90 ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
105 91
106.include "../../mk/termcap.buildlink3.mk" 92.include "../../mk/termcap.buildlink3.mk"
107.include "../../devel/gettext-lib/buildlink3.mk" 
108.include "../../mk/bsd.pkg.mk" 93.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/shells/bash/PLIST (expand / switch to unified diff)

--- pkgsrc/shells/bash/PLIST 2019/01/08 16:24:42 1.9
+++ pkgsrc/shells/bash/PLIST 2019/10/24 11:52:30 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.9 2019/01/08 16:24:42 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.10 2019/10/24 11:52:30 triaxx Exp $
2bin/bash 2bin/bash
3bin/bashbug 3bin/bashbug
4include/bash/alias.h 4include/bash/alias.h
5include/bash/array.h 5include/bash/array.h
6include/bash/arrayfunc.h 6include/bash/arrayfunc.h
7include/bash/assoc.h 7include/bash/assoc.h
8include/bash/bashansi.h 8include/bash/bashansi.h
9include/bash/bashintl.h 9include/bash/bashintl.h
10include/bash/bashjmp.h 10include/bash/bashjmp.h
11include/bash/bashtypes.h 11include/bash/bashtypes.h
12include/bash/builtins.h 12include/bash/builtins.h
13include/bash/builtins/bashgetopt.h 13include/bash/builtins/bashgetopt.h
14include/bash/builtins/builtext.h 14include/bash/builtins/builtext.h
@@ -92,51 +92,51 @@ lib/bash/whoami @@ -92,51 +92,51 @@ lib/bash/whoami
92lib/pkgconfig/bash.pc 92lib/pkgconfig/bash.pc
93man/man1/bash.1 93man/man1/bash.1
94man/man1/bashbug.1 94man/man1/bashbug.1
95share/doc/bash/CHANGES 95share/doc/bash/CHANGES
96share/doc/bash/COMPAT 96share/doc/bash/COMPAT
97share/doc/bash/FAQ 97share/doc/bash/FAQ
98share/doc/bash/INTRO 98share/doc/bash/INTRO
99share/doc/bash/NEWS 99share/doc/bash/NEWS
100share/doc/bash/POSIX 100share/doc/bash/POSIX
101share/doc/bash/RBASH 101share/doc/bash/RBASH
102share/doc/bash/README 102share/doc/bash/README
103share/doc/bash/bash.html 103share/doc/bash/bash.html
104share/doc/bash/bashref.html 104share/doc/bash/bashref.html
105share/locale/af/LC_MESSAGES/bash.mo 105${PLIST.nls}share/locale/af/LC_MESSAGES/bash.mo
106share/locale/bg/LC_MESSAGES/bash.mo 106${PLIST.nls}share/locale/bg/LC_MESSAGES/bash.mo
107share/locale/ca/LC_MESSAGES/bash.mo 107${PLIST.nls}share/locale/ca/LC_MESSAGES/bash.mo
108share/locale/cs/LC_MESSAGES/bash.mo 108${PLIST.nls}share/locale/cs/LC_MESSAGES/bash.mo
109share/locale/da/LC_MESSAGES/bash.mo 109${PLIST.nls}share/locale/da/LC_MESSAGES/bash.mo
110share/locale/de/LC_MESSAGES/bash.mo 110${PLIST.nls}share/locale/de/LC_MESSAGES/bash.mo
111share/locale/el/LC_MESSAGES/bash.mo 111${PLIST.nls}share/locale/el/LC_MESSAGES/bash.mo
112share/locale/en@boldquot/LC_MESSAGES/bash.mo 112${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/bash.mo
113share/locale/en@quot/LC_MESSAGES/bash.mo 113${PLIST.nls}share/locale/en@quot/LC_MESSAGES/bash.mo
114share/locale/eo/LC_MESSAGES/bash.mo 114${PLIST.nls}share/locale/eo/LC_MESSAGES/bash.mo
115share/locale/es/LC_MESSAGES/bash.mo 115${PLIST.nls}share/locale/es/LC_MESSAGES/bash.mo
116share/locale/et/LC_MESSAGES/bash.mo 116${PLIST.nls}share/locale/et/LC_MESSAGES/bash.mo
117share/locale/fi/LC_MESSAGES/bash.mo 117${PLIST.nls}share/locale/fi/LC_MESSAGES/bash.mo
118share/locale/fr/LC_MESSAGES/bash.mo 118${PLIST.nls}share/locale/fr/LC_MESSAGES/bash.mo
119share/locale/ga/LC_MESSAGES/bash.mo 119${PLIST.nls}share/locale/ga/LC_MESSAGES/bash.mo
120share/locale/gl/LC_MESSAGES/bash.mo 120${PLIST.nls}share/locale/gl/LC_MESSAGES/bash.mo
121share/locale/hr/LC_MESSAGES/bash.mo 121${PLIST.nls}share/locale/hr/LC_MESSAGES/bash.mo
122share/locale/hu/LC_MESSAGES/bash.mo 122${PLIST.nls}share/locale/hu/LC_MESSAGES/bash.mo
123share/locale/id/LC_MESSAGES/bash.mo 123${PLIST.nls}share/locale/id/LC_MESSAGES/bash.mo
124share/locale/it/LC_MESSAGES/bash.mo 124${PLIST.nls}share/locale/it/LC_MESSAGES/bash.mo
125share/locale/ja/LC_MESSAGES/bash.mo 125${PLIST.nls}share/locale/ja/LC_MESSAGES/bash.mo
126share/locale/lt/LC_MESSAGES/bash.mo 126${PLIST.nls}share/locale/lt/LC_MESSAGES/bash.mo
127share/locale/nb/LC_MESSAGES/bash.mo 127${PLIST.nls}share/locale/nb/LC_MESSAGES/bash.mo
128share/locale/nl/LC_MESSAGES/bash.mo 128${PLIST.nls}share/locale/nl/LC_MESSAGES/bash.mo
129share/locale/pl/LC_MESSAGES/bash.mo 129${PLIST.nls}share/locale/pl/LC_MESSAGES/bash.mo
130share/locale/pt/LC_MESSAGES/bash.mo 130${PLIST.nls}share/locale/pt/LC_MESSAGES/bash.mo
131share/locale/pt_BR/LC_MESSAGES/bash.mo 131${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/bash.mo
132share/locale/ro/LC_MESSAGES/bash.mo 132${PLIST.nls}share/locale/ro/LC_MESSAGES/bash.mo
133share/locale/ru/LC_MESSAGES/bash.mo 133${PLIST.nls}share/locale/ru/LC_MESSAGES/bash.mo
134share/locale/sk/LC_MESSAGES/bash.mo 134${PLIST.nls}share/locale/sk/LC_MESSAGES/bash.mo
135share/locale/sl/LC_MESSAGES/bash.mo 135${PLIST.nls}share/locale/sl/LC_MESSAGES/bash.mo
136share/locale/sr/LC_MESSAGES/bash.mo 136${PLIST.nls}share/locale/sr/LC_MESSAGES/bash.mo
137share/locale/sv/LC_MESSAGES/bash.mo 137${PLIST.nls}share/locale/sv/LC_MESSAGES/bash.mo
138share/locale/tr/LC_MESSAGES/bash.mo 138${PLIST.nls}share/locale/tr/LC_MESSAGES/bash.mo
139share/locale/uk/LC_MESSAGES/bash.mo 139${PLIST.nls}share/locale/uk/LC_MESSAGES/bash.mo
140share/locale/vi/LC_MESSAGES/bash.mo 140${PLIST.nls}share/locale/vi/LC_MESSAGES/bash.mo
141share/locale/zh_CN/LC_MESSAGES/bash.mo 141${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/bash.mo
142share/locale/zh_TW/LC_MESSAGES/bash.mo 142${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/bash.mo