9 files changed, 8 insertions, 73 deletions
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index f9592b466cb..31745d7aa13 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2002/10/05 04:17:59 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2002/11/30 14:04:01 grant Exp $
 
 DISTNAME=		bison-1.35
 CATEGORIES=		devel
@@ -13,12 +13,13 @@ BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
+USE_PKGLOCALEDIR=	# defined
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ARGS+=	--with-libintl-prefix=${BUILDLINK_PREFIX.gettext-lib}
 
 # We set the timezone to "GMT" below to avoid rebuilds of the info files
 # which fail under NetBSD 1.5.
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}" TZ=GMT
+MAKE_ENV+=		TZ=GMT
 
 CPPFLAGS+=		-Dunix		# for $TMPDIR parsing
 
diff --git a/devel/bison/PLIST b/devel/bison/PLIST
index 698c49c9513..ddddc15be29 100644
--- a/devel/bison/PLIST
+++ b/devel/bison/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/05/10 00:15:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/11/30 14:04:01 grant Exp $
 bin/bison
 @unexec ${INSTALL_INFO} --delete %D/info/bison.info %D/info/dir
 info/bison.info
@@ -13,7 +13,7 @@ info/bison.info-6
 man/man1/bison.1
 share/bison/bison.simple
 share/bison/bison.hairy
-share/locale/locale.alias
+${PKGLOCALEDIR}/locale/locale.alias
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/bison.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/bison.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/bison.mo
diff --git a/devel/bison/distinfo b/devel/bison/distinfo
index f51ac1ba56c..c25cd7e3fb4 100644
--- a/devel/bison/distinfo
+++ b/devel/bison/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.10 2002/03/29 09:42:52 wiz Exp $
+$NetBSD: distinfo,v 1.11 2002/11/30 14:04:01 grant Exp $
 
 SHA1 (bison-1.35.tar.bz2) = 083a1f3c153f7358e451a213f0879e98b3aafb1c
 Size (bison-1.35.tar.bz2) = 627723 bytes
-SHA1 (patch-aa) = 47194ffb10e0bda3f01e656dd1a84eae9df46db3
-SHA1 (patch-ab) = 467f560b38de856b013b455f918fb858c6124711
diff --git a/devel/bison/patches/patch-aa b/devel/bison/patches/patch-aa
deleted file mode 100644
index 6a7e3531d45..00000000000
--- a/devel/bison/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2002/02/10 19:05:57 tron Exp $
-
---- src/Makefile.in.orig	Wed Jan 23 14:31:20 2002
-+++ src/Makefile.in	Sun Feb 10 19:54:49 2002
-@@ -107,7 +107,7 @@
- DEFS = @DEFS@ \
-   -DBISON_SIMPLE=\"$(pkgdatadir)/bison.simple\" \
-   -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\" \
--  -DLOCALEDIR=\"$(datadir)/locale\"
-+  -DLOCALEDIR=\"$(prefix)/$(PKGLOCALEDIR)/locale\"
- 
- 
- CFLAGS = @CFLAGS@ $(WARNING_CFLAGS) $(WERROR_CFLAGS)
diff --git a/devel/bison/patches/patch-ab b/devel/bison/patches/patch-ab
deleted file mode 100644
index 0550234cad7..00000000000
--- a/devel/bison/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2002/02/10 19:05:57 tron Exp $
-
---- po/Makefile.in.in.orig	Mon Jan 21 15:03:21 2002
-+++ po/Makefile.in.in	Sun Feb 10 20:03:16 2002
-@@ -23,7 +23,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index c6f4c36b29c..9c709cb2e7d 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/11/28 16:56:14 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2002/11/30 14:08:30 grant Exp $
 
 DISTNAME=       make-3.80
 PKGNAME=        gmake-3.80
@@ -11,6 +11,7 @@ COMMENT=	GNU version of 'make' utility
 
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
+USE_PKGLOCALEDIR=	YES
 CONFIGURE_ARGS+=	--program-prefix="g"
 CONFIGURE_ARGS+=	--with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
 CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
diff --git a/devel/gmake/patches/patch-ab b/devel/gmake/patches/patch-ab
deleted file mode 100644
index aee9f8fe995..00000000000
--- a/devel/gmake/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2002/10/16 00:21:22 dmcmahill Exp $
-
---- po/Makefile.in.in.orig	Thu Oct  3 14:18:35 2002
-+++ po/Makefile.in.in
-@@ -21,7 +21,7 @@ VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
diff --git a/devel/gmake/patches/patch-ac b/devel/gmake/patches/patch-ac
deleted file mode 100644
index 680e7137d96..00000000000
--- a/devel/gmake/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/10/16 00:21:22 dmcmahill Exp $
-
---- Makefile.am.orig	Thu Oct  3 22:29:18 2002
-+++ Makefile.am
-@@ -27,7 +27,7 @@ make_LDADD =	@LIBOBJS@ @ALLOCA@ $(GLOBLI
- 
- man_MANS =	make.1
- 
--DEFS =		-DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" @DEFS@
-+DEFS =		-DLOCALEDIR=\"$(prefix)/$(PKGLOCALEDIR)/locale\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" @DEFS@
- 
- AM_CPPFLAGS =	$(GLOBINC)
- 
diff --git a/devel/gmake/patches/patch-ad b/devel/gmake/patches/patch-ad
deleted file mode 100644
index 3ffd0c35d15..00000000000
--- a/devel/gmake/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/10/16 00:21:22 dmcmahill Exp $
-
---- Makefile.in.orig	Thu Oct  3 22:56:12 2002
-+++ Makefile.in
-@@ -55,7 +55,7 @@ CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
- 
--DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" @DEFS@
-+DEFS = -DLOCALEDIR=\"$(prefix)/$(PKGLOCALEDIR)/locale\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" @DEFS@
- DEPDIR = @DEPDIR@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@