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

the latest versions) xdg-dirs, xdg-x11-dirs or gnome*-dirs. Bump PKGREVISION.
author: jmmv <jmmv> 2004-03-08 19:40:36 +0000
committer: jmmv <jmmv> 2004-03-08 19:40:36 +0000
commit: 3ae0aec8ac71e8b2b498fbfcdeed74888a448b22 (patch)
tree: 31ed0dbd30601179a2bbef617a33214b104e418a
parent: 47c6e2b314c6de44ed6a3b6733b41c3e1d1a9732 (diff)
download: pkgsrc-3ae0aec8ac71e8b2b498fbfcdeed74888a448b22.tar.gz
197 files changed, 605 insertions, 450 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index af675f9944a..a3e03b306e3 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2004/03/07 12:09:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	file-roller-2.4.4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.4/}
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://fileroller.sourceforge.net/
 COMMENT=	Front-end to archiving programs like tar and zip
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		gtar-base>=1.13.25:../../archivers/gtar-base
 DEPENDS+=		unzip>=5.50nb2:../../archivers/unzip
 DEPENDS+=		zip>=2.3nb2:../../archivers/zip
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 45d9f02fcc1..4270d5c3a64 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2004/02/14 17:21:32 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	easytag-0.30
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=easytag/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://easytag.sourceforge.net/
 COMMENT=	Tool to view, edit and write ID3 v1&2 TAGs with a GTK+ interface
 
-DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=	gnome1-dirs>=1.5:../../misc/gnome1-dirs
 BUILD_USES_MSGFMT=	yes	# xgettext, really
 
 GNU_CONFIGURE=		yes
diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile
index 0606f7910d4..7397db2aa51 100644
--- a/audio/gdcd/Makefile
+++ b/audio/gdcd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/01/03 18:49:33 reed Exp $
+# $NetBSD: Makefile,v 1.22 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	gdcd-0.2.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://gdcd.undergrid.net/source_archive/
 
@@ -10,6 +10,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gdcd.undergrid.net/
 COMMENT=	CD player for the X Window System using the GIMP Tool Kit (GTK)
 
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index b8323325b94..ecee80af8c8 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/12/23 18:05:57 sketch Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	gnome-audio-2.0.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-audio/2.0/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +11,8 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Set of audio files for GNOME
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 USE_X11=	YES
diff --git a/audio/gnome-audio/PLIST b/audio/gnome-audio/PLIST
index 2667768d1e3..373a7bc5d7b 100644
--- a/audio/gnome-audio/PLIST
+++ b/audio/gnome-audio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/12/03 02:33:53 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/03/08 19:40:36 jmmv Exp $
 share/sounds/card_shuffle.wav
 share/sounds/email.wav
 share/sounds/error.wav
@@ -17,4 +17,3 @@ share/sounds/startup3.wav
 share/sounds/warning.wav
 @dirrm share/sounds/panel
 @dirrm share/sounds/gtk-events
-@unexec ${RMDIR} %D/share/sounds 2>/dev/null || ${TRUE}
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index d4f90afd792..54fd89d1fdd 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2003/08/30 22:51:11 jlam Exp $
+# $NetBSD: Makefile,v 1.76 2004/03/08 19:40:36 jmmv Exp $
 
 DISTNAME=		gqmpeg-0.20.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gqmpeg/}
 
@@ -10,7 +10,7 @@ HOMEPAGE=		http://gqmpeg.sourceforge.net/
 COMMENT=		GTK+ front end to mpg123
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 DEPENDS+=		mpg123{,-esound,-nas}>=0.59.18:../../audio/mpg123
 DEPENDS+=		vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
 DEPENDS+=		xmp>=2.0.2:../../audio/xmp
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 8a82faa8edb..184e67704b9 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/03/04 17:44:08 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/08 19:40:36 jmmv Exp $
 
 DISTNAME=	liteamp-0.2.4.1
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.kldp.net/liteamp/
 
@@ -8,8 +9,7 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://kldp.net/projects/liteamp/
 COMMENT=	Light-weight Music Player for GNOME2
 
-DEPENDS+=	xdg-dirs>=1.0:../../misc/xdg-dirs
-DEPENDS+=	gnome2-dirs>=1.2nb1:../../misc/gnome2-dirs
+DEPENDS+=	gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 72a14aa8eb8..3add865b70a 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/02/29 16:41:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	rhythmbox-0.6.7
+PKGREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.6/}
 
@@ -10,7 +11,7 @@ HOMEPAGE=	http://www.rhythmbox.org/
 COMMENT=	Music management application for GNOME
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 910b27bd38f..c01550f09f1 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/02/14 18:26:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	streamtuner-${DIST_VER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio www
 MASTER_SITES=	http://savannah.nongnu.org/download/streamtuner/streamtuner.pkg/${DIST_VER}/
 
@@ -10,7 +10,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/streamtuner/
 COMMENT=	Stream directory browser
 
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK2=		yes
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 904e69c60d4..99bf96cb70d 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/02/19 11:39:24 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	sweep-0.8.2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sweep/}
 
@@ -10,7 +10,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://sweep.sourceforge.net/
 COMMENT=	Full-featured digital sound editor
 
-DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=	gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 BUILD_USES_MSGFMT=	YES
 
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index 59be12c0610..8d1ef7e72e3 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/01/22 07:15:01 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:36 jmmv Exp $
 
 DISTNAME=	yamt-0.5
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=yamt/}
 
@@ -10,6 +10,7 @@ HOMEPAGE=	http://yamt.sourceforge.net/
 COMMENT=	Yet Another MP3 Tool
 
 BUILD_USES_MSGFMT=	yes
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
 
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index 0f88c59f0cb..ebf4da126fb 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/01/03 18:49:35 reed Exp $
+# $NetBSD: Makefile,v 1.22 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=		oregano-0.20
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		cad gnome
 MASTER_SITES=		http://www.dtek.chalmers.se/~d4hult/oregano/download/
 
@@ -10,7 +10,7 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.dtek.chalmers.se/~d4hult/oregano/
 COMMENT=		Application for schematic capture/simulation of electrical circuits
 
-DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/chat/everybuddy/Makefile b/chat/everybuddy/Makefile
index f7f58a8c044..ded896818a1 100644
--- a/chat/everybuddy/Makefile
+++ b/chat/everybuddy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/08/15 22:48:04 jmc Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/08 19:40:36 jmmv Exp $
 
 .include "Makefile.common"
-PKGREVISION=	4
+PKGREVISION=	5
 
 CONFLICTS+=	everybuddy-gnome-[0-9]*
 
diff --git a/chat/everybuddy/Makefile.common b/chat/everybuddy/Makefile.common
index b31f9469a06..073ba8d501a 100644
--- a/chat/everybuddy/Makefile.common
+++ b/chat/everybuddy/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2004/01/22 07:49:20 grant Exp $
+# $NetBSD: Makefile.common,v 1.13 2004/03/08 19:40:36 jmmv Exp $
 
 DISTNAME=	everybuddy-0.2.0
 CATEGORIES=	chat
@@ -8,7 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.everybuddy.com/
 COMMENT=	Universal Instant Messaging Client
 
-DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=	gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile
index c299c067bd7..1bd7d448d2f 100644
--- a/chat/gabber/Makefile
+++ b/chat/gabber/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2004/03/07 12:09:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2004/03/08 19:40:36 jmmv Exp $
 
 DISTNAME=	gabber-0.8.8
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gabber/}
 
@@ -9,6 +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_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
diff --git a/chat/gabber/PLIST b/chat/gabber/PLIST
index ffef85d0569..626b86358c6 100644
--- a/chat/gabber/PLIST
+++ b/chat/gabber/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/07/10 19:50:11 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/08 19:40:36 jmmv Exp $
 bin/gabber
 etc/sound/events/gabber.soundlist
 man/man1/gabber.1
@@ -157,7 +157,6 @@ share/sounds/gabber/gabber_ooochat_recv.wav
 share/sounds/gabber/gabber_startup.wav
 share/sounds/gabber/gabber_subrequest.wav
 @dirrm share/sounds/gabber
-@unexec ${RMDIR} %D/share/sounds 2> /dev/null || ${TRUE}
 @dirrm share/pixmaps/gabber
 @dirrm share/omf/gabber
 @comment in scrollkeeper: @dirrm share/omf
diff --git a/chat/gaim-gnome/Makefile b/chat/gaim-gnome/Makefile
index 62d643cc516..d8ad8996db9 100644
--- a/chat/gaim-gnome/Makefile
+++ b/chat/gaim-gnome/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2004/01/03 18:49:35 reed Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:36 jmmv Exp $
 
 .include "../gaim-gtk1/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
-PKGREVISION=	6
+PKGREVISION=	7
 CONFLICTS+=	gaim-[0-9]*
 COMMENT+=	with GNOME support
 
diff --git a/chat/gaim-gtk1/Makefile.common b/chat/gaim-gtk1/Makefile.common
index 04c779a5833..e4ea1e49072 100644
--- a/chat/gaim-gtk1/Makefile.common
+++ b/chat/gaim-gtk1/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2004/02/14 17:21:34 jlam Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	gaim-0.59.8
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/} \
 		ftp://ftp.marko.net/pub/gaim/
@@ -17,7 +17,7 @@ PATCHDIR=	${.CURDIR}/../gaim-gtk1/patches
 PKGDIR=		${.CURDIR}/../gaim-gtk1
 PLIST_SRC=      ${.CURDIR}/../gaim-gtk1/PLIST.common
 
-DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=	gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index ea35c472d49..7fc449b5381 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2004/03/01 15:19:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.56 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	gaim-0.75
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE=	http://gaim.sourceforge.net/
 COMMENT=	GTK2 based client for the AOL Instant Messenger chat system
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=	gnome2-dirs>=1.1:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 CONFLICTS+=	gaim-gnome-[0-9]*
 
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index 3b2c2e7d4cf..cf01a6bd469 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2004/01/11 20:54:07 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.24 2004/03/08 19:40:36 jmmv Exp $
 bin/gaim
 bin/gaim-remote
 include/gaim-remote/remote-socket.h
@@ -350,7 +350,6 @@ share/sounds/gaim/receive.wav
 share/sounds/gaim/redalert.wav
 share/sounds/gaim/send.wav
 @dirrm share/sounds/gaim
-@unexec ${RMDIR} %D/share/sounds 2>/dev/null || ${TRUE}
 @dirrm share/pixmaps/gaim/status/default
 @dirrm share/pixmaps/gaim/status
 @dirrm share/pixmaps/gaim/smileys/default
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 670cd7be57c..3227c5cf35c 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/01/22 07:49:20 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/03/08 19:40:36 jmmv Exp $
 
 DISTNAME=	gnomeicu-0.96
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	chat gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnomeicu/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +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_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index 2591d82b53d..63c75aa54b0 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/03/08 15:48:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	gossip-0.7.2
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gossip/0.7/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,7 +11,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GTK2 Jabber Instant Messaging client
 
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_DEPENDS=		p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
 BUILD_USES_MSGFMT=	yes
 
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index e86b03f30cc..b9faa5d7cde 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.23 2004/01/22 07:49:21 grant Exp $
+# $NetBSD: Makefile.common,v 1.24 2004/03/08 19:40:36 jmmv Exp $
 
 DISTNAME=	xchat-1.8.11
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	chat x11
 MASTER_SITES=	${HOMEPAGE}files/source/1.8/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +11,7 @@ HOMEPAGE=	http://xchat.org/
 COMMENT=	X11 (X Window System) IRC client, using the GTK+ toolkit
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 DISTINFO_FILE=	${.CURDIR}/../xchat/distinfo
 FILESDIR=	${.CURDIR}/../xchat/files
diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile
index 1aa6e5d4039..bd54a86313a 100644
--- a/chat/xchat2/Makefile
+++ b/chat/xchat2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:35 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	xchat-2.0.7
+PKGREVISION=	1
 CATEGORIES=	chat gnome
 MASTER_SITES=	http://www.xchat.org/files/source/2.0/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +12,7 @@ HOMEPAGE=	http://www.xchat.org/
 COMMENT=	X11 (X Window System) IRC client, using the GTK2 toolkit
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 CONFLICTS=		xchat-gnome-[0-9]*
 
diff --git a/comms/gnome-pilot/Makefile b/comms/gnome-pilot/Makefile
index 73cd74a8a27..4ba960fcc2c 100644
--- a/comms/gnome-pilot/Makefile
+++ b/comms/gnome-pilot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:35 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=		gnome-pilot-0.1.71
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		comms gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-pilot/0.1/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Palm Pilot synchronisation for GNOME
 
-DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 DEPENDS+=		gob-[0-9]*:../../devel/gob
 BUILD_USES_MSGFMT=	YES
 
diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile
index b7fac449793..916e12a464a 100644
--- a/databases/gnome-mime-data/Makefile
+++ b/databases/gnome-mime-data/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2004/02/14 18:26:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=		gnome-mime-data-2.4.1
+PKGREVISION=		1
 CATEGORIES=		databases gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-mime-data/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,7 +12,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		MIME and Application database for GNOME2
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 CONFLICTS=		gnome-vfs<=1.0.3
 
diff --git a/databases/gq/Makefile b/databases/gq/Makefile
index 9511da983cf..4814e267351 100644
--- a/databases/gq/Makefile
+++ b/databases/gq/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/01/23 21:50:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=	gq-1.0beta1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	databases net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gqclient/}
 
@@ -10,7 +10,7 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://biot.com/gq/
 COMMENT=	GTK-based LDAP client
 
-DEPENDS+=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 USE_BUILDLINK2=		yes
 USE_X11=		yes
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 568132b0e13..879bb1a0c19 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2004/02/14 18:26:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=		libgnomedb-1.0.0
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		databases gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomedb/1.0/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.gnome-db.org/
 COMMENT=		GNOME2 database library
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index a2b9726b1b6..67bab989c33 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/02/20 12:39:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=		mergeant-0.12.1
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		databases gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/mergeant/0.12/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gnome-db.org/
 COMMENT=		GNOME2 GNOME-DB database front-end
 
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 USE_PERL5=              build
 USE_BUILDLINK3=		YES
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 7950b5c22cd..2eb2d0db3c0 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/02/26 16:25:52 cube Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=		anjuta-1.2.1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=anjuta/}
 
@@ -15,7 +16,7 @@ DEPENDS+=		gdk-pixbuf>=0.22:../../graphics/gdk-pixbuf
 DEPENDS+=		gettext>=0.11.5:../../devel/gettext
 DEPENDS+=		glade2>=2.0.1:../../devel/glade2
 DEPENDS+=		gmake>=3.80:../../devel/gmake
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		gnome2-terminal>=2.4.2:../../x11/gnome2-terminal
 DEPENDS+=		libtool>=1.5.2:../../devel/libtool
 DEPENDS+=		pkgconfig>=0.15.0:../../devel/pkgconfig
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index e0a6799ac70..9cef84764ad 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:36 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:37 jmmv Exp $
 
 DISTNAME=		devhelp-0.7
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		devel x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/devhelp/0.7/}
 EXTRACT_SUFX=		.tar.bz2
@@ -10,7 +10,7 @@ MAINTAINER=		benedikt.meurer@unix-ag.uni-siegen.de
 HOMEPAGE=		http://www.imendio.com/projects/devhelp/
 COMMENT=		Documentation viewer based on GNOME2
 
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 382cf96d876..f4216ae5369 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2004/02/14 17:21:37 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2004/03/08 19:40:37 jmmv Exp $
 
 DISTNAME=	glade-0.6.4
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_GNOME:=sources/glade/0.6/}
 
@@ -9,6 +9,8 @@ MAINTAINER=     tech-pkg@NetBSD.org
 HOMEPAGE=	http://glade.gnome.org/
 COMMENT=	User interface builder for GTK+
 
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 USE_X11BASE=		yes
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index ff8c2b3a75e..8e1191dc674 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2004/03/07 12:09:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=		glade-2.0.1
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/glade/2.0/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,6 +13,7 @@ HOMEPAGE=		http://glade.gnome.org/
 COMMENT=		User interface builder for the GTK2+ toolkit and GNOME2
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index e14dc8b5ad5..74afac494ac 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/03/07 12:09:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=	gtranslator-1.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	devel
 MASTER_SITES=	http://www.gtranslator.org/download/releases/1.0/
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.gtranslator.org/
 COMMENT=	Gettext po file editor for the GNOME2 desktop environment
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 0463ecc3fe8..c3aee201a4c 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.20 2004/02/15 11:10:50 markd Exp $
+# $NetBSD: Makefile,v 1.21 2004/03/08 19:40:37 jmmv Exp $
 
 DISTNAME=	kdesdk-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 COMMENT=	Support applications and tools used by KDE developers
 
 CONFLICTS+=	cervisia-[0-9]*
 CONFLICTS+=	umbrello-[0-9]*
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_BUILDLINK2=		YES
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index 2c4bf2c1119..62efdac2ae5 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2004/03/05 17:39:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=	libgnomeui-2.4.0.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeui/2.4/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,6 +12,7 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Core GNOME2 graphical libraries
 
 BUILD_USES_MSGFMT=	yes
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 CONFLICTS+=		gnome-libs<=1.4.2nb1
 
diff --git a/devel/mrproject/Makefile b/devel/mrproject/Makefile
index 0ee90a08cf3..a1c70582aaf 100644
--- a/devel/mrproject/Makefile
+++ b/devel/mrproject/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2004/02/16 15:06:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=		mrproject-0.5.1
-PKGREVISION=		11
+PKGREVISION=		12
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.codefactory.se/pub/software/mrproject/source/
 
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://mrproject.codefactory.se/
 COMMENT=		Project management program
 
-DEPENDS+=		gnome1-dirs>=1.4:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 9f35ae46c64..ca4cb767b5f 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2004/03/07 10:44:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.73 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=		abiword-2.0.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=abiword/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,6 +12,7 @@ HOMEPAGE=		http://www.abisource.com/
 COMMENT=		Open Source cross-platform word processor
 
 BUILD_USES_MSGFMT=	yes
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 # GTK1 version and previous name of the GTK2 version
 CONFLICTS=		abiword-personal-[0-9]* abiword2-[0-9]*
diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
index 35930ca7d5a..3b3427ea8b7 100644
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:14:05 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=	beaver-0.2.6
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	http://savannah.nongnu.org/download/beaver/
 
@@ -10,6 +10,8 @@ MAINTAINER=	vincent.derrien@ahoup.net
 HOMEPAGE=	http://www.nongnu.org/beaver/
 COMMENT=	Lightweight GTK+ text editor with syntax highlighting
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=	YES
 USE_X11=	YES
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index f9e9b1682df..b05bcc4ae84 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/03/07 12:09:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=	conglomerate-0.7.12
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=conglomerate/}
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.conglomerate.org/
 COMMENT=	XML editor for GNOME2
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		docbook-xsl>=1.64.1:../../textproc/docbook-xsl
 DEPENDS+=		docbook-xml>=4.2nb6:../../textproc/docbook-xml
 
diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index 96ce30553fa..f93f06f76bc 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/03/07 12:09:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=	dasher-3.2.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/3.2/}
 
@@ -10,7 +10,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.inference.phy.cam.ac.uk/dasher/
 COMMENT=	Easy typing without using keyboard
 
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/editors/dasher/PLIST b/editors/dasher/PLIST
index 1ac57f2267c..1dfabfe4ab5 100644
--- a/editors/dasher/PLIST
+++ b/editors/dasher/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/26 15:10:50 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/03/08 19:40:37 jmmv Exp $
 bin/dasher
 man/man1/dasher.1
 share/applications/dasher.desktop
@@ -76,7 +76,6 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/dasher.mo
 share/omf/dasher/dasher-C.omf
 @dirrm share/omf/dasher
 @comment in scrollkeeper: @dirrm share/omf
-@unexec ${RMDIR} %D/share/icons 2>/dev/null || ${TRUE}
 @dirrm share/gnome/help/dasher/C/figures
 @dirrm share/gnome/help/dasher/C
 @dirrm share/gnome/help/dasher
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index a74af9ae910..c53d9b538e4 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/02/16 23:20:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=		gconf-editor-2.4.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gconf-editor/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Editor for the GConf configuration system
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		xdg-dirs>=1.0:../../misc/xdg-dirs
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 525ab6be662..5def9fd4146 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2004/03/07 12:09:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.30 2004/03/08 19:40:37 jmmv Exp $
 #
 
 DISTNAME=		gedit-2.4.1
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE=		http://gedit.sourceforge.net/
 COMMENT=		Lightweight GNOME2 text editor
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 USE_PERL5=		build
 USE_BUILDLINK3=		YES
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 60e71bbe7b3..031c907d88e 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/02/25 22:16:23 markd Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/08 19:40:37 jmmv Exp $
 
 DISTNAME=		kile-1.6.1
+PKGREVISION=		1
 CATEGORIES=		editors kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kile/}
 
@@ -8,6 +9,8 @@ MAINTAINER=		markd@NetBSD.org
 HOMEPAGE=		http://kile.sourceforge.net/
 COMMENT=		LaTeX source editor - TeX shell - Gnuplot front end
 
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+
 USE_BUILDLINK2=		yes
 USE_GNU_TOOLS+=		make
 USE_LANGUAGES=		c c++
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 3fac19e82a7..1e89a6cc2c1 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/25 22:04:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/08 19:40:38 jmmv Exp $
 #
 
 DISTNAME=	mlview-0.6.2
+PKGREVISION=	1
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/mlview/0.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +12,7 @@ HOMEPAGE=	http://www.freespiders.org/projects/gmlview/
 COMMENT=	XML editor for the GNOME environment
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		xdg-dirs>=1.0:../../misc/xdg-dirs
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index cd860f3921c..7fae788b76c 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/01/23 21:50:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/08 19:40:38 jmmv Exp $
 
 DISTNAME=	kvim-${KVIM_VERSION}
 PKGNAME=	vim-kde-${KVIM_VERSION}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	editors kde
 MASTER_SITES=	ftp://ftp.kde.org/stable/apps/KDE3.x/utils/ \
 		http://freenux.org/kvim/
@@ -17,6 +17,8 @@ KVIM_VERSION=	6.1.141
 CONFLICTS+=	vim-gtk-[0-9]* vim-gtk2-[0-9]*
 CONFLICTS+=	vim-share-[0-9]* vim-[0-9]* vim-xaw-[0-9]*
 
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+
 WRKSRC= 		${WRKDIR}/kvim-${KVIM_VERSION}/src
 USE_BUILDLINK2=		YES
 
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 55e58f9dee7..9880da8a28e 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2004/02/14 17:21:39 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2004/03/08 19:40:38 jmmv Exp $
 
 DISTNAME=		gnucash-1.8.8
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		finance
 MASTER_SITES=		ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
 			${MASTER_SITE_SOURCEFORGE:=gnucash/}
@@ -12,7 +12,7 @@ COMMENT=		Personal double-entry accounting program
 
 DEPENDS+=		p5-Date-Manip>=5.42a:../../devel/p5-Date-Manip
 DEPENDS+= 		p5-finance-quote>=1.06:../../finance/p5-finance-quote
-DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 BUILDLINK_DEPENDS.guile14+=	guile14<1.5.0:../../lang/guile14
 
diff --git a/finance/gnucash/PLIST b/finance/gnucash/PLIST
index a512cfb34a9..cf551a10ee0 100644
--- a/finance/gnucash/PLIST
+++ b/finance/gnucash/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2004/02/17 16:03:15 seb Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/03/08 19:40:38 jmmv Exp $
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnucash.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnucash.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnucash.mo
@@ -825,8 +825,6 @@ share/pixmaps/gnucash/stock_split_watermark.png
 @dirrm share/gnucash/accounts
 @dirrm share/gnucash
 @dirrm share/doc/html/gnucash
-@unexec ${RMDIR} %D/share/gnome/apps/Applications 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/apps 2>/dev/null || ${TRUE}
 @dirrm share/examples/gnucash
 @dirrm libexec/gnucash/overrides
 @dirrm libexec/gnucash
diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index 9b8dd66d69d..2f773c9ac2d 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/03/07 12:09:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/08 19:40:38 jmmv Exp $
 #
 
 DISTNAME=	gucharmap-1.2.0
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	fonts
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gucharmap/1.2/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://gucharmap.sourceforge.net/
 COMMENT=	Unicode/ISO10646 character map and font viewer
 
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK3=		yes
diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile
index 3623659978d..385b182f7d9 100644
--- a/games/ccgo/Makefile
+++ b/games/ccgo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/02/29 12:42:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/08 19:40:38 jmmv Exp $
 #
 
 DISTNAME=		ccgo-0.3.4
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		http://ccdw.org/~cjj/prog/ccgo/
 
@@ -9,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://ccdw.org/~cjj/prog/ccgo/
 COMMENT=		Go board with IGS and gnugo interface
 
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		gnugo>=3.4:../../games/gnugo
 
 BUILD_USES_MSGFMT=	YES
diff --git a/games/crimsonfields/Makefile b/games/crimsonfields/Makefile
index d431244b3fb..75343ae0b32 100644
--- a/games/crimsonfields/Makefile
+++ b/games/crimsonfields/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2004/03/07 07:34:20 snj Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/08 19:40:38 jmmv Exp $
 #
 
 DISTNAME=		crimson-0.3.8
 PKGNAME=		${DISTNAME:S/crimson/crimsonfields/}
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		http://crimson.seul.org/files/
 EXTRACT_SUFX=		.tar.bz2
@@ -11,6 +12,8 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://crimson.seul.org/
 COMMENT=		Tactical war game in the tradition of Battle Isle
 
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 077608176ab..1aa031433e4 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2004/03/08 02:32:31 snj Exp $
+# $NetBSD: Makefile,v 1.25 2004/03/08 19:40:38 jmmv Exp $
 
 DISTNAME=		dopewars-1.5.9
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		games
 MASTER_SITES=		http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/ \
 			${MASTER_SITE_SOURCEFORGE:=dopewars/} \
@@ -11,6 +11,8 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/
 COMMENT=		Make a fortune dealing drugs on the streets of New York
 
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+
 USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/games/dopewars/PLIST b/games/dopewars/PLIST
index 53f8156ae8e..5e1c1b61385 100644
--- a/games/dopewars/PLIST
+++ b/games/dopewars/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/07/18 18:04:07 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/08 19:40:38 jmmv Exp $
 bin/dopewars
 man/man6/dopewars.6
 share/doc/${PKGNAME}/help/cops.html
@@ -47,8 +47,6 @@ ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/dopewars.mo
 share/pixmaps/dopewars-pill.png
 share/pixmaps/dopewars-shot.png
 share/pixmaps/dopewars-weed.png
-@unexec ${RMDIR} %D/share/gnome/apps/Games 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/apps 2>/dev/null || ${TRUE}
 @dirrm share/dopewars
 @dirrm share/doc/${PKGNAME}/help
 @dirrm share/doc/${PKGNAME}
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 29e21d516ac..be8f039af38 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/03/01 22:46:22 heinz Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/08 19:40:38 jmmv Exp $
 #
 
 DISTNAME=		enigma-0.81
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_GNU:=enigma/} \
 			http://www.rzuser.uni-heidelberg.de/~dheck/
@@ -12,6 +13,8 @@ COMMENT=		Puzzle game similar to Oxyd/Rock'n'Roll/Marble Madness
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+
 GCC_REQD+=		2.95
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index 1fd12274ba1..b83d1ed0d63 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:40 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/08 19:40:38 jmmv Exp $
 #
 
 DISTNAME=		freesci-0.3.4a
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		http://savannah.nongnu.org/download/freesci/stable.pkg/0.3.4a/
 
@@ -9,6 +10,8 @@ MAINTAINER=		dillo@NetBSD.org
 HOMEPAGE=		http://freesci.linuxgames.com/
 COMMENT=		Interpreter for Sierra On-Line's SCI games
 
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile
index 9d9df8c0394..acd46c4bf9d 100644
--- a/games/gnocatan/Makefile
+++ b/games/gnocatan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2004/03/08 19:40:38 jmmv Exp $
 #
 
 DISTNAME=	gnocatan-0.8.1.16
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnocatan/}
 
@@ -10,6 +10,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gnocatan.sourceforge.net/
 COMMENT=	GNOME version of the Settlers of Catan board game
 
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
diff --git a/games/gnocatan/PLIST b/games/gnocatan/PLIST
index 6aca6dc4442..f0ec342ff87 100644
--- a/games/gnocatan/PLIST
+++ b/games/gnocatan/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/25 07:32:45 minskim Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/03/08 19:40:38 jmmv Exp $
 bin/gnocatan
 bin/gnocatan-meta-server
 bin/gnocatan-server-console
@@ -132,7 +132,6 @@ share/pixmaps/gnome-gnocatan.png
 @dirrm share/gnome/help/gnocatan/C
 @dirrm share/gnome/help/gnocatan
 @comment in gnome2-dirs: @dirrm share/gnome/help
-@unexec ${RMDIR} %D/share/gnome/apps/Games 2> /dev/null || ${TRUE}
 @dirrm share/games/gnocatan/themes/Tiny
 @dirrm share/games/gnocatan/themes/Iceland
 @dirrm share/games/gnocatan/themes/FreeCIV-like
diff --git a/games/gnome-breakout/Makefile b/games/gnome-breakout/Makefile
index b03a3b1fc7f..bb01bf81814 100644
--- a/games/gnome-breakout/Makefile
+++ b/games/gnome-breakout/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/08 19:40:38 jmmv Exp $
 #
 
 DISTNAME=	gnome-breakout-0.5.2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	games gnome
 MASTER_SITES=	http://www.senet.com.au/~alcaron/
 
@@ -10,6 +10,8 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.senet.com.au/~alcaron/software.html
 COMMENT=	Gnome version of the classic breakout game
 
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index d12bd73cfa5..010fe00e220 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.27 2004/03/08 19:40:38 jmmv Exp $
 
 DISTNAME=		gnome-chess-0.3.3
-PKGREVISION=		11
+PKGREVISION=		12
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-chess/0.3/}
 
@@ -9,7 +9,7 @@ MAINTAINER=		tron@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/softwaremap/projects/gnome-chess/
 COMMENT=		GNOME\'s graphical interface for playing chess
 
-DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 87b5995f9e6..ad42da833c3 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.63 2004/03/08 19:40:38 jmmv Exp $
 
 DISTNAME=		gnome-games-1.4.0.4
-PKGREVISION=		10
+PKGREVISION=		11
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/1.4/}\
 			${MASTER_SITE_LOCAL}
@@ -13,7 +13,7 @@ MAINTAINER=		tron@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME games collection
 
-DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 BUILD_USES_MSGFMT=	YES
 BUILD_USES_GETTEXT_M4=	YES
 
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 387849cfc35..a4313f26ba7 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2004/03/08 19:40:38 jmmv Exp $
 
 DISTNAME=		gnome-games-2.4.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 games collection
 
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 CONFLICTS=		xbill-[0-9]*
 
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index a071e2cbf3b..8474e998a99 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/02/20 14:38:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/08 19:40:38 jmmv Exp $
 #
 
 DISTNAME=	gtetrinet-0.7.1
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtetrinet/0.7/}
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://gtetrinet.sourceforge.net/
 COMMENT=	Multiplayer tetris game for GNOME2
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		gnome2-dirs>=1.1:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index ff0a43c3b72..01af73b1578 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.23 2004/02/05 07:53:58 markd Exp $
+# $NetBSD: Makefile,v 1.24 2004/03/08 19:40:39 jmmv Exp $
 
 DISTNAME=	kdegames-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	games
 COMMENT=	Games for the KDE integrated X11 desktop
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_BUILDLINK2=		YES
diff --git a/games/kdetoys3/Makefile b/games/kdetoys3/Makefile
index a8913c19d3d..07cac6936ad 100644
--- a/games/kdetoys3/Makefile
+++ b/games/kdetoys3/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.20 2004/02/05 07:59:14 markd Exp $
+# $NetBSD: Makefile,v 1.21 2004/03/08 19:40:39 jmmv Exp $
 
 DISTNAME=	kdetoys-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	games
 COMMENT=	Toys for the KDE integrated X11 desktop
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_BUILDLINK2=		YES
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 9317542c3ec..5b91a3cddfd 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/01/24 13:30:56 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/03/08 19:40:39 jmmv Exp $
 
 DISTNAME=	scummvm-0.5.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scummvm/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +10,8 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://scummvm.sourceforge.net/
 COMMENT=	LucasArts Script Creation Utility for Maniac Mansion
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 USE_BUILDLINK2=	yes
 USE_GNU_TOOLS+=	make
 USE_X11=	yes
diff --git a/games/sirius/Makefile b/games/sirius/Makefile
index 56538580612..7344aa6fd08 100644
--- a/games/sirius/Makefile
+++ b/games/sirius/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/02/20 14:53:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/08 19:40:39 jmmv Exp $
 #
 
 DISTNAME=	sirius-0.8.0
+PKGREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	http://sirius.bitvis.nu/files/
 
@@ -10,7 +11,7 @@ HOMEPAGE=	http://sirius.bitvis.nu/
 COMMENT=	Othello game for GNOME2
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS=		xdg-dirs>=1.0:../../misc/xdg-dirs
+DEPENDS=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
diff --git a/games/xbreaky/Makefile b/games/xbreaky/Makefile
index 376afbd7a4c..8ecef542fbb 100644
--- a/games/xbreaky/Makefile
+++ b/games/xbreaky/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:50:02 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:39 jmmv Exp $
 #
 
 DISTNAME=	xbreaky-0.0.5
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://xbreaky.sourceforge.net/
 
@@ -9,6 +10,8 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://xbreaky.sourceforge.net/
 COMMENT=	Breakout game for X11
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index a83a54881d7..ea6f1e867ce 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2004/01/24 13:30:57 grant Exp $
+# $NetBSD: Makefile,v 1.25 2004/03/08 19:40:39 jmmv Exp $
 
 DISTNAME=		xpuyopuyo-0.9.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		games x11
 MASTER_SITES=		http://chaos2.org/xpuyopuyo/ \
 			http://lenin.dabney.caltech.edu./~justins/xpuyopuyo/
@@ -10,7 +10,7 @@ MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://chaos2.org/xpuyopuyo/
 COMMENT=		Tetris-like puzzle game
 
-DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 AUTOMAKE_REQD=		1.4
 USE_BUILDLINK2=		YES
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 10e6bb2b396..a3d419fa5ed 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2004/02/20 17:02:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.29 2004/03/08 19:40:39 jmmv Exp $
 
 DISTNAME=	dia-0.92.2
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.92/}
 
@@ -9,7 +9,7 @@ MAINTAINER=	jmcneill@invisible.yi.org
 HOMEPAGE=	http://www.lysator.liu.se/~alla/dia/
 COMMENT=	Program for creating diagrams of all kinds
 
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile
index 7d6f437b783..b384330691b 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile,v 1.36 2004/03/08 19:40:39 jmmv Exp $
 
 DISTNAME=		ee-0.3.12
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ee/0.3/}
 
@@ -9,7 +9,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Image viewer based on imlib by the Rasterman.  Gtk clone of xv
 
-DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 USE_BUILDLINK2=		# defined
 USE_PKGLOCALEDIR=	# defined
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 76f9773b0a5..b2ce917ad34 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/08 19:40:39 jmmv Exp $
 
 DISTNAME=		eog-0.6
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		gnome graphics x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/eog/0.6/}
 
@@ -9,6 +9,8 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Eye of GNOME: an image viewing and cataloging program
 
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
 USE_GNU_TOOLS+=		make
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 766f7043753..5af52fc47dd 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.27 2004/03/08 19:40:39 jmmv Exp $
 #
 
 DISTNAME=	eog-2.5.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.5/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Eye of GNOME: an image viewing and cataloging program
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_X11=		YES
diff --git a/graphics/g3d/Makefile b/graphics/g3d/Makefile
index b0352db5375..80b35b823c1 100644
--- a/graphics/g3d/Makefile
+++ b/graphics/g3d/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/08 19:40:39 jmmv Exp $
 #
 
 DISTNAME=	g3d-0.0.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://condor.stcloudstate.edu/~hebl9901/g3d/
 
@@ -10,6 +10,8 @@ MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://condor.stcloudstate.edu/~hebl9901/g3d/
 COMMENT=	3D modeller with a view of 3D modelling
 
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 WRKSRC=		${WRKDIR}/g3d
 USE_LIBTOOL=	YES
 USE_GNU_TOOLS+=	make
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 0617fa11f2a..fe8c9658f05 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2004/02/20 17:49:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/03/08 19:40:39 jmmv Exp $
 
 DISTNAME=	gimageview-0.2.24
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmmviewer/}
 
@@ -9,7 +9,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://gtkmmviewer.sourceforge.net/
 COMMENT=	GTK+ based image viewer with tabbed browsing
 
-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/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile
index 6fdfad04495..6fe0bc32ce7 100644
--- a/graphics/gnome-icon-theme/Makefile
+++ b/graphics/gnome-icon-theme/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/02/11 06:37:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/08 19:40:39 jmmv Exp $
 #
 
 DISTNAME=		gnome-icon-theme-1.0.9
+PKGREVISION=		1
 CATEGORIES=		graphics gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-icon-theme/1.0/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,6 +12,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Theme consisting of a set of icons for GNOME
 
 BUILD_USES_MSGFMT=	yes
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/graphics/gnome-iconedit/Makefile b/graphics/gnome-iconedit/Makefile
index 1158be158f3..709ba8d5f5e 100644
--- a/graphics/gnome-iconedit/Makefile
+++ b/graphics/gnome-iconedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/08 19:40:39 jmmv Exp $
 #
 
 DISTNAME=		gnome-iconedit-1.2.0
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		graphics gnome
 MASTER_SITES=		http://www.webtribe.net/i/iain/
 
@@ -10,6 +10,7 @@ MAINTAINER=		wiz@NetBSD.org
 COMMENT=		Icon editor based on GNOME libraries
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/graphics/gnome-iconedit/PLIST b/graphics/gnome-iconedit/PLIST
index 777a5c32cbe..d3c6da6ce4a 100644
--- a/graphics/gnome-iconedit/PLIST
+++ b/graphics/gnome-iconedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/12/01 13:49:41 salo Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/08 19:40:39 jmmv Exp $
 bin/gnome-iconedit
 etc/CORBA/servers/gnome-iconedit.gnorba
 share/gnome/apps/Graphics/gnome-iconedit.desktop
@@ -30,4 +30,3 @@ share/pixmaps/gnome-iconedit/selector.png
 @dirrm share/pixmaps/gnome-iconedit
 @dirrm share/gnome/help/gnome-iconedit/C
 @dirrm share/gnome/help/gnome-iconedit
-@unexec ${RMDIR} -p %D/share/gnome/apps/Graphics 2>/dev/null || ${TRUE}
diff --git a/graphics/gnome-pixmaps/Makefile b/graphics/gnome-pixmaps/Makefile
index 84be87c5d85..93d6c526ae7 100644
--- a/graphics/gnome-pixmaps/Makefile
+++ b/graphics/gnome-pixmaps/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:41:03 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/08 19:40:39 jmmv Exp $
 #
 
 DISTNAME=		gnome-core-1.4.2
 PKGNAME=		${DISTNAME:S/core/pixmaps/}
+PKGREVISION=		1
 CATEGORIES=		graphics gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-core/1.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,6 +12,8 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Pixmaps for gnome-core
 
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 .include "../../mk/bsd.prefs.mk"
 
 CONFLICTS=		gnome-core<1.4.2
diff --git a/graphics/gnome2-pixmaps/Makefile b/graphics/gnome2-pixmaps/Makefile
index 1fd8e92df17..165599776e7 100644
--- a/graphics/gnome2-pixmaps/Makefile
+++ b/graphics/gnome2-pixmaps/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2004/02/11 04:40:49 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/08 19:40:39 jmmv Exp $
 #
 
 DISTNAME=		gnome-desktop-2.4.1.1
 PKGNAME=		${DISTNAME:S/-desktop/2-pixmaps/}
+PKGREVISION=		1
 CATEGORIES=		graphics gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -20,6 +21,8 @@ CONFLICTS+=		gnome-pixmaps-[0-9]*
 CONFLICTS+=		gnome-pixmaps-2.0.8
 .endif
 
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+
 USE_BUILDLINK3=		YES
 USE_X11=		YES
 NO_CONFIGURE=		YES
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index 0d35142c1a6..3c569699a01 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:39 jmmv Exp $
 #
 
 DISTNAME=	gpaint-0.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gpaint/}
 
@@ -10,6 +10,8 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://gpaint.sourceforge.net/
 COMMENT=	Simple, easy-to-use paint program for GNOME
 
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index ce5dd37d3d9..8e29a32f6ae 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/02/16 15:06:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/08 19:40:39 jmmv Exp $
 #
 
 DISTNAME=	gtkam-0.1.10
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gphoto.sourceforge.net/proj/gphoto2/
 COMMENT=	Digital camera access graphical client (GTK2)
 
-DEPENDS+=		gnome2-dirs>=1.4:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index e9157f9ca46..3c13594d052 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.31 2004/03/01 11:37:15 markd Exp $
+# $NetBSD: Makefile,v 1.32 2004/03/08 19:40:39 jmmv Exp $
 
 DISTNAME=	kdegraphics-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 COMMENT=	Graphics programs for the KDE integrated X11 desktop
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 #DEPENDS+=	gPhoto2
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index 7c87c62d0ca..80e0d05e58b 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/01/24 15:46:44 grant Exp $
+# $NetBSD: Makefile,v 1.22 2004/03/08 19:40:39 jmmv Exp $
 #
 
 DISTNAME=	scigraphica-0.8.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	graphics math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scigraphica/}
 
@@ -10,7 +10,7 @@ MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://scigraphica.sourceforge.net/
 COMMENT=	Data analysis and technical graphics
 
-DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=	gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 USE_BUILDLINK2=		YES
 USE_X11=		YES
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index 2e69306e87b..a5a3dad4947 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2004/01/24 15:46:44 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/03/08 19:40:39 jmmv Exp $
 #
 
 DISTNAME=	sodipodi-0.33
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sodipodi/}
 
@@ -10,7 +10,7 @@ MAINTAINER=	manu@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/gnome-office/sodipodi.shtml
 COMMENT=	Open source vector graphics drawing program using SVG as native format
 
-DEPENDS+=	gnome2-dirs>=1.0:../../misc/gnome2-dirs
+DEPENDS+=	gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
diff --git a/graphics/sodipodi/PLIST b/graphics/sodipodi/PLIST
index edabbe1040f..4c1d9feccd3 100644
--- a/graphics/sodipodi/PLIST
+++ b/graphics/sodipodi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/18 04:14:05 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/08 19:40:39 jmmv Exp $
 bin/sodipodi
 lib/sodipodi/extensions/ill2svg.pl
 man/man1/sodipodi.1
@@ -209,6 +209,4 @@ share/sodipodi/zoom_out.xpm
 share/sodipodi/zoom_page.xpm
 share/sodipodi/zoom_select.xpm
 @unexec ${RMDIR} %D/share/oaf 2> /dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/apps/Graphics 2> /dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/apps 2> /dev/null || ${TRUE}
 @dirrm share/sodipodi
diff --git a/inputmethod/imhangul_status_applet/Makefile b/inputmethod/imhangul_status_applet/Makefile
index 6681e2ebec7..80121c0d197 100644
--- a/inputmethod/imhangul_status_applet/Makefile
+++ b/inputmethod/imhangul_status_applet/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/18 00:16:35 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/08 19:40:40 jmmv Exp $
 #
 
 DISTNAME=		imhangul_status_applet-0.2
+PKGREVISION=		1
 CATEGORIES=		korean inputmethod
 MASTER_SITES=		http://download.kldp.net/imhangul/
 
@@ -10,6 +11,7 @@ HOMEPAGE=		http://imhangul.kldp.net/\#APPLET
 COMMENT=		GNOME2 applet to show imhangul status
 
 DEPENDS=		imhangul>=0.9.6:../../inputmethod/imhangul
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 6a61a7ee48d..1a9f9ad6b6d 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2004/02/14 17:21:44 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2004/03/08 19:40:40 jmmv Exp $
 #
 
 DISTNAME=		balsa-1.4.3
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		mail gnome
 MASTER_SITES=		http://www.theochem.kth.se/~pawsa/balsa/ \
 			ftp://ftp.newton.cx/pub/balsa/
@@ -12,6 +12,8 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.balsa.net/
 COMMENT=		GNOME EMail client
 
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_X11BASE=		yes
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index bc9298982e8..f09af7298cd 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2004/03/07 11:15:45 recht Exp $
+# $NetBSD: Makefile,v 1.23 2004/03/08 19:40:40 jmmv Exp $
 #
 
 DISTNAME=		balsa-2.0.16
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		mail gnome
 MASTER_SITES=		http://balsa.gnome.org/				\
 			ftp://ftp.newton.cx/pub/balsa/
@@ -13,6 +13,7 @@ HOMEPAGE=		http://balsa.gnome.org/
 COMMENT=		GNOME2 EMail client
 
 BUILD_USES_MSGFMT=	yes
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_PERL5=		build
 USE_PKGINSTALL=		yes
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index dbbcf22c1a3..bfc0dbfa942 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.56 2004/03/08 19:40:40 jmmv Exp $
 
 DISTNAME=		evolution-1.4.5
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		mail time gnome
 MASTER_SITES=		ftp://ftp.ximian.com/pub/source/evolution/ \
 			${MASTER_SITE_GNOME:=sources/evolution/1.4/}
@@ -12,7 +12,7 @@ HOMEPAGE=		http://ximian.com/products/evolution/
 COMMENT=		GNOME mailer, calendar, contact manager, and communications tool
 
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		psmisc-[0-9]*:../../sysutils/psmisc
 BUILD_USES_MSGFMT=	YES
 
diff --git a/mail/evolution12/Makefile b/mail/evolution12/Makefile
index 531629ed7da..eb84ba82d0e 100644
--- a/mail/evolution12/Makefile
+++ b/mail/evolution12/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/08 19:40:40 jmmv Exp $
 
 DISTNAME=		evolution-1.2.4
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		mail time gnome
 MASTER_SITES=		ftp://ftp.ximian.com/pub/ximian-evolution/source/ \
 			ftp://ximian.netnitco.net/pub/mirrors/ximian/ximian-evolution/source/ \
@@ -21,7 +21,7 @@ HOMEPAGE=		http://ximian.com/products/evolution/
 COMMENT=		GNOME mailer, calendar, contact manager, and communications tool
 
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-DEPENDS+=		gnome1-dirs>=1.4:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 DEPENDS+=		psmisc-[0-9]*:../../sysutils/psmisc
 BUILD_USES_MSGFMT=	YES
 
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 14b87cb1d5c..c6ffb723634 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2004/03/08 19:40:40 jmmv Exp $
 #
 
 DISTNAME=		gcalctool-4.3.48
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcalctool/4.3/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 6da27936fa8..a5d0a659082 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.81 2004/03/08 19:40:40 jmmv Exp $
 #
 
 DISTNAME=		gnumeric-1.0.13
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.0/}
 
@@ -10,7 +10,7 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/gnumeric/
 COMMENT=		Spreadsheet program from the GNOME project
 
-DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 # for Python support a shared libpython is required but not provided yet
 #BUILD_DEPENDS+=		python>=2.0:../../lang/python
 
diff --git a/math/gnumeric0/Makefile b/math/gnumeric0/Makefile
index 51c3534d6ff..f406016ecd2 100644
--- a/math/gnumeric0/Makefile
+++ b/math/gnumeric0/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:44 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2004/03/08 19:40:40 jmmv Exp $
 #
 
 DISTNAME=		gnumeric-0.75
-PKGREVISION=		10
+PKGREVISION=		11
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/0.75/}
 
@@ -10,7 +10,7 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/gnumeric/
 COMMENT=		Powerful and easy to use spreadsheet program from the GNOME project
 
-DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/math/graphopt/Makefile b/math/graphopt/Makefile
index f0f5ada8389..3efb6302ec1 100644
--- a/math/graphopt/Makefile
+++ b/math/graphopt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/11/07 15:24:10 gavan Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:40 jmmv Exp $
 #
 
 DISTNAME=	graphopt-0.4.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=graphopt/}
 EXTRACT_SUFX=	.tgz
@@ -11,6 +11,8 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://schmuhl.org/graphopt/
 COMMENT=	Optimize graph layouts
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 USE_BUILDLINK2=	YES
 USE_GCC_SHLIB=	YES
 GNU_CONFIGURE=	YES
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 20829cf6b78..204fa59b161 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2004/02/14 17:21:44 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2004/03/08 19:40:40 jmmv Exp $
 
 DISTNAME=	Guppi-0.40.3
 PKGNAME=	${DISTNAME:S/G/g/}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/Guppi/0.40/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,6 +11,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/guppi/
 COMMENT=	Plot program with integrated statistics capabilities
 
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 .if exists(/usr/include/wctype.h)
 #
 # "guppi" only accepts newer versions of the "gnumeric" package which
diff --git a/misc/blackbook/Makefile b/misc/blackbook/Makefile
index 6a5588cbc0c..51ceb2e1486 100644
--- a/misc/blackbook/Makefile
+++ b/misc/blackbook/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 14:11:09 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/08 19:40:40 jmmv Exp $
 #
 
 DISTNAME=	blackbook-3
 PKGNAME=	${DISTNAME}.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc x11
 MASTER_SITES=  	${MASTER_SITE_SOURCEFORGE:=blackbook/}
 
@@ -11,6 +11,8 @@ MAINTAINER=	sjr@hispabsd.org
 HOMEPAGE=	http://blackbook.sourceforge.net/
 COMMENT=	Simple address book (Gtk+ based)
 
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
diff --git a/misc/blackbook/PLIST b/misc/blackbook/PLIST
index eb0d091f320..a23edb6389b 100644
--- a/misc/blackbook/PLIST
+++ b/misc/blackbook/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/03 09:44:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/03/08 19:40:40 jmmv Exp $
 bin/blackbook
 share/icons/book64.xpm
 share/icons/book48.xpm
-@unexec ${RMDIR} %D/share/icons 2>/dev/null || ${TRUE}
diff --git a/misc/drwright/Makefile b/misc/drwright/Makefile
index fdadea0ae95..ffd2ba9eb7b 100644
--- a/misc/drwright/Makefile
+++ b/misc/drwright/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/24 17:05:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/08 19:40:40 jmmv Exp $
 #
 
 DISTNAME=		drwright-0.17
+PKGREVISION=		1
 CATEGORIES=		misc gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/drwright/0.17/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,7 +12,7 @@ HOMEPAGE=		http://www.imendio.com/projects/drwright/
 COMMENT=		Computer break reminder
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS=		gnome2-dirs>=1.4:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile
index 0efa76320c3..c0af4d0441e 100644
--- a/misc/gnome-pim/Makefile
+++ b/misc/gnome-pim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2004/01/24 14:11:10 grant Exp $
+# $NetBSD: Makefile,v 1.45 2004/03/08 19:40:40 jmmv Exp $
 
 DISTNAME=		gnome-pim-1.4.6
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		misc x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-pim/1.4/}
 
@@ -9,7 +9,7 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Personal Information Manager for GNOME
 
-DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 USE_BUILDLINK2=		YES
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index d32a3b40049..98d67946b75 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.70 2004/03/08 19:40:40 jmmv Exp $
 
 DISTNAME=		gnome-utils-1.4.1.2
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		misc x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/1.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -10,7 +10,7 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Set of useful GNOME utilities and applications
 
-DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+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
 
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 54b1fee39c6..c862aa3606a 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2004/03/08 19:40:40 jmmv Exp $
 #
 
 DISTNAME=		gnome-utils-2.4.1
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		misc gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,6 +12,7 @@ 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
diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index f660e102510..29998ddf927 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:40 jmmv Exp $
 #
 
 DISTNAME=		gok-0.8.4
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=desktop/2.4/2.4.1/sources/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME On-Screen Keyboard
 
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index ac8525f20ed..a632de9b34f 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2004/01/24 14:11:10 grant Exp $
+# $NetBSD: Makefile,v 1.21 2004/03/08 19:40:40 jmmv Exp $
 
 DISTNAME=		gperiodic-2.0.7
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		misc x11
 MASTER_SITES=		http://www.acclab.helsinki.fi/~frantz/software/
 
@@ -10,7 +10,7 @@ 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.0:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 USE_BUILDLINK2=		# defined
 USE_PKGLOCALEDIR=	# defined
diff --git a/misc/gxmame/Makefile b/misc/gxmame/Makefile
index b69f0182f33..f7784111ae6 100644
--- a/misc/gxmame/Makefile
+++ b/misc/gxmame/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/01/24 14:11:10 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/03/08 19:40:40 jmmv Exp $
 #
 
 DISTNAME=	gxmame-0.34b
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gxmame/}
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://gxmame.sourceforge.net/
 COMMENT=	Frontend for XMame using the GTK2 library
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		xmame-[0-9]*:../../emulators/xmame
 
 GNU_CONFIGURE=		yes
diff --git a/misc/hitchhiker/Makefile b/misc/hitchhiker/Makefile
index 3d479a238fd..bfd8710e52d 100644
--- a/misc/hitchhiker/Makefile
+++ b/misc/hitchhiker/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2004/01/03 18:49:46 reed Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/08 19:40:40 jmmv Exp $
 #
 
 DISTNAME=	hh2000-0.6
 PKGNAME=	hitchhiker-0.6
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hitchhiker/}
 
@@ -11,6 +11,8 @@ 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
diff --git a/misc/hitchhiker/PLIST b/misc/hitchhiker/PLIST
index c579de85580..3f35941ceb8 100644
--- a/misc/hitchhiker/PLIST
+++ b/misc/hitchhiker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/12/09 16:01:34 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/08 19:40:40 jmmv Exp $
 bin/hh2000
 share/gnome/apps/Applications/hh2000.desktop
 share/hh2000/data/asteroids.csv
@@ -50,7 +50,6 @@ share/pixmaps/hh2000/star.xpm
 share/pixmaps/hh2000/step_forward.xpm
 share/pixmaps/hh2000/step_reverse.xpm
 share/pixmaps/hh2000icon.png
-@unexec ${RMDIR} -p %D/share/gnome/apps/Applications 2> /dev/null || ${TRUE}
 @dirrm share/pixmaps/hh2000
 @dirrm share/hh2000/scripts
 @dirrm share/hh2000/maps
diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index 0bb173d33f0..01c305c04bd 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.21 2004/02/09 00:54:49 chris Exp $
+# $NetBSD: Makefile,v 1.22 2004/03/08 19:40:40 jmmv Exp $
 
 DISTNAME=	kdeaddons-${_KDE_VERSION}
-PKGREVISION=	1
+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
diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile
index b3beb47a451..16f1779975b 100644
--- a/misc/kdeadmin3/Makefile
+++ b/misc/kdeadmin3/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.20 2004/02/04 20:44:42 markd Exp $
+# $NetBSD: Makefile,v 1.21 2004/03/08 19:40:41 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
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index 32a721cbf7b..46c7de0e913 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.21 2004/02/04 22:13:11 markd Exp $
+# $NetBSD: Makefile,v 1.22 2004/03/08 19:40:41 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=	\
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index ef4882bd0dc..103a85a11a1 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:45 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/03/08 19:40:41 jmmv Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 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
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index a55f8b8ac85..8eda181d898 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.32 2004/02/28 16:21:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2004/03/08 19:40:41 jmmv Exp $
 
 DISTNAME=	kdeutils-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 DEPENDS+=	gtar-base>=1.13.25:../../archivers/gtar-base
diff --git a/misc/ooqstart/Makefile b/misc/ooqstart/Makefile
index 141c869f7cd..f6ead47387f 100644
--- a/misc/ooqstart/Makefile
+++ b/misc/ooqstart/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/01/24 14:11:10 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:41 jmmv Exp $
 #
 
 DISTNAME=	ooqstart-0.8.3
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ooqstart/}
 EXTRACT_SUFX=	.tgz
@@ -12,6 +12,7 @@ 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_GNU_TOOLS+=	make
diff --git a/misc/xchm/Makefile b/misc/xchm/Makefile
index 7c7657aef8c..e6ba27735b7 100644
--- a/misc/xchm/Makefile
+++ b/misc/xchm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/03/07 01:17:45 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/08 19:40:41 jmmv Exp $
 #
 
 DISTNAME=	xchm-0.9
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xchm/}
 
@@ -9,6 +10,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://xchm.sourceforge.net/
 COMMENT=	CHM viewer for UNIX
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c++
 GNU_CONFIGURE=		yes
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 18445804234..a13900b663e 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/08 19:40:41 jmmv Exp $
 #
 
 DISTNAME=		yelp-2.4.2
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Help browser for GNOME 2 desktop
 
-DEPENDS=		gnome2-dirs>=1.4:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		docbook>=4.2:../../textproc/docbook
 BUILD_USES_MSGFMT=	yes
 
diff --git a/multimedia/alevt/Makefile b/multimedia/alevt/Makefile
index 76fcdc790f7..69589e8ce38 100644
--- a/multimedia/alevt/Makefile
+++ b/multimedia/alevt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/01/26 11:47:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/08 19:40:41 jmmv Exp $
 
 DISTNAME=	alevt-1.6.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/video/}
 
@@ -11,6 +11,7 @@ COMMENT=	Teletext decoder and browser for Brooktree 848 compatible TV cards
 
 DEPENDS+=	png>=1.2.1:../../graphics/png
 DEPENDS+=	fxtv>=1.02:../../multimedia/fxtv
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
 
 ONLY_FOR_PLATFORM=	NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
 			NetBSD-1.5_ALPHA-* NetBSD-1.[5-9]*-*
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 35835204e00..1fe8d30acdd 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/02/20 17:32:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/03/08 19:40:41 jmmv Exp $
 #
 
 DISTNAME=	gmencoder-0.1.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gmencoder/}
 EXTRACT_SUFX=	.tgz
@@ -12,7 +12,7 @@ HOMEPAGE=	http://gmencoder.sourceforge.net/
 COMMENT=	GNOME2 frontend to mencoder
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=       	gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=       	gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=       	mencoder>=0.90:../../multimedia/mencoder
 DEPENDS+=       	mplayer>=0.90:../../multimedia/mplayer
 
diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index f26bdc34314..8ae8bd61089 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/08 19:40:41 jmmv Exp $
 
 DISTNAME=		gnome-media-1.2.3
-PKGREVISION=		10
+PKGREVISION=		11
 CATEGORIES=		multimedia gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/1.2/}
 
@@ -9,7 +9,7 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Set of audio/multimedia applications for GNOME
 
-DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 BUILD_USES_MSGFMT=	YES
 
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index 4deaa87eeea..b7ce28854ca 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/08 19:40:41 jmmv Exp $
 
 DISTNAME=		gnome-media-2.4.1.1
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		multimedia gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,6 +11,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Set of audio/multimedia applications for GNOME2
 
 BUILD_USES_MSGFMT=	yes
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index f2ea959863b..0cf1af3dccd 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/02/18 13:33:41 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/08 19:40:41 jmmv Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
@@ -11,6 +11,7 @@ CONFLICTS=	timidity-[0-9]*
 
 DEPENDS+=	xine-arts>=1rc0a:../../audio/xine-arts
 DEPENDS+=	trm>=0.2.1:../../audio/trm
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_BUILDLINK2=		YES
 
diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile
index 68ae78f070a..cc06df370c0 100644
--- a/multimedia/nautilus-media/Makefile
+++ b/multimedia/nautilus-media/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/02/20 12:06:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/08 19:40:41 jmmv Exp $
 #
 
 DISTNAME=	nautilus-media-0.3.3.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/nautilus-media/0.3/}
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://thomas.apestaart.org/projects/nautilus-media/
 COMMENT=	Multimedia add-ons for Nautilus
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 087fd7d2c83..205ca7c68e9 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:45 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/08 19:40:41 jmmv Exp $
 #
 
 DISTNAME=		xine-ui-0.9.22
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 
@@ -11,6 +11,8 @@ HOMEPAGE=		http://xinehq.de/
 COMMENT=		Skinned xlib-based xine GUI
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+
 BUILDLINK_DEPENDS.curl=	curl>7.10.2
 
 USE_PKGLOCALEDIR=	YES
diff --git a/net/amule/Makefile b/net/amule/Makefile
index 5b8f08bd4f4..7b3027619fd 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2004/02/13 11:18:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/08 19:40:41 jmmv Exp $
 #
 
 DISTNAME=		aMule-1.2.5
 PKGNAME=		${DISTNAME:S/aMule/amule/}
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=amule/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,7 +12,7 @@ MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://amule.sourceforge.net/
 COMMENT=		Another Emule P2P client
 
-DEPENDS=		xdg-dirs>=1.0:../../misc/xdg-dirs
+DEPENDS=		xdg-dirs>=1.1:../../misc/xdg-dirs
 BUILD_USES_MSGFMT=	yes
 
 CONFLICTS=		xmule-[0-9]*
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 03b934e7f32..47782621fda 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2004/02/16 22:07:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/03/08 19:40:41 jmmv Exp $
 #
 
 DISTNAME=		bug-buddy-2.4.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bug-buddy/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Graphical GNOME2 bug reporting tool
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index 3217bd60627..a855268db36 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/02/20 16:23:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/08 19:40:41 jmmv Exp $
 #
 
 DISTNAME=	dc_gui2-0.75
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	http://www.ac2i.tzo.com/dctc/ \
 		http://brainz.servebeer.com/dctc/
@@ -12,6 +12,7 @@ HOMEPAGE=	http://www.ac2i.tzo.com/dctc/
 COMMENT=	Graphical user interface for DCTC
 
 DEPENDS+=	dctc>=0.85.4:../../net/dctc
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
diff --git a/net/ed2k-gtk-gui/Makefile b/net/ed2k-gtk-gui/Makefile
index c75ea5b2e80..fc63e96afeb 100644
--- a/net/ed2k-gtk-gui/Makefile
+++ b/net/ed2k-gtk-gui/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/20 03:49:26 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/08 19:40:41 jmmv Exp $
 
 DISTNAME=		ed2k-gtk-gui-0.6.1
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ed2k-gtk-gui/}
 
@@ -8,7 +9,7 @@ MAINTAINER=		minskim@NetBSD.org
 HOMEPAGE=		http://ed2k-gtk-gui.sourceforge.net/
 COMMENT=		GUI for the eDonkey2000 and Overnet
 
-DEPENDS+=		xdg-dirs>=1.0:../../misc/xdg-dirs
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_BUILDLINK3=		yes
 USE_X11=		yes
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 624a296794a..2002e524259 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/02/20 16:05:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/08 19:40:41 jmmv Exp $
 #
 
 DISTNAME=	etherape-0.9.0
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	gnome net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=etherape/}
 
@@ -10,6 +10,8 @@ MAINTAINER=	damon@NetBSD.org
 HOMEPAGE=	http://etherape.sourceforge.net/
 COMMENT=	Graphical network monitor
 
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_BUILDLINK3=		YES
diff --git a/net/gftp/Makefile b/net/gftp/Makefile
index 3931f578371..ac1cc7861df 100644
--- a/net/gftp/Makefile
+++ b/net/gftp/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.16 2004/03/08 10:11:17 tron Exp $
+# $NetBSD: Makefile,v 1.17 2004/03/08 19:40:41 jmmv Exp $
 #
 
 .include "${.CURDIR}/Makefile.common"
-PKGREVISION=	2
+PKGREVISION=	3
 
 COMMENT=	Multithreaded GTK2+ ftp client
 
-DEPENDS+=	gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=	gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 CONFLICTS=	gftp-gtk1-[0-9]*
 
diff --git a/net/gftp/Makefile.common b/net/gftp/Makefile.common
index 808ddf1bfef..0e585634a98 100644
--- a/net/gftp/Makefile.common
+++ b/net/gftp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2004/03/08 10:11:17 tron Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/03/08 19:40:41 jmmv Exp $
 
 DISTNAME=	gftp-${VERSION}
 CATEGORIES=	net
@@ -10,6 +10,7 @@ MAINTAINER=	jmcneill@invisible.yi.org
 HOMEPAGE=	http://gftp.seul.org/
 
 BUILD_USES_MSGFMT=	yes
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile
index 2e322b64e80..faf85cc40e6 100644
--- a/net/gnapster/Makefile
+++ b/net/gnapster/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2004/02/14 17:21:46 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2004/03/08 19:40:41 jmmv Exp $
 
 DISTNAME=	gnapster-1.5.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnapster/}
 
@@ -10,6 +10,7 @@ HOMEPAGE=	http://sourceforge.net/projects/gnapster/
 COMMENT=	Simple client for the online mp3 community
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_BUILDLINK2=		YES
 USE_X11=		YES
diff --git a/net/gtm/Makefile b/net/gtm/Makefile
index cd0b4625db4..f0858ac1a31 100644
--- a/net/gtm/Makefile
+++ b/net/gtm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2004/01/24 14:50:05 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/03/08 19:40:41 jmmv Exp $
 #
 
 DISTNAME=	gtm-0.4.12
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtm/}
 
@@ -11,6 +11,7 @@ HOMEPAGE=	http://gtm.sourceforge.net/
 COMMENT=	Gnome Transfer Manager
 
 DEPENDS+=	wget-[0-9]*:../../net/wget
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 77cbb6f1315..3ed4ca4d63f 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.27 2004/03/01 13:08:42 markd Exp $
+# $NetBSD: Makefile,v 1.28 2004/03/08 19:40:42 jmmv Exp $
 
 DISTNAME=	kdenetwork-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	net
 COMMENT=	Network modules for the KDE integrated X11 desktop
 
 CONFLICTS=	kopete-[0-9]*
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_BUILDLINK2=		yes
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index ede0c639a45..9e1735b531f 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/02/20 12:13:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/08 19:40:42 jmmv Exp $
 #
 
 DISTNAME=		tsclient-0.132
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		net
 MASTER_SITES=		http://www.gnomepro.com/tsclient/
 
@@ -12,7 +12,7 @@ COMMENT=		GNOME2 Frontend for rdesktop
 
 DEPENDS+=       	rdesktop-[0-9]*:../../net/rdesktop
 DEPENDS+=       	vncviewer-[0-9]*:../../net/vncviewer
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK3=		yes
diff --git a/news/pan-gnome/Makefile b/news/pan-gnome/Makefile
index ac1ce8752fe..efb558629c5 100644
--- a/news/pan-gnome/Makefile
+++ b/news/pan-gnome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/01/03 18:49:51 reed Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/08 19:40:42 jmmv Exp $
 #
 
 DISTNAME=	pan-0.11.4
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	news gnome
 MASTER_SITES=	http://pan.rebelbase.com/download/releases/${DISTNAME:C/pan-//}/SOURCE/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,6 +12,7 @@ HOMEPAGE=	http://pan.rebelbase.com/
 COMMENT=	Newsreader for Gnome
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
 
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 75fb775fc7d..e43fee794c2 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2004/02/14 19:24:05 minskim Exp $
+# $NetBSD: Makefile,v 1.33 2004/03/08 19:40:42 jmmv Exp $
 #
 
 DISTNAME=		pan-0.14.2
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		news
 MASTER_SITES=		http://pan.rebelbase.com/download/releases/${DISTNAME:C/pan-//}/SOURCE/
 EXTRACT_SUFX=		.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://pan.rebelbase.com/
 COMMENT=		Newsreader for GTK2
 
-DEPENDS+=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	YES
 
 USE_PERL5=		build
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 8c996b71c35..e69ca7da041 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2004/02/14 17:21:49 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2004/03/08 19:40:42 jmmv Exp $
 #
 
 DISTNAME=		ggv-1.0.2
-PKGREVISION=		11
+PKGREVISION=		12
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ggv/1.0/}
 
@@ -11,6 +11,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME frontend for GhostScript
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index f88360eca56..be7cd5dcfc7 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2004/02/16 23:36:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.27 2004/03/08 19:40:42 jmmv Exp $
 #
 
 DISTNAME=		ggv-2.4.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ggv/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 frontend for GhostScript
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
diff --git a/print/gpdf/Makefile b/print/gpdf/Makefile
index 5f006217bc0..aa3e83cc9e6 100644
--- a/print/gpdf/Makefile
+++ b/print/gpdf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/02/19 13:22:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:42 jmmv Exp $
 #
 
 DISTNAME=	gpdf-0.112.1
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gpdf/0.112/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,7 +11,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME 2 version of xpdf
 
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK3=		yes
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 66ffb553d0d..4291c63cb6f 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2004/02/20 13:08:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2004/03/08 19:40:42 jmmv Exp $
 
 DISTNAME=	seahorse-0.7.3
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=seahorse/}
 
@@ -11,7 +11,7 @@ COMMENT=	GnuPG front end and bonobo component for Gnome
 
 BUILD_USES_MSGFMT=	yes
 DEPENDS+=		gnupg>=1.2.1:../../security/gnupg
-DEPENDS+=		gnome2-dirs>=1.1:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
diff --git a/sysutils/apotheke/Makefile b/sysutils/apotheke/Makefile
index e644a45f0bf..c8c7b131fcb 100644
--- a/sysutils/apotheke/Makefile
+++ b/sysutils/apotheke/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/02/20 12:22:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/08 19:40:42 jmmv Exp $
 #
 
 DISTNAME=	apotheke-0.2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	ftp://ftp.berlios.de/pub/apotheke/
 
@@ -10,6 +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_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 7e2e95d6350..a3c6114f0ce 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2004/01/24 15:06:57 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/08 19:40:42 jmmv Exp $
 #
 
 DISTNAME=		cdrdao-1.1.7.src
 PKGNAME=		gcdmaster-1.1.7
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cdrdao/}
 
@@ -12,6 +12,7 @@ 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
diff --git a/sysutils/gcdmaster/PLIST b/sysutils/gcdmaster/PLIST
index 1c0ef6c5c63..0a5f409300c 100644
--- a/sysutils/gcdmaster/PLIST
+++ b/sysutils/gcdmaster/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/10/29 16:50:14 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/03/08 19:40:42 jmmv Exp $
 bin/gcdmaster
 man/man1/xcdrdao.1
 share/pixmaps/gcdmaster/gcdmaster.png
@@ -20,5 +20,3 @@ share/pixmaps/gcdmaster/pixmap_zoom-selection.xpm
 share/pixmaps/gcdmaster/pixmap_zoom-tool.xpm
 share/gnome/apps/Applications/gcdmaster.desktop
 @dirrm share/pixmaps/gcdmaster
-@unexec ${RMDIR} %D/share/gnome/apps/Applications 2> /dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/apps 2> /dev/null || ${TRUE}
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 20a39d95f85..71d99197374 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2003/07/17 22:53:34 grant Exp $
+# $NetBSD: Makefile,v 1.37 2004/03/08 19:40:42 jmmv Exp $
 #
 
 DISTNAME=		gcombust-0.1.54
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 sysutils
 MASTER_SITES=		${HOMEPAGE}
 
@@ -12,7 +12,7 @@ COMMENT=		Graphical frontend for CD mastering (mkisofs, cdrecord, ...)
 
 DEPENDS+=		cdrecord>=1.10:../../sysutils/cdrecord
 DEPENDS+=		cdlabelgen-[0-9]*:../../graphics/cdlabelgen
-DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 DEPENDS+=		gv-[0-9]*:../../print/gv
 
 USE_BUILDLINK2=		YES
diff --git a/sysutils/gmc/Makefile b/sysutils/gmc/Makefile
index a7cc6809266..c7963d094e2 100644
--- a/sysutils/gmc/Makefile
+++ b/sysutils/gmc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2004/01/03 18:49:52 reed Exp $
+# $NetBSD: Makefile,v 1.35 2004/03/08 19:40:42 jmmv Exp $
 
 PKGNAME=		g${DISTNAME}
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES+=		gnome
 
 COMMENT=		GNOME version of Midnight Commander, a free Norton Commander Clone
@@ -10,7 +10,7 @@ USE_X11BASE=		# defined
 CONFIGURE_ARGS+=	--with-tm-x-support
 CONFIGURE_ARGS+=	--with-gnome
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+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 7066ebe4f6a..e2b02619ce5 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/24 21:39:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/08 19:40:42 jmmv Exp $
 #
 
 DISTNAME=	gnome-pkgview-1.0.5
+PKGREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.greatnorthern.demon.co.uk/packages/gnome-pkgview/
 
@@ -10,7 +11,7 @@ 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.0:../../misc/xdg-dirs
+DEPENDS=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile
index a755eb17af9..dc709d20aca 100644
--- a/sysutils/gnome2-system-monitor/Makefile
+++ b/sysutils/gnome2-system-monitor/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2004/02/19 09:31:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:42 jmmv Exp $
 #
 
 DISTNAME=	gnome-system-monitor-2.4.0
 PKGNAME=	${DISTNAME:S/gnome/gnome2/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.4/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +12,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME 2 system monitor program
 
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK3=		yes
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index 4effb1fa40b..0f144221042 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2004/01/24 15:06:57 grant Exp $
+# $NetBSD: Makefile,v 1.31 2004/03/08 19:40:42 jmmv Exp $
 
 DISTNAME=		gtop-1.0.13
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtop/1.0/}
 
@@ -10,6 +10,7 @@ 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
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 096a56d7a71..0a573aee95a 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2004/02/14 18:26:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2004/03/08 19:40:42 jmmv Exp $
 #
 
 DISTNAME=		nautilus-2.4.2
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,6 +11,8 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/projects/nautilus/
 COMMENT=		Nautilus file manager for GNOME2
 
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+
 USE_PKGLOCALEDIR=	yes
 USE_BUILDLINK3=		yes
 USE_X11=		yes
diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile
index d1c214d31c0..9d0d5075c91 100644
--- a/sysutils/xfe/Makefile
+++ b/sysutils/xfe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/01/24 15:06:58 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/03/08 19:40:42 jmmv Exp $
 #
 
 DISTNAME=	xfe-0.54.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xfe/}
 
@@ -11,6 +11,7 @@ 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_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
index 572b0b0a951..d6302a6ad1d 100644
--- a/sysutils/xnc/Makefile
+++ b/sysutils/xnc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/02/22 22:29:22 jschauma Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/08 19:40:42 jmmv Exp $
 
 DISTNAME=	xnc-5.0.4.src
 PKGNAME=	xnc-5.0.4
+PKGREVISION=	1
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://www.xnc.dubna.su/src-5/
 
@@ -9,6 +10,8 @@ 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_X11=	yes
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
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 6182b2c63ed..7ace944df07 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2004/02/09 18:47:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.41 2004/03/08 19:40:43 jmmv Exp $
 #
 
 DISTNAME=	bluefish-0.12
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/	\
 		ftp://bluefish.advancecreations.com/bluefish/downloads/ \
@@ -15,7 +15,7 @@ MAINTAINER=	wulf@ping.net.au
 HOMEPAGE=	http://bluefish.openoffice.nl/
 COMMENT=	GTK HTML editor for the experienced web designer
 
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		weblint-[0-9]*:../../www/weblint
 BUILD_USES_MSGFMT=	YES
 
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 847049529b2..eca4c82e87e 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/03/06 13:46:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/08 19:40:43 jmmv Exp $
 #
 
 DISTNAME=	epiphany-1.0.7
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/1.0/}
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.gnome.org/projects/epiphany/
 COMMENT=	The web browser for the GNOME Desktop
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index f77454a45f2..9d9484fe364 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2004/02/18 13:33:41 jlam Exp $
+# $NetBSD: Makefile,v 1.64 2004/03/08 19:40:43 jmmv Exp $
 
 DISTNAME=	galeon-1.2.13
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}
 
@@ -12,6 +12,7 @@ COMMENT=	GNOME web browser based on gecko (mozilla rendering engine)
 CONFLICTS=	galeon-current-[0-9]*
 
 BUILD_DEPENDS+=	xml-i18n-tools>=0.8.1:../../textproc/xml-i18n-tools
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
 
 EVAL_PREFIX+=	MOZILLA_PREFIX=mozilla
 EVAL_PREFIX+=	ICONV_PREFIX=libiconv
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index 0a229f022bb..bc5f5cf13a2 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2004/01/20 12:28:26 agc Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/08 19:40:43 jmmv Exp $
 #
 
 DISTNAME=		Xaw-XPM-1.1
 PKGNAME=		Xaw-Xpm-1.1
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=libs/X/}
 
@@ -12,6 +13,8 @@ COMMENT=		Enhanced 3-D widgets based on the Athena Widget set and Xaw3d
 
 CONFLICTS=		Xaw3d-[0-9]*
 
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 WRKSRC=			${WRKDIR}/XawXpm
 USE_BUILDLINK2=		YES
 USE_IMAKE=		YES
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 629f5a87291..c018470bd28 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2004/02/14 17:21:55 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2004/03/08 19:40:43 jmmv Exp $
 
 DISTNAME=		control-center-1.4.0.4
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/control-center/1.4/}
 
@@ -10,6 +10,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME control-center development library
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
 
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index b77d46efc83..0136fc7c8b7 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:55 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2004/03/08 19:40:43 jmmv Exp $
 #
 
 DISTNAME=		gdkxft-1.5
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gdkxft/}
 
@@ -10,6 +10,8 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://gdkxft.sourceforge.net/
 COMMENT=		Transparently add anti-aliased font support to gtk+ applications
 
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 .include "../../mk/bsd.prefs.mk"
 
 .if !exists(${X11BASE}/lib/libXft.a)
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index ad6e62f91b0..d312e865be5 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.53 2004/03/08 19:40:43 jmmv Exp $
 #
 
 DISTNAME=	gdm-2.4.4.7
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.4/} \
 		${MASTER_SITE_LOCAL}
@@ -14,6 +14,7 @@ COMMENT=	Gnome Display Manager - a re-implementation of the xdm program
 
 BUILDLINK_DEPENDS.libart2+=	libart2>=2.3.11
 BUILD_USES_MSGFMT=	YES
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
diff --git a/x11/gdm1/Makefile b/x11/gdm1/Makefile
index 29ea2b28042..7758e6ce138 100644
--- a/x11/gdm1/Makefile
+++ b/x11/gdm1/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/20 13:33:07 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/08 19:40:43 jmmv Exp $
 
 DISTNAME=	gdm-2.2.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.2/} \
 		${MASTER_SITE_LOCAL}
@@ -11,6 +11,8 @@ MAINTAINER=	mjl@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Gnome Display Manager - a re-implementation of the xdm program
 
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_BUILDLINK2=		YES
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index b0da711fd19..cecdf5f803f 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2004/03/08 19:40:43 jmmv Exp $
 #
 
 DISTNAME=		gnome-applets-1.4.0.4
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/1.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,6 +12,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Applets for GNOME
 
 BUILD_DEPENDS+=		xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
 
 BUILDLINK_DEPENDS.gnome-panel=	gnome-panel<2.0
 
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 16c41148417..ccaf2fd8a3e 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.96 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.97 2004/03/08 19:40:43 jmmv Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		11
+PKGREVISION=		12
 
 COMMENT=		Core component of GNU Network Object Management Environment
 
-DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 DEPENDS+=		xscreensaver-gnome>=4.14:../xscreensaver-gnome
 DEPENDS+=		gnome-session>=1.4.2:../../x11/gnome1-session
 DEPENDS+=		gnome-panel>=1.4.2:../../x11/gnome1-panel
diff --git a/x11/gnome-core/Makefile.common b/x11/gnome-core/Makefile.common
index ae0356e390b..07e2573d1ac 100644
--- a/x11/gnome-core/Makefile.common
+++ b/x11/gnome-core/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2004/02/14 17:21:55 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2004/03/08 19:40:43 jmmv Exp $
 #
 
 DISTNAME=		gnome-core-1.4.2
@@ -10,6 +10,7 @@ MAINTAINER?=		rh@NetBSD.org
 HOMEPAGE?=		http://www.gnome.org/
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
 
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 6d291be548e..f3113859f53 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2004/02/18 11:56:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.98 2004/03/08 19:40:43 jmmv Exp $
 
 DISTNAME=		gnome-libs-1.4.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-libs/1.4/}
 
@@ -9,7 +9,7 @@ MAINTAINER=		tron@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Libraries for the GNU Network Object Model Environment
 
-DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 BUILD_USES_MSGFMT=	YES
 
 USE_X11BASE=		YES
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 8244fd7b65e..d3c2bba28e8 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2004/03/07 12:09:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.34 2004/03/08 19:40:43 jmmv Exp $
 #
 
 DISTNAME=		gnome-panel-2.4.2
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 panel application
 
-DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		gnome-icon-theme>=1.0.9:../../graphics/gnome-icon-theme
 
 GNU_CONFIGURE=		YES
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 8f1da177013..a37a89a3959 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2004/03/08 15:24:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2004/03/08 19:40:43 jmmv Exp $
 #
 
 DISTNAME=		gnome-session-2.4.2
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.4/}
 SITES_gnome-splash-2.4.2.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
@@ -13,7 +13,7 @@ MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 session management utilities
 
-DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 CONFLICTS+=		gnome-core<1.4.2nb4
 
diff --git a/x11/gnome-themes-extra/Makefile b/x11/gnome-themes-extra/Makefile
index f5193ea1135..374ad05742a 100644
--- a/x11/gnome-themes-extra/Makefile
+++ b/x11/gnome-themes-extra/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/02/20 13:27:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:43 jmmv Exp $
 #
 
 DISTNAME=	gnome-themes-extras-0.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-themes-extras/0.5/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Extra themes for GNOME 2
 
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK3=		yes
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index 28501b912de..d2409984b56 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:55 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/03/08 19:40:43 jmmv Exp $
 #
 
 DISTNAME=		gnome-themes-2.4.1
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-themes/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Collection of themes and icons for GNOME 2
 
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK3=		yes
diff --git a/x11/gnome1-panel/Makefile b/x11/gnome1-panel/Makefile
index 317582bf7e7..913c221c863 100644
--- a/x11/gnome1-panel/Makefile
+++ b/x11/gnome1-panel/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2004/03/07 12:09:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/08 19:40:43 jmmv Exp $
 #
 
 .include "../../x11/gnome-core/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/-core/-panel/}
-PKGREVISION=		6
+PKGREVISION=		7
 
 COMMENT=		Gnome-panel component split out from gnome-core
 
-DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 DEPENDS+=		gnome-session>=1.4.2:../../x11/gnome1-session
 DEPENDS+=		xscreensaver-gnome>=4.14:../xscreensaver-gnome
 BUILD_DEPENDS+=		gtk-doc>=0.9:../../textproc/gtk-doc
diff --git a/x11/gnome1-session/Makefile b/x11/gnome1-session/Makefile
index e83cdbe4fa0..8f6f6757dd8 100644
--- a/x11/gnome1-session/Makefile
+++ b/x11/gnome1-session/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.8 2004/03/07 12:09:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/08 19:40:44 jmmv Exp $
 #
 
 .include "../../x11/gnome-core/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/-core/-session/}
-PKGREVISION=		6
+PKGREVISION=		7
 
 COMMENT=		Gnome-session component split out from gnome-core
 
-DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 DEPENDS+=		xscreensaver-gnome>=4.14:../xscreensaver-gnome
 BUILD_DEPENDS+=		gtk-doc>=0.9:../../textproc/gtk-doc
 
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index b5b93858494..7cbfd8f760b 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2004/03/07 12:09:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2004/03/08 19:40:44 jmmv Exp $
 #
 
 DISTNAME=		gnome-applets-2.4.2
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 panel applets
 
-DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		yes
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index d729db0e335..fbdcdf2f256 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2004/02/15 18:37:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2004/03/08 19:40:44 jmmv Exp $
 #
 
 DISTNAME=	control-center-2.4.0
 PKGNAME=	gnome2-${DISTNAME}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.4/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME2 configuration utility
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS=		gnome2-dirs>=1.3:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index f8c709df71f..d20773ab88c 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2004/03/07 12:09:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/03/08 19:40:44 jmmv Exp $
 #
 
 DISTNAME=		gnome-terminal-2.4.2
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,7 +13,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Xterm like terminal program for GNOME 2
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 CONFLICTS=		gnome-core-[0-9]*
 
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index 3011e61fb19..9793ecb7601 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/03/07 12:09:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:44 jmmv Exp $
 #
 
 DISTNAME=		gnopernicus-0.7.1
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnopernicus/0.7/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Collection of accessibility apps for GNOME 2
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index 6ebc70c7461..9ec91feade5 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2004/02/14 17:21:55 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/08 19:40:44 jmmv Exp $
 
 DISTNAME=		gtk-engines-0.12
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/0.12/}
 
@@ -9,6 +9,8 @@ MAINTAINER=		tron@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Theme engines for GTK+
 
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 GNU_CONFIGURE=		# defined
 USE_BUILDLINK2=		# defined
 USE_X11BASE=		# defined
diff --git a/x11/gtk-engines/PLIST b/x11/gtk-engines/PLIST
index 17209ccd1d2..b042c9b8da0 100644
--- a/x11/gtk-engines/PLIST
+++ b/x11/gtk-engines/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/10 08:46:53 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/03/08 19:40:44 jmmv Exp $
 lib/gtk/themes/engines/libmetal.la
 lib/gtk/themes/engines/libmetal.so
 lib/gtk/themes/engines/libnotif.la
@@ -103,5 +103,4 @@ share/themes/Redmond95/gtk/gtkrc
 @dirrm share/themes/Notif
 @dirrm share/themes/Metal/gtk
 @dirrm share/themes/Metal
-@unexec ${RMDIR} -p %D/share/themes 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} -p %D/lib/gtk/themes/engines 2>/dev/null || ${TRUE}
diff --git a/x11/gtk-thinice-engine/Makefile b/x11/gtk-thinice-engine/Makefile
index 89d5512f6a4..d1f8687e365 100644
--- a/x11/gtk-thinice-engine/Makefile
+++ b/x11/gtk-thinice-engine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/02/27 01:53:45 snj Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:44 jmmv Exp $
 #
 
 DISTNAME=	gtk-thinice-engine-2.0.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-thinice-engine/2.0/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://thinice.sourceforge.net/
 COMMENT=	Simple, clean theme engine
 
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK2=		yes
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index d6d91dff511..1543f19ad7b 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2004/02/14 18:26:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.101 2004/03/08 19:40:44 jmmv Exp $
 
 DISTNAME=		gtk+-1.2.10
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v1.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -12,6 +12,9 @@ HOMEPAGE=		http://www.gtk.org/
 COMMENT=		The GIMP Toolkit - libraries for building X11 user interfaces
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 USE_BUILDLINK3=		yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/gtk/PLIST b/x11/gtk/PLIST
index e4272c8540a..d42c19e9ef7 100644
--- a/x11/gtk/PLIST
+++ b/x11/gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/01/18 01:11:40 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/03/08 19:40:44 jmmv Exp $
 bin/gtk-config
 share/gtk/gtkrc.az
 share/gtk/gtkrc.be
@@ -235,7 +235,6 @@ share/themes/Default/gtk/gtkrc
 @unexec ${RMDIR} %D/share/aclocal 2>/dev/null || ${TRUE}
 @dirrm share/themes/Default/gtk
 @unexec ${RMDIR} %D/share/themes/Default 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/themes 2>/dev/null || ${TRUE}
 @dirrm include/gtk-1.2/gtk
 @dirrm include/gtk-1.2/gdk
 @dirrm include/gtk-1.2
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index 08cf58a3128..d12abb298b7 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2004/02/14 18:26:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2004/03/08 19:40:45 jmmv Exp $
 #
 
 DISTNAME=		gtk-engines-2.2.0
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/2.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,6 +12,8 @@ MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Theme engines for GTK+ version 2
 
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
 USE_X11=		yes
diff --git a/x11/gtk2-engines/PLIST b/x11/gtk2-engines/PLIST
index ce620b39259..8f2cb4f222d 100644
--- a/x11/gtk2-engines/PLIST
+++ b/x11/gtk2-engines/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/18 10:49:33 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/03/08 19:40:45 jmmv Exp $
 lib/gtk-2.0/${PKGVERSION}/engines/libmetal.a
 lib/gtk-2.0/${PKGVERSION}/engines/libmetal.la
 lib/gtk-2.0/${PKGVERSION}/engines/libmetal.so
@@ -17,6 +17,5 @@ share/themes/Redmond95/gtk-2.0/gtkrc
 @dirrm share/themes/Redmond95
 @dirrm share/themes/Metal/gtk-2.0
 @dirrm share/themes/Metal
-@unexec ${RMDIR} %D/share/themes 2>/dev/null || ${TRUE}
 @dirrm lib/gtk-2.0/${PKGVERSION}/engines
 @unexec ${RMDIR} %D/lib/gtk-2.0/${PKGREVISION} 2>/dev/null || ${TRUE}
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 8d626b11891..b791c0ed46e 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2004/02/27 01:52:48 snj Exp $
+# $NetBSD: Makefile,v 1.45 2004/03/08 19:40:44 jmmv Exp $
 #
 
 DISTNAME=		gtk+-2.2.4
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \
@@ -15,6 +15,8 @@ HOMEPAGE=		http://www.gtk.org/
 COMMENT=		The GIMP Toolkit - libraries for building X11 user interfaces
 
 BUILD_USES_MSGFMT=	yes
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index fa45b1b947a..edecc90ff07 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2004/02/27 01:52:48 snj Exp $
+@comment $NetBSD: PLIST,v 1.23 2004/03/08 19:40:44 jmmv Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 bin/gtk-demo
@@ -779,7 +779,6 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
 @dirrm share/themes/Default/gtk-2.0-key
 @dirrm share/themes/Default/gtk-2.0
 @unexec ${RMDIR} %D/share/themes/Default 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/themes 2>/dev/null || ${TRUE}
 @dirrm share/gtk-2.0/demo
 @dirrm share/gtk-2.0
 @dirrm share/doc/html/gtk
diff --git a/x11/gtkstep/Makefile b/x11/gtkstep/Makefile
index 3b8e668a320..10bd2721e7e 100644
--- a/x11/gtkstep/Makefile
+++ b/x11/gtkstep/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:56 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/08 19:40:45 jmmv Exp $
 
 DISTNAME=		gtkstep-1.10
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11
 MASTER_SITES=		http://ulli.linuxave.net/gtkstep/
 EXTRACT_SUFX=		.tar.bz2
@@ -10,6 +10,8 @@ MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://ulli.linuxave.net/gtkstep/index.html
 COMMENT=		GTK theme-engine to yield a NEXTSTEP(tm) look and feel
 
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 USE_LIBTOOL=		# defined
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index f12f777fbc6..a4786a8a264 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.41 2004/02/12 05:04:08 markd Exp $
+# $NetBSD: Makefile,v 1.42 2004/03/08 19:40:45 jmmv Exp $
 
 DISTNAME=	kdebase-3.2.0
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index a046ad17637..117e3a1efbf 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2004/02/29 12:00:56 markd Exp $
+# $NetBSD: Makefile,v 1.53 2004/03/08 19:40:45 jmmv Exp $
 
 DISTNAME=	kdelibs-3.2.0
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 PKGREVISION=	1
@@ -8,7 +9,7 @@ PKGREVISION=	1
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 CONFLICTS+=	koffice3<=1.1.1
-DEPENDS+=	xdg-dirs>=1.0:../../misc/xdg-dirs
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index c7ee7cb8ea4..142594f5ee6 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/03/07 12:09:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2004/03/08 19:40:46 jmmv Exp $
 
 DISTNAME=	multi-gnome-terminal-1.6.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	gnome x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=multignometerm/}
 
@@ -9,6 +9,8 @@ MAINTAINER=	damon@NetBSD.org
 HOMEPAGE=	http://multignometerm.sourceforge.net/
 COMMENT=	Gnome tabbed terminal emulator
 
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 USE_BUILDLINK2=		# defined
 USE_X11BASE=		# defined
 USE_GNU_TOOLS+=		make
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index dba9c99d690..62d6e4a3373 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/02/25 23:19:21 minskim Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/08 19:40:46 jmmv Exp $
 
 DISTNAME=		wdm-1.25
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 windowmaker
 MASTER_SITES=		http://voins.program.ru/wdm/
 
@@ -10,6 +10,7 @@ HOMEPAGE=		http://voins.program.ru/wdm/
 COMMENT=		WINGs display manager
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS+=		xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
 
 USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
diff --git a/x11/xfce4-gtk2-engines/Makefile b/x11/xfce4-gtk2-engines/Makefile
index 813426f8ef5..2b21d27b495 100644
--- a/x11/xfce4-gtk2-engines/Makefile
+++ b/x11/xfce4-gtk2-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/27 01:54:23 snj Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:46 jmmv Exp $
 #
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
@@ -7,9 +7,11 @@ XFCE4_VERSION=	2.1.8
 
 DISTNAME=	gtk-xfce-engine-${XFCE4_VERSION}
 PKGNAME=	xfce4-gtk2-engine-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	XFce4 GTK2 themes
 
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
+
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index cdd1a8e9e50..f784dc685be 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/02/16 22:20:01 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 19:40:46 jmmv Exp $
 #
 
 DISTNAME=	xpad-1.12
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xpad/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE=	http://xpad.sourceforge.net/
 COMMENT=	Sticky notes application in GTK 2
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile
index 48427cf9198..47b3cfea81a 100644
--- a/x11/xscreensaver-demo/Makefile
+++ b/x11/xscreensaver-demo/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2004/02/26 17:31:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/08 19:40:46 jmmv Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-demo-/}
 COMMENT=	Screen saver and locker for the X window system (demo program)
-PKGREVISION=	3
+PKGREVISION=	4
 
 CONFLICTS+=	xscreensaver<4.14 xscreensaver-gnome-[0-9]*
 
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 USE_BUILDLINK3=	yes
 
 .include "../../x11/xscreensaver/Makefile.common"
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 8fbf55da717..21ade1f1b8a 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.29 2004/02/26 17:31:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.30 2004/03/08 19:40:46 jmmv Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
 COMMENT=	Screen saver and locker for the X window system (GNOME applet)
-PKGREVISION=	3
+PKGREVISION=	4
 
 CONFLICTS+=	xscreensaver<4.14 xscreensaver-demo-[0-9]*
 
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 USE_BUILDLINK3=	yes
 
 .include "../../x11/xscreensaver/Makefile.common"
author	jmmv <jmmv>	2004-03-08 19:40:36 +0000
committer	jmmv <jmmv>	2004-03-08 19:40:36 +0000
commit	3ae0aec8ac71e8b2b498fbfcdeed74888a448b22 (patch)
tree	31ed0dbd30601179a2bbef617a33214b104e418a
parent	47c6e2b314c6de44ed6a3b6733b41c3e1d1a9732 (diff)
download	pkgsrc-3ae0aec8ac71e8b2b498fbfcdeed74888a448b22.tar.gz