USE_PKGLOCALEDIR, remove unnecessary patches, delint.

5 files changed, 6 insertions, 48 deletions

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)