USE_PKGLOCALEDIR, remove unnecessary patch, delint.

19 files changed, 62 insertions, 66 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 0b0a4b148eb..9bb0a06d1a0 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/19 10:54:52 rh Exp $
+# $NetBSD: Makefile,v 1.11 2002/12/01 13:49:38 salo Exp $
 
 DISTNAME=		dia-0.90
 # PKGREVISION=		1
@@ -11,13 +11,14 @@ COMMENT=		program for creating diagrams of all kinds
 
 BUILD_DEPENDS+=		bison>=1.35:../../devel/bison
 
-USE_X11=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	YES
-USE_BUILDLINK2=	YES
+USE_X11=		YES
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
+USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-gnome
 
 BROKEN=			segfaults on start-up
diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile
index 36741fe8c29..74bbc11588d 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/10/19 10:54:52 rh Exp $
+# $NetBSD: Makefile,v 1.27 2002/12/01 13:49:39 salo Exp $
 
 DISTNAME=		ee-0.3.12
 PKGREVISION=		2
@@ -10,6 +10,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Image viewer based on imlib by the Rasterman.  Gtk clone of xv
 
 USE_BUILDLINK2=		# defined
+USE_PKGLOCALEDIR=	# defined
 USE_X11BASE=		# defined
 USE_GMAKE=		# defined
 
@@ -21,7 +22,6 @@ LOCALSTATEDIR=		/var/gnome
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
 			--with-glib-prefix=${BUILDLINK_PREFIX.glib}
-CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 
 .include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ee/distinfo b/graphics/ee/distinfo
index f40a2052b02..29c05ad2b33 100644
--- a/graphics/ee/distinfo
+++ b/graphics/ee/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/01/24 15:44:12 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/12/01 13:49:39 salo Exp $
 
 SHA1 (ee-0.3.12.tar.gz) = 7a7bcd75485de3d16d1b2fc25f4ac499e3c7c932
 Size (ee-0.3.12.tar.gz) = 437916 bytes
 SHA1 (patch-aa) = 3cb285731f60dc868266c66af77d17bc9da2a464
-SHA1 (patch-ab) = ae8db887be68291d8fe4edf4d634c1e3caf2e711
+SHA1 (patch-ab) = 9a606712b78dcbceddf65ced8f5572a3860c7bad
diff --git a/graphics/ee/patches/patch-ab b/graphics/ee/patches/patch-ab
index 40fea09c2dc..b203b273be8 100644
--- a/graphics/ee/patches/patch-ab
+++ b/graphics/ee/patches/patch-ab
@@ -1,13 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2002/01/24 15:44:12 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2002/12/01 13:49:39 salo Exp $
 
---- configure.orig	Mon Jul 17 17:42:39 2000
-+++ configure
-@@ -4740,6 +4740,10 @@
+--- configure.orig	Mon Jul 17 23:42:39 2000
++++ configure	Sun Dec  1 14:21:19 2002
+@@ -4740,6 +4740,8 @@
  
  
  
-+# Set DATADIRNAME to "${PKGLOCALEDIR}"
-+DATADIRNAME="${PKGLOCALEDIR}"
 +INTLDEPS=
 +INTLLIBS="-lintl"
  
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 9c269864f5f..755287a1217 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/10/21 15:24:32 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/12/01 13:49:39 salo Exp $
 
 DISTNAME=		eog-0.6
 PKGREVISION=		1
@@ -13,6 +13,7 @@ GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 
 .include "../../devel/bonobo/buildlink2.mk"
 .include "../../devel/GConf/buildlink2.mk"
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index cfaf0cfb544..58d13d38881 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/02 04:09:34 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/12/01 13:49:40 salo Exp $
 #
 
 DISTNAME=		eog-1.0.3
@@ -16,6 +16,7 @@ GNU_CONFIGURE=		YES
 USE_X11=		YES
 USE_GMAKE=		YES
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
 .include "../../textproc/scrollkeeper/buildlink2.mk"
diff --git a/graphics/gimp-base/Makefile b/graphics/gimp-base/Makefile
index d08ec465515..226bfca3ce5 100644
--- a/graphics/gimp-base/Makefile
+++ b/graphics/gimp-base/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2002/10/07 14:54:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2002/12/01 13:49:40 salo Exp $
 
 DISTNAME=		gimp-1.2.3
 PKGNAME=		gimp-base-1.2.3
 PKGREVISION=		2
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.3/ \
-		ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.3/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gimp/v1.2/v1.2.3/
+			ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.3/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/gimp/v1.2/v1.2.3/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		hubertf@netbsd.org
@@ -16,7 +16,9 @@ COMMENT=		Image manipulation program similar to Photoshop[tm]
 CONFLICTS+=		gimp<=1.2.3
 
 BUILD_USES_MSGFMT=	yes
+
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 USE_GMAKE=		yes
 
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index e73352c3db7..bb025d58b9b 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/10/20 13:37:17 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2002/12/01 13:49:40 salo Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1999/06/19 17:38:24 cpiazza Exp $
 
 DISTNAME=	Giram-0.1.2
@@ -13,12 +13,11 @@ COMMENT=	Giram is Really A Modeller
 
 DEPENDS+=	povray-[0-9]*:../../graphics/povray
 
-USE_BUILDLINK2=	yes
-USE_X11=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-
-CONFIGURE_ENV=	PKGLOCALEDIR="${PKGLOCALEDIR}"
+USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
+USE_X11=		yes
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
 
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/Giram
diff --git a/graphics/giram/distinfo b/graphics/giram/distinfo
index 4ec3fa8f6e0..7300dc2fa93 100644
--- a/graphics/giram/distinfo
+++ b/graphics/giram/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/01/25 19:20:28 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/12/01 13:49:40 salo Exp $
 
 SHA1 (Giram-0.1.2.tar.gz) = d0758b5bdc51d41c868ae68cf3ce1352b16b68ea
 Size (Giram-0.1.2.tar.gz) = 452540 bytes
-SHA1 (patch-aa) = 17354eedaedd64e8cdee895bc5c4c39d06391f4d
 SHA1 (patch-ak) = 27587c5825d11ee9278edfb342fa1b6e6d20a428
diff --git a/graphics/giram/patches/patch-aa b/graphics/giram/patches/patch-aa
deleted file mode 100644
index d32e208ba04..00000000000
--- a/graphics/giram/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/01/25 19:20:29 wiz Exp $
-
---- configure.orig	Mon Aug 30 19:18:47 1999
-+++ configure
-@@ -4497,7 +4497,7 @@
- s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
- s%@CATALOGS@%$CATALOGS%g
- s%@CATOBJEXT@%$CATOBJEXT%g
--s%@DATADIRNAME@%$DATADIRNAME%g
-+s%@DATADIRNAME@%$PKGLOCALEDIR%g
- s%@GMOFILES@%$GMOFILES%g
- s%@INSTOBJEXT@%$INSTOBJEXT%g
- s%@INTLDEPS@%$INTLDEPS%g
diff --git a/graphics/gnome-iconedit/Makefile b/graphics/gnome-iconedit/Makefile
index ddfa73cc4c3..db40e990377 100644
--- a/graphics/gnome-iconedit/Makefile
+++ b/graphics/gnome-iconedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/10/08 07:53:46 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/12/01 13:49:41 salo Exp $
 #
 
 DISTNAME=		gnome-iconedit-1.2.0
@@ -12,6 +12,7 @@ COMMENT=		icon editor based on GNOME libraries
 BUILD_USES_MSGFMT=	YES
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
diff --git a/graphics/gnome-iconedit/PLIST b/graphics/gnome-iconedit/PLIST
index 31e82c0f57a..777a5c32cbe 100644
--- a/graphics/gnome-iconedit/PLIST
+++ b/graphics/gnome-iconedit/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.4 2002/10/08 07:53:46 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/12/01 13:49:41 salo Exp $
 bin/gnome-iconedit
 etc/CORBA/servers/gnome-iconedit.gnorba
 share/gnome/apps/Graphics/gnome-iconedit.desktop
 share/gnome/help/gnome-iconedit/C/topic.dat
 share/idl/Iconedit.idl
-share/locale/de/LC_MESSAGES/gnome-iconedit.mo
-share/locale/en_GB/LC_MESSAGES/gnome-iconedit.mo
-share/locale/fr/LC_MESSAGES/gnome-iconedit.mo
-share/locale/ko/LC_MESSAGES/gnome-iconedit.mo
-share/locale/sv/LC_MESSAGES/gnome-iconedit.mo
-share/locale/tr/LC_MESSAGES/gnome-iconedit.mo
-share/locale/wa/LC_MESSAGES/gnome-iconedit.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-iconedit.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-iconedit.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-iconedit.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-iconedit.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-iconedit.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-iconedit.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-iconedit.mo
 share/oaf/gnome-iconedit.oafinfo
 share/pixmaps/gnome-iconedit/cheques.png
 share/pixmaps/gnome-iconedit/dropper.png
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 0ebb5b27519..9fddc3b6213 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/09/10 16:06:42 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2002/12/01 13:49:41 salo Exp $
 
 DISTNAME=	gphoto2-2.1.0
 PKGNAME=	gphoto-2.1.0
@@ -13,6 +13,7 @@ COMMENT=	Download and view files from various digital cameras
 BUILD_USES_MSGFMT=	# defined
 
 USE_BUILDLINK2=		# defined
+USE_PKGLOCALEDIR=	# defined
 USE_GMAKE=		# defined
 
 USE_LIBTOOL=		# defined
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index 26dd7dbc09b..69a614a84ac 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/08/26 17:59:39 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/12/01 13:49:41 salo Exp $
 
 DISTNAME=	libexif-0.5.3
 CATEGORIES=	graphics
@@ -10,6 +10,7 @@ HOMEPAGE=	http://libexif.sourceforge.net/
 COMMENT=	EXIF file library
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index f0fd74e29e8..2059642f52c 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/10/30 04:13:54 rh Exp $
+# $NetBSD: Makefile,v 1.4 2002/12/01 13:49:41 salo Exp $
 #
 
 DISTNAME=		libgnomecanvas-2.0.4
@@ -15,6 +15,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/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile
index 8d5decc0be2..0fd58741842 100644
--- a/graphics/ogle_gui/Makefile
+++ b/graphics/ogle_gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/09/29 07:21:43 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/12/01 13:49:41 salo Exp $
 
 DISTNAME=	ogle_gui-0.8.5
 PKGREVISION=	1
@@ -10,6 +10,7 @@ HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
 COMMENT=	GUI for the Ogle DVD player
 
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 USE_GMAKE=		yes
 
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index c7e7a03e192..aa3457dc9f3 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/10/07 23:47:50 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/12/01 13:49:42 salo Exp $
 #
 
 DISTNAME=	sodipodi-0.25
@@ -11,6 +11,7 @@ COMMENT=	Open source vector graphics drawing program using SVG as native format
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index 91dca77b86d..7005f5b36e2 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/10/28 09:03:09 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/12/01 13:49:42 salo Exp $
 #
 
 DISTNAME=	tuxpaint-2002.10.26
@@ -9,9 +9,10 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.newbreedsoftware.com/tuxpaint/
 COMMENT=	drawing program for small children
 
-USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
-MANCOMPRESSED=	YES
+USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
+USE_GMAKE=		YES
+MANCOMPRESSED=		YES
 
 .include "../../audio/SDL-mixer/buildlink2.mk"
 .include "../../devel/SDL/buildlink2.mk"
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 3d50addfbae..890236df4df 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/10/21 15:02:26 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2002/12/01 13:49:42 salo Exp $
 #
 
 DISTNAME=	xsane-0.86
@@ -19,10 +19,11 @@ COMMENT=	New improved frontend for SANE
 
 BUILD_USES_MSGFMT=	yes
 
-GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
-USE_X11BASE=	YES
-USE_BUILDLINK2=	YES
+GNU_CONFIGURE=		YES
+USE_GMAKE=		YES
+USE_X11BASE=		YES
+USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"