Use ${PKGLOCALEDIR} to determine the location of the installed locale files.

5 files changed, 22 insertions, 21 deletions

diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index ebd607f88bc..7aa34c038c6 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/02/16 14:38:18 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2001/02/28 23:31:06 jlam Exp $
 
 DISTNAME=		bison-1.28
 CATEGORIES=		devel
@@ -14,6 +14,7 @@ USE_LIBINTL=		# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 CPPFLAGS+=		-Dunix		# for $TMPDIR parsing
 
diff --git a/devel/bison/files/patch-sum b/devel/bison/files/patch-sum
index 996a513a009..68faf6e7be2 100644
--- a/devel/bison/files/patch-sum
+++ b/devel/bison/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.5 2000/02/03 18:46:53 jdolecek Exp $
+$NetBSD: patch-sum,v 1.6 2001/02/28 23:31:06 jlam Exp $
 
 MD5 (patch-aa) = 3edc18b2508fc13d087e3f6e80fb8684
 MD5 (patch-ab) = 0aee895505c684915d8c6d2fd38e4172
 MD5 (patch-ac) = 5f1cb06155359a3297544de061a8cb5c
-MD5 (patch-ad) = 13dbf11212a918e10b2ab91dfe583119
 MD5 (patch-ae) = d62df30ec1161d952aa449ba28f709d6
 MD5 (patch-af) = ace586b9de5473d4d9fada22c7c3a8eb
+MD5 (patch-ag) = f3b8f6be4e4a325ae6ec43003580207e
diff --git a/devel/bison/patches/patch-ad b/devel/bison/patches/patch-ad
deleted file mode 100644
index 72d6b42ab2a..00000000000
--- a/devel/bison/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/10/04 17:24:02 jlam Exp $
-
---- po/Makefile.in.in.orig	Fri Feb  5 10:05:15 1999
-+++ po/Makefile.in.in	Sat Oct  2 20:59:36 1999
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/devel/bison/patches/patch-ag b/devel/bison/patches/patch-ag
new file mode 100644
index 00000000000..a2998308bc8
--- /dev/null
+++ b/devel/bison/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2001/02/28 23:31:06 jlam Exp $
+
+--- configure.orig	Tue Jul  6 09:03:05 1999
++++ configure	Wed Feb 28 18:24:28 2001
+@@ -3556,6 +3556,8 @@
+    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ 	< $srcdir/po/POTFILES.in > po/POTFILES
+   
++# Use ${PKGLOCALEDIR} to determine the location of the locale files.
++DATADIRNAME="${PKGLOCALEDIR}"
+ 
+ # This is necessary so that .o files in LIBOBJS are also built via
+ # the ANSI2KNR-filtering rules.
diff --git a/devel/bison/pkg/PLIST b/devel/bison/pkg/PLIST
index 172d49a2c1d..01d354e2948 100644
--- a/devel/bison/pkg/PLIST
+++ b/devel/bison/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1999/10/04 17:24:03 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/02/28 23:31:07 jlam Exp $
 bin/bison
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
@@ -11,7 +11,7 @@ info/bison.info-5
 man/man1/bison.1
 share/bison.simple
 share/bison.hairy
-share/locale/de/LC_MESSAGES/bison.mo
-share/locale/es/LC_MESSAGES/bison.mo
-share/locale/fr/LC_MESSAGES/bison.mo
-share/locale/nl/LC_MESSAGES/bison.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/bison.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/bison.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/bison.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/bison.mo