3 files changed, 4 insertions, 270 deletions

diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile
index 04df5aa02274..381442143d1e 100644
--- a/mail/qmail-spamcontrol/Makefile
+++ b/mail/qmail-spamcontrol/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${SPAMCONTROL_VERSION}
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES+=	http://www.fehcom.de/qmail/spamcontrol/:spamcontrol
 PKGNAMESUFFIX=	-spamcontrol
@@ -16,138 +17,19 @@ EXTRACT_ONLY=	${QMAIL_DIST}
 MAINTAINER=	freebsd@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
+EXTRA_PATCHES+=	${MASTERDIR}/files/patch-install.c
 
 # Distfiles
 QMAIL_DIST=		${PORTNAME}-${QMAIL_VERSION}${EXTRACT_SUFX}
 SPAMCONTROL_DIST=	spamcontrol-${SPAMCONTROL_VERSION}_tgz.bin
 SPAMCONTROL_VERSION=	2313
-PREFIX?=		${QMAIL_PORT_PREFIX}
 LATEST_LINK=		${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
-OPTIONS=	RELAYMAILFROM	"Open relay based on mailfrom" off \
-		QUITASAP	"Close session in case of a filter condition" off \
-		REQBRACKETS	"Require brackets in <addresses>" on \
-		VERP		"VERP addresses for recipients" on \
-		RECIPIENTS550	"Get a 550 reply instead of a deferred bounce" off \
-		LOCALMFREQAUTH	"Require auth when from is @ your domains" off \
-		AUTHCRAM	"Aditional CRAM-MD5 support" off \
-		MOREIPME	"Additional control files moreipme & notipme" off \
-		BIGTODO		"Bruce Guenter's BigToDo patch" off
-
-.if !defined(_PREMKINCLUDED)
-.include <bsd.port.pre.mk>
-.endif
+SLAVE_SPAMCONTROL=	yes
 
+# Local overrides
 MASTERDIR=	${.CURDIR}/../qmail
 PATCHDIR=	${.CURDIR}/files
-# Using default from master port, i.e., /var/qmail
-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
-MAIN_QMAIL_PORT_SENDMAIL_F_PATCH_BARRIER=		yes
-MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER=	yes
-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}
-
-# Local overrides
 DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
-MD5_FILE=	${.CURDIR}/distinfo
-
-EXTRA_MAN8=	qmail-badloadertypes.8 qmail-badmimetypes.8 qmail-recipients.8
-MAN8+=		${EXTRA_MAN8}
-DOCFILES+=	${WRKDIR}/doc/FILES.spamcontrol ${WRKDIR}/doc/HISTORY.spamcontrol \
-		${WRKDIR}/doc/INSTALL.spamcontrol ${WRKDIR}/doc/LICENSE.spamcontrol \
-		${WRKDIR}/doc/LOGGING.spamcontrol ${WRKDIR}/doc/Makefile.djbdns \
-		${WRKDIR}/doc/README.auth ${WRKDIR}/doc/README.bigtodo \
-		${WRKDIR}/doc/README.bouncemaxbytes ${WRKDIR}/doc/README.djbdns \
-		${WRKDIR}/doc/README.doublebouncetrim ${WRKDIR}/doc/README.moreipme \
-		${WRKDIR}/doc/README.qmailqueue ${WRKDIR}/doc/README.recipients \
-		${WRKDIR}/doc/README.spamcontrol ${WRKDIR}/doc/README.wildmat \
-		${WRKDIR}/doc/README_spamcontrol.html \
-		${WRKDIR}/doc/RELEASE_22.spamcontrol \
-		${WRKDIR}/doc/RELEASE_23.spamcontrol \
-		${WRKDIR}/doc/SMTPREPLY.spamcontrol ${WRKDIR}/doc/TESTING.spamcontrol \
-		${WRKDIR}/doc/TODO.spamcontrol ${WRKDIR}/doc/badloadertypes \
-		${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 \
-		qmail-users2recipients qmail-vpopmail2recipients
-
-# Fill SELECTED_OPTIONS with options to write conf-spamcontrol
-.if defined(WITH_RELAYMAILFROM)
-SELECTED_OPTIONS+=	relaymailfrom=yes
-.else
-SELECTED_OPTIONS+=	relaymailfrom=no
-.endif
-
-.if defined(WITH_QUITASAP)
-SELECTED_OPTIONS+=	quitasap=yes
-.else
-SELECTED_OPTIONS+=	quitasap=no
-.endif
-
-.if !defined(WITHOUT_REQBRACKETS)
-SELECTED_OPTIONS+=	reqbrackets=yes
-.else
-SELECTED_OPTIONS+=	reqbrackets=no
-.endif
-
-.if !defined(WITHOUT_VERP)
-SELECTED_OPTIONS+=	verp=yes
-.else
-SELECTED_OPTIONS+=	verp=no
-.endif
-
-.if defined(WITH_RECIPIENTS550)
-SELECTED_OPTIONS+=	recipients550=yes
-.else
-SELECTED_OPTIONS+=	recipients550=no
-.endif
-
-.if defined(WITH_LOCALMFREQAUTH)
-SELECTED_OPTIONS+=	localmfreqauth=yes
-.else
-SELECTED_OPTIONS+=	localmfreqauth=no
-.endif
-
-.if defined(WITH_AUTHCRAM)
-SELECTED_OPTIONS+=	authcram=yes
-.else
-SELECTED_OPTIONS+=	authcram=no
-.endif
-
-.if defined(WITH_MOREIPME)
-SELECTED_OPTIONS+=	moreipme=yes
-.else
-SELECTED_OPTIONS+=	moreipme=no
-.endif
-
-.if defined(WITH_BIGTODO)
-SELECTED_OPTIONS+=	bigtodo=yes
-.else
-SELECTED_OPTIONS+=	bigtodo=no
-.endif
-
-post-extract:
-	@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${SPAMCONTROL_DIST}
-
-pre-configure:
-	@${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail
-	@${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \
-		> ${WRKSRC}/conf-spamcontrol
-.for option in ${SELECTED_OPTIONS}
-	@${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol
-.endfor
-	@cd ${WRKSRC} && ./install_spamcontrol.sh
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/qmail-spamcontrol/distinfo b/mail/qmail-spamcontrol/distinfo
deleted file mode 100644
index 309efaab60b5..000000000000
--- a/mail/qmail-spamcontrol/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (qmail-1.03.tar.gz) = 622f65f982e380dbe86e6574f3abcb7c
-SIZE (qmail-1.03.tar.gz) = 220668
-MD5 (spamcontrol-2313_tgz.bin) = a8ad350699dfd6110c3e8a8784f55ad4
-SIZE (spamcontrol-2313_tgz.bin) = 116888
diff --git a/mail/qmail-spamcontrol/pkg-plist b/mail/qmail-spamcontrol/pkg-plist
deleted file mode 100644
index b0058288972b..000000000000
--- a/mail/qmail-spamcontrol/pkg-plist
+++ /dev/null
@@ -1,144 +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-badloadertypes
-bin/qmail-badmimetypes
-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-recipients
-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
-scripts/qmail-alias2recipients
-scripts/qmail-pwd2recipients
-scripts/qmail-users2recipients
-scripts/qmail-vpopmail2recipients
-%%PORTDOCS%%%%DOCDIR%%/BLURB
-%%PORTDOCS%%%%DOCDIR%%/BLURB2
-%%PORTDOCS%%%%DOCDIR%%/BLURB3
-%%PORTDOCS%%%%DOCDIR%%/BLURB4
-%%PORTDOCS%%%%DOCDIR%%/FAQ
-%%PORTDOCS%%%%DOCDIR%%/FILES.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/HISTORY.spamcontrol
-%%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.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
-%%PORTDOCS%%%%DOCDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCDIR%%/LICENSE.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/LOGGING.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/Makefile.djbdns
-%%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%%/README.bigtodo
-%%PORTDOCS%%%%DOCDIR%%/README.bouncemaxbytes
-%%PORTDOCS%%%%DOCDIR%%/README.djbdns
-%%PORTDOCS%%%%DOCDIR%%/README.doublebouncetrim
-%%PORTDOCS%%%%DOCDIR%%/README.moreipme
-%%PORTDOCS%%%%DOCDIR%%/README.qmailqueue
-%%PORTDOCS%%%%DOCDIR%%/README.recipients
-%%PORTDOCS%%%%DOCDIR%%/README.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/README.wildmat
-%%PORTDOCS%%%%DOCDIR%%/README_spamcontrol.html
-%%PORTDOCS%%%%DOCDIR%%/RELEASE_22.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/RELEASE_23.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
-%%PORTDOCS%%%%DOCDIR%%/SECURITY
-%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
-%%PORTDOCS%%%%DOCDIR%%/SMTPREPLY.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
-%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
-%%PORTDOCS%%%%DOCDIR%%/TEST.receive
-%%PORTDOCS%%%%DOCDIR%%/TESTING.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
-%%PORTDOCS%%%%DOCDIR%%/TODO.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCDIR%%/badloadertypes
-%%PORTDOCS%%%%DOCDIR%%/badmailfrom
-%%PORTDOCS%%%%DOCDIR%%/badmimetypes
-%%PORTDOCS%%%%DOCDIR%%/badrcptto
-%%PORTDOCS%%%%DOCDIR%%/conf-spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/install_spamcontrol.sh
-%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
-%%PORTDOCS%%%%DOCDIR%%/tarpitcount
-%%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