8 files changed, 88 insertions, 52 deletions

diff --git a/mail/qmail-smtp_auth+tls/Makefile b/mail/qmail-smtp_auth+tls/Makefile
index d295799e61f1..ba49e4d700ea 100644
--- a/mail/qmail-smtp_auth+tls/Makefile
+++ b/mail/qmail-smtp_auth+tls/Makefile
@@ -1,32 +1,34 @@
-# New ports collection makefile for:	qmail-tls
+# New ports collection makefile for:	qmail-smtp_auth+tls
 # Date created:				03 Dec 2000
-# Whom:					Mario S F Ferreira <lioux@linf.unb.br> et al.
+# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> et. al.
 #
 # $FreeBSD$
 #
 
 PORTNAME=	qmail
-PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
+PORTVERSION=	${QMAIL_VERSION}.${SMTP_AUTH-TLS_PATCH_DATE}
 CATEGORIES=	mail
-PKGNAMESUFFIX=	-tls
+PKGNAMESUFFIX=	-smtp_auth+tls
 
-PATCH_SITES+=	http://www.esat.kuleuven.ac.be/~vermeule/qmail/:tls
-PATCHFILES+=	tls.patch:tls
-PATCH_DIST_STRIP+=	-p1
+PATCH_SITES+=	http://students.imsa.edu/~ngroot/:smtp_auth_tls
+PATCHFILES+=	qmail-1.03-starttls-smtp-auth.patch:smtp_auth_tls
 
 MAINTAINER=	lioux@FreeBSD.org
-COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH TLS support
+COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH SMTP_AUTH+TLS
+
+# not type-safe
+ONLY_FOR_ARCHS=	i386
 
 USE_OPENSSL=	YES
 
 # Patches from the main qmail port are not wanted
 MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=	yes
 
-TLS_PATCH_DATE=	20020825
+SMTP_AUTH-TLS_PATCH_DATE=	20020519
 
 # Using default from master port, i.e., /var/qmail
 PREFIX?=	${QMAIL_PORT_PREFIX}
-#PREFIX=		/var/qmail-tls
+#PREFIX=		/var/qmail-smtp_auth+tls
 
 .if !defined(PRE_MK_INCLUDED)
 .include <bsd.port.pre.mk>
@@ -42,17 +44,20 @@ CFLAGS+=	-DDEBUG
 QMAIL_PORT=	${.CURDIR}/../qmail
 QMAIL_PORT_PREFIX!=	cd ${QMAIL_PORT} && ${MAKE} -V PREFIX
 
-DOCFILES+=	${WRKDIR}/TLS.readme
+DOCFILES+=	${WRKDIR}/SMTP_AUTH+TLS.readme \
+		${WRKSRC}/README.auth
 
-slaveport-pre-fetch: qmail-tls-pre-fetch
+slaveport-pre-fetch: qmail-smtp_auth+tls-pre-fetch
 
-qmail-tls-pre-fetch:
+qmail-smtp_auth+tls-pre-fetch:
 	@${ECHO_MSG} "WITH_TLS_DEBUG=yes		enable additional debug information"
 
-slaveport-post-patch: qmail-tls-post-patch
+slaveport-post-patch: qmail-smtp_auth+tls-post-patch
 
-qmail-tls-post-patch:
-	@${HEAD} -74 ${DISTDIR}/tls.patch > ${WRKDIR}/TLS.readme
+qmail-smtp_auth+tls-post-patch:
+	@${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
 
 # Primary Ugh... ;-)
diff --git a/mail/qmail-smtp_auth+tls/pkg-descr b/mail/qmail-smtp_auth+tls/pkg-descr
index 0bb7b139ef7d..e2b55ce1a034 100644
--- a/mail/qmail-smtp_auth+tls/pkg-descr
+++ b/mail/qmail-smtp_auth+tls/pkg-descr
@@ -1,11 +1,22 @@
-What is is: [excerpt taken from tls patch]
+What is is: [excerpt taken from README.auth from the patch]
 
-Frederik Vermeulen <jos-tls@kotnet.org> 20000823
-http://www.esat.kuleuven.ac.be/~vermeule/qmail/tls.patch
+This patch adds ESMTP AUTH authentication protocol support to
+qmail-1.03.  It's originally based on Mrs. Brisby's smtp-auth patch
+with many enhancements from Krzysztof Dabrowski <brush@elysium.pl>.
 
-This patch implements RFC2487 in qmail. This means you can
-get SSL or TLS encrypted and authenticated SMTP between
-the MTAs and between MTA and an MUA like Netscape4.5 TM.
-The code is considered experimental.
+You can always get the newest version from:
+http://members.elysium.pl/brush/qmail-smtpd-auth/
 
+To use all of it's functionality you will also have to obtain and
+install Krzysztof's cmd5checkpw utility available at:
+http://members.elysium.pl/brush/cmd5checkpw/
+
+If you need more information about SMTP-AUTH itself and the
+client/server support and configuration, visit:
+http://members.elysium.pl/brush/smtp-auth/
+
+Neal Groothuis glued both ESMTP AUTH and TLS patches together and
+then we have this port.
+
+Author: Neal Groothuis <ngroot@imsa.edu>
 WWW: http://www.qmail.org/
diff --git a/mail/qmail-smtp_auth+tls/pkg-message b/mail/qmail-smtp_auth+tls/pkg-message
index 48b6d844ca57..0ab9666d73c5 100644
--- a/mail/qmail-smtp_auth+tls/pkg-message
+++ b/mail/qmail-smtp_auth+tls/pkg-message
@@ -7,8 +7,9 @@ qmail, and finally replacing sendmail with qmail.
 You should also add /var/qmail/man to your MANPATH (see manpath(1)
 or login.conf(5)).
 
-Do not forget to read /var/qmail/doc/TLS.readme. After all,
-this is NOT our old stock qmail.
+Do not forget to read both /var/qmail/doc/SMTP_AUTH+TLS.readme AND
+/var/qmail/doc/README.auth.  After all, this is NOT our old stock
+qmail.
 
 ==> You can enable qmail as your default mailer:
 
diff --git a/mail/qmail-smtp_auth+tls/pkg-plist b/mail/qmail-smtp_auth+tls/pkg-plist
index e561e624d46c..e535a5356b1e 100644
--- a/mail/qmail-smtp_auth+tls/pkg-plist
+++ b/mail/qmail-smtp_auth+tls/pkg-plist
@@ -21,7 +21,8 @@
 %%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
 %%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
 %%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
-%%PORTDOCS%%%%DOCDIR%%/TLS.readme
+%%PORTDOCS%%%%DOCDIR%%/README.auth
+%%PORTDOCS%%%%DOCDIR%%/SMTP_AUTH+TLS.readme
 boot/home
 boot/home+df
 boot/proc
diff --git a/mail/qmail-smtp_auth/Makefile b/mail/qmail-smtp_auth/Makefile
index d295799e61f1..ba49e4d700ea 100644
--- a/mail/qmail-smtp_auth/Makefile
+++ b/mail/qmail-smtp_auth/Makefile
@@ -1,32 +1,34 @@
-# New ports collection makefile for:	qmail-tls
+# New ports collection makefile for:	qmail-smtp_auth+tls
 # Date created:				03 Dec 2000
-# Whom:					Mario S F Ferreira <lioux@linf.unb.br> et al.
+# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> et. al.
 #
 # $FreeBSD$
 #
 
 PORTNAME=	qmail
-PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
+PORTVERSION=	${QMAIL_VERSION}.${SMTP_AUTH-TLS_PATCH_DATE}
 CATEGORIES=	mail
-PKGNAMESUFFIX=	-tls
+PKGNAMESUFFIX=	-smtp_auth+tls
 
-PATCH_SITES+=	http://www.esat.kuleuven.ac.be/~vermeule/qmail/:tls
-PATCHFILES+=	tls.patch:tls
-PATCH_DIST_STRIP+=	-p1
+PATCH_SITES+=	http://students.imsa.edu/~ngroot/:smtp_auth_tls
+PATCHFILES+=	qmail-1.03-starttls-smtp-auth.patch:smtp_auth_tls
 
 MAINTAINER=	lioux@FreeBSD.org
-COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH TLS support
+COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH SMTP_AUTH+TLS
+
+# not type-safe
+ONLY_FOR_ARCHS=	i386
 
 USE_OPENSSL=	YES
 
 # Patches from the main qmail port are not wanted
 MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=	yes
 
-TLS_PATCH_DATE=	20020825
+SMTP_AUTH-TLS_PATCH_DATE=	20020519
 
 # Using default from master port, i.e., /var/qmail
 PREFIX?=	${QMAIL_PORT_PREFIX}
-#PREFIX=		/var/qmail-tls
+#PREFIX=		/var/qmail-smtp_auth+tls
 
 .if !defined(PRE_MK_INCLUDED)
 .include <bsd.port.pre.mk>
@@ -42,17 +44,20 @@ CFLAGS+=	-DDEBUG
 QMAIL_PORT=	${.CURDIR}/../qmail
 QMAIL_PORT_PREFIX!=	cd ${QMAIL_PORT} && ${MAKE} -V PREFIX
 
-DOCFILES+=	${WRKDIR}/TLS.readme
+DOCFILES+=	${WRKDIR}/SMTP_AUTH+TLS.readme \
+		${WRKSRC}/README.auth
 
-slaveport-pre-fetch: qmail-tls-pre-fetch
+slaveport-pre-fetch: qmail-smtp_auth+tls-pre-fetch
 
-qmail-tls-pre-fetch:
+qmail-smtp_auth+tls-pre-fetch:
 	@${ECHO_MSG} "WITH_TLS_DEBUG=yes		enable additional debug information"
 
-slaveport-post-patch: qmail-tls-post-patch
+slaveport-post-patch: qmail-smtp_auth+tls-post-patch
 
-qmail-tls-post-patch:
-	@${HEAD} -74 ${DISTDIR}/tls.patch > ${WRKDIR}/TLS.readme
+qmail-smtp_auth+tls-post-patch:
+	@${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
 
 # Primary Ugh... ;-)
diff --git a/mail/qmail-smtp_auth/pkg-descr b/mail/qmail-smtp_auth/pkg-descr
index 0bb7b139ef7d..e2b55ce1a034 100644
--- a/mail/qmail-smtp_auth/pkg-descr
+++ b/mail/qmail-smtp_auth/pkg-descr
@@ -1,11 +1,22 @@
-What is is: [excerpt taken from tls patch]
+What is is: [excerpt taken from README.auth from the patch]
 
-Frederik Vermeulen <jos-tls@kotnet.org> 20000823
-http://www.esat.kuleuven.ac.be/~vermeule/qmail/tls.patch
+This patch adds ESMTP AUTH authentication protocol support to
+qmail-1.03.  It's originally based on Mrs. Brisby's smtp-auth patch
+with many enhancements from Krzysztof Dabrowski <brush@elysium.pl>.
 
-This patch implements RFC2487 in qmail. This means you can
-get SSL or TLS encrypted and authenticated SMTP between
-the MTAs and between MTA and an MUA like Netscape4.5 TM.
-The code is considered experimental.
+You can always get the newest version from:
+http://members.elysium.pl/brush/qmail-smtpd-auth/
 
+To use all of it's functionality you will also have to obtain and
+install Krzysztof's cmd5checkpw utility available at:
+http://members.elysium.pl/brush/cmd5checkpw/
+
+If you need more information about SMTP-AUTH itself and the
+client/server support and configuration, visit:
+http://members.elysium.pl/brush/smtp-auth/
+
+Neal Groothuis glued both ESMTP AUTH and TLS patches together and
+then we have this port.
+
+Author: Neal Groothuis <ngroot@imsa.edu>
 WWW: http://www.qmail.org/
diff --git a/mail/qmail-smtp_auth/pkg-message b/mail/qmail-smtp_auth/pkg-message
index 48b6d844ca57..0ab9666d73c5 100644
--- a/mail/qmail-smtp_auth/pkg-message
+++ b/mail/qmail-smtp_auth/pkg-message
@@ -7,8 +7,9 @@ qmail, and finally replacing sendmail with qmail.
 You should also add /var/qmail/man to your MANPATH (see manpath(1)
 or login.conf(5)).
 
-Do not forget to read /var/qmail/doc/TLS.readme. After all,
-this is NOT our old stock qmail.
+Do not forget to read both /var/qmail/doc/SMTP_AUTH+TLS.readme AND
+/var/qmail/doc/README.auth.  After all, this is NOT our old stock
+qmail.
 
 ==> You can enable qmail as your default mailer:
 
diff --git a/mail/qmail-smtp_auth/pkg-plist b/mail/qmail-smtp_auth/pkg-plist
index e561e624d46c..e535a5356b1e 100644
--- a/mail/qmail-smtp_auth/pkg-plist
+++ b/mail/qmail-smtp_auth/pkg-plist
@@ -21,7 +21,8 @@
 %%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
 %%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
 %%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
-%%PORTDOCS%%%%DOCDIR%%/TLS.readme
+%%PORTDOCS%%%%DOCDIR%%/README.auth
+%%PORTDOCS%%%%DOCDIR%%/SMTP_AUTH+TLS.readme
 boot/home
 boot/home+df
 boot/proc