git: 086b6c38dec8 - main - net/quoted: Fix syntax error of rc script

From: Yasuhiro Kimura <yasu_at_FreeBSD.org>
Date: Mon, 18 Oct 2021 07:14:58 UTC
The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=086b6c38dec852b483d48ceabd5a9d523f58bf82

commit 086b6c38dec852b483d48ceabd5a9d523f58bf82
Author:     hex7c@libpluto.net <hex7c@libpluto.net>
AuthorDate: 2021-10-18 00:22:49 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
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 <bsd.port.mk>
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