7 files changed, 43 insertions, 33 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 71376861d658..82041177a925 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.185 2008/09/22 10:26:54 kwm Exp $
+#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.187 2009/10/10 16:04:54 marcus Exp $
 #
 
 PORTNAME=	gnome-vfs
-PORTVERSION=	2.24.1
-PORTREVISION?=	1
+PORTVERSION=	2.24.2
+PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index ea83731f7f7e..63d1710811e0 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.24.1.tar.bz2) = 100f9af16dc659e375ee8da45175a28d
-SHA256 (gnome2/gnome-vfs-2.24.1.tar.bz2) = bc59144e303b152b84b86f209347a3e87a91d5ed7172d8503ee19c232dcabeb6
-SIZE (gnome2/gnome-vfs-2.24.1.tar.bz2) = 1936704
+MD5 (gnome2/gnome-vfs-2.24.2.tar.bz2) = 371d13e7306eb82e3fe3748a7584c440
+SHA256 (gnome2/gnome-vfs-2.24.2.tar.bz2) = 50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856
+SIZE (gnome2/gnome-vfs-2.24.2.tar.bz2) = 1859173
diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure
index df7bc5e67603..7865fc3fbb2c 100644
--- a/devel/gnome-vfs/files/patch-configure
+++ b/devel/gnome-vfs/files/patch-configure
@@ -1,41 +1,41 @@
---- configure.orig	Mon Feb 12 14:15:37 2007
-+++ configure	Mon Feb 12 14:15:37 2007
-@@ -5708,7 +5708,7 @@ fi
+--- configure.orig	2009-10-10 11:55:11.000000000 -0400
++++ configure	2009-10-10 11:55:14.000000000 -0400
+@@ -8433,7 +8433,7 @@ fi
  
  
  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=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -22101,6 +22101,8 @@ echo $ECHO_N "checking for LC_MESSAGES..
+ 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
 +  ac_check_lib_save_LIBS=$LIBS
 +  LIBS="-lintl  $LIBS"
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22147,6 +22149,7 @@ am_cv_val_LC_MESSAGES=no
- fi
- rm -f conftest.err conftest.$ac_objext \
+@@ -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
- echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
- echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
-@@ -23612,6 +23615,7 @@ if test `eval echo '${'$as_ac_var'}'` = 
+ { $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'}
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
 + LIBS="-lintl $LIBS"
   have_ngettext=yes
  else
-   echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -33364,7 +33368,7 @@ if test "${openssl_libs+set}" = set; the
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+@@ -26068,7 +26072,7 @@ if test "${openssl_libs+set}" = set; the
+   $as_echo_n "(cached) " >&6
  else
  
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
@@ -43,8 +43,8 @@
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33662,7 +33666,7 @@ if test "${openssl_libs+set}" = set; the
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26363,7 +26367,7 @@ if test "${openssl_libs+set}" = set; the
+   $as_echo_n "(cached) " >&6
  else
  
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c
index c7fb1cf36dba..90fb33a41d77 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c
@@ -1,11 +1,18 @@
---- libgnomevfs/gnome-vfs-filesystem-type.c.orig	2007-09-17 14:48:45.000000000 -0400
-+++ libgnomevfs/gnome-vfs-filesystem-type.c	2007-09-17 14:50:06.000000000 -0400
-@@ -65,6 +65,8 @@ static struct FSInfo fs_data[] = {
- 	{ "msdosfs"  , N_("MSDOS Volume"), 0 },
+--- libgnomevfs/gnome-vfs-filesystem-type.c.orig	2009-10-08 10:03:36.000000000 -0400
++++ libgnomevfs/gnome-vfs-filesystem-type.c	2009-10-10 11:57:06.000000000 -0400
+@@ -70,6 +70,7 @@ static struct FSInfo fs_data[] = {
  	{ "nfs"      , N_("NFS Network Volume"), 1 },
  	{ "ntfs"     , N_("Windows NT Volume"), 0 },
+ 	{ "ntfs-3g"  , N_("Windows NT Volume"), 1 },
 +	{ "nullfs"   , N_("BSD Loopback Volume"), 1 },
-+	{ "zfs"      , N_("ZFS Volume"), 1 },
+ 	{ "nilfs2"   , N_("NILFS Linux Volume"), 1 },
  	{ "nwfs"     , N_("Netware Volume"), 0 },
  	{ "proc"     , N_("System Volume"), 0 },
- 	{ "procfs"   , N_("System Volume"), 0 },
+@@ -90,6 +91,7 @@ static struct FSInfo fs_data[] = {
+ 	{ "xenix"    , N_("Xenix Volume"), 0 },
+ 	{ "xfs"      , N_("XFS Linux Volume"), 1 },
+ 	{ "xiafs"    , N_("XIAFS Volume"), 0 },
++	{ "zfs"      , N_("ZFS Volume"), 1 },
+ 	{ "cifs"     , N_("CIFS Volume"), 1 },
+ };
+ 
diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in
index 402f3449c6f9..0b97e9c55c64 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.20 2008/08/06 04:22:49 mezz Exp $
+#   $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.23 2009/11/28 05:58:59 mezz Exp $
 #
 # Restore gconf keys of libgnome.
 
diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in
index 19bf94479dab..018b36eccbf9 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.20 2008/08/06 04:22:49 mezz Exp $
+#   $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.23 2009/11/28 05:58:59 mezz Exp $
 #
 # Restore gconf keys of libgnome.
 
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 3a4d8fcbb7fe..31ce344648e6 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -120,6 +120,7 @@ share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -235,6 +236,8 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/ast/LC_MESSAGES