pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/qmail-run Placate pkglint by abolishing LOCALBASE...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c9f2e87b2da0
branches: trunk
changeset: 642888:c9f2e87b2da0
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Sat Dec 06 22:14:27 2014 +0000
description:
Placate pkglint by abolishing LOCALBASE (no functional change
intended) and adding LICENSE and NO_CHECKSUM. Bump version.
diffstat:
mail/qmail-run/INSTALL | 6 ++++--
mail/qmail-run/Makefile | 16 +++++++++++++---
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, 51 insertions(+), 39 deletions(-)
diffs (truncated from 333 to 300 lines):
diff -r 061b1d77dc81 -r c9f2e87b2da0 mail/qmail-run/INSTALL
--- a/mail/qmail-run/INSTALL Sat Dec 06 20:44:58 2014 +0000
+++ b/mail/qmail-run/INSTALL Sat Dec 06 22:14:27 2014 +0000
@@ -1,4 +1,6 @@
QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@
+QMAIL_PREFIX=@QMAIL_PREFIX@
+UCSPI_TCP_PREFIX=@UCSPI_TCP_PREFIX@
psmsg='#
# This file was auto-generated by pkgsrc.'
@@ -6,7 +8,7 @@
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
@@ -36,7 +38,7 @@
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
diff -r 061b1d77dc81 -r c9f2e87b2da0 mail/qmail-run/Makefile
--- a/mail/qmail-run/Makefile Sat Dec 06 20:44:58 2014 +0000
+++ b/mail/qmail-run/Makefile Sat Dec 06 22:14:27 2014 +0000
@@ -1,13 +1,14 @@
-# $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@localhost
COMMENT= Configures qmail to receive and deliver mail
+LICENSE= 2-clause-bsd
DEPENDS_QMAIL= qmail>=1.03nb8:../../mail/qmail
DEPENDS+= ${DEPENDS_QMAIL}
@@ -16,6 +17,7 @@
WRKSRC= ${WRKDIR}
NO_BUILD= yes
+NO_CHECKSUM= yes
FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
FILES_SUBST+= PKGNAME=${PKGNAME:Q}
@@ -39,10 +41,18 @@
. 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'
diff -r 061b1d77dc81 -r c9f2e87b2da0 mail/qmail-run/files/mailer.conf
--- a/mail/qmail-run/files/mailer.conf Sat Dec 06 20:44:58 2014 +0000
+++ b/mail/qmail-run/files/mailer.conf Sat Dec 06 22:14:27 2014 +0000
@@ -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
-send-mail @LOCALBASE@/bin/sendmail
-mailq @LOCALBASE@/bin/qmail-qread
-newaliases @LOCALBASE@/bin/newaliases
-hoststat @LOCALBASE@/bin/qmail-tcpto
-purgestat @LOCALBASE@/bin/qmail-tcpok
+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
diff -r 061b1d77dc81 -r c9f2e87b2da0 mail/qmail-run/files/qmail-procmail.sh
--- a/mail/qmail-run/files/qmail-procmail.sh Sat Dec 06 20:44:58 2014 +0000
+++ b/mail/qmail-run/files/qmail-procmail.sh Sat Dec 06 22:14:27 2014 +0000
@@ -4,7 +4,7 @@
# 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
diff -r 061b1d77dc81 -r c9f2e87b2da0 mail/qmail-run/files/qmail-qfilter-queue.sh
--- a/mail/qmail-run/files/qmail-qfilter-queue.sh Sat Dec 06 20:44:58 2014 +0000
+++ b/mail/qmail-run/files/qmail-qfilter-queue.sh Sat Dec 06 22:14:27 2014 +0000
@@ -30,6 +30,6 @@
[ -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}
diff -r 061b1d77dc81 -r c9f2e87b2da0 mail/qmail-run/files/qmail-qread-client.sh
--- a/mail/qmail-run/files/qmail-qread-client.sh Sat Dec 06 20:44:58 2014 +0000
+++ b/mail/qmail-run/files/qmail-qread-client.sh Sat Dec 06 22:14:27 2014 +0000
@@ -1,10 +1,10 @@
#!@SH@
#
-# $NetBSD: qmail-qread-client.sh,v 1.2 2004/08/03 08:59:24 schmonz Exp $
+# $NetBSD: qmail-qread-client.sh,v 1.3 2014/12/06 22:14:27 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'
+exec @UCSPI_TCP_PREFIX@/bin/tcpclient -RHl0 -- 127.0.0.1 20025 @SH@ -c 'exec @CAT@ <&6'
diff -r 061b1d77dc81 -r c9f2e87b2da0 mail/qmail-run/files/qmailpop3d.sh
--- a/mail/qmail-run/files/qmailpop3d.sh Sat Dec 06 20:44:58 2014 +0000
+++ b/mail/qmail-run/files/qmailpop3d.sh Sat Dec 06 22:14:27 2014 +0000
@@ -1,6 +1,6 @@
#!@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).
#
@@ -17,11 +17,11 @@
: ${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
@@ -31,7 +31,7 @@
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"
@@ -48,7 +48,7 @@
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=""
}
@@ -81,7 +81,7 @@
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
}
diff -r 061b1d77dc81 -r c9f2e87b2da0 mail/qmail-run/files/qmailqread.sh
--- a/mail/qmail-run/files/qmailqread.sh Sat Dec 06 20:44:58 2014 +0000
+++ b/mail/qmail-run/files/qmailqread.sh Sat Dec 06 22:14:27 2014 +0000
@@ -1,6 +1,6 @@
#!@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.
@@ -14,14 +14,14 @@
# 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"
@@ -30,7 +30,7 @@
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=""
}
diff -r 061b1d77dc81 -r c9f2e87b2da0 mail/qmail-run/files/qmailsend.sh
--- a/mail/qmail-run/files/qmailsend.sh Sat Dec 06 20:44:58 2014 +0000
+++ b/mail/qmail-run/files/qmailsend.sh Sat Dec 06 22:14:27 2014 +0000
@@ -1,6 +1,6 @@
#!@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).
#
@@ -12,11 +12,11 @@
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
@@ -25,7 +25,7 @@
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"
@@ -81,14 +81,14 @@
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
- @LOCALBASE@/bin/qmail-qread
+ @QMAIL_PREFIX@/bin/qmail-qstat
+ @QMAIL_PREFIX@/bin/qmail-qread
}
qmailsend_hup()
diff -r 061b1d77dc81 -r c9f2e87b2da0 mail/qmail-run/files/qmailsmtpd.sh
--- a/mail/qmail-run/files/qmailsmtpd.sh Sat Dec 06 20:44:58 2014 +0000
+++ b/mail/qmail-run/files/qmailsmtpd.sh Sat Dec 06 22:14:27 2014 +0000
@@ -1,6 +1,6 @@
#!@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).
#
@@ -11,7 +11,7 @@
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"}
@@ -21,7 +21,7 @@
: ${qmailsmtpd_postsmtpd:=""}
: ${qmailsmtpd_log:="YES"}
Home |
Main Index |
Thread Index |
Old Index