[pkgsrc/trunk]: pkgsrc/mail/qmail-run If any of our several rcvars aren't YES...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b4b53547a439
branches:  trunk
changeset: 440264:b4b53547a439
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Oct 05 12:17:20 2020 +0000

description:
If any of our several rcvars aren't YES, that's fine: don't exit
nonzero. Bump version.

While here, document in qmail-qread-client that its rc.conf vars are
shared with the qmailqread service.

diffstat:

 mail/qmail-run/Makefile                    |   4 ++--
 mail/qmail-run/files/qmail-qread-client.sh |  13 +++++++++----
 mail/qmail-run/files/qmail.sh              |   6 ++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diffs (65 lines):

diff -r b14480969374 -r b4b53547a439 mail/qmail-run/Makefile
--- a/mail/qmail-run/Makefile   Mon Oct 05 12:10:05 2020 +0000
+++ b/mail/qmail-run/Makefile   Mon Oct 05 12:17:20 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2020/05/19 19:45:58 schmonz Exp $
+# $NetBSD: Makefile,v 1.76 2020/10/05 12:17:20 schmonz Exp $
 #
 
-DISTNAME=              qmail-run-20200519
+DISTNAME=              qmail-run-20201005
 CATEGORIES=            mail
 MASTER_SITES=          # empty
 DISTFILES=             # empty
diff -r b14480969374 -r b4b53547a439 mail/qmail-run/files/qmail-qread-client.sh
--- a/mail/qmail-run/files/qmail-qread-client.sh        Mon Oct 05 12:10:05 2020 +0000
+++ b/mail/qmail-run/files/qmail-qread-client.sh        Mon Oct 05 12:17:20 2020 +0000
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: qmail-qread-client.sh,v 1.5 2017/04/11 14:04:37 schmonz Exp $
+# $NetBSD: qmail-qread-client.sh,v 1.6 2020/10/05 12:17:20 schmonz Exp $
 #
 # @PKGNAME@ client program to allow local non-root users to see
 # the queue. Requires that the corresponding server program be running.
@@ -9,10 +9,15 @@
 
 if [ -f /etc/rc.subr ]; then
        . /etc/rc.subr
+fi
+
+# User-settable rc.conf variables and their default values
+# (shared with the qmailqread service):
+: ${qmailqread_tcphost:="127.0.0.1"}
+: ${qmailqread_tcpport:="20025"}
+
+if [ -f /etc/rc.subr ]; then
        load_rc_config qmailqread
 fi
 
-: ${qmailqread_tcphost:="127.0.0.1"}
-: ${qmailqread_tcpport:="20025"}
-
 exec @PREFIX@/bin/tcpclient -RHl0 -- ${qmailqread_tcphost} ${qmailqread_tcpport} @SH@ -c 'exec @CAT@ <&6'
diff -r b14480969374 -r b4b53547a439 mail/qmail-run/files/qmail.sh
--- a/mail/qmail-run/files/qmail.sh     Mon Oct 05 12:10:05 2020 +0000
+++ b/mail/qmail-run/files/qmail.sh     Mon Oct 05 12:17:20 2020 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmail.sh,v 1.9 2018/12/30 19:09:05 schmonz Exp $
+# $NetBSD: qmail.sh,v 1.10 2020/10/05 12:17:20 schmonz Exp $
 #
 # @PKGNAME@ master script for administrators to control qmail
 # services. Usage resembles the qmailctl script from "Life with qmail".
@@ -36,7 +36,9 @@
        for service in "$@"; do
                if [ -f /etc/rc.subr ]; then
                        load_rc_config $service
-                       checkyesno $service && $rcd_dir/${service} $rc_arg
+                       if checkyesno $service; then
+                               $rcd_dir/${service} $rc_arg
+                       fi
                else
                        $rcd_dir/${service} $rc_arg
                fi