3 files changed, 30 insertions, 45 deletions

diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile
index 80949b73bcc6..04df5aa02274 100644
--- a/mail/qmail-spamcontrol/Makefile
+++ b/mail/qmail-spamcontrol/Makefile
@@ -16,6 +16,9 @@ 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
+
 # Distfiles
 QMAIL_DIST=		${PORTNAME}-${QMAIL_VERSION}${EXTRACT_SUFX}
 SPAMCONTROL_DIST=	spamcontrol-${SPAMCONTROL_VERSION}_tgz.bin
@@ -33,14 +36,15 @@ OPTIONS=	RELAYMAILFROM	"Open relay based on mailfrom" off \
 		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_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}
 
@@ -75,7 +80,7 @@ DOCFILES+=	${WRKDIR}/doc/FILES.spamcontrol ${WRKDIR}/doc/HISTORY.spamcontrol \
 		${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 @@ SELECTED_OPTIONS+=	bigtodo=no
 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" \
@@ -149,10 +150,4 @@ pre-configure:
 .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 --git a/mail/qmail-spamcontrol/files/patch-qmail-smtpd.c.patch b/mail/qmail-spamcontrol/files/patch-qmail-smtpd.c.patch
index 249df059ec4f..5ec3016b92af 100644
--- a/mail/qmail-spamcontrol/files/patch-qmail-smtpd.c.patch
+++ b/mail/qmail-spamcontrol/files/patch-qmail-smtpd.c.patch
@@ -1,5 +1,5 @@
 --- orig/qmail-smtpd.c.patch	Sun Apr  3 15:51:55 2005
-+++ ./galle/qmail-smtpd.c.patch	Mon Apr  4 08:06:31 2005
++++ qmail-smtpd.c.patch	Mon Apr  4 08:06:31 2005
 @@ -1,8 +1,6 @@
 ---- qmail-smtpd.c.orig  1998-06-15
 -+++ qmail-smtpd.c       2005-04-03
diff --git a/mail/qmail-spamcontrol/pkg-plist b/mail/qmail-spamcontrol/pkg-plist
index ec71b87f3f6d..b0058288972b 100644
--- a/mail/qmail-spamcontrol/pkg-plist
+++ b/mail/qmail-spamcontrol/pkg-plist
@@ -1,27 +1,3 @@
-@group qmail
-@mode 04711
-@comment *** NOTE different owner
-@owner qmailq
-bin/qmail-queue
-@owner
-@mode 0700
-bin/qmail-badloadertypes
-bin/qmail-badmimetypes
-bin/qmail-lspawn
-bin/qmail-newmrh
-bin/qmail-newu
-bin/qmail-recipients
-bin/qmail-start
-@mode 0711
-bin/qmail-clean
-bin/qmail-getpw
-bin/qmail-local
-bin/qmail-pw2u
-bin/qmail-remote
-bin/qmail-rspawn
-bin/qmail-send
-bin/splogger
-@mode 0755
 bin/bouncesaying
 bin/condredirect
 bin/datemail
@@ -37,25 +13,38 @@ 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
-@group
-@owner
-@mode
 boot/binm1
 boot/binm1+df
 boot/binm2
@@ -76,6 +65,8 @@ configure/dnsptr
 configure/hostname
 configure/install
 configure/ipmeprint
+scripts/enable-qmail
+scripts/mkaliasdir
 scripts/qmail-alias2recipients
 scripts/qmail-pwd2recipients
 scripts/qmail-users2recipients
@@ -142,7 +133,6 @@ scripts/qmail-vpopmail2recipients
 %%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 +141,4 @@ scripts/qmail-vpopmail2recipients
 @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. Go to mail/qmail portsdir and do a 'make enable-sendmail'" | /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