Wed Oct 23 11:58:01 2019 UTC ()
bison: make nls support optional

pkgsrc changes:
---------------
- add option for nls disabled by default (consistency with gmake)
- bump revision


(triaxx)
diff -r1.107 -r1.108 pkgsrc/devel/bison/Makefile
diff -r1.30 -r1.31 pkgsrc/devel/bison/PLIST
diff -r0 -r1.1 pkgsrc/devel/bison/options.mk
cvs diff -r1.107 -r1.108 pkgsrc/devel/bison/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/bison/Makefile 2019/08/11 13:18:39 1.107
+++ pkgsrc/devel/bison/Makefile 2019/10/23 11:58:01 1.108
@@ -1,46 +1,47 @@ @@ -1,46 +1,47 @@
1# $NetBSD: Makefile,v 1.107 2019/08/11 13:18:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.108 2019/10/23 11:58:01 triaxx Exp $
2 2
3DISTNAME= bison-3.2.4 3DISTNAME= bison-3.2.4
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GNU:=bison/} 6MASTER_SITES= ${MASTER_SITE_GNU:=bison/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnu.org/software/bison/bison.html 10HOMEPAGE= http://www.gnu.org/software/bison/bison.html
11COMMENT= GNU yacc(1) replacement 11COMMENT= GNU yacc(1) replacement
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_PKGLOCALEDIR= yes 15USE_TOOLS+= grep gm4:run flex perl:build
16USE_TOOLS+= grep gm4:run msgfmt flex perl:build 
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
18CONFIGURE_ARGS+= --disable-yacc 17CONFIGURE_ARGS+= --disable-yacc
19CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes 
20CONFIGURE_ENV+= ac_cv_prog_M4=${TOOLS_PATH.gm4} 18CONFIGURE_ENV+= ac_cv_prog_M4=${TOOLS_PATH.gm4}
21 19
 20.include "options.mk"
 21
22INFO_FILES= yes 22INFO_FILES= yes
23TEST_TARGET= check 23TEST_TARGET= check
24REPLACE_PERL+= examples/extexi 24REPLACE_PERL+= examples/extexi
25REPLACE_SH+= examples/test examples/*/*.test 25REPLACE_SH+= examples/test examples/*/*.test
26 26
27CONFIGURE_ARGS.Cygwin+= ac_cv_func___fpending=yes 27CONFIGURE_ARGS.Cygwin+= ac_cv_func___fpending=yes
28 28
29# Avoid rebuilding manpage 29# Avoid rebuilding manpage
30pre-build: 30pre-build:
31 ${TOUCH} ${WRKSRC}/doc/bison.1 31 ${TOUCH} ${WRKSRC}/doc/bison.1
32 32
33# "bison" wants a recent version of "gettext" which at least some 33# "bison" wants a recent version of "gettext" which at least some
34# NetBSD versions don't provide. Figure out whether it will install 34# NetBSD versions don't provide. Figure out whether it will install
35# the locale files or not. 35# the locale files or not.
 36.if !empty(PKG_OPTIONS:Mnls)
36PLIST_SRC= ${WRKDIR}/PLIST 37PLIST_SRC= ${WRKDIR}/PLIST
37 38
38post-configure: 39post-configure:
39 if grep -q '^POSUB = po$$' ${WRKSRC}/Makefile; then \ 40 if grep -q '^POSUB = po$$' ${WRKSRC}/Makefile; then \
40 ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}; \ 41 ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}; \
41 else \ 42 else \
42 ${GREP} -v '^share/locale/' ${PKGDIR}/PLIST >${PLIST_SRC}; \ 43 ${GREP} -v '^share/locale/' ${PKGDIR}/PLIST >${PLIST_SRC}; \
43 fi 44 fi
 45.endif
44 46
45.include "../../devel/gettext-lib/buildlink3.mk" 
46.include "../../mk/bsd.pkg.mk" 47.include "../../mk/bsd.pkg.mk"
cvs diff -r1.30 -r1.31 pkgsrc/devel/bison/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/bison/PLIST 2019/02/13 20:05:14 1.30
+++ pkgsrc/devel/bison/PLIST 2019/10/23 11:58:01 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.30 2019/02/13 20:05:14 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.31 2019/10/23 11:58:01 triaxx Exp $
2bin/bison 2bin/bison
3info/bison.info 3info/bison.info
4man/man1/bison.1 4man/man1/bison.1
5share/aclocal/bison-i18n.m4 5share/aclocal/bison-i18n.m4
6share/bison/README 6share/bison/README
7share/bison/bison.m4 7share/bison/bison.m4
8share/bison/c++-skel.m4 8share/bison/c++-skel.m4
9share/bison/c++.m4 9share/bison/c++.m4
10share/bison/c-like.m4 10share/bison/c-like.m4
11share/bison/c-skel.m4 11share/bison/c-skel.m4
12share/bison/c.m4 12share/bison/c.m4
13share/bison/glr.c 13share/bison/glr.c
14share/bison/glr.cc 14share/bison/glr.cc
@@ -38,81 +38,81 @@ share/doc/bison/examples/c++/README @@ -38,81 +38,81 @@ share/doc/bison/examples/c++/README
38share/doc/bison/examples/c++/simple.yy 38share/doc/bison/examples/c++/simple.yy
39share/doc/bison/examples/c++/variant-11.yy 39share/doc/bison/examples/c++/variant-11.yy
40share/doc/bison/examples/c++/variant.yy 40share/doc/bison/examples/c++/variant.yy
41share/doc/bison/examples/calc++/Makefile 41share/doc/bison/examples/calc++/Makefile
42share/doc/bison/examples/calc++/README 42share/doc/bison/examples/calc++/README
43share/doc/bison/examples/calc++/calc++.cc 43share/doc/bison/examples/calc++/calc++.cc
44share/doc/bison/examples/calc++/driver.cc 44share/doc/bison/examples/calc++/driver.cc
45share/doc/bison/examples/calc++/driver.hh 45share/doc/bison/examples/calc++/driver.hh
46share/doc/bison/examples/calc++/parser.yy 46share/doc/bison/examples/calc++/parser.yy
47share/doc/bison/examples/calc++/scanner.ll 47share/doc/bison/examples/calc++/scanner.ll
48share/doc/bison/examples/mfcalc/calc.h 48share/doc/bison/examples/mfcalc/calc.h
49share/doc/bison/examples/mfcalc/mfcalc.y 49share/doc/bison/examples/mfcalc/mfcalc.y
50share/doc/bison/examples/rpcalc/rpcalc.y 50share/doc/bison/examples/rpcalc/rpcalc.y
51share/locale/ast/LC_MESSAGES/bison-runtime.mo 51${PLIST.nls}share/locale/ast/LC_MESSAGES/bison-runtime.mo
52share/locale/ca/LC_MESSAGES/bison-runtime.mo 52${PLIST.nls}share/locale/ca/LC_MESSAGES/bison-runtime.mo
53share/locale/ca/LC_MESSAGES/bison.mo 53${PLIST.nls}share/locale/ca/LC_MESSAGES/bison.mo
54share/locale/da/LC_MESSAGES/bison-runtime.mo 54${PLIST.nls}share/locale/da/LC_MESSAGES/bison-runtime.mo
55share/locale/da/LC_MESSAGES/bison.mo 55${PLIST.nls}share/locale/da/LC_MESSAGES/bison.mo
56share/locale/de/LC_MESSAGES/bison-runtime.mo 56${PLIST.nls}share/locale/de/LC_MESSAGES/bison-runtime.mo
57share/locale/de/LC_MESSAGES/bison.mo 57${PLIST.nls}share/locale/de/LC_MESSAGES/bison.mo
58share/locale/el/LC_MESSAGES/bison-runtime.mo 58${PLIST.nls}share/locale/el/LC_MESSAGES/bison-runtime.mo
59share/locale/el/LC_MESSAGES/bison.mo 59${PLIST.nls}share/locale/el/LC_MESSAGES/bison.mo
60share/locale/eo/LC_MESSAGES/bison-runtime.mo 60${PLIST.nls}share/locale/eo/LC_MESSAGES/bison-runtime.mo
61share/locale/eo/LC_MESSAGES/bison.mo 61${PLIST.nls}share/locale/eo/LC_MESSAGES/bison.mo
62share/locale/es/LC_MESSAGES/bison-runtime.mo 62${PLIST.nls}share/locale/es/LC_MESSAGES/bison-runtime.mo
63share/locale/es/LC_MESSAGES/bison.mo 63${PLIST.nls}share/locale/es/LC_MESSAGES/bison.mo
64share/locale/et/LC_MESSAGES/bison-runtime.mo 64${PLIST.nls}share/locale/et/LC_MESSAGES/bison-runtime.mo
65share/locale/et/LC_MESSAGES/bison.mo 65${PLIST.nls}share/locale/et/LC_MESSAGES/bison.mo
66share/locale/fi/LC_MESSAGES/bison-runtime.mo 66${PLIST.nls}share/locale/fi/LC_MESSAGES/bison-runtime.mo
67share/locale/fi/LC_MESSAGES/bison.mo 67${PLIST.nls}share/locale/fi/LC_MESSAGES/bison.mo
68share/locale/fr/LC_MESSAGES/bison-runtime.mo 68${PLIST.nls}share/locale/fr/LC_MESSAGES/bison-runtime.mo
69share/locale/fr/LC_MESSAGES/bison.mo 69${PLIST.nls}share/locale/fr/LC_MESSAGES/bison.mo
70share/locale/ga/LC_MESSAGES/bison-runtime.mo 70${PLIST.nls}share/locale/ga/LC_MESSAGES/bison-runtime.mo
71share/locale/ga/LC_MESSAGES/bison.mo 71${PLIST.nls}share/locale/ga/LC_MESSAGES/bison.mo
72share/locale/gl/LC_MESSAGES/bison-runtime.mo 72${PLIST.nls}share/locale/gl/LC_MESSAGES/bison-runtime.mo
73share/locale/hr/LC_MESSAGES/bison-runtime.mo 73${PLIST.nls}share/locale/hr/LC_MESSAGES/bison-runtime.mo
74share/locale/hr/LC_MESSAGES/bison.mo 74${PLIST.nls}share/locale/hr/LC_MESSAGES/bison.mo
75share/locale/hu/LC_MESSAGES/bison-runtime.mo 75${PLIST.nls}share/locale/hu/LC_MESSAGES/bison-runtime.mo
76share/locale/ia/LC_MESSAGES/bison-runtime.mo 76${PLIST.nls}share/locale/ia/LC_MESSAGES/bison-runtime.mo
77share/locale/id/LC_MESSAGES/bison-runtime.mo 77${PLIST.nls}share/locale/id/LC_MESSAGES/bison-runtime.mo
78share/locale/id/LC_MESSAGES/bison.mo 78${PLIST.nls}share/locale/id/LC_MESSAGES/bison.mo
79share/locale/it/LC_MESSAGES/bison-runtime.mo 79${PLIST.nls}share/locale/it/LC_MESSAGES/bison-runtime.mo
80share/locale/it/LC_MESSAGES/bison.mo 80${PLIST.nls}share/locale/it/LC_MESSAGES/bison.mo
81share/locale/ja/LC_MESSAGES/bison-runtime.mo 81${PLIST.nls}share/locale/ja/LC_MESSAGES/bison-runtime.mo
82share/locale/ja/LC_MESSAGES/bison.mo 82${PLIST.nls}share/locale/ja/LC_MESSAGES/bison.mo
83share/locale/ky/LC_MESSAGES/bison-runtime.mo 83${PLIST.nls}share/locale/ky/LC_MESSAGES/bison-runtime.mo
84share/locale/lt/LC_MESSAGES/bison-runtime.mo 84${PLIST.nls}share/locale/lt/LC_MESSAGES/bison-runtime.mo
85share/locale/lv/LC_MESSAGES/bison-runtime.mo 85${PLIST.nls}share/locale/lv/LC_MESSAGES/bison-runtime.mo
86share/locale/ms/LC_MESSAGES/bison-runtime.mo 86${PLIST.nls}share/locale/ms/LC_MESSAGES/bison-runtime.mo
87share/locale/ms/LC_MESSAGES/bison.mo 87${PLIST.nls}share/locale/ms/LC_MESSAGES/bison.mo
88share/locale/nb/LC_MESSAGES/bison-runtime.mo 88${PLIST.nls}share/locale/nb/LC_MESSAGES/bison-runtime.mo
89share/locale/nb/LC_MESSAGES/bison.mo 89${PLIST.nls}share/locale/nb/LC_MESSAGES/bison.mo
90share/locale/nl/LC_MESSAGES/bison-runtime.mo 90${PLIST.nls}share/locale/nl/LC_MESSAGES/bison-runtime.mo
91share/locale/nl/LC_MESSAGES/bison.mo 91${PLIST.nls}share/locale/nl/LC_MESSAGES/bison.mo
92share/locale/pl/LC_MESSAGES/bison-runtime.mo 92${PLIST.nls}share/locale/pl/LC_MESSAGES/bison-runtime.mo
93share/locale/pl/LC_MESSAGES/bison.mo 93${PLIST.nls}share/locale/pl/LC_MESSAGES/bison.mo
94share/locale/pt/LC_MESSAGES/bison-runtime.mo 94${PLIST.nls}share/locale/pt/LC_MESSAGES/bison-runtime.mo
95share/locale/pt/LC_MESSAGES/bison.mo 95${PLIST.nls}share/locale/pt/LC_MESSAGES/bison.mo
96share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo 96${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo
97share/locale/pt_BR/LC_MESSAGES/bison.mo 97${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/bison.mo
98share/locale/ro/LC_MESSAGES/bison-runtime.mo 98${PLIST.nls}share/locale/ro/LC_MESSAGES/bison-runtime.mo
99share/locale/ro/LC_MESSAGES/bison.mo 99${PLIST.nls}share/locale/ro/LC_MESSAGES/bison.mo
100share/locale/ru/LC_MESSAGES/bison-runtime.mo 100${PLIST.nls}share/locale/ru/LC_MESSAGES/bison-runtime.mo
101share/locale/ru/LC_MESSAGES/bison.mo 101${PLIST.nls}share/locale/ru/LC_MESSAGES/bison.mo
102share/locale/sl/LC_MESSAGES/bison-runtime.mo 102${PLIST.nls}share/locale/sl/LC_MESSAGES/bison-runtime.mo
103share/locale/sq/LC_MESSAGES/bison-runtime.mo 103${PLIST.nls}share/locale/sq/LC_MESSAGES/bison-runtime.mo
104share/locale/sr/LC_MESSAGES/bison-runtime.mo 104${PLIST.nls}share/locale/sr/LC_MESSAGES/bison-runtime.mo
105share/locale/sr/LC_MESSAGES/bison.mo 105${PLIST.nls}share/locale/sr/LC_MESSAGES/bison.mo
106share/locale/sv/LC_MESSAGES/bison-runtime.mo 106${PLIST.nls}share/locale/sv/LC_MESSAGES/bison-runtime.mo
107share/locale/sv/LC_MESSAGES/bison.mo 107${PLIST.nls}share/locale/sv/LC_MESSAGES/bison.mo
108share/locale/th/LC_MESSAGES/bison-runtime.mo 108${PLIST.nls}share/locale/th/LC_MESSAGES/bison-runtime.mo
109share/locale/tr/LC_MESSAGES/bison-runtime.mo 109${PLIST.nls}share/locale/tr/LC_MESSAGES/bison-runtime.mo
110share/locale/tr/LC_MESSAGES/bison.mo 110${PLIST.nls}share/locale/tr/LC_MESSAGES/bison.mo
111share/locale/uk/LC_MESSAGES/bison-runtime.mo 111${PLIST.nls}share/locale/uk/LC_MESSAGES/bison-runtime.mo
112share/locale/uk/LC_MESSAGES/bison.mo 112${PLIST.nls}share/locale/uk/LC_MESSAGES/bison.mo
113share/locale/vi/LC_MESSAGES/bison-runtime.mo 113${PLIST.nls}share/locale/vi/LC_MESSAGES/bison-runtime.mo
114share/locale/vi/LC_MESSAGES/bison.mo 114${PLIST.nls}share/locale/vi/LC_MESSAGES/bison.mo
115share/locale/zh_CN/LC_MESSAGES/bison-runtime.mo 115${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/bison-runtime.mo
116share/locale/zh_CN/LC_MESSAGES/bison.mo 116${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/bison.mo
117share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo 117${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
118share/locale/zh_TW/LC_MESSAGES/bison.mo 118${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/bison.mo
File Added: pkgsrc/devel/bison/options.mk
# $NetBSD: options.mk,v 1.1 2019/10/23 11:58:01 triaxx Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.bison
PKG_SUPPORTED_OPTIONS=	nls

PLIST_VARS+=		nls

.include "../../mk/bsd.options.mk"

###
### NLS support
###
.if !empty(PKG_OPTIONS:Mnls)
USE_PKGLOCALEDIR=	yes
USE_TOOLS+=		msgfmt
CONFIGURE_ARG+=		--enable-nls
CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libintl=yes
.include "../../devel/gettext-lib/buildlink3.mk"
PLIST.nls=		yes
.else
CONFIGURE_ARG+=		--disable-nls
.endif