5 files changed, 30 insertions, 74 deletions

diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 3c8ff549ff26..78b42a0ed973 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.0.2
+PORTVERSION=	2.0.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/sources/gnome-vfs
+MASTER_SITE_SUBDIR=	2.0.1/sources/gnome-vfs
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 7a74124b3916..def225fe2e3f 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-2.0.2.tar.bz2) = 5d96a9d6d8cf06663edfcfce01f61314
+MD5 (gnome2/gnome-vfs-2.0.3.tar.bz2) = 0a7ed1921f2044b80d5fa80ee5b7d5d5
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index cad0532681da..9e2dee5f6722 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Wed Jul 24 17:10:41 2002
-+++ configure	Wed Jul 24 17:12:02 2002
-@@ -7247,6 +7247,7 @@
+--- configure.orig	Thu Aug 29 00:11:10 2002
++++ configure	Thu Aug 29 15:56:42 2002
+@@ -7358,6 +7358,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,18 +8,18 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12165,8 +12166,8 @@
+@@ -12275,8 +12276,8 @@
    done
  fi
  
--echo "$as_me:12168: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:12278: checking for bzCompressInit in -lbz2" >&5
 -echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:12168: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:12278: checking for BZ2_bzCompressInit in -lbz2" >&5
 +echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
  if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12182,11 +12183,11 @@
+@@ -12292,11 +12293,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -33,28 +33,25 @@
    ;
    return 0;
  }
-@@ -12519,7 +12520,7 @@
+@@ -12629,7 +12630,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
 +		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
  		cat >conftest.$ac_ext <<_ACEOF
- #line 12524 "configure"
+ #line 12634 "configure"
  #include "confdefs.h"
-@@ -12570,9 +12571,9 @@
+@@ -12680,7 +12681,7 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
 -                        OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto"
 +                        OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo"
                  else
--                	OPENSSL_LIBS="-lssl -lcrypto"
-+                	OPENSSL_LIBS="-lssl -lcryptofoo"
+                 	OPENSSL_LIBS="-lssl -lcrypto"
                  fi
- 
- if true; then
-@@ -13662,7 +13663,7 @@
+@@ -13875,7 +13876,7 @@
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
  s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnomevfs2/files/patch-ac b/devel/gnomevfs2/files/patch-ac
index 85e9fc54a6c5..557a7018d2c0 100644
--- a/devel/gnomevfs2/files/patch-ac
+++ b/devel/gnomevfs2/files/patch-ac
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- modules/Makefile.in	2002/02/16 13:09:49	1.1
-+++ modules/Makefile.in	2002/02/16 13:10:49
-@@ -174,7 +174,7 @@
- @HAVE_CDDA_TRUE@CDDA_LTLIBS = libcdda.la
- @HAVE_CDDA_FALSE@CDDA_LTLIBS = 
+--- modules/Makefile.in.orig	Thu Aug 29 15:57:06 2002
++++ modules/Makefile.in	Thu Aug 29 15:58:00 2002
+@@ -180,7 +180,7 @@
+ @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la
+ @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = 
  
--module_flags = -export_dynamic -avoid-version
+-module_flags = -export_dynamic -avoid-version -module
 +module_flags = -export_dynamic -avoid-version -module $(PTHREAD_LIB)
  modulesdir = $(libdir)/gnome-vfs-2.0/modules
  
- modules_LTLIBRARIES =  	$(CDDA_LTLIBS)					libdesktop.la					libvfolder-desktop.la				libextfs.la					libfile.la					libnntp.la					libvfs-test.la					$(HTTP_LTLIBS)					libbzip2.la					libgzip.la					libftp.la					libvfs-pipe.la					libvfs-translate.la				libssh.la					$(NULL)
+ modules_LTLIBRARIES =  	$(CDDA_LTLIBS)					libextfs.la					libfile.la					libnntp.la					libvfs-test.la					$(HTTP_LTLIBS)					libbzip2.la					libgzip.la					libftp.la					libvfs-pipe.la					libvfs-translate.la				$(CDEMENU_LTLIBS)                       	libssh.la					libtar.la					$(NULL)
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 799fa771bfaa..7c57e8cbe5cb 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -4,8 +4,13 @@ etc/gconf/gconf.xml.defaults/system/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
 etc/gconf/schemas/system_http_proxy.schemas
 etc/gnome-vfs-2.0/modules/default-modules.conf
-etc/gnome-vfs-2.0/vfolders/applications.vfolder-info
-etc/gnome-vfs-2.0/vfolders/preferences.vfolder-info
+etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
+etc/gnome-vfs-2.0/vfolders/applications.vfolder-info-default
+etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info
+etc/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info
+etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info
+etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info
+etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h
@@ -48,7 +53,6 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
 lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
 lib/gnome-vfs-2.0/modules/libbzip2.so
-lib/gnome-vfs-2.0/modules/libdesktop.so
 lib/gnome-vfs-2.0/modules/libextfs.so
 lib/gnome-vfs-2.0/modules/libfile.so
 lib/gnome-vfs-2.0/modules/libftp.so
@@ -84,49 +88,7 @@ lib/vfs/2.0/extfs/zoo
 libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
 libdata/pkgconfig/gnome-vfs-2.0.pc
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
-share/doc/gnome-vfs-2.0/about.html
-share/doc/gnome-vfs-2.0/data-types.html
-share/doc/gnome-vfs-2.0/everything-else.html
-share/doc/gnome-vfs-2.0/file-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-application-registry.html
-share/doc/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-cancellation.html
-share/doc/gnome-vfs-2.0/gnome-vfs-configuration.html
-share/doc/gnome-vfs-2.0/gnome-vfs-context.html
-share/doc/gnome-vfs-2.0/gnome-vfs-directory.html
-share/doc/gnome-vfs-2.0/gnome-vfs-file-info.html
-share/doc/gnome-vfs-2.0/gnome-vfs-file-size.html
-share/doc/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html
-share/doc/gnome-vfs-2.0/gnome-vfs-inet-connection.html
-share/doc/gnome-vfs-2.0/gnome-vfs-initialization.html
-share/doc/gnome-vfs-2.0/gnome-vfs-iobuf.html
-share/doc/gnome-vfs-2.0/gnome-vfs-method.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-handlers.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-info.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-magic.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime.html
-share/doc/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html
-share/doc/gnome-vfs-2.0/gnome-vfs-module-callbacks.html
-share/doc/gnome-vfs-2.0/gnome-vfs-module-shared.html
-share/doc/gnome-vfs-2.0/gnome-vfs-module.html
-share/doc/gnome-vfs-2.0/gnome-vfs-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-parse-ls.html
-share/doc/gnome-vfs-2.0/gnome-vfs-process.html
-share/doc/gnome-vfs-2.0/gnome-vfs-result.html
-share/doc/gnome-vfs-2.0/gnome-vfs-ssl.html
-share/doc/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html
-share/doc/gnome-vfs-2.0/gnome-vfs-types.html
-share/doc/gnome-vfs-2.0/gnome-vfs-uri.html
-share/doc/gnome-vfs-2.0/gnome-vfs-utils.html
-share/doc/gnome-vfs-2.0/gnome-vfs-xfer.html
-share/doc/gnome-vfs-2.0/index.html
-share/doc/gnome-vfs-2.0/index.sgml
-share/doc/gnome-vfs-2.0/mime-registry.html
-share/doc/gnome-vfs-2.0/modules.html
-share/doc/gnome-vfs-2.0/writing-modules.html
-share/doc/gnome-vfs-2.0/x27.html
+share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo