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

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

10 files changed, 31 insertions, 23 deletions

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