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

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

17 files changed, 53 insertions, 39 deletions

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