Remove add-on scripts and config files from the qmail and netqmail

packages. They now simply compile and install qmail and its
prerequisites. (The add-on scripts and config files will be revivified
as a separate qmail-run package. Thus, QMAIL_AUTOCONFIG is no longer
needed.)

The user is notified at install time that one popular, well-regarded
way to enable qmail is to follow the directions in "Life with
qmail", and that another way is to install the qmail-run package.

These changes, based on discussion with Charles Cazabon, are intended
to make life easier for the helpful people on the qmail mailing
list by clearly marking custom add-ons as such.

Other changes:

Since netqmail is a tarball containing the qmail tarball plus the
netqmail bits, we can use it for both packages and share more logic
between the two packages: MASTER_SITES, DISTINFO_FILE, WRKSRC, and
the post-extract target.

Now that there's one place to put the distinfo, add Eben Pratt's
simple patch to build and install on Mac OS X 10.3 (the patch is
not applied on other OSes).

Bump PKGREVISION of both packages.

13 files changed, 46 insertions, 466 deletions

diff --git a/mail/qmail/INSTALL b/mail/qmail/INSTALL
index a5589944d84..2e7b3ca67d3 100644
--- a/mail/qmail/INSTALL
+++ b/mail/qmail/INSTALL
@@ -1,10 +1,8 @@
-# $NetBSD: INSTALL,v 1.1 2004/07/21 22:35:59 schmonz Exp $
+# $NetBSD: INSTALL,v 1.2 2004/08/02 03:57:17 schmonz Exp $
 
 DOCDIR=@DOCDIR@
 EGDIR=@EGDIR@
-SHAREDIR=@SHAREDIR@
 QMAILDIR=@QMAILDIR@
-QMAIL_AUTOCONFIG=@QMAIL_AUTOCONFIG@
 QMAIL_QUEUE_DIR=@QMAIL_QUEUE_DIR@
 QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@
 
@@ -53,43 +51,12 @@ EOF
 	;;
 
 POST-INSTALL)
-	if [ "${QMAIL_AUTOCONFIG}" = YES ]; then
-
-		cd ${SHAREDIR}/setup && ./config-fast `./hostname`
-
-		cd ${PKG_SYSCONFDIR}/alias && ${TOUCH} .qmail-postmaster .qmail-mailer-daemon .qmail-root
-
-		if ! [ -s ${PKG_SYSCONFDIR}/control/concurrencyincoming ]; then
-			${ECHO} 20 > ${PKG_SYSCONFDIR}/control/concurrencyincoming
-			${CHMOD} 644 ${PKG_SYSCONFDIR}/control/concurrencyincoming
-		fi
-
-		if ! [ -s ${PKG_SYSCONFDIR}/control/defaultdelivery ]; then
-			${ECHO} ./Mailbox > ${PKG_SYSCONFDIR}/control/defaultdelivery
-			${CHMOD} 644 ${PKG_SYSCONFDIR}/control/defaultdelivery
-		fi
-
-		pop3rule=':allow'
-		smtprule='127.:allow,RELAYCLIENT=""'
-		for i in pop3 smtp; do
-			if ! [ -s ${PKG_SYSCONFDIR}/tcp.${i} ]; then
-				eval ${ECHO} \"\$${i}rule\" > ${PKG_SYSCONFDIR}/tcp.${i}
-			fi
-			${CHMOD} 644 ${PKG_SYSCONFDIR}/tcp.${i}
-			${LOCALBASE}/bin/tcprules ${PKG_SYSCONFDIR}/tcp.${i}.cdb ${PKG_SYSCONFDIR}/tcp.${i}.tmp < ${PKG_SYSCONFDIR}/tcp.${i}
-			${CHMOD} 644 ${PKG_SYSCONFDIR}/tcp.${i}.cdb
-		done
-
-		if ! [ -z ${QMAIL_QUEUE_EXTRA} ]; then
-			${ECHO} '#' >> ${PKG_SYSCONFDIR}/alias/.qmail-${QMAIL_QUEUE_EXTRA}
-			${CHMOD} 644 ${PKG_SYSCONFDIR}/alias/.qmail-${QMAIL_QUEUE_EXTRA}
-		fi
-
-	else
+	if ! [ -z ${QMAIL_QUEUE_EXTRA} ]; then
 		${CAT} <<EOF
 ===========================================================================
 
-You may need to create some config files manually.
+NOTE: Before using qmail, create a .qmail-${QMAIL_QUEUE_EXTRA} in
+${QMAILDIR}/alias that meets the QUEUE_EXTRA requirements.
 
 ===========================================================================
 EOF
diff --git a/mail/qmail/MESSAGE b/mail/qmail/MESSAGE
index 97457900b7a..4f792b9ff6f 100644
--- a/mail/qmail/MESSAGE
+++ b/mail/qmail/MESSAGE
@@ -1,23 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.8 2004/07/21 22:35:59 schmonz Exp $
+$NetBSD: MESSAGE,v 1.9 2004/08/02 03:57:17 schmonz Exp $
 
-To activate ${PKGBASE} for local and outgoing deliveries:
-- Check the configuration files in ${PKG_SYSCONFDIR}.
-- Modify /etc/mailer.conf (see ${EGDIR}/mailer.conf).
-- Set qmailsend=YES in /etc/rc.conf.
+There are many ways to enable ${PKGBASE}. One popular, well-regarded
+choice is to follow the directions in Dave Sill's "Life with qmail":
 
-To enable SMTP:
-- Set qmailsmtpd=YES in /etc/rc.conf.
+    <URL:http://www.lifewithqmail.org/lwq.html>
 
-To enable POP3 (only for Maildirs):
-- Set qmailpop3d=YES in /etc/rc.conf.
-
-To allow local non-root users to see the queue:
-- Set qmailqread=YES in /etc/rc.conf.
-- Change the mailq entry in /etc/mailer.conf to qmail-qread-client.
-
-Alternatively, you can manage the qmail daemons with daemontools
-by creating appropriate run scripts in /service. There are many
-ways to do this; you may find the qmail-conf package helpful.
+Alternatively, you can let pkgsrc do the work by installing the
+qmail-run package.
 
 ===========================================================================
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index ea0ee7e31b0..a6049bd2b6b 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2004/07/21 22:35:59 schmonz Exp $
+# $NetBSD: Makefile,v 1.25 2004/08/02 03:57:17 schmonz Exp $
 #
 
-DISTNAME=	qmail-1.03
-PKGREVISION=	7
+PKGNAME=	${QMAIL_VERS}
+PKGREVISION=	8
 CATEGORIES=	mail
-MASTER_SITES=	http://cr.yp.to/software/			\
-		ftp://ftp.ntnu.no/pub/unix/mail/qmail/		\
-		ftp://ftp.jp.qmail.org/qmail/			\
-		ftp://ftp.net.ohio-state.edu/pub/networking/mail/qmail/
 
 MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	http://cr.yp.to/qmail.html
@@ -22,6 +18,8 @@ NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 NO_PACKAGE=	"needs work to function properly as a binary package"
 
+APPLY_NETQMAIL=	${DO_NADA}
+
 .include "../../mail/qmail/Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmail/Makefile.common b/mail/qmail/Makefile.common
index 6ee459be2a6..78c1acd6732 100644
--- a/mail/qmail/Makefile.common
+++ b/mail/qmail/Makefile.common
@@ -1,6 +1,10 @@
-# $NetBSD: Makefile.common,v 1.1 2004/07/21 22:35:59 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/08/02 03:57:17 schmonz Exp $
 #
 
+QMAIL_VERS=	qmail-1.03
+DISTNAME=	netqmail-1.05
+MASTER_SITES=	http://qmail.org/
+
 DEPENDS+=	checkpassword-[0-9]*:../../sysutils/checkpassword
 DEPENDS+=	daemontools-[0-9]*:../../sysutils/daemontools
 DEPENDS+=	qmail-users>=1.0:../../mail/qmail-users
@@ -13,12 +17,19 @@ CONFLICTS+=	pulsar<=0.1.1
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/${PKGNAME_NOREV}
+
+.if defined(PKG_PHASE) && ${PKG_PHASE} == "extract"
+WRKSRC=			${WRKDIR}/${DISTNAME}
+.endif
+
 ALL_TARGET= 		it man
 INSTALL_TARGET=		setup check
 
 FILESDIR=		${.CURDIR}/../../mail/qmail/files
 MESSAGE_SRC=		${.CURDIR}/../../mail/qmail/MESSAGE
 PLIST_SRC=		${.CURDIR}/../../mail/qmail/PLIST
+DISTINFO_FILE=		${.CURDIR}/../../mail/netqmail/distinfo
 
 USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/../../mail/qmail/DEINSTALL
@@ -27,7 +38,6 @@ MAKE_DIRS+=		${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/alias ${EGDIR}/boot
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/control ${DOCDIR}
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/users
 OWN_DIRS+=		${QMAILDIR} ${QMAIL_QUEUE_DIR}
-RCD_SCRIPTS=		qmail qmailqread qmailpop3d qmailsend qmailsmtpd
 PKG_SYSCONFSUBDIR=	qmail
 
 DOCDIR=			${PREFIX}/share/doc/qmail
@@ -39,9 +49,9 @@ FILES_SUBST+=		DOCDIR=${DOCDIR}
 FILES_SUBST+=		EGDIR=${EGDIR}
 FILES_SUBST+=		SHAREDIR=${SHAREDIR}
 FILES_SUBST+=		QMAILDIR=${QMAILDIR}
-FILES_SUBST+=		QMAIL_AUTOCONFIG=${QMAIL_AUTOCONFIG}
 FILES_SUBST+=		QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR}
 FILES_SUBST+=		QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA}
+PLIST_SUBST+=		OSXSUFX+=${OSXSUFX}
 
 SETUP_PROGRAMS=		dnsfq dnsip dnsptr hostname install ipmeprint
 SETUP_SCRIPTS=		config config-fast
@@ -57,8 +67,16 @@ INSTALLATION_DIRS+=	share/doc/qmail share/examples/qmail share/qmail
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=		QMAILDIR QMAIL_AUTOCONFIG
-BUILD_DEFS+=		QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA
+.if ${OPSYS} == "Darwin"
+OSXSUFX=		.doc
+PATCHFILES=		panther.patch
+PATCH_SITES=		http://http.netdevice.com:9080/qmail/patch/
+PATCH_DIST_STRIP=	-p1
+.else
+OSXSUFX=		# empty
+.endif
+
+BUILD_DEFS+=		QMAILDIR QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA
 
 .if !empty(QMAIL_QUEUE_DIR:M${QMAILDIR}/*)
 PKG_FAIL_REASON+=	"QMAIL_QUEUE_DIR must not be under ${QMAILDIR}"
@@ -74,17 +92,16 @@ SUBST_SED.logging=	-e 's|0|${QUEUE_EXTRALEN}|g'
 SUBST_SED.logging+=	-e 's|""|${QUEUE_EXTRA}|g'
 .endif
 
+post-extract:
+	@extract_file=${QMAIL_VERS}.tar.gz; export extract_file;	\
+	cd ${WRKSRC}; ${EXTRACT_CMD}; cd ${QMAIL_VERS};			\
+	${APPLY_NETQMAIL}
+
 do-configure:
 	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
 
-post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/mailer.conf		\
-		> ${WRKDIR}/mailer.conf.qmail
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/qmail-qread-client.sh	\
-		> ${WRKDIR}/qmail-qread-client
-
 post-install:
 	# qmail's installer sets strange permissions; set them back
 .	if (${PKG_INSTALLATION_TYPE} == "overwrite")
@@ -99,9 +116,6 @@ post-install:
 .	  endfor
 .	endif
 
-	${INSTALL_DATA} ${WRKDIR}/mailer.conf.qmail ${EGDIR}/mailer.conf
-	${INSTALL_SCRIPT} ${WRKDIR}/qmail-qread-client ${PREFIX}/bin
-
 	${INSTALL_DATA_DIR} ${SHAREDIR}
 	${INSTALL_PROGRAM_DIR} ${SHAREDIR}/setup
 	for i in ${SETUP_PROGRAMS}; do					\
diff --git a/mail/qmail/PLIST b/mail/qmail/PLIST
index 9950bf9c062..df59c622c80 100644
--- a/mail/qmail/PLIST
+++ b/mail/qmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/07/21 22:35:59 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/08/02 03:57:17 schmonz Exp $
 bin/bouncesaying
 bin/condredirect
 bin/datemail
@@ -28,7 +28,6 @@ bin/qmail-qmqpc
 bin/qmail-qmqpd
 bin/qmail-qmtpd
 bin/qmail-qread
-bin/qmail-qread-client
 bin/qmail-qstat
 bin/qmail-queue
 bin/qmail-remote
@@ -147,7 +146,7 @@ man/man8/qmail-tcpok.8
 man/man8/qmail-tcpto.8
 man/man8/splogger.8
 share/doc/qmail/FAQ
-share/doc/qmail/INSTALL
+share/doc/qmail/INSTALL${OSXSUFX}
 share/doc/qmail/INSTALL.alias
 share/doc/qmail/INSTALL.ctl
 share/doc/qmail/INSTALL.ids
@@ -165,7 +164,7 @@ share/doc/qmail/PIC.relaygood
 share/doc/qmail/PIC.rem2local
 share/doc/qmail/REMOVE.binmail
 share/doc/qmail/REMOVE.sendmail
-share/doc/qmail/SENDMAIL
+share/doc/qmail/SENDMAIL${OSXSUFX}
 share/doc/qmail/TEST.deliver
 share/doc/qmail/TEST.receive
 share/doc/qmail/UPGRADE
@@ -179,7 +178,6 @@ share/examples/qmail/boot/home
 share/examples/qmail/boot/home+df
 share/examples/qmail/boot/proc
 share/examples/qmail/boot/proc+df
-share/examples/qmail/mailer.conf
 share/qmail/setup/config
 share/qmail/setup/config-fast
 share/qmail/setup/dnsfq
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
deleted file mode 100644
index 7d8dd48e675..00000000000
--- a/mail/qmail/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.6 2004/07/21 22:35:59 schmonz Exp $
-
-SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a
-Size (qmail-1.03.tar.gz) = 220668 bytes
diff --git a/mail/qmail/files/mailer.conf b/mail/qmail/files/mailer.conf
deleted file mode 100644
index c918d862c6b..00000000000
--- a/mail/qmail/files/mailer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$NetBSD: mailer.conf,v 1.3 2004/07/21 22:35:59 schmonz Exp $
-#
-# Use "qmail" as replacement for "sendmail".
-#
-sendmail	@PREFIX@/bin/sendmail
-send-mail	@PREFIX@/bin/sendmail
-mailq		@PREFIX@/bin/qmail-qread
-newaliases	@PREFIX@/bin/newaliases
-hoststat	@PREFIX@/bin/qmail-tcpto
-purgestat	@PREFIX@/bin/qmail-tcpok
diff --git a/mail/qmail/files/qmail-qread-client.sh b/mail/qmail/files/qmail-qread-client.sh
deleted file mode 100644
index 1a175d07787..00000000000
--- a/mail/qmail/files/qmail-qread-client.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!@SH@
-#
-# 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/files/qmail.sh b/mail/qmail/files/qmail.sh
deleted file mode 100644
index a7c8bead012..00000000000
--- a/mail/qmail/files/qmail.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: qmail.sh,v 1.5 2004/07/21 22:35:59 schmonz Exp $
-#
-# Master script for administrators to control qmail services.
-# Usage resembles the qmailctl script from "Life with qmail".
-#
-
-# KEYWORD: nostart
-
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
-
-rcd_dir=`@DIRNAME@ $0`
-
-# NOTE: run_rc_command sets $rc_arg
-#
-forward_commands()
-{
-	# Backward compat with NetBSD <1.6:
-	[ -z "$rc_arg" ] && rc_arg=$_arg
-
-	for file in $COMMAND_LIST; do
-		$rcd_dir/$file $rc_arg
-	done
-}
-
-reverse_commands()
-{
-	# Backward compat with NetBSD <1.6:
-	[ -z "$rc_arg" ] && rc_arg=$_arg
-
-	REVCOMMAND_LIST=
-	for file in $COMMAND_LIST; do
-		REVCOMMAND_LIST="$file $REVCOMMAND_LIST"
-	done
-	for file in $REVCOMMAND_LIST; do
-		$rcd_dir/$file $rc_arg
-	done
-}
-
-qmailrcd()
-{
-	for service in $@; do
-		$rcd_dir/qmail${service} $rc_arg
-	done
-}
-
-qmail_help()
-{
-	@CAT@ <<HELP
-   stop -- stops mail service (smtp connections refused, nothing goes out)
-  start -- starts mail service (smtp connection accepted, mail can go out)
-  pause -- temporarily stops mail service (connections accepted, nothing leaves)
-   cont -- continues paused mail service
-   stat -- displays status of mail service
-    cdb -- rebuild the tcpserver cdb file for smtp and/or pop3
-restart -- stops and restarts smtp, sends qmail-send a TERM & restarts it
-doqueue -- schedules queued messages for immediate delivery
- reload -- sends qmail-send HUP, rereading locals and virtualdomains
-  queue -- shows status of queue
-   alrm -- same as doqueue
-  flush -- same as doqueue
-    hup -- same as reload
-HELP
-}
-
-COMMAND_LIST="qmailsend qmailsmtpd qmailpop3d"
-
-name="qmail"
-start_cmd="forward_commands"
-stop_cmd="reverse_commands"
-doqueue_cmd="qmailrcd send"; alrm_cmd=${doqueue_cmd}; flush_cmd=${doqueue_cmd}
-reload_cmd="qmailrcd send"; hup_cmd=${reload_cmd}
-status_cmd="forward_commands"; stat_cmd=${status_cmd}
-pause_cmd="forward_commands"
-cont_cmd="forward_commands"
-cdb_cmd="qmailrcd smtpd pop3d"
-queue_cmd="qmailrcd send"
-help_cmd="qmail_help"
-extra_commands="pause cont stat status cdb doqueue reload queue alrm flush hup help"
-
-if [ -f /etc/rc.subr ]; then
-	run_rc_command "$1"
-else
-	@ECHO@ -n " ${name}"
-	_arg="$1"
-	${start_cmd}
-fi
diff --git a/mail/qmail/files/qmailpop3d.sh b/mail/qmail/files/qmailpop3d.sh
deleted file mode 100644
index 47f226a46fa..00000000000
--- a/mail/qmail/files/qmailpop3d.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: qmailpop3d.sh,v 1.3 2004/07/21 22:35:59 schmonz Exp $
-#
-# Script to control qmail-pop3d (POP3 server for Maildirs).
-#
-
-# PROVIDE: qmailpop3d mail
-
-. /etc/rc.subr
-
-name="qmailpop3d"
-rcvar=${name}
-required_files="@PKG_SYSCONFDIR@/control/me"
-required_files="${required_files} @PKG_SYSCONFDIR@/tcp.pop3.cdb"
-command="@LOCALBASE@/bin/tcpserver"
-procname=${name}
-start_precmd="qmailpop3d_precmd"
-extra_commands="stat pause cont cdb"
-stat_cmd="qmailpop3d_stat"
-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_softlimit=${qmailpop3d_softlimit-"2000000"}
-qmailpop3d_pretcpserver=${qmailpop3d_pretcpserver-""}
-qmailpop3d_prepop3d=${qmailpop3d_prepop3d-""}
-qmailpop3d_checkpassword=${qmailpop3d_checkpassword-"@LOCALBASE@/bin/checkpassword"}
-qmailpop3d_maildirname=${qmailpop3d_maildirname-"Maildir"}
-
-qmailpop3d_precmd()
-{
-	# tcpserver(1) is akin to inetd(8), but runs one service per process.
-	# We want to signal only the tcpserver process responsible for POP
-	# service. Use argv0(1) to set procname to "qmailpop3d".
-	command="@SETENV@ - ${qmailpop3d_postenv} @LOCALBASE@/bin/softlimit -m ${qmailpop3d_softlimit} ${qmailpop3d_pretcpserver} @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} ${qmailpop3d_tcpflags} -x @PKG_SYSCONFDIR@/tcp.pop3.cdb ${qmailpop3d_tcphost} ${qmailpop3d_tcpport} @PREFIX@/bin/qmail-popup `@CAT@ @PKG_SYSCONFDIR@/control/me` ${qmailpop3d_checkpassword} ${qmailpop3d_prepop3d} @PREFIX@/bin/qmail-pop3d ${qmailpop3d_maildirname} 2>&1 | @PREFIX@/bin/splogger ${name}"
-	command_args="&"
-	rc_flags=""
-}
-
-qmailpop3d_stat()
-{
-	run_rc_command status
-}
-
-qmailpop3d_pause()
-{
-	if ! statusmsg=`run_rc_command status`; then
-		@ECHO@ $statusmsg
-		return 1
-	fi
-	@ECHO@ "Pausing ${name}."
-	kill -STOP $rc_pid
-}
-
-qmailpop3d_cont()
-{
-	if ! statusmsg=`run_rc_command status`; then
-		@ECHO@ $statusmsg
-		return 1
-	fi
-	@ECHO@ "Continuing ${name}."
-	kill -CONT $rc_pid
-}
-
-qmailpop3d_cdb()
-{
-	echo "Reloading @PKG_SYSCONFDIR@/tcp.pop3."
-	@LOCALBASE@/bin/tcprules @PKG_SYSCONFDIR@/tcp.pop3.cdb @PKG_SYSCONFDIR@/tcp.pop3.tmp < @PKG_SYSCONFDIR@/tcp.pop3
-	@CHMOD@ 644 @PKG_SYSCONFDIR@/tcp.pop3.cdb
-}
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/qmail/files/qmailqread.sh b/mail/qmail/files/qmailqread.sh
deleted file mode 100644
index 28dbb522788..00000000000
--- a/mail/qmail/files/qmailqread.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: qmailqread.sh,v 1.1 2004/07/21 22:35:59 schmonz Exp $
-#
-# 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
-# REQUIRE: qmailsend
-
-. /etc/rc.subr
-
-name="qmailqread"
-rcvar=${name}
-command="@LOCALBASE@/bin/tcpserver"
-procname=${name}
-start_precmd="qmailqread_precmd"
-
-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 @PREFIX@/bin/qmail-qread 2>&1 | @PREFIX@/bin/splogger ${name}"
-	command_args="&"
-	rc_flags=""
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/qmail/files/qmailsend.sh b/mail/qmail/files/qmailsend.sh
deleted file mode 100644
index 6966e0f5afa..00000000000
--- a/mail/qmail/files/qmailsend.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: qmailsend.sh,v 1.1 2004/07/21 22:35:59 schmonz Exp $
-#
-# Script to control qmail-send (local and outgoing mail).
-#
-
-# PROVIDE: qmailsend mail
-# REQUIRE: LOGIN
-
-. /etc/rc.subr
-
-name="qmailsend"
-rcvar=${name}
-required_files="@PKG_SYSCONFDIR@/control/defaultdelivery"
-required_files="${required_files} @PKG_SYSCONFDIR@/control/me"
-command="@PREFIX@/bin/qmail-send"
-start_precmd="qmailsend_precmd"
-extra_commands="stat pause cont doqueue reload queue alrm flush hup"
-stat_cmd="qmailsend_stat"
-pause_cmd="qmailsend_pause"
-cont_cmd="qmailsend_cont"
-doqueue_cmd="qmailsend_doqueue"
-queue_cmd="qmailsend_queue"
-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=@PREFIX@/bin:$PATH"}
-qmailsend_defaultdelivery=${qmailsend_defaultdelivery-"`cat @PKG_SYSCONFDIR@/control/defaultdelivery`"}
-
-qmailsend_precmd()
-{
-	# qmail-start(8) starts the various qmail processes, then exits.
-	# qmail-send(8) is the process we want to signal later.
-	command="@SETENV@ - ${qmailsend_postenv} qmail-start '$qmailsend_defaultdelivery' splogger ${name}"
-	command_args="&"
-	rc_flags=""
-}
-
-qmailsend_stat()
-{
-	run_rc_command status
-}
-
-qmailsend_pause()
-{
-	if ! statusmsg=`run_rc_command status`; then
-		@ECHO@ $statusmsg
-		return 1
-	fi
-	@ECHO@ "Pausing ${name}."
-	kill -STOP $rc_pid
-}
-
-qmailsend_cont()
-{
-	if ! statusmsg=`run_rc_command status`; then
-		@ECHO@ $statusmsg
-		return 1
-	fi
-	@ECHO@ "Continuing ${name}."
-	kill -CONT $rc_pid
-}
-
-qmailsend_doqueue()
-{
-	if ! statusmsg=`run_rc_command status`; then
-		@ECHO@ $statusmsg
-		return 1
-	fi
-	@ECHO@ "Flushing timeout table and sending ALRM signal to qmail-send."
-	@PREFIX@/bin/qmail-tcpok
-	kill -ALRM $rc_pid
-}
-
-qmailsend_queue()
-{
-	@PREFIX@/bin/qmail-qstat
-	@PREFIX@/bin/qmail-qread
-}
-
-qmailsend_hup()
-{
-	run_rc_command reload
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/qmail/files/qmailsmtpd.sh b/mail/qmail/files/qmailsmtpd.sh
deleted file mode 100644
index 37b412882bd..00000000000
--- a/mail/qmail/files/qmailsmtpd.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: qmailsmtpd.sh,v 1.4 2004/07/21 22:35:59 schmonz Exp $
-#
-# Script to control qmail-smtpd (SMTP service).
-#
-
-# PROVIDE: qmailsmtpd mail
-# REQUIRE: qmailsend
-
-. /etc/rc.subr
-
-name="qmailsmtpd"
-rcvar=${name}
-required_files="@PKG_SYSCONFDIR@/control/concurrencyincoming"
-required_files="${required_files} @PKG_SYSCONFDIR@/tcp.smtp.cdb"
-required_files="${required_files} @PKG_SYSCONFDIR@/control/rcpthosts"
-command="@LOCALBASE@/bin/tcpserver"
-procname=${name}
-start_precmd="qmailsmtpd_precmd"
-extra_commands="stat pause cont cdb"
-stat_cmd="qmailsmtpd_stat"
-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=@PREFIX@/bin/qmail-queue"}
-qmailsmtpd_tcpflags=${qmailsmtpd_tcpflags-"-v -R -l 0"}
-qmailsmtpd_tcphost=${qmailsmtpd_tcphost-"0"}
-qmailsmtpd_tcpport=${qmailsmtpd_tcpport-"25"}
-qmailsmtpd_softlimit=${qmailsmtpd_softlimit-"2000000"}
-qmailsmtpd_pretcpserver=${qmailsmtpd_pretcpserver-""}
-qmailsmtpd_presmtpd=${qmailsmtpd_presmtpd-""}
-
-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_softlimit} ${qmailsmtpd_pretcpserver} @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} ${qmailsmtpd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.smtp.cdb -c `@CAT@ @PKG_SYSCONFDIR@/control/concurrencyincoming` -u `@ID@ -u qmaild` -g `@ID@ -g qmaild` ${qmailsmtpd_tcphost} ${qmailsmtpd_tcpport} ${qmailsmtpd_presmtpd} @PREFIX@/bin/qmail-smtpd 2>&1 | @PREFIX@/bin/splogger ${name}"
-	command_args="&"
-	rc_flags=""
-}
-
-qmailsmtpd_stat()
-{
-	run_rc_command status
-}
-
-qmailsmtpd_pause()
-{
-	if ! statusmsg=`run_rc_command status`; then
-		@ECHO@ $statusmsg
-		return 1
-	fi
-	@ECHO@ "Pausing ${name}."
-	kill -STOP $rc_pid
-}
-
-qmailsmtpd_cont()
-{
-	if ! statusmsg=`run_rc_command status`; then
-		@ECHO@ $statusmsg
-		return 1
-	fi
-	@ECHO@ "Continuing ${name}."
-	kill -CONT $rc_pid
-}
-
-qmailsmtpd_cdb()
-{
-	echo "Reloading @PKG_SYSCONFDIR@/tcp.smtp."
-	@LOCALBASE@/bin/tcprules @PKG_SYSCONFDIR@/tcp.smtp.cdb @PKG_SYSCONFDIR@/tcp.smtp.tmp < @PKG_SYSCONFDIR@/tcp.smtp
-	@CHMOD@ 644 @PKG_SYSCONFDIR@/tcp.smtp.cdb
-}
-
-load_rc_config $name
-run_rc_command "$1"