Re-add the "locale" files because they will be installed on platforms with

a recent enough version of gettext(3) e.g. Mac OS X or Linux. Dynamically
adjust the package list depending on the configure result.

Bump the package revisions because the package list was incorrect on
various platforms.

2 files changed, 60 insertions, 4 deletions

diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 7ebec88abc3..d916102932b 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2008/11/07 22:01:48 abs Exp $
+# $NetBSD: Makefile,v 1.66 2008/11/09 14:28:17 tron Exp $
 
 DISTNAME=		bison-2.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=bison/}
 EXTRACT_SUFX=		.tar.bz2
@@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gm4:run msgfmt
+USE_TOOLS+=		grep gm4:run msgfmt
 INFO_FILES=		# PLIST
 
 CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libintl=yes
@@ -27,5 +27,16 @@ TEST_TARGET=		check
 pre-build:
 	${TOUCH} ${WRKSRC}/doc/bison.1
 
+# "bison" wants a recent version of "gettext" which at least NetBSD doesn't
+# provide. Figure out whether it will install the locale files or not.
+PLIST_SRC=	${WRKDIR}/PLIST
+
+post-configure:
+	if grep -q '^POSUB = po$$' ${WRKSRC}/Makefile; then		\
+	  ${CP} ${PKGDIR}/PLIST ${PLIST_SRC};				\
+	else								\
+	  ${GREP} -v '^share/locale/' ${PKGDIR}/PLIST >${PLIST_SRC};	\
+	fi
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bison/PLIST b/devel/bison/PLIST
index 6e1c16f8123..4db0efd911c 100644
--- a/devel/bison/PLIST
+++ b/devel/bison/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2008/11/07 12:32:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2008/11/09 14:28:17 tron Exp $
 bin/bison
 info/bison.info
 lib/liby.a
@@ -25,6 +25,51 @@ share/bison/xslt/xml2dot.xsl
 share/bison/xslt/xml2text.xsl
 share/bison/xslt/xml2xhtml.xsl
 share/bison/yacc.c
+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.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/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/hr/LC_MESSAGES/bison-runtime.mo
+share/locale/hr/LC_MESSAGES/bison.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/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_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/sv/LC_MESSAGES/bison-runtime.mo
+share/locale/sv/LC_MESSAGES/bison.mo
+share/locale/tr/LC_MESSAGES/bison-runtime.mo
+share/locale/tr/LC_MESSAGES/bison.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_TW/LC_MESSAGES/bison-runtime.mo
+share/locale/zh_TW/LC_MESSAGES/bison.mo
 @dirrm share/bison/xslt
 @dirrm share/bison/m4sugar
 @dirrm share/bison