5 files changed, 26 insertions, 43 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 7d1b55e91d0a..caa250ad4313 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.189 2010/04/01 14:24:30 kwm Exp $
+#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.191 2010/09/29 12:30:29 kwm Exp $
 #
 
 PORTNAME=	gnome-vfs
-PORTVERSION=	2.24.3
-PORTREVISION?=	1
+PORTVERSION=	2.24.4
+PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 5a89b547e6a7..3f8cf3778131 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.24.3.tar.bz2) = 646a2672c6e7e4ebff6a798b0fb7cc90
-SHA256 (gnome2/gnome-vfs-2.24.3.tar.bz2) = 3b0f342e79813bfc11d8e636db96b3ffd16c9ca48b07306410e09a3fd1065b4a
-SIZE (gnome2/gnome-vfs-2.24.3.tar.bz2) = 1830456
+MD5 (gnome2/gnome-vfs-2.24.4.tar.bz2) = a05fab03eeef10a47dd156b758982f2e
+SHA256 (gnome2/gnome-vfs-2.24.4.tar.bz2) = 62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa
+SIZE (gnome2/gnome-vfs-2.24.4.tar.bz2) = 1890370
diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure
index 7865fc3fbb2c..e44e93476014 100644
--- a/devel/gnome-vfs/files/patch-configure
+++ b/devel/gnome-vfs/files/patch-configure
@@ -1,54 +1,37 @@
---- configure.orig	2009-10-10 11:55:11.000000000 -0400
-+++ configure	2009-10-10 11:55:14.000000000 -0400
-@@ -8433,7 +8433,7 @@ fi
- 
+--- configure.orig	2010-09-29 07:03:15.000000000 +0000
++++ configure	2010-09-29 07:09:42.000000000 +0000
+@@ -8424,7 +8424,7 @@
  
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 -		  inttypes.h stdint.h unistd.h
 +		  inttypes.h stdint.h unistd.h sys/sysmacros.h
- do
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -14864,6 +14864,8 @@ $as_echo_n "checking for LC_MESSAGES... 
- if test "${am_cv_val_LC_MESSAGES+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-+  ac_check_lib_save_LIBS=$LIBS
-+  LIBS="-lintl  $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -14911,6 +14913,7 @@ fi
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
- $as_echo "$am_cv_val_LC_MESSAGES" >&6; }
-@@ -16395,6 +16398,7 @@ as_val=`eval 'as_val=${'$as_ac_var'}
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+@@ -14465,6 +14465,7 @@
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define HAVE_NGETTEXT 1
  _ACEOF
 + LIBS="-lintl $LIBS"
   have_ngettext=yes
  else
-   { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -26068,7 +26072,7 @@ if test "${openssl_libs+set}" = set; the
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+@@ -17694,7 +17695,7 @@
    $as_echo_n "(cached) " >&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
-@@ -26363,7 +26367,7 @@ if test "${openssl_libs+set}" = set; the
+ 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -17824,7 +17825,7 @@
    $as_echo_n "(cached) " >&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
+ 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in
index 6567e62042f2..68798e37cc53 100644
--- a/devel/gnome-vfs/pkg-deinstall.in
+++ b/devel/gnome-vfs/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.26 2010/04/02 21:50:06 kwm Exp $
+#   $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.28 2010/09/29 12:30:29 kwm Exp $
 #
 # Restore gconf keys of libgnome.
 
diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in
index 0fc15088ae8b..b9dc1ffa789a 100644
--- a/devel/gnome-vfs/pkg-install.in
+++ b/devel/gnome-vfs/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.26 2010/04/02 21:50:06 kwm Exp $
+#   $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.28 2010/09/29 12:30:29 kwm Exp $
 #
 # Restore gconf keys of libgnome.