Update to 2.6.1, but keep the shared lib at 600.

7 files changed, 122 insertions, 62 deletions

diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 40cc95ad9d73..160c9df43cdd 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.6.0
-PORTREVISION=	2
+PORTVERSION=	2.6.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.6
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 31ff3374ec64..388ca60275de 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.6.0.tar.bz2) = 4d0323cf015dd006210fcacd4bfe7420
-SIZE (gnome2/gnome-vfs-2.6.0.tar.bz2) = 1431274
+MD5 (gnome2/gnome-vfs-2.6.1.tar.bz2) = c192cd126ff5bf113348e21385c3fb5e
+SIZE (gnome2/gnome-vfs-2.6.1.tar.bz2) = 1482123
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 8273ab3fee00..2be60214fd18 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,6 +1,15 @@
---- configure.orig	Sun Feb  8 16:04:02 2004
-+++ configure	Sun Feb  8 16:04:36 2004
-@@ -22816,6 +22816,8 @@
+--- configure.orig	Mon Apr 19 15:48:25 2004
++++ configure	Mon Apr 19 16:27:55 2004
+@@ -1527,7 +1527,7 @@
+ LIBGNOMEVFS_MAJOR_VERSION=2
+ LIBGNOMEVFS_MINOR_VERSION=6
+ LIBGNOMEVFS_MICRO_VERSION=1
+-LIBGNOMEVFS_INTERFACE_AGE=0
++LIBGNOMEVFS_INTERFACE_AGE=1
+ # If you need a modifier for the version number.
+ # Normally empty, but can be used to make "fixup" releases.
+ LIBGNOMEVFS_EXTRAVERSION=
+@@ -22815,6 +22815,8 @@
  if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -9,7 +18,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22898,6 +22900,7 @@
+@@ -22897,6 +22899,7 @@
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
@@ -17,7 +26,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -22905,6 +22908,7 @@
+@@ -22904,6 +22907,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
@@ -25,7 +34,76 @@
   have_ngettext=yes
  fi
  done
-@@ -26396,8 +26400,8 @@
+@@ -25302,7 +25306,7 @@
+ 
+ 
+ 
+-for ac_header in sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h wctype.h
++for ac_header in sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h sys/param.h wctype.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -25463,6 +25467,9 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #endif
+@@ -25516,6 +25523,9 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #endif
+@@ -25591,6 +25601,9 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #endif
+@@ -25644,6 +25657,9 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #endif
+@@ -25720,6 +25736,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <unistd.h>
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #endif
+@@ -25780,6 +25799,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <unistd.h>
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #endif
+@@ -26788,8 +26810,8 @@
    done
  fi
  
@@ -36,7 +114,7 @@
  if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26416,11 +26420,11 @@
+@@ -26808,11 +26830,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -50,7 +128,7 @@
    ;
    return 0;
  }
-@@ -27547,7 +27551,7 @@
+@@ -27943,7 +27965,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -59,7 +137,27 @@
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -30543,6 +30547,7 @@
+@@ -29572,6 +29594,9 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
+ #include <sys/statfs.h>
+ #include <sys/fstyp.h>
+ _ACEOF
+@@ -29612,6 +29637,9 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
+ #include <sys/statfs.h>
+ #include <sys/vmount.h>
+ _ACEOF
+@@ -31250,6 +31278,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-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
index ab74eb9324fd..a168c6acdac8 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -1,26 +1,25 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Sat Mar 13 18:57:02 2004
-+++ libgnomevfs/gnome-vfs-utils.c	Sat Mar 13 18:51:21 2004
-@@ -797,8 +797,10 @@
+--- libgnomevfs/gnome-vfs-utils.c.orig	Fri Apr 16 06:43:05 2004
++++ libgnomevfs/gnome-vfs-utils.c	Mon Apr 19 15:41:47 2004
+@@ -797,7 +797,9 @@
  	
  #if HAVE_STATVFS
  	statfs_result = statvfs (unescaped_path, &statfs_buffer);
 +#define statfs_bsize f_frsize
  #else
- 	statfs_result = statfs (unescaped_path, &statfs_buffer);   
 +#define statfs_bsize f_bsize
- #endif  
- 
- 	if (statfs_result != 0) {
-@@ -831,7 +833,7 @@
- 		}
+ #if STATFS_ARGS == 2
+ 	statfs_result = statfs (unescaped_path, &statfs_buffer);   
+ #elif STATFS_ARGS == 4
+@@ -838,7 +840,7 @@
  	}
+ #endif
  
 -	block_size = statfs_buffer.f_bsize; 
 +	block_size = statfs_buffer.statfs_bsize; 
  	free_blocks = statfs_buffer.f_bavail;
  
  	*size = block_size * free_blocks;
-@@ -859,7 +861,7 @@
+@@ -866,7 +868,7 @@
  	paths = g_strsplit (gnome_var, ":", 0); 
  
  	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
diff --git a/devel/gnomevfs2/files/patch-modules_pty-open.c b/devel/gnomevfs2/files/patch-modules_pty-open.c
deleted file mode 100644
index 2ee23b086f16..000000000000
--- a/devel/gnomevfs2/files/patch-modules_pty-open.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- modules/pty-open.c.orig	Sun Apr  4 12:58:08 2004
-+++ modules/pty-open.c	Sun Apr  4 12:59:30 2004
-@@ -613,6 +613,10 @@
- 	if ((fd == -1) && (errno == ENOENT)) {
- 		fd = open("/dev/ptc", O_RDWR | O_NOCTTY); /* AIX */
- 	}
-+
-+	if ((fd == -1) && (errno == ENOENT)) {
-+		fd = posix_openpt(O_RDWR);
-+	}
- #endif
- 	/* Set it to blocking. */
- 	flags = fcntl(fd, F_GETFL);
diff --git a/devel/gnomevfs2/files/patch-modules_sftp-method.c b/devel/gnomevfs2/files/patch-modules_sftp-method.c
deleted file mode 100644
index bd08ae0b45f1..000000000000
--- a/devel/gnomevfs2/files/patch-modules_sftp-method.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- modules/sftp-method.c.orig	Mon Mar  8 13:52:39 2004
-+++ modules/sftp-method.c	Sun Apr  4 13:50:21 2004
-@@ -175,6 +175,15 @@
- 
- typedef ssize_t (*read_write_fn) (int, void *, size_t);
- 
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression)				\
-+	(__extension__						\
-+	 ({ long int __result;					\
-+	  	do __result = (long int) (expression);		\
-+		while (__result == -1L && errno == EINTR);	\
-+		__result; }))
-+#endif
-+
- static gsize
- atomic_io (read_write_fn f, gint fd, gpointer buffer_in, gsize size) 
- {
-@@ -1072,6 +1081,7 @@
- 		if (io_status == G_IO_STATUS_NORMAL) {
- 			buffer[len] = 0;
- 			if (g_str_has_suffix (buffer, "password: ") ||
-+			    g_str_has_suffix (buffer, "Password:")  ||
- 			    g_str_has_prefix (buffer, "Enter passphrase for key")) {
- 				if (invoke_full_auth (uri, done_auth, buffer, &password) && password != NULL) {
- 					g_io_channel_write_chars (tty_channel, password, -1, &len, NULL);
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 03548442eea8..67b5ac09bb5b 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -196,6 +196,7 @@ share/doc/gnome-vfs-2.0/right.png
 share/doc/gnome-vfs-2.0/up.png
 @exec mkdir -p %D/share/gnome/vfolders
 %%KDEMENUS%%share/gnome/vfolders/KDE.directory
+share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -209,6 +210,7 @@ share/locale/cy/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/en_CA/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -219,6 +221,7 @@ 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
 share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/gu/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/hr/LC_MESSAGES/gnome-vfs-2.0.mo