Move "User-settable rc.conf variables and their default values"

section above the inclusion of rc.subr, and express the default
assignments more succinctly (from Todd Vierling). Bump version.

5 files changed, 45 insertions, 42 deletions

diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index d7ad237a7b0..a8ae208cf8e 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/12/28 02:47:45 reed Exp $
+# $NetBSD: Makefile,v 1.7 2004/12/29 16:18:41 schmonz Exp $
 #
 
-DISTNAME=		qmail-run-20040823
-PKGREVISION=		1
+DISTNAME=		qmail-run-20041229
 CATEGORIES=		mail
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/mail/qmail-run/files/qmailpop3d.sh b/mail/qmail-run/files/qmailpop3d.sh
index 9506cf0b623..21ac183a024 100644
--- a/mail/qmail-run/files/qmailpop3d.sh
+++ b/mail/qmail-run/files/qmailpop3d.sh
@@ -1,17 +1,30 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailpop3d.sh,v 1.3 2004/08/23 03:47:48 schmonz Exp $
+# $NetBSD: qmailpop3d.sh,v 1.4 2004/12/29 16:18:41 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
 #
 
 # PROVIDE: qmailpop3d mail
 
+name="qmailpop3d"
+
+# User-settable rc.conf variables and their default values:
+: ${qmailpop3d_postenv:=""}
+: ${qmailpop3d_tcpflags:="-v -R -H -l 0"}
+: ${qmailpop3d_tcphost:="0"}
+: ${qmailpop3d_tcpport:="110"}
+: ${qmailpop3d_datalimit:="2000000"}
+: ${qmailpop3d_pretcpserver:=""}
+: ${qmailpop3d_prepop3d:=""}
+: ${qmailpop3d_checkpassword:="@LOCALBASE@/bin/checkpassword"}
+: ${qmailpop3d_maildirname:="Maildir"}
+: ${qmailpop3d_logcmd:="@LOCALBASE@/bin/setuidgid qmaill @LOCALBASE@/bin/splogger nb${name}"}
+
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 
-name="qmailpop3d"
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/control/me"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/concurrencypop3"
@@ -25,18 +38,6 @@ pause_cmd="qmailpop3d_pause"
 cont_cmd="qmailpop3d_cont"
 cdb_cmd="qmailpop3d_cdb"
 
-# User-settable rc.conf variables and their default values:
-qmailpop3d_postenv=${qmailpop3d_postenv-""}
-qmailpop3d_tcpflags=${qmailpop3d_tcpflags-"-v -R -H -l 0"}
-qmailpop3d_tcphost=${qmailpop3d_tcphost-"0"}
-qmailpop3d_tcpport=${qmailpop3d_tcpport-"110"}
-qmailpop3d_datalimit=${qmailpop3d_datalimit-"2000000"}
-qmailpop3d_pretcpserver=${qmailpop3d_pretcpserver-""}
-qmailpop3d_prepop3d=${qmailpop3d_prepop3d-""}
-qmailpop3d_checkpassword=${qmailpop3d_checkpassword-"@LOCALBASE@/bin/checkpassword"}
-qmailpop3d_maildirname=${qmailpop3d_maildirname-"Maildir"}
-qmailpop3d_logcmd=${qmailpop3d_logcmd-"@LOCALBASE@/bin/setuidgid qmaill @LOCALBASE@/bin/splogger nb${name}"}
-
 qmailpop3d_precmd()
 {
 	# tcpserver(1) is akin to inetd(8), but runs one service per process.
diff --git a/mail/qmail-run/files/qmailqread.sh b/mail/qmail-run/files/qmailqread.sh
index 17cca739097..9e3908e64f3 100644
--- a/mail/qmail-run/files/qmailqread.sh
+++ b/mail/qmail-run/files/qmailqread.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailqread.sh,v 1.3 2004/08/23 03:47:48 schmonz Exp $
+# $NetBSD: qmailqread.sh,v 1.4 2004/12/29 16:18:41 schmonz Exp $
 #
 # @PKGNAME@ script to control a service providing local non-root
 # users access to see the queue. Adapted from a script by Steinar Haug.
@@ -9,19 +9,20 @@
 # PROVIDE: qmailqread mail
 # REQUIRE: qmailsend
 
+name="qmailqread"
+
+# User-settable rc.conf variables and their default values:
+: ${qmailqread_logcmd:="@LOCALBASE@/bin/setuidgid qmaill @LOCALBASE@/bin/splogger nb${name}"}
+
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 
-name="qmailqread"
 rcvar=${name}
 command="@LOCALBASE@/bin/tcpserver"
 procname=${name}
 start_precmd="qmailqread_precmd"
 
-# User-settable rc.conf variables and their default values:
-qmailqread_logcmd=${qmailqread_logcmd-"@LOCALBASE@/bin/setuidgid qmaill @LOCALBASE@/bin/splogger nb${name}"}
-
 qmailqread_precmd()
 {
 	command="@SETENV@ - @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} -R -1 -u `@ID@ -u qmails` -g `@ID@ -g qmails` 127.0.0.1 20025 @LOCALBASE@/bin/qmail-qread 2>&1 | ${qmailqread_logcmd}"
diff --git a/mail/qmail-run/files/qmailsend.sh b/mail/qmail-run/files/qmailsend.sh
index 6b0be89ac75..a12939bbdb3 100644
--- a/mail/qmail-run/files/qmailsend.sh
+++ b/mail/qmail-run/files/qmailsend.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsend.sh,v 1.3 2004/08/23 03:47:48 schmonz Exp $
+# $NetBSD: qmailsend.sh,v 1.4 2004/12/29 16:18:41 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-send (local and outgoing mail).
 #
@@ -9,11 +9,17 @@
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
+name="qmailsend"
+
+# User-settable rc.conf variables and their default values:
+: ${qmailsend_postenv:="PATH=@LOCALBASE@/bin:$PATH"}
+: ${qmailsend_defaultdelivery:="`@HEAD@ -1 @PKG_SYSCONFDIR@/control/defaultdelivery`"}
+: ${qmailsend_logcmd:="@LOCALBASE@/bin/splogger nb${name}"}
+
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 
-name="qmailsend"
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/control/defaultdelivery"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/me"
@@ -29,11 +35,6 @@ alrm_cmd="qmailsend_doqueue"
 flush_cmd="qmailsend_doqueue"
 hup_cmd="qmailsend_hup"
 
-# User-settable rc.conf variables and their default values:
-qmailsend_postenv=${qmailsend_postenv-"PATH=@LOCALBASE@/bin:$PATH"}
-qmailsend_defaultdelivery=${qmailsend_defaultdelivery-"`@HEAD@ -1 @PKG_SYSCONFDIR@/control/defaultdelivery`"}
-qmailsend_logcmd=${qmailsend_logcmd-"@LOCALBASE@/bin/splogger nb${name}"}
-
 qmailsend_precmd()
 {
 	# qmail-start(8) starts the various qmail processes, then exits.
diff --git a/mail/qmail-run/files/qmailsmtpd.sh b/mail/qmail-run/files/qmailsmtpd.sh
index aafb26603b4..d913de3b819 100644
--- a/mail/qmail-run/files/qmailsmtpd.sh
+++ b/mail/qmail-run/files/qmailsmtpd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsmtpd.sh,v 1.3 2004/08/23 03:47:48 schmonz Exp $
+# $NetBSD: qmailsmtpd.sh,v 1.4 2004/12/29 16:18:41 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-smtpd (SMTP service).
 #
@@ -8,11 +8,23 @@
 # PROVIDE: qmailsmtpd mail
 # REQUIRE: qmailsend
 
+name="qmailsmtpd"
+
+# User-settable rc.conf variables and their default values:
+: ${qmailsmtpd_postenv:="QMAILQUEUE=@LOCALBASE@/bin/qmail-queue"}
+: ${qmailsmtpd_tcpflags:="-v -R -l 0"}
+: ${qmailsmtpd_tcphost:="0"}
+: ${qmailsmtpd_tcpport:="25"}
+: ${qmailsmtpd_datalimit:="2000000"}
+: ${qmailsmtpd_pretcpserver:=""}
+: ${qmailsmtpd_presmtpd:=""}
+: ${qmailsmtpd_postsmtpd:=""}
+: ${qmailsmtpd_logcmd:="@LOCALBASE@/bin/setuidgid qmaill @LOCALBASE@/bin/splogger nb${name}"}
+
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 
-name="qmailsmtpd"
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/control/concurrencyincoming"
 required_files="${required_files} @PKG_SYSCONFDIR@/tcp.smtp.cdb"
@@ -26,17 +38,6 @@ pause_cmd="qmailsmtpd_pause"
 cont_cmd="qmailsmtpd_cont"
 cdb_cmd="qmailsmtpd_cdb"
 
-# User-settable rc.conf variables and their default values:
-qmailsmtpd_postenv=${qmailsmtpd_postenv-"QMAILQUEUE=@LOCALBASE@/bin/qmail-queue"}
-qmailsmtpd_tcpflags=${qmailsmtpd_tcpflags-"-v -R -l 0"}
-qmailsmtpd_tcphost=${qmailsmtpd_tcphost-"0"}
-qmailsmtpd_tcpport=${qmailsmtpd_tcpport-"25"}
-qmailsmtpd_datalimit=${qmailsmtpd_datalimit-"2000000"}
-qmailsmtpd_pretcpserver=${qmailsmtpd_pretcpserver-""}
-qmailsmtpd_presmtpd=${qmailsmtpd_presmtpd-""}
-qmailsmtpd_postsmtpd=${qmailsmtpd_postsmtpd-""}
-qmailsmtpd_logcmd=${qmailsmtpd_logcmd-"@LOCALBASE@/bin/setuidgid qmaill @LOCALBASE@/bin/splogger nb${name}"}
-
 qmailsmtpd_precmd()
 {
 	# tcpserver(1) is akin to inetd(8), but runs one service per process.