Fix PKGLOCALEDIR usage. Closes pkg/18661

5 files changed, 49 insertions, 6 deletions

diff --git a/audio/mad/Makefile b/audio/mad/Makefile
index e0bfc7f811a..28653612f55 100644
--- a/audio/mad/Makefile
+++ b/audio/mad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/10/03 20:43:04 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/11/18 07:57:45 salo Exp $
 #
 
 DISTNAME=	mad-0.14.2b
@@ -19,6 +19,8 @@ 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 d97614268c8..09e33efac29 100644
--- a/audio/mad/distinfo
+++ b/audio/mad/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/12/14 09:20:18 toshii Exp $
+$NetBSD: distinfo,v 1.5 2002/11/18 07:57:45 salo Exp $
 
 SHA1 (mad-0.14.2b.tar.gz) = 07303e2a512a9956d63fef3451ae7823e5f03b68
 Size (mad-0.14.2b.tar.gz) = 721345 bytes
-SHA1 (patch-ac) = c02a8a2e8c720bb8fb96c1b48ef76db010375d11
+SHA1 (patch-aa) = e07a6ad0b2b8cda0f52870ce6fb31913ca4f3798
+SHA1 (patch-ab) = c2f5a2d2142648cd1611a3a309160fba107ca83b
+SHA1 (patch-ac) = 85e8220cba070d29f44385a293782444247065f7
diff --git a/audio/mad/patches/patch-aa b/audio/mad/patches/patch-aa
new file mode 100644
index 00000000000..34ddc0caf88
--- /dev/null
+++ b/audio/mad/patches/patch-aa
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..b47313a064f
--- /dev/null
+++ b/audio/mad/patches/patch-ab
@@ -0,0 +1,15 @@
+$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 56bde7e71a5..65695b78554 100644
--- a/audio/mad/patches/patch-ac
+++ b/audio/mad/patches/patch-ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2001/12/14 09:19:21 toshii Exp $
+$NetBSD: patch-ac,v 1.3 2002/11/18 07:57:47 salo Exp $
 
---- Makefile.in.orig	Fri Nov  9 16:02:44 2001
-+++ Makefile.in	Fri Dec 14 17:37:18 2001
+--- 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)\"
+ 
+ 
 @@ -144,7 +144,7 @@
  ldadd_libmad = $(depend_libmad)
  ldadd_libid3tag = $(depend_libid3tag) $(ldadd_libz)