[pkgsrc/trunk]: pkgsrc/mail/qmail-run Catch up to djbdns-run:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d2b3422540cc
branches:  trunk
changeset: 364298:d2b3422540cc
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Fri Jun 23 15:49:03 2017 +0000

description:
Catch up to djbdns-run:

- Add "reload" as a synonym for "cdb" in qmail{ofmip,pop3,smtp}d.sh
- Shorten tcprules invocations

Bump version.

diffstat:

 mail/qmail-run/Makefile             |   4 ++--
 mail/qmail-run/files/qmailofmipd.sh |  22 ++++++++++++----------
 mail/qmail-run/files/qmailpop3d.sh  |  10 ++++++----
 mail/qmail-run/files/qmailsmtpd.sh  |  10 ++++++----
 4 files changed, 26 insertions(+), 20 deletions(-)

diffs (157 lines):

diff -r 1b3b0c8e901a -r d2b3422540cc mail/qmail-run/Makefile
--- a/mail/qmail-run/Makefile   Fri Jun 23 15:44:06 2017 +0000
+++ b/mail/qmail-run/Makefile   Fri Jun 23 15:49:03 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2017/06/17 05:58:39 schmonz Exp $
+# $NetBSD: Makefile,v 1.38 2017/06/23 15:49:03 schmonz Exp $
 #
 
-DISTNAME=              qmail-run-20170617
+DISTNAME=              qmail-run-20170623
 CATEGORIES=            mail
 MASTER_SITES=          # empty
 DISTFILES=             # empty
diff -r 1b3b0c8e901a -r d2b3422540cc mail/qmail-run/files/qmailofmipd.sh
--- a/mail/qmail-run/files/qmailofmipd.sh       Fri Jun 23 15:44:06 2017 +0000
+++ b/mail/qmail-run/files/qmailofmipd.sh       Fri Jun 23 15:49:03 2017 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailofmipd.sh,v 1.5 2017/06/17 05:58:39 schmonz Exp $
+# $NetBSD: qmailofmipd.sh,v 1.6 2017/06/23 15:49:03 schmonz Exp $
 #
 # @PKGNAME@ script to control ofmipd (SMTP submission service).
 #
@@ -36,11 +36,12 @@
 command="${qmailofmipd_tcpserver}"
 procname=${name}
 start_precmd="qmailofmipd_precmd"
-extra_commands="stat pause cont cdb"
+extra_commands="stat pause cont cdb reload"
 stat_cmd="qmailofmipd_stat"
 pause_cmd="qmailofmipd_pause"
 cont_cmd="qmailofmipd_cont"
 cdb_cmd="qmailofmipd_cdb"
+reload_cmd=${cdb_cmd}
 
 qmailofmipd_precmd()
 {
@@ -72,35 +73,36 @@
 qmailofmipd_pause()
 {
        if ! statusmsg=`run_rc_command status`; then
-               echo $statusmsg
+               @ECHO@ $statusmsg
                return 1
        fi
-       echo "Pausing ${name}."
+       @ECHO@ "Pausing ${name}."
        kill -STOP $rc_pid
 }
 
 qmailofmipd_cont()
 {
        if ! statusmsg=`run_rc_command status`; then
-               echo $statusmsg
+               @ECHO@ $statusmsg
                return 1
        fi
-       echo "Continuing ${name}."
+       @ECHO@ "Continuing ${name}."
        kill -CONT $rc_pid
 }
 
 qmailofmipd_cdb()
 {
-       echo "Reloading @PKG_SYSCONFDIR@/tcp.ofmip."
-       @PREFIX@/bin/tcprules @PKG_SYSCONFDIR@/tcp.ofmip.cdb @PKG_SYSCONFDIR@/tcp.ofmip.tmp < @PKG_SYSCONFDIR@/tcp.ofmip
-       /bin/chmod 644 @PKG_SYSCONFDIR@/tcp.ofmip.cdb
+       @ECHO@ "Reloading @PKG_SYSCONFDIR@/tcp.ofmip."
+       cd @PKG_SYSCONFDIR@
+       @PREFIX@/bin/tcprules tcp.ofmip.cdb tcp.ofmip.tmp < tcp.ofmip
+       @CHMOD@ 644 tcp.ofmip.cdb
 }
 
 if [ -f /etc/rc.subr ]; then
        load_rc_config $name
        run_rc_command "$1"
 else
-       echo -n " ${name}"
+       @ECHO_N@ " ${name}"
        qmailofmipd_precmd
        eval ${command} ${qmailofmipd_flags} ${command_args}
 fi
diff -r 1b3b0c8e901a -r d2b3422540cc mail/qmail-run/files/qmailpop3d.sh
--- a/mail/qmail-run/files/qmailpop3d.sh        Fri Jun 23 15:44:06 2017 +0000
+++ b/mail/qmail-run/files/qmailpop3d.sh        Fri Jun 23 15:49:03 2017 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailpop3d.sh,v 1.14 2017/06/17 05:58:39 schmonz Exp $
+# $NetBSD: qmailpop3d.sh,v 1.15 2017/06/23 15:49:03 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
 #
@@ -36,11 +36,12 @@
 command="${qmailpop3d_tcpserver}"
 procname=${name}
 start_precmd="qmailpop3d_precmd"
-extra_commands="stat pause cont cdb"
+extra_commands="stat pause cont cdb reload"
 stat_cmd="qmailpop3d_stat"
 pause_cmd="qmailpop3d_pause"
 cont_cmd="qmailpop3d_cont"
 cdb_cmd="qmailpop3d_cdb"
+reload_cmd=${cdb_cmd}
 
 qmailpop3d_precmd()
 {
@@ -92,8 +93,9 @@
 qmailpop3d_cdb()
 {
        @ECHO@ "Reloading @PKG_SYSCONFDIR@/tcp.pop3."
-       @PREFIX@/bin/tcprules @PKG_SYSCONFDIR@/tcp.pop3.cdb @PKG_SYSCONFDIR@/tcp.pop3.tmp < @PKG_SYSCONFDIR@/tcp.pop3
-       @CHMOD@ 644 @PKG_SYSCONFDIR@/tcp.pop3.cdb
+       cd @PKG_SYSCONFDIR@
+       @PREFIX@/bin/tcprules tcp.pop3.cdb tcp.pop3.tmp < tcp.pop3
+       @CHMOD@ 644 tcp.pop3.cdb
 }
 
 if [ -f /etc/rc.subr ]; then
diff -r 1b3b0c8e901a -r d2b3422540cc mail/qmail-run/files/qmailsmtpd.sh
--- a/mail/qmail-run/files/qmailsmtpd.sh        Fri Jun 23 15:44:06 2017 +0000
+++ b/mail/qmail-run/files/qmailsmtpd.sh        Fri Jun 23 15:49:03 2017 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsmtpd.sh,v 1.14 2017/06/17 05:58:39 schmonz Exp $
+# $NetBSD: qmailsmtpd.sh,v 1.15 2017/06/23 15:49:03 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-smtpd (SMTP service).
 #
@@ -36,11 +36,12 @@
 command="${qmailsmtpd_tcpserver}"
 procname=${name}
 start_precmd="qmailsmtpd_precmd"
-extra_commands="stat pause cont cdb"
+extra_commands="stat pause cont cdb reload"
 stat_cmd="qmailsmtpd_stat"
 pause_cmd="qmailsmtpd_pause"
 cont_cmd="qmailsmtpd_cont"
 cdb_cmd="qmailsmtpd_cdb"
+reload_cmd=${cdb_cmd}
 
 qmailsmtpd_precmd()
 {
@@ -92,8 +93,9 @@
 qmailsmtpd_cdb()
 {
        @ECHO@ "Reloading @PKG_SYSCONFDIR@/tcp.smtp."
-       @PREFIX@/bin/tcprules @PKG_SYSCONFDIR@/tcp.smtp.cdb @PKG_SYSCONFDIR@/tcp.smtp.tmp < @PKG_SYSCONFDIR@/tcp.smtp
-       @CHMOD@ 644 @PKG_SYSCONFDIR@/tcp.smtp.cdb
+       cd @PKG_SYSCONFDIR@
+       @PREFIX@/bin/tcprules tcp.smtp.cdb tcp.smtp.tmp < tcp.smtp
+       @CHMOD@ 644 tcp.smtp.cdb
 }
 
 if [ -f /etc/rc.subr ]; then