USE_PKGLOCALEDIR, remove unnecessary patches, delint.

40 files changed, 86 insertions, 132 deletions

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 34e35a08eb3..62a6dec6582 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/10/30 03:09:27 rh Exp $
+# $NetBSD: Makefile,v 1.33 2002/11/30 23:21:32 salo Exp $
 #
 
 DISTNAME=		GConf-1.0.9
@@ -15,6 +15,7 @@ BUILD_USES_MSGFMT=	yes
 #DEPENDS+=		guile>=1.3.4:../../lang/guile
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 
diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile
index 04f7d86bd07..47dc886e526 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/10/19 10:54:43 rh Exp $
+# $NetBSD: Makefile,v 1.8 2002/11/30 23:21:33 salo Exp $
 #
 
 DISTNAME=		GConf-1.2.1
@@ -16,6 +16,7 @@ BUILD_USES_MSGFMT=	yes
 
 USE_GNU_GETTEXT=	yes
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_GMAKE=		yes
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 9e1b3e02d1c..1d98cd1dae8 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/10/05 03:54:46 rh Exp $
+# $NetBSD: Makefile,v 1.7 2002/11/30 23:21:33 salo Exp $
 #
 
 DISTNAME=		anjuta-0.1.9
@@ -16,6 +16,7 @@ DEPENDS+=		xml-i18n-tools>=0.9:../../textproc/xml-i18n-tools
 BUILD_USES_MSGFMT=	YES
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index 1656053b244..6eb6faab1ff 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/10/30 03:09:29 rh Exp $
+# $NetBSD: Makefile,v 1.12 2002/11/30 23:21:33 salo Exp $
 #
 
 DISTNAME=		bonobo-activation-2.1.0
@@ -17,6 +17,7 @@ USE_X11=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_PERL5=		build
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/bonobo-activation-2.0.pc.in
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 985f5d99ee7..4e0c1c36316 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/10/19 10:54:44 rh Exp $
+# $NetBSD: Makefile,v 1.10 2002/11/30 23:21:33 salo Exp $
 
 DISTNAME=		bonobo-conf-0.14
 PKGREVISION=		2
@@ -12,6 +12,7 @@ COMMENT=		Bonobo configuration system
 BUILD_USES_MSGFMT=	YES
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 2ca55294264..0796416f66b 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/11/28 15:30:27 drochner Exp $
+# $NetBSD: Makefile,v 1.33 2002/11/30 23:21:33 salo Exp $
 #
 
 DISTNAME=		bonobo-1.0.18
@@ -15,6 +15,7 @@ BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 BUILDLINK_DEPENDS.libxml=	libxml>1.8.15
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index 55ed59680ee..c3259d2b3a2 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/10/19 10:54:44 rh Exp $
+# $NetBSD: Makefile,v 1.8 2002/11/30 23:21:34 salo Exp $
 #
 
 DISTNAME=		eel-1.0.1
@@ -15,6 +15,7 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 USE_PERL5=		YES
diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile
index 7579ae364da..6fb4fb5c323 100644
--- a/devel/eel2/Makefile
+++ b/devel/eel2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/10/30 03:09:29 rh Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/30 23:21:34 salo Exp $
 #
 
 DISTNAME=		eel-2.0.7
@@ -14,6 +14,7 @@ COMMENT=		Eazel Extentions Library for GNOME2
 BUILD_USES_MSGFMT=	YES
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
diff --git a/devel/gal/Makefile b/devel/gal/Makefile
index 739b21fb4e7..7d06a3d895e 100644
--- a/devel/gal/Makefile
+++ b/devel/gal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2002/10/29 17:08:44 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2002/11/30 23:21:34 salo Exp $
 
 DISTNAME=		gal-0.19.3
 PKGREVISION=		1
@@ -11,6 +11,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Gnome Application Libraries
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 
diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile
index 4265b04450a..838a6c953f8 100644
--- a/devel/gal2/Makefile
+++ b/devel/gal2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/02 05:45:30 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/11/30 23:21:34 salo Exp $
 #
 
 DISTNAME=		gal2-0-0.0.7
@@ -15,6 +15,7 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_GMAKE=		YES
 USE_X11=		YES
 USE_LIBTOOL=		YES
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index d6fdba84aa5..7ae8d623502 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/11/27 17:41:05 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2002/11/30 23:21:34 salo Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
@@ -13,13 +13,12 @@ COMMENT=		tools for providing messages in different languages
 DEPENDS+=		gettext-m4-0.11.5:../../devel/gettext-m4
 
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
 CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
-CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 USE_GNU_GETTEXT=	yes
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ARGS+=	--with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index 52a57175e5f..2b24d28fb99 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2002/11/27 17:41:05 drochner Exp $
+$NetBSD: distinfo,v 1.7 2002/11/30 23:21:34 salo Exp $
 
 SHA1 (gettext-0.11.5.tar.gz) = 4d17534afac106bc0f2310a9fd77a291d433234b
 Size (gettext-0.11.5.tar.gz) = 3724099 bytes
-SHA1 (patch-aa) = 0b0b2fe55a10db61431f7217b804e4540581263d
+SHA1 (patch-aa) = faa6d71599703d20ac7652637c83a0c713467a32
 SHA1 (patch-ab) = 6e9eec0ff3bbab05df5a6b513ee9f8d3b39ad385
 SHA1 (patch-ac) = 1703e08d31fb31b99f6496ef56f4c405f1baefab
 SHA1 (patch-ai) = 97b824ed5e8b776a6b9e5a75287c6349e8e345d4
diff --git a/devel/gettext/patches/patch-aa b/devel/gettext/patches/patch-aa
index 3a7c90b55ff..264150d4721 100644
--- a/devel/gettext/patches/patch-aa
+++ b/devel/gettext/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2002/11/27 17:41:06 drochner Exp $
+$NetBSD: patch-aa,v 1.10 2002/11/30 23:21:35 salo Exp $
 
 --- configure.orig	Tue Aug  6 15:57:16 2002
 +++ configure	Sun Sep  1 16:06:20 2002
@@ -13,12 +13,3 @@ $NetBSD: patch-aa,v 1.9 2002/11/27 17:41:06 drochner Exp $
        fi
  
        if test "$gt_use_preinstalled_gnugettext" = "yes" \
-@@ -14369,7 +14365,7 @@
-         nls_cv_header_intl=
-     nls_cv_header_libgt=
- 
--        DATADIRNAME=share
-+        DATADIRNAME=${PKGLOCALEDIR}
- 
-         INSTOBJEXT=.mo
- 
diff --git a/devel/gindent/patches/patch-ab b/devel/gindent/patches/patch-ab
deleted file mode 100644
index 13e2c978b88..00000000000
--- a/devel/gindent/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2002/09/01 13:50:09 tron Exp $
-
---- po/Makefile.in.in.orig	Tue May 21 21:01:08 2002
-+++ po/Makefile.in.in	Sun Sep  1 15:46:30 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/glade/Makefile b/devel/glade/Makefile
index 7147df8cced..0f5c00423a7 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2002/11/02 02:42:03 rh Exp $
+# $NetBSD: Makefile,v 1.31 2002/11/30 23:21:35 salo Exp $
 #
 
 DISTNAME=	glade-0.6.2
@@ -11,13 +11,13 @@ MAINTAINER=     packages@netbsd.org
 HOMEPAGE=	http://glade.pn.org/
 COMMENT=	User interface builder for GTK+
 
-GNU_CONFIGURE=	yes
-USE_X11BASE=	yes
-USE_BUILDLINK2=	yes
+GNU_CONFIGURE=		yes
+USE_X11BASE=		yes
+USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 
-CONFIGURE_ENV+=	LOCALEDIR=${PKGLOCALEDIR}
-CONFIGURE_ARGS+=--with-bonobo
-CONFIGURE_ARGS+=--localstatedir=${SCROLLKEEPER_DATADIR}
+CONFIGURE_ARGS+=	--with-bonobo
+CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/glade
diff --git a/devel/glade/distinfo b/devel/glade/distinfo
index 98633b7ba4f..ce21472ce39 100644
--- a/devel/glade/distinfo
+++ b/devel/glade/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:20 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/11/30 23:21:35 salo Exp $
 
 SHA1 (glade-0.6.2.tar.gz) = 7f6f3f25078c38ff55ca354b6dc523b356e2b4b5
 Size (glade-0.6.2.tar.gz) = 2191537 bytes
-SHA1 (patch-aa) = 8f897b025e4b22f4c836ee0d15015f3e61ebf0b9
+SHA1 (patch-aa) = 08e09a8a0edb50087e3b680b500d0bb4b5de93f2
diff --git a/devel/glade/patches/patch-aa b/devel/glade/patches/patch-aa
index 70b2d8ae48e..f3ec242089f 100644
--- a/devel/glade/patches/patch-aa
+++ b/devel/glade/patches/patch-aa
@@ -1,13 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2001/02/13 11:47:00 tron Exp $
+$NetBSD: patch-aa,v 1.3 2002/11/30 23:21:35 salo Exp $
 
---- configure.orig	Sun Oct  1 12:40:47 2000
-+++ configure	Thu Nov  9 17:52:48 2000
-@@ -4490,6 +4490,10 @@
+--- configure.orig	Wed Mar 28 19:49:59 2001
++++ configure	Sat Nov 30 19:14:17 2002
+@@ -4607,6 +4607,8 @@
  
  
  
-+# Set DATADIRNAME to "${LOCALEDIR}"
-+DATADIRNAME="${LOCALEDIR}"
 +INTLDEPS=
 +INTLLIBS="-lintl"
  
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 254ab4f7c49..8560c9aeee4 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/11/02 02:42:03 rh Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/30 23:21:36 salo Exp $
 #
 
 DISTNAME=		glade-1.1.2
@@ -16,12 +16,12 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_GMAKE=		YES
 USE_X11=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-CONFIGURE_ENV+=		LOCALEDIR=${PKGLOCALEDIR}
 CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
 .include "../../textproc/scrollkeeper/buildlink2.mk"
diff --git a/devel/gnome-objc/Makefile b/devel/gnome-objc/Makefile
index a7d4f0635c5..068bff775cf 100644
--- a/devel/gnome-objc/Makefile
+++ b/devel/gnome-objc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/19 10:54:48 rh Exp $
+# $NetBSD: Makefile,v 1.11 2002/11/30 23:21:36 salo Exp $
 #
 
 DISTNAME=	gnome-objc-1.0.40
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Objective C API for gnome and gtk
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 PTHREAD_OPTS+=		require
 
diff --git a/devel/gnome-objc/PLIST b/devel/gnome-objc/PLIST
index 86cb5a0fd5d..13cce39224d 100644
--- a/devel/gnome-objc/PLIST
+++ b/devel/gnome-objc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/24 18:31:34 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/11/30 23:21:36 salo Exp $
 bin/obgnome-config
 include/obgnome/obgnome.h
 include/obgnome/obgnomeAbout.h
@@ -131,13 +131,13 @@ lib/libobgtk.so
 lib/libobgtk.so.3
 lib/libobgtk.so.3.1
 lib/obGnomeConf.sh
-share/locale/de/LC_MESSAGES/gnome-objc.mo
-share/locale/es/LC_MESSAGES/gnome-objc.mo
-share/locale/fr/LC_MESSAGES/gnome-objc.mo
-share/locale/no/LC_MESSAGES/gnome-objc.mo
-share/locale/pt/LC_MESSAGES/gnome-objc.mo
-share/locale/ru/LC_MESSAGES/gnome-objc.mo
-share/locale/sv/LC_MESSAGES/gnome-objc.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnome-objc.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-objc.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-objc.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-objc.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-objc.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-objc.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-objc.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-objc.mo
+${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-objc.mo
 @dirrm include/obgtk
 @dirrm include/obgnome
diff --git a/devel/gtkdiff/Makefile b/devel/gtkdiff/Makefile
index 50b1d6620a0..6ca3e1aadd7 100644
--- a/devel/gtkdiff/Makefile
+++ b/devel/gtkdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/09/22 00:07:25 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/11/30 23:21:36 salo Exp $
 #
 
 DISTNAME=	gtkdiff-1.6.0
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.ainet.or.jp/~inoue/software/gtkdiff/index-e.html
 COMMENT=	diff front-end program using GNOME
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index cce87fc3acb..a7258b71a75 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/10/13 15:09:18 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2002/11/30 23:21:36 salo Exp $
 # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp
 #
 
@@ -12,7 +12,9 @@ HOMEPAGE=	http://www.gnu.org/software/idutils/idutils.html
 COMMENT=	Classic Berkeley gid/lid tools for looking up variables in code
 
 BUILD_USES_MSGFMT=	yes
+
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 
 INFO_FILES=	id-utils.info
 GNU_CONFIGURE=	yes
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index e1f29c08219..260f37a3fb0 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/10/19 10:54:49 rh Exp $
+# $NetBSD: Makefile,v 1.6 2002/11/30 23:21:36 salo Exp $
 
 DISTNAME=		libbonobo-2.0.0
 PKGREVISION=		2
@@ -12,6 +12,7 @@ COMMENT=		GNOME2 Object activation framework library
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 USE_GMAKE=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index 64d112e8b97..40e03e903fb 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/11/26 17:00:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2002/11/30 23:21:37 salo Exp $
 #
 
 DISTNAME=	libbonoboui-2.0.3.2
@@ -14,6 +14,7 @@ BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 USE_GMAKE=		yes
 USE_GNU_GETTEXT=	yes
 USE_X11=		yes
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 74d2d25cb87..93598987658 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/10/19 10:54:50 rh Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/30 23:21:37 salo Exp $
 #
 
 DISTNAME=	libgnome-2.0.4
@@ -17,6 +17,7 @@ BUILDLINK_DEPENDS.libxml2=libxml2>=2.4.22
 BUILDLINK_DEPENDS.esound=esound>=0.2.26
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
 USE_GNU_GETTEXT=	YES
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index 5cc16327a3d..5305822f241 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/10/19 10:54:51 rh Exp $
+# $NetBSD: Makefile,v 1.4 2002/11/30 23:21:37 salo Exp $
 #
 
 DISTNAME=	libgnomeui-2.0.5
@@ -16,6 +16,7 @@ BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 USE_GMAKE=		yes
 USE_GNU_GETTEXT=	yes
 USE_PERL5=		yes
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index e20d634ce3a..3273791ece8 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2002/11/04 00:48:32 rh Exp $
+# $NetBSD: Makefile,v 1.65 2002/11/30 23:21:37 salo Exp $
 
 DISTNAME=		libgtop-1.0.13
 CATEGORIES=		devel gnome
@@ -29,6 +29,7 @@ IGNORE+=		"(More information can be found in libgtop.info.)"
 
 USE_PERL5=		build
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
@@ -44,7 +45,6 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-glib-prefix=${BUILDLINK_PREFIX.glib} \
 			--with-catgets --with-libgtop-guile=no
 CONFIGURE_ENV+=		AWK="${AWK}" LN_S="${LN} -s" PERL="${PERL5}"
-CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../x11/gnome-libs/buildlink2.mk"
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index f7754c2fff7..4f66856e4f8 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.9 2002/11/04 00:48:33 rh Exp $
+$NetBSD: distinfo,v 1.10 2002/11/30 23:21:37 salo Exp $
 
 SHA1 (libgtop-1.0.13.tar.bz2) = 7002d37ab43ebac14315298472a170ceaedbd072
 Size (libgtop-1.0.13.tar.bz2) = 733873 bytes
-SHA1 (patch-aa) = 21a55e4f2639037f03bf19f1c1e45c9a4a360d41
 SHA1 (patch-ab) = 3ce99bf4d72cf4e4203364d78361c8a2df081d8d
 SHA1 (patch-ac) = 644bfe717bdcc993a668a3d075acda8ef39571d8
 SHA1 (patch-ad) = 9522d20b1467b73678003d5c0f98dcac7d312893
diff --git a/devel/libgtop/patches/patch-aa b/devel/libgtop/patches/patch-aa
deleted file mode 100644
index 1397f6c18eb..00000000000
--- a/devel/libgtop/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2002/11/04 00:48:33 rh Exp $
-
---- configure.orig	Mon Nov  4 10:12:53 2002
-+++ configure
-@@ -15379,6 +15379,11 @@ fi
-    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- 	< $srcdir/po/POTFILES.in > po/POTFILES
- 
-+#
-+# override DATADIRNAME with PKGLOCALEDIR if set
-+#
-+[ -z "$PKGLOCALEDIR" ] || DATADIRNAME=$PKGLOCALEDIR
-+
- echo "$as_me:15382: checking for X" >&5
- echo $ECHO_N "checking for X... $ECHO_C" >&6
- 
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index dfe98590b0f..0eb44f71744 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/11/04 03:18:40 rh Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/30 23:21:38 salo Exp $
 
 DISTNAME=		libgtop-2.0.0
 PKGNAME=		${DISTNAME:S/-/2-/}
@@ -30,6 +30,7 @@ IGNORE+=		"(More information can be found in libgtop.info.)"
 
 USE_PERL5=		build
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
@@ -46,7 +47,6 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-glib-prefix=${BUILDLINK_PREFIX.glib2}
 CONFIGURE_ARGS+=	--with-catgets --with-libgtop-guile=no
 CONFIGURE_ENV+=		AWK="${AWK}" LN_S="${LN} -s" PERL="${PERL5}"
-CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index 8ff452209c4..2f54e45bf23 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
+$NetBSD: distinfo,v 1.2 2002/11/30 23:21:38 salo Exp $
 
 SHA1 (libgtop-2.0.0.tar.bz2) = 9178e5cede22ae5a8928677b195fe585b84b3b86
 Size (libgtop-2.0.0.tar.bz2) = 690581 bytes
-SHA1 (patch-aa) = 13df9537fff754a0442988e110ab379f92a654e8
+SHA1 (patch-aa) = 20cc13d5965815271f85f2dec086460176b2d1cd
 SHA1 (patch-ab) = 3ce99bf4d72cf4e4203364d78361c8a2df081d8d
 SHA1 (patch-ac) = 644bfe717bdcc993a668a3d075acda8ef39571d8
 SHA1 (patch-ad) = 9522d20b1467b73678003d5c0f98dcac7d312893
diff --git a/devel/libgtop2/patches/patch-aa b/devel/libgtop2/patches/patch-aa
index fa1dfddb288..c86140a8ac4 100644
--- a/devel/libgtop2/patches/patch-aa
+++ b/devel/libgtop2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
+$NetBSD: patch-aa,v 1.2 2002/11/30 23:21:38 salo Exp $
 
 --- configure.orig	Tue Jun 11 07:46:22 2002
 +++ configure
@@ -18,18 +18,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
  	  ;;
  	*)
  	  if test x$hacker_mode = xyes ; then
-@@ -12834,6 +12834,11 @@ fi
-    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- 	< $srcdir/po/POTFILES.in > po/POTFILES
- 
-+#
-+# override DATADIRNAME with PKGLOCALEDIR if set
-+#
-+[ -z "$PKGLOCALEDIR" ] || DATADIRNAME=$PKGLOCALEDIR
-+ 
- echo "$as_me:12837: checking for X" >&5
- echo $ECHO_N "checking for X... $ECHO_C" >&6
- 
 @@ -15698,7 +15703,7 @@ LIBGTOP_INCS="$LIBGTOP_INCS $SUPPORTINCS
  LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
  LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index ce96d21f086..b82867fc522 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/10/19 10:54:51 rh Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/30 23:21:38 salo Exp $
 #
 
 DISTNAME=	libwnck-0.17
@@ -14,6 +14,7 @@ BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 USE_GMAKE=		yes
 USE_GNU_GETTEXT=	yes
 
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 013ee1b9bea..4efa27ef981 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/09/21 10:57:08 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2002/11/30 23:21:39 salo Exp $
 #
 
 DISTNAME=	maketool-0.7
@@ -13,6 +13,7 @@ COMMENT=	Graphical front end to GNU make
 BUILD_USES_MSGFMT=	# defined
 
 USE_BUILDLINK2=		# defined
+USE_PKGLOCALEDIR=	# defined
 USE_X11=		# defined
 USE_GMAKE=		# defined
 GNU_CONFIGURE=		# defined
diff --git a/devel/maketool/PLIST b/devel/maketool/PLIST
index 1c2090c530a..d2f1622bdf4 100644
--- a/devel/maketool/PLIST
+++ b/devel/maketool/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2002/03/10 01:16:29 fredb Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/11/30 23:21:39 salo Exp $
 bin/maketool
 libexec/maketool/extract_targets
 libexec/maketool/maketool_client
-share/locale/cs/LC_MESSAGES/maketool.mo
-share/locale/ja/LC_MESSAGES/maketool.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/maketool.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/maketool.mo
 share/maketool/autoconf-dist.mk
 share/maketool/autoconf-maint.mk
 share/maketool/automake.mk
diff --git a/devel/mrproject/Makefile b/devel/mrproject/Makefile
index a21b0efad8c..4efa8fb181b 100644
--- a/devel/mrproject/Makefile
+++ b/devel/mrproject/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/10/07 09:36:53 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/11/30 23:21:39 salo Exp $
 #
 
 DISTNAME=		mrproject-0.5.1
@@ -11,6 +11,7 @@ HOMEPAGE=		http://mrproject.codefactory.se/
 COMMENT=		Project management program
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index df981d6f1e5..1a0d119201a 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/10/19 10:54:51 rh Exp $
+# $NetBSD: Makefile,v 1.22 2002/11/30 23:21:39 salo Exp $
 #
 
 DISTNAME=		oaf-0.6.10
@@ -11,6 +11,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		new object activation framework for GNOME
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
 
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 5b315548d6d..87349f70c31 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/10/19 18:08:58 martti Exp $
+# $NetBSD: Makefile,v 1.16 2002/11/30 23:21:39 salo Exp $
 #
 
 DISTNAME=	popt-1.7
@@ -17,13 +17,13 @@ BUILD_USES_MSGFMT=	yes
 CONFLICTS=		ORBit<=0.5.3
 
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
-CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/popt/distinfo b/devel/popt/distinfo
index e3543cc9512..da1ab1da05f 100644
--- a/devel/popt/distinfo
+++ b/devel/popt/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.10 2002/11/26 06:50:20 jlam Exp $
+$NetBSD: distinfo,v 1.11 2002/11/30 23:21:39 salo Exp $
 
 SHA1 (popt-1.7.tar.gz) = 66f3c77b87a160951b180447f4a6dce68ad2f71b
 Size (popt-1.7.tar.gz) = 574549 bytes
-SHA1 (patch-aa) = e4fe1bf5bfd717faf8233a22300869121827af6c
 SHA1 (patch-ab) = 7c9ad516baeb6343dfc21f8611f132592575d084
diff --git a/devel/popt/patches/patch-aa b/devel/popt/patches/patch-aa
deleted file mode 100644
index 0acc1e688d4..00000000000
--- a/devel/popt/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2002/10/15 10:18:41 martti Exp $
-
---- configure.orig	Sat Aug 31 15:22:20 2002
-+++ configure	Tue Oct 15 12:05:53 2002
-@@ -12382,7 +12382,7 @@
-         nls_cv_header_intl=
-     nls_cv_header_libgt=
- 
--        DATADIRNAME=share
-+        DATADIRNAME=${PKGLOCALEDIR}
- 
- 
-         INSTOBJEXT=.mo