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

*-dirs packages.

16 files changed, 32 insertions, 45 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 1786d52118f..94cdd0dc460 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/03/26 02:27:41 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2004/04/14 16:15:23 jmmv Exp $
 
 DISTNAME=	dia-0.92.2
 PKGREVISION=	7
@@ -9,9 +9,8 @@ MAINTAINER=	jmcneill@invisible.yi.org
 HOMEPAGE=	http://www.lysator.liu.se/~alla/dia/
 COMMENT=	Program for creating diagrams of all kinds
 
-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/graphics/ee/Makefile b/graphics/ee/Makefile
index 5dd86ffb0be..0e72d7614c1 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/03/26 02:27:41 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2004/04/14 16:15:23 jmmv Exp $
 
 DISTNAME=		ee-0.3.12
 PKGREVISION=		10
@@ -9,9 +9,8 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Image viewer based on imlib by the Rasterman.  Gtk clone of xv
 
-DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
-
 USE_BUILDLINK2=		# defined
+USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	# defined
 USE_X11BASE=		# defined
 USE_GNU_TOOLS+=		make
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index e7590975b96..594d6010e99 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/04/12 00:16:43 snj Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/14 16:15:23 jmmv Exp $
 
 DISTNAME=		eog-0.6
 PKGREVISION=		7
@@ -9,12 +9,11 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Eye of GNOME: an image viewing and cataloging program
 
-DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
-
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
 USE_GNU_TOOLS+=		make
 USE_BUILDLINK3=		YES
+USE_DIRS+=		xdg-x11-1.1
 USE_PKGLOCALEDIR=	YES
 
 .include "../../devel/bonobo/buildlink3.mk"
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 915764a984d..46177aa70f3 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/04/01 18:54:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.30 2004/04/14 16:15:23 jmmv Exp $
 #
 
 DISTNAME=	eog-2.6.0
@@ -11,12 +11,12 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Eye of GNOME: an image viewing and cataloging program
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
 USE_BUILDLINK3=		YES
+USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 
 GCONF2_SCHEMAS= 	eog.schemas
diff --git a/graphics/g3d/Makefile b/graphics/g3d/Makefile
index 80b35b823c1..5b1d52aa8c6 100644
--- a/graphics/g3d/Makefile
+++ b/graphics/g3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/03/08 19:40:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/04/14 16:15:23 jmmv Exp $
 #
 
 DISTNAME=	g3d-0.0.2
@@ -10,9 +10,8 @@ MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://condor.stcloudstate.edu/~hebl9901/g3d/
 COMMENT=	3D modeller with a view of 3D modelling
 
-DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
-
 WRKSRC=		${WRKDIR}/g3d
+USE_DIRS+=	xdg-x11-1.1
 USE_LIBTOOL=	YES
 USE_GNU_TOOLS+=	make
 USE_X11BASE=	YES
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index ffd4ab80eed..793fda9d8c3 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/03/26 02:27:41 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2004/04/14 16:15:23 jmmv Exp $
 
 DISTNAME=	gimageview-0.2.24
 PKGREVISION=	12
@@ -9,9 +9,8 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://gtkmmviewer.sourceforge.net/
 COMMENT=	GTK+ based image viewer with tabbed browsing
 
-DEPENDS+=	gnome2-dirs>=1.5:../../misc/gnome2-dirs
-
 USE_BUILDLINK3=		YES
+USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile
index 8dc2c6dc0af..bbe7b1293f8 100644
--- a/graphics/gnome-icon-theme/Makefile
+++ b/graphics/gnome-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/04/09 20:11:45 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/14 16:15:23 jmmv Exp $
 #
 
 DISTNAME=		gnome-icon-theme-1.2.0
@@ -13,10 +13,10 @@ COMMENT=		Theme consisting of a set of icons for GNOME
 DEPENDS+=		hicolor-icon-theme>=0.4:../../graphics/hicolor-icon-theme
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
+USE_DIRS+=		xdg-1.1
 USE_GNU_TOOLS+=		make
 USE_PERL5=		build
 USE_PKGLOCALEDIR=	yes
diff --git a/graphics/gnome-iconedit/Makefile b/graphics/gnome-iconedit/Makefile
index 709ba8d5f5e..c506889ccc9 100644
--- a/graphics/gnome-iconedit/Makefile
+++ b/graphics/gnome-iconedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/03/08 19:40:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2004/04/14 16:15:24 jmmv Exp $
 #
 
 DISTNAME=		gnome-iconedit-1.2.0
@@ -10,9 +10,9 @@ MAINTAINER=		wiz@NetBSD.org
 COMMENT=		Icon editor based on GNOME libraries
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 USE_BUILDLINK2=		YES
+USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_GNU_TOOLS+=		make
diff --git a/graphics/gnome-pixmaps/Makefile b/graphics/gnome-pixmaps/Makefile
index 4f18dd289e1..8850ab5ebd9 100644
--- a/graphics/gnome-pixmaps/Makefile
+++ b/graphics/gnome-pixmaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/04/14 01:17:19 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/14 16:15:24 jmmv Exp $
 #
 
 DISTNAME=		gnome-core-1.4.2
@@ -12,8 +12,6 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Pixmaps for gnome-core
 
-DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
-
 .include "../../mk/bsd.prefs.mk"
 
 CONFLICTS=		gnome-core<1.4.2
@@ -22,6 +20,7 @@ CONFLICTS+=		gnome2-pixmaps-[0-9]*
 .endif
 
 USE_BUILDLINK3=		YES
+USE_DIRS+=		xdg-x11-1.1
 USE_X11BASE=		YES
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
diff --git a/graphics/gnome2-pixmaps/Makefile b/graphics/gnome2-pixmaps/Makefile
index 0b4ab41baf5..ea425e4109b 100644
--- a/graphics/gnome2-pixmaps/Makefile
+++ b/graphics/gnome2-pixmaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/04/01 18:35:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/04/14 16:15:24 jmmv Exp $
 #
 
 DISTNAME=		gnome-desktop-2.6.0
@@ -20,9 +20,8 @@ CONFLICTS+=		gnome-pixmaps-[0-9]*
 CONFLICTS+=		gnome-pixmaps-2.0.8
 .endif
 
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
-
 USE_BUILDLINK3=		YES
+USE_DIRS+=		xdg-1.1
 USE_X11=		YES
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index 3c569699a01..70b2e590cbd 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/14 16:15:24 jmmv Exp $
 #
 
 DISTNAME=	gpaint-0.2
@@ -10,9 +10,8 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://gpaint.sourceforge.net/
 COMMENT=	Simple, easy-to-use paint program for GNOME
 
-DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
-
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-x11-1.1
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
 USE_GNU_GETTEXT=	YES
diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index e35774d58b0..c4ebf7fea1f 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/03 18:49:43 reed Exp $
+# $NetBSD: Makefile,v 1.20 2004/04/14 16:15:24 jmmv Exp $
 
 DISTNAME=	gphoto-0.4.3
 PKGREVISION=	6
@@ -9,9 +9,8 @@ MAINTAINER=	jmcm@cs.cmu.edu
 HOMEPAGE=	http://www.gphoto.org/
 COMMENT=	Download and view files from various digital cameras
 
-DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
-
 USE_BUILDLINK2=		YES
+USE_DIRS+=		gnome1-1.0
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index ea75adfc10c..26c9d0519e4 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/04/13 16:27:26 reed Exp $
+# $NetBSD: Makefile,v 1.22 2004/04/14 16:15:24 jmmv Exp $
 #
 
 DISTNAME=	gtkam-0.1.11
@@ -9,9 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gphoto.sourceforge.net/proj/gphoto2/
 COMMENT=	Digital camera access graphical client (GTK2)
 
-DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
-
 USE_BUILDLINK3=		YES
+USE_DIRS+=		gnome2-1.5
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 6e36cc7720f..303eeb589dc 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.35 2004/03/26 02:27:42 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2004/04/14 16:15:24 jmmv Exp $
 
 DISTNAME=	kdegraphics-${_KDE_VERSION}
 PKGREVISION=	2
 CATEGORIES=	graphics
 COMMENT=	Graphics programs for the KDE integrated X11 desktop
 
-DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
-
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 #DEPENDS+=	gPhoto2
 #DEPENDS+=	gpio
 
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-1.1
 
 BUILDLINK_DEPENDS.lcms=	lcms>=1.12
 
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index 80e0d05e58b..24fcbe5b092 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/03/08 19:40:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/04/14 16:15:24 jmmv Exp $
 #
 
 DISTNAME=	scigraphica-0.8.0
@@ -10,9 +10,8 @@ MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://scigraphica.sourceforge.net/
 COMMENT=	Data analysis and technical graphics
 
-DEPENDS+=	gnome1-dirs>=1.5:../../misc/gnome1-dirs
-
 USE_BUILDLINK2=		YES
+USE_DIRS+=		gnome1-1.5
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
 USE_GNU_READLINE=	YES
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index fa4e0b19b00..6ae905b891b 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/03/28 21:02:55 xtraeme Exp $
+# $NetBSD: Makefile,v 1.26 2004/04/14 16:15:24 jmmv Exp $
 #
 
 DISTNAME=	sodipodi-0.34
@@ -9,10 +9,9 @@ MAINTAINER=	manu@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/gnome-office/sodipodi.shtml
 COMMENT=	Open source vector graphics drawing program using SVG as native format
 
-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_LIBTOOL=		YES