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

*-dirs packages.

11 files changed, 22 insertions, 24 deletions

diff --git a/sysutils/apotheke/Makefile b/sysutils/apotheke/Makefile
index 81a7f02178e..4087c178de7 100644
--- a/sysutils/apotheke/Makefile
+++ b/sysutils/apotheke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/03/26 02:27:54 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:27 jmmv Exp $
 #
 
 DISTNAME=	apotheke-0.2
@@ -10,9 +10,8 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://apotheke.berlios.de/
 COMMENT=	CVS view for Nautilus
 
-DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
-
 USE_BUILDLINK3=		yes
+USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_X11=		yes
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index a3c6114f0ce..284102d8f61 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/03/08 19:40:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/14 16:15:27 jmmv Exp $
 #
 
 DISTNAME=		cdrdao-1.1.7.src
@@ -12,12 +12,12 @@ HOMEPAGE=		http://cdrdao.sourceforge.net/gcdmaster/index.html
 COMMENT=		GUI for cdrdao with some editing capability
 
 DEPENDS+=		cdrdao-1.1.7:../../sysutils/cdrdao
-DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 WRKSRC=			${WRKDIR}/cdrdao-1.1.7
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
+USE_DIRS+=		gnome1-1.5
 USE_GNU_TOOLS+=		make
 CONFIGURE_ARGS+=	--with-pcctsbin=${LOCALBASE}/bin
 CONFIGURE_ARGS+=	--with-pcctsinc=${LOCALBASE}/include/pccts
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 71d99197374..3606a784f11 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/03/08 19:40:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.38 2004/04/14 16:15:27 jmmv Exp $
 #
 
 DISTNAME=		gcombust-0.1.54
@@ -12,10 +12,10 @@ COMMENT=		Graphical frontend for CD mastering (mkisofs, cdrecord, ...)
 
 DEPENDS+=		cdrecord>=1.10:../../sysutils/cdrecord
 DEPENDS+=		cdlabelgen-[0-9]*:../../graphics/cdlabelgen
-DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 DEPENDS+=		gv-[0-9]*:../../print/gv
 
 USE_BUILDLINK2=		YES
+USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
diff --git a/sysutils/gmc/Makefile b/sysutils/gmc/Makefile
index bd442bfdd95..aab59da3609 100644
--- a/sysutils/gmc/Makefile
+++ b/sysutils/gmc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2004/03/26 02:27:54 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2004/04/14 16:15:27 jmmv Exp $
 
 PKGNAME=		g${DISTNAME}
 PKGREVISION=		9
@@ -6,11 +6,11 @@ CATEGORIES+=		gnome
 
 COMMENT=		GNOME version of Midnight Commander, a free Norton Commander Clone
 
+USE_DIRS+=		gnome1-1.5
 USE_X11BASE=		# defined
 CONFIGURE_ARGS+=	--with-tm-x-support
 CONFIGURE_ARGS+=	--with-gnome
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 post-install:
 	${RMDIR} ${PREFIX}/share/gnome/help/gmc/C/figs
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index fd47b96a0ed..3ad8a05dc03 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/03/26 02:27:54 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/14 16:15:27 jmmv Exp $
 #
 
 DISTNAME=	gnome-pkgview-1.0.5
@@ -11,10 +11,10 @@ HOMEPAGE=	http://www.greatnorthern.demon.co.uk/gnome-pkgview.html
 COMMENT=	Displays the version of GNOME components installed
 
 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
 
 GCONF2_SCHEMAS=		gnome-pkgview.schemas
diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile
index 08a8f0d4c56..4692802795b 100644
--- a/sysutils/gnome2-system-monitor/Makefile
+++ b/sysutils/gnome2-system-monitor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/02 12:18:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:28 jmmv Exp $
 #
 
 DISTNAME=	gnome-system-monitor-2.6.0
@@ -11,10 +11,10 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME 2 system monitor program
 
-DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK3=		yes
+USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index e0944653d11..020a5064bea 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/04/02 12:18:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.34 2004/04/14 16:15:28 jmmv Exp $
 
 DISTNAME=		gtop-1.0.13
 PKGREVISION=		8
@@ -10,10 +10,10 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME system monitor - top like, memory graphs, process viewer
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
 
 OSVERSION_SPECIFIC=	YES
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-x11-1.1
 USE_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 1479a863448..800756305b4 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/01 19:07:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/14 16:15:28 jmmv Exp $
 #
 
 DISTNAME=	nautilus-cd-burner-2.6.0
@@ -11,10 +11,10 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	CD burner view for Nautilus
 
 DEPENDS+=		cdrecord-[0-9]*:../../sysutils/cdrecord
-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_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 2c88514dd37..667912baf28 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/04/01 18:38:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2004/04/14 16:15:28 jmmv Exp $
 #
 
 DISTNAME=		nautilus-2.6.0
@@ -11,10 +11,10 @@ HOMEPAGE=		http://www.gnome.org/projects/nautilus/
 COMMENT=		Nautilus file manager for GNOME2
 
 DEPENDS+=		hicolor-icon-theme>=0.4:../../graphics/hicolor-icon-theme
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_PKGLOCALEDIR=	yes
 USE_BUILDLINK3=		yes
+USE_DIRS+=		xdg-1.1
 USE_X11=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile
index c55408db6d5..3015ccf82b3 100644
--- a/sysutils/xfe/Makefile
+++ b/sysutils/xfe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/03/20 15:35:38 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/14 16:15:28 jmmv Exp $
 #
 
 DISTNAME=	xfe-0.54.2
@@ -11,9 +11,9 @@ HOMEPAGE=	http://xfe.sourceforge.net/
 COMMENT=	Fast MS-Explorer like filemanager for X
 
 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
 USE_GNU_TOOLS+=		make
diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
index d6302a6ad1d..e57b1974238 100644
--- a/sysutils/xnc/Makefile
+++ b/sysutils/xnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/08 19:40:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/14 16:15:28 jmmv Exp $
 
 DISTNAME=	xnc-5.0.4.src
 PKGNAME=	xnc-5.0.4
@@ -10,10 +10,9 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://xnc.dubna.su/
 COMMENT=	File manager for X Window
 
-DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
-
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=	yes
+USE_DIRS+=	xdg-1.1
 USE_X11=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes