From owner-svn-ports-head@FreeBSD.ORG Fri Sep 19 17:39:35 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C93F1803; Fri, 19 Sep 2014 17:39:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B4503219; Fri, 19 Sep 2014 17:39:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8JHdZA6041698; Fri, 19 Sep 2014 17:39:35 GMT (envelope-from nox@FreeBSD.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8JHdYhD041694; Fri, 19 Sep 2014 17:39:34 GMT (envelope-from nox@FreeBSD.org) Message-Id: <201409191739.s8JHdYhD041694@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nox set sender to nox@FreeBSD.org using -f From: Juergen Lock Date: Fri, 19 Sep 2014 17:39:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368579 - in head/multimedia/webcamd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Sep 2014 17:39:35 -0000 Author: nox Date: Fri Sep 19 17:39:34 2014 New Revision: 368579 URL: http://svnweb.freebsd.org/changeset/ports/368579 QAT: https://qat.redports.org/buildarchive/r368579/ Log: - Update to 3.17.0.6 . [1] - Fix rcorder. [2] Submitted by: hselasky (maintainer) [1] Reported by: John Hein (via private email) [2] Modified: head/multimedia/webcamd/Makefile head/multimedia/webcamd/distinfo head/multimedia/webcamd/files/webcamd.conf.in head/multimedia/webcamd/files/webcamd.in Modified: head/multimedia/webcamd/Makefile ============================================================================== --- head/multimedia/webcamd/Makefile Fri Sep 19 16:45:20 2014 (r368578) +++ head/multimedia/webcamd/Makefile Fri Sep 19 17:39:34 2014 (r368579) @@ -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 Modified: head/multimedia/webcamd/distinfo ============================================================================== --- head/multimedia/webcamd/distinfo Fri Sep 19 16:45:20 2014 (r368578) +++ head/multimedia/webcamd/distinfo Fri Sep 19 17:39:34 2014 (r368579) @@ -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 Modified: head/multimedia/webcamd/files/webcamd.conf.in ============================================================================== --- head/multimedia/webcamd/files/webcamd.conf.in Fri Sep 19 16:45:20 2014 (r368578) +++ head/multimedia/webcamd/files/webcamd.conf.in Fri Sep 19 17:39:34 2014 (r368579) @@ -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"; }; Modified: head/multimedia/webcamd/files/webcamd.in ============================================================================== --- head/multimedia/webcamd/files/webcamd.in Fri Sep 19 16:45:20 2014 (r368578) +++ head/multimedia/webcamd/files/webcamd.in Fri Sep 19 17:39:34 2014 (r368579) @@ -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)