From nobody Mon Oct 18 07:14:58 2021 X-Original-To: dev-commits-ports-all@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 6E4DB180D16A; Mon, 18 Oct 2021 07:15:01 +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 4HXp6W3M2Yz3DD5; Mon, 18 Oct 2021 07:14:59 +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 9A5651C80B; Mon, 18 Oct 2021 07:14:58 +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 19I7EwpW009368; Mon, 18 Oct 2021 07:14:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19I7EwkK009367; Mon, 18 Oct 2021 07:14:58 GMT (envelope-from git) Date: Mon, 18 Oct 2021 07:14:58 GMT Message-Id: <202110180714.19I7EwkK009367@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 086b6c38dec8 - main - net/quoted: Fix syntax error of rc script List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 086b6c38dec852b483d48ceabd5a9d523f58bf82 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=086b6c38dec852b483d48ceabd5a9d523f58bf82 commit 086b6c38dec852b483d48ceabd5a9d523f58bf82 Author: hex7c@libpluto.net AuthorDate: 2021-10-18 00:22:49 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-10-18 07:14:10 +0000 net/quoted: Fix syntax error of rc script * Switch to use @rmtry in pkg-plist * Pet portclippy PR: 259015 Approved by: maintainer, ygy (mentor) Differential Revision: https://reviews.freebsd.org/D32541 --- net/quoted/Makefile | 6 +++--- net/quoted/files/quoted.in | 2 +- net/quoted/pkg-plist | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/quoted/Makefile b/net/quoted/Makefile index 88ebbfe4a22e..650fe7333f61 100644 --- a/net/quoted/Makefile +++ b/net/quoted/Makefile @@ -2,16 +2,16 @@ PORTNAME= quoted PORTVERSION= 1.01 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://www.mrp3.com/webutil/ MAINTAINER= bobf@mrp3.com COMMENT= Easily configured QOTD daemon with over 130 good quality quotes -GNU_CONFIGURE= yes USES= gmake +USE_RC_SUBR= ${PORTNAME} -USE_RC_SUBR= ${PORTNAME} +GNU_CONFIGURE= yes .include diff --git a/net/quoted/files/quoted.in b/net/quoted/files/quoted.in index d80349de4092..5f04ea75fcc8 100644 --- a/net/quoted/files/quoted.in +++ b/net/quoted/files/quoted.in @@ -29,7 +29,7 @@ quoted_start() if [ -e ${required_files} ] ; then ${command_plus_args} sleep 1 - pid=`ps ax | awk '{if (match($5, ".*/quoted$") || $5 == "quoted") print $1}` + pid=`ps ax | awk '{if (match($5, ".*/quoted$") || $5 == "quoted") print $1}'` if [ -z ${pid} ]; then echo "${name} failed to start" return 1 diff --git a/net/quoted/pkg-plist b/net/quoted/pkg-plist index 3dc07c42afcc..a60869bda19e 100644 --- a/net/quoted/pkg-plist +++ b/net/quoted/pkg-plist @@ -1,4 +1,4 @@ -@unexec rm -f /var/run/quoted.pid +@rmtry /var/run/quoted.pid bin/quoted etc/quotes man/man1/quoted.1.gz