From nobody Tue Oct 12 08:47:31 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E17B417FAD4F; Tue, 12 Oct 2021 08:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HT8S35wJ6z3hkP; Tue, 12 Oct 2021 08:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A6D7D1185B; Tue, 12 Oct 2021 08:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19C8lVIU090547; Tue, 12 Oct 2021 08:47:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19C8lVbs090546; Tue, 12 Oct 2021 08:47:31 GMT (envelope-from git) Date: Tue, 12 Oct 2021 08:47:31 GMT Message-Id: <202110120847.19C8lVbs090546@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hans Petter Selasky Subject: git: b12212190261 - main - multimedia/webcamd: Silence prints from rc script when webcamd is disabled. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b12212190261b8694be357bf2f052effacc06cc0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/ports/commit/?id=b12212190261b8694be357bf2f052effacc06cc0 commit b12212190261b8694be357bf2f052effacc06cc0 Author: Hans Petter Selasky AuthorDate: 2021-10-12 08:38:15 +0000 Commit: Hans Petter Selasky CommitDate: 2021-10-12 08:46:46 +0000 multimedia/webcamd: Silence prints from rc script when webcamd is disabled. PR: 259062 Approved by: pi (implicit) --- multimedia/webcamd/Makefile | 2 +- multimedia/webcamd/files/webcamd.conf.in | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/multimedia/webcamd/Makefile b/multimedia/webcamd/Makefile index bd91ec70c2ec..05fd6fd0b512 100644 --- a/multimedia/webcamd/Makefile +++ b/multimedia/webcamd/Makefile @@ -3,7 +3,7 @@ PORTNAME= webcamd DISTVERSIONPREFIX= v DISTVERSION= 5.13.2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= hselasky@FreeBSD.org diff --git a/multimedia/webcamd/files/webcamd.conf.in b/multimedia/webcamd/files/webcamd.conf.in index df946c04da20..684415013cbe 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 "%%PREFIX%%/etc/rc.d/webcamd start $cdev"; + action "%%PREFIX%%/etc/rc.d/webcamd start $cdev 2>/dev/null"; }; # Vendor specific USB webcams and DVB devices. @@ -13,7 +13,7 @@ notify 100 { match "subsystem" "INTERFACE"; match "type" "ATTACH"; match "intclass" "0xff"; - action "%%PREFIX%%/etc/rc.d/webcamd start $cdev"; + action "%%PREFIX%%/etc/rc.d/webcamd start $cdev 2>/dev/null"; }; # Unspecified USB webcams and DVB devices. @@ -22,7 +22,7 @@ notify 100 { match "subsystem" "INTERFACE"; match "type" "ATTACH"; match "intclass" "0x00"; - action "%%PREFIX%%/etc/rc.d/webcamd start $cdev"; + action "%%PREFIX%%/etc/rc.d/webcamd start $cdev 2>/dev/null"; }; # Logitech webcams @@ -33,7 +33,7 @@ notify 100 { match "vendor" "0x046d"; match "intclass" "0x0a"; match "intsubclass" "0xff"; - action "%%PREFIX%%/etc/rc.d/webcamd start $cdev"; + action "%%PREFIX%%/etc/rc.d/webcamd start $cdev 2>/dev/null"; }; # Generic USB input devices. @@ -48,7 +48,7 @@ notify 100 { # and mouse # match "vendor" "0x056a"; - action "%%PREFIX%%/etc/rc.d/webcamd start $cdev $interface"; + action "%%PREFIX%%/etc/rc.d/webcamd start $cdev $interface 2>/dev/null"; }; # Elantech touchscreen @@ -60,7 +60,7 @@ notify 100 { match "vendor" "0x04f3"; match "product" "0x2071"; - action "%%PREFIX%%/etc/rc.d/webcamd start $cdev $interface"; + action "%%PREFIX%%/etc/rc.d/webcamd start $cdev $interface 2>/dev/null"; }; # Logitech gamepad @@ -72,6 +72,6 @@ notify 100 { match "vendor" "0x046d"; match "product" "0xc216|0xc219"; - action "%%PREFIX%%/etc/rc.d/webcamd start $cdev $interface"; + action "%%PREFIX%%/etc/rc.d/webcamd start $cdev $interface 2>/dev/null"; };