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

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

19 files changed, 61 insertions, 41 deletions

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