- Update to 2.14.2

3 files changed, 23 insertions, 14 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 1cf2f7b36327..f18354fe0a7c 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome-vfs
-PORTVERSION=	2.14.1
+PORTVERSION=	2.14.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index da121ec287a5..c4d97b903183 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.14.1.tar.bz2) = d7ba7e667b46b5929b3e277a8b870868
-SHA256 (gnome2/gnome-vfs-2.14.1.tar.bz2) = cdcef326c3bacd89bf40551932f6b8e2c04bee4ebf3afc1633032af04a7631bf
-SIZE (gnome2/gnome-vfs-2.14.1.tar.bz2) = 1813793
+MD5 (gnome2/gnome-vfs-2.14.2.tar.bz2) = b657e31974d6981adf9b2c4db981f62c
+SHA256 (gnome2/gnome-vfs-2.14.2.tar.bz2) = 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7
+SIZE (gnome2/gnome-vfs-2.14.2.tar.bz2) = 1816194
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-configure
index 37ce76b20c7e..8835cb06b0c1 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun May  7 00:51:33 2006
-+++ configure	Sun May  7 00:53:15 2006
-@@ -23482,6 +23482,8 @@ echo $ECHO_N "checking for $ac_func... $
+--- configure.orig	Wed May 17 11:33:28 2006
++++ configure	Wed May 17 21:44:26 2006
+@@ -23540,6 +23540,8 @@
  if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -9,7 +9,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23564,6 +23566,7 @@ eval "$as_ac_var=no"
+@@ -23622,6 +23624,7 @@
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
@@ -17,7 +17,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -24655,6 +24658,7 @@ if test `eval echo '${'$as_ac_var'}'` = 
+@@ -23629,6 +23632,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
@@ -25,7 +25,7 @@
   have_ngettext=yes
  else
    echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -25708,7 +25712,7 @@ done
+@@ -25026,7 +25030,7 @@
  
  
  
@@ -34,7 +34,7 @@
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -34025,7 +34029,7 @@ if test "${openssl_libs+set}" = set; the
+@@ -33396,7 +33400,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -43,7 +43,16 @@
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38165,6 +38169,9 @@ _ACEOF
+@@ -33694,7 +33698,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 -lcrypto"
+ 		cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37536,6 +37540,9 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -53,7 +62,7 @@
  #include <sys/statfs.h>
  #include <sys/fstyp.h>
  _ACEOF
-@@ -38206,6 +38213,9 @@ _ACEOF
+@@ -37577,6 +37584,9 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -63,7 +72,7 @@
  #include <sys/statfs.h>
  #include <sys/vmount.h>
  _ACEOF
-@@ -39645,6 +39655,7 @@ s,@TEST_LIBS@,$TEST_LIBS,;t t
+@@ -39016,6 +39026,7 @@
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
  s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t