6 files changed, 50 insertions, 32 deletions

diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 804e06b93549..77a20974ca62 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -3,13 +3,14 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gvfs/Makefile,v 1.21 2008/03/18 16:16:48 mezz Exp $
+#   $MCom: ports/devel/gvfs/Makefile,v 1.37 2009/01/10 01:59:21 mezz Exp $
 #
 
 PORTNAME=	gvfs
-PORTVERSION=	0.2.5
+PORTVERSION=	1.0.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME virtual file system
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index f9834de5f3b7..a0397c2d0987 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gvfs-0.2.5.tar.bz2) = 01676053d9481022ade9a5274576541b
-SHA256 (gvfs-0.2.5.tar.bz2) = f8bb3d32b1fe797190b9d8f2a6b0cdf91e897326a26cf8d9583e41f0d3aae86b
-SIZE (gvfs-0.2.5.tar.bz2) = 826404
+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
diff --git a/devel/gvfs/files/patch-Makefile.in b/devel/gvfs/files/patch-Makefile.in
index 7832811c4608..658cccd6ad11 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 519718969441..000000000000
--- 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 000000000000..6686b28aebb7
--- /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 a9b1733da210..8670f6588266 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
@@ -74,12 +80,15 @@ share/locale/et/LC_MESSAGES/gvfs.mo
 share/locale/eu/LC_MESSAGES/gvfs.mo
 share/locale/fi/LC_MESSAGES/gvfs.mo
 share/locale/fr/LC_MESSAGES/gvfs.mo
+share/locale/ga/LC_MESSAGES/gvfs.mo
 share/locale/gl/LC_MESSAGES/gvfs.mo
+share/locale/gu/LC_MESSAGES/gvfs.mo
 share/locale/he/LC_MESSAGES/gvfs.mo
 share/locale/hi/LC_MESSAGES/gvfs.mo
 share/locale/hu/LC_MESSAGES/gvfs.mo
 share/locale/it/LC_MESSAGES/gvfs.mo
 share/locale/ja/LC_MESSAGES/gvfs.mo
+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
@@ -96,8 +105,12 @@ share/locale/pt_BR/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
+share/locale/sq/LC_MESSAGES/gvfs.mo
+share/locale/sr/LC_MESSAGES/gvfs.mo
+share/locale/sr@latin/LC_MESSAGES/gvfs.mo
 share/locale/sv/LC_MESSAGES/gvfs.mo
 share/locale/ta/LC_MESSAGES/gvfs.mo
+share/locale/te/LC_MESSAGES/gvfs.mo
 share/locale/th/LC_MESSAGES/gvfs.mo
 share/locale/tr/LC_MESSAGES/gvfs.mo
 share/locale/uk/LC_MESSAGES/gvfs.mo
@@ -105,6 +118,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
@@ -112,6 +126,10 @@ share/locale/zh_TW/LC_MESSAGES/gvfs.mo
 @dirrmtry etc/profile.d
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/ku/LC_MESSAGES