 @@ -1,22 +1,24 @@
 QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@
 QMAIL_PREFIX=@QMAIL_PREFIX@
 UCSPI_TCP_PREFIX=@UCSPI_TCP_PREFIX@
 psmsg='#
 # This file was auto-generated by pkgsrc.'
 case ${STAGE} in
 POST-INSTALL)
-	cd ${LOCALBASE}/share/qmail/setup && ./config-fast `./hostname`
+	cd ${QMAIL_PREFIX}/share/qmail/setup && ./config-fast `./hostname`
 	cd ${PKG_SYSCONFDIR}/alias && ${TOUCH} .qmail-postmaster .qmail-mailer-daemon .qmail-root
 	if ! [ -s ${PKG_SYSCONFDIR}/control/concurrencypop3 ]; then
 		${ECHO} 20 > ${PKG_SYSCONFDIR}/control/concurrencypop3
 		${ECHO} "$psmsg" >> ${PKG_SYSCONFDIR}/control/concurrencypop3
 		${CHMOD} 644 ${PKG_SYSCONFDIR}/control/concurrencypop3
 	fi
 	if ! [ -s ${PKG_SYSCONFDIR}/control/concurrencyincoming ]; then
 		${ECHO} 20 > ${PKG_SYSCONFDIR}/control/concurrencyincoming
 		${ECHO} "$psmsg" >> ${PKG_SYSCONFDIR}/control/concurrencyincoming
 		${CHMOD} 644 ${PKG_SYSCONFDIR}/control/concurrencyincoming
 @@ -26,25 +28,25 @@ POST-INSTALL)
 		${ECHO} ./Mailbox > ${PKG_SYSCONFDIR}/control/defaultdelivery
 		${ECHO} "$psmsg" >> ${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
 			${ECHO} "$psmsg" > ${PKG_SYSCONFDIR}/tcp.${i}
 			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}
+		${UCSPI_TCP_PREFIX}/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} "$psmsg" >> ${PKG_SYSCONFDIR}/alias/.qmail-${QMAIL_QUEUE_EXTRA}
 		${CHMOD} 644 ${PKG_SYSCONFDIR}/alias/.qmail-${QMAIL_QUEUE_EXTRA}
 	fi
 	;;
 esac

 @@ -1,58 +1,68 @@
-# $NetBSD: Makefile,v 1.26 2014/10/09 14:06:40 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2014/12/06 22:14:27 schmonz Exp $
+#
-DISTNAME=		qmail-run-20140912
+DISTNAME=		qmail-run-20141206
 CATEGORIES=		mail
 MASTER_SITES=		# empty
 DISTFILES=		# empty
 MAINTAINER=		schmonz@NetBSD.org
 COMMENT=		Configures qmail to receive and deliver mail
 LICENSE=		2-clause-bsd
 DEPENDS_QMAIL=		qmail>=1.03nb8:../../mail/qmail
 DEPENDS+=		${DEPENDS_QMAIL}
 CONFLICTS+=		qmail-qfilter-1.5nb1
 WRKSRC=			${WRKDIR}
 NO_BUILD=		yes
 NO_CHECKSUM=		yes
 FILES_SUBST+=		QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
 FILES_SUBST+=		PKGNAME=${PKGNAME:Q}
 RCD_SCRIPTS=		qmail qmailpop3d qmailqread qmailsend qmailsmtpd
 INSTALLATION_DIRS=	bin share/doc/qmail-run share/examples/qmail-run
 BUILD_DEFS+=		QMAIL_QUEUE_EXTRA
 .include "../../mk/bsd.prefs.mk"
 # Detect the PKG_SYSCONFDIR of the installed qmail, so we can create
 # config files there and refer to them from rc.d scripts.
+#
 .if !defined(PKG_SYSCONFDIR.qmail-run)
 PKG_SYSCONFDIR.qmail-run!=						\
 	${PKG_INFO} -Q PKG_SYSCONFDIR					\
 		${DEPENDS_QMAIL:C/:.*$//:Q} 2>/dev/null ||		\
 	${ECHO} "PKG_SYSCONFDIR.qmail-run_not_set"
 .  if empty(PKG_SYSCONFDIR.qmail-run:M*not_set)
 MAKEVARS+=	PKG_SYSCONFDIR.qmail-run
 .  endif
 .endif
 QMAIL_TOOLS=		checkpassword daemontools fastforward procmail
 QMAIL_TOOLS+=		qmail qmail-qfilter ucspi-tcp
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	mailer.conf qmail-procmail qmail-qfilter-queue
 SUBST_FILES.paths+=	qmail-qread-client
-SUBST_SED.paths+=	-e 's,@LOCALBASE@,${LOCALBASE},g'
+.for i in ${QMAIL_TOOLS}
 QMAIL_TOOL_VAR.${i}=	${i:S/-/_/g:tu}_PREFIX
 EVAL_PREFIX+=		${QMAIL_TOOL_VAR.${i}}=${i}
 FILES_SUBST+=		${QMAIL_TOOL_VAR.${i}}=${${QMAIL_TOOL_VAR.${i}}:Q}
 SUBST_SED.paths+=	-e 's,@${QMAIL_TOOL_VAR.${i}}@,${${QMAIL_TOOL_VAR.${i}}},g'
 .endfor
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_SED.paths+=	-e 's,@ECHO@,${ECHO},g'
 SUBST_SED.paths+=	-e 's,@SORT@,${SORT},g'
 SUBST_SED.paths+=	-e 's,@CAT@,${CAT},g'
 SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
 SUBST_SED.paths+=	-e 's,@SED@,${SED},g'
 SUBST_SED.paths+=	-e 's,@PKGNAME@,${PKGNAME},g'
 SUBST_STAGE.paths=	post-patch
 post-extract:
 	for f in README.pkgsrc mailer.conf; do				\
 	    ${CP} ${FILESDIR}/$$f ${WRKDIR}/$$f;			\

 @@ -1,64 +1,64 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: qmailpop3d.sh,v 1.8 2014/09/12 17:07:10 schmonz Exp $
+# $NetBSD: qmailpop3d.sh,v 1.9 2014/12/06 22:14:27 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:="-vRHl0"}
 : ${qmailpop3d_tcphost:="0"}
 : ${qmailpop3d_tcpport:="110"}
 : ${qmailpop3d_datalimit:="146800640"}
 : ${qmailpop3d_pretcpserver:=""}
 : ${qmailpop3d_prepop3d:=""}
-: ${qmailpop3d_checkpassword:="@LOCALBASE@/bin/checkpassword"}
+: ${qmailpop3d_checkpassword:="@CHECKPASSWORD_PREFIX@/bin/checkpassword"}
 : ${qmailpop3d_maildirname:="Maildir"}
 : ${qmailpop3d_log:="YES"}
 : ${qmailpop3d_logcmd:="logger -t nb${name} -p mail.info"}
-: ${qmailpop3d_nologcmd:="@LOCALBASE@/bin/multilog -*"}
+: ${qmailpop3d_nologcmd:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"}
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/control/me"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/concurrencypop3"
 required_files="${required_files} @PKG_SYSCONFDIR@/tcp.pop3.cdb"
-command="@LOCALBASE@/bin/tcpserver"
+command="@UCSPI_TCP_PREFIX@/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"
 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".
 	if [ -f /etc/rc.subr ]; then
 		checkyesno qmailpop3d_log || qmailpop3d_logcmd=${qmailpop3d_nologcmd}
 	fi
-	command="@SETENV@ - ${qmailpop3d_postenv} @LOCALBASE@/bin/softlimit -m ${qmailpop3d_datalimit} ${qmailpop3d_pretcpserver} @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} ${qmailpop3d_tcpflags} -x @PKG_SYSCONFDIR@/tcp.pop3.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencypop3` ${qmailpop3d_tcphost} ${qmailpop3d_tcpport} @LOCALBASE@/bin/qmail-popup `@HEAD@ -1 @PKG_SYSCONFDIR@/control/me` ${qmailpop3d_checkpassword} ${qmailpop3d_prepop3d} @LOCALBASE@/bin/qmail-pop3d ${qmailpop3d_maildirname} 2>&1 | @LOCALBASE@/bin/setuidgid qmaill ${qmailpop3d_logcmd}"
+	command="@SETENV@ - ${qmailpop3d_postenv} @DAEMONTOOLS_PREFIX@/bin/softlimit -m ${qmailpop3d_datalimit} ${qmailpop3d_pretcpserver} @UCSPI_TCP_PREFIX@/bin/argv0 @UCSPI_TCP_PREFIX@/bin/tcpserver ${name} ${qmailpop3d_tcpflags} -x @PKG_SYSCONFDIR@/tcp.pop3.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencypop3` ${qmailpop3d_tcphost} ${qmailpop3d_tcpport} @QMAIL_PREFIX@/bin/qmail-popup `@HEAD@ -1 @PKG_SYSCONFDIR@/control/me` ${qmailpop3d_checkpassword} ${qmailpop3d_prepop3d} @QMAIL_PREFIX@/bin/qmail-pop3d ${qmailpop3d_maildirname} 2>&1 | @DAEMONTOOLS_PREFIX@/bin/setuidgid qmaill ${qmailpop3d_logcmd}"
 	command_args="&"
 	rc_flags=""
+}
 qmailpop3d_stat()
+{
 	run_rc_command status
+}
 qmailpop3d_pause()
+{
 	if ! statusmsg=`run_rc_command status`; then
 		@ECHO@ $statusmsg
 @@ -71,25 +71,25 @@ qmailpop3d_pause()
 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
+	@UCSPI_TCP_PREFIX@/bin/tcprules @PKG_SYSCONFDIR@/tcp.pop3.cdb @PKG_SYSCONFDIR@/tcp.pop3.tmp < @PKG_SYSCONFDIR@/tcp.pop3
 	@CHMOD@ 644 @PKG_SYSCONFDIR@/tcp.pop3.cdb
+}
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
 	run_rc_command "$1"
 else
 	@ECHO_N@ " ${name}"
 	qmailpop3d_precmd
 	eval ${command} ${qmailpop3d_flags} ${command_args}
 fi

 @@ -1,64 +1,64 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: qmailsmtpd.sh,v 1.8 2014/09/12 17:07:10 schmonz Exp $
+# $NetBSD: qmailsmtpd.sh,v 1.9 2014/12/06 22:14:27 schmonz Exp $
+#
 # @PKGNAME@ script to control qmail-smtpd (SMTP service).
+#
 # PROVIDE: qmailsmtpd mail
 # REQUIRE: qmailsend
 name="qmailsmtpd"
 # User-settable rc.conf variables and their default values:
-: ${qmailsmtpd_postenv:="QMAILQUEUE=@LOCALBASE@/bin/qmail-queue"}
+: ${qmailsmtpd_postenv:="QMAILQUEUE=@QMAIL_PREFIX@/bin/qmail-queue"}
 : ${qmailsmtpd_tcpflags:="-vRl0"}
 : ${qmailsmtpd_tcphost:="0"}
 : ${qmailsmtpd_tcpport:="25"}
 : ${qmailsmtpd_datalimit:="146800640"}
 : ${qmailsmtpd_pretcpserver:=""}
 : ${qmailsmtpd_presmtpd:=""}
 : ${qmailsmtpd_postsmtpd:=""}
 : ${qmailsmtpd_log:="YES"}
 : ${qmailsmtpd_logcmd:="logger -t nb${name} -p mail.info"}
-: ${qmailsmtpd_nologcmd:="@LOCALBASE@/bin/multilog -*"}
+: ${qmailsmtpd_nologcmd:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"}
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 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"
+command="@UCSPI_TCP_PREFIX@/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"
 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".
 	if [ -f /etc/rc.subr ]; then
 		checkyesno qmailsmtpd_log || qmailsmtpd_logcmd=${qmailsmtpd_nologcmd}
 	fi
-	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 | @LOCALBASE@/bin/setuidgid qmaill ${qmailsmtpd_logcmd}"
+	command="@SETENV@ - ${qmailsmtpd_postenv} @DAEMONTOOLS_PREFIX@/bin/softlimit -m ${qmailsmtpd_datalimit} ${qmailsmtpd_pretcpserver} @UCSPI_TCP_PREFIX@/bin/argv0 @UCSPI_TCP_PREFIX@/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} @QMAIL_PREFIX@/bin/qmail-smtpd ${qmailsmtpd_postsmtpd} 2>&1 | @DAEMONTOOLS_PREFIX@/bin/setuidgid qmaill ${qmailsmtpd_logcmd}"
 	command_args="&"
 	rc_flags=""
+}
 qmailsmtpd_stat()
+{
 	run_rc_command status
+}
 qmailsmtpd_pause()
+{
 	if ! statusmsg=`run_rc_command status`; then
 		@ECHO@ $statusmsg
 @@ -71,25 +71,25 @@ qmailsmtpd_pause()
 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
+	@UCSPI_TCP_PREFIX@/bin/tcprules @PKG_SYSCONFDIR@/tcp.smtp.cdb @PKG_SYSCONFDIR@/tcp.smtp.tmp < @PKG_SYSCONFDIR@/tcp.smtp
 	@CHMOD@ 644 @PKG_SYSCONFDIR@/tcp.smtp.cdb
+}
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
 	run_rc_command "$1"
 else
 	@ECHO_N@ " ${name}"
 	qmailsmtpd_precmd
 	eval ${command} ${qmailsmtpd_flags} ${command_args}
 fi

 @@ -1,45 +1,45 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: qmailqread.sh,v 1.6 2005/04/15 05:17:02 schmonz Exp $
+# $NetBSD: qmailqread.sh,v 1.7 2014/12/06 22:14:27 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.
+#
 # PROVIDE: qmailqread mail
 # REQUIRE: qmailsend
 name="qmailqread"
 # User-settable rc.conf variables and their default values:
 : ${qmailqread_log:="YES"}
 : ${qmailqread_logcmd:="logger -t nb${name} -p mail.info"}
-: ${qmailqread_nologcmd:="@LOCALBASE@/bin/multilog -*"}
+: ${qmailqread_nologcmd:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"}
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 rcvar=${name}
-command="@LOCALBASE@/bin/tcpserver"
+command="@UCSPI_TCP_PREFIX@/bin/tcpserver"
 procname=${name}
 start_precmd="qmailqread_precmd"
 qmailqread_precmd()
+{
 	if [ -f /etc/rc.subr ]; then
 		checkyesno qmailqread_log || qmailqread_logcmd=${qmailqread_nologcmd}
 	fi
-	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 | @LOCALBASE@/bin/setuidgid qmaill ${qmailqread_logcmd}"
+	command="@SETENV@ - @UCSPI_TCP_PREFIX@/bin/argv0 @UCSPI_TCP_PREFIX@/bin/tcpserver ${name} -R -1 -u `@ID@ -u qmails` -g `@ID@ -g qmails` 127.0.0.1 20025 @QMAIL_PREFIX@/bin/qmail-qread 2>&1 | @DAEMONTOOLS_PREFIX@/bin/setuidgid qmaill ${qmailqread_logcmd}"
 	command_args="&"
 	rc_flags=""
+}
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
 	run_rc_command "$1"
 else
 	@ECHO_N@ " ${name}"
 	qmailqread_precmd
 	eval ${command} ${qmailqread_flags} ${command_args}
 fi

 @@ -1,41 +1,41 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: qmailsend.sh,v 1.6 2005/04/15 05:17:02 schmonz Exp $
+# $NetBSD: qmailsend.sh,v 1.7 2014/12/06 22:14:27 schmonz Exp $
+#
 # @PKGNAME@ script to control qmail-send (local and outgoing mail).
+#
 # PROVIDE: qmailsend mail
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 name="qmailsend"
 # User-settable rc.conf variables and their default values:
-: ${qmailsend_postenv:="PATH=@LOCALBASE@/bin:$PATH"}
+: ${qmailsend_postenv:="PATH=@QMAIL_PREFIX@/bin:$PATH"}
 : ${qmailsend_defaultdelivery:="`@HEAD@ -1 @PKG_SYSCONFDIR@/control/defaultdelivery`"}
 : ${qmailsend_log:="YES"}
 : ${qmailsend_logcmd:="logger -t nb${name} -p mail.info"}
-: ${qmailsend_nologcmd:="@LOCALBASE@/bin/multilog -*"}
+: ${qmailsend_nologcmd:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"}
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/control/defaultdelivery"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/me"
-command="@LOCALBASE@/bin/qmail-send"
+command="@QMAIL_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"
 qmailsend_precmd()
+{
 @@ -71,34 +71,34 @@ qmailsend_cont()
 		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."
-	@LOCALBASE@/bin/qmail-tcpok
+	@QMAIL_PREFIX@/bin/qmail-tcpok
 	kill -ALRM $rc_pid
+}
 qmailsend_queue()
+{
-	@LOCALBASE@/bin/qmail-qstat
+	@QMAIL_PREFIX@/bin/qmail-qstat
-	@LOCALBASE@/bin/qmail-qread
+	@QMAIL_PREFIX@/bin/qmail-qread
+}
 qmailsend_hup()
+{
 	run_rc_command reload
+}
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
 	run_rc_command "$1"
 else
 	@ECHO_N@ " ${name}"
 	qmailsend_precmd

 @@ -1,10 +1,10 @@
-#	$NetBSD: mailer.conf,v 1.3 2006/06/04 15:23:25 schmonz Exp $
+#	$NetBSD: mailer.conf,v 1.4 2014/12/06 22:14:27 schmonz Exp $
+#
 # Use qmail as the system mailer.
+#
-sendmail	@LOCALBASE@/bin/sendmail
+sendmail	@QMAIL_PREFIX@/bin/sendmail
-send-mail	@LOCALBASE@/bin/sendmail
+send-mail	@QMAIL_PREFIX@/bin/sendmail
-mailq		@LOCALBASE@/bin/qmail-qread
+mailq		@QMAIL_PREFIX@/bin/qmail-qread
-newaliases	@LOCALBASE@/bin/newaliases
+newaliases	@FASTFORWARD_PREFIX@/bin/newaliases
-hoststat	@LOCALBASE@/bin/qmail-tcpto
+hoststat	@QMAIL_PREFIX@/bin/qmail-tcpto
-purgestat	@LOCALBASE@/bin/qmail-tcpok
+purgestat	@QMAIL_PREFIX@/bin/qmail-tcpok

 @@ -20,16 +20,16 @@ possible_qfilters=`@ECHO@ @PKG_SYSCONFDI
 qfilters=""
 if [ "${possible_qfilters}" = "@PKG_SYSCONFDIR@/filters/qfilter-*" ]; then
 	qfilters="@CAT@"
 else
 	for qfilter in ${possible_qfilters}; do
 		if [ -x "${qfilter}" ]; then
 			qfilters="${qfilters} ${qfilter}"
 		fi
 	done
 	[ -z "${qfilters}" ] && qfilters="@CAT@"
 fi
-qfilter_cmd="@LOCALBASE@/bin/qmail-qfilter `@ECHO@ ${qfilters} | @SED@ -e 's| | -- |g'`"
+qfilter_cmd="@QMAIL_QFILTER_PREFIX@/bin/qmail-qfilter `@ECHO@ ${qfilters} | @SED@ -e 's| | -- |g'`"
 exec ${qfilter_cmd}

 @@ -1,13 +1,13 @@
 #!@SH@
 # Copyright (c) 1998-2001 Software in the Public Interest
 # <http://www.debian.org/>
 # Written by Philip Hands. Distributed under the GNU GPL.
 # Modified slightly by Dave Sill.
-@LOCALBASE@/bin/preline @LOCALBASE@/bin/procmail && exit 0
+@QMAIL_PREFIX@/bin/preline @PROCMAIL_PREFIX@/bin/procmail && exit 0
 # check if procmail returned EX_TEMPFAIL (75)
 [ $? = 75 ] && exit 111
 # otherwise return a permanent error
 exit 100

	@@ -1,10 +1,10 @@		@@ -1,10 +1,10 @@
1	#!@SH@	1	#!@SH@
2	#	2	#
3	# $NetBSD: qmail-qread-client.sh,v 1.2 2004/08/03 08:59:24 schmonz Exp $	3	# $NetBSD: qmail-qread-client.sh,v 1.3 2014/12/06 22:14:27 schmonz Exp $
4	#	4	#
5	# @PKGNAME@ client program to allow local non-root users to see	5	# @PKGNAME@ client program to allow local non-root users to see
6	# the queue. Requires that the corresponding server program be running.	6	# the queue. Requires that the corresponding server program be running.
7	# From Steinar Haug.	7	# From Steinar Haug.
8	#	8	#
9		9
10	exec @LOCALBASE@/bin/tcpclient -RHl0 -- 127.0.0.1 20025 @SH@ -c 'exec @CAT@ <&6'	10	exec @UCSPI_TCP_PREFIX@/bin/tcpclient -RHl0 -- 127.0.0.1 20025 @SH@ -c 'exec @CAT@ <&6'