Depend on (at least) version 1.2 of gnome{,1,2}-dirs to automatically handle

the shared share/mime-info directory.  Bump PKGREVISION.

50 files changed, 131 insertions, 83 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 6453c6b2fee..2aa73ec5489 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/05/02 11:53:35 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/30 16:19:50 jmmv Exp $
 #
 
 DISTNAME=	file-roller-2.2.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fileroller/}
 
@@ -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.0:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
diff --git a/archivers/file-roller/PLIST b/archivers/file-roller/PLIST
index 8df383eaed4..94a7c4490c6 100644
--- a/archivers/file-roller/PLIST
+++ b/archivers/file-roller/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/18 14:55:54 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/05/30 16:19:50 jmmv Exp $
 bin/file-roller
 lib/bonobo/libfile-roller-component.a
 lib/bonobo/libfile-roller-component.la
@@ -62,6 +62,7 @@ share/omf/file-roller/file-roller-ru.omf
 share/pixmaps/file-roller.png
 @dirrm share/omf/file-roller
 @comment in scrollkeeper: @dirrm share/omf
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnome/help/file-roller/ru/figures
 @dirrm share/gnome/help/file-roller/ru
 @dirrm share/gnome/help/file-roller/C/figures
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index e02dd010876..0b4bd532fb1 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2003/05/02 11:53:41 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2003/05/30 16:19:51 jmmv Exp $
 
 DISTNAME=		gnome-media-1.2.3
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		audio gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/1.2/}
 
@@ -9,6 +9,8 @@ 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
+
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
diff --git a/audio/gnome-media/PLIST b/audio/gnome-media/PLIST
index b0928a5fe8f..855305e8f4b 100644
--- a/audio/gnome-media/PLIST
+++ b/audio/gnome-media/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/02/18 14:55:55 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/05/30 16:19:51 jmmv Exp $
 bin/cddbslave
 bin/cddbsubmit
 bin/gmix
@@ -71,6 +71,7 @@ share/mime-info/grecord.keys
 share/mime-info/grecord.mime
 @dirrm share/omf/gnome-media
 @comment in scrollkeeper: @dirrm share/omf
+@comment in gnome-dirs: @dirrm share/mime-info
 @exec ${MKDIR} %D/share/gnome/help/gmix/it/stylesheet-images
 @dirrm share/gnome/help/gmix/it/stylesheet-images
 @dirrm share/gnome/help/gmix/it/figures
diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index a87f1a2e4aa..aa28d222898 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/05/02 11:53:58 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/05/30 16:19:51 jmmv Exp $
 #
 
 DISTNAME=		oregano-0.20
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		cad gnome
 MASTER_SITES=		http://www.dtek.chalmers.se/~d4hult/oregano/download/
 
@@ -10,6 +10,8 @@ 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
+
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
diff --git a/cad/oregano/PLIST b/cad/oregano/PLIST
index b29007482c3..18639a70ef9 100644
--- a/cad/oregano/PLIST
+++ b/cad/oregano/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/27 12:37:20 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/05/30 16:19:52 jmmv Exp $
 bin/oregano
 bin/pspice2oregano
 share/gnome/apps/Applications/oregano.desktop
@@ -38,6 +38,7 @@ share/oregano/samples/opamp.oregano
 share/oregano/samples/transistors.oregano
 share/oregano/samples/zener.oregano
 share/pixmaps/gnome-oregano.png
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnome/help/oregano/C
 @dirrm share/gnome/help/oregano
 @comment in gnome-dirs: @dirrm share/gnome/help
diff --git a/comms/gnome-pilot/Makefile b/comms/gnome-pilot/Makefile
index a4183b24b7f..9636eec7b01 100644
--- a/comms/gnome-pilot/Makefile
+++ b/comms/gnome-pilot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:08 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/30 16:19:52 jmmv Exp $
 #
 
 DISTNAME=		gnome-pilot-0.1.71
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		comms gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-pilot/0.1/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,6 +11,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Palm Pilot synchronisation for GNOME
 
+DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
 DEPENDS+=		gob-[0-9]*:../../devel/gob
 BUILD_USES_MSGFMT=	YES
 
diff --git a/comms/gnome-pilot/PLIST b/comms/gnome-pilot/PLIST
index 0f90a6fb4c7..d762a9990b3 100644
--- a/comms/gnome-pilot/PLIST
+++ b/comms/gnome-pilot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/27 14:31:43 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/05/30 16:19:52 jmmv Exp $
 bin/gnome-pilot-make-password
 bin/gpilot-applet
 bin/gpilot-install-file
@@ -87,6 +87,7 @@ share/pixmaps/sync_broken.png
 share/pixmaps/sync_icon.png
 share/pixmaps/sync_paused.png
 share/pixmaps/syncing_icon.png
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnome-pilot/glade
 @dirrm share/gnome-pilot/conduits
 @dirrm share/gnome-pilot
diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile
index b65eed60f12..a6abf2fb385 100644
--- a/databases/gnome-mime-data/Makefile
+++ b/databases/gnome-mime-data/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/05/25 08:10:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/30 16:19:53 jmmv Exp $
 #
 
 DISTNAME=		gnome-mime-data-2.2.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		databases gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-mime-data/2.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		MIME and Application database for GNOME2
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		gnome2-dirs>=1.1:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 CONFLICTS=		gnome-vfs<=1.0.3
 
diff --git a/databases/gnome-mime-data/PLIST b/databases/gnome-mime-data/PLIST
index 0001a383ea2..3d91340fe72 100644
--- a/databases/gnome-mime-data/PLIST
+++ b/databases/gnome-mime-data/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/05/25 08:10:20 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/05/30 16:19:53 jmmv Exp $
 lib/pkgconfig/gnome-mime-data-2.0.pc
 man/man5/gnome-vfs-mime.5
 share/application-registry/gnome-vfs.applications
@@ -222,6 +222,6 @@ share/pixmaps/document-icons/i-spreadsheet.png
 share/pixmaps/document-icons/i-web.png
 share/pixmaps/document-icons/i-zipdisk.png
 @dirrm share/pixmaps/document-icons
-@unexec ${RMDIR} %D/share/mime-info 2>/dev/null || ${TRUE}
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/examples/gnome-mime-data
 @comment in gnome2-dirs: @dirrm share/application-registry
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index af6b7644efe..39ea2f1e4ce 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:12 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/30 16:19:53 jmmv Exp $
 #
 
 DISTNAME=		libgnomedb-0.10.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		databases gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomedb/0.10/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=		sab@posix.org.uk
 HOMEPAGE=		http://www.gnome-db.org/
 COMMENT=		GNOME2 database library
 
-DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 USE_X11=		YES
 USE_GMAKE=		YES
diff --git a/databases/libgnomedb/PLIST b/databases/libgnomedb/PLIST
index bcc612b7363..5d698c9efd9 100644
--- a/databases/libgnomedb/PLIST
+++ b/databases/libgnomedb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/18 14:55:56 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/05/30 16:19:53 jmmv Exp $
 bin/gnome-database-properties
 include/libgnomedb/gnome-db-browser.h
 include/libgnomedb/gnome-db-combo.h
@@ -160,6 +160,7 @@ share/pixmaps/libgnomedb/gnome-db.png
 @dirrm share/pixmaps/libgnomedb
 @dirrm share/omf/libgnomedb
 @comment in scrollkeeper: @dirrm share/omf
+@comment in gnome-dirs: @dirrm share/mime-info
 @comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/examples/libgnomedb
 @dirrm share/doc/html/libgnomedb
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 562decc3c18..87c5daeecf9 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/05/02 11:54:13 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/30 16:19:54 jmmv Exp $
 #
 
 DISTNAME=		mergeant-0.10.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		databases gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/mergeant/0.10/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,6 +11,8 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome-db.org/
 COMMENT=		GNOME2 GNOME-DB database front-end
 
+DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+
 USE_PERL5=              build
 USE_BUILDLINK2=		YES
 USE_X11=		YES
diff --git a/databases/mergeant/PLIST b/databases/mergeant/PLIST
index e809ea06289..21202f3664c 100644
--- a/databases/mergeant/PLIST
+++ b/databases/mergeant/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/21 11:58:59 salo Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/05/30 16:19:54 jmmv Exp $
 bin/mergeant
 share/application-registry/mergeant.applications
 share/applications/mergeant.desktop
@@ -56,6 +56,7 @@ share/pixmaps/mergeant/query-view-table_16x16.png
 share/pixmaps/mergeant/query-view-view_16x16.png
 @dirrm share/pixmaps/mergeant
 @dirrm share/omf/mergeant
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/mergeant/plugins
 @dirrm share/mergeant/dtd
 @dirrm share/mergeant
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 5b6f333834c..1b19e6f05fc 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/05/02 11:54:19 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/30 16:19:54 jmmv Exp $
 #
 
 DISTNAME=		anjuta-1.0.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=anjuta/}
 
@@ -11,6 +11,7 @@ HOMEPAGE=		http://www.anjuta.org/
 COMMENT=		Gnome based IDE for C and C++
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
 
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/devel/anjuta/PLIST b/devel/anjuta/PLIST
index 9c343e04260..bbdb7289d1a 100644
--- a/devel/anjuta/PLIST
+++ b/devel/anjuta/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/02/18 14:55:56 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/05/30 16:19:54 jmmv Exp $
 bin/anjuta
 bin/anjuta_import.sh
 bin/anjuta_launcher
@@ -469,6 +469,7 @@ share/pixmaps/anjuta/wizard.xpm
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnome/help/anjuta/ja/anjuta-manual/figures
 @dirrm share/gnome/help/anjuta/ja/anjuta-manual
 @exec ${MKDIR} %D/share/gnome/help/anjuta/ja/anjuta-faqs/figures
diff --git a/devel/mrproject/Makefile b/devel/mrproject/Makefile
index b001399305a..da0eb805345 100644
--- a/devel/mrproject/Makefile
+++ b/devel/mrproject/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/05/05 14:29:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/30 16:19:55 jmmv Exp $
 #
 
 DISTNAME=		mrproject-0.5.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.codefactory.se/pub/software/mrproject/source/
 
@@ -10,6 +10,8 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://mrproject.codefactory.se/
 COMMENT=		Project management program
 
+DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
diff --git a/devel/mrproject/PLIST b/devel/mrproject/PLIST
index 21a2605122d..a10faa000e8 100644
--- a/devel/mrproject/PLIST
+++ b/devel/mrproject/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/03/05 18:43:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/05/30 16:19:55 jmmv Exp $
 bin/mrproject
 bin/mrproject-engine
 bin/run-mrproject
@@ -119,6 +119,7 @@ share/oaf/GNOME_MrProject_XmlFileFilter.oaf
 share/pixmaps/gnome-application-x-mrproject.png
 share/pixmaps/mrproject.png
 @dirrm share/mrproject
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/images/mrproject
 @comment belongs to evolution: share/images
 @dirrm lib/mrproject/components
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index ac4c0857561..36e46109773 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/05/05 16:21:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/30 16:19:55 jmmv Exp $
 #
 
 DISTNAME=		gedit-2.2.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.2/}
 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.0:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 USE_PERL5=		build
 USE_BUILDLINK2=		YES
diff --git a/editors/gedit/PLIST b/editors/gedit/PLIST
index 31494ad6ce3..73910008036 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/03/12 16:41:01 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/05/30 16:19:56 jmmv Exp $
 bin/gedit
 bin/gnome-text-editor
 lib/bonobo/servers/GNOME_Gedit.server
@@ -128,6 +128,7 @@ share/pixmaps/gedit-logo.png
 share/pixmaps/gedit-plugin-manager.png
 @dirrm share/omf/gedit
 @comment in scrollkeeper: @dirrm share/omf
+@comment in gnome2-dirs: @dirrm share/mime-info
 @dirrm share/gnome/help/gedit/ro/figures
 @dirrm share/gnome/help/gedit/ro
 @dirrm share/gnome/help/gedit/C/figures
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 06ca8a439c9..c01795fb7dc 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2003/05/05 16:24:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.41 2003/05/30 16:19:56 jmmv Exp $
 
 DISTNAME=		gnucash-1.8.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		finance
 MASTER_SITES=		ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
 			${MASTER_SITE_SOURCEFORGE:=gnucash/}
@@ -11,6 +11,7 @@ HOMEPAGE=		http://www.gnucash.org/
 COMMENT=		Personal double-entry accounting program
 
 DEPENDS+= 		p5-finance-quote>=1.06:../../finance/p5-finance-quote
+DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
 
 BUILDLINK_DEPENDS.guile14=	guile14>=1.4:../../lang/guile14
 BUILDLINK_DEPENDS.guile14+=	guile14<1.5.0:../../lang/guile14
diff --git a/finance/gnucash/PLIST b/finance/gnucash/PLIST
index ba9341b5c69..7730ca8318c 100644
--- a/finance/gnucash/PLIST
+++ b/finance/gnucash/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/02/27 04:08:24 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/05/30 16:19:56 jmmv Exp $
 bin/gnc-prices
 bin/gnc-test-env
 bin/gnucash
@@ -745,7 +745,7 @@ share/pixmaps/gnucash/gnucash_splash.png
 share/pixmaps/gnucash/stock_split_title.png
 share/pixmaps/gnucash/stock_split_watermark.png
 @dirrm share/pixmaps/gnucash
-@unexec ${RMDIR} %D/share/mime-info 2>/dev/null || ${TRUE}
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnucash/scm/qif-import
 @dirrm share/gnucash/scm/printing
 @dirrm share/gnucash/scm/gnumeric
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index 885740e0f29..33ceef02fbe 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2003/05/05 16:27:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2003/05/30 16:19:57 jmmv Exp $
 
 DISTNAME=		gnome-chess-0.3.3
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-chess/0.3/}
 
@@ -9,6 +9,8 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://arcavia.com/rd/gnome-chess/
 COMMENT=		GNOME\'s graphical interface for playing chess
 
+DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11BASE=		yes
diff --git a/games/gnome-chess/PLIST b/games/gnome-chess/PLIST
index 2b370a84e71..7a4a3bfb04e 100644
--- a/games/gnome-chess/PLIST
+++ b/games/gnome-chess/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/02/18 14:55:58 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/05/30 16:19:57 jmmv Exp $
 bin/gnome-chess
 share/gnome-chess/glade/level.glade
 share/gnome-chess/glade/login.glade
@@ -72,6 +72,7 @@ share/pixmaps/gnome-chess/start.png
 @dirrm share/pixmaps/gnome-chess
 @dirrm share/omf/gnome-chess
 @comment in scrollkeeper: @dirrm share/omf
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnome/help/gnome-chess-manual/C/stylesheet-images
 @dirrm share/gnome/help/gnome-chess-manual/C/figures
 @dirrm share/gnome/help/gnome-chess-manual/C
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 3de89d8fc23..d498e4a86eb 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2003/05/05 16:27:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.52 2003/05/30 16:19:57 jmmv Exp $
 
 DISTNAME=		gnome-games-1.4.0.4
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/1.4/}\
 			${MASTER_SITE_LOCAL}
@@ -13,6 +13,7 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME games collection
 
+DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
 BUILD_USES_MSGFMT=	YES
 BUILD_USES_GETTEXT_M4=	YES
 
diff --git a/games/gnome-games/PLIST b/games/gnome-games/PLIST
index e08f1cc07a6..ffc0d482d9e 100644
--- a/games/gnome-games/PLIST
+++ b/games/gnome-games/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2002/07/17 22:21:38 rh Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/05/30 16:19:57 jmmv Exp $
 bin/ctali
 bin/freecell
 bin/gataxx
@@ -1045,6 +1045,7 @@ share/xbill/pixmaps/wingdows.xpm
 @dirrm share/pixmaps/cards/backs
 @dirrm share/pixmaps/cards
 @dirrm share/omf/gnome-games
+@comment in gnome-dirs: @dirrm share/mime-info
 @exec ${MKDIR} %D/share/gnome/help/same-gnome/ru/stylesheet-images
 @dirrm share/gnome/help/same-gnome/ru/stylesheet-images
 @exec ${MKDIR} %D/share/gnome/help/same-gnome/ru/figures
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 4ce8f82ca9c..ca45712b601 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:57 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/30 16:19:58 jmmv Exp $
 
 DISTNAME=		gnome-games-2.2.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/2.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,6 +11,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 games collection
 
 BUILD_USES_MSGFMT=	yes
+DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 CONFLICTS=		xbill-[0-9]*
 
diff --git a/games/gnome2-games/PLIST b/games/gnome2-games/PLIST
index 71f367ba7bc..94d95359322 100644
--- a/games/gnome2-games/PLIST
+++ b/games/gnome2-games/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/05/01 11:21:25 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/05/30 16:19:58 jmmv Exp $
 bin/ctali
 bin/freecell
 bin/gataxx
@@ -714,6 +714,7 @@ share/xbill/pixmaps/wingdows.xpm
 @dirrm share/pixmaps/cards/backs
 @dirrm share/pixmaps/cards
 @dirrm share/omf/gnome-games
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnome/help/xbill/C/figures
 @dirrm share/gnome/help/xbill/C
 @dirrm share/gnome/help/xbill
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index b93c9e4d964..38a11eb5538 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/05/09 15:21:29 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/30 16:19:58 jmmv Exp $
 
 DISTNAME=	dia-0.91
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.91/}
 
@@ -12,7 +13,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.0:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/graphics/dia/PLIST b/graphics/dia/PLIST
index 09a6727a195..b08752df7d6 100644
--- a/graphics/dia/PLIST
+++ b/graphics/dia/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/05/09 15:21:29 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/05/30 16:19:59 jmmv Exp $
 bin/dia
 lib/dia/libbondgraph_objects.a
 lib/dia/libbondgraph_objects.la
@@ -664,6 +664,7 @@ share/mime-info/dia.keys
 share/mime-info/dia.mime
 share/pixmaps/dia-diagram.png
 share/pixmaps/dia_gnome_icon.png
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnome/help/dia/pl
 @dirrm share/gnome/help/dia/en
 @dirrm share/gnome/help/dia
diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile
index 4d632854c3e..ba525158760 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2003/05/05 16:32:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2003/05/30 16:19:59 jmmv Exp $
 
 DISTNAME=		ee-0.3.12
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ee/0.3/}
 
@@ -9,6 +9,8 @@ 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
+
 USE_BUILDLINK2=		# defined
 USE_PKGLOCALEDIR=	# defined
 USE_X11BASE=		# defined
diff --git a/graphics/ee/PLIST b/graphics/ee/PLIST
index 04d8449ac27..a05dcf9db08 100644
--- a/graphics/ee/PLIST
+++ b/graphics/ee/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:31 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/05/30 16:19:59 jmmv Exp $
 bin/ee
 share/gnome/apps/Graphics/ee.desktop
 share/gnome/help/ee/C/index.html
@@ -32,5 +32,6 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/ee.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/ee.mo
 share/mime-info/ee.keys
 share/pixmaps/gnome-ee.png
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnome/help/ee/C
 @dirrm share/gnome/help/ee
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index b4a5f2e4717..3bbe3016482 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2003/05/05 16:39:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.38 2003/05/30 16:20:00 jmmv Exp $
 
 DISTNAME=		evolution-1.2.4
-PKGREVISION=		1
+PKGREVISION=		2
 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,6 +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.2:../../misc/gnome1-dirs
 DEPENDS+=		psmisc-[0-9]*:../../sysutils/psmisc
 BUILD_USES_MSGFMT=	YES
 
diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST
index 0ee511cfa8d..0844678f2e7 100644
--- a/mail/evolution/PLIST
+++ b/mail/evolution/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2003/04/12 04:26:41 rh Exp $
+@comment $NetBSD: PLIST,v 1.14 2003/05/30 16:20:00 jmmv Exp $
 bin/csv2vcard
 bin/evolution
 bin/evolution-addressbook
@@ -1439,6 +1439,7 @@ share/omf/evolution/evolution-no.omf
 share/pixmaps/evolution.png
 @dirrm share/omf/evolution
 @comment in scrollkeeper: @dirrm share/omf
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/libical-evolution/zoneinfo/Pacific
 @dirrm share/libical-evolution/zoneinfo/Indian
 @dirrm share/libical-evolution/zoneinfo/Europe
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index a97410fdfc3..1f3347c160b 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2003/05/05 16:40:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.73 2003/05/30 16:20:01 jmmv Exp $
 #
 
 DISTNAME=		gnumeric-1.0.13
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.0/}
 
@@ -10,6 +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
 # for Python support a shared libpython is required but not provided yet
 #BUILD_DEPENDS+=		python>=2.0:../../lang/python
 
diff --git a/math/gnumeric/PLIST b/math/gnumeric/PLIST
index 79b8256811a..459dc901bab 100644
--- a/math/gnumeric/PLIST
+++ b/math/gnumeric/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2003/02/18 14:56:00 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.21 2003/05/30 16:20:01 jmmv Exp $
 bin/gnumeric
 lib/gnumeric/${PKGVERSION}-bonobo/plugins/applix/applix.a
 lib/gnumeric/${PKGVERSION}-bonobo/plugins/applix/applix.la
@@ -979,6 +979,7 @@ share/pixmaps/gnumeric/top_border
 @dirrm share/pixmaps/gnumeric
 @dirrm share/omf/gnumeric
 @comment in scrollkeeper: @dirrm share/omf
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/templates
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/idl
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/guile
diff --git a/math/gnumeric0/Makefile b/math/gnumeric0/Makefile
index dbcdbb94b4c..71a77024fd4 100644
--- a/math/gnumeric0/Makefile
+++ b/math/gnumeric0/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/05/05 16:40:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/30 16:20:02 jmmv Exp $
 #
 
 DISTNAME=		gnumeric-0.75
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/0.75/}
 
@@ -10,6 +10,8 @@ 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
+
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
diff --git a/math/gnumeric0/PLIST b/math/gnumeric0/PLIST
index 9ee36db3e61..b3c97d1c89c 100644
--- a/math/gnumeric0/PLIST
+++ b/math/gnumeric0/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/12/09 16:01:33 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/05/30 16:20:02 jmmv Exp $
 bin/gnumeric
 lib/gnumeric/${PKGVERSION}-bonobo/plugins/applix/applix.a
 lib/gnumeric/${PKGVERSION}-bonobo/plugins/applix/applix.la
@@ -757,6 +757,7 @@ share/pixmaps/gnumeric/right_border
 share/pixmaps/gnumeric/stf-druid.png
 share/pixmaps/gnumeric/top_border
 @dirrm share/pixmaps/gnumeric
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/templates
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/idl
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/gnome/ui
diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile
index dd1bf62edde..191a60703a8 100644
--- a/misc/gnome-pim/Makefile
+++ b/misc/gnome-pim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2003/05/05 16:43:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.39 2003/05/30 16:20:02 jmmv Exp $
 
 DISTNAME=		gnome-pim-1.4.6
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		misc x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-pim/1.4/}
 
@@ -9,6 +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
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 USE_BUILDLINK2=		YES
diff --git a/misc/gnome-pim/PLIST b/misc/gnome-pim/PLIST
index bebce85d018..1f8c3fad729 100644
--- a/misc/gnome-pim/PLIST
+++ b/misc/gnome-pim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/11 04:24:31 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/05/30 16:20:03 jmmv Exp $
 bin/gnomecal
 bin/gnomecard
 etc/CORBA/servers/gnomecal.gnorba
@@ -73,6 +73,7 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
 share/mime-info/gnome-pim.keys
 share/pixmaps/gnome-calendar-conduit.png
 share/pixmaps/gnome-gnomecard.png
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnome/help/gnomecard/eu
 @dirrm share/gnome/help/gnomecard/C
 @dirrm share/gnome/help/gnomecard
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 677b5602a03..6b94b4a217d 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2003/05/05 16:43:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.61 2003/05/30 16:20:03 jmmv Exp $
 
 DISTNAME=		gnome-utils-1.4.1.2
 PKGREVISION=		3
@@ -10,6 +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
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 BUILD_DEPENDS+=		xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools
 
diff --git a/misc/gnome-utils/PLIST b/misc/gnome-utils/PLIST
index 21f109e1b4a..f1669205198 100644
--- a/misc/gnome-utils/PLIST
+++ b/misc/gnome-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/04/11 11:34:38 tron Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/05/30 16:20:03 jmmv Exp $
 bin/gcalc
 bin/gcharmap
 bin/gcolorsel
@@ -693,6 +693,7 @@ share/stripchart/stripchart.params
 @dirrm share/pixmaps/logview
 @dirrm share/omf/gnome-utils
 @comment in scrollkeeper: @dirrm share/omf
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/logview
 @dirrm share/gnome/help/stripchart/es/stylesheet-images
 @dirrm share/gnome/help/stripchart/es/figures
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index e1232731aed..c8b41a4bd27 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/05/05 16:59:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/30 16:20:03 jmmv Exp $
 #
 
 DISTNAME=		bug-buddy-2.2.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bug-buddy/2.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,6 +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
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
diff --git a/net/bug-buddy/PLIST b/net/bug-buddy/PLIST
index 506c02d8b2d..5c27d31c0c1 100644
--- a/net/bug-buddy/PLIST
+++ b/net/bug-buddy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/18 14:56:01 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/05/30 16:20:04 jmmv Exp $
 bin/bug-buddy
 man/man1/bug-buddy.1
 share/application-registry/bug-buddy.applications
@@ -64,6 +64,7 @@ share/omf/bug-buddy/bug-buddy-C.omf
 share/pixmaps/bug-buddy.png
 @dirrm share/omf/bug-buddy
 @comment in scrollkeeper: @dirrm share/omf
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnome/help/bug-buddy/C
 @dirrm share/gnome/help/bug-buddy
 @dirrm share/bug-buddy/bugzilla/ximian
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 630d900f6cd..b6240471cc1 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/05/30 15:25:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/30 16:20:04 jmmv Exp $
 
 DISTNAME=	seahorse-0.7.3
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=seahorse/}
 
@@ -9,7 +10,7 @@ HOMEPAGE=	http://seahorse.sourceforge.net/
 COMMENT=	GnuPG front end and bonobo component for Gnome
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS=		gnupg>=1.2.1:../../security/gnupg
+DEPENDS+=		gnupg>=1.2.1:../../security/gnupg
 DEPENDS+=		gnome2-dirs>=1.1:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
diff --git a/security/seahorse/PLIST b/security/seahorse/PLIST
index bce5035a2f9..311929880cb 100644
--- a/security/seahorse/PLIST
+++ b/security/seahorse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/05/30 15:25:08 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/05/30 16:20:04 jmmv Exp $
 bin/seahorse
 bin/seahorse-pgp-preferences
 lib/bonobo/libseahorse-pgp-file-listener.a
@@ -63,7 +63,7 @@ share/seahorse/glade/seahorse-signatures.glade
 @dirrm share/seahorse
 @dirrm share/omf/seahorse
 @comment in scrollkeeper: @dirrm share/omf
-@exec ${RMDIR} %D/share/mime-info >/dev/null || ${TRUE}
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnome/help/seahorse/C/figures
 @dirrm share/gnome/help/seahorse/C
 @dirrm share/gnome/help/seahorse
diff --git a/sysutils/gmc/Makefile b/sysutils/gmc/Makefile
index 03e94252f0f..e45a9f0db0f 100644
--- a/sysutils/gmc/Makefile
+++ b/sysutils/gmc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2003/05/02 11:56:22 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2003/05/30 16:20:05 jmmv Exp $
 
 PKGNAME=		g${DISTNAME}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES+=		gnome
 
 COMMENT=		GNOME version of Midnight Commander, a free Norton Commander Clone
@@ -10,6 +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
 
 post-install:
 	${RMDIR} ${PREFIX}/share/gnome/help/gmc/C/figs
diff --git a/sysutils/gmc/PLIST b/sysutils/gmc/PLIST
index 83aa0f77a32..16cd83f0c19 100644
--- a/sysutils/gmc/PLIST
+++ b/sysutils/gmc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/19 04:49:58 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/05/30 16:20:05 jmmv Exp $
 bin/gmc
 bin/gmc-client
 bin/mc
@@ -209,6 +209,7 @@ share/pixmaps/mc/makefile.xpm
 share/pixmaps/mc/sound.xpm
 share/pixmaps/mc/trash.xpm
 @dirrm share/pixmaps/mc
+@comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/gnome/help/gmc/C
 @dirrm share/gnome/help/gmc
 @dirrm lib/mc/term
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 7bca2eebc75..9756077fdf4 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.86 2003/05/05 14:41:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.87 2003/05/30 16:20:05 jmmv Exp $
 
 DISTNAME=		gnome-libs-1.4.1.4
-PKGREVISION=		4
+PKGREVISION=		5
 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.0:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
 BUILD_USES_MSGFMT=	YES
 
 USE_X11BASE=		YES
diff --git a/x11/gnome-libs/PLIST b/x11/gnome-libs/PLIST
index 643dbbe70ec..7baa1162f89 100644
--- a/x11/gnome-libs/PLIST
+++ b/x11/gnome-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2003/01/30 11:14:43 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.12 2003/05/30 16:20:06 jmmv Exp $
 bin/dns-helper
 bin/gconfigger
 bin/gnome-bug
@@ -583,7 +583,7 @@ share/type-convert/gnome-make-postscript-mimes
 share/type-convert/postscript.convert
 share/type-convert/type.convert
 @dirrm share/type-convert
-@dirrm share/mime-info
+@comment in gnome-dirs: @dirrm share/mime-info
 @unexec ${RMDIR} %D/share/gnome/html/zvt 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/gnome/html/gnorba 2>/dev/null || ${TRUE}
 @dirrm share/gnome/html/gnomeui