Received: by mail.netbsd.org (Postfix, from userid 605) id BAF4F84D88; Wed, 23 Oct 2019 11:58:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 43A7B84D82 for ; Wed, 23 Oct 2019 11:58:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ubnTG77fHGw6 for ; Wed, 23 Oct 2019 11:58:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 634A184D26 for ; Wed, 23 Oct 2019 11:58:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5D59DFA81; Wed, 23 Oct 2019 11:58:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157183188189660" MIME-Version: 1.0 Date: Wed, 23 Oct 2019 11:58:01 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/devel/bison To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20191023115801.5D59DFA81@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157183188189660 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Wed Oct 23 11:58:01 UTC 2019 Modified Files: pkgsrc/devel/bison: Makefile PLIST Added Files: pkgsrc/devel/bison: options.mk Log Message: bison: make nls support optional pkgsrc changes: --------------- - add option for nls disabled by default (consistency with gmake) - bump revision To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 pkgsrc/devel/bison/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/bison/PLIST cvs rdiff -u -r0 -r1.1 pkgsrc/devel/bison/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157183188189660 Content-Disposition: inline Content-Length: 9421 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/bison/Makefile diff -u pkgsrc/devel/bison/Makefile:1.107 pkgsrc/devel/bison/Makefile:1.108 --- pkgsrc/devel/bison/Makefile:1.107 Sun Aug 11 13:18:39 2019 +++ pkgsrc/devel/bison/Makefile Wed Oct 23 11:58:01 2019 @@ -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 @@ COMMENT= GNU yacc(1) replacement 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 @@ pre-build: # "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 @@ post-configure: else \ ${GREP} -v '^share/locale/' ${PKGDIR}/PLIST >${PLIST_SRC}; \ fi +.endif -.include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/bison/PLIST diff -u pkgsrc/devel/bison/PLIST:1.30 pkgsrc/devel/bison/PLIST:1.31 --- pkgsrc/devel/bison/PLIST:1.30 Wed Feb 13 20:05:14 2019 +++ pkgsrc/devel/bison/PLIST Wed Oct 23 11:58:01 2019 @@ -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/calc++/scanner. 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 Added files: Index: pkgsrc/devel/bison/options.mk diff -u /dev/null pkgsrc/devel/bison/options.mk:1.1 --- /dev/null Wed Oct 23 11:58:01 2019 +++ pkgsrc/devel/bison/options.mk Wed Oct 23 11:58:01 2019 @@ -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 --_----------=_157183188189660--