Update to 1.6.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13900 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 20 insertions, 37 deletions

diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 73dc560f0..9f38919f0 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gvfs/Makefile,v 1.58 2010/02/23 15:29:19 kwm Exp $
+#   $MCom: ports/devel/gvfs/Makefile,v 1.59 2010/03/09 12:15:21 avl Exp $
 #
 
 PORTNAME=	gvfs
-PORTVERSION=	1.5.5
+PORTVERSION=	1.6.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index 8aa6c3ac7..a52c82895 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gvfs-1.5.5.tar.bz2) = d4ae94acdea317d8a8bf88a793b8df3f
-SHA256 (gnome2/gvfs-1.5.5.tar.bz2) = e6c3c54ddbf5be75836e69c6d847500201b1b95b54d9bea8f9f51d2bc9617c8a
-SIZE (gnome2/gvfs-1.5.5.tar.bz2) = 1310788
+MD5 (gnome2/gvfs-1.6.0.tar.bz2) = fb533047ddd894ec5c811b005cb88a07
+SHA256 (gnome2/gvfs-1.6.0.tar.bz2) = 2e4c973e75c7af8d2d88232cd7742971f655fdbd7f5b687450b858484d88a0d3
+SIZE (gnome2/gvfs-1.6.0.tar.bz2) = 1352935
diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure
index e284f4e52..cee0fc7d7 100644
--- a/devel/gvfs/files/patch-configure
+++ b/devel/gvfs/files/patch-configure
@@ -1,25 +1,15 @@
---- configure.orig	2010-03-19 12:43:09.000000000 -0400
-+++ configure	2010-03-19 12:51:09.000000000 -0400
-@@ -707,6 +707,9 @@ ac_unique_file="client/gdaemonvfs.h"
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
-+#ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+#endif
- #ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
-@@ -16196,7 +16199,7 @@ if test "${ac_cv_lib_archive_archive_ent
+--- configure.orig	2010-03-30 10:14:50.000000000 +0200
++++ configure	2010-03-30 10:16:26.000000000 +0200
+@@ -20312,7 +20312,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-larchive  $LIBS"
 +LIBS="-larchive -lcrypto -lmd  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -16241,7 +16244,7 @@ $as_echo "#define HAVE_ARCHIVE /**/" >>c
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -20388,7 +20388,7 @@
                  if test x$with_archive_libs != x/usr/lib; then
                          ARCHIVE_LIBS="-L$with_archive_libs -larchive"
                  else
@@ -27,23 +17,13 @@
 +                	ARCHIVE_LIBS="-larchive -lcrypto -lmd"
                  fi
  	else
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archive_entry_filetype in -larchive" >&5
-@@ -16250,7 +16253,7 @@ if test "${ac_cv_lib_archive_archive_ent
+ 		{ $as_echo "$as_me:$LINENO: checking for archive_entry_filetype in -larchive" >&5
+@@ -20397,7 +20397,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-larchive  $LIBS"
 +LIBS="-larchive -lcrypto -lmd $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -17655,6 +17658,9 @@ sys_lib_dlsearch_path_spec; do
-     *[\\\\\\\`\\"\\\$]*)
-       eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-       ;;
-+    *-freebsd*)
-+      use_gphoto2=yes
-+      ;;
-     *)
-       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-       ;;
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index b196ca80b..5bf2409f3 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -110,6 +110,7 @@ share/locale/mk/LC_MESSAGES/gvfs.mo
 share/locale/ml/LC_MESSAGES/gvfs.mo
 share/locale/mr/LC_MESSAGES/gvfs.mo
 share/locale/nb/LC_MESSAGES/gvfs.mo
+share/locale/nds/LC_MESSAGES/gvfs.mo
 share/locale/nl/LC_MESSAGES/gvfs.mo
 share/locale/nn/LC_MESSAGES/gvfs.mo
 share/locale/or/LC_MESSAGES/gvfs.mo
@@ -146,6 +147,8 @@ share/locale/zh_TW/LC_MESSAGES/gvfs.mo
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
 @dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mai/LC_MESSAGES