[pkgsrc/trunk]: pkgsrc/devel/bison bison: make nls support optional

[triaxx <triaxx%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2422ea3e86cf
branches:  trunk
changeset: 342653:2422ea3e86cf
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Wed Oct 23 11:58:01 2019 +0000

description:
bison: make nls support optional

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

diffstat:

 devel/bison/Makefile   |   13 ++--
 devel/bison/PLIST      |  138 ++++++++++++++++++++++++------------------------
 devel/bison/options.mk |   22 +++++++
 3 files changed, 98 insertions(+), 75 deletions(-)

diffs (221 lines):

diff -r e6e603435f4c -r 2422ea3e86cf devel/bison/Makefile
--- a/devel/bison/Makefile      Wed Oct 23 10:39:30 2019 +0000
+++ b/devel/bison/Makefile      Wed Oct 23 11:58:01 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2019/08/11 13:18:39 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2019/10/23 11:58:01 triaxx Exp $
 
 DISTNAME=      bison-3.2.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=bison/}
 EXTRACT_SUFX=  .tar.xz
@@ -12,13 +12,13 @@
 LICENSE=       gnu-gpl-v3
 
 USE_LANGUAGES=         c c++
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            grep gm4:run msgfmt flex perl:build
+USE_TOOLS+=            grep gm4:run flex perl:build
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-yacc
-CONFIGURE_ENV+=                gt_cv_func_gnugettext1_libintl=yes
 CONFIGURE_ENV+=                ac_cv_prog_M4=${TOOLS_PATH.gm4}
 
+.include "options.mk"
+
 INFO_FILES=            yes
 TEST_TARGET=           check
 REPLACE_PERL+=         examples/extexi
@@ -33,6 +33,7 @@
 # "bison" wants a recent version of "gettext" which at least some
 # NetBSD versions don't provide. Figure out whether it will install
 # the locale files or not.
+.if !empty(PKG_OPTIONS:Mnls)
 PLIST_SRC=     ${WRKDIR}/PLIST
 
 post-configure:
@@ -41,6 +42,6 @@
        else                                                            \
          ${GREP} -v '^share/locale/' ${PKGDIR}/PLIST >${PLIST_SRC};    \
        fi
+.endif
 
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e6e603435f4c -r 2422ea3e86cf devel/bison/PLIST
--- a/devel/bison/PLIST Wed Oct 23 10:39:30 2019 +0000
+++ b/devel/bison/PLIST Wed Oct 23 11:58:01 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2019/02/13 20:05:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.31 2019/10/23 11:58:01 triaxx Exp $
 bin/bison
 info/bison.info
 man/man1/bison.1
@@ -48,71 +48,71 @@
 share/doc/bison/examples/mfcalc/calc.h
 share/doc/bison/examples/mfcalc/mfcalc.y
 share/doc/bison/examples/rpcalc/rpcalc.y
-share/locale/ast/LC_MESSAGES/bison-runtime.mo
-share/locale/ca/LC_MESSAGES/bison-runtime.mo
-share/locale/ca/LC_MESSAGES/bison.mo
-share/locale/da/LC_MESSAGES/bison-runtime.mo
-share/locale/da/LC_MESSAGES/bison.mo
-share/locale/de/LC_MESSAGES/bison-runtime.mo
-share/locale/de/LC_MESSAGES/bison.mo
-share/locale/el/LC_MESSAGES/bison-runtime.mo
-share/locale/el/LC_MESSAGES/bison.mo
-share/locale/eo/LC_MESSAGES/bison-runtime.mo
-share/locale/eo/LC_MESSAGES/bison.mo
-share/locale/es/LC_MESSAGES/bison-runtime.mo
-share/locale/es/LC_MESSAGES/bison.mo
-share/locale/et/LC_MESSAGES/bison-runtime.mo
-share/locale/et/LC_MESSAGES/bison.mo
-share/locale/fi/LC_MESSAGES/bison-runtime.mo
-share/locale/fi/LC_MESSAGES/bison.mo
-share/locale/fr/LC_MESSAGES/bison-runtime.mo
-share/locale/fr/LC_MESSAGES/bison.mo
-share/locale/ga/LC_MESSAGES/bison-runtime.mo
-share/locale/ga/LC_MESSAGES/bison.mo
-share/locale/gl/LC_MESSAGES/bison-runtime.mo
-share/locale/hr/LC_MESSAGES/bison-runtime.mo
-share/locale/hr/LC_MESSAGES/bison.mo
-share/locale/hu/LC_MESSAGES/bison-runtime.mo
-share/locale/ia/LC_MESSAGES/bison-runtime.mo
-share/locale/id/LC_MESSAGES/bison-runtime.mo
-share/locale/id/LC_MESSAGES/bison.mo
-share/locale/it/LC_MESSAGES/bison-runtime.mo
-share/locale/it/LC_MESSAGES/bison.mo
-share/locale/ja/LC_MESSAGES/bison-runtime.mo
-share/locale/ja/LC_MESSAGES/bison.mo
-share/locale/ky/LC_MESSAGES/bison-runtime.mo
-share/locale/lt/LC_MESSAGES/bison-runtime.mo
-share/locale/lv/LC_MESSAGES/bison-runtime.mo
-share/locale/ms/LC_MESSAGES/bison-runtime.mo
-share/locale/ms/LC_MESSAGES/bison.mo
-share/locale/nb/LC_MESSAGES/bison-runtime.mo
-share/locale/nb/LC_MESSAGES/bison.mo
-share/locale/nl/LC_MESSAGES/bison-runtime.mo
-share/locale/nl/LC_MESSAGES/bison.mo
-share/locale/pl/LC_MESSAGES/bison-runtime.mo
-share/locale/pl/LC_MESSAGES/bison.mo
-share/locale/pt/LC_MESSAGES/bison-runtime.mo
-share/locale/pt/LC_MESSAGES/bison.mo
-share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo
-share/locale/pt_BR/LC_MESSAGES/bison.mo
-share/locale/ro/LC_MESSAGES/bison-runtime.mo
-share/locale/ro/LC_MESSAGES/bison.mo
-share/locale/ru/LC_MESSAGES/bison-runtime.mo
-share/locale/ru/LC_MESSAGES/bison.mo
-share/locale/sl/LC_MESSAGES/bison-runtime.mo
-share/locale/sq/LC_MESSAGES/bison-runtime.mo
-share/locale/sr/LC_MESSAGES/bison-runtime.mo
-share/locale/sr/LC_MESSAGES/bison.mo
-share/locale/sv/LC_MESSAGES/bison-runtime.mo
-share/locale/sv/LC_MESSAGES/bison.mo
-share/locale/th/LC_MESSAGES/bison-runtime.mo
-share/locale/tr/LC_MESSAGES/bison-runtime.mo
-share/locale/tr/LC_MESSAGES/bison.mo
-share/locale/uk/LC_MESSAGES/bison-runtime.mo
-share/locale/uk/LC_MESSAGES/bison.mo
-share/locale/vi/LC_MESSAGES/bison-runtime.mo
-share/locale/vi/LC_MESSAGES/bison.mo
-share/locale/zh_CN/LC_MESSAGES/bison-runtime.mo
-share/locale/zh_CN/LC_MESSAGES/bison.mo
-share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
-share/locale/zh_TW/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/ast/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/ca/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/ca/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/el/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/el/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/eo/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/eo/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/et/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/et/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/fi/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/fi/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/ga/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/ga/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/gl/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/hr/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/hr/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/hu/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/ia/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/id/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/id/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/ky/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/lt/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/lv/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/ms/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/ms/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/nb/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/nb/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/nl/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/nl/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/pt/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/pt/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/ro/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/ro/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/sl/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/sq/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/sr/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/sr/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/th/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/bison.mo
+${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
+${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/bison.mo
diff -r e6e603435f4c -r 2422ea3e86cf devel/bison/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/bison/options.mk    Wed Oct 23 11:58:01 2019 +0000
@@ -0,0 +1,22 @@
+# $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