Use PKGLOCALEDIR for the location of the installed locale files.

Also add a few GNOME files to the PLIST, remove redundant CPPFLAGS, and
use DEINSTALL_FILE to specify location of deinstallation script.

4 files changed, 35 insertions, 14 deletions

diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 580d0718a9a..3ecb6ae03e2 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/03/01 14:16:32 hubertf Exp $
+# $NetBSD: Makefile,v 1.29 2001/03/01 17:09:03 jlam Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp
 #
 
@@ -21,18 +21,15 @@ USE_X11BASE=		# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ARGS+=	--enable-japanese
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
-CPPFLAGS+=		-I${LOCALBASE}/include		# libintl.h
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 
-post-build:
-	${SED} -e 's#@PREFIX@#${PREFIX}#g' < ${PKGDIR}/DEINSTALL	\
-		> ${WRKDIR}/DEINSTALL
-
 # in case gnome isn't installed, we need to create the directories
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/gnome/apps/Multimedia
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+	${SED}	-e 's|@PREFIX@|${PREFIX}|g'				\
+		${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gqmpeg/files/patch-sum b/audio/gqmpeg/files/patch-sum
index 7f5bffe2dbe..31f1fa70c12 100644
--- a/audio/gqmpeg/files/patch-sum
+++ b/audio/gqmpeg/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.10 2001/01/18 04:04:32 hubertf Exp $
+$NetBSD: patch-sum,v 1.11 2001/03/01 17:09:03 jlam Exp $
 
 MD5 (patch-aa) = 0c1b4b14d0c110364f83c6287842ca98
+MD5 (patch-ab) = 766b531cc297d18bcd70986a2ab06166
diff --git a/audio/gqmpeg/patches/patch-ab b/audio/gqmpeg/patches/patch-ab
new file mode 100644
index 00000000000..9ff6b7e9204
--- /dev/null
+++ b/audio/gqmpeg/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.16 2001/03/01 17:09:03 jlam Exp $
+
+--- configure.orig	Wed Feb 28 02:00:28 2001
++++ configure
+@@ -2192,7 +2192,6 @@
+   FALSE_FALSE=
+ fi
+ 
+-localedir='${prefix}/share/locale'
+ 
+ 
+ ALL_LINGUAS="cs de fr ja pt_BR"
+@@ -4023,6 +4022,8 @@
+ 	< $srcdir/po/POTFILES.in > po/POTFILES
+   
+ 
++DATADIRNAME="${PKGLOCALEDIR}"
++localedir='${prefix}/${DATADIRNAME}/locale'
+ 
+ 
+ 
diff --git a/audio/gqmpeg/pkg/PLIST b/audio/gqmpeg/pkg/PLIST
index 6a88fed430d..d6c40ccd018 100644
--- a/audio/gqmpeg/pkg/PLIST
+++ b/audio/gqmpeg/pkg/PLIST
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.7 2001/03/01 14:16:33 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/03/01 17:09:04 jlam Exp $
 bin/gqmpeg
 bin/gqmpeg-shoutcast-plugin.sh
 man/man1/gqmpeg.1
+share/gnome/apps/Multimedia/gqmpeg.desktop
 share/gqmpeg/skins/SKIN-SPECS
-share/locale/cs/LC_MESSAGES/gqmpeg.mo
-share/locale/de/LC_MESSAGES/gqmpeg.mo
-share/locale/fr/LC_MESSAGES/gqmpeg.mo
-share/locale/ja/LC_MESSAGES/gqmpeg.mo
-share/locale/pt_BR/LC_MESSAGES/gqmpeg.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gqmpeg.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gqmpeg.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gqmpeg.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gqmpeg.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gqmpeg.mo
+share/pixmaps/gqmpeg.png
 @unexec rmdir -p %D/share/pixmaps 2> /dev/null || true
 @unexec rmdir -p %D/share/gqmpeg/skins 2> /dev/null || true
 @unexec rmdir -p %D/share/gnome/apps/Multimedia 2> /dev/null || true