Update MASTER_SITES and add a file explaining how to replace

sendmail on 4.0 (mailwrapper)

PR:		16921
Submitted by:	maintainer

3 files changed, 70 insertions, 9 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 068b9d0d1fc5..cce2eacb38bc 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:	qmail
 # Version required:	1.03
 # Date created:		25 May 1998
-# Whom:			Mario S F Ferreira <lioux@gns.com.br> et al.
+# Whom:			Mario S F Ferreira <lioux@linf.unb.br> et al.
 #
 # $FreeBSD$
 #
 
 DISTNAME=	qmail-1.03
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.net.ohio-state.edu/pub/networking/mail/qmail/ \
+MASTER_SITES=	http://cr.yp.to/software/ \
 		ftp://ftp.ntnu.no/pub/unix/mail/qmail/ \
+		ftp://ftp.pipex.net/mirrors/qmail/ \
+		ftp://ftp.jp.qmail.org/qmail/ \
+		ftp://ftp.rifkin.technion.ac.il/pub/qmail/ \
 		ftp://ftp.mira.net.au/unix/mail/qmail/ \
+		ftp://ftp.net.ohio-state.edu/pub/networking/mail/qmail/ \
 		ftp://ftp.id.wustl.edu/pub/qmail/ \
-		ftp://mirror.uk.uu.net/pub/qmail/ \
-		ftp://ftp.jp.qmail.org/qmail/ \
-		http://ftp.rifkin.technion.ac.il/pub/qmail/ \
-		http://koobera.math.uic.edu/www/software/ \
-		http://pobox.com/~djb/software/ 
+		ftp://koobera.math.uic.edu/www/
 
 # Patch necessary to cope with non-RFC >512 dns entries
 # Since AOL has been using those, the problem has skyrocketed from minor to
@@ -53,7 +53,8 @@ PLIST_SUB=	DOCDIR=${DOCDIR}
 
 DOCFILES=	${WRKSRC}/BLURB ${WRKSRC}/BLURB2 ${WRKSRC}/BLURB3 \
 		${WRKSRC}/BLURB4 ${WRKSRC}/INTERNALS ${WRKSRC}/SECURITY \
-		${WRKSRC}/THOUGHTS ${FILESDIR}/PORT_NOTES
+		${WRKSRC}/THOUGHTS ${FILESDIR}/PORT_NOTES \
+		${FILESDIR}/PORT_NOTES_FreeBSD_40-RELEASE
 
 # The following docfiles are normally installed with qmail-hier
 DOCFILES+=	${WRKSRC}/FAQ ${WRKSRC}/UPGRADE ${WRKSRC}/SENDMAIL \
@@ -78,7 +79,8 @@ BOOTFILES=	${WRKSRC}/home ${WRKSRC}/home+df ${WRKSRC}/proc \
 BOOTFILES+=	${FILESDIR}/maildir
 
 CONFIGUREFILES=	${WRKSRC}/install ${WRKSRC}/dnsfq ${WRKSRC}/hostname \
-		${WRKSRC}/dnsip ${WRKSRC}/ipmeprint ${WRKSRC}/dnsptr
+		${WRKSRC}/dnsip ${WRKSRC}/ipmeprint ${WRKSRC}/dnsptr \
+		${WRKSRC}/config-fast
 
 .if (${PREFIX} == "/usr/local")
 DOCDIR=	share/doc/qmail
diff --git a/mail/qmail/files/PORT_NOTES b/mail/qmail/files/PORT_NOTES
index 6c2928c27383..07844f9cf5db 100644
--- a/mail/qmail/files/PORT_NOTES
+++ b/mail/qmail/files/PORT_NOTES
@@ -79,6 +79,9 @@ To upgrade from sendmail to qmail:
  Instead, change the sendmail_enable line in /etc/rc.conf to read
 
         sendmail_enable="NO"
+
+ If you are running a FreeBSD 4.0-RELEASE or later, read
+ PORT_NOTES_FreeBSD_40-RELEASE before executing step 12.
  ]
 
 13. Read REMOVE.binmail.
diff --git a/mail/qmail/files/PORT_NOTES_FreeBSD_40-RELEASE b/mail/qmail/files/PORT_NOTES_FreeBSD_40-RELEASE
new file mode 100644
index 000000000000..a3b92efed639
--- /dev/null
+++ b/mail/qmail/files/PORT_NOTES_FreeBSD_40-RELEASE
@@ -0,0 +1,56 @@
+In addition to PORT_NOTES_FreeBSD_40-RELEASE, there are many
+other potentially important qmail documents there such as PORT_NOTES
+and INSTALL.
+
+As with all ports, the ports maintainer (me!) makes NO WARRANTIES of
+any kind: expressed, implied, or other; about the reliability or
+security of this package.  Any damage or problems derived from its
+usage or related to it are neither my responsibility nor the software
+author's.  This package is provided AS IS.
+
+Although I am probably sounding cold and harsh, believe me: qmail is
+one of the most reliable and easy-to-use softwares around.  However,
+this also is NOT a WARRANTY.  It is just an opinion.  :)
+
+The qmail port will normally install into /var/qmail/.  If you changed
+this to /usr/local/, then please note that the docs have been
+installed into /usr/local/share/doc/qmail/ (as opposed to
+/usr/local/doc/).
+
+##
+### Document starts here
+##
+
+If you read PORT_NOTES, you may have noticed I mentioned step 12 should
+be changed for FreeBSD versions 4.0-Release and later.
+
+FreeBSD 4.0-Release and later come with a program named mailwrapper (8)
+which eases the replacement of sendmail. No binaries need to be touched,
+"chmod"ed, erased, deleted or, otherwise, modified.
+
+Whenever you call /usr/sbin/sendmail, /usr/bin/mail, or /usr/bin/newaliases;
+in fact, you are calling a symbolic link to mailwrapper. Mailwrapper
+then calls the appropriate binary according to its configuration file.
+
+An excerpt from the mailwrapper manual: 
+
+"The mailwrapper program is designed to replace /usr/sbin/sendmail and to
+ invoke an appropriate MTA instead of sendmail(8) based on configuration
+ information placed in /etc/mail/mailer.conf. This permits the administra-
+ tor to configure which MTA is to be invoked on the system at run time."
+
+Configuration for mailwrapper is kept in /etc/mail/mailer.conf.
+
+Here follows my personal /etc/mail/mailer.conf
+
+sendmail        /var/qmail/bin/sendmail
+send-mail       /var/qmail/bin/sendmail
+mailq           /var/qmail/bin/qmail-qstat
+newaliases      /var/qmail/bin/newaliases
+
+So, whenever you call sendmail, in fact, you are using the appropriate
+"qmail-clones".
+
+You should notice, though, that the programs do not behave exactly as
+their sendmail counterparts. Therefore, reading the appropriate
+/var/qmail/doc files and man pages is highly advisable.