5 files changed, 33 insertions, 31 deletions

diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 660383dc4c34..1e00b77874d7 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	1.9.5
+PORTVERSION=	1.9.7
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	msgfmt-new:${PORTSDIR}/devel/gettext-devel \
-		${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata \
-		pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	gconf-2.3:${PORTSDIR}/devel/gconf2 \
+		${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
+LIB_DEPENDS=	gconf-2.5:${PORTSDIR}/devel/gconf2 \
 		bonobo-2.0:${PORTSDIR}/devel/libbonobo
-RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata \
-		pkg-config:${PORTSDIR}/devel/pkgconfig
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index f91ac99d125f..ba692c445c37 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.5.tar.bz2) = 6187575b3cd890fed78c805659455057
+MD5 (gnome2/gnome-vfs-1.9.7.tar.bz2) = 766b86fbcbcec8da3604ca92b6eadc42
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index a5963d2046f2..e6ade3b65778 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,20 +1,20 @@
 
 $FreeBSD$
 
---- configure	2002/02/16 13:00:43	1.1
-+++ configure	2002/02/16 13:03:25
-@@ -12056,8 +12056,8 @@
+--- configure.orig	Wed Feb 27 12:00:58 2002
++++ configure	Wed Feb 27 12:02:16 2002
+@@ -11963,8 +11963,8 @@
    done
  fi
  
--echo "$as_me:12059: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:11966: checking for bzCompressInit in -lbz2" >&5
 -echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:12059: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:11966: 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
-@@ -12073,11 +12073,11 @@
+@@ -11980,11 +11980,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,25 +28,28 @@ $FreeBSD$
    ;
    return 0;
  }
-@@ -12336,7 +12336,7 @@
+@@ -12296,7 +12296,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 12341 "configure"
+ #line 12301 "configure"
  #include "confdefs.h"
-@@ -12386,7 +12386,7 @@
- EOF
+@@ -12347,9 +12347,9 @@
  
  		msg_openssl="yes"
--		OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcrypto"
-+		OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcryptofoo"
+                 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"
+                 fi
  
  if true; then
-   HAVE_SSL_TRUE=
-@@ -13170,7 +13170,7 @@
+@@ -13227,7 +13227,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 1b5a09da7f27..3d34ddfdbf53 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	2002/02/16 12:59:40	1.1
-+++ intltool-merge.in	2002/02/16 12:59:59
-@@ -269,7 +269,7 @@
- 
-         if ($UTF8_ARG) {
-             my $encoding = get_po_encoding ($po_file);
--            open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";	
-+            open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";	
+--- 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 @@
+             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|";	
+             }
          } else {
              open PO_FILE, "<$po_file";	
-         }
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index d2264681ee4c..e752643c375a 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -25,6 +25,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-iobuf.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h