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

*-dirs packages.

17 files changed, 34 insertions, 43 deletions

diff --git a/misc/drwright/Makefile b/misc/drwright/Makefile
index 46d6bb68ef6..735d322945c 100644
--- a/misc/drwright/Makefile
+++ b/misc/drwright/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/03/26 02:27:45 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/14 16:15:25 jmmv Exp $
 #
 
 DISTNAME=		drwright-0.17
@@ -12,10 +12,10 @@ HOMEPAGE=		http://www.imendio.com/projects/drwright/
 COMMENT=		Computer break reminder
 
 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_LIBTOOL=		yes
 USE_PERL5=		yes
diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile
index 7b6c72f0632..cea40ea98c2 100644
--- a/misc/gnome-pim/Makefile
+++ b/misc/gnome-pim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2004/03/26 02:27:46 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2004/04/14 16:15:25 jmmv Exp $
 
 DISTNAME=		gnome-pim-1.4.6
 PKGREVISION=		7
@@ -9,10 +9,10 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Personal Information Manager for GNOME
 
-DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 USE_BUILDLINK2=		YES
+USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 9052004ee19..ac440f2326e 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2004/04/02 12:18:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.73 2004/04/14 16:15:25 jmmv Exp $
 
 DISTNAME=		gnome-utils-1.4.1.2
 PKGREVISION=		9
@@ -10,7 +10,6 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Set of useful GNOME utilities and applications
 
-DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 BUILD_DEPENDS+=		xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools
 
@@ -18,6 +17,7 @@ BUILDLINK_DEPENDS.gnome-panel=	gnome-panel<2.0
 
 CONFLICTS=		coreutils<=5.0
 
+USE_DIRS+=		gnome1-1.5
 USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
 USE_BUILDLINK2=		YES
diff --git a/misc/gnome2-user-docs/Makefile b/misc/gnome2-user-docs/Makefile
index 435e9774b3a..80424334ec6 100644
--- a/misc/gnome2-user-docs/Makefile
+++ b/misc/gnome2-user-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/04/01 18:57:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/14 16:15:25 jmmv Exp $
 #
 
 DISTNAME=	gnome2-user-docs-2.6.0
@@ -10,9 +10,8 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	The GNOME 2 users guide
 
-DEPENDS=	gnome2-dirs>=1.5:../../misc/gnome2-dirs
-
 USE_BUILDLINK3=		yes
+USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 68fabd569c4..faff84a352d 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/04/01 19:09:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2004/04/14 16:15:25 jmmv Exp $
 #
 
 DISTNAME=		gnome-utils-2.6.0
@@ -11,11 +11,11 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Set of useful GNOME2 utilities and applications
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_PERL5=		build
 USE_GNU_TOOLS+=		make
 USE_BUILDLINK3=		yes
+USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index b737a186dc1..6fef9d0e4c3 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/04/01 19:04:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/04/14 16:15:25 jmmv Exp $
 #
 
 DISTNAME=		gok-0.10.0
@@ -10,9 +10,8 @@ MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME On-Screen Keyboard
 
-DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
-
 USE_BUILDLINK3=		yes
+USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index a632de9b34f..915d70dcf71 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/03/08 19:40:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/04/14 16:15:25 jmmv Exp $
 
 DISTNAME=		gperiodic-2.0.7
 PKGREVISION=		2
@@ -10,9 +10,9 @@ HOMEPAGE=		http://www.acclab.helsinki.fi/~frantz/software/gperiodic.php
 COMMENT=		Displays a periodic table of the elements
 
 BUILD_USES_MSGFMT=	# defined
-DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 USE_BUILDLINK2=		# defined
+USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	# defined
 USE_X11=		# defined
 USE_GNU_TOOLS+=		make
diff --git a/misc/gxmame/Makefile b/misc/gxmame/Makefile
index f7784111ae6..0c7d9547c3f 100644
--- a/misc/gxmame/Makefile
+++ b/misc/gxmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/08 19:40:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/14 16:15:25 jmmv Exp $
 #
 
 DISTNAME=	gxmame-0.34b
@@ -11,11 +11,11 @@ HOMEPAGE=	http://gxmame.sourceforge.net/
 COMMENT=	Frontend for XMame using the GTK2 library
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		xmame-[0-9]*:../../emulators/xmame
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
+USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/misc/hitchhiker/Makefile b/misc/hitchhiker/Makefile
index bfd8710e52d..55f70107d96 100644
--- a/misc/hitchhiker/Makefile
+++ b/misc/hitchhiker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/08 19:40:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/14 16:15:25 jmmv Exp $
 #
 
 DISTNAME=	hh2000-0.6
@@ -11,11 +11,10 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://hirame.hiram.edu/~worleyam
 COMMENT=	Astronomical simulation and visualization program
 
-DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
-
 GNU_CONFIGURE=		yes
 USE_X11BASE=		yes
 USE_BUILDLINK2=		yes
+USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	yes
 
 .include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index d4a75f6aae0..d5a6ee012cf 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.25 2004/04/05 18:41:14 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2004/04/14 16:15:25 jmmv Exp $
 
 DISTNAME=	kdeaddons-${_KDE_VERSION}
 PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Add ons for the KDE integrated X11 desktop
 
-DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
-
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-1.1
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile
index f356ca2c5f5..12a32754ccd 100644
--- a/misc/kdeadmin3/Makefile
+++ b/misc/kdeadmin3/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.23 2004/03/26 02:27:46 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:25 jmmv Exp $
 
 DISTNAME=	kdeadmin-${_KDE_VERSION}
 PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	System administration tools for the KDE integrated X11 desktop
 
-DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
-
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-1.1
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index f68a138bf7b..76d8ea54233 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2004/03/26 02:27:46 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/14 16:15:25 jmmv Exp $
 
 DISTNAME=	kdeedu-${_KDE_VERSION}
 PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Edu{tainment,cation} tools for the KDE integrated X11 desktop
 
-DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
-
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 REPLACE_PERL=	\
@@ -14,6 +12,7 @@ REPLACE_PERL=	\
 	kvoctrain/kvoctrain/spotlight2kvtml
 
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-1.1
 
 .include "../../meta-pkgs/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 69a6d720441..2fa31688152 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.27 2004/03/26 02:27:46 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2004/04/14 16:15:25 jmmv Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
 PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
-DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
-
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-1.1
 
 REPLACE_PERL=	kmail/kmail-3.1-update-new-mail-notification-settings.pl \
 		kmail/kmail-3.1-use-UOID-for-identities.pl \
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 3c30d3135c9..5a77dfe73f1 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.36 2004/04/05 09:31:30 mrg Exp $
+# $NetBSD: Makefile,v 1.37 2004/04/14 16:15:25 jmmv Exp $
 
 DISTNAME=	kdeutils-${_KDE_VERSION}
 PKGREVISION=	1
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
-DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
-
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 .include "../../mk/bsd.prefs.mk"
 
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-1.1
 USE_PKGINSTALL=		YES
 
 # Ensure we export symbols in the linked shared object.
diff --git a/misc/ooqstart/Makefile b/misc/ooqstart/Makefile
index 0a73df2a4ab..f946ef87932 100644
--- a/misc/ooqstart/Makefile
+++ b/misc/ooqstart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:46 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/14 16:15:25 jmmv Exp $
 #
 
 DISTNAME=	ooqstart-0.8.3
@@ -12,9 +12,9 @@ HOMEPAGE=	http://ooqstart.sourceforge.net/
 COMMENT=	OpenOffice quickstart applet for GNOME
 
 DEPENDS+=	gnome-applets>=1.4.0:../../x11/gnome-applets
-DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
 
 USE_BUILDLINK2=	YES
+USE_DIRS+=	xdg-x11-1.1
 USE_GNU_TOOLS+=	make
 USE_X11BASE=	YES
 NO_CONFIGURE=	YES
diff --git a/misc/xchm/Makefile b/misc/xchm/Makefile
index 252c92e2753..c459c89d4e5 100644
--- a/misc/xchm/Makefile
+++ b/misc/xchm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/09 14:29:09 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:25 jmmv Exp $
 #
 
 DISTNAME=	xchm-0.9.1
@@ -9,9 +9,8 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://xchm.sourceforge.net/
 COMMENT=	CHM viewer for UNIX
 
-DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
-
 USE_BUILDLINK3=		yes
+USE_DIRS+=		xdg-1.1
 USE_LANGUAGES=		c++
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 6b4d14edc77..7cdc5062f3f 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/04/01 18:48:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2004/04/14 16:15:25 jmmv Exp $
 #
 
 DISTNAME=		yelp-2.6.0
@@ -10,13 +10,13 @@ MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Help browser for GNOME 2 desktop
 
-DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		docbook>=4.2:../../textproc/docbook
 BUILD_USES_MSGFMT=	yes
 
 BUILDLINK_DEPENDS.libxslt+=	libxslt>=1.1.4
 
 USE_BUILDLINK3=		yes
+USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes