Note ${PKGNAME} in installed scripts for support purposes. Add a

missing RCS Id. Add qmailsmtpd_postsmtpd, useful for SMTP AUTH.
Bump version.

7 files changed, 23 insertions, 18 deletions

diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index 1e26d57e69e..2131e042037 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/08/02 03:59:21 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2004/08/03 08:59:24 schmonz Exp $
 #
 
-DISTNAME=		qmail-run-20040801
+DISTNAME=		qmail-run-20040803
 CATEGORIES=		mail
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -26,6 +26,7 @@ NO_CHECKSUM=		# defined
 USE_PKGINSTALL=		yes
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 FILES_SUBST+=		QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA}
+FILES_SUBST+=		PKGNAME=${PKGNAME}
 RCD_SCRIPTS=		qmail qmailqread qmailpop3d qmailsend qmailsmtpd
 
 INSTALLATION_DIRS=	bin share/doc/qmail-run share/examples/qmail-run
diff --git a/mail/qmail-run/files/qmail-qread-client.sh b/mail/qmail-run/files/qmail-qread-client.sh
index 1a175d07787..64fdcc88f41 100644
--- a/mail/qmail-run/files/qmail-qread-client.sh
+++ b/mail/qmail-run/files/qmail-qread-client.sh
@@ -1,7 +1,10 @@
 #!@SH@
 #
-# Client program to allow local non-root users to see the queue.
-# Requires that the corresponding server program be running. From
-# Steinar Haug.
+# $NetBSD: qmail-qread-client.sh,v 1.2 2004/08/03 08:59:24 schmonz Exp $
+#
+# @PKGNAME@ client program to allow local non-root users to see
+# the queue. Requires that the corresponding server program be running.
+# From Steinar Haug.
+#
 
 exec @LOCALBASE@/bin/tcpclient -RHl0 -- 127.0.0.1 20025 @SH@ -c 'exec @CAT@ <&6'
diff --git a/mail/qmail-run/files/qmail.sh b/mail/qmail-run/files/qmail.sh
index 711e1aff5f5..aa411838e08 100644
--- a/mail/qmail-run/files/qmail.sh
+++ b/mail/qmail-run/files/qmail.sh
@@ -1,9 +1,9 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmail.sh,v 1.1.1.1 2004/08/02 03:59:22 schmonz Exp $
+# $NetBSD: qmail.sh,v 1.2 2004/08/03 08:59:24 schmonz Exp $
 #
-# Master script for administrators to control qmail services.
-# Usage resembles the qmailctl script from "Life with qmail".
+# @PKGNAME@ master script for administrators to control qmail
+# services. Usage resembles the qmailctl script from "Life with qmail".
 #
 
 # KEYWORD: nostart
diff --git a/mail/qmail-run/files/qmailpop3d.sh b/mail/qmail-run/files/qmailpop3d.sh
index 7b0074df076..6460961a68b 100644
--- a/mail/qmail-run/files/qmailpop3d.sh
+++ b/mail/qmail-run/files/qmailpop3d.sh
@@ -1,8 +1,8 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailpop3d.sh,v 1.1.1.1 2004/08/02 03:59:21 schmonz Exp $
+# $NetBSD: qmailpop3d.sh,v 1.2 2004/08/03 08:59:24 schmonz Exp $
 #
-# Script to control qmail-pop3d (POP3 server for Maildirs).
+# @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
 #
 
 # PROVIDE: qmailpop3d mail
diff --git a/mail/qmail-run/files/qmailqread.sh b/mail/qmail-run/files/qmailqread.sh
index 81007c75319..37d984196d7 100644
--- a/mail/qmail-run/files/qmailqread.sh
+++ b/mail/qmail-run/files/qmailqread.sh
@@ -1,9 +1,9 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailqread.sh,v 1.1.1.1 2004/08/02 03:59:21 schmonz Exp $
+# $NetBSD: qmailqread.sh,v 1.2 2004/08/03 08:59:24 schmonz Exp $
 #
-# Script to control a service providing local non-root users access
-# to see the queue. Adapted from a script by Steinar Haug.
+# @PKGNAME@ script to control a service providing local non-root
+# users access to see the queue. Adapted from a script by Steinar Haug.
 #
 
 # PROVIDE: qmailqread mail
diff --git a/mail/qmail-run/files/qmailsend.sh b/mail/qmail-run/files/qmailsend.sh
index e696c913bee..2bd73865273 100644
--- a/mail/qmail-run/files/qmailsend.sh
+++ b/mail/qmail-run/files/qmailsend.sh
@@ -1,8 +1,8 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsend.sh,v 1.1.1.1 2004/08/02 03:59:21 schmonz Exp $
+# $NetBSD: qmailsend.sh,v 1.2 2004/08/03 08:59:24 schmonz Exp $
 #
-# Script to control qmail-send (local and outgoing mail).
+# @PKGNAME@ script to control qmail-send (local and outgoing mail).
 #
 
 # PROVIDE: qmailsend mail
diff --git a/mail/qmail-run/files/qmailsmtpd.sh b/mail/qmail-run/files/qmailsmtpd.sh
index 7c47c0e81c6..18cdb146c38 100644
--- a/mail/qmail-run/files/qmailsmtpd.sh
+++ b/mail/qmail-run/files/qmailsmtpd.sh
@@ -1,8 +1,8 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsmtpd.sh,v 1.1.1.1 2004/08/02 03:59:21 schmonz Exp $
+# $NetBSD: qmailsmtpd.sh,v 1.2 2004/08/03 08:59:24 schmonz Exp $
 #
-# Script to control qmail-smtpd (SMTP service).
+# @PKGNAME@ script to control qmail-smtpd (SMTP service).
 #
 
 # PROVIDE: qmailsmtpd mail
@@ -32,6 +32,7 @@ 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()
@@ -39,7 +40,7 @@ qmailsmtpd_precmd()
 	# tcpserver(1) is akin to inetd(8), but runs one service per process.
 	# We want to signal only the tcpserver process responsible for SMTP
 	# service. Use argv0(1) to set procname to "qmailsmtpd".
-	command="@SETENV@ - ${qmailsmtpd_postenv} @LOCALBASE@/bin/softlimit -m ${qmailsmtpd_datalimit} ${qmailsmtpd_pretcpserver} @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} ${qmailsmtpd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.smtp.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyincoming` -u `@ID@ -u qmaild` -g `@ID@ -g qmaild` ${qmailsmtpd_tcphost} ${qmailsmtpd_tcpport} ${qmailsmtpd_presmtpd} @LOCALBASE@/bin/qmail-smtpd 2>&1 | ${qmailsmtpd_logcmd}"
+	command="@SETENV@ - ${qmailsmtpd_postenv} @LOCALBASE@/bin/softlimit -m ${qmailsmtpd_datalimit} ${qmailsmtpd_pretcpserver} @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} ${qmailsmtpd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.smtp.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyincoming` -u `@ID@ -u qmaild` -g `@ID@ -g qmaild` ${qmailsmtpd_tcphost} ${qmailsmtpd_tcpport} ${qmailsmtpd_presmtpd} @LOCALBASE@/bin/qmail-smtpd ${qmailsmtpd_postsmtpd} 2>&1 | ${qmailsmtpd_logcmd}"
 	command_args="&"
 	rc_flags=""
 }