6 files changed, 90 insertions, 17 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 84a44acaa666..891be079ab57 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomevfs
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gnome-vfs
@@ -14,7 +14,9 @@ DISTNAME=	gnome-vfs-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
+		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
+		gconf.8:${PORTSDIR}/devel/gconf
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -31,4 +33,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
+MAN5=		gnome-vfs-mime.5
+
 .include <bsd.port.mk>
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index ef5100941197..034bc8d56e7a 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome-vfs-0.1.tar.gz) = a12c45a3afae85318734a0cc0a478a7e
+MD5 (gnome-vfs-0.2.tar.gz) = 368b44ed55b525289bc2cc4444f11d30
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index a84dfa92912f..743135715f12 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Feb 22 01:04:03 2000
-+++ configure	Wed Jun 28 16:08:33 2000
-@@ -2120,7 +2120,7 @@
+--- configure.orig	Mon Jul  3 19:03:42 2000
++++ configure	Wed Jul  5 14:42:17 2000
+@@ -2204,7 +2204,7 @@
  # Check whether --enable-gconf or --disable-gconf was given.
  if test "${enable_gconf+set}" = set; then
    enableval="$enable_gconf"
@@ -8,8 +8,8 @@
 +  gconf_enabled="$enableval"
  fi
  
- # Check whether --with-default-backend or --without-default-backend was given.
-@@ -4772,7 +4772,7 @@
+ # Check whether --enable-libefs or --disable-libefs was given.
+@@ -4862,7 +4862,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -18,24 +18,24 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -5545,7 +5545,7 @@
+@@ -5924,7 +5924,7 @@
  VFSPTHREAD_LIBDIR='-L${libdir}'
- VFSPTHREAD_INCLUDEDIR='-I${includedir}'
+ VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'
  VFSPTHREAD_INCLUDEDIR="$VFSPTHREAD_INCLUDEDIR `gnome-config --cflags gnome`"
 -VFSPTHREAD_LIBS="-lgnomevfs -lgnomevfs-pthread `gnome-config --libs gnome` `glib-config --libs gthread`"
 +VFSPTHREAD_LIBS="-lgnomevfs -lgnomevfs-pthread `gnome-config --libs gnome` `$GLIB_CONFIG --libs gthread`"
  
  
  
-@@ -5558,9 +5558,9 @@
+@@ -5937,9 +5937,9 @@
  EOF
  
  
 -VFS_LIBS="-lgnomevfs `glib-config --libs gthread gmodule`"
 +VFS_LIBS="-lgnomevfs `$GLIB_CONFIG --libs gthread gmodule`"
  VFS_LIBDIR='-L${libdir}'
--VFS_INCLUDEDIR='-I${includedir}'" `glib-config --cflags gthread gmodule`"
-+VFS_INCLUDEDIR='-I${includedir}'" `$GLIB_CONFIG --cflags gthread gmodule`"
+-VFS_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'" `glib-config --cflags gthread gmodule`"
++VFS_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'" `$GLIB_CONFIG --cflags gthread gmodule`"
  
  
  
diff --git a/devel/gnome-vfs/files/patch-ab b/devel/gnome-vfs/files/patch-ab
index 5dacf4ba5702..5163e15edf51 100644
--- a/devel/gnome-vfs/files/patch-ab
+++ b/devel/gnome-vfs/files/patch-ab
@@ -1,7 +1,14 @@
---- Makefile.in.orig	Tue Feb 22 01:45:45 2000
-+++ Makefile.in	Wed Jun 28 14:08:43 2000
-@@ -143,7 +143,7 @@
- EXTRA_DIST =  	HACKING						TODO						autogen.sh					vfsConf.sh.in					vfscorbaConf.sh.in				vfspthreadConf.sh.in
+--- Makefile.in.orig	Mon Jul  3 19:33:07 2000
++++ Makefile.in	Wed Jul  5 15:43:12 2000
+@@ -162,13 +162,13 @@
+ @HAVE_GCONF_TRUE@SUBDIRS_GCONF = mime-type-capplet
+ @HAVE_GCONF_FALSE@SUBDIRS_GCONF = 
+ 
+-SUBDIRS =  	libgnomevfs					libgnomevfs-pthread				$(SUBDIRS_OAF)					idl						modules						data						man						devel-docs					$(SUBDIRS_GCONF)				test						po
++SUBDIRS =  	libgnomevfs					libgnomevfs-pthread				$(SUBDIRS_OAF)					idl						modules						data						man										$(SUBDIRS_GCONF)				test						po
+ 
+ 
+ EXTRA_DIST =  	HACKING						TODO						autogen.sh					gnome-vfs.spec					vfsConf.sh.in					vfscorbaConf.sh.in				vfspthreadConf.sh.in
  
  
 -confexecdir = $(libdir)
diff --git a/devel/gnome-vfs/files/patch-ae b/devel/gnome-vfs/files/patch-ae
new file mode 100644
index 000000000000..246e180a7598
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-ae
@@ -0,0 +1,14 @@
+--- mime-type-capplet/nautilus-mime-type-capplet.c.orig	Wed Jun 21 20:48:29 2000
++++ mime-type-capplet/nautilus-mime-type-capplet.c	Wed Jul  5 15:17:57 2000
+@@ -28,7 +28,11 @@
+ #include <config.h>
+ #include <ctype.h>
+ #include <dirent.h>
++#ifdef	__FreeBSD__
++#include <gnuregex.h>
++#else
+ #include <regex.h>
++#endif
+ #include <string.h>
+ #include <sys/types.h>
+ 
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 026b96eff91d..9b0008727408 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -1,28 +1,62 @@
+bin/gnome-vfs-gen-mimedb
 bin/gnome-vfs-slave
+bin/nautilus-mime-type-capplet
+etc/gnome-vfs-mime-magic
+etc/gnome-vfs-mime-magic.dat
 etc/vfs/modules/default-modules.conf
 etc/vfsConf.sh
 etc/vfscorbaConf.sh
 etc/vfspthreadConf.sh
 include/libgnomevfs/gnome-vfs-async-ops.h
+include/libgnomevfs/gnome-vfs-backend.h
+include/libgnomevfs/gnome-vfs-cancellation.h
+include/libgnomevfs/gnome-vfs-configuration.h
 include/libgnomevfs/gnome-vfs-constants.h
+include/libgnomevfs/gnome-vfs-context.h
 include/libgnomevfs/gnome-vfs-directory-filter.h
 include/libgnomevfs/gnome-vfs-directory-list.h
 include/libgnomevfs/gnome-vfs-directory.h
 include/libgnomevfs/gnome-vfs-file-info.h
+include/libgnomevfs/gnome-vfs-find-directory.h
+include/libgnomevfs/gnome-vfs-handle.h
+include/libgnomevfs/gnome-vfs-inet-connection.h
 include/libgnomevfs/gnome-vfs-init.h
+include/libgnomevfs/gnome-vfs-iobuf.h
+include/libgnomevfs/gnome-vfs-list-sort.h
+include/libgnomevfs/gnome-vfs-messages.h
+include/libgnomevfs/gnome-vfs-method.h
+include/libgnomevfs/gnome-vfs-mime-handlers.h
+include/libgnomevfs/gnome-vfs-mime-info.h
+include/libgnomevfs/gnome-vfs-mime-magic.h
+include/libgnomevfs/gnome-vfs-mime-sniff-buffer-private.h
+include/libgnomevfs/gnome-vfs-mime-sniff-buffer.h
+include/libgnomevfs/gnome-vfs-mime.h
+include/libgnomevfs/gnome-vfs-module-shared.h
+include/libgnomevfs/gnome-vfs-module.h  
 include/libgnomevfs/gnome-vfs-ops.h
+include/libgnomevfs/gnome-vfs-parse-ls.h
+include/libgnomevfs/gnome-vfs-private-ops.h
+include/libgnomevfs/gnome-vfs-private-types.h
+include/libgnomevfs/gnome-vfs-private-utils.h
+include/libgnomevfs/gnome-vfs-private.h
 include/libgnomevfs/gnome-vfs-process.h
+include/libgnomevfs/gnome-vfs-regexp-filter.h
 include/libgnomevfs/gnome-vfs-result.h
+include/libgnomevfs/gnome-vfs-seekable.h
+include/libgnomevfs/gnome-vfs-shellpattern-filter.h
 include/libgnomevfs/gnome-vfs-types.h
 include/libgnomevfs/gnome-vfs-uri.h
 include/libgnomevfs/gnome-vfs-utils.h
 include/libgnomevfs/gnome-vfs-xfer.h
 include/libgnomevfs/gnome-vfs.h
 lib/libgnomevfs-corba.a
+lib/libgnomevfs-corba.so
 lib/libgnomevfs-corba.so.0
 lib/libgnomevfs-pthread.a
+lib/libgnomevfs-pthread.so
 lib/libgnomevfs-pthread.so.0
 lib/libgnomevfs.a
+lib/libgnomevfs.so
 lib/libgnomevfs.so.0
 lib/vfs/extfs/README
 lib/vfs/extfs/a
@@ -40,22 +74,36 @@ lib/vfs/extfs/rpms
 lib/vfs/extfs/trpm
 lib/vfs/extfs/zip
 lib/vfs/extfs/zoo
+lib/vfs/include/gnome-vfs-file-size.h
 lib/vfs/modules/libbzip2.so
 lib/vfs/modules/libextfs.so
 lib/vfs/modules/libfile.so
 lib/vfs/modules/libftp.so
+lib/vfs/modules/libgconf.so
 lib/vfs/modules/libgzip.so
 lib/vfs/modules/libhttp.so
 lib/vfs/modules/libvfs-pipe.so
 lib/vfs/modules/libvfs-translate.so
+share/gnome/apps/Settings/nautilus-mime-type.desktop
+share/gnome/control-center/nautilus-mime-type.desktop
+share/gnome/mime-info/application-registry-hack.keys
+share/gnome/mime-info/gnome-vfs.keys
+share/gnome/mime-info/gnome-vfs.mime
+share/locale/ca/LC_MESSAGES/gnome-vfs.mo
 share/locale/da/LC_MESSAGES/gnome-vfs.mo
 share/locale/de/LC_MESSAGES/gnome-vfs.mo
 share/locale/el/LC_MESSAGES/gnome-vfs.mo
 share/locale/fr/LC_MESSAGES/gnome-vfs.mo
 share/locale/gl/LC_MESSAGES/gnome-vfs.mo
+share/locale/hu/LC_MESSAGES/gnome-vfs.mo
+share/locale/ja/LC_MESSAGES/gnome-vfs.mo
+share/locale/ko/LC_MESSAGES/gnome-vfs.mo
+share/locale/lt/LC_MESSAGES/gnome-vfs.mo
 share/locale/no/LC_MESSAGES/gnome-vfs.mo
 share/locale/pl/LC_MESSAGES/gnome-vfs.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-vfs.mo
+share/locale/ru/LC_MESSAGES/gnome-vfs.mo
+share/locale/sl/LC_MESSAGES/gnome-vfs.mo
 share/locale/sv/LC_MESSAGES/gnome-vfs.mo
 share/locale/tr/LC_MESSAGES/gnome-vfs.mo
 share/locale/uk/LC_MESSAGES/gnome-vfs.mo