ports/79094: A lot of changes on qmail master and all slave ports
Renato Botelho
renato at galle.com.br
Mon Mar 21 17:20:03 UTC 2005
>Number: 79094
>Category: ports
>Synopsis: A lot of changes on qmail master and all slave ports
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 21 17:20:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Renato Botelho
>Release: FreeBSD 5.3-RELEASE-p5 i386
>Organization:
Galle Folheados - http://www.galle.com.br
>Environment:
System: FreeBSD data.galle.com.br 5.3-RELEASE-p5 FreeBSD 5.3-RELEASE-p5 #7: Thu Mar 3 09:03:28 BRST 2005 root at srv1.galle.com.br:/usr/obj/usr/src/sys/GALLE i386
>Description:
This PR superseds ports/78923
Qmail maintainer (lioux) is cc'ed
This PR has a lot of changes on the following ports:
mail/qmail
mail/qmail-ldap
mail/qmail-mysql
mail/qmail-smtp_auth+tls
mail/qmail-spamcontrol
mail/qmail-tls
The finally of these changes is simplify qmail ports, pacify portlint
messages and remove perl dependence. If this is approved, the only
thing that use perl will be pkg-install script on qmail main port.
This script has started to be converted to shell by Marcos Tischer
Vallim (tischer at gmail.com) and when he finish the work I'll send a
PR removing all perl dependence.
Here is a resume of all changes:
o Pacify a lot of portlint WARN and FATAL messages
o Change ${PERL} to ${SED} or ${REINPLACE_CMD}
o Added patch patch-qmail-1.03-rfc2821.diff to search other MX servers
when the first return a code > 500 and < 599
o Install mkaliasdir script on ${PREFIX}/scripts directory
o Remove targets to disable-qmail and enable-sendmail and put it on a
shell script that is installed on /var/qmail/scripts. Change messages
reflect this.
o Organize better pkg-plist
o Remove thereal-post-patch target and put all on post-post-patch target
o Add [0-9] to CONFLICTS on qmail-ldap port
o Change LIB_DEPENDS to USE_MYSQL=yes on qmail-mysql port
o Change qmail-spamcontrol to don't need more to apply patches mannualy
Files added:
mail/qmail/files/bootfiles.sed.in
mail/qmail/files/enable-qmail.in
>How-To-Repeat:
>Fix:
--- qmail-ports.diff begins here ---
diff -ruN --exclude=CVS ./mail.orig/qmail/Makefile ./mail/qmail/Makefile
--- ./mail.orig/qmail/Makefile Fri Mar 11 13:40:55 2005
+++ ./mail/qmail/Makefile Mon Mar 21 12:29:24 2005
@@ -6,7 +6,7 @@
#
PORTNAME= qmail
-PORTVERSION?= ${QMAIL_VERSION}
+PORTVERSION?= ${QMAIL_VERSION}
PORTREVISION?= 3
CATEGORIES= mail
MASTER_SITES+= http://cr.yp.to/software/ \
@@ -16,6 +16,9 @@
${MASTER_SITE_QMAIL}
DISTNAME= ${PORTNAME}-${QMAIL_VERSION}
+MAINTAINER?= lioux at FreeBSD.org
+COMMENT?= A secure, reliable, efficient, simple, and fast MTA
+
# qmail-* skeleton ports including this port may not want
# its patches
.if !defined(MAIN_QMAIL_PORT_DNS_PATCH_BARRIER)
@@ -34,10 +37,19 @@
PATCHFILES+= sendmail-flagf.patch:sendmail_flagf
.endif # MAIN_QMAIL_PORT_SENDMAIL_F_PATCH_BARRIER
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:local,dns,ldap,mysql,smtp_auth_tls,tls/}
-PATCH_SITE_SUBDIR+= lioux/:local,dns,ldap,mysql,smtp_auth_tls,tls
+.if !defined(MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER)
+# This patch changes qmail-remote to skip over MX servers that greet with
+# codes 400 to 499 and to bounce mail when any MX server that qmail tries
+# greets with a code 500 to 599.
+# Created by Matthias Andree
+PATCH_SITES+= http://www-dt.e-technik.uni-dortmund.de/~ma/qmail/:rfc2821
+PATCHFILES+= patch-qmail-1.03-rfc2821.diff:rfc2821
+.endif # MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER
-MASTER_SITE_QMAIL+= \
+PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:local,dns,ldap,mysql,smtp_auth_tls,tls/}
+PATCH_SITE_SUBDIR+= lioux/:local,dns,ldap,mysql,smtp_auth_tls,tls
+
+MASTER_SITE_QMAIL+= \
http://qmail.geto.net/%SUBDIR%/ \
http://qmail.palomine.net/%SUBDIR%/ \
http://qmail.mirrors.summersault.com/%SUBDIR%/ \
@@ -114,7 +126,7 @@
# MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER
#
.if defined(WITH_QMAILQUEUE_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER)
-PATCHFILES+= qmailqueue-patch
+PATCHFILES+= qmailqueue-patch
.endif # WITH_QMAILQUEUE_PATCH && !MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER
.if defined(WITH_BIG_TODO_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER)
PATCHFILES+= big-todo.103.patch
@@ -126,9 +138,6 @@
PATCHFILES+= outgoingip.patch
.endif # WITH_OUTGOINGIP_PATCH && !MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER
-MAINTAINER?= lioux at FreeBSD.org
-COMMENT?= A secure, reliable, efficient, simple, and fast MTA
-
NO_PACKAGE= djb\'s packaging license does not allow non-standard\
qmail binary distributions
@@ -143,17 +152,6 @@
WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT?= 509
.endif # WITH_BIG_CONCURRENCY_PATCH && !MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER
-# Some configuration files we use for installing the port
-MAILER_CONF_FILE?= /etc/mail/mailer.conf
-MAKE_CONF_FILE?= /etc/make.conf
-RC_CONF_FILE?= /etc/rc.conf
-# Some programs we use when building/installing the port
-FMT?= /usr/bin/fmt
-HEAD?= /usr/bin/head
-MAILQ?= /usr/bin/mailq
-NEWALIASES?= /usr/bin/newaliases
-SENDMAIL?= /usr/sbin/sendmail
-
ALL_TARGET+= default dot-qmail.5 qmail-control.5 qmail-getpw.8 \
qmail-limits.7 qmail-newmrh.8 qmail-newu.8 qmail-pw2u.8 \
qmail-send.8 qmail-start.8 qmail-users.5
@@ -193,13 +191,13 @@
${WRKSRC}/PIC.relaygood ${WRKSRC}/PIC.rem2local
# More files normally installed with from hier.c
-BOOTFILES= ${WRKSRC}/home ${WRKSRC}/home+df ${WRKSRC}/proc \
- ${WRKSRC}/proc+df ${WRKSRC}/binm1 ${WRKSRC}/binm1+df \
- ${WRKSRC}/binm2 ${WRKSRC}/binm2+df ${WRKSRC}/binm3 \
- ${WRKSRC}/binm3+df
+BOOTFILES= home home+df proc proc+df binm1 binm1+df \
+ binm2 binm2+df binm3 binm3+df
# Supplied by Stuart Henderson <stuart at internationalschool.co.uk>
-BOOTFILES+= ${FILESDIR}/maildir
+BOOTFILES+= maildir
+
+SCRIPTS+= enable-qmail
CONFIGUREPROGS= ${WRKSRC}/install ${WRKSRC}/dnsfq ${WRKSRC}/hostname \
${WRKSRC}/dnsip ${WRKSRC}/ipmeprint ${WRKSRC}/dnsptr
@@ -213,6 +211,7 @@
NO_MTREE= yes
USE_PERL5_BUILD=yes
+USE_REINPLACE= yes
.if !defined(_PREMKINCLUDED)
.include <bsd.port.pre.mk>
@@ -265,7 +264,7 @@
@${ECHO_MSG} ""
.endif
-post-patch: thereal-post-patch slaveport-post-patch post-post-patch
+post-patch: slaveport-post-patch post-post-patch
# Yet anther ugly hack (used by qmail-* skeleton ports)
# Permits them to define local targets without braking everything
@@ -275,7 +274,26 @@
.endif
post-post-patch:
- @${PERL} -pi -ne "s!/var/qmail!${PREFIX}!;s!/usr/local/!${LOCALBASE}/!" ${WRKSRC}/Makefile
+ @${SED} 's!%%PREFIX%%!${PREFIX}!g; \
+ s!%%ECHO_CMD%%!${ECHO_CMD}!g' \
+ ${FILESDIR}/bootfiles.sed.in > \
+ ${WRKDIR}/bootfiles.sed
+.for i in ${BOOTFILES}
+ @if [ -f ${WRKSRC}/${i}.sh ] ; \
+ then \
+ ${SED} -f ${WRKDIR}/bootfiles.sed ${WRKSRC}/$i.sh > ${WRKDIR}/${i} ; \
+ elif [ -f ${FILESDIR}/${i} ] ; \
+ then \
+ ${SED} -f ${WRKDIR}/bootfiles.sed ${FILESDIR}/$i > ${WRKDIR}/${i} ; \
+ fi
+.endfor
+ @${MKDIR} ${WRKDIR}/scripts
+ @${SED} "s!%%PREFIX%%!${PREFIX}!g; s!%%DOCDIR%%!${DOCDIR}!g" \
+ ${FILESDIR}/enable-qmail.in > \
+ ${WRKDIR}/scripts/enable-qmail
+ @${SED} s!/var/qmail/!${PREFIX}/!g ${FILESDIR}/mailer.conf.sample > \
+ ${WRKDIR}/mailer.conf.sample
+ @${REINPLACE_CMD} "s!/var/qmail!${PREFIX}!;s!/usr/local/!${LOCALBASE}/!" ${WRKSRC}/Makefile
# If you want to change the qmail users, they must be changed in both
# work/*/conf-users and pkg/INSTALL.
@@ -325,137 +343,18 @@
@${TOUCH} ${PREFIX}/alias/.qmail-${i}
.endfor
@# This is not part of qmail proper, hence the 2nd class citizenship
- ${INSTALL_SCRIPT} ${FILESDIR}/mkaliasdir ${PREFIX}/${DOCDIR}
.if !defined(WITH_PRESERVE_CONFIG_FILES)
@cd ${PREFIX}/configure ; ./config
.endif
@${MKDIR} ${LOCALBASE}/etc/rc.d
@${LN} -sf ${PREFIX}/rc ${LOCALBASE}/etc/rc.d/qmail.sh
- @${ECHO}
+ @${ECHO_CMD}
@${SED} s!/var/qmail!${PREFIX}!g ${PKGMESSAGE} | ${FMT}
-
-# hack to allow slave ports to include bsd.port.pre.mk and then this file
-.if defined(_PREMKINCLUDED)
-.include <bsd.port.post.mk>
-.else
-.include <bsd.port.mk>
-.endif
-
-# Ugh... ;-)
-thereal-post-patch:
-.for i in ${BOOTFILES}
- @if [ -f ${i}.sh ] ; \
- then \
- ${PERL} -p -ne 's!QMAIL/!${PREFIX}/!;s!^(exec)!case "\$$1" in\nstart)\n\t\1!;s!(qmail)$$!\1\&\n\texit 0\n\t;;\nstop)\n\texec killall qmail-send\n\t;;\n*)\n\t${ECHO_CMD} "Usage: `basename \$$0` {start|stop}" >&2\n\texit 64\n\t;;\nesac!' $i.sh > ${WRKDIR}/${i:T} ; \
- elif [ -f ${i} ] ; \
- then \
- ${PERL} -p -ne 's!QMAIL/!${PREFIX}/!;s!^(exec)!case "\$$1" in\nstart)\n\t\1!;s!(qmail)$$!\1\&\n\texit 0\n\t;;\nstop)\n\texec killall qmail-send\n\t;;\n*)\n\t${ECHO_CMD} "Usage: `basename \$$0` {start|stop}" >&2\n\texit 64\n\t;;\nesac!' $i > ${WRKDIR}/${i:T} ; \
- fi
+ @${ECHO_CMD}
+ @${MKDIR} ${PREFIX}/scripts
+ ${INSTALL_SCRIPT} ${FILESDIR}/mkaliasdir ${PREFIX}/scripts
+.for script in ${SCRIPTS}
+ @${INSTALL_SCRIPT} ${WRKDIR}/scripts/${script} ${PREFIX}/scripts
.endfor
- @${SED} s!/var/qmail/!${PREFIX}/!g ${FILESDIR}/mailer.conf.sample > \
- ${WRKDIR}/mailer.conf.sample
-
-# Double Ugh... ;-)
-${WRKDIR}/.thereal_disable_sendmail_done:
- @if [ ! -d ${WRKDIR} ]; \
- then \
- ${MKDIR} ${WRKDIR} ; \
- fi
-
-# I would like some input on the targets below. Only constructive ones
-# please. :)
-# based on shells/pdksh /etc/shells update PLIST.
-thereal-disable-sendmail: ${WRKDIR}/.thereal_disable_sendmail_done ${RC_CONF_FILE}
- @if [ -f ${RC_CONF_FILE} ]; \
- then \
- ${CP} ${RC_CONF_FILE} ${RC_CONF_FILE}.bak && \
- ${GREP} -v sendmail_enable ${RC_CONF_FILE}.bak > \
- ${RC_CONF_FILE} && \
- ${TOUCH} ${WRKDIR}/.thereal_disable_sendmail_done ; \
- else \
- ${ECHO_MSG} "===> ERROR: YOU DO NOT HAVE A VALID ${RC_CONF_FILE}" ; \
- ${ECHO_MSG} "===> FIX this and try again" ; \
- ${FALSE} ; \
- fi
-
-disable-sendmail: thereal-disable-sendmail
- @${ECHO_MSG} "===> I hope you know what you are doing:"
- @${ECHO_MSG} "===> You just told your system to not"
- @${ECHO_MSG} "===> automaticaly start sendmail on your"
- @${ECHO_MSG} "===> next startup."
- @${ECHO_MSG} "===> (i.e., added sendmail_enable=\"NONE\" to rc.conf)"
- @if [ -f ${RC_CONF_FILE} ]; \
- then \
- ${ECHO_CMD} sendmail_enable=\"NONE\" >> ${RC_CONF_FILE} ; \
- fi
-enable-sendmail: thereal-disable-sendmail
- @${ECHO_MSG} "===> I hope you know what you are doing:"
- @${ECHO_MSG} "===> You just told your system to"
- @${ECHO_MSG} "===> automaticaly start sendmail on your"
- @${ECHO_MSG} "===> next startup."
- @${ECHO_MSG} "===> (i.e., removed sendmail_enable=\"NONE\" from rc.conf)"
-
-enable-qmail: install disable-sendmail
- @if [ -f ${MAILER_CONF_FILE} ]; \
- then \
- ${CP} ${MAILER_CONF_FILE} ${MAILER_CONF_FILE}.bak && \
- ${CP} ${WRKDIR}/mailer.conf.sample ${MAILER_CONF_FILE} ; \
- else \
- ${ECHO_MSG} "===> ERROR: YOU DO NOT HAVE A VALID ${MAILER_CONF_FILE}" ; \
- ${ECHO_MSG} "===> FIX this and try again" ; \
- ${ECHO_MSG} "===> or, do \"make force_enable_qmail\" if you are sure" ; \
- ${ECHO_MSG} "===> you want this port replacing some binaries" ; \
- ${ECHO_MSG} "===> IF THIS FEELS UNEASY, read ${PREFIX}/${DOCDIR}/REMOVE.sendmail and do it manually" ; \
- ${ECHO_MSG} "" ; \
- ${ECHO_MSG} "=======> VERY IMPORTANT <=======" ; \
- ${ECHO_MSG} "===> One side issue is that if you do replace them," ; \
- ${ECHO_MSG} "===> you really should consider ADDING \"NO_SENDMAIL=true\"" ; \
- ${ECHO_MSG} "===> to your ${MAKE_CONF_FILE} if you do \"make world\"." ; \
- ${ECHO_MSG} "===> Otherwise, \"make world\" will \"fix\" your sendmail" ; \
- ${ECHO_MSG} "===> installation breaking your qmail one." ; \
- ${ECHO_MSG} "===> Read the FreeBSD Handbook section on \"make world\"" ; \
- ${ECHO_MSG} "===> if you do not know what I am talking about." ; \
- ${ECHO_MSG} "===> Check http://www.FreeBSD.org/ for the most" ; \
- ${ECHO_MSG} "===> updated copy of the Handbook." ; \
- fi
- @${ECHO_MSG} "===> Do not forget to choose an appropriate qmail startup"
- @${ECHO_MSG} "===> script. Go through ${PREFIX}/boot, choose one"
- @${ECHO_MSG} "===> and copy the chosen script as ${PREFIX}/rc"
- @${ECHO_MSG} "===> For example, \"cp ${PREFIX}/boot/proc+df ${PREFIX}/rc\""
-
-# taken from mail/postfix idea
-force-enable-qmail: install disable-sendmail
- @${ECHO_MSG} "===> Replacing sendmail"
- @if [ -e ${SENDMAIL} ]; then \
- ${MV} -f ${SENDMAIL} ${SENDMAIL}.OFF && \
- ${CHMOD} 0 ${SENDMAIL}.OFF; \
- fi
- @if [ -e ${PREFIX}/bin/sendmail ]; then \
- ${LN} -sf ${PREFIX}/bin/sendmail ${SENDMAIL}; \
- fi
- @${ECHO_MSG} "===> Replacing mailq"
- @if [ -e ${MAILQ} ]; then \
- ${MV} -f ${MAILQ} ${MAILQ}.OFF && \
- ${CHMOD} 0 ${MAILQ}.OFF; \
- fi
- @if [ -e ${PREFIX}/bin/qmail-qread ]; then \
- ${LN} -sf ${PREFIX}/bin/qmail-qread ${MAILQ}; \
- fi
- @${ECHO_MSG} "===> Replacing newaliases"
- @if [ -e ${NEWALIASES} ]; then \
- ${MV} -f ${NEWALIASES} ${NEWALIASES}.OFF && \
- ${CHMOD} 0 ${NEWALIASES}.OFF; \
- fi
- @if [ -e ${PREFIX}/bin/newaliases ]; then \
- ${LN} -sf ${PREFIX}/bin/newaliases ${NEWALIASES}; \
- fi
-
-# The users are instructed (in PORT_NOTES) to install ${QUEUE_DIR}/rc
-# themselves. Each /var/qmail/ should have its own rc. On many machines,
-# /usr/local/ is nfs mounted and /var/qmail/ is local. An individual
-# machine may want/not-want qmail. Pity we can't add a dir to local_startup
-# from here.
-
-# Wouldn't hurt to provide an "enable_qmail" and "disable_sendmail" target
-# that do 1) and 2) above and disable the existing sendmail, respectively.
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS ./mail.orig/qmail/distinfo ./mail/qmail/distinfo
--- ./mail.orig/qmail/distinfo Fri Apr 9 07:47:18 2004
+++ ./mail/qmail/distinfo Mon Mar 21 12:30:36 2005
@@ -20,3 +20,5 @@
SIZE (outgoingip.patch) = 6839
MD5 (sendmail-flagf.patch) = 4e1f2d8315e7e2a5482798c9d19fac4d
SIZE (sendmail-flagf.patch) = 863
+MD5 (patch-qmail-1.03-rfc2821.diff) = 1b85f233ab5b9d7ec1a8da1188bf10ef
+SIZE (patch-qmail-1.03-rfc2821.diff) = 2564
diff -ruN --exclude=CVS ./mail.orig/qmail/files/bootfiles.sed.in ./mail/qmail/files/bootfiles.sed.in
--- ./mail.orig/qmail/files/bootfiles.sed.in Wed Dec 31 21:00:00 1969
+++ ./mail/qmail/files/bootfiles.sed.in Wed Mar 16 12:33:33 2005
@@ -0,0 +1,15 @@
+s!QMAIL/!%%PREFIX%%/!
+s!^\(exec\)!case "\$1" in\
+start)\
+\ \1!
+s!\(qmail\)$!\1\&\
+\ exit 0\
+\ ;;\
+stop)\
+\ exec killall qmail-send\
+\ ;;\
+*)\
+\ %%ECHO_CMD%% "Usage: `basename \$0` {start|stop}" >\&2\
+\ exit 64\
+\ ;;\
+esac!
diff -ruN --exclude=CVS ./mail.orig/qmail/files/enable-qmail.in ./mail/qmail/files/enable-qmail.in
--- ./mail.orig/qmail/files/enable-qmail.in Wed Dec 31 21:00:00 1969
+++ ./mail/qmail/files/enable-qmail.in Fri Mar 18 10:42:54 2005
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+disable_sendmail() {
+ echo "===> I hope you know what you are doing:"
+ echo "===> You just told your system to not"
+ echo "===> automaticaly start sendmail on your"
+ echo "===> next startup."
+ echo "===> (i.e., added sendmail_enable=\"NONE\" to rc.conf)"
+
+ if [ -f ${RC_CONF_FILE} ]; then
+ echo sendmail_enable=\"NONE\" >> ${RC_CONF_FILE}
+ fi
+}
+
+enable_qmail() {
+ if [ -f ${MAILER_CONF_FILE} ]; then
+ cp ${MAILER_CONF_FILE} ${MAILER_CONF_FILE}.bak && \
+ cp %%PREFIX%%/%%DOCDIR%%/mailer.conf.sample ${MAILER_CONF_FILE}
+ else
+ echo "===> ERROR: YOU DO NOT HAVE A VALID ${MAILER_CONF_FILE}"
+ echo "===> FIX this and try again"
+ echo "===> or, run \"$0 --force\" if you are sure"
+ echo "===> you want this port replacing some binaries"
+ echo "===> IF THIS FEELS UNEASY, read %%PREFIX%%/%%DOCDIR%%/REMOVE.sendmail and do it manually"
+ echo ""
+ echo "=======> VERY IMPORTANT <======="
+ echo "===> One side issue is that if you do replace them,"
+ echo "===> you really should consider ADDING \"NO_SENDMAIL=true\""
+ echo "===> to your /etc/make.conf if you do \"make world\"."
+ echo "===> Otherwise, \"make world\" will \"fix\" your sendmail"
+ echo "===> installation breaking your qmail one."
+ echo "===> Read the FreeBSD Handbook section on \"make world\""
+ echo "===> if you do not know what I am talking about."
+ echo "===> Check http://www.FreeBSD.org/ for the most"
+ echo "===> updated copy of the Handbook."
+ fi
+ echo "===> Do not forget to choose an appropriate qmail startup"
+ echo "===> script. Go through %%PREFIX%%/boot, choose one"
+ echo "===> and copy the chosen script as %%PREFIX%%/rc"
+ echo "===> For example, \"cp %%PREFIX%%/boot/proc+df %%PREFIX%%/rc\""
+}
+
+# taken from mail/postfix idea
+force_enable_qmail() {
+ echo "===> Replacing sendmail"
+ if [ -e ${SENDMAIL} ]; then
+ mv -f ${SENDMAIL} ${SENDMAIL}.OFF && \
+ chmod 0 ${SENDMAIL}.OFF
+ fi
+ if [ -e %%PREFIX%%/bin/sendmail ]; then
+ ln -sf %%PREFIX%%/bin/sendmail ${SENDMAIL}
+ fi
+
+ echo "===> Replacing mailq"
+ if [ -e ${MAILQ} ]; then
+ mv -f ${MAILQ} ${MAILQ}.OFF && \
+ chmod 0 ${MAILQ}.OFF
+ fi
+ if [ -e %%PREFIX%%/bin/qmail-qread ]; then
+ ln -sf %%PREFIX%%/bin/qmail-qread ${MAILQ}
+ fi
+
+ echo "===> Replacing newaliases"
+ if [ -e ${NEWALIASES} ]; then
+ mv -f ${NEWALIASES} ${NEWALIASES}.OFF && \
+ chmod 0 ${NEWALIASES}.OFF
+ fi
+ if [ -e %%PREFIX%%/bin/newaliases ]; then
+ ln -sf %%PREFIX%%/bin/newaliases ${NEWALIASES}
+ fi
+}
+
+# main
+RC_CONF_FILE=/etc/rc.conf
+MAILER_CONF_FILE=/etc/mail/mailer.conf
+SENDMAIL=/usr/sbin/sendmail
+MAILQ=/usr/bin/mailq
+NEWALIASES=/usr/bin/newaliases
+
+disable_sendmail
+
+if [ "$1" = "--force"]; then
+ force_enable_qmail
+else
+ enable_qmail
+fi
diff -ruN --exclude=CVS ./mail.orig/qmail/pkg-install ./mail/qmail/pkg-install
--- ./mail.orig/qmail/pkg-install Sat Jul 25 17:05:53 1998
+++ ./mail/qmail/pkg-install Tue Mar 15 09:49:11 2005
@@ -15,6 +15,8 @@
exit 0;
}
+$pw = "/usr/sbin/pw";
+$nonexistent = "/nonexistent";
@groups = ("qmail", "qnofiles");
%users = ('qmaild', "qnofiles", 'qmaill', "qnofiles", 'qmailp', "qnofiles",
'qmailq', "qmail", 'qmailr', "qmail", 'qmails', "qmail");
@@ -33,7 +35,7 @@
do checkrpw; # May exit
$x = "-g $gids{$group}";
- $result = system ("/usr/sbin/pw groupadd $group $x");
+ $result = system ("$pw groupadd $group $x");
if ($result) {
die "Failed to add group $group as gid $gids{$group}\n";
}
@@ -44,7 +46,7 @@
do checkrpw; # May exit
$x = "-u $uids{'alias'}";
- $result = system ("/usr/sbin/pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/alias\" -s /nonexistent $x");
+ $result = system ("$pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/alias\" -s $nonexistent $x");
if ($result) {
die "Failed to add user alias as uid $uids{'alias'}\n";
}
@@ -55,7 +57,7 @@
do checkrpw; # May exit
$x = "-u $uids{$user}";
- $result = system ("/usr/sbin/pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}\" -s /nonexistent $x");
+ $result = system ("$pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}\" -s $nonexistent $x");
if ($result) {
die "Failed to add user $user as uid $uids{$user}\n";
}
@@ -84,7 +86,7 @@
exit 0;
sub checkrpw {
- if (! -x "/usr/sbin/pw") {
+ if (! -x "$pw") {
print <<'EOM';
This system looks like a pre-2.2 version of FreeBSD. We see that it
is missing the "pw" utility. We need this utility. Please get and
@@ -93,7 +95,7 @@
ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/pw.tar.gz
EOM
- die "No /usr/sbin/pw";
+ die "No $pw";
}
if ($> != 0) {
diff -ruN --exclude=CVS ./mail.orig/qmail/pkg-message ./mail/qmail/pkg-message
--- ./mail.orig/qmail/pkg-message Fri Jul 7 15:52:32 2000
+++ ./mail/qmail/pkg-message Thu Mar 17 16:39:29 2005
@@ -7,10 +7,5 @@
You should also add /var/qmail/man to your MANPATH (see manpath(1)
or login.conf(5)).
-You can enable qmail as your default mailer:
-
-# this will disable the default MTA
-1) do "make disable-sendmail"
-
-# enable qmail as your default MTA
-2) do "make enable-qmail"
+You can enable qmail as your default mailer executing:
+> /var/qmail/scripts/enable-qmail
diff -ruN --exclude=CVS ./mail.orig/qmail/pkg-plist ./mail/qmail/pkg-plist
--- ./mail.orig/qmail/pkg-plist Sun Feb 11 23:53:22 2001
+++ ./mail/qmail/pkg-plist Fri Mar 18 10:11:30 2005
@@ -1,37 +1,3 @@
-%%PORTDOCS%%%%DOCDIR%%/FAQ
-%%PORTDOCS%%%%DOCDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
-%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
-%%PORTDOCS%%%%DOCDIR%%/TEST.receive
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
-%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
-%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
-boot/home
-boot/home+df
-boot/proc
-boot/proc+df
-boot/binm1
-boot/binm1+df
-boot/binm2
-boot/binm2+df
-boot/binm3
-boot/binm3+df
-
@group qmail
@mode 04711
@comment *** NOTE different owner
@@ -40,122 +6,114 @@
@owner
@mode 0700
bin/qmail-lspawn
- at mode 0700
+bin/qmail-newmrh
+bin/qmail-newu
bin/qmail-start
@mode 0711
+bin/qmail-clean
bin/qmail-getpw
- at mode 0711
bin/qmail-local
- at mode 0711
+bin/qmail-popup
+bin/qmail-pw2u
bin/qmail-remote
- at mode 0711
bin/qmail-rspawn
- at mode 0711
-bin/qmail-clean
- at mode 0711
bin/qmail-send
- at mode 0711
bin/splogger
- at mode 0700
-bin/qmail-newu
- at mode 0700
-bin/qmail-newmrh
- at mode 0711
-bin/qmail-pw2u
- at mode 0755
-bin/qmail-inject
- at mode 0755
-bin/predate
@mode 0755
+bin/bouncesaying
+bin/condredirect
bin/datemail
- at mode 0755
+bin/elq
+bin/except
+bin/forward
+bin/maildir2mbox
+bin/maildirmake
+bin/maildirwatch
bin/mailsubj
- at mode 0755
-bin/qmail-showctl
- at mode 0755
-bin/qmail-qread
- at mode 0755
-bin/qmail-qstat
- at mode 0755
-bin/qmail-tcpto
- at mode 0755
-bin/qmail-tcpok
- at mode 0755
+bin/pinq
+bin/predate
+bin/preline
+bin/qail
+bin/qbiff
+bin/qmail-inject
bin/qmail-pop3d
- at mode 0711
-bin/qmail-popup
- at mode 0755
bin/qmail-qmqpc
- at mode 0755
bin/qmail-qmqpd
- at mode 0755
bin/qmail-qmtpd
- at mode 0755
+bin/qmail-qread
+bin/qmail-qstat
+bin/qmail-showctl
bin/qmail-smtpd
- at mode 0755
-bin/sendmail
- at mode 0755
-bin/tcp-env
- at mode 0755
+bin/qmail-tcpok
+bin/qmail-tcpto
bin/qreceipt
- at mode 0755
bin/qsmhook
- at mode 0755
-bin/qbiff
- at mode 0755
-bin/forward
- at mode 0755
-bin/preline
- at mode 0755
-bin/condredirect
- at mode 0755
-bin/bouncesaying
- at mode 0755
-bin/except
- at mode 0755
-bin/maildirmake
- at mode 0755
-bin/maildir2mbox
- at mode 0755
-bin/maildirwatch
- at mode 0755
-bin/qail
- at mode 0755
-bin/elq
- at mode 0755
-bin/pinq
-
+bin/sendmail
+bin/tcp-env
@group
@owner
@mode
-
+boot/binm1
+boot/binm1+df
+boot/binm2
+boot/binm2+df
+boot/binm3
+boot/binm3+df
+boot/home
+boot/home+df
+boot/maildir
+boot/proc
+boot/proc+df
@comment This port installs the following manually (ie. not through qmail-hier)
-configure/install
configure/config
configure/config-fast
configure/dnsfq
-configure/hostname
configure/dnsip
-configure/ipmeprint
configure/dnsptr
+configure/hostname
+configure/install
+configure/ipmeprint
+scripts/enable-qmail
+scripts/mkaliasdir
%%PORTDOCS%%%%DOCDIR%%/BLURB
%%PORTDOCS%%%%DOCDIR%%/BLURB2
%%PORTDOCS%%%%DOCDIR%%/BLURB3
%%PORTDOCS%%%%DOCDIR%%/BLURB4
+%%PORTDOCS%%%%DOCDIR%%/FAQ
+%%PORTDOCS%%%%DOCDIR%%/INSTALL
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
%%PORTDOCS%%%%DOCDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCDIR%%/SECURITY
-%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
+%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
+%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
+%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
+%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
+%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
+%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
+%%PORTDOCS%%%%DOCDIR%%/SECURITY
+%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
+%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
+%%PORTDOCS%%%%DOCDIR%%/TEST.receive
+%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
+%%PORTDOCS%%%%DOCDIR%%/UPGRADE
%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
-%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
-boot/maildir
%%PORTDOCS%%@dirrm %%DOCDIR%%
+ at dirrm scripts
@dirrm configure
@dirrm boot
@dirrm bin
-
@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
- at unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. Go to mail/qmail portsdir and do a 'make enable-sendmail'" | /usr/bin/fmt
+ at unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" | /usr/bin/fmt
diff -ruN --exclude=CVS ./mail.orig/qmail-ldap/Makefile ./mail/qmail-ldap/Makefile
--- ./mail.orig/qmail-ldap/Makefile Fri Feb 11 19:11:51 2005
+++ ./mail/qmail-ldap/Makefile Mon Mar 21 13:05:37 2005
@@ -13,43 +13,50 @@
PATCH_SITES= http://www.nrg4u.com/qmail/:ldap
PATCHFILES= qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz:ldap
-PATCH_DIST_STRIP+= -p1
-
-EXTRA_PATCHES+= ${QMAIL_PORT_PATCHDIR}/patch-ab ${QMAIL_PORT_PATCHDIR}/patch-ac
MAINTAINER= lioux at FreeBSD.org
COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support
-CONFLICTS= nss-* emboss-* digest-*
+EXTRA_PATCHES+= ${QMAIL_PORT_PATCHDIR}/patch-ab ${QMAIL_PORT_PATCHDIR}/patch-ac
+PATCH_DIST_STRIP+= -p1
+
+CONFLICTS= nss-[0-9]* emboss-[0-9]* digest-[0-9]*
USE_OPENLDAP= yes
+USE_REINPLACE= yes
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}2
.if !defined(WITHOUT_TLS)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-with_tls
+PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-with_tls
USE_OPENSSL= yes
.endif # WITHOUT_TLS
# Patches from the main qmail port are not wanted
-MAIN_QMAIL_PORT_DNS_PATCH_BARRIER= yes
+MAIN_QMAIL_PORT_DNS_PATCH_BARRIER= yes
MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER= yes
-MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes
+MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes
+MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER= yes
LDAP_PATCH_DATE= 20020901
# Using default from master port, i.e., /var/qmail
PREFIX?= ${QMAIL_PORT_PREFIX}
-#PREFIX= /var/qmail-ldap
-.if !defined(PRE_MK_INCLUDED)
+.if !defined(_PREMKINCLUDED)
.include <bsd.port.pre.mk>
.endif
-#QMAIL_PORT= ${PORTSDIR}/mail/qmail
-QMAIL_PORT= ${.CURDIR}/../qmail
+# Local overrides
+MASTERDIR= ${.CURDIR}/../qmail
+PATCHDIR= ${.CURDIR}/files
+PKGDIR_LOCAL= ${.CURDIR}
+DESCR= ${PKGDIR_LOCAL}/pkg-descr
+PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
+PLIST= ${PKGDIR_LOCAL}/pkg-plist
+
QMAIL_TLS_PORT= ${.CURDIR}/../qmail-tls
-QMAIL_PORT_PREFIX!= cd ${QMAIL_PORT} && ${MAKE} -V PREFIX
-QMAIL_PORT_PATCHDIR!= cd ${QMAIL_PORT} && ${MAKE} -V PATCHDIR
+QMAIL_PORT_PREFIX!= cd ${MASTERDIR} && ${MAKE} -V PREFIX
+QMAIL_PORT_PATCHDIR!= cd ${MASTERDIR} && ${MAKE} -V PATCHDIR
DOCFILES+= ${WRKSRC}/QLDAPINSTALL ${WRKSRC}/QLDAPNEWS \
${WRKSRC}/POPBEFORESMTP \
@@ -71,32 +78,32 @@
slaveport-post-patch: qmail-ldap-post-patch
qmail-ldap-post-patch:
- @${PERL} -pi -ne "s|LDAPLIBS=-L/usr/local/lib|LDAPLIBS=-L${LOCALBASE}/lib|;s|LDAPINCLUDES=-I/usr/local/include|LDAPINCLUDES=-I${LOCALBASE}/include|" ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} "s|LDAPLIBS=-L/usr/local/lib|LDAPLIBS=-L${LOCALBASE}/lib|;s|LDAPINCLUDES=-I/usr/local/include|LDAPINCLUDES=-I${LOCALBASE}/include|" ${WRKSRC}/Makefile
.if !defined(WITHOUT_TLS)
- @${PERL} -pi -ne "s|#TLSON=|TLSON=|; \
+ @${REINPLACE_CMD} "s|#TLSON=|TLSON=|; \
s|#TLSINCLUDES=-I/usr/local/include|TLSINCLUDES=-I${OPENSSLBASE}/include|; \
s|#TLSLIBS=-L/usr/local/lib|TLSLIBS=-L${OPENSSLBASE}/lib|; \
s|#OPENSSLBIN=/usr/local/bin/openssl|OPENSSLBIN=${OPENSSLBASE}/bin/openssl|" \
${WRKSRC}/Makefile
.endif # !WITHOUT_TLS
.if !defined(WITHOUT_LDAP_CLUSTER)
- @${PERL} -pi -ne "s|#LDAPFLAGS=-DQLDAP_CLUSTER\s+-DEXTERNAL_TODO|LDAPFLAGS\+=-DQLDAP_CLUSTER -DEXTERNAL_TODO#|" ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} "s|#LDAPFLAGS=-DQLDAP_CLUSTER\s+-DEXTERNAL_TODO|LDAPFLAGS\+=-DQLDAP_CLUSTER -DEXTERNAL_TODO#|" ${WRKSRC}/Makefile
.endif # WITHOUT_LDAP_CLUSTER
.if !defined(WITHOUT_AUTOMAILDIRMAKE)
- @${PERL} -pi -ne "s|#MDIRMAKE=-DAUTOMAILDIRMAKE|MDIRMAKE=-DAUTOMAILDIRMAKE|" ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} "s|#MDIRMAKE=-DAUTOMAILDIRMAKE|MDIRMAKE=-DAUTOMAILDIRMAKE|" ${WRKSRC}/Makefile
.endif # WITHOUT_AUTOMAILDIRMAKE
.if !defined(WITHOUT_AUTOHOMEDIRMAKE)
- @${PERL} -pi -ne "s|#HDIRMAKE=-DAUTOHOMEDIRMAKE|HDIRMAKE=-DAUTOHOMEDIRMAKE|" ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} "s|#HDIRMAKE=-DAUTOHOMEDIRMAKE|HDIRMAKE=-DAUTOHOMEDIRMAKE|" ${WRKSRC}/Makefile
.endif # WITHOUT_AUTOHOMEDIRMAKE
.if defined(WITH_LDAP_DEBUG)
- @${PERL} -pi -ne "s|#DEBUG=-DDEBUG|DEBUG=-DDEBUG|" ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} "s|#DEBUG=-DDEBUG|DEBUG=-DDEBUG|" ${WRKSRC}/Makefile
.endif # WITH_LDAP_DEBUG
.if defined(WITH_CLEARTEXTPASSWD)
- @${PERL} -pi -ne "s|^#\s*-DCLEARTEXTPASSWD.*$$|LDAPFLAGS\+=-DCLEARTEXTPASSWD|" \
+ @${REINPLACE_CMD} "s|^#\s*-DCLEARTEXTPASSWD.*$$|LDAPFLAGS\+=-DCLEARTEXTPASSWD|" \
${WRKSRC}/Makefile
.endif # WITH_CLEARTEXTPASSWD
.if defined(WITH_DASH_EXT)
- @${PERL} -pi -ne "s|^# -DDASH_EXT.*$$|LDAPFLAGS\+=-DDASH_EXT|" \
+ @${REINPLACE_CMD} "s|^# -DDASH_EXT.*$$|LDAPFLAGS\+=-DDASH_EXT|" \
${WRKSRC}/Makefile
.endif # WITH_DASH_EXT
@@ -105,15 +112,5 @@
certificate-req:
@cd ${QMAIL_TLS_PORT} && ${MAKE} $@ clean
-
-# Local overrides
-MASTERDIR= ${QMAIL_PORT}
-PATCHDIR= ${.CURDIR}/files
-PKGDIR_LOCAL= ${.CURDIR}
-DESCR= ${PKGDIR_LOCAL}/pkg-descr
-PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
-PLIST= ${PKGDIR_LOCAL}/pkg-plist
-
-PRE_MK_INCLUDED= yes
.include "${MASTERDIR}/Makefile"
diff -ruN --exclude=CVS ./mail.orig/qmail-ldap/pkg-message ./mail/qmail-ldap/pkg-message
--- ./mail.orig/qmail-ldap/pkg-message Sat Nov 10 22:25:28 2001
+++ ./mail/qmail-ldap/pkg-message Fri Mar 18 10:05:40 2005
@@ -11,13 +11,8 @@
this is NOT our old stock qmail. And, /var/qmail/doc/ANTISPAM
for some antispam control measures.
-You can enable qmail as your default mailer:
-
-# this will disable the default MTA
-1) do "make disable-sendmail"
-
-# enable qmail as your default MTA
-2) do "make enable-qmail"
+You can enable qmail as your default mailer executing:
+> /var/qmail/scripts/enable-qmail
=====><=====
diff -ruN --exclude=CVS ./mail.orig/qmail-ldap/pkg-plist ./mail/qmail-ldap/pkg-plist
--- ./mail.orig/qmail-ldap/pkg-plist Tue Apr 13 20:26:09 2004
+++ ./mail/qmail-ldap/pkg-plist Fri Mar 18 10:10:42 2005
@@ -1,42 +1,3 @@
-%%PORTDOCS%%%%DOCDIR%%/FAQ
-%%PORTDOCS%%%%DOCDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
-%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
-%%PORTDOCS%%%%DOCDIR%%/TEST.receive
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
-%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
-%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
-%%PORTDOCS%%%%DOCDIR%%/POPBEFORESMTP
-%%PORTDOCS%%%%DOCDIR%%/QLDAPINSTALL
-%%PORTDOCS%%%%DOCDIR%%/QLDAPNEWS
-%%PORTDOCS%%%%DOCDIR%%/QLDAPTODO
-%%PORTDOCS%%%%DOCDIR%%/QLDAPPICTURE
-boot/home
-boot/home+df
-boot/proc
-boot/proc+df
-boot/binm1
-boot/binm1+df
-boot/binm2
-boot/binm2+df
-boot/binm3
-boot/binm3+df
-
@group qmail
@mode 04711
@comment *** NOTE different owner
@@ -44,141 +5,130 @@
bin/qmail-queue
@owner
@mode 0700
+bin/auth_pop
+bin/auth_imap
+bin/qmail-ldaplookup
bin/qmail-lspawn
- at mode 0700
+bin/qmail-newmrh
+bin/qmail-newu
bin/qmail-start
@mode 0711
+bin/qmail-clean
bin/qmail-getpw
- at mode 0711
bin/qmail-local
- at mode 0711
+bin/qmail-popup
+bin/qmail-pw2u
bin/qmail-remote
- at mode 0711
bin/qmail-rspawn
- at mode 0711
-bin/qmail-clean
- at mode 0711
bin/qmail-send
- at mode 0711
bin/splogger
- at mode 0700
-bin/qmail-newu
- at mode 0700
-bin/qmail-newmrh
- at mode 0711
-bin/qmail-pw2u
- at mode 0755
-bin/qmail-inject
- at mode 0755
-bin/predate
@mode 0755
+bin/bouncesaying
+bin/condredirect
bin/datemail
- at mode 0755
bin/digest
- at mode 0755
+bin/elq
+bin/except
+bin/forward
+bin/maildir2mbox
+bin/maildirmake
+bin/maildirwatch
bin/mailsubj
- at mode 0755
bin/pbsadd
- at mode 0755
bin/pbscheck
- at mode 0755
bin/pbsdbd
- at mode 0755
-bin/qmail-showctl
- at mode 0755
-bin/qmail-qread
- at mode 0755
-bin/qmail-qstat
- at mode 0755
-bin/qmail-tcpto
- at mode 0755
-bin/qmail-tcpok
- at mode 0755
+bin/pinq
+bin/predate
+bin/preline
+bin/qail
+bin/qbiff
+bin/qmail-inject
bin/qmail-pop3d
- at mode 0711
-bin/qmail-popup
- at mode 0755
bin/qmail-qmqpc
- at mode 0755
bin/qmail-qmqpd
- at mode 0755
bin/qmail-qmtpd
- at mode 0755
+bin/qmail-qread
+bin/qmail-qstat
+bin/qmail-quotawarn
+bin/qmail-reply
+bin/qmail-showctl
bin/qmail-smtpd
- at mode 0755
+bin/qmail-tcpok
+bin/qmail-tcpto
bin/qmail-todo
- at mode 0755
-bin/sendmail
- at mode 0755
-bin/tcp-env
- at mode 0755
bin/qreceipt
- at mode 0755
bin/qsmhook
- at mode 0755
-bin/qbiff
- at mode 0755
-bin/forward
- at mode 0755
-bin/preline
- at mode 0755
-bin/condredirect
- at mode 0755
-bin/bouncesaying
- at mode 0755
-bin/except
- at mode 0755
-bin/maildirmake
- at mode 0755
-bin/maildir2mbox
- at mode 0755
-bin/maildirwatch
- at mode 0755
-bin/qail
- at mode 0755
-bin/elq
- at mode 0755
-bin/pinq
- at mode 0755
-bin/qmail-reply
- at mode 0755
-bin/qmail-quotawarn
- at mode 0700
-bin/auth_pop
- at mode 0700
-bin/auth_imap
- at mode 0700
-bin/qmail-ldaplookup
-
+bin/sendmail
+bin/tcp-env
@group
@owner
@mode
-
+boot/binm1
+boot/binm1+df
+boot/binm2
+boot/binm2+df
+boot/binm3
+boot/binm3+df
+boot/home
+boot/home+df
+boot/maildir
+boot/proc
+boot/proc+df
@comment This port installs the following manually (ie. not through qmail-hier)
-configure/install
configure/config
configure/config-fast
configure/dnsfq
-configure/hostname
configure/dnsip
-configure/ipmeprint
configure/dnsptr
+configure/hostname
+configure/install
+configure/ipmeprint
+scripts/enable-qmail
+scripts/mkaliasdir
%%PORTDOCS%%%%DOCDIR%%/BLURB
%%PORTDOCS%%%%DOCDIR%%/BLURB2
%%PORTDOCS%%%%DOCDIR%%/BLURB3
%%PORTDOCS%%%%DOCDIR%%/BLURB4
+%%PORTDOCS%%%%DOCDIR%%/FAQ
+%%PORTDOCS%%%%DOCDIR%%/INSTALL
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
%%PORTDOCS%%%%DOCDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCDIR%%/SECURITY
-%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
+%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
+%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
+%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
+%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
+%%PORTDOCS%%%%DOCDIR%%/POPBEFORESMTP
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
+%%PORTDOCS%%%%DOCDIR%%/QLDAPINSTALL
+%%PORTDOCS%%%%DOCDIR%%/QLDAPNEWS
+%%PORTDOCS%%%%DOCDIR%%/QLDAPTODO
+%%PORTDOCS%%%%DOCDIR%%/QLDAPPICTURE
+%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
+%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
+%%PORTDOCS%%%%DOCDIR%%/SECURITY
+%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
+%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
+%%PORTDOCS%%%%DOCDIR%%/TEST.receive
+%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
+%%PORTDOCS%%%%DOCDIR%%/UPGRADE
%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
-%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
-boot/maildir
%%PORTDOCS%%@dirrm %%DOCDIR%%
+ at dirrm scripts
@dirrm configure
@dirrm boot
@dirrm bin
-
- at unexec echo "If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
+ at unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
+ at unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
+ at unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" | /usr/bin/fmt
diff -ruN --exclude=CVS ./mail.orig/qmail-mysql/Makefile ./mail/qmail-mysql/Makefile
--- ./mail.orig/qmail-mysql/Makefile Tue Mar 15 12:05:50 2005
+++ ./mail/qmail-mysql/Makefile Fri Mar 18 12:45:55 2005
@@ -18,6 +18,7 @@
COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH MySQL support
USE_MYSQL= yes
+USE_REINPLACE= yes
# patches from the master port that brake this one are now allowed
MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER= yes
@@ -26,30 +27,25 @@
# Using default from master port, i.e., /var/qmail
PREFIX?= ${QMAIL_PORT_PREFIX}
-#PREFIX= /var/qmail-mysql
-.if !defined(PRE_MK_INCLUDED)
+.if !defined(_PREMKINCLUDED)
.include <bsd.port.pre.mk>
.endif
-#QMAIL_PORT= ${PORTSDIR}/mail/qmail
-QMAIL_PORT= ${.CURDIR}/../qmail
-QMAIL_PORT_PREFIX!= cd ${QMAIL_PORT} && ${MAKE} -V PREFIX
+# Local overrides
+MASTERDIR= ${.CURDIR}/../qmail
+PKGDIR_LOCAL= ${.CURDIR}
+DESCR= ${PKGDIR_LOCAL}/pkg-descr
+PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
+
+QMAIL_PORT_PREFIX!= cd ${MASTERDIR} && ${MAKE} -V PREFIX
# Yet anther ugly hack (works due to code inside the main qmail port)
slaveport-post-patch: qmail-mysql-post-patch
qmail-mysql-post-patch:
- @${PERL} -pi -ne \
+ @${REINPLACE_CMD} \
's|/opt/mysql|${LOCALBASE}|' \
${WRKSRC}/Makefile
-
-# Local overrides
-MASTERDIR= ${QMAIL_PORT}
-PKGDIR_LOCAL= ${.CURDIR}
-DESCR= ${PKGDIR_LOCAL}/pkg-descr
-PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
-
-PRE_MK_INCLUDED= yes
.include "${MASTERDIR}/Makefile"
diff -ruN --exclude=CVS ./mail.orig/qmail-mysql/pkg-message ./mail/qmail-mysql/pkg-message
--- ./mail.orig/qmail-mysql/pkg-message Mon Feb 12 00:08:53 2001
+++ ./mail/qmail-mysql/pkg-message Fri Mar 18 10:06:03 2005
@@ -10,10 +10,5 @@
Do not forget to read http://iain.cx/unix/qmail/mysql.php. After all,
this is NOT our old stock qmail.
-You can enable qmail as your default mailer:
-
-# this will disable the default MTA
-1) do "make disable-sendmail"
-
-# enable qmail as your default MTA
-2) do "make enable-qmail"
+You can enable qmail as your default mailer executing:
+> /var/qmail/scripts/enable-qmail
diff -ruN --exclude=CVS ./mail.orig/qmail-smtp_auth+tls/Makefile ./mail/qmail-smtp_auth+tls/Makefile
--- ./mail.orig/qmail-smtp_auth+tls/Makefile Thu Mar 11 23:28:38 2004
+++ ./mail/qmail-smtp_auth+tls/Makefile Mon Mar 21 12:34:32 2005
@@ -20,17 +20,18 @@
ONLY_FOR_ARCHS= i386
USE_OPENSSL= YES
+USE_REINPLACE= yes
# Patches from the main qmail port are not wanted
MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes
+MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER= yes
SMTP_AUTH-TLS_PATCH_DATE= 20020519
# Using default from master port, i.e., /var/qmail
PREFIX?= ${QMAIL_PORT_PREFIX}
-#PREFIX= /var/qmail-smtp_auth+tls
-.if !defined(PRE_MK_INCLUDED)
+.if !defined(_PREMKINCLUDED)
.include <bsd.port.pre.mk>
.endif
@@ -40,9 +41,14 @@
CFLAGS+= -DDEBUG
.endif # WITH_TLS_DEBUG
-#QMAIL_PORT= ${PORTSDIR}/mail/qmail
-QMAIL_PORT= ${.CURDIR}/../qmail
-QMAIL_PORT_PREFIX!= cd ${QMAIL_PORT} && ${MAKE} -V PREFIX
+# Local overrides
+MASTERDIR= ${.CURDIR}/../qmail
+PKGDIR_LOCAL= ${.CURDIR}
+DESCR= ${PKGDIR_LOCAL}/pkg-descr
+PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
+PLIST= ${PKGDIR_LOCAL}/pkg-plist
+
+QMAIL_PORT_PREFIX!= cd ${MASTERDIR} && ${MAKE} -V PREFIX
DOCFILES+= ${WRKDIR}/SMTP_AUTH+TLS.readme \
${WRKSRC}/README.auth
@@ -58,7 +64,7 @@
@${HEAD} -6 ${DISTDIR}/qmail-1.03-starttls-smtp-auth.patch \
| ${TAIL} -5 \
> ${WRKDIR}/SMTP_AUTH+TLS.readme
- @${PERL} -pi -ne "s|/usr/local/ssl|${OPENSSLBASE}|" ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} "s|/usr/local/ssl|${OPENSSLBASE}|" ${WRKSRC}/Makefile
# Primary Ugh... ;-)
# idea stolen from www/apache13-ssl, a target written by adam at algroup.co.uk
@@ -98,12 +104,5 @@
else \
${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
fi
-
-# Local overrides
-MASTERDIR= ${QMAIL_PORT}
-PKGDIR_LOCAL= ${.CURDIR}
-DESCR= ${PKGDIR_LOCAL}/pkg-descr
-PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
-PLIST= ${PKGDIR_LOCAL}/pkg-plist
.include "${MASTERDIR}/Makefile"
diff -ruN --exclude=CVS ./mail.orig/qmail-smtp_auth+tls/pkg-plist ./mail/qmail-smtp_auth+tls/pkg-plist
--- ./mail.orig/qmail-smtp_auth+tls/pkg-plist Thu Mar 11 23:28:38 2004
+++ ./mail/qmail-smtp_auth+tls/pkg-plist Fri Mar 18 10:10:53 2005
@@ -1,39 +1,3 @@
-%%PORTDOCS%%%%DOCDIR%%/FAQ
-%%PORTDOCS%%%%DOCDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
-%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
-%%PORTDOCS%%%%DOCDIR%%/TEST.receive
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
-%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
-%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
-%%PORTDOCS%%%%DOCDIR%%/README.auth
-%%PORTDOCS%%%%DOCDIR%%/SMTP_AUTH+TLS.readme
-boot/home
-boot/home+df
-boot/proc
-boot/proc+df
-boot/binm1
-boot/binm1+df
-boot/binm2
-boot/binm2+df
-boot/binm3
-boot/binm3+df
-
@group qmail
@mode 04711
@comment *** NOTE different owner
@@ -42,122 +6,116 @@
@owner
@mode 0700
bin/qmail-lspawn
- at mode 0700
+bin/qmail-newmrh
+bin/qmail-newu
bin/qmail-start
@mode 0711
+bin/qmail-clean
bin/qmail-getpw
- at mode 0711
bin/qmail-local
- at mode 0711
+bin/qmail-popup
+bin/qmail-pw2u
bin/qmail-remote
- at mode 0711
bin/qmail-rspawn
- at mode 0711
-bin/qmail-clean
- at mode 0711
bin/qmail-send
- at mode 0711
bin/splogger
- at mode 0700
-bin/qmail-newu
- at mode 0700
-bin/qmail-newmrh
- at mode 0711
-bin/qmail-pw2u
- at mode 0755
-bin/qmail-inject
- at mode 0755
-bin/predate
@mode 0755
+bin/bouncesaying
+bin/condredirect
bin/datemail
- at mode 0755
+bin/elq
+bin/except
+bin/forward
+bin/maildir2mbox
+bin/maildirmake
+bin/maildirwatch
bin/mailsubj
- at mode 0755
-bin/qmail-showctl
- at mode 0755
-bin/qmail-qread
- at mode 0755
-bin/qmail-qstat
- at mode 0755
-bin/qmail-tcpto
- at mode 0755
-bin/qmail-tcpok
- at mode 0755
+bin/pinq
+bin/predate
+bin/preline
+bin/qail
+bin/qbiff
+bin/qmail-inject
bin/qmail-pop3d
- at mode 0711
-bin/qmail-popup
- at mode 0755
bin/qmail-qmqpc
- at mode 0755
bin/qmail-qmqpd
- at mode 0755
bin/qmail-qmtpd
- at mode 0755
+bin/qmail-qread
+bin/qmail-qstat
+bin/qmail-showctl
bin/qmail-smtpd
- at mode 0755
-bin/sendmail
- at mode 0755
-bin/tcp-env
- at mode 0755
+bin/qmail-tcpok
+bin/qmail-tcpto
bin/qreceipt
- at mode 0755
bin/qsmhook
- at mode 0755
-bin/qbiff
- at mode 0755
-bin/forward
- at mode 0755
-bin/preline
- at mode 0755
-bin/condredirect
- at mode 0755
-bin/bouncesaying
- at mode 0755
-bin/except
- at mode 0755
-bin/maildirmake
- at mode 0755
-bin/maildir2mbox
- at mode 0755
-bin/maildirwatch
- at mode 0755
-bin/qail
- at mode 0755
-bin/elq
- at mode 0755
-bin/pinq
-
+bin/sendmail
+bin/tcp-env
@group
@owner
@mode
-
+boot/binm1
+boot/binm1+df
+boot/binm2
+boot/binm2+df
+boot/binm3
+boot/binm3+df
+boot/home
+boot/home+df
+boot/maildir
+boot/proc
+boot/proc+df
@comment This port installs the following manually (ie. not through qmail-hier)
-configure/install
configure/config
configure/config-fast
configure/dnsfq
-configure/hostname
configure/dnsip
-configure/ipmeprint
configure/dnsptr
+configure/hostname
+configure/install
+configure/ipmeprint
+scripts/enable-qmail
+scripts/mkaliasdir
%%PORTDOCS%%%%DOCDIR%%/BLURB
%%PORTDOCS%%%%DOCDIR%%/BLURB2
%%PORTDOCS%%%%DOCDIR%%/BLURB3
%%PORTDOCS%%%%DOCDIR%%/BLURB4
+%%PORTDOCS%%%%DOCDIR%%/FAQ
+%%PORTDOCS%%%%DOCDIR%%/INSTALL
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
%%PORTDOCS%%%%DOCDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCDIR%%/SECURITY
-%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
+%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
+%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
+%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
+%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
+%%PORTDOCS%%%%DOCDIR%%/README.auth
+%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
+%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
+%%PORTDOCS%%%%DOCDIR%%/SECURITY
+%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
+%%PORTDOCS%%%%DOCDIR%%/SMTP_AUTH+TLS.readme
%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
+%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
+%%PORTDOCS%%%%DOCDIR%%/TEST.receive
+%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
+%%PORTDOCS%%%%DOCDIR%%/UPGRADE
%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
-%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
-boot/maildir
%%PORTDOCS%%@dirrm %%DOCDIR%%
+ at dirrm scripts
@dirrm configure
@dirrm boot
@dirrm bin
-
@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
- at unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. Go to mail/qmail portsdir and do a 'make enable-sendmail'" | /usr/bin/fmt
+ at unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" | /usr/bin/fmt
diff -ruN --exclude=CVS ./mail.orig/qmail-spamcontrol/Makefile ./mail/qmail-spamcontrol/Makefile
--- ./mail.orig/qmail-spamcontrol/Makefile Mon Mar 14 16:59:10 2005
+++ ./mail/qmail-spamcontrol/Makefile Mon Mar 21 12:36:32 2005
@@ -16,6 +16,9 @@
MAINTAINER= renato at galle.com.br
COMMENT= Qmail MTA with SpamControl patches
+EXTRA_PATCHES+= ${QMAIL_PORT_PATCHDIR}/patch-aa ${QMAIL_PORT_PATCHDIR}/patch-ab \
+ ${QMAIL_PORT_PATCHDIR}/patch-ac
+
# Distfiles
QMAIL_DIST= ${PORTNAME}-${QMAIL_VERSION}${EXTRACT_SUFX}
SPAMCONTROL_DIST= spamcontrol-${SPAMCONTROL_VERSION}_tgz.bin
@@ -33,14 +36,15 @@
MOREIPME "Additional control files moreipme & notipme" off \
BIGTODO "Bruce Guenter's BigToDo patch" off
-.if !defined(PRE_MK_INCLUDED)
+.if !defined(_PREMKINCLUDED)
.include <bsd.port.pre.mk>
.endif
+MASTERDIR= ${.CURDIR}/../qmail
+PATCHDIR= ${.CURDIR}/files
# Using default from master port, i.e., /var/qmail
-QMAIL_PORT= ${PORTSDIR}/mail/qmail
-QMAIL_PORT_PREFIX!= cd ${QMAIL_PORT} && ${MAKE} -V PREFIX
-MASTERDIR= ${QMAIL_PORT}
+QMAIL_PORT_PREFIX!= cd ${MASTERDIR} && ${MAKE} -V PREFIX
+QMAIL_PORT_PATCHDIR!= cd ${MASTERDIR} && ${MAKE} -V PATCHDIR
# Block some patches because SpamControl contain the same patches inside
MAIN_QMAIL_PORT_DNS_PATCH_BARRIER= yes
@@ -49,6 +53,7 @@
MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER= yes
MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes
MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER= yes
+MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER= yes
ALL_TARGET+= ${EXTRA_MAN8}
@@ -75,7 +80,7 @@
${WRKDIR}/doc/badmailfrom ${WRKDIR}/doc/badmimetypes \
${WRKDIR}/doc/badrcptto ${WRKDIR}/doc/conf-spamcontrol \
${WRKDIR}/doc/install_spamcontrol.sh ${WRKDIR}/doc/tarpitcount
-SCRIPTS= qmail-alias2recipients qmail-pwd2recipients \
+SCRIPTS+= qmail-alias2recipients qmail-pwd2recipients \
qmail-users2recipients qmail-vpopmail2recipients
# Fill SELECTED_OPTIONS with options to write conf-spamcontrol
@@ -136,10 +141,6 @@
post-extract:
@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${SPAMCONTROL_DIST}
-slaveport-post-patch:
- @cd ${WRKSRC} && \
- ${PATCH} -s < ${.CURDIR}/files/patch-qmail-smtpd.c.patch
-
pre-configure:
@${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail
@${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \
@@ -148,11 +149,5 @@
@${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol
.endfor
@cd ${WRKSRC} && ./install_spamcontrol.sh
-
-post-install:
- @${MKDIR} ${PREFIX}/scripts
-.for script in ${SCRIPTS}
- @${INSTALL_SCRIPT} ${WRKDIR}/scripts/${script} ${PREFIX}/scripts
-.endfor
.include "${MASTERDIR}/Makefile"
diff -ruN --exclude=CVS ./mail.orig/qmail-spamcontrol/pkg-plist ./mail/qmail-spamcontrol/pkg-plist
--- ./mail.orig/qmail-spamcontrol/pkg-plist Fri Mar 11 13:28:55 2005
+++ ./mail/qmail-spamcontrol/pkg-plist Fri Mar 18 10:11:41 2005
@@ -16,6 +16,7 @@
bin/qmail-clean
bin/qmail-getpw
bin/qmail-local
+bin/qmail-popup
bin/qmail-pw2u
bin/qmail-remote
bin/qmail-rspawn
@@ -39,7 +40,6 @@
bin/qbiff
bin/qmail-inject
bin/qmail-pop3d
-bin/qmail-popup
bin/qmail-qmqpc
bin/qmail-qmqpd
bin/qmail-qmtpd
@@ -76,6 +76,8 @@
configure/hostname
configure/install
configure/ipmeprint
+scripts/enable-qmail
+scripts/mkaliasdir
scripts/qmail-alias2recipients
scripts/qmail-pwd2recipients
scripts/qmail-users2recipients
@@ -142,7 +144,6 @@
%%PORTDOCS%%%%DOCDIR%%/conf-spamcontrol
%%PORTDOCS%%%%DOCDIR%%/install_spamcontrol.sh
%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
-%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
%%PORTDOCS%%%%DOCDIR%%/tarpitcount
%%PORTDOCS%%@dirrm %%DOCDIR%%
@dirrm scripts
@@ -151,4 +152,4 @@
@dirrm bin
@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
- at unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. Go to mail/qmail portsdir and do a 'make enable-sendmail'" | /usr/bin/fmt
+ at unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" | /usr/bin/fmt
diff -ruN --exclude=CVS ./mail.orig/qmail-tls/Makefile ./mail/qmail-tls/Makefile
--- ./mail.orig/qmail-tls/Makefile Sun Mar 7 18:08:27 2004
+++ ./mail/qmail-tls/Makefile Mon Mar 21 12:34:24 2005
@@ -18,17 +18,18 @@
COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH TLS support
USE_OPENSSL= YES
+USE_REINPLACE= yes
# Patches from the main qmail port are not wanted
MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes
+MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER= yes
TLS_PATCH_DATE= 20020825
# Using default from master port, i.e., /var/qmail
PREFIX?= ${QMAIL_PORT_PREFIX}
-#PREFIX= /var/qmail-tls
-.if !defined(PRE_MK_INCLUDED)
+.if !defined(_PREMKINCLUDED)
.include <bsd.port.pre.mk>
.endif
@@ -38,9 +39,14 @@
CFLAGS+= -DDEBUG
.endif # WITH_TLS_DEBUG
-#QMAIL_PORT= ${PORTSDIR}/mail/qmail
-QMAIL_PORT= ${.CURDIR}/../qmail
-QMAIL_PORT_PREFIX!= cd ${QMAIL_PORT} && ${MAKE} -V PREFIX
+# Local overrides
+MASTERDIR= ${.CURDIR}/../qmail
+PKGDIR_LOCAL= ${.CURDIR}
+DESCR= ${PKGDIR_LOCAL}/pkg-descr
+PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
+PLIST= ${PKGDIR_LOCAL}/pkg-plist
+
+QMAIL_PORT_PREFIX!= cd ${MASTERDIR} && ${MAKE} -V PREFIX
DOCFILES+= ${WRKDIR}/TLS.readme
@@ -53,7 +59,7 @@
qmail-tls-post-patch:
@${HEAD} -74 ${DISTDIR}/tls.patch > ${WRKDIR}/TLS.readme
- @${PERL} -pi -ne "s|/usr/local/ssl|${OPENSSLBASE}|" ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} "s|/usr/local/ssl|${OPENSSLBASE}|" ${WRKSRC}/Makefile
# Primary Ugh... ;-)
# idea stolen from www/apache13-ssl, a target written by adam at algroup.co.uk
@@ -93,12 +99,5 @@
else \
${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
fi
-
-# Local overrides
-MASTERDIR= ${QMAIL_PORT}
-PKGDIR_LOCAL= ${.CURDIR}
-DESCR= ${PKGDIR_LOCAL}/pkg-descr
-PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
-PLIST= ${PKGDIR_LOCAL}/pkg-plist
.include "${MASTERDIR}/Makefile"
diff -ruN --exclude=CVS ./mail.orig/qmail-tls/pkg-plist ./mail/qmail-tls/pkg-plist
--- ./mail.orig/qmail-tls/pkg-plist Mon Feb 12 00:07:46 2001
+++ ./mail/qmail-tls/pkg-plist Fri Mar 18 10:11:20 2005
@@ -1,38 +1,3 @@
-%%PORTDOCS%%%%DOCDIR%%/FAQ
-%%PORTDOCS%%%%DOCDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
-%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
-%%PORTDOCS%%%%DOCDIR%%/TEST.receive
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
-%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
-%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
-%%PORTDOCS%%%%DOCDIR%%/TLS.readme
-boot/home
-boot/home+df
-boot/proc
-boot/proc+df
-boot/binm1
-boot/binm1+df
-boot/binm2
-boot/binm2+df
-boot/binm3
-boot/binm3+df
-
@group qmail
@mode 04711
@comment *** NOTE different owner
@@ -41,122 +6,115 @@
@owner
@mode 0700
bin/qmail-lspawn
- at mode 0700
+bin/qmail-newmrh
+bin/qmail-newu
bin/qmail-start
@mode 0711
+bin/qmail-clean
bin/qmail-getpw
- at mode 0711
bin/qmail-local
- at mode 0711
+bin/qmail-popup
+bin/qmail-pw2u
bin/qmail-remote
- at mode 0711
bin/qmail-rspawn
- at mode 0711
-bin/qmail-clean
- at mode 0711
bin/qmail-send
- at mode 0711
bin/splogger
- at mode 0700
-bin/qmail-newu
- at mode 0700
-bin/qmail-newmrh
- at mode 0711
-bin/qmail-pw2u
- at mode 0755
-bin/qmail-inject
- at mode 0755
-bin/predate
@mode 0755
+bin/bouncesaying
+bin/condredirect
bin/datemail
- at mode 0755
+bin/elq
+bin/except
+bin/forward
+bin/maildir2mbox
+bin/maildirmake
+bin/maildirwatch
bin/mailsubj
- at mode 0755
-bin/qmail-showctl
- at mode 0755
-bin/qmail-qread
- at mode 0755
-bin/qmail-qstat
- at mode 0755
-bin/qmail-tcpto
- at mode 0755
-bin/qmail-tcpok
- at mode 0755
+bin/pinq
+bin/predate
+bin/preline
+bin/qail
+bin/qbiff
+bin/qmail-inject
bin/qmail-pop3d
- at mode 0711
-bin/qmail-popup
- at mode 0755
bin/qmail-qmqpc
- at mode 0755
bin/qmail-qmqpd
- at mode 0755
bin/qmail-qmtpd
- at mode 0755
+bin/qmail-qread
+bin/qmail-qstat
+bin/qmail-showctl
bin/qmail-smtpd
- at mode 0755
-bin/sendmail
- at mode 0755
-bin/tcp-env
- at mode 0755
+bin/qmail-tcpok
+bin/qmail-tcpto
bin/qreceipt
- at mode 0755
bin/qsmhook
- at mode 0755
-bin/qbiff
- at mode 0755
-bin/forward
- at mode 0755
-bin/preline
- at mode 0755
-bin/condredirect
- at mode 0755
-bin/bouncesaying
- at mode 0755
-bin/except
- at mode 0755
-bin/maildirmake
- at mode 0755
-bin/maildir2mbox
- at mode 0755
-bin/maildirwatch
- at mode 0755
-bin/qail
- at mode 0755
-bin/elq
- at mode 0755
-bin/pinq
-
+bin/sendmail
+bin/tcp-env
@group
@owner
@mode
-
+boot/binm1
+boot/binm1+df
+boot/binm2
+boot/binm2+df
+boot/binm3
+boot/binm3+df
+boot/home
+boot/home+df
+boot/maildir
+boot/proc
+boot/proc+df
@comment This port installs the following manually (ie. not through qmail-hier)
-configure/install
configure/config
configure/config-fast
configure/dnsfq
-configure/hostname
configure/dnsip
-configure/ipmeprint
configure/dnsptr
+configure/hostname
+configure/install
+configure/ipmeprint
+scripts/enable-qmail
+scripts/mkaliasdir
%%PORTDOCS%%%%DOCDIR%%/BLURB
%%PORTDOCS%%%%DOCDIR%%/BLURB2
%%PORTDOCS%%%%DOCDIR%%/BLURB3
%%PORTDOCS%%%%DOCDIR%%/BLURB4
+%%PORTDOCS%%%%DOCDIR%%/FAQ
+%%PORTDOCS%%%%DOCDIR%%/INSTALL
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
%%PORTDOCS%%%%DOCDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCDIR%%/SECURITY
-%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
+%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
+%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
+%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
+%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
+%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
+%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
+%%PORTDOCS%%%%DOCDIR%%/SECURITY
+%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
+%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
+%%PORTDOCS%%%%DOCDIR%%/TEST.receive
+%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
+%%PORTDOCS%%%%DOCDIR%%/TLS.readme
+%%PORTDOCS%%%%DOCDIR%%/UPGRADE
%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
-%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
-boot/maildir
%%PORTDOCS%%@dirrm %%DOCDIR%%
+ at dirrm scripts
@dirrm configure
@dirrm boot
@dirrm bin
-
@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
- at unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. Go to mail/qmail portsdir and do a 'make enable-sendmail'" | /usr/bin/fmt
+ at unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" | /usr/bin/fmt
--- qmail-ports.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list