3 files changed, 5 insertions, 216 deletions

diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile
index c62f6e000b40..9f142befdd69 100644
--- a/mail/qmail-tls/Makefile
+++ b/mail/qmail-tls/Makefile
@@ -7,97 +7,22 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 
-PATCH_SITES+=	http://www.esat.kuleuven.ac.be/~vermeule/qmail/:tls
-PATCHFILES+=	tls.patch:tls
-PATCH_DIST_STRIP+=	-p1
-
 MAINTAINER=	freebsd@galle.com.br
 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
+SLAVE_TLS=	yes
 
 TLS_PATCH_DATE=	20020825
 
-# Using default from master port, i.e., /var/qmail
-PREFIX?=	${QMAIL_PORT_PREFIX}
-
-.if !defined(_PREMKINCLUDED)
-.include <bsd.port.pre.mk>
-.endif
-
-CFLAGS+=	-I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS
-
-.if defined(WITH_TLS_DEBUG)
-CFLAGS+=	-DDEBUG
-.endif # WITH_TLS_DEBUG
+USE_OPENSSL=	yes
 
 # 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
-
-slaveport-pre-fetch: qmail-tls-pre-fetch
-
-qmail-tls-pre-fetch:
-	@${ECHO_MSG} "WITH_TLS_DEBUG=yes		enable additional debug information"
-
-slaveport-post-patch: qmail-tls-post-patch
-
-qmail-tls-post-patch:
-	@${HEAD} -74 ${DISTDIR}/tls.patch > ${WRKDIR}/TLS.readme
-	@${REINPLACE_CMD} "s|/usr/local/ssl|${OPENSSLBASE}|" ${WRKSRC}/Makefile
-
-# Primary Ugh... ;-)
-# idea stolen from www/apache13-ssl, a target written by adam@algroup.co.uk
-# internal code ripped from tls.patch guts ;-) written by Frederik Vermeulen <jos-tls@kotnet.org>
-
-certificate:
-	@if [ -f ${OPENSSLDIR}/openssl.cnf ]; \
-	then \
-		if [ ! -d ${WRKDIR} ]; \
-		then \
-			${MKDIR} ${WRKDIR} ; \
-		fi ; \
-		${OPENSSLBASE}/bin/openssl req -new -x509 -nodes \
-			-out ${WRKDIR}/servercert.pem -days 366 \
-			-keyout ${WRKDIR}/servercert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
-		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
-	else \
-		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
-	fi
-
-certificate-req:
-	@if [ -f ${OPENSSLDIR}/openssl.cnf ]; \
-	then \
-		if [ ! -d ${WRKDIR} ]; \
-		then \
-			${MKDIR} ${WRKDIR} ; \
-		fi ; \
-		${OPENSSLBASE}/bin/openssl req -new -nodes \
-			-out ${WRKDIR}/req.pem \
-			-keyout ${WRKDIR}/servercert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
-		${ECHO_MSG} ; \
-		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
-		${ECHO_MSG} "===> Send ${WRKDIR}/req.pem to your CA to obtain signed_req.pem, and do:" ; \
-		${ECHO_MSG} "===> cat signed_req.pem >> ${PREFIX}/control/servercert.pem" ; \
-	else \
-		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
-	fi
+DESCR=		${.CURDIR}/pkg-descr
+LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/qmail-tls/pkg-message b/mail/qmail-tls/pkg-message
deleted file mode 100644
index 48b6d844ca57..000000000000
--- a/mail/qmail-tls/pkg-message
+++ /dev/null
@@ -1,27 +0,0 @@
-	ATTENTIONATTENTION:
-
-Please make sure that you read /var/qmail/doc/PORT_NOTES.
-It contains important information about testing and configuring
-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.
-
-==> 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"
-
-==> As you need to provide a working certificate in /var/qmail/control/cert.pem :
-
-# makes a self-signed certificate
-3) do "make certificate"
-
-# makes a certificate request
-4) do "make certificate-req"
diff --git a/mail/qmail-tls/pkg-plist b/mail/qmail-tls/pkg-plist
deleted file mode 100644
index 20f793d9ac77..000000000000
--- a/mail/qmail-tls/pkg-plist
+++ /dev/null
@@ -1,109 +0,0 @@
-bin/bouncesaying
-bin/condredirect
-bin/datemail
-bin/elq
-bin/except
-bin/forward
-bin/maildir2mbox
-bin/maildirmake
-bin/maildirwatch
-bin/mailsubj
-bin/pinq
-bin/predate
-bin/preline
-bin/qail
-bin/qbiff
-bin/qmail-clean
-bin/qmail-getpw
-bin/qmail-inject
-bin/qmail-local
-bin/qmail-lspawn
-bin/qmail-newmrh
-bin/qmail-newu
-bin/qmail-pop3d
-bin/qmail-popup
-bin/qmail-pw2u
-bin/qmail-qmqpc
-bin/qmail-qmqpd
-bin/qmail-qmtpd
-bin/qmail-qread
-bin/qmail-qstat
-bin/qmail-queue
-bin/qmail-remote
-bin/qmail-rspawn
-bin/qmail-send
-bin/qmail-showctl
-bin/qmail-smtpd
-bin/qmail-start
-bin/qmail-tcpok
-bin/qmail-tcpto
-bin/qreceipt
-bin/qsmhook
-bin/sendmail
-bin/splogger
-bin/tcp-env
-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/config
-configure/config-fast
-configure/dnsfq
-configure/dnsip
-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%%/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%%@dirrm %%DOCDIR%%
-@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
-@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