[pkgsrc/trunk]: pkgsrc/mail/qmail-run Use RCD_SCRIPTS_DIR in MESSAGE and READ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5910d2b5024b
branches:  trunk
changeset: 389708:5910d2b5024b
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Jan 07 04:29:46 2019 +0000

description:
Use RCD_SCRIPTS_DIR in MESSAGE and README.pkgsrc, and SUBST_VARS the latter.

diffstat:

 mail/qmail-run/MESSAGE             |   6 +++---
 mail/qmail-run/Makefile            |   6 +++---
 mail/qmail-run/files/README.pkgsrc |  26 +++++++++++++-------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diffs (120 lines):

diff -r 2b086b000b70 -r 5910d2b5024b mail/qmail-run/MESSAGE
--- a/mail/qmail-run/MESSAGE    Mon Jan 07 02:35:02 2019 +0000
+++ b/mail/qmail-run/MESSAGE    Mon Jan 07 04:29:46 2019 +0000
@@ -1,14 +1,14 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.15 2018/12/14 06:49:30 schmonz Exp $
+$NetBSD: MESSAGE,v 1.16 2019/01/07 04:29:46 schmonz Exp $
 
 Assuming NetBSD-style mailwrapper(8) and rc(8), to enable qmail for
 local and outbound delivery:
 
-- Run "/etc/rc.d/postfix stop" and set postfix=NO in /etc/rc.conf.
+- Run "${RCD_SCRIPTS_DIR}/postfix stop" and set postfix=NO in /etc/rc.conf.
 - Replace /etc/mailer.conf with ${PREFIX}/share/examples/qmail-run/mailer.conf.
 - Check configuration in ${PKG_SYSCONFDIR} (especially alias/.qmail-*).
 - Set qmailsend=YES and qmailqread=YES in /etc/rc.conf.
-- Run "/etc/rc.d/qmail start".
+- Run "${RCD_SCRIPTS_DIR}/qmail start".
 
 For SMTP, TLS, and more, please read
 ${PREFIX}/share/doc/qmail-run/README.pkgsrc.
diff -r 2b086b000b70 -r 5910d2b5024b mail/qmail-run/Makefile
--- a/mail/qmail-run/Makefile   Mon Jan 07 02:35:02 2019 +0000
+++ b/mail/qmail-run/Makefile   Mon Jan 07 04:29:46 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2018/12/30 19:09:04 schmonz Exp $
+# $NetBSD: Makefile,v 1.69 2019/01/07 04:29:46 schmonz Exp $
 #
 
 DISTNAME=              qmail-run-20181230
@@ -77,11 +77,11 @@
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
-SUBST_FILES.paths=     mailer.conf
+SUBST_FILES.paths=     mailer.conf README.pkgsrc
 SUBST_FILES.paths+=    greylisting-spp-wrapper ofmipd-with-user-cdb
 SUBST_FILES.paths+=    qmail-isspam-* qmail-procmail qmail-qread-client
 SUBST_FILES.paths+=    rcptchecks ofmipfilters smtpfilters smtpplugins tcprules-*
-SUBST_VARS.paths=      PKGNAME PKG_SYSCONFDIR PREFIX
+SUBST_VARS.paths=      PKGNAME PKG_SYSCONFDIR PREFIX RCD_SCRIPTS_DIR
 SUBST_VARS.paths+=     CAT ECHO GREP SED SH SORT TRUE
 
 post-extract:
diff -r 2b086b000b70 -r 5910d2b5024b mail/qmail-run/files/README.pkgsrc
--- a/mail/qmail-run/files/README.pkgsrc        Mon Jan 07 02:35:02 2019 +0000
+++ b/mail/qmail-run/files/README.pkgsrc        Mon Jan 07 04:29:46 2019 +0000
@@ -4,42 +4,42 @@
 Assuming NetBSD-style mailwrapper(8) and rc(8), to enable qmail for...
 
 Local and outbound delivery:
-- Run "/etc/rc.d/postfix stop" and set postfix=NO in /etc/rc.conf.
-- Replace /etc/mailer.conf with ${PREFIX}/share/examples/qmail-run/mailer.conf.
-- Check configuration in ${PKG_SYSCONFDIR} (especially alias/.qmail-*).
+- Run "@RCD_SCRIPTS_DIR@/postfix stop" and set postfix=NO in /etc/rc.conf.
+- Replace /etc/mailer.conf with @PREFIX@/share/examples/qmail-run/mailer.conf.
+- Check configuration in @PKG_SYSCONFDIR@ (especially alias/.qmail-*).
 - Set qmailsend=YES and qmailqread=YES in /etc/rc.conf.
-- Run "/etc/rc.d/qmail start".
+- Run "@RCD_SCRIPTS_DIR@/qmail start".
 
 Incoming SMTP on port 25:
 - Set qmailsmtpd=YES in /etc/rc.conf.
 - Add any qmail-rcptcheck programs to control/rcptchecks.
 - Add any qmail-qfilter programs to control/smtpfilters.
 - Add any qmail-spp programs (such as greylisting) to control/smtpplugins.
-- Run "/etc/rc.d/qmailsmtpd start".
+- Run "@RCD_SCRIPTS_DIR@/qmailsmtpd start".
 
 Greylisting:
 - Add any exempt recipient addresses to control/greylist/exemptrcpts.
 - Add any exempt recipient domains to control/greylist/exemptrcpthosts.
 - Tuples are (IP,sender,recipient). To effectively omit IP, add
   GL_WRAPPER_TCPREMOTEIP="127.127.127.127" to control/tcprules/smtp,
-  then run "/etc/rc.d/qmailsmtpd cdb".
+  then run "@RCD_SCRIPTS_DIR@/qmailsmtpd cdb".
 - Uncomment "greylisting-spp-wrapper" in control/smtpplugins.
 
 Authenticated message submission on port 587:
 - Set qmailofmipd=YES in /etc/rc.conf.
 - Add any qmail-qfilter programs to control/ofmipfilters.
-- Run "/etc/rc.d/qmailofmipd start".
+- Run "@RCD_SCRIPTS_DIR@/qmailofmipd start".
 
 POP3 (for Maildirs only) on port 110:
 - Set qmailpop3d=YES in /etc/rc.conf.
-- Run "/etc/rc.d/qmailpop3d start".
+- Run "@RCD_SCRIPTS_DIR@/qmailpop3d start".
 
 TLS encryption for SMTP, submission, POP3, and remote delivery:
 - Create cert and DH params (follow steps in `pkg_info -qD qmail`).
-- Run "/etc/rc.d/qmail restart".
+- Run "@RCD_SCRIPTS_DIR@/qmail restart".
 
 Sender Policy Framework:
-- Configure Sender Rewriting Scheme (see ${PREFIX}/share/doc/qmail/README.srs)
+- Configure Sender Rewriting Scheme (see @PREFIX@/share/doc/qmail/README.srs)
   so your auto-forwarded messages will reach servers that choose to
   enforce the forwarded domains' SPF policies.
 - Publish a DNS TXT record with your desired policy.
@@ -47,10 +47,10 @@
   accepted. To reject -- including rejecting auto-forwarded messages
   from servers that haven't configured SRS -- add
   SPP_SPF_RESULT_FAIL="E550 spf_smtp_msg" to control/tcprules/smtp,
-  then run "/etc/rc.d/qmailsmtpd cdb".
+  then run "@RCD_SCRIPTS_DIR@/qmailsmtpd cdb".
 - Messages that explicit-pass are not greylisted. To remove the
   exemption, remove SPP_SPF_RESULT_PASS="SGL_WHITELISTED=1" from
-  control/tcprules/smtp, then run "/etc/rc.d/qmailsmtpd cdb".
+  control/tcprules/smtp, then run "@RCD_SCRIPTS_DIR@/qmailsmtpd cdb".
 
 
  Getting help
@@ -97,5 +97,5 @@
 Instead, the qmail-run package:
 * Provides NetBSD-style rc.d scripts, including one very similar to qmailctl.
 * Sends log messages to syslog(3) by default.
-* Stores tcprules in ${PKG_SYSCONFDIR}/control/tcprules.
+* Stores tcprules in @PKG_SYSCONFDIR@/control/tcprules.
 * Uses mailwrapper(8) and mailer.conf(5).