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

*-dirs packages.

13 files changed, 28 insertions, 31 deletions

diff --git a/net/amule/Makefile b/net/amule/Makefile
index 89ded583953..7d5cfaa7504 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/04/13 14:53:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/04/14 16:15:26 jmmv Exp $
 #
 
 DISTNAME=		aMule-1.2.6
@@ -12,12 +12,12 @@ MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://amule.sourceforge.net/
 COMMENT=		Another Emule P2P client
 
-DEPENDS=		xdg-dirs>=1.1:../../misc/xdg-dirs
 BUILD_USES_MSGFMT=	yes
 
 CONFLICTS=		xmule-[0-9]*
 
 USE_BUILDLINK3=		yes
+USE_DIRS+=		xdg-1.1
 USE_GNU_TOOLS+=		make
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index b6f70c56ec7..62b350bd3e0 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/04/01 18:54:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/04/14 16:15:26 jmmv Exp $
 #
 
 DISTNAME=		bug-buddy-2.6.0
@@ -11,10 +11,10 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Graphical GNOME2 bug reporting tool
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
+USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index 4376e6982f8..bcbca10194d 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/03/26 02:27:47 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/14 16:15:26 jmmv Exp $
 #
 
 DISTNAME=	dc_gui2-0.75
@@ -12,10 +12,10 @@ HOMEPAGE=	http://www.ac2i.tzo.com/dctc/
 COMMENT=	Graphical user interface for DCTC
 
 DEPENDS+=	dctc>=0.85.4:../../net/dctc
-DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
+USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
 CONFIGURE_ARGS+=	--enable-manual-db-detect
 USE_GNU_TOOLS+=		make
diff --git a/net/ed2k-gtk-gui/Makefile b/net/ed2k-gtk-gui/Makefile
index 58ff6292251..c536383eeb1 100644
--- a/net/ed2k-gtk-gui/Makefile
+++ b/net/ed2k-gtk-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/04/09 13:56:22 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/14 16:15:26 jmmv Exp $
 
 DISTNAME=		ed2k-gtk-gui-0.6.2
 CATEGORIES=		net
@@ -8,9 +8,8 @@ MAINTAINER=		minskim@NetBSD.org
 HOMEPAGE=		http://ed2k-gtk-gui.sourceforge.net/
 COMMENT=		GUI for the eDonkey2000 and Overnet
 
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
-
 USE_BUILDLINK3=		yes
+USE_DIRS+=		xdg-1.1
 USE_X11=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 644b2279162..1d0ca5c8bfc 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/03/26 02:27:47 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2004/04/14 16:15:26 jmmv Exp $
 #
 
 DISTNAME=	etherape-0.9.0
@@ -10,11 +10,10 @@ MAINTAINER=	damon@NetBSD.org
 HOMEPAGE=	http://etherape.sourceforge.net/
 COMMENT=	Graphical network monitor
 
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
-
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_BUILDLINK3=		YES
+USE_DIRS+=		xdg-1.1
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
diff --git a/net/gftp-gtk1/Makefile b/net/gftp-gtk1/Makefile
index 604bd664c55..7ff77de1dfe 100644
--- a/net/gftp-gtk1/Makefile
+++ b/net/gftp-gtk1/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2004/04/05 02:45:45 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/14 16:15:26 jmmv Exp $
 
 .include "${.CURDIR}/../gftp/Makefile.common"
 
 PKGNAME=	gftp-gtk1-${VERSION}
 COMMENT=	Multithreaded GTK+ ftp client
 
-DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
 CONFLICTS=	gftp-[0-9]*
 
+USE_DIRS+=	gnome1-1.0
+
 CONFIGURE_ARGS+=	--disable-gtk20
 
 PLIST_SRC=	${.CURDIR}/../gftp/PLIST
diff --git a/net/gftp/Makefile b/net/gftp/Makefile
index e488c10c816..f80cd8d2f47 100644
--- a/net/gftp/Makefile
+++ b/net/gftp/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2004/04/05 02:45:45 xtraeme Exp $
+# $NetBSD: Makefile,v 1.20 2004/04/14 16:15:26 jmmv Exp $
 #
 
 .include "${.CURDIR}/Makefile.common"
 
 COMMENT=	Multithreaded GTK2+ ftp client
 
-DEPENDS+=	gnome2-dirs>=1.5:../../misc/gnome2-dirs
-
 CONFLICTS=	gftp-gtk1-[0-9]*
 
+USE_DIRS+=	gnome2-1.5
+
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gftp/Makefile.common b/net/gftp/Makefile.common
index d1525ff932b..1ad0b448ae9 100644
--- a/net/gftp/Makefile.common
+++ b/net/gftp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/04/05 02:45:45 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/04/14 16:15:26 jmmv Exp $
 
 DISTNAME=	gftp-${VERSION}
 CATEGORIES=	net
@@ -10,9 +10,9 @@ MAINTAINER=	jmcneill@invisible.yi.org
 HOMEPAGE=	http://gftp.seul.org/
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_BUILDLINK3=		yes
+USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile
index 280e0a639ca..e3f0f034c5e 100644
--- a/net/gnapster/Makefile
+++ b/net/gnapster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/03/26 02:27:48 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2004/04/14 16:15:26 jmmv Exp $
 
 DISTNAME=	gnapster-1.5.0
 PKGREVISION=	9
@@ -10,9 +10,9 @@ HOMEPAGE=	http://sourceforge.net/projects/gnapster/
 COMMENT=	Simple client for the online mp3 community
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-1.1
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 94f59df58ea..3bf51958861 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/01 19:09:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/14 16:15:26 jmmv Exp $
 #
 
 DISTNAME=	gnome-netstatus-2.6.0
@@ -10,10 +10,9 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Network status applet for the GNOME panel
 
-DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
-
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
+USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/net/gtm/Makefile b/net/gtm/Makefile
index e452ecf074e..0893ce667cd 100644
--- a/net/gtm/Makefile
+++ b/net/gtm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/03/26 02:27:48 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/14 16:15:26 jmmv Exp $
 #
 
 DISTNAME=	gtm-0.4.12
@@ -11,9 +11,9 @@ HOMEPAGE=	http://gtm.sourceforge.net/
 COMMENT=	Gnome Transfer Manager
 
 DEPENDS+=	wget-[0-9]*:../../net/wget
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index ea4a25e2af5..638a8a90b16 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/03/26 02:27:48 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2004/04/14 16:15:26 jmmv Exp $
 
 DISTNAME=	kdenetwork-${_KDE_VERSION}
 PKGREVISION=	1
@@ -7,11 +7,10 @@ COMMENT=	Network modules for the KDE integrated X11 desktop
 
 CONFLICTS=	kopete-[0-9]*
 
-DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
-
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_BUILDLINK2=		yes
+USE_DIRS+=		xdg-1.1
 PTHREAD_OPTS+=		require
 
 REPLACE_PERL=		ksirc/dsirc
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 0edc3ae7edf..8b1faec964b 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/03/26 02:27:50 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/14 16:15:26 jmmv Exp $
 #
 
 DISTNAME=		tsclient-0.132
@@ -12,10 +12,10 @@ COMMENT=		GNOME2 Frontend for rdesktop
 
 DEPENDS+=       	rdesktop-[0-9]*:../../net/rdesktop
 DEPENDS+=       	vncviewer-[0-9]*:../../net/vncviewer
-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_PKGLOCALEDIR=	yes
 USE_PERL5=		run