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

*-dirs packages.

8 files changed, 16 insertions, 17 deletions

diff --git a/multimedia/alevt/Makefile b/multimedia/alevt/Makefile
index c4c10ca3072..29f7c90832b 100644
--- a/multimedia/alevt/Makefile
+++ b/multimedia/alevt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/22 03:31:25 kristerw Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/14 16:15:25 jmmv Exp $
 
 DISTNAME=	alevt-1.6.0
 PKGREVISION=	2
@@ -11,12 +11,12 @@ COMMENT=	Teletext decoder and browser for Brooktree 848 compatible TV cards
 
 DEPENDS+=	png>=1.2.1:../../graphics/png
 DEPENDS+=	fxtv>=1.02:../../multimedia/fxtv
-DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
 
 ONLY_FOR_PLATFORM=	NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
 			NetBSD-1.5_ALPHA-* NetBSD-1.[5-9]*-* \
 			NetBSD-[2-9]*-*
 
+USE_DIRS+=	xdg-x11-1.1
 USE_X11BASE=	YES
 USE_GNU_TOOLS+=	make
 
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 6ee87757b3a..cbf140474cc 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/05 18:41:14 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/14 16:15:25 jmmv Exp $
 #
 
 DISTNAME=	gmencoder-0.1.0
@@ -12,12 +12,12 @@ HOMEPAGE=	http://gmencoder.sourceforge.net/
 COMMENT=	GNOME2 frontend to mencoder
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=       	gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=       	mencoder>=0.90:../../multimedia/mencoder
 DEPENDS+=       	mplayer>=0.90:../../multimedia/mplayer
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
+USE_DIRS+=       	gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index 8ae8bd61089..80b2b304431 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/03/08 19:40:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/14 16:15:25 jmmv Exp $
 
 DISTNAME=		gnome-media-1.2.3
 PKGREVISION=		11
@@ -9,12 +9,11 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Set of audio/multimedia applications for GNOME
 
-DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
-
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
+USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index 0e4686d98c5..057f01f0d13 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/06 09:58:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/14 16:15:25 jmmv Exp $
 
 DISTNAME=		gnome-media-2.6.0
 PKGREVISION=		1
@@ -11,10 +11,10 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Set of audio/multimedia applications for GNOME2
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
+USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
diff --git a/multimedia/gst-player/Makefile b/multimedia/gst-player/Makefile
index 906a2a3d98f..6706697d9bd 100644
--- a/multimedia/gst-player/Makefile
+++ b/multimedia/gst-player/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/06 13:55:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/14 16:15:25 jmmv Exp $
 
 DISTNAME=	gst-player-0.8.0
 CATEGORIES=	audio graphics
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.gstreamer.net/
 COMMENT=	GStreamer Media Player
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS=                gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		gst-plugins-mad>=0.8.0:../../audio/gst-plugins-mad
 DEPENDS+=		gst-plugins-mpeg2dec>=0.8.0:../../multimedia/gst-plugins-mpeg2dec
 DEPENDS+=		gst-plugins-dvdnav>=0.8.0:../../multimedia/gst-plugins-dvdnav
@@ -20,6 +19,7 @@ DEPENDS+=		gst-plugins-theora>=0.8.0:../../multimedia/gst-plugins-theora
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
+USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 37d975cb980..f9f8120dc15 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/05 18:41:14 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:25 jmmv Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
 PKGREVISION=	3
@@ -11,9 +11,9 @@ CONFLICTS=	timidity-[0-9]*
 
 DEPENDS+=	xine-arts>=1rc0a:../../audio/xine-arts
 DEPENDS+=	trm>=0.2.1:../../audio/trm
-DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-1.1
 
 REPLACE_PERL=		kscd/workman2cddb.pl
 
diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile
index ed8f4dc5d36..bfe74e03acb 100644
--- a/multimedia/nautilus-media/Makefile
+++ b/multimedia/nautilus-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/04/06 10:09:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/14 16:15:26 jmmv Exp $
 #
 
 DISTNAME=	nautilus-media-0.8.0
@@ -12,7 +12,6 @@ HOMEPAGE=	http://thomas.apestaart.org/projects/nautilus-media/
 COMMENT=	Multimedia add-ons for Nautilus
 
 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-flac>=0.8.0:../../audio/gst-plugins-flac
 DEPENDS+=		gst-plugins-gnomevfs>=0.8.0:../../sysutils/gst-plugins-gnomevfs
@@ -22,6 +21,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_PERL5=		build
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index b1bcea292eb..c2c6fa28629 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/04/05 18:41:14 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/14 16:15:26 jmmv Exp $
 #
 
 DISTNAME=		xine-ui-0.9.23
@@ -11,12 +11,12 @@ HOMEPAGE=		http://xinehq.de/
 COMMENT=		Skinned xlib-based xine GUI
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 BUILDLINK_DEPENDS.curl=	curl>7.10.2
 
 USE_PKGLOCALEDIR=	YES
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-1.1
 USE_X11=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES