From bedae6c90ccf11bddb3b3bdde8d2652e72eeeed3 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Wed, 14 Apr 2004 16:15:20 +0000
Subject: Make use of the new USE_DIRS variable, instead of directly depending
 on the *-dirs packages.

---
 wm/metacity/Makefile       | 4 ++--
 wm/obconf/Makefile         | 5 ++---
 wm/openbox/Makefile        | 4 ++--
 wm/sawfish/Makefile        | 4 ++--
 wm/sawfish/Makefile.common | 4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'wm')

diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index fd3163999a3..169730ffea2 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/04/01 18:35:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.30 2004/04/14 16:15:28 jmmv Exp $
 #
 
 DISTNAME=	metacity-2.8.0
@@ -11,9 +11,9 @@ HOMEPAGE=	http://www.gnome.org/softwaremap/projects/Metacity/
 COMMENT=	GNOME-compliant window manager
 
 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/wm/obconf/Makefile b/wm/obconf/Makefile
index 899c31c76a3..e1d39e91258 100644
--- a/wm/obconf/Makefile
+++ b/wm/obconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/14 16:15:28 jmmv Exp $
 
 DISTNAME=		obconf-1.5
 PKGREVISION=		4
@@ -9,9 +9,8 @@ MAINTAINER=		snj@NetBSD.org
 HOMEPAGE=		http://www.openbox.org/obconf/
 COMMENT=		Tool for configuring the Openbox window manager
 
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
-
 USE_BUILDLINK3=		YES
+USE_DIRS+=		xdg-1.1
 GNU_CONFIGURE=		YES
 
 .include "../../devel/libglade2/buildlink3.mk"
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index 00a9c877b51..9c17bf68928 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/03/15 15:17:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/14 16:15:28 jmmv Exp $
 
 DISTNAME=	openbox-3.1
 PKGREVISION=	3
@@ -10,11 +10,11 @@ HOMEPAGE=	http://icculus.org/openbox/
 COMMENT=	Standards compliant, light-weight and extensible window manager
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		vera-ttf>=1.10:../../fonts/vera-ttf
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
+USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index d21a8b04d45..bb96c88d2d7 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/03/08 19:40:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/14 16:15:28 jmmv Exp $
 #
 
 PKGNAME=		sawfish-${SF_VERS}
@@ -7,8 +7,8 @@ PKGREVISION=		8
 COMMENT=		GNOME-aware window manager that is fully configurable in Lisp
 
 DEPENDS+=		sawfish-replibs-${SF_VERS}nb4:../../wm/sawfish-replibs
-DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
 
+USE_DIRS+=		xdg-x11-1.1
 USE_X11BASE=		# defined
 
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common
index 601b0c44e93..da713136e94 100644
--- a/wm/sawfish/Makefile.common
+++ b/wm/sawfish/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2004/03/08 19:40:43 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.20 2004/04/14 16:15:28 jmmv Exp $
 
 DISTNAME=		sawfish-${SF_VERS}-gtk1
 SF_VERS=		1.2
@@ -9,10 +9,10 @@ MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://sawmill.sourceforge.net/
 
 DEPENDS+=		rep-gtk>=0.15nb2:../../x11/rep-gtk
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_X11=		# defined
 USE_BUILDLINK2=		# defined
+USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	# defined
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		# defined
-- 
cgit v1.2.3