Handle some shared directories by depending on (or updating dependancies to

the latest versions) xdg-dirs, xdg-x11-dirs or gnome*-dirs.
Bump PKGREVISION.

7 files changed, 17 insertions, 14 deletions

diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index ab4ca2b1db8..b1760d3c9c1 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2004/03/04 19:17:04 minskim Exp $
+# $NetBSD: Makefile,v 1.28 2004/03/08 19:40:43 jmmv Exp $
 #
 
 DISTNAME=	metacity-2.6.5
+PKGREVISION=	1
 CATEGORIES=	wm x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +12,7 @@ HOMEPAGE=	http://www.gnome.org/softwaremap/projects/Metacity/
 COMMENT=	GNOME-compliant window manager
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST
index 9e443af206c..755654b736d 100644
--- a/wm/metacity/PLIST
+++ b/wm/metacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/12/14 20:33:25 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/03/08 19:40:43 jmmv Exp $
 bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
@@ -176,7 +176,6 @@ share/themes/Simple/metacity-1/minimize.png
 @dirrm share/themes/Atlanta
 @dirrm share/themes/AgingGorilla/metacity-1
 @dirrm share/themes/AgingGorilla
-@unexec ${RMDIR} %D/share/themes 2>/dev/null || ${TRUE}
 @dirrm share/metacity/icons
 @dirrm share/metacity/glade
 @dirrm share/metacity
diff --git a/wm/obconf/Makefile b/wm/obconf/Makefile
index d329398ff07..899c31c76a3 100644
--- a/wm/obconf/Makefile
+++ b/wm/obconf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/02/16 23:03:11 snj Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:43 jmmv Exp $
 
 DISTNAME=		obconf-1.5
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		wm
 MASTER_SITES=		http://icculus.org/openbox/obconf/
 
@@ -9,6 +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
 GNU_CONFIGURE=		YES
 
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index 6e3bb0fce97..015d70055ea 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/02/16 23:00:47 snj Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/08 19:40:43 jmmv Exp $
 
 DISTNAME=	openbox-3.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	wm x11
 MASTER_SITES=	http://icculus.org/openbox/releases/
 
@@ -10,7 +10,7 @@ HOMEPAGE=	http://icculus.org/openbox/
 COMMENT=	Standards compliant, light-weight and extensible window manager
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		vera-ttf>=1.10:../../fonts/vera-ttf
 
 GNU_CONFIGURE=		YES
diff --git a/wm/openbox/PLIST b/wm/openbox/PLIST
index 5ff52e25af9..835af782a47 100644
--- a/wm/openbox/PLIST
+++ b/wm/openbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/23 08:41:55 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/08 19:40:43 jmmv Exp $
 bin/gnome-panel-control
 bin/kdetrayproxy
 bin/openbox
@@ -61,7 +61,6 @@ share/themes/TheBear/openbox-3/themerc
 @unexec ${RMDIR} %D/share/themes/Artwiz 2>/dev/null || ${TRUE}
 @dirrm share/themes/Allegro/openbox-3
 @unexec ${RMDIR} %D/share/themes/Allegro 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/themes 2>/dev/null || ${TRUE}
 @dirrm share/openbox
 @comment in gnome2-dirs: @dirrm share/gnome/wm-properties
 @dirrm share/examples/openbox
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index 858a23d4809..d21a8b04d45 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.23 2004/01/15 08:10:16 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2004/03/08 19:40:43 jmmv Exp $
 #
 
 PKGNAME=		sawfish-${SF_VERS}
-PKGREVISION=		7
+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_X11BASE=		# defined
 
diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common
index ae81f15d513..601b0c44e93 100644
--- a/wm/sawfish/Makefile.common
+++ b/wm/sawfish/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2004/01/24 15:18:32 grant Exp $
+# $NetBSD: Makefile.common,v 1.19 2004/03/08 19:40:43 jmmv Exp $
 
 DISTNAME=		sawfish-${SF_VERS}-gtk1
 SF_VERS=		1.2
@@ -9,6 +9,7 @@ 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