4 files changed, 18 insertions, 89 deletions
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 77a20974ca62..3687e14e7751 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.37 2009/01/10 01:59:21 mezz Exp $
+#   $MCom: ports/devel/gvfs/Makefile,v 1.43 2009/04/03 10:02:13 kwm Exp $
 #
 
 PORTNAME=	gvfs
-PORTVERSION=	1.0.3
+PORTVERSION=	1.2.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index a0397c2d0987..5aa52eec0deb 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gvfs-1.0.3.tar.bz2) = a41e8b7d99e390cef8312f7ce5f312a5
-SHA256 (gnome2/gvfs-1.0.3.tar.bz2) = 17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd
-SIZE (gnome2/gvfs-1.0.3.tar.bz2) = 920742
+MD5 (gnome2/gvfs-1.2.1.tar.bz2) = df8f624587adfabe7009838ce6d8d5fd
+SHA256 (gnome2/gvfs-1.2.1.tar.bz2) = 0e3c3469721ff1d4296bf4af7e1f131201d2dc6a36c772d99e1630f8cce31da2
+SIZE (gnome2/gvfs-1.2.1.tar.bz2) = 1048427
diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure
index d922ddd4565f..a707a133b21d 100644
--- a/devel/gvfs/files/patch-configure
+++ b/devel/gvfs/files/patch-configure
@@ -1,69 +1,6 @@
---- configure.orig	2008-03-28 17:23:44.000000000 -0400
-+++ configure	2008-03-28 17:24:02.000000000 -0400
-@@ -24617,7 +24617,7 @@ if test "x$enable_http" != "xno"; then
-   msg_http=yes
- fi
- 
--  if test "x$msg_http" == "xyes"; then
-+  if test "x$msg_http" = "xyes"; then
- 
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for HTTP" >&5
-@@ -24885,7 +24885,7 @@ if test "x$enable_fuse" != "xno"; then
-   msg_fuse=yes
- fi
- 
--  if test "x$msg_fuse" == "xyes"; then
-+  if test "x$msg_fuse" = "xyes"; then
- 
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for FUSE" >&5
-@@ -25036,7 +25036,7 @@ if test "x$enable_gconf" != "xno"; then
-   msg_gconf=yes
- fi
- 
--  if test "x$msg_gconf" == "xyes"; then
-+  if test "x$msg_gconf" = "xyes"; then
- 
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for GCONF" >&5
-@@ -25189,7 +25189,7 @@ if test "x$enable_hal" != "xno"; then
-   msg_hal=yes
- fi
- 
--  if test "x$msg_hal" == "xyes"; then
-+  if test "x$msg_hal" = "xyes"; then
- 
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for HAL" >&5
-@@ -25371,7 +25371,7 @@ if test $ac_cv_lib_hal_libhal_get_all_de
-   have_hal_fast_init=yes
- fi
- 
--    if test "x$have_hal_fast_init" == "xyes"; then
-+    if test "x$have_hal_fast_init" = "xyes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_HAL_FAST_INIT 1
-@@ -25412,7 +25412,7 @@ if test "x$enable_cdda" != "xno"; then
-   msg_cdda=yes
- fi
- 
--  if test "x$msg_cdda" == "xyes"; then
-+  if test "x$msg_cdda" = "xyes"; then
- 
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for CDDA" >&5
-@@ -25772,7 +25772,7 @@ else
- fi
- 
- 
--  if test "x$msg_obexftp" == "xyes" -a "x$have_expat" == "xtrue"; then
-+  if test "x$msg_obexftp" = "xyes" -a "x$have_expat" = "xtrue"; then
- 
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for OBEXFTP" >&5
-@@ -25936,13 +25936,16 @@ fi
+--- configure.orig	2009-03-02 17:50:05.000000000 -0500
++++ configure	2009-03-02 17:50:44.000000000 -0500
+@@ -26973,6 +26973,9 @@ fi
      *-linux*)
        use_gphoto2=yes
        ;;
@@ -73,21 +10,3 @@
      *)
        use_gphoto2=no
        ;;
-   esac
- 
--  if test "x$msg_gphoto2" == "xyes"; then
--    if test "x$use_gphoto2" == "xyes"; then
-+  if test "x$msg_gphoto2" = "xyes"; then
-+    if test "x$use_gphoto2" = "xyes"; then
- 
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for GPHOTO2" >&5
-@@ -26098,7 +26101,7 @@ if test "x$enable_keyring" != "xno"; the
-   msg_keyring=yes
- fi
- 
--  if test "x$msg_keyring" == "xyes"; then
-+  if test "x$msg_keyring" = "xyes"; then
- 
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for KEYRING" >&5
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index 8670f6588266..a10939f60b43 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -23,6 +23,9 @@ lib/gio/modules/libgioremote-volume-monitor.la
 lib/gio/modules/libgioremote-volume-monitor.so
 lib/gio/modules/libgvfsdbus.la
 lib/gio/modules/libgvfsdbus.so
+lib/libgvfscommon-dnssd.la
+lib/libgvfscommon-dnssd.so
+lib/libgvfscommon-dnssd.so.0
 lib/libgvfscommon.la
 lib/libgvfscommon.so
 lib/libgvfscommon.so.0
@@ -53,6 +56,7 @@ share/gvfs/mounts/burn.mount
 %%CDDA%%share/gvfs/mounts/cdda.mount
 share/gvfs/mounts/computer.mount
 share/gvfs/mounts/dav.mount
+share/gvfs/mounts/dav+sd.mount
 share/gvfs/mounts/dns-sd.mount
 share/gvfs/mounts/ftp.mount
 %%GPHOTO2%%share/gvfs/mounts/gphoto2.mount
@@ -66,6 +70,7 @@ share/gvfs/mounts/trash.mount
 %%GPHOTO2%%share/gvfs/remote-volume-monitors/gphoto2.monitor
 share/gvfs/remote-volume-monitors/hal.monitor
 share/locale/ar/LC_MESSAGES/gvfs.mo
+share/locale/as/LC_MESSAGES/gvfs.mo
 share/locale/be@latin/LC_MESSAGES/gvfs.mo
 share/locale/bg/LC_MESSAGES/gvfs.mo
 share/locale/bn_IN/LC_MESSAGES/gvfs.mo
@@ -92,16 +97,19 @@ share/locale/kn/LC_MESSAGES/gvfs.mo
 share/locale/ko/LC_MESSAGES/gvfs.mo
 share/locale/ku/LC_MESSAGES/gvfs.mo
 share/locale/lt/LC_MESSAGES/gvfs.mo
+share/locale/lv/LC_MESSAGES/gvfs.mo
 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/nl/LC_MESSAGES/gvfs.mo
 share/locale/nn/LC_MESSAGES/gvfs.mo
+share/locale/or/LC_MESSAGES/gvfs.mo
 share/locale/pa/LC_MESSAGES/gvfs.mo
 share/locale/pl/LC_MESSAGES/gvfs.mo
 share/locale/pt/LC_MESSAGES/gvfs.mo
 share/locale/pt_BR/LC_MESSAGES/gvfs.mo
+share/locale/ro/LC_MESSAGES/gvfs.mo
 share/locale/ru/LC_MESSAGES/gvfs.mo
 share/locale/sk/LC_MESSAGES/gvfs.mo
 share/locale/sl/LC_MESSAGES/gvfs.mo
@@ -138,3 +146,5 @@ share/locale/zh_TW/LC_MESSAGES/gvfs.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as