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/devel/anjuta/Makefile b/devel/anjuta/Makefile
index a43d3c115a8..a1eb1ddcbd6 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/03/26 02:27:37 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2004/04/14 16:15:21 jmmv Exp $
 #
 
 DISTNAME=		anjuta-1.2.1
@@ -16,13 +16,13 @@ DEPENDS+=		gdk-pixbuf>=0.22:../../graphics/gdk-pixbuf
 DEPENDS+=		gettext>=0.11.5:../../devel/gettext
 DEPENDS+=		glade2>=2.0.1:../../devel/glade2
 DEPENDS+=		gmake>=3.80:../../devel/gmake
-DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		gnome2-terminal>=2.4.2:../../x11/gnome2-terminal
 DEPENDS+=		libtool>=1.5.2:../../devel/libtool
 DEPENDS+=		pkgconfig>=0.15.0:../../devel/pkgconfig
 DEPENDS+=		yelp>=2.4.2:../../misc/yelp
 
 USE_BUILDLINK3=		YES
+USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index a0903c78813..62ba592acd2 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:37 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/14 16:15:21 jmmv Exp $
 
 DISTNAME=		devhelp-0.7
 PKGREVISION=		9
@@ -10,9 +10,8 @@ MAINTAINER=		benedikt.meurer@unix-ag.uni-siegen.de
 HOMEPAGE=		http://www.imendio.com/projects/devhelp/
 COMMENT=		Documentation viewer based on GNOME2
 
-DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
-
 USE_BUILDLINK3=		yes
+USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PERL5=		build
diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile
index 6ac95cec428..371a3975faa 100644
--- a/devel/eel2/Makefile
+++ b/devel/eel2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/04/01 18:36:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.30 2004/04/14 16:15:21 jmmv Exp $
 #
 
 DISTNAME=		eel-2.6.0
@@ -12,9 +12,9 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Eazel Extensions Library for GNOME2
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 USE_BUILDLINK3=		YES
+USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 718b0ee8946..a802ca4fdee 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2004/04/11 16:29:52 snj Exp $
+# $NetBSD: Makefile,v 1.48 2004/04/14 16:15:21 jmmv Exp $
 
 DISTNAME=	glade-0.6.4
 PKGREVISION=	6
@@ -9,9 +9,8 @@ MAINTAINER=     tech-pkg@NetBSD.org
 HOMEPAGE=	http://glade.gnome.org/
 COMMENT=	User interface builder for GTK+
 
-DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
-
 GNU_CONFIGURE=		yes
+USE_DIRS+=		xdg-x11-1.1
 USE_GNU_TOOLS+=		make
 USE_X11BASE=		yes
 USE_BUILDLINK3=		yes
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 02146aca280..c6c5ba45032 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/03/26 02:27:37 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2004/04/14 16:15:21 jmmv Exp $
 #
 
 DISTNAME=		glade-2.0.1
@@ -13,10 +13,10 @@ HOMEPAGE=		http://glade.gnome.org/
 COMMENT=		User interface builder for the GTK2+ toolkit and 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_GNU_TOOLS+=		make
 USE_X11=		YES
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 40d59510217..98c07af2f8e 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:38 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/14 16:15:22 jmmv Exp $
 #
 
 DISTNAME=	gtranslator-1.0
@@ -11,10 +11,10 @@ HOMEPAGE=	http://www.gtranslator.org/
 COMMENT=	Gettext po file editor for the GNOME2 desktop environment
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
+USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 397b3858c35..0a5b7aa58ba 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/03/26 02:27:38 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:22 jmmv Exp $
 
 DISTNAME=	kdesdk-${_KDE_VERSION}
 PKGREVISION=	1
@@ -8,11 +8,10 @@ COMMENT=	Support applications and tools used by KDE developers
 CONFLICTS+=	cervisia-[0-9]*
 CONFLICTS+=	umbrello-[0-9]*
 
-DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
-
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-1.1
 LTCONFIG_OVERRIDE+=	${WRKSRC}/kapptemplate/admin/ltconfig
 
 BUILD_DEPENDS+= qt3-tools>=3.1.1:../../x11/qt3-tools
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index b1cb8103f0a..c28624c42b0 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/04/01 18:23:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.32 2004/04/14 16:15:22 jmmv Exp $
 #
 
 DISTNAME=	libbonoboui-2.6.0
@@ -11,10 +11,10 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME2 Object activation framework library (graphical version)
 
 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/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index f7134dd5007..2e2049114ac 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/04/06 17:38:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.32 2004/04/14 16:15:22 jmmv Exp $
 #
 
 DISTNAME=	libgnomeui-2.6.0
@@ -11,12 +11,12 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Core GNOME2 graphical libraries
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 CONFLICTS+=		gnome-libs<=1.4.2nb1
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
+USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 USE_GNU_TOOLS+=		make
 USE_PERL5=		yes
diff --git a/devel/mrproject/Makefile b/devel/mrproject/Makefile
index a1c70582aaf..b4a2b39abbc 100644
--- a/devel/mrproject/Makefile
+++ b/devel/mrproject/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/03/08 19:40:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:22 jmmv Exp $
 #
 
 DISTNAME=		mrproject-0.5.1
@@ -10,9 +10,8 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://mrproject.codefactory.se/
 COMMENT=		Project management program
 
-DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
-
 USE_BUILDLINK2=		YES
+USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES