2 files changed, 8 insertions, 2 deletions

diff --git a/multimedia/webcamd/files/webcamd.conf.in b/multimedia/webcamd/files/webcamd.conf.in
index 194066e26418..c1f79bbd20e0 100644
--- a/multimedia/webcamd/files/webcamd.conf.in
+++ b/multimedia/webcamd/files/webcamd.conf.in
@@ -3,5 +3,5 @@ notify 100 {
 	match "subsystem"	"INTERFACE";
 	match "type"		"ATTACH";
 	match "intclass"	"(0x0e|0xff)";
-	action "env LD_PRELOAD=%%PREFIX%%/lib/libcuse4bsd.so %%PREFIX%%/etc/rc.d/webcamd start $cdev";
+	action "env LD_PRELOAD=%%LIBHAL%%%%LIBCUSE%% %%PREFIX%%/etc/rc.d/webcamd start $cdev";
 };
diff --git a/multimedia/webcamd/files/webcamd.in b/multimedia/webcamd/files/webcamd.in
index a082fb1a839c..4271b72c0893 100644
--- a/multimedia/webcamd/files/webcamd.in
+++ b/multimedia/webcamd/files/webcamd.in
@@ -10,6 +10,7 @@
 #
 
 webcamd_enable=${webcamd_enable-"NO"}
+hald_enable=${hald_enable-"NO"}
 
 . /etc/rc.subr
 
@@ -17,7 +18,12 @@ name=webcamd
 rcvar=`set_rcvar`
 command=%%PREFIX%%/sbin/webcamd
 command_args="-B"
-pidfile="/var/run/webcamd.$cdev.0.pid"
+
+if [ -n "$hald_enable" ]; then
+	command_args="$command_args -H"
+fi
+
+pidfile="/var/run/webcamd.*.0.pid"
 
 load_rc_config $name
 if [ $# -gt 1 ]; then