USE_PKGLOCALEDIR, delint.

14 files changed, 70 insertions, 65 deletions

diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index f23bb90aef8..25eec29f730 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/11/30 14:45:33 grant Exp $
+# $NetBSD: Makefile,v 1.26 2002/12/01 02:00:12 salo Exp $
 
 DISTNAME=	baduki-0.2.9
 CATEGORIES=	games
@@ -9,11 +9,12 @@ HOMEPAGE=	http://soback.kornet21.net/~artist/baduk/baduki.html
 COMMENT=	Go playing program based on xamigo
 
 BUILD_USES_MSGFMT=	# defined
+
 USE_BUILDLINK2=		# defined
+USE_PKGLOCALEDIR=	# defined
 USE_X11=		# defined
 
 GNU_CONFIGURE=		# defined
-USE_PKGLOCALEDIR=	# defined
 CONFIGURE_ARGS+=	--without-included-gettext
 
 .include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/games/baduki/PLIST b/games/baduki/PLIST
index 72cfa4508bb..205c46f8b21 100644
--- a/games/baduki/PLIST
+++ b/games/baduki/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:50:53 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/01 02:00:12 salo Exp $
 bin/baduki
-share/locale/ko/LC_MESSAGES/baduki.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/baduki.mo
 share/baduki/baduki.gtkrc
 share/baduki/board.xpm
 @dirrm share/baduki
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index ba46f98506f..fbb29132985 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/10/13 11:35:15 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/12/01 02:00:13 salo Exp $
 
 DISTNAME=		dopewars-1.5.0
 CATEGORIES=		games
@@ -12,6 +12,7 @@ HOMEPAGE=		http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/
 COMMENT=		Make a fortune dealing drugs on the streets of New York
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_GMAKE=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index 7e6010d4b41..0383c4541c1 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2002/09/23 10:02:50 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12 2002/12/01 02:00:13 salo Exp $
 
 DISTNAME=		freeciv-${FC_VERS}
 FC_VERS=		1.12.0
@@ -13,7 +13,9 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.freeciv.org/
 
 BUILD_USES_MSGFMT=	# defined
+
 USE_BUILDLINK2=		# defined
+USE_PKGLOCALEDIR=	# defined
 GNU_CONFIGURE=		# defined
 
 DISTINFO_FILE=		${.CURDIR}/../../games/freeciv-share/distinfo
diff --git a/games/gnome-breakout/Makefile b/games/gnome-breakout/Makefile
index 062c4adbd3d..7a0f550f06b 100644
--- a/games/gnome-breakout/Makefile
+++ b/games/gnome-breakout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/10/13 16:17:57 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/12/01 02:00:13 salo Exp $
 #
 
 DISTNAME=	gnome-breakout-0.5.2
@@ -10,9 +10,10 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.senet.com.au/~alcaron/software.html
 COMMENT=	Gnome version of the classic breakout game
 
-GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
-USE_X11BASE=	YES
+GNU_CONFIGURE=		YES
+USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
+USE_X11BASE=		YES
 
 post-install:
 	${TOUCH} /var/games/gnome-breakout.scores
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index 4a677653750..4f6c3f69c49 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/11/02 02:42:03 rh Exp $
+# $NetBSD: Makefile,v 1.15 2002/12/01 02:00:14 salo Exp $
 
 DISTNAME=		gnome-chess-0.3.3
 PKGREVISION=		3
@@ -10,6 +10,7 @@ HOMEPAGE=		http://arcavia.com/rd/gnome-chess/
 COMMENT=		GNOME\'s graphical interface for playing chess
 
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
diff --git a/games/gnome-chess/PLIST b/games/gnome-chess/PLIST
index 6eb81d60694..3d754d714f0 100644
--- a/games/gnome-chess/PLIST
+++ b/games/gnome-chess/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/07/17 13:11:44 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/12/01 02:00:14 salo Exp $
 bin/gnome-chess
 share/gnome-chess/glade/level.glade
 share/gnome-chess/glade/login.glade
@@ -26,29 +26,29 @@ share/gnome/help/gnome-chess-manual/C/stylesheet-images/toc-plus.gif
 share/gnome/help/gnome-chess-manual/C/stylesheet-images/up.gif
 share/gnome/help/gnome-chess-manual/C/stylesheet-images/warning.gif
 share/gnome/help/gnome-chess-manual/C/usage.html
-share/locale/az/LC_MESSAGES/gnome-chess.mo
-share/locale/ca/LC_MESSAGES/gnome-chess.mo
-share/locale/da/LC_MESSAGES/gnome-chess.mo
-share/locale/de/LC_MESSAGES/gnome-chess.mo
-share/locale/el/LC_MESSAGES/gnome-chess.mo
-share/locale/es/LC_MESSAGES/gnome-chess.mo
-share/locale/fr/LC_MESSAGES/gnome-chess.mo
-share/locale/ga/LC_MESSAGES/gnome-chess.mo
-share/locale/gl/LC_MESSAGES/gnome-chess.mo
-share/locale/it/LC_MESSAGES/gnome-chess.mo
-share/locale/ja/LC_MESSAGES/gnome-chess.mo
-share/locale/lt/LC_MESSAGES/gnome-chess.mo
-share/locale/nl/LC_MESSAGES/gnome-chess.mo
-share/locale/nn/LC_MESSAGES/gnome-chess.mo
-share/locale/no/LC_MESSAGES/gnome-chess.mo
-share/locale/pl/LC_MESSAGES/gnome-chess.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-chess.mo
-share/locale/ro/LC_MESSAGES/gnome-chess.mo
-share/locale/ru/LC_MESSAGES/gnome-chess.mo
-share/locale/sv/LC_MESSAGES/gnome-chess.mo
-share/locale/tr/LC_MESSAGES/gnome-chess.mo
-share/locale/uk/LC_MESSAGES/gnome-chess.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-chess.mo
+${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-chess.mo
 share/mime-info/gnome-chess.keys
 share/mime-info/gnome-chess.mime
 share/omf/gnome-chess/gnome-chess-manual-C.omf
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 3b4cc4a3dbf..733db7f7a16 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2002/10/23 09:30:39 bouyer Exp $
+# $NetBSD: Makefile,v 1.45 2002/12/01 02:00:14 salo Exp $
 
 DISTNAME=		gnome-games-1.4.0.4
 PKGREVISION=		2
@@ -14,25 +14,24 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME games collection
 
 BUILD_USES_MSGFMT=	YES
+BUILD_USES_GETTEXT_M4=	YES
 
 CONFLICTS=		xbill-[0-9]*
 
 AUTOMAKE_REQD=		1.4
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_GMAKE=		YES
 USE_X11BASE=		YES
+USE_CONFIG_WRAPPER=	YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-BUILD_USES_GETTEXT_M4=	YES
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 CONFIGURE_ARGS+=	--localstatedir=/var
 
-USE_CONFIG_WRAPPER=	YES
-
 INSTALL_FILE=		${WRKDIR}/INSTALL
-MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 
 post-patch:
 	cd ${WRKSRC} &&							\
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 8865f36967d..8af631a931f 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2002/07/17 22:21:38 rh Exp $
+$NetBSD: distinfo,v 1.11 2002/12/01 02:00:14 salo Exp $
 
 SHA1 (gnome-games-1.4.0.4.tar.bz2) = c96c1fe97cd131920d463490e8247438e16efb0f
 Size (gnome-games-1.4.0.4.tar.bz2) = 9407259 bytes
@@ -7,7 +7,7 @@ Size (gnome-games-html-1.4.0.4.tar.bz2) = 73900 bytes
 SHA1 (patch-aa) = 888cf35c192d70e2edd1e4f656b69eac25c2e88a
 SHA1 (patch-ab) = a65a783eca7102c3ecb5352f7ce855b75434388b
 SHA1 (patch-ac) = 71cf86496f6a8cf5f3291a7e046704e3ed0855ed
-SHA1 (patch-ad) = 268de04b74b35a5ed37b9b3abc592100af3ad4fc
-SHA1 (patch-ae) = 3cb3e3cea44a092ab65d45f3557888a090bf8369
+SHA1 (patch-ad) = 5170dfa7514e5dceae66e92c856ca8c155b96dd3
+SHA1 (patch-ae) = 937c7c934a6d29d4a0e4a53184f55842195bb49f
 SHA1 (patch-af) = 99ecb1786e6a32824ab30e81d7c9e4a31107a6ff
 SHA1 (patch-ag) = 321580be465664472d290d22871da97e317d9cde
diff --git a/games/gnome-games/patches/patch-ad b/games/gnome-games/patches/patch-ad
index 3a4fd8137e9..e5b00c617a1 100644
--- a/games/gnome-games/patches/patch-ad
+++ b/games/gnome-games/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.5 2002/05/12 00:28:23 rh Exp $
+$NetBSD: patch-ad,v 1.6 2002/12/01 02:00:14 salo Exp $
 
 --- aclocal.m4.orig	Thu Jul 12 06:02:03 2001
 +++ aclocal.m4
@@ -10,12 +10,3 @@ $NetBSD: patch-ad,v 1.5 2002/05/12 00:28:23 rh Exp $
    rm -f conf.gdk_pixbuftest
  ])
  
-@@ -4697,7 +4698,7 @@
- 		  [CATOBJEXT=.gmo
- 		   DATADIRNAME=share],
- 		  [CATOBJEXT=.mo
--		   DATADIRNAME=lib])
-+		   DATADIRNAME=${PKGLOCALEDIR}])
- 		INSTOBJEXT=.mo
- 	      fi
- 	    fi
diff --git a/games/gnome-games/patches/patch-ae b/games/gnome-games/patches/patch-ae
index 70d1c172820..90a0453eb8e 100644
--- a/games/gnome-games/patches/patch-ae
+++ b/games/gnome-games/patches/patch-ae
@@ -1,10 +1,17 @@
-$NetBSD: patch-ae,v 1.2 2002/05/12 00:28:23 rh Exp $
+$NetBSD: patch-ae,v 1.3 2002/12/01 02:00:14 salo Exp $
 
---- gnome-stones/objects/Makefile.am.orig	Tue Nov 10 14:55:56 1998
-+++ gnome-stones/objects/Makefile.am
-@@ -6,9 +6,11 @@
+--- gnome-stones/objects/Makefile.am.orig	Tue Nov 10 05:55:56 1998
++++ gnome-stones/objects/Makefile.am	Sun Dec  1 02:15:05 2002
+@@ -1,14 +1,17 @@
+ GSTONES_SRC_DIR = $(srcdir)/../
+ 
+ objectdir= $(libdir)/gnome-stones/objects
++localedir= $(prefix)/share/locale
+ 
+ INCLUDES = 						\
  	-I$(GSTONES_SRC_DIR)				\
- 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
++	-DGNOMELOCALEDIR=\""$(localedir)"\" 	\
  	-I$(includedir)					\
 -	$(GNOME_INCLUDEDIR)
 +	$(GNOME_INCLUDEDIR) $(GDK_PIXBUF_CFLAGS)
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 8d2ef97ef34..da34ad7acde 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/09/10 16:06:41 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/12/01 02:00:14 salo Exp $
 #
 
 DISTNAME=	gtkballs-3.0.1
@@ -13,6 +13,7 @@ COMMENT=	GTK+ clone of "Color Lines"
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 USE_GMAKE=		yes
 CONFIGURE_ARGS+=	--without-included-gettext
 
diff --git a/games/gtkballs/PLIST b/games/gtkballs/PLIST
index 7dc1998ca74..3cb8132b3e5 100644
--- a/games/gtkballs/PLIST
+++ b/games/gtkballs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/30 23:28:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/12/01 02:00:14 salo Exp $
 bin/gtkballs
 man/man6/gtkballs.6
 share/gtkballs/COPYING
@@ -316,10 +316,10 @@ share/gtkballs/themes/klines/yellow_jump6.xpm
 share/gtkballs/themes/klines/yellow_jump7.xpm
 share/gtkballs/themes/klines/yellow_jump8.xpm
 share/gtkballs/themes/klines/yellow_small.xpm
-share/locale/de/LC_MESSAGES/gtkballs.mo
-share/locale/fr/LC_MESSAGES/gtkballs.mo
-share/locale/pl/LC_MESSAGES/gtkballs.mo
-share/locale/ru/LC_MESSAGES/gtkballs.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtkballs.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gtkballs.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gtkballs.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtkballs.mo
 @comment user-modified: var/gtkballs-scores
 @unexec ${RMDIR} %D/var 2>/dev/null || ${TRUE}
 @dirrm share/gtkballs/themes/klines
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 75b8a9d5871..b961538b131 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/04 07:40:37 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/12/01 02:00:15 salo Exp $
 #
 
 DISTNAME=		gturing-0.1.1
@@ -14,6 +14,7 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES