Update to 0.99.2.

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

6 files changed, 38 insertions, 33 deletions

diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index a7de2b6be..242b7e970 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gvfs/Makefile,v 1.23 2008/06/05 07:58:56 kwm Exp $
+#   $MCom: ports/devel/gvfs/Makefile,v 1.24 2008/06/06 21:38:47 marcus Exp $
 #
 
 PORTNAME=	gvfs
-PORTVERSION=	0.99.1
-PORTREVISION=	1
+PORTVERSION=	0.99.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index 980cb6746..8dd949355 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gvfs-0.99.1.tar.bz2) = d1cd85461481171c8a4fc970d623fc59
-SHA256 (gvfs-0.99.1.tar.bz2) = 026e174a7c0108a53c6914aef23879478f3684dab340f4f1e6a661561ebb0fc9
-SIZE (gvfs-0.99.1.tar.bz2) = 829953
+MD5 (gvfs-0.99.2.tar.bz2) = be34d612c4d993e90022af1751c280c5
+SHA256 (gvfs-0.99.2.tar.bz2) = 26092f008d213a6085674e1888ede247ddc8f692dd59029ce5fa555965d65bfc
+SIZE (gvfs-0.99.2.tar.bz2) = 846613
diff --git a/devel/gvfs/files/patch-Makefile.in b/devel/gvfs/files/patch-Makefile.in
index 7832811c4..658cccd6a 100644
--- a/devel/gvfs/files/patch-Makefile.in
+++ b/devel/gvfs/files/patch-Makefile.in
@@ -1,11 +1,10 @@
---- Makefile.in.orig	2008-02-11 20:04:47.000000000 -0500
-+++ Makefile.in	2008-02-11 20:05:02.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 gconf po programs test hal
-+DIST_SUBDIRS = common client daemon gconf po programs hal
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
+--- Makefile.in.orig	2008-07-22 23:17:58.000000000 -0400
++++ Makefile.in	2008-07-22 23:18:24.000000000 -0400
+@@ -269,7 +269,6 @@ SUBDIRS = \
+ 	gconf \
+ 	po   \
+ 	programs \
+-	test \
+ 	$(NULL)
+ 
+ EXTRA_DIST = \
diff --git a/devel/gvfs/files/patch-hal_ghalvolume.c b/devel/gvfs/files/patch-hal_ghalvolume.c
deleted file mode 100644
index 519718969..000000000
--- a/devel/gvfs/files/patch-hal_ghalvolume.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- hal/ghalvolume.c.orig	2008-02-25 16:51:39.000000000 -0500
-+++ hal/ghalvolume.c	2008-02-25 16:52:00.000000000 -0500
-@@ -550,7 +550,11 @@ g_hal_volume_new (GVolumeMonitor   *volu
-         return NULL;
- 
-       /* TODO: other OS'es? Will address this with DK aka HAL 2.0 */
-+#ifdef __FreeBSD__
-+      device_path = hal_device_get_property_string (drive_device, "freebsd.device_file");
-+#else
-       device_path = hal_device_get_property_string (drive_device, "linux.device_file");
-+#endif
-       if (strlen (device_path) == 0)
-         device_path = NULL;
- 
diff --git a/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c b/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c
new file mode 100644
index 000000000..6686b28ae
--- /dev/null
+++ b/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c
@@ -0,0 +1,14 @@
+--- monitor/gphoto2/ggphoto2volume.c.orig	2008-07-22 09:29:19.000000000 -0400
++++ monitor/gphoto2/ggphoto2volume.c	2008-07-22 23:22:30.000000000 -0400
+@@ -277,7 +277,11 @@ g_gphoto2_volume_new (GVolumeMonitor   *
+     return NULL;
+ 
+   /* TODO: other OS'es? Will address this with DK aka HAL 2.0 */
++#ifdef __FreeBSD__
++  device_path = hal_device_get_property_string (drive_device, "freebsd.device_file");
++#else
+   device_path = hal_device_get_property_string (drive_device, "linux.device_file");
++#endif
+   if (strlen (device_path) == 0)
+     device_path = NULL;
+ 
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index a9b1733da..7faedcaf2 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -19,14 +19,16 @@ include/gvfs-client/gvfs/gvfsurimapper.h
 include/gvfs-client/gvfs/gvfsuriutils.h
 lib/gio/modules/libgiogconf.la
 lib/gio/modules/libgiogconf.so
-lib/gio/modules/libgiohal-volume-monitor.la
-lib/gio/modules/libgiohal-volume-monitor.so
+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.la
 lib/libgvfscommon.so
 lib/libgvfscommon.so.0
 %%FUSE%%libexec/gvfs-fuse-daemon
+%%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor
+libexec/gvfs-hal-volume-monitor
 libexec/gvfsd
 %%ARCHIVE%%libexec/gvfsd-archive
 libexec/gvfsd-burn
@@ -44,6 +46,8 @@ libexec/gvfsd-sftp
 %%SMB%%libexec/gvfsd-smb-browse
 libexec/gvfsd-trash
 share/dbus-1/services/gvfs-daemon.service
+%%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
+share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
 %%ARCHIVE%%share/gvfs/mounts/archive.mount
 share/gvfs/mounts/burn.mount
 %%CDDA%%share/gvfs/mounts/cdda.mount
@@ -59,6 +63,8 @@ share/gvfs/mounts/sftp.mount
 %%SMB%%share/gvfs/mounts/smb-browse.mount
 %%SMB%%share/gvfs/mounts/smb.mount
 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/be@latin/LC_MESSAGES/gvfs.mo
 share/locale/bg/LC_MESSAGES/gvfs.mo
@@ -105,6 +111,7 @@ share/locale/vi/LC_MESSAGES/gvfs.mo
 share/locale/zh_CN/LC_MESSAGES/gvfs.mo
 share/locale/zh_HK/LC_MESSAGES/gvfs.mo
 share/locale/zh_TW/LC_MESSAGES/gvfs.mo
+@dirrm share/gvfs/remote-volume-monitors
 @dirrm share/gvfs/mounts
 @dirrm share/gvfs
 @dirrm include/gvfs-client/gvfs