From 066771d488c4780599b20d1ff025e031abb3f9c5 Mon Sep 17 00:00:00 2001 From: jperkin Date: Wed, 25 Nov 2015 12:51:30 +0000 Subject: Remove mk/find-prefix.mk usage from the mail category. The find-prefix infrastructure was required in a pkgviews world where packages installed from pkgsrc could have different installation prefixes, and this was a way for a dependency prefix to be determined. Now that pkgviews has been removed there is no longer any need for the overhead of this infrastructure. Instead we use BUILDLINK_PREFIX.pkg for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the dependency is coming from pkgsrc. Provides a reasonable performance win due to the reduction of `pkg_info -qp` calls, some of which were redundant anyway as they were duplicating the same information provided by BUILDLINK_PREFIX.pkg. --- mail/qmail-run/INSTALL | 6 ++---- mail/qmail-run/Makefile | 11 +---------- mail/qmail-run/files/mailer.conf | 14 +++++++------- mail/qmail-run/files/qmail-procmail.sh | 2 +- mail/qmail-run/files/qmail-qfilter-queue.sh | 2 +- mail/qmail-run/files/qmail-qread-client.sh | 4 ++-- mail/qmail-run/files/qmailpop3d.sh | 12 ++++++------ mail/qmail-run/files/qmailqread.sh | 8 ++++---- mail/qmail-run/files/qmailsend.sh | 14 +++++++------- mail/qmail-run/files/qmailsmtpd.sh | 12 ++++++------ 10 files changed, 37 insertions(+), 48 deletions(-) (limited to 'mail/qmail-run') diff --git a/mail/qmail-run/INSTALL b/mail/qmail-run/INSTALL index 70b0c7c17e7..9c1e6dc0448 100644 --- a/mail/qmail-run/INSTALL +++ b/mail/qmail-run/INSTALL @@ -1,6 +1,4 @@ QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@ -QMAIL_PREFIX=@QMAIL_PREFIX@ -UCSPI_TCP_PREFIX=@UCSPI_TCP_PREFIX@ psmsg='# # This file was auto-generated by pkgsrc.' @@ -8,7 +6,7 @@ psmsg='# case ${STAGE} in POST-INSTALL) - cd ${QMAIL_PREFIX}/share/qmail/setup && ./config-fast `./hostname` + cd ${PREFIX}/share/qmail/setup && ./config-fast `./hostname` cd ${PKG_SYSCONFDIR}/alias && ${TOUCH} .qmail-postmaster .qmail-mailer-daemon .qmail-root @@ -38,7 +36,7 @@ POST-INSTALL) eval ${ECHO} \"\$${i}rule\" > ${PKG_SYSCONFDIR}/tcp.${i} fi ${CHMOD} 644 ${PKG_SYSCONFDIR}/tcp.${i} - ${UCSPI_TCP_PREFIX}/bin/tcprules ${PKG_SYSCONFDIR}/tcp.${i}.cdb ${PKG_SYSCONFDIR}/tcp.${i}.tmp < ${PKG_SYSCONFDIR}/tcp.${i} + ${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 diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile index 8196cf34aa4..def45dcf597 100644 --- a/mail/qmail-run/Makefile +++ b/mail/qmail-run/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2014/12/06 22:14:27 schmonz Exp $ +# $NetBSD: Makefile,v 1.28 2015/11/25 12:51:30 jperkin Exp $ # DISTNAME= qmail-run-20141206 @@ -41,18 +41,9 @@ 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 -.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' diff --git a/mail/qmail-run/files/mailer.conf b/mail/qmail-run/files/mailer.conf index b18da445a10..e9276c79ef4 100644 --- a/mail/qmail-run/files/mailer.conf +++ b/mail/qmail-run/files/mailer.conf @@ -1,10 +1,10 @@ -# $NetBSD: mailer.conf,v 1.4 2014/12/06 22:14:27 schmonz Exp $ +# $NetBSD: mailer.conf,v 1.5 2015/11/25 12:51:30 jperkin Exp $ # # Use qmail as the system mailer. # -sendmail @QMAIL_PREFIX@/bin/sendmail -send-mail @QMAIL_PREFIX@/bin/sendmail -mailq @QMAIL_PREFIX@/bin/qmail-qread -newaliases @FASTFORWARD_PREFIX@/bin/newaliases -hoststat @QMAIL_PREFIX@/bin/qmail-tcpto -purgestat @QMAIL_PREFIX@/bin/qmail-tcpok +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-run/files/qmail-procmail.sh b/mail/qmail-run/files/qmail-procmail.sh index 3838d3a7f28..cfeec7d02d2 100644 --- a/mail/qmail-run/files/qmail-procmail.sh +++ b/mail/qmail-run/files/qmail-procmail.sh @@ -4,7 +4,7 @@ # Written by Philip Hands. Distributed under the GNU GPL. # Modified slightly by Dave Sill. -@QMAIL_PREFIX@/bin/preline @PROCMAIL_PREFIX@/bin/procmail && exit 0 +@PREFIX@/bin/preline @PREFIX@/bin/procmail && exit 0 # check if procmail returned EX_TEMPFAIL (75) [ $? = 75 ] && exit 111 diff --git a/mail/qmail-run/files/qmail-qfilter-queue.sh b/mail/qmail-run/files/qmail-qfilter-queue.sh index e62fe08836c..1e715e43de2 100644 --- a/mail/qmail-run/files/qmail-qfilter-queue.sh +++ b/mail/qmail-run/files/qmail-qfilter-queue.sh @@ -30,6 +30,6 @@ else [ -z "${qfilters}" ] && qfilters="@CAT@" fi -qfilter_cmd="@QMAIL_QFILTER_PREFIX@/bin/qmail-qfilter `@ECHO@ ${qfilters} | @SED@ -e 's| | -- |g'`" +qfilter_cmd="@PREFIX@/bin/qmail-qfilter `@ECHO@ ${qfilters} | @SED@ -e 's| | -- |g'`" exec ${qfilter_cmd} diff --git a/mail/qmail-run/files/qmail-qread-client.sh b/mail/qmail-run/files/qmail-qread-client.sh index 93ed77577bf..a39f473cd75 100644 --- a/mail/qmail-run/files/qmail-qread-client.sh +++ b/mail/qmail-run/files/qmail-qread-client.sh @@ -1,10 +1,10 @@ #!@SH@ # -# $NetBSD: qmail-qread-client.sh,v 1.3 2014/12/06 22:14:27 schmonz Exp $ +# $NetBSD: qmail-qread-client.sh,v 1.4 2015/11/25 12:51:30 jperkin 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 @UCSPI_TCP_PREFIX@/bin/tcpclient -RHl0 -- 127.0.0.1 20025 @SH@ -c 'exec @CAT@ <&6' +exec @PREFIX@/bin/tcpclient -RHl0 -- 127.0.0.1 20025 @SH@ -c 'exec @CAT@ <&6' diff --git a/mail/qmail-run/files/qmailpop3d.sh b/mail/qmail-run/files/qmailpop3d.sh index 9ce2ebfb682..74e80d5b322 100644 --- a/mail/qmail-run/files/qmailpop3d.sh +++ b/mail/qmail-run/files/qmailpop3d.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmailpop3d.sh,v 1.9 2014/12/06 22:14:27 schmonz Exp $ +# $NetBSD: qmailpop3d.sh,v 1.10 2015/11/25 12:51:30 jperkin Exp $ # # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs). # @@ -17,11 +17,11 @@ name="qmailpop3d" : ${qmailpop3d_datalimit:="146800640"} : ${qmailpop3d_pretcpserver:=""} : ${qmailpop3d_prepop3d:=""} -: ${qmailpop3d_checkpassword:="@CHECKPASSWORD_PREFIX@/bin/checkpassword"} +: ${qmailpop3d_checkpassword:="@PREFIX@/bin/checkpassword"} : ${qmailpop3d_maildirname:="Maildir"} : ${qmailpop3d_log:="YES"} : ${qmailpop3d_logcmd:="logger -t nb${name} -p mail.info"} -: ${qmailpop3d_nologcmd:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"} +: ${qmailpop3d_nologcmd:="@PREFIX@/bin/multilog -*"} if [ -f /etc/rc.subr ]; then . /etc/rc.subr @@ -31,7 +31,7 @@ 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="@UCSPI_TCP_PREFIX@/bin/tcpserver" +command="@PREFIX@/bin/tcpserver" procname=${name} start_precmd="qmailpop3d_precmd" extra_commands="stat pause cont cdb" @@ -48,7 +48,7 @@ qmailpop3d_precmd() if [ -f /etc/rc.subr ]; then checkyesno qmailpop3d_log || qmailpop3d_logcmd=${qmailpop3d_nologcmd} fi - 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="@SETENV@ - ${qmailpop3d_postenv} @PREFIX@/bin/softlimit -m ${qmailpop3d_datalimit} ${qmailpop3d_pretcpserver} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} ${qmailpop3d_tcpflags} -x @PKG_SYSCONFDIR@/tcp.pop3.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencypop3` ${qmailpop3d_tcphost} ${qmailpop3d_tcpport} @PREFIX@/bin/qmail-popup `@HEAD@ -1 @PKG_SYSCONFDIR@/control/me` ${qmailpop3d_checkpassword} ${qmailpop3d_prepop3d} @PREFIX@/bin/qmail-pop3d ${qmailpop3d_maildirname} 2>&1 | @PREFIX@/bin/setuidgid qmaill ${qmailpop3d_logcmd}" command_args="&" rc_flags="" } @@ -81,7 +81,7 @@ qmailpop3d_cont() qmailpop3d_cdb() { @ECHO@ "Reloading @PKG_SYSCONFDIR@/tcp.pop3." - @UCSPI_TCP_PREFIX@/bin/tcprules @PKG_SYSCONFDIR@/tcp.pop3.cdb @PKG_SYSCONFDIR@/tcp.pop3.tmp < @PKG_SYSCONFDIR@/tcp.pop3 + @PREFIX@/bin/tcprules @PKG_SYSCONFDIR@/tcp.pop3.cdb @PKG_SYSCONFDIR@/tcp.pop3.tmp < @PKG_SYSCONFDIR@/tcp.pop3 @CHMOD@ 644 @PKG_SYSCONFDIR@/tcp.pop3.cdb } diff --git a/mail/qmail-run/files/qmailqread.sh b/mail/qmail-run/files/qmailqread.sh index 83f0d0ff7b1..21f4b256936 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.7 2014/12/06 22:14:27 schmonz Exp $ +# $NetBSD: qmailqread.sh,v 1.8 2015/11/25 12:51:30 jperkin Exp $ # # @PKGNAME@ script to control a service providing local non-root # users access to see the queue. Adapted from a script by Steinar Haug. @@ -14,14 +14,14 @@ 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:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"} +: ${qmailqread_nologcmd:="@PREFIX@/bin/multilog -*"} if [ -f /etc/rc.subr ]; then . /etc/rc.subr fi rcvar=${name} -command="@UCSPI_TCP_PREFIX@/bin/tcpserver" +command="@PREFIX@/bin/tcpserver" procname=${name} start_precmd="qmailqread_precmd" @@ -30,7 +30,7 @@ qmailqread_precmd() if [ -f /etc/rc.subr ]; then checkyesno qmailqread_log || qmailqread_logcmd=${qmailqread_nologcmd} fi - 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="@SETENV@ - @PREFIX@/bin/argv0 @PREFIX@/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/setuidgid qmaill ${qmailqread_logcmd}" command_args="&" rc_flags="" } diff --git a/mail/qmail-run/files/qmailsend.sh b/mail/qmail-run/files/qmailsend.sh index c64ae3e5496..ecabfcaf8da 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.7 2014/12/06 22:14:27 schmonz Exp $ +# $NetBSD: qmailsend.sh,v 1.8 2015/11/25 12:51:30 jperkin Exp $ # # @PKGNAME@ script to control qmail-send (local and outgoing mail). # @@ -12,11 +12,11 @@ name="qmailsend" # User-settable rc.conf variables and their default values: -: ${qmailsend_postenv:="PATH=@QMAIL_PREFIX@/bin:$PATH"} +: ${qmailsend_postenv:="PATH=@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:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"} +: ${qmailsend_nologcmd:="@PREFIX@/bin/multilog -*"} if [ -f /etc/rc.subr ]; then . /etc/rc.subr @@ -25,7 +25,7 @@ fi rcvar=${name} required_files="@PKG_SYSCONFDIR@/control/defaultdelivery" required_files="${required_files} @PKG_SYSCONFDIR@/control/me" -command="@QMAIL_PREFIX@/bin/qmail-send" +command="@PREFIX@/bin/qmail-send" start_precmd="qmailsend_precmd" extra_commands="stat pause cont doqueue reload queue alrm flush hup" stat_cmd="qmailsend_stat" @@ -81,14 +81,14 @@ qmailsend_doqueue() return 1 fi @ECHO@ "Flushing timeout table and sending ALRM signal to qmail-send." - @QMAIL_PREFIX@/bin/qmail-tcpok + @PREFIX@/bin/qmail-tcpok kill -ALRM $rc_pid } qmailsend_queue() { - @QMAIL_PREFIX@/bin/qmail-qstat - @QMAIL_PREFIX@/bin/qmail-qread + @PREFIX@/bin/qmail-qstat + @PREFIX@/bin/qmail-qread } qmailsend_hup() diff --git a/mail/qmail-run/files/qmailsmtpd.sh b/mail/qmail-run/files/qmailsmtpd.sh index f88a1ed16ca..94a7e4fa9b0 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.9 2014/12/06 22:14:27 schmonz Exp $ +# $NetBSD: qmailsmtpd.sh,v 1.10 2015/11/25 12:51:30 jperkin Exp $ # # @PKGNAME@ script to control qmail-smtpd (SMTP service). # @@ -11,7 +11,7 @@ name="qmailsmtpd" # User-settable rc.conf variables and their default values: -: ${qmailsmtpd_postenv:="QMAILQUEUE=@QMAIL_PREFIX@/bin/qmail-queue"} +: ${qmailsmtpd_postenv:="QMAILQUEUE=@PREFIX@/bin/qmail-queue"} : ${qmailsmtpd_tcpflags:="-vRl0"} : ${qmailsmtpd_tcphost:="0"} : ${qmailsmtpd_tcpport:="25"} @@ -21,7 +21,7 @@ name="qmailsmtpd" : ${qmailsmtpd_postsmtpd:=""} : ${qmailsmtpd_log:="YES"} : ${qmailsmtpd_logcmd:="logger -t nb${name} -p mail.info"} -: ${qmailsmtpd_nologcmd:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"} +: ${qmailsmtpd_nologcmd:="@PREFIX@/bin/multilog -*"} if [ -f /etc/rc.subr ]; then . /etc/rc.subr @@ -31,7 +31,7 @@ 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="@UCSPI_TCP_PREFIX@/bin/tcpserver" +command="@PREFIX@/bin/tcpserver" procname=${name} start_precmd="qmailsmtpd_precmd" extra_commands="stat pause cont cdb" @@ -48,7 +48,7 @@ qmailsmtpd_precmd() if [ -f /etc/rc.subr ]; then checkyesno qmailsmtpd_log || qmailsmtpd_logcmd=${qmailsmtpd_nologcmd} fi - 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="@SETENV@ - ${qmailsmtpd_postenv} @PREFIX@/bin/softlimit -m ${qmailsmtpd_datalimit} ${qmailsmtpd_pretcpserver} @PREFIX@/bin/argv0 @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} @PREFIX@/bin/qmail-smtpd ${qmailsmtpd_postsmtpd} 2>&1 | @PREFIX@/bin/setuidgid qmaill ${qmailsmtpd_logcmd}" command_args="&" rc_flags="" } @@ -81,7 +81,7 @@ qmailsmtpd_cont() qmailsmtpd_cdb() { @ECHO@ "Reloading @PKG_SYSCONFDIR@/tcp.smtp." - @UCSPI_TCP_PREFIX@/bin/tcprules @PKG_SYSCONFDIR@/tcp.smtp.cdb @PKG_SYSCONFDIR@/tcp.smtp.tmp < @PKG_SYSCONFDIR@/tcp.smtp + @PREFIX@/bin/tcprules @PKG_SYSCONFDIR@/tcp.smtp.cdb @PKG_SYSCONFDIR@/tcp.smtp.tmp < @PKG_SYSCONFDIR@/tcp.smtp @CHMOD@ 644 @PKG_SYSCONFDIR@/tcp.smtp.cdb } -- cgit v1.2.3