Make use of the new USE_DIRS variable, instead of directly depending on the

*-dirs packages.

10 files changed, 20 insertions, 24 deletions

diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index 11392a54169..17a5652c05d 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/04/14 12:46:39 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/04/14 16:15:20 jmmv Exp $
 #
 
 DISTNAME=	bmp-0.9.6.1
@@ -9,14 +9,13 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://beepmp.sourceforge.net/
 COMMENT=	Beep Media Player (fork of XMMS to work with GTK+ 2.x)
 
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
-
 DISTINFO_FILE=		${.CURDIR}/../../audio/bmp/distinfo
 FILESDIR=		${.CURDIR}/../../audio/xmms/files
 PATCHDIR=		${.CURDIR}/../../audio/bmp/patches
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
+USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 3f8994e6f34..ff487d7e799 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/04/11 16:08:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.40 2004/04/14 16:15:20 jmmv Exp $
 #
 
 DISTNAME=	easytag-0.30
@@ -11,10 +11,10 @@ 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.5:../../misc/gnome1-dirs
 BUILD_USES_MSGFMT=	yes	# xgettext, really
 
 GNU_CONFIGURE=		yes
+USE_DIRS+=		gnome1-1.5
 USE_GNU_TOOLS+=		make
 USE_X11=		yes
 USE_BUILDLINK3=		yes
diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile
index ba865249273..5a35b40a28f 100644
--- a/audio/gdcd/Makefile
+++ b/audio/gdcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/04/11 16:53:36 xtraeme Exp $
+# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:20 jmmv Exp $
 #
 
 DISTNAME=	gdcd-0.2.1
@@ -10,8 +10,7 @@ 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_DIRS+=	xdg-x11-1.1
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 USE_BUILDLINK3=	YES
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 7d2063a51f8..17964096324 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/03/22 08:12:28 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/14 16:15:20 jmmv Exp $
 #
 
 DISTNAME=	gnome-audio-2.0.0
@@ -11,10 +11,10 @@ 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_DIRS+=	xdg-1.1
 USE_X11=	YES
 
 do-install:
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index f5eeefe4319..60f7ec99221 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2004/04/11 17:13:40 xtraeme Exp $
+# $NetBSD: Makefile,v 1.79 2004/04/14 16:15:20 jmmv Exp $
 
 DISTNAME=		gqmpeg-0.20.0
 PKGREVISION=		4
@@ -10,12 +10,12 @@ HOMEPAGE=		http://gqmpeg.sourceforge.net/
 COMMENT=		GTK+ front end to mpg123
 
 BUILD_USES_MSGFMT=	yes
-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
 
 USE_BUILDLINK3=		YES
+USE_DIRS+=		gnome1-1.5
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index ecbb66d321d..f2308c06a7f 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/11 03:10:25 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/14 16:15:20 jmmv Exp $
 
 DISTNAME=	liteamp-0.2.4.2
 CATEGORIES=	audio
@@ -8,9 +8,8 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://kldp.net/projects/liteamp/
 COMMENT=	Light-weight Music Player for GNOME2
 
-DEPENDS+=	gnome2-dirs>=1.5:../../misc/gnome2-dirs
-
 USE_BUILDLINK3=		yes
+USE_DIRS+=		gnome2-1.5
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 39339808c2b..0ad287c6af7 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/06 09:53:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:21 jmmv Exp $
 #
 
 DISTNAME=	rhythmbox-0.7.2
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.rhythmbox.org/
 COMMENT=	Music management application for GNOME
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		gst-plugins-esound>=0.8.0:../../audio/gst-plugins-esound
 DEPENDS+=		gst-plugins-gnomevfs>=0.8.0:../../sysutils/gst-plugins-gnomevfs
 DEPENDS+=		gst-plugins-mad>=0.8.0:../../audio/gst-plugins-mad
@@ -19,6 +18,7 @@ DEPENDS+=		gst-plugins-vorbis>=0.8.0:../../audio/gst-plugins-vorbis
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
+USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 08d95aeb581..2784f7dbe24 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/03/30 22:21:31 xtraeme Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/14 16:15:21 jmmv Exp $
 #
 
 DISTNAME=	streamtuner-0.12.1
@@ -9,10 +9,10 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/streamtuner/
 COMMENT=	Stream directory browser
 
-DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK3=		yes
+USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 99bf96cb70d..ef61cdc60c3 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/03/08 19:40:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/14 16:15:21 jmmv Exp $
 #
 
 DISTNAME=	sweep-0.8.2
@@ -10,11 +10,10 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://sweep.sourceforge.net/
 COMMENT=	Full-featured digital sound editor
 
-DEPENDS+=	gnome1-dirs>=1.5:../../misc/gnome1-dirs
-
 BUILD_USES_MSGFMT=	YES
 
 USE_BUILDLINK3=		YES
+USE_DIRS+=		gnome1-1.5
 USE_LIBTOOL=		YES
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	YES
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index 6250fadde4d..f68311c81cc 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/04/11 19:13:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/14 16:15:21 jmmv Exp $
 
 DISTNAME=	yamt-0.5
 PKGREVISION=	6
@@ -10,9 +10,9 @@ 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_BUILDLINK3=		yes
+USE_DIRS+=		xdg-x11-1.1
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 USE_GNU_TOOLS+=		make