6 files changed, 28 insertions, 191 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 30280fd637d6..d837cb54b7c4 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.6.1.1
-PORTREVISION=	3
+PORTVERSION=	2.6.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.6
@@ -25,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \
 		libbonobo
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--disable-openssl \
 		--disable-gnutls \
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 4289fb0f5848..d88c0954602a 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.6.1.1.tar.bz2) = a5a7e86dbe539d64c7be99ccef5bc8db
-SIZE (gnome2/gnome-vfs-2.6.1.1.tar.bz2) = 1482056
+MD5 (gnome2/gnome-vfs-2.6.2.tar.bz2) = 61bf3e145652089c63edd423ecbc9eba
+SIZE (gnome2/gnome-vfs-2.6.2.tar.bz2) = 1372181
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index 0bd0acf68b34..f7ec12a89ea7 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Mon Apr 19 15:48:25 2004
-+++ configure	Mon Apr 19 16:27:55 2004
-@@ -22815,6 +22815,8 @@
+--- configure.orig	Thu Aug 12 19:59:11 2004
++++ configure	Thu Aug 12 19:59:11 2004
+@@ -22922,6 +22922,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
-@@ -22897,6 +22899,7 @@
+@@ -23004,6 +23006,7 @@
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
@@ -17,84 +17,15 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -22904,6 +22907,7 @@
+@@ -23011,6 +23014,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
 + LIBS="-lintl $LIBS"
   have_ngettext=yes
- fi
- done
-@@ -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 @@
+ else
+   echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+@@ -26981,8 +26985,8 @@
    done
  fi
  
@@ -105,7 +36,7 @@
  if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26808,11 +26830,11 @@
+@@ -27001,11 +27005,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -119,7 +50,7 @@
    ;
    return 0;
  }
-@@ -27943,7 +27965,7 @@
+@@ -28136,7 +28140,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -128,7 +59,7 @@
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -29572,6 +29594,9 @@
+@@ -29765,6 +29769,9 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -138,7 +69,7 @@
  #include <sys/statfs.h>
  #include <sys/fstyp.h>
  _ACEOF
-@@ -29612,6 +29637,9 @@
+@@ -29805,6 +29812,9 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -148,7 +79,7 @@
  #include <sys/statfs.h>
  #include <sys/vmount.h>
  _ACEOF
-@@ -31250,6 +31278,7 @@
+@@ -31432,6 +31442,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/gnome-vfs/files/patch-ltmain.sh b/devel/gnome-vfs/files/patch-ltmain.sh
deleted file mode 100644
index 58384ee38d2e..000000000000
--- a/devel/gnome-vfs/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Sat Dec  6 14:47:45 2003
-+++ ltmain.sh	Tue Dec  9 14:09:01 2003
-@@ -1280,7 +1280,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1290,8 +1290,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -3000,6 +3008,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5428,10 +5439,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/gnome-vfs/files/patch-modules_extfs-method.c b/devel/gnome-vfs/files/patch-modules_extfs-method.c
new file mode 100644
index 000000000000..129e9c4e131e
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_extfs-method.c
@@ -0,0 +1,11 @@
+--- modules/extfs-method.c.orig	Thu Aug 12 20:04:05 2004
++++ modules/extfs-method.c	Thu Aug 12 20:06:20 2004
+@@ -61,7 +61,7 @@
+ 
+ 
+ static ssize_t
+-getdelim (char **lineptr, size_t n, int terminator, FILE *stream)
++getdelim (char **lineptr, size_t *n, int terminator, FILE *stream)
+ {
+ 	char *line, *p;
+ 	size_t size, copy;
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index d1aeafab15f1..ea46ef2df11a 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -111,58 +111,6 @@ libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
 libdata/pkgconfig/gnome-vfs-2.0.pc
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
 libexec/gnome-vfs-daemon
-share/doc/gnome-vfs-2.0/about.html
-share/doc/gnome-vfs-2.0/advanced-operations.html
-share/doc/gnome-vfs-2.0/ch08.html
-share/doc/gnome-vfs-2.0/data-types.html
-share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html
-share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html
-share/doc/gnome-vfs-2.0/home.png
-share/doc/gnome-vfs-2.0/index.html
-share/doc/gnome-vfs-2.0/index.sgml
-share/doc/gnome-vfs-2.0/left.png
-share/doc/gnome-vfs-2.0/mime-registry.html
-share/doc/gnome-vfs-2.0/modules.html
-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
@@ -234,7 +182,6 @@ share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
-@dirrm share/doc/gnome-vfs-2.0
 @dirrm share/gnome/vfolders
 @dirrm lib/vfs/2.0/extfs
 @dirrm lib/vfs/2.0