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

*-dirs packages.

8 files changed, 16 insertions, 20 deletions

diff --git a/chat/everybuddy/Makefile.common b/chat/everybuddy/Makefile.common
index 073ba8d501a..ba4d8ddb47f 100644
--- a/chat/everybuddy/Makefile.common
+++ b/chat/everybuddy/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2004/03/08 19:40:36 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/04/14 16:15:21 jmmv Exp $
 
 DISTNAME=	everybuddy-0.2.0
 CATEGORIES=	chat
@@ -8,8 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.everybuddy.com/
 COMMENT=	Universal Instant Messaging Client
 
-DEPENDS+=	gnome1-dirs>=1.5:../../misc/gnome1-dirs
-
+USE_DIRS+=	gnome1-1.5
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2= yes
diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile
index 1bd7d448d2f..618e228ccfb 100644
--- a/chat/gabber/Makefile
+++ b/chat/gabber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/03/08 19:40:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.32 2004/04/14 16:15:21 jmmv Exp $
 
 DISTNAME=	gabber-0.8.8
 PKGREVISION=	5
@@ -9,9 +9,8 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://gabber.sourceforge.net/
 COMMENT=	Gnome Jabber Client
 
-DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
-
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-x11-1.1
 USE_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
diff --git a/chat/gaim-gtk1/Makefile.common b/chat/gaim-gtk1/Makefile.common
index e4ea1e49072..cfdadb6a536 100644
--- a/chat/gaim-gtk1/Makefile.common
+++ b/chat/gaim-gtk1/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2004/03/08 19:40:36 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.9 2004/04/14 16:15:21 jmmv Exp $
 #
 
 DISTNAME=	gaim-0.59.8
@@ -17,8 +17,7 @@ PATCHDIR=	${.CURDIR}/../gaim-gtk1/patches
 PKGDIR=		${.CURDIR}/../gaim-gtk1
 PLIST_SRC=      ${.CURDIR}/../gaim-gtk1/PLIST.common
 
-DEPENDS+=	gnome1-dirs>=1.5:../../misc/gnome1-dirs
-
+USE_DIRS+=		gnome1-1.5
 USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 7756f71a0c3..9ff8348229c 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2004/04/02 16:08:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.58 2004/04/14 16:15:21 jmmv Exp $
 #
 
 DISTNAME=	gaim-0.76
@@ -11,12 +11,12 @@ HOMEPAGE=	http://gaim.sourceforge.net/
 COMMENT=	GTK2 based client for the AOL Instant Messenger chat system
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 CONFLICTS+=	gaim-gnome-[0-9]*
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
+USE_DIRS+=		xdg-1.1
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index eade7bed806..5486d2b7041 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/03/26 02:27:35 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2004/04/14 16:15:21 jmmv Exp $
 
 DISTNAME=	gnomeicu-0.96
 PKGREVISION=	11
@@ -10,9 +10,8 @@ MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://gnomeicu.sourceforge.net/
 COMMENT=	GNOME ICQ client
 
-DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
-
 USE_BUILDLINK2=		YES
+USE_DIRS+=		xdg-x11-1.1
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index 70dc2670da4..6885ea7c326 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/04/01 19:12:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/14 16:15:21 jmmv Exp $
 #
 
 DISTNAME=	gossip-0.7.4
@@ -10,11 +10,11 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://gossip.imendio.org/
 COMMENT=	GTK2 Jabber Instant Messaging client
 
-DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_DEPENDS=		p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK3=		yes
+USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=       yes
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 8d24c1c2a97..dd928cd1c56 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2004/03/26 02:27:35 wiz Exp $
+# $NetBSD: Makefile.common,v 1.26 2004/04/14 16:15:21 jmmv Exp $
 
 DISTNAME=	xchat-1.8.11
 PKGREVISION=	6
@@ -11,7 +11,6 @@ HOMEPAGE=	http://xchat.org/
 COMMENT=	X11 (X Window System) IRC client, using the GTK+ toolkit
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 DISTINFO_FILE=	${.CURDIR}/../xchat/distinfo
 FILESDIR=	${.CURDIR}/../xchat/files
@@ -20,6 +19,7 @@ PKGDIR=		${.CURDIR}/../xchat
 PLIST_SRC=	${.CURDIR}/../xchat/PLIST
 
 USE_BUILDLINK2=		YES
+USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_GNU_TOOLS+=		make
diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile
index 6c2c44791c0..28530d04e13 100644
--- a/chat/xchat2/Makefile
+++ b/chat/xchat2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/03/26 02:27:35 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2004/04/14 16:15:21 jmmv Exp $
 #
 
 DISTNAME=	xchat-2.0.8
@@ -12,12 +12,12 @@ HOMEPAGE=	http://www.xchat.org/
 COMMENT=	X11 (X Window System) IRC client, using the GTK2 toolkit
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 CONFLICTS=		xchat-gnome-[0-9]*
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
+USE_DIRS+=		gnome2-1.5
 USE_LIBTOOL=		YES
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	YES