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

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

6 files changed, 16 insertions, 12 deletions

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