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

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

11 files changed, 34 insertions, 25 deletions

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