3 files changed, 24 insertions, 25 deletions
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;
+