Make this coexist with GNOME2 by depending on gnome-mime-data instead of

installing local versions.  Patch provided by Eric Gillespie
<epg@pretzelnet.org>, with minor modifications.
Bump PKGREVISION.

4 files changed, 25 insertions, 12 deletions

diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index c2eba78f63b..4f7d2842b52 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2002/10/19 10:54:57 rh Exp $
+# $NetBSD: Makefile,v 1.24 2003/01/02 03:19:32 rh Exp $
 
 DISTNAME=		gnome-vfs-1.0.3
+PKGREVISION=		1
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/1.0/}
 
@@ -9,7 +10,9 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME Virtual File System
 
 BUILD_USES_MSGFMT=	YES
+BUILDLINK_DEPENDS.gnome-mime-data=	gnome-mime-data>=2.0.1
 
+AUTOMAKE_REQD=		1.4
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
@@ -18,8 +21,13 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+pre-configure:
+	cd ${WRKSRC} && ${AUTOMAKE}
+
 .include "../../archivers/bzip2/buildlink2.mk"
+.include "../../databases/gnome-mime-data/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/GConf/buildlink2.mk"
 
+.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-vfs/PLIST b/sysutils/gnome-vfs/PLIST
index 8153ee8112b..9339304eaf8 100644
--- a/sysutils/gnome-vfs/PLIST
+++ b/sysutils/gnome-vfs/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2002/08/25 19:23:23 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/01/02 03:19:32 rh Exp $
 bin/gnome-vfs-config
-etc/gnome-vfs-mime-magic
 etc/vfs/modules/default-modules.conf
 include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-application-registry.h
 include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-async-ops.h
@@ -90,8 +89,6 @@ lib/vfs/modules/libfile.so
 lib/vfs/modules/libftp.a
 lib/vfs/modules/libftp.la
 lib/vfs/modules/libftp.so
-lib/vfs/modules/libftp.so.0
-lib/vfs/modules/libftp.so.0.0
 lib/vfs/modules/libgconf.a
 lib/vfs/modules/libgconf.la
 lib/vfs/modules/libgconf.so
@@ -107,14 +104,10 @@ lib/vfs/modules/libvfs-pipe.so
 lib/vfs/modules/libvfs-test.a
 lib/vfs/modules/libvfs-test.la
 lib/vfs/modules/libvfs-test.so
-lib/vfs/modules/libvfs-test.so.0
-lib/vfs/modules/libvfs-test.so.0.0
 lib/vfs/modules/libvfs-translate.a
 lib/vfs/modules/libvfs-translate.la
 lib/vfs/modules/libvfs-translate.so
 lib/vfsConf.sh
-man/man5/gnome-vfs-mime.5
-share/application-registry/gnome-vfs.applications
 share/locale/az/LC_MESSAGES/gnome-vfs.mo
 share/locale/ca/LC_MESSAGES/gnome-vfs.mo
 share/locale/da/LC_MESSAGES/gnome-vfs.mo
@@ -145,8 +138,6 @@ share/locale/tr/LC_MESSAGES/gnome-vfs.mo
 share/locale/uk/LC_MESSAGES/gnome-vfs.mo
 share/locale/wa/LC_MESSAGES/gnome-vfs.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-vfs.mo
-share/mime-info/gnome-vfs.keys
-share/mime-info/gnome-vfs.mime
 @exec ${MKDIR} %D/share/gtk-doc/html/gnome-vfs
 @dirrm share/gtk-doc/html/gnome-vfs
 @dirrm lib/vfs/modules
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index de1de71f6e6..9d391e7cb66 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/08/28 16:49:38 jlam Exp $
+$NetBSD: distinfo,v 1.10 2003/01/02 03:19:32 rh Exp $
 
 SHA1 (gnome-vfs-1.0.3.tar.gz) = 51b4ca77591ee83b35d3987f0f26740623c1fa0a
 Size (gnome-vfs-1.0.3.tar.gz) = 1211129 bytes
@@ -9,3 +9,4 @@ SHA1 (patch-ad) = cf959c7d8eb70dba844ea01e887e7487111d9cbd
 SHA1 (patch-ae) = a0906ba19a6953aca3b173f03fb1b2d9bf742a09
 SHA1 (patch-af) = c76c64801b643828f6cb8751131447335d39c28e
 SHA1 (patch-ag) = 20260ccfc66aa977770a502b30f888c7039332a5
+SHA1 (patch-ah) = 60692c044ca131bd76e94c9a6d3bb71a481b0827
diff --git a/sysutils/gnome-vfs/patches/patch-ah b/sysutils/gnome-vfs/patches/patch-ah
new file mode 100644
index 00000000000..02e38fabd48
--- /dev/null
+++ b/sysutils/gnome-vfs/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2003/01/02 03:19:33 rh Exp $
+
+--- Makefile.am.orig	Fri Oct 12 03:18:11 2001
++++ Makefile.am
+@@ -9,8 +9,6 @@ SUBDIRS =					\
+ 	libgnomevfs-pthread			\
+ 	idl					\
+ 	modules					\
+-	data					\
+-	man					\
+ 	devel-docs				\
+ 	$(SUBDIRS_GNOME)			\
+ 	po