Handle some shared directories by depending on (or updating dependancies to

the latest versions) xdg-dirs, xdg-x11-dirs or gnome*-dirs.
Bump PKGREVISION.

10 files changed, 30 insertions, 24 deletions

diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 45d9f02fcc1..4270d5c3a64 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2004/02/14 17:21:32 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	easytag-0.30
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=easytag/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://easytag.sourceforge.net/
 COMMENT=	Tool to view, edit and write ID3 v1&2 TAGs with a GTK+ interface
 
-DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=	gnome1-dirs>=1.5:../../misc/gnome1-dirs
 BUILD_USES_MSGFMT=	yes	# xgettext, really
 
 GNU_CONFIGURE=		yes
diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile
index 0606f7910d4..7397db2aa51 100644
--- a/audio/gdcd/Makefile
+++ b/audio/gdcd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/01/03 18:49:33 reed Exp $
+# $NetBSD: Makefile,v 1.22 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	gdcd-0.2.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://gdcd.undergrid.net/source_archive/
 
@@ -10,6 +10,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gdcd.undergrid.net/
 COMMENT=	CD player for the X Window System using the GIMP Tool Kit (GTK)
 
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index b8323325b94..ecee80af8c8 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/12/23 18:05:57 sketch Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	gnome-audio-2.0.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-audio/2.0/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +11,8 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Set of audio files for GNOME
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 USE_X11=	YES
diff --git a/audio/gnome-audio/PLIST b/audio/gnome-audio/PLIST
index 2667768d1e3..373a7bc5d7b 100644
--- a/audio/gnome-audio/PLIST
+++ b/audio/gnome-audio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/12/03 02:33:53 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/03/08 19:40:36 jmmv Exp $
 share/sounds/card_shuffle.wav
 share/sounds/email.wav
 share/sounds/error.wav
@@ -17,4 +17,3 @@ share/sounds/startup3.wav
 share/sounds/warning.wav
 @dirrm share/sounds/panel
 @dirrm share/sounds/gtk-events
-@unexec ${RMDIR} %D/share/sounds 2>/dev/null || ${TRUE}
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index d4f90afd792..54fd89d1fdd 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2003/08/30 22:51:11 jlam Exp $
+# $NetBSD: Makefile,v 1.76 2004/03/08 19:40:36 jmmv Exp $
 
 DISTNAME=		gqmpeg-0.20.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gqmpeg/}
 
@@ -10,7 +10,7 @@ HOMEPAGE=		http://gqmpeg.sourceforge.net/
 COMMENT=		GTK+ front end to mpg123
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 DEPENDS+=		mpg123{,-esound,-nas}>=0.59.18:../../audio/mpg123
 DEPENDS+=		vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
 DEPENDS+=		xmp>=2.0.2:../../audio/xmp
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 8a82faa8edb..184e67704b9 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/03/04 17:44:08 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/08 19:40:36 jmmv Exp $
 
 DISTNAME=	liteamp-0.2.4.1
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.kldp.net/liteamp/
 
@@ -8,8 +9,7 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://kldp.net/projects/liteamp/
 COMMENT=	Light-weight Music Player for GNOME2
 
-DEPENDS+=	xdg-dirs>=1.0:../../misc/xdg-dirs
-DEPENDS+=	gnome2-dirs>=1.2nb1:../../misc/gnome2-dirs
+DEPENDS+=	gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 72a14aa8eb8..3add865b70a 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/02/29 16:41:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	rhythmbox-0.6.7
+PKGREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.6/}
 
@@ -10,7 +11,7 @@ HOMEPAGE=	http://www.rhythmbox.org/
 COMMENT=	Music management application for GNOME
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 910b27bd38f..c01550f09f1 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/02/14 18:26:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	streamtuner-${DIST_VER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio www
 MASTER_SITES=	http://savannah.nongnu.org/download/streamtuner/streamtuner.pkg/${DIST_VER}/
 
@@ -10,7 +10,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/streamtuner/
 COMMENT=	Stream directory browser
 
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK2=		yes
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 904e69c60d4..99bf96cb70d 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/02/19 11:39:24 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	sweep-0.8.2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sweep/}
 
@@ -10,7 +10,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://sweep.sourceforge.net/
 COMMENT=	Full-featured digital sound editor
 
-DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=	gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 BUILD_USES_MSGFMT=	YES
 
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index 59be12c0610..8d1ef7e72e3 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/01/22 07:15:01 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:36 jmmv Exp $
 
 DISTNAME=	yamt-0.5
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=yamt/}
 
@@ -10,6 +10,7 @@ HOMEPAGE=	http://yamt.sourceforge.net/
 COMMENT=	Yet Another MP3 Tool
 
 BUILD_USES_MSGFMT=	yes
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
 
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes