Update to 0.1.4, and disable libsoup support since gvfs now requires the

unreleased libsoup-2.4.


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

6 files changed, 36 insertions, 37 deletions

diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 113d05e61..55c2e6e5a 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -3,10 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/devel/gvfs/Makefile,v 1.5 2008/01/10 16:38:48 marcus Exp $
+#    $MCom: ports/devel/gvfs/Makefile,v 1.6 2008/01/14 21:07:05 marcus Exp $
 
 PORTNAME=	gvfs
-PORTVERSION=	0.1.2
+PORTVERSION=	0.1.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 
@@ -14,8 +14,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME virtual file system
 
 LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus \
-    		hal.1:${PORTSDIR}/sysutils/hal \
-		soup-2.2.8:${PORTSDIR}/devel/libsoup
+    		hal.1:${PORTSDIR}/sysutils/hal
+#		soup-2.2.8:${PORTSDIR}/devel/libsoup
 
 USE_GNOME=	glib20 gnomehack gnomeprefix intlhack
 USE_GMAKE=	yes
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index 270415d9b..958fae51b 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gvfs-0.1.2.tar.gz) = 89052b4f232aaaaaf060329012891368
-SHA256 (gvfs-0.1.2.tar.gz) = 7705fb4d9ea6137d614db6e06872fbad8827e805a1d324f9bf7f2ede74eb044d
-SIZE (gvfs-0.1.2.tar.gz) = 723806
+MD5 (gvfs-0.1.4.tar.gz) = c3c600f2ab85de256b2e1a13fa46d8ce
+SHA256 (gvfs-0.1.4.tar.gz) = d9b55a2c0a23ce572d33e6d26a070d211da9bcd44a9ba2be24f0556272453c7c
+SIZE (gvfs-0.1.4.tar.gz) = 750900
diff --git a/devel/gvfs/files/patch-Makefile.in b/devel/gvfs/files/patch-Makefile.in
index e5bc9df26..11ebaa19d 100644
--- a/devel/gvfs/files/patch-Makefile.in
+++ b/devel/gvfs/files/patch-Makefile.in
@@ -1,10 +1,11 @@
---- Makefile.in.orig	2007-12-30 16:07:20.000000000 -0500
-+++ Makefile.in	2007-12-30 16:07:26.000000000 -0500
-@@ -220,7 +220,6 @@ SUBDIRS = \
- 	daemon \
- 	po   \
- 	programs \
--	test \
- 	hal \
- 	$(NULL)
- 
+--- Makefile.in.orig	2008-01-21 16:09:20.000000000 -0500
++++ Makefile.in	2008-01-21 16:09:36.000000000 -0500
+@@ -60,7 +60,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
+   distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = common client daemon po programs test hal
++DIST_SUBDIRS = common client daemon po programs hal
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure
index 54743070b..b6d61bc26 100644
--- a/devel/gvfs/files/patch-configure
+++ b/devel/gvfs/files/patch-configure
@@ -1,6 +1,15 @@
---- configure.orig	2007-12-22 18:32:00.000000000 -0500
-+++ configure	2007-12-22 18:32:13.000000000 -0500
-@@ -24091,7 +24091,7 @@ if test "x$enable_cdda" != "xno"; then
+--- configure.orig	2008-01-21 16:10:01.000000000 -0500
++++ configure	2008-01-21 16:11:08.000000000 -0500
+@@ -24401,7 +24401,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
+@@ -24551,7 +24551,7 @@ if test "x$enable_cdda" != "xno"; then
    msg_cdda=yes
  fi
  
@@ -9,7 +18,7 @@
  
  pkg_failed=no
  { echo "$as_me:$LINENO: checking for CDDA" >&5
-@@ -24242,7 +24242,7 @@ if test "x$enable_fuse" != "xno"; then
+@@ -24702,7 +24702,7 @@ if test "x$enable_fuse" != "xno"; then
    msg_fuse=yes
  fi
  
@@ -18,7 +27,7 @@
  
  pkg_failed=no
  { echo "$as_me:$LINENO: checking for FUSE" >&5
-@@ -24394,7 +24394,7 @@ if test "x$enable_hal" != "xno"; then
+@@ -24854,7 +24854,7 @@ if test "x$enable_hal" != "xno"; then
    msg_hal=yes
  fi
  
@@ -27,7 +36,7 @@
  
  pkg_failed=no
  { echo "$as_me:$LINENO: checking for HAL" >&5
-@@ -24576,7 +24576,7 @@ if test $ac_cv_lib_hal_libhal_get_all_de
+@@ -25036,7 +25036,7 @@ if test $ac_cv_lib_hal_libhal_get_all_de
    have_hal_fast_init=yes
  fi
  
diff --git a/devel/gvfs/files/patch-daemon_gvfsbackendcomputer.c b/devel/gvfs/files/patch-daemon_gvfsbackendcomputer.c
deleted file mode 100644
index 0994b22d2..000000000
--- a/devel/gvfs/files/patch-daemon_gvfsbackendcomputer.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- daemon/gvfsbackendcomputer.c.orig	2008-01-09 03:12:26.000000000 -0500
-+++ daemon/gvfsbackendcomputer.c	2008-01-09 03:13:00.000000000 -0500
-@@ -417,6 +417,7 @@ recompute_files (GVfsBackendComputer *ba
-           file->icon = g_volume_get_icon (file->volume);
-           file->display_name = g_volume_get_name (file->volume);
-           file->can_mount = g_volume_can_mount (file->volume);
-+          file->root = NULL;
-           file->can_eject = g_volume_can_eject (file->volume);
-         }
-       else /* drive */
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index 0adc5931f..578d230ae 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -20,10 +20,9 @@ lib/libgvfscommon.la
 lib/libgvfscommon.so
 lib/libgvfscommon.so.0
 libexec/gvfsd
+libexec/gvfsd-burn
 libexec/gvfsd-computer
-libexec/gvfsd-dav
 libexec/gvfsd-ftp
-libexec/gvfsd-http
 libexec/gvfsd-localtest
 libexec/gvfsd-sftp
 %%SMB%%libexec/gvfsd-smb
@@ -31,10 +30,9 @@ libexec/gvfsd-sftp
 libexec/gvfsd-trash
 %%FUSE%%libexec/gvfs-fuse-daemon
 share/dbus-1/services/gvfs-daemon.service
+share/gvfs/mounts/burn.mount
 share/gvfs/mounts/computer.mount
-share/gvfs/mounts/dav.mount
 share/gvfs/mounts/ftp.mount
-share/gvfs/mounts/http.mount
 share/gvfs/mounts/localtest.mount
 share/gvfs/mounts/sftp.mount
 %%SMB%%share/gvfs/mounts/smb-browse.mount
@@ -47,6 +45,7 @@ share/locale/eu/LC_MESSAGES/gvfs.mo
 share/locale/it/LC_MESSAGES/gvfs.mo
 share/locale/nb/LC_MESSAGES/gvfs.mo
 share/locale/ru/LC_MESSAGES/gvfs.mo
+share/locale/sv/LC_MESSAGES/gvfs.mo
 @dirrm share/gvfs/mounts
 @dirrm share/gvfs
 @dirrm include/gvfs-client/gvfs