Bring up already ported portion on GNOME2 development platform on par with

GNOME2 beta2 release.

5 files changed, 21 insertions, 62 deletions

diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 1e00b77874d7..ce8c377d7b4f 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	1.9.7
+PORTVERSION=	1.9.10
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index ba692c445c37..01ca5ef35958 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.7.tar.bz2) = 766b86fbcbcec8da3604ca92b6eadc42
+MD5 (gnome2/gnome-vfs-1.9.10.tar.bz2) = 967ac50161fe0f24bc071d3d8d010081
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index e6ade3b65778..bd10b13e7ff5 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,20 +1,20 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Feb 27 12:00:58 2002
-+++ configure	Wed Feb 27 12:02:16 2002
-@@ -11963,8 +11963,8 @@
+--- configure.orig	Mon Mar 11 21:42:05 2002
++++ configure	Mon Mar 11 21:42:37 2002
+@@ -11993,8 +11993,8 @@
    done
  fi
  
--echo "$as_me:11966: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:11996: checking for bzCompressInit in -lbz2" >&5
 -echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:11966: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:11996: 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
-@@ -11980,11 +11980,11 @@
+@@ -12010,11 +12010,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -28,16 +28,16 @@ $FreeBSD$
    ;
    return 0;
  }
-@@ -12296,7 +12296,7 @@
+@@ -12326,7 +12326,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 12301 "configure"
+ #line 12331 "configure"
  #include "confdefs.h"
-@@ -12347,9 +12347,9 @@
+@@ -12377,9 +12377,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -49,7 +49,7 @@ $FreeBSD$
                  fi
  
  if true; then
-@@ -13227,7 +13227,7 @@
+@@ -13259,7 +13259,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-intltool-merge.in b/devel/gnomevfs2/files/patch-intltool-merge.in
index 3d34ddfdbf53..d5a424fcc59c 100644
--- a/devel/gnomevfs2/files/patch-intltool-merge.in
+++ b/devel/gnomevfs2/files/patch-intltool-merge.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- intltool-merge.in.orig	Mon Feb 11 23:40:38 2002
-+++ intltool-merge.in	Wed Feb 27 12:03:10 2002
-@@ -287,7 +287,7 @@
+--- intltool-merge.in.orig	Sun Mar 10 01:56:09 2002
++++ intltool-merge.in	Mon Mar 11 21:43:48 2002
+@@ -290,7 +290,7 @@
              if (lc $encoding eq "utf-8") {
                  open PO_FILE, "<$po_file";	
              } else {
--                open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";	
-+                open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";	
+-                my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv";
++                my $iconv = $ENV{"INTLTOOL_ICONV"} || "giconv";
+                 open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|";	
              }
          } else {
-             open PO_FILE, "<$po_file";	
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index e752643c375a..122e0d80cc66 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -78,55 +78,13 @@ lib/vfs2/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/about.html
-share/doc/gnome-vfs/data-types.html
-share/doc/gnome-vfs/everything-else.html
-share/doc/gnome-vfs/file-operations.html
-share/doc/gnome-vfs/gnome-vfs-application-registry.html
-share/doc/gnome-vfs/gnome-vfs-asynchronous-operations.html
-share/doc/gnome-vfs/gnome-vfs-cancellation.html
-share/doc/gnome-vfs/gnome-vfs-configuration.html
-share/doc/gnome-vfs/gnome-vfs-context.html
-share/doc/gnome-vfs/gnome-vfs-directory.html
-share/doc/gnome-vfs/gnome-vfs-file-info.html
-share/doc/gnome-vfs/gnome-vfs-file-size.html
-share/doc/gnome-vfs/gnome-vfs-finding-special-directories.html
-share/doc/gnome-vfs/gnome-vfs-inet-connection.html
-share/doc/gnome-vfs/gnome-vfs-initialization.html
-share/doc/gnome-vfs/gnome-vfs-iobuf.html
-share/doc/gnome-vfs/gnome-vfs-method.html
-share/doc/gnome-vfs/gnome-vfs-mime-handlers.html
-share/doc/gnome-vfs/gnome-vfs-mime-info.html
-share/doc/gnome-vfs/gnome-vfs-mime-magic.html
-share/doc/gnome-vfs/gnome-vfs-mime-monitor.html
-share/doc/gnome-vfs/gnome-vfs-mime-sniff-buffer.html
-share/doc/gnome-vfs/gnome-vfs-mime.html
-share/doc/gnome-vfs/gnome-vfs-module-callback-module-api.html
-share/doc/gnome-vfs/gnome-vfs-module-callbacks.html
-share/doc/gnome-vfs/gnome-vfs-module-shared.html
-share/doc/gnome-vfs/gnome-vfs-module.html
-share/doc/gnome-vfs/gnome-vfs-ops.html
-share/doc/gnome-vfs/gnome-vfs-parse-ls.html
-share/doc/gnome-vfs/gnome-vfs-process.html
-share/doc/gnome-vfs/gnome-vfs-result.html
-share/doc/gnome-vfs/gnome-vfs-ssl.html
-share/doc/gnome-vfs/gnome-vfs-standard-callbacks.html
-share/doc/gnome-vfs/gnome-vfs-types.html
-share/doc/gnome-vfs/gnome-vfs-uri.html
-share/doc/gnome-vfs/gnome-vfs-utils.html
-share/doc/gnome-vfs/gnome-vfs-xfer.html
-share/doc/gnome-vfs/index.html
-share/doc/gnome-vfs/index.sgml
-share/doc/gnome-vfs/mime-registry.html
-share/doc/gnome-vfs/modules.html
-share/doc/gnome-vfs/writing-modules.html
-share/doc/gnome-vfs/x27.html
 share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo
 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
@@ -136,6 +94,7 @@ share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo