USE_PKGLOCALEDIR, remove unnecessary patches, delint.

14 files changed, 80 insertions, 115 deletions

diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 554a1196108..e94b63e6824 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/10/13 11:55:54 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2002/11/30 11:46:02 salo Exp $
 
 DISTNAME=	aumix-2.7
 CATEGORIES=	audio
@@ -15,6 +15,7 @@ COMMENT=	Set mix levels
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-own-labels
 CONFIGURE_ARGS+=	--enable-nls
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 960ed4a37c0..fa4f599d48a 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/09/02 17:42:39 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2002/11/30 11:46:03 salo Exp $
 #
 
 DISTNAME=	easytag-0.23.2
@@ -11,16 +11,14 @@ COMMENT=	Tool to view, edit and write ID3 v1&2 TAGs with a GTK+ interface
 
 BUILD_USES_MSGFMT=	yes				# xgettext, really
 
-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 "../../audio/id3lib/buildlink2.mk"
 .include "../../audio/libvorbis/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
-
-MAKE_ENV+=	PKGLOCALEDIR=${PKGLOCALEDIR}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 36f3dd69ee3..e9c94f93a2d 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/11/02 02:42:01 rh Exp $
+# $NetBSD: Makefile,v 1.20 2002/11/30 11:46:04 salo Exp $
 
 DISTNAME=		gnome-media-1.2.3
 PKGREVISION=		3
@@ -9,12 +9,14 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Set of audio/multimedia applications for GNOME
 
+BUILD_USES_MSGFMT=	YES
+
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
-BUILD_USES_MSGFMT=	YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
diff --git a/audio/gnome-media/PLIST b/audio/gnome-media/PLIST
index bfb8ade7626..db0027aa1a5 100644
--- a/audio/gnome-media/PLIST
+++ b/audio/gnome-media/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/07/17 13:22:49 rh Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/11/30 11:46:04 salo Exp $
 bin/cddbslave
 bin/cddbsubmit
 bin/gmix
@@ -30,38 +30,38 @@ share/gnome/help/gmix/it/index.html
 share/gnome/help/gmix/it/license.html
 share/gnome/help/gmix/it/ln10.html
 share/gnome/help/gmix/it/topic.dat
-share/locale/az/LC_MESSAGES/gnome-media.mo
-share/locale/cs/LC_MESSAGES/gnome-media.mo
-share/locale/da/LC_MESSAGES/gnome-media.mo
-share/locale/de/LC_MESSAGES/gnome-media.mo
-share/locale/en_GB/LC_MESSAGES/gnome-media.mo
-share/locale/es/LC_MESSAGES/gnome-media.mo
-share/locale/et/LC_MESSAGES/gnome-media.mo
-share/locale/fi/LC_MESSAGES/gnome-media.mo
-share/locale/fr/LC_MESSAGES/gnome-media.mo
-share/locale/ga/LC_MESSAGES/gnome-media.mo
-share/locale/hu/LC_MESSAGES/gnome-media.mo
-share/locale/it/LC_MESSAGES/gnome-media.mo
-share/locale/ja/LC_MESSAGES/gnome-media.mo
-share/locale/ko/LC_MESSAGES/gnome-media.mo
-share/locale/nl/LC_MESSAGES/gnome-media.mo
-share/locale/no/LC_MESSAGES/gnome-media.mo
-share/locale/pl/LC_MESSAGES/gnome-media.mo
-share/locale/pt/LC_MESSAGES/gnome-media.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-media.mo
-share/locale/ru/LC_MESSAGES/gnome-media.mo
-share/locale/sk/LC_MESSAGES/gnome-media.mo
-share/locale/sl/LC_MESSAGES/gnome-media.mo
-share/locale/sv/LC_MESSAGES/gnome-media.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnome-media.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-media.mo
-share/locale/ca/LC_MESSAGES/gnome-media.mo
-share/locale/el/LC_MESSAGES/gnome-media.mo
-share/locale/ro/LC_MESSAGES/gnome-media.mo
-share/locale/uk/LC_MESSAGES/gnome-media.mo
-share/locale/gl/LC_MESSAGES/gnome-media.mo
-share/locale/lt/LC_MESSAGES/gnome-media.mo
-share/locale/tr/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-media.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-media.mo
 share/omf/gnome-media/gmix-C.omf
 share/omf/gnome-media/gmix-it.omf
 share/pixmaps/gnome-grecord.png
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index b594b81d985..86b77e9b320 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2002/09/11 09:48:46 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2002/11/30 11:46:04 salo Exp $
 #
 
 DISTNAME=		gqmpeg-0.19.0
@@ -15,10 +15,9 @@ DEPENDS+=		vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
 DEPENDS+=		xmp>=2.0.2:../../audio/xmp
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--without-included-gettext \
-			--datadir=${PREFIX}/${PKGLOCALEDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -28,6 +27,7 @@ CONFIGURE_ARGS+=	--enable-japanese
 .if !defined(GQMPEG_NO_RUSSIAN)
 CONFIGURE_ARGS+=	--enable-russian
 .endif
+CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ENV+=		GNOME_DATADIR=${PREFIX}/share
 
 # in case gnome isn't installed, we need to create the directories
diff --git a/audio/mad/Makefile b/audio/mad/Makefile
index 28653612f55..b83d22ca627 100644
--- a/audio/mad/Makefile
+++ b/audio/mad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/11/18 07:57:45 salo Exp $
+# $NetBSD: Makefile,v 1.9 2002/11/30 11:46:04 salo Exp $
 #
 
 DISTNAME=	mad-0.14.2b
@@ -15,12 +15,11 @@ BUILD_USES_MSGFMT=	YES
 CONFLICTS=	madplay-[0-9]*
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
-
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../audio/esound/buildlink2.mk"
diff --git a/audio/mad/distinfo b/audio/mad/distinfo
index 09e33efac29..0144cd9ee48 100644
--- a/audio/mad/distinfo
+++ b/audio/mad/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/11/18 07:57:45 salo Exp $
+$NetBSD: distinfo,v 1.6 2002/11/30 11:46:05 salo Exp $
 
 SHA1 (mad-0.14.2b.tar.gz) = 07303e2a512a9956d63fef3451ae7823e5f03b68
 Size (mad-0.14.2b.tar.gz) = 721345 bytes
-SHA1 (patch-aa) = e07a6ad0b2b8cda0f52870ce6fb31913ca4f3798
-SHA1 (patch-ab) = c2f5a2d2142648cd1611a3a309160fba107ca83b
-SHA1 (patch-ac) = 85e8220cba070d29f44385a293782444247065f7
+SHA1 (patch-ac) = 8d70ebc8823a876ee72fb89e14fbc4cfcd755c45
diff --git a/audio/mad/patches/patch-aa b/audio/mad/patches/patch-aa
deleted file mode 100644
index 34ddc0caf88..00000000000
--- a/audio/mad/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/11/18 07:57:46 salo Exp $
-
---- intl/Makefile.in.orig	Wed Oct 25 23:52:11 2000
-+++ intl/Makefile.in	Mon Nov 18 05:08:20 2002
-@@ -31,8 +31,8 @@
- libdir = $(exec_prefix)/lib
- includedir = $(prefix)/include
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
--gnulocaledir = $(prefix)/share/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
-+gnulocaledir = $(localedir)
- gettextsrcdir = @datadir@/gettext/intl
- aliaspath = $(localedir):.
- subdir = intl
diff --git a/audio/mad/patches/patch-ab b/audio/mad/patches/patch-ab
deleted file mode 100644
index b47313a064f..00000000000
--- a/audio/mad/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/11/18 07:57:46 salo Exp $
-
---- po/Makefile.in.in.orig	Tue Oct 23 04:35:49 2001
-+++ po/Makefile.in.in	Mon Nov 18 05:01:03 2002
-@@ -19,8 +19,8 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
--gnulocaledir = $(prefix)/share/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
-+gnulocaledir = $(localedir)
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
- 
diff --git a/audio/mad/patches/patch-ac b/audio/mad/patches/patch-ac
index 65695b78554..d28c5ebd12d 100644
--- a/audio/mad/patches/patch-ac
+++ b/audio/mad/patches/patch-ac
@@ -1,16 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2002/11/18 07:57:47 salo Exp $
+$NetBSD: patch-ac,v 1.4 2002/11/30 11:46:06 salo Exp $
 
 --- Makefile.in.orig	Fri Nov  9 08:02:44 2001
-+++ Makefile.in	Mon Nov 18 04:56:00 2002
-@@ -134,7 +134,7 @@
- 
- audio = @AUDIO@
- 
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- INCLUDES = -Ilibmad -I$(srcdir)/libid3tag -Iintl  			-DLOCALEDIR=\"$(localedir)\"
- 
- 
++++ Makefile.in	Sat Nov 30 12:29:36 2002
 @@ -144,7 +144,7 @@
  ldadd_libmad = $(depend_libmad)
  ldadd_libid3tag = $(depend_libid3tag) $(ldadd_libz)
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 5ed5cb7cc3c..697b5184167 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/11/29 17:27:07 kim Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/30 11:46:06 salo Exp $
 #
 
 DISTNAME=	normalize-0.7.6
@@ -9,13 +9,15 @@ MAINTAINER=	lukem@netbsd.org
 HOMEPAGE=	http://www.cs.columbia.edu/~cvaill/normalize/
 COMMENT=	Wave (.wav) file volume normalizer
 
-USE_BUILDLINK2=	YES
-GNU_CONFIGURE=	YES
-USE_GNU_GETTEXT=YES
-CONFIGURE_ARGS+=--without-libiconv-prefix
-CONFIGURE_ARGS+=--without-libintl-prefix
-#CONFIGURE_ARGS+=--with-audiofile
-CONFIGURE_ARGS+=--with-mad
+USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
+GNU_CONFIGURE=		YES
+USE_GNU_GETTEXT=	YES
+
+CONFIGURE_ARGS+=	--without-libiconv-prefix
+CONFIGURE_ARGS+=	--without-libintl-prefix
+#CONFIGURE_ARGS+=	--with-audiofile
+CONFIGURE_ARGS+=	--with-mad
 
 #.include "../../audio/libaudiofile/buildlink2.mk"
 .include "../../audio/mad/buildlink2.mk"
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 298be1ad250..8ed33c5b18e 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/09/16 14:51:21 uebayasi Exp $
+# $NetBSD: Makefile,v 1.20 2002/11/30 11:46:06 salo Exp $
 
 DISTNAME=	vorbis-tools-1.0
 PKGNAME=	vorbis-tools-1.0.0.8
@@ -16,6 +16,7 @@ BUILD_DEFS+=	USE_INET6
 CONFLICTS=	vorbis-[0-9]*
 
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 0d7d9d64dbc..766e8bd1dea 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/11/03 23:05:26 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2002/11/30 11:46:07 salo Exp $
 #
 
 DISTNAME=	xmms-1.2.7
@@ -11,19 +11,20 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.xmms.org/
 COMMENT=	X Multimedia System --- An audio player with a Winamp GUI
 
-USE_BUILDLINK2=	yes
-USE_LIBTOOL=	yes
-USE_GMAKE=	yes
-USE_X11=	yes
-GNU_CONFIGURE=	yes
+USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
+USE_LIBTOOL=		yes
+USE_GMAKE=		yes
+USE_X11=		yes
+GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--without-gnome
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 # Broken configure script assumes that iconv_open lives in libc; work around.  
-CPPFLAGS+=		-DHAVE_ICONV_OPEN=1                                     
-CONFIGURE_ENV+=		ac_cv_func_iconv_open=yes                       
-LIBS+=			-liconv                                                 
+CPPFLAGS+=		-DHAVE_ICONV_OPEN=1
+CONFIGURE_ENV+=		ac_cv_func_iconv_open=yes
+LIBS+=			-liconv
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index d9d4acb6b93..9362983db9a 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/21 02:15:57 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/30 11:46:07 salo Exp $
 
 DISTNAME=	yamt-0.5
 CATEGORIES=	audio
@@ -8,11 +8,13 @@ MAINTAINER=	rxg@netbsd.org
 HOMEPAGE=	http://yamt.sourceforge.net/
 COMMENT=	Yet Another MP3 Tool
 
+BUILD_USES_MSGFMT=	yes
+
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 USE_X11BASE=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
-BUILD_USES_MSGFMT=	yes
 
 .include "../../x11/gnome-libs/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"