4 files changed, 22 insertions, 11 deletions

diff --git a/multimedia/webcamd/Makefile b/multimedia/webcamd/Makefile
index 5921ca4814ca..9d5feacdd87f 100644
--- a/multimedia/webcamd/Makefile
+++ b/multimedia/webcamd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	webcamd
-PORTVERSION=	3.17.0.5
+PORTVERSION=	3.17.0.6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.selasky.org/hans_petter/distfiles/ \
 		http://home.selasky.org:8192/distfiles/
@@ -102,11 +102,16 @@ do-configure:
 post-patch:
 	@cd ${WRKSRC}/patches; ${SH} ./do_patch.sh
 
+pre-install:
+	@${SED} -i .orig \
+		-e "s|%%PREFIX%%|${PREFIX}|g" \
+		-e "s|%%LIBHAL%%|${LIBHAL}|g" \
+		-e "s|%%LIBCUSE%%|${LIBCUSE}|g" \
+		${WRKDIR}/webcamd
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \
-		-e "s|%%LIBHAL%%|${LIBHAL}|g" \
-		-e "s|%%LIBCUSE%%|${LIBCUSE}|g" \
 		< ${FILESDIR}/webcamd.conf.in > ${WRKDIR}/webcamd.conf
 	${INSTALL_DATA} "${WRKDIR}/webcamd.conf" ${STAGEDIR}${PREFIX}/etc/devd
 
diff --git a/multimedia/webcamd/distinfo b/multimedia/webcamd/distinfo
index 0064b629013d..557f5b8c0a41 100644
--- a/multimedia/webcamd/distinfo
+++ b/multimedia/webcamd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (webcamd-3.17.0.5.tar.bz2) = c43d25938c6dc33c4c9debb7754de4dfa067e67acd00f8ae0096243af773c675
-SIZE (webcamd-3.17.0.5.tar.bz2) = 10327807
+SHA256 (webcamd-3.17.0.6.tar.bz2) = f7fa6b9cc936afcc51bb7f78cf7d51ba5c9cec595618f93a02cbb7982403c299
+SIZE (webcamd-3.17.0.6.tar.bz2) = 10326622
diff --git a/multimedia/webcamd/files/webcamd.conf.in b/multimedia/webcamd/files/webcamd.conf.in
index 1a96bf9c2cd2..d9937fb268ef 100644
--- a/multimedia/webcamd/files/webcamd.conf.in
+++ b/multimedia/webcamd/files/webcamd.conf.in
@@ -4,7 +4,7 @@ notify 100 {
 	match "subsystem"	"INTERFACE";
 	match "type"		"ATTACH";
 	match "intclass"	"0x0e";
-	action "env LD_PRELOAD=%%LIBHAL%%%%LIBCUSE%% %%PREFIX%%/etc/rc.d/webcamd start $cdev";
+	action "%%PREFIX%%/etc/rc.d/webcamd start $cdev";
 };
 
 # Vendor specific USB webcams and DVB devices.
@@ -13,7 +13,7 @@ notify 100 {
 	match "subsystem"	"INTERFACE";
 	match "type"		"ATTACH";
 	match "intclass"	"0xff";
-	action "env LD_PRELOAD=%%LIBHAL%%%%LIBCUSE%% %%PREFIX%%/etc/rc.d/webcamd start $cdev";
+	action "%%PREFIX%%/etc/rc.d/webcamd start $cdev";
 };
 
 # Unspecified USB webcams and DVB devices.
@@ -22,7 +22,7 @@ notify 100 {
 	match "subsystem"	"INTERFACE";
 	match "type"		"ATTACH";
 	match "intclass"	"0x00";
-	action "env LD_PRELOAD=%%LIBHAL%%%%LIBCUSE%% %%PREFIX%%/etc/rc.d/webcamd start $cdev";
+	action "%%PREFIX%%/etc/rc.d/webcamd start $cdev";
 };
 
 # Generic USB input devices.
@@ -37,5 +37,5 @@ notify 100 {
 # and mouse
 #
 	match "vendor"		"0x056a";
-	action "env LD_PRELOAD=%%LIBHAL%%%%LIBCUSE%% %%PREFIX%%/etc/rc.d/webcamd start $cdev $interface";
+	action "%%PREFIX%%/etc/rc.d/webcamd start $cdev $interface";
 };
diff --git a/multimedia/webcamd/files/webcamd.in b/multimedia/webcamd/files/webcamd.in
index 8fb20f655db6..3fb2cde494e1 100644
--- a/multimedia/webcamd/files/webcamd.in
+++ b/multimedia/webcamd/files/webcamd.in
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 # PROVIDE: webcamd
-# REQUIRE: DAEMON LOGIN
+# REQUIRE: FILESYSTEMS netif
 # BEFORE: devd
 # KEYWORD: shutdown
 #
@@ -99,13 +99,19 @@ load_rc_config $name
 devd_device=${2}
 devd_interface=${3-0}
 
-command=%%PREFIX%%/sbin/webcamd
+command=webcamd
 command_args="-B -U ${webcamd_user} -G ${webcamd_group}"
 
 start_cmd="${name}_start"
 stop_cmd="${name}_stop"
 status_cmd="${name}_status"
 
+webcamd()
+{
+  # When running early we need to pre-load some libraries
+  env LD_PRELOAD=%%LIBHAL%%%%LIBCUSE%% %%PREFIX%%/sbin/webcamd $*
+}
+
 webcamd_pids()
 {
   pids=$(pgrep -d ' ' $name)