Subject: pkg/18661: audio/mad lacks proper PKGLOCALEDIR support (patch included)
To: None <gnats-bugs@gnats.netbsd.org>
From: Lubomir Sedlacik <salo@Xtrmntr.org>
List: netbsd-bugs
Date: 10/15/2002 03:20:47
>Number:         18661
>Category:       pkg
>Synopsis:       audio/mad lacks proper PKGLOCALEDIR support (patch included)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Oct 14 18:21:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Lubomir Sedlacik
>Release:        SunOS 5.9
>Organization:
>Environment:
>Description:

audio/mad doesn't have any patches for correct PKGLOCALEDIR support and
installs locale catalogues into wrong directories on Solaris.

>How-To-Repeat:

try to build audio/mad on Solaris machine

>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/mad/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile	3 Oct 2002 20:43:04 -0000	1.7
+++ Makefile	15 Oct 2002 01:14:40 -0000
@@ -19,6 +19,8 @@
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
+
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../audio/esound/buildlink2.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/mad/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	14 Dec 2001 09:20:18 -0000	1.4
+++ distinfo	15 Oct 2002 01:14:40 -0000
@@ -2,4 +2,5 @@
 
 SHA1 (mad-0.14.2b.tar.gz) = 07303e2a512a9956d63fef3451ae7823e5f03b68
 Size (mad-0.14.2b.tar.gz) = 721345 bytes
-SHA1 (patch-ac) = c02a8a2e8c720bb8fb96c1b48ef76db010375d11
+SHA1 (patch-aa) = 2075c9884c3018b650c5d56119ea7c5443d6b371
+SHA1 (patch-ac) = 5dc723a95fb755e0bf0f8de04bbeac5502dd1788
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/audio/mad/patches/patch-ac,v
retrieving revision 1.2
diff -u -r1.2 patch-ac
--- patches/patch-ac	14 Dec 2001 09:19:21 -0000	1.2
+++ patches/patch-ac	15 Oct 2002 01:14:40 -0000
@@ -1,7 +1,16 @@
 $NetBSD: patch-ac,v 1.2 2001/12/14 09:19:21 toshii 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	Tue Oct 15 02:40:51 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)


new file patches/patch-aa:

--- /dev/null	Tue Oct 15 03:03:01 2002
+++ patches/patch-aa	Tue Oct 15 01:52:52 2002
@@ -1,0 +1,15 @@
+$NetBSD$
+
+--- po/Makefile.in.in.orig	Tue Oct 23 04:35:49 2001
++++ po/Makefile.in.in	Tue Oct 15 01:52:26 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 = $(prefix)/${PKGLOCALEDIR}/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
+ 
>Release-Note:
>Audit-Trail:
>Unformatted: