summaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-03-18 15:39:55 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-03-18 15:39:55 +0800
commit8d2cecf681218178625f24306910283f55fc5059 (patch)
tree1730b2d9c91a8ae660c2eb0426c7b620d996f2a1 /sysutils
parenteec509a3078d403c1bb7d5a1bae5957a455a428a (diff)
downloadmarcuscom-ports-8d2cecf681218178625f24306910283f55fc5059.tar
marcuscom-ports-8d2cecf681218178625f24306910283f55fc5059.tar.gz
marcuscom-ports-8d2cecf681218178625f24306910283f55fc5059.tar.bz2
marcuscom-ports-8d2cecf681218178625f24306910283f55fc5059.tar.lz
marcuscom-ports-8d2cecf681218178625f24306910283f55fc5059.tar.xz
marcuscom-ports-8d2cecf681218178625f24306910283f55fc5059.tar.zst
marcuscom-ports-8d2cecf681218178625f24306910283f55fc5059.zip
Mark our storage addon as ready. This important step caused a lot of
auto-mount problems. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10769 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/hal/Makefile3
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c13
2 files changed, 15 insertions, 1 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 6f457e891..e7ac488ed 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/hal/Makefile,v 1.39 2008/03/15 23:18:46 marcus Exp $
+# $MCom: ports/sysutils/hal/Makefile,v 1.40 2008/03/17 22:24:44 marcus Exp $
#
PORTNAME= hal
DISTVERSION= 0.5.11rc2
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
new file mode 100644
index 000000000..460927eb6
--- /dev/null
+++ b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
@@ -0,0 +1,13 @@
+--- hald/freebsd/addons/addon-storage.c.orig 2008-03-18 03:37:34.000000000 -0400
++++ hald/freebsd/addons/addon-storage.c 2008-03-18 03:34:58.000000000 -0400
+@@ -202,6 +202,10 @@ main (int argc, char **argv)
+ ! strcmp(driver, "cd")))) && ! strcmp(removable, "true");
+ addon.had_media = hf_addon_storage_update();
+
++ if (!libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error))
++ goto end;
++ dbus_error_free(&hfp_error);
++
+ connection = libhal_ctx_get_dbus_connection(hfp_ctx);
+ assert(connection != NULL);
+