Julio Merino <jmmv@menta.net> writes:

> > Installation process ask the user to remove gnome-vfs,
> > because gnome-mime-data installs the same files at the
> > same places, but gnome-vfs is required actually in the
> > system by programs like galeon, gnumeric, gnome 1
> > stuff.
> 
> ... and?

And it's quite annoying.

I recently looked into this.  According to the GNOME folks, you
can install the two versions side-by-side as long as you install
GNOME 1 first.  Furthermore, Debian manages to ship both versions
(libs only; they have switched to GNOME 2 for all apps with both
versions available (e.g. Nautilus)).  So what is pkgsrc doing
wrong?  I found the same thing Cesar Catrian found: that the only
conflict is between gnome-mime-data and gnome-vfs-1.  Remove this
conflict and everything is fine.

Only these changes need to be made:

databases/gnome-mime-data:
    Remove gnome-vfs-1* conflict.

sysutils/gnome-vfs:
    Add a dependency on gnome-mime-data.

    Don't ship these files:

    etc/gnome-vfs-mime-magic
    man/man5/gnome-vfs-mime.5
    share/application-registry/gnome-vfs.applications
    share/mime-info/gnome-vfs.keys
    share/mime-info/gnome-vfs.mime

This is in fact exactly what Debian does.  The five files
removed from gnome-vfs are provided in compatible format by the
gnome-mime-data package.  So making gnome-vfs1 depend on
gnome-mime-data makes everyone happy.  I have been running my
system like this for a few weeks now.  Now that i'm sure it
works, here are the patches:

(Note that the gnome-vfs package already had a patch against a
Makefile.am but was not running automake.  My patch below fixes
that as a side effect.  This causes libftp.so.* and
libvfs-test.so.* not to be created and installed which is, i
believe, correct.  However, the PLIST does list these files.  So
either that patch needs to be removed or the PLIST should be
updated.  I have done neither, as it is a separate issue).

? sysutils/gnome-vfs/patches/patch-ah
Index: databases/gnome-mime-data/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/gnome-mime-data/Makefile,v
retrieving revision 1.5
diff -a -u -r1.5 Makefile
--- databases/gnome-mime-data/Makefile	2002/12/25 15:11:20	1.5
+++ databases/gnome-mime-data/Makefile	2003/01/01 23:50:00
@@ -13,8 +13,6 @@
 
 BUILD_USES_MSGFMT=	YES
 
-CONFLICTS=		gnome-vfs-1*
-
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_PERL5=		build
Index: sysutils/gnome-vfs/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-vfs/Makefile,v
retrieving revision 1.23
diff -a -u -r1.23 Makefile
--- sysutils/gnome-vfs/Makefile	2002/10/19 10:54:57	1.23
+++ sysutils/gnome-vfs/Makefile	2003/01/01 23:50:00
@@ -10,6 +10,7 @@
 
 BUILD_USES_MSGFMT=	YES
 
+AUTOMAKE_REQD=		1.4
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
@@ -18,8 +19,13 @@
 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"
Index: sysutils/gnome-vfs/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-vfs/PLIST,v
retrieving revision 1.7
diff -a -u -r1.7 PLIST
--- sysutils/gnome-vfs/PLIST	2002/08/25 19:23:23	1.7
+++ sysutils/gnome-vfs/PLIST	2003/01/01 23:50:00
@@ -1,6 +1,5 @@
 @comment $NetBSD: PLIST,v 1.7 2002/08/25 19:23:23 jlam 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
@@ -113,8 +112,6 @@
 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 +142,6 @@
 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
Index: sysutils/gnome-vfs/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-vfs/distinfo,v
retrieving revision 1.9
diff -a -u -r1.9 distinfo
--- sysutils/gnome-vfs/distinfo	2002/08/28 16:49:38	1.9
+++ sysutils/gnome-vfs/distinfo	2003/01/01 23:50:00
@@ -9,3 +9,4 @@
 SHA1 (patch-ae) = a0906ba19a6953aca3b173f03fb1b2d9bf742a09
 SHA1 (patch-af) = c76c64801b643828f6cb8751131447335d39c28e
 SHA1 (patch-ag) = 20260ccfc66aa977770a502b30f888c7039332a5
+SHA1 (patch-ah) = 60692c044ca131bd76e94c9a6d3bb71a481b0827

Install the following file as patch-ah:

$NetBSD$

--- 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


--  
Eric Gillespie <*> epg@pretzelnet.org

Build a fire for a man, and he'll be warm for a day.  Set a man on
fire, and he'll be warm for the rest of his life. -Terry Pratchett