Install gnome-support files even if gnome is not installed; this way

we don't have to have separate PLISTs for the two cases.

4 files changed, 31 insertions, 3 deletions

diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 5566722a504..602989ae625 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/12/08 21:18:35 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2000/12/18 04:21:08 wiz Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp
 #
 
@@ -29,4 +29,9 @@ 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
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gqmpeg/files/patch-sum b/audio/gqmpeg/files/patch-sum
index 0c22ac0a37f..167ff070dcc 100644
--- a/audio/gqmpeg/files/patch-sum
+++ b/audio/gqmpeg/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.8 2000/12/08 21:24:52 wiz Exp $
+$NetBSD: patch-sum,v 1.9 2000/12/18 04:21:09 wiz Exp $
 
+MD5 (patch-aa) = 19328e0a939e495c64880ac71b9e07b3
 MD5 (patch-ab) = 8d569fd0f1ce557af0b9994e5ce481d8
diff --git a/audio/gqmpeg/patches/patch-aa b/audio/gqmpeg/patches/patch-aa
new file mode 100644
index 00000000000..b8378e03747
--- /dev/null
+++ b/audio/gqmpeg/patches/patch-aa
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.11 2000/12/18 04:21:09 wiz Exp $
+
+--- Makefile.in.orig	Sun Dec  3 07:35:39 2000
++++ Makefile.in
+@@ -109,11 +109,11 @@
+ skindir = $(prefix)/share/gqmpeg/skins
+ skin_DATA = 
+ 
+-@HAVE_GNOME_TRUE@desktopdir = $(GNOME_DATADIR)/gnome/apps/Multimedia
+-@HAVE_GNOME_TRUE@desktop_DATA = gqmpeg.desktop
++desktopdir = $(datadir)/gnome/apps/Multimedia
++desktop_DATA = gqmpeg.desktop
+ 
+-@HAVE_GNOME_TRUE@icondir = $(GNOME_DATADIR)/pixmaps
+-@HAVE_GNOME_TRUE@icon_DATA = gqmpeg.png
++icondir = $(datadir)/pixmaps
++icon_DATA = gqmpeg.png
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
diff --git a/audio/gqmpeg/pkg/PLIST b/audio/gqmpeg/pkg/PLIST
index b6cf33676de..ff9b635f372 100644
--- a/audio/gqmpeg/pkg/PLIST
+++ b/audio/gqmpeg/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/08/04 18:35:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/12/18 04:21:09 wiz Exp $
 bin/gqmpeg
 bin/gqmpeg-shoutcast-plugin.sh
 man/man1/gqmpeg.1
@@ -10,4 +10,6 @@ share/locale/ja/LC_MESSAGES/gqmpeg.mo
 share/locale/pt_BR/LC_MESSAGES/gqmpeg.mo
 share/pixmaps/gqmpeg.png
 @exec mkdir -p %D/share/gqmpeg/skins
+@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