5 files changed, 31 insertions, 23 deletions

diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index f6d9c85ec9fc..4b6686cde745 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	1.9.15
+PORTVERSION=	1.9.16
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index c013614b090e..2bb5f1f241e0 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.15.tar.bz2) = b4897314329a7d59b1e774c55af84118
+MD5 (gnome2/gnome-vfs-1.9.16.tar.bz2) = 161ccd037041ae92fd742ac4705b4bb6
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 735db4eb7963..9eb96806f017 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Sat May 11 19:15:25 2002
-+++ configure	Sat May 11 19:17:52 2002
-@@ -7207,6 +7207,7 @@
+--- configure.orig	Mon May 27 14:03:09 2002
++++ configure	Mon May 27 14:04:14 2002
+@@ -7224,6 +7224,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'
-@@ -11987,8 +11988,8 @@
+@@ -12140,8 +12141,8 @@
    done
  fi
  
--echo "$as_me:11990: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:12143: checking for bzCompressInit in -lbz2" >&5
 -echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:11990: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:12143: 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
-@@ -12004,11 +12005,11 @@
+@@ -12157,11 +12158,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,16 +33,16 @@
    ;
    return 0;
  }
-@@ -12337,7 +12338,7 @@
+@@ -12490,7 +12491,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 12342 "configure"
+ #line 12495 "configure"
  #include "confdefs.h"
-@@ -12388,9 +12389,9 @@
+@@ -12541,9 +12542,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -54,7 +54,7 @@
                  fi
  
  if true; then
-@@ -13476,7 +13477,7 @@
+@@ -14134,7 +14135,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-ab b/devel/gnomevfs2/files/patch-ab
index 3e204f19a3ef..cd5b093a93d8 100644
--- a/devel/gnomevfs2/files/patch-ab
+++ b/devel/gnomevfs2/files/patch-ab
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in	2002/02/16 13:04:16	1.1
-+++ Makefile.in	2002/02/16 13:09:12
-@@ -165,7 +165,7 @@
+--- Makefile.in.orig	Mon May 27 13:58:39 2002
++++ Makefile.in	Mon May 27 13:59:22 2002
+@@ -169,7 +169,7 @@
  
- SUBDIRS_GNOME = monikers doc
+ SUBDIRS_GNOME = monikers doc schemas
  
--SUBDIRS =  	libgnomevfs					modules						devel-docs					doc						test						monikers					po
-+SUBDIRS =  	libgnomevfs					modules						devel-docs					doc						monikers					po
+-SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc						test						monikers					po
++SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc											monikers					po
  
  
  EXTRA_DIST =  	HACKING						TODO						autogen.sh					gnome-vfs.spec					gnome-vfs-2.0.pc.in				gnome-vfs-module-2.0.pc.in			intltool-extract.in				intltool-merge.in				intltool-update.in
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 3bd672c7b373..f6b772730152 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -1,3 +1,8 @@
+etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml
+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
@@ -51,6 +56,7 @@ lib/gnome-vfs-2.0/modules/libgzip.so
 lib/gnome-vfs-2.0/modules/libhttp.so
 lib/gnome-vfs-2.0/modules/libnntp.so
 lib/gnome-vfs-2.0/modules/libssh.so
+lib/gnome-vfs-2.0/modules/libtar.so
 lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
 lib/gnome-vfs-2.0/modules/libvfs-pipe.so
 lib/gnome-vfs-2.0/modules/libvfs-test.so
@@ -133,6 +139,7 @@ share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -168,4 +175,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
 @dirrm etc/gnome-vfs-2.0/vfolders
 @dirrm etc/gnome-vfs-2.0/modules
 @dirrm etc/gnome-vfs-2.0
+@dirrm etc/gconf/gconf.xml.defaults/system/http_proxy
+@dirrm etc/gconf/gconf.xml.defaults/system
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system
 @unexec /bin/rmdir %D/lib/vfs 2>/dev/null || /usr/bin/true