2 files changed, 34 insertions, 45 deletions

diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile
index db6f1ffd0858..18274943d125 100644
--- a/mail/qmail-spamcontrol/Makefile
+++ b/mail/qmail-spamcontrol/Makefile
@@ -21,6 +21,17 @@ QMAIL_DIST=		${PORTNAME}-${QMAIL_VERSION}${EXTRACT_SUFX}
 SPAMCONTROL_DIST=	spamcontrol-${SPAMCONTROL_VERSION}_tgz.bin
 SPAMCONTROL_VERSION=	2312
 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(PRE_MK_INCLUDED)
 .include <bsd.port.pre.mk>
@@ -49,22 +60,22 @@ MD5_FILE=	${.CURDIR}/distinfo
 
 EXTRA_MAN8=	qmail-badloadertypes.8 qmail-badmimetypes.8 qmail-recipients.8
 MAN8+=		${EXTRA_MAN8}
-DOCFILES+=	${WRKSRC}/FILES.spamcontrol ${WRKSRC}/HISTORY.spamcontrol \
-		${WRKSRC}/INSTALL.spamcontrol ${WRKSRC}/LICENSE.spamcontrol \
-		${WRKSRC}/LOGGING.spamcontrol ${WRKSRC}/Makefile.djbdns \
-		${WRKSRC}/README.auth ${WRKSRC}/README.bigtodo \
-		${WRKSRC}/README.bouncemaxbytes ${WRKSRC}/README.djbdns \
-		${WRKSRC}/README.doublebouncetrim ${WRKSRC}/README.moreipme \
-		${WRKSRC}/README.qmailqueue ${WRKSRC}/README.recipients \
-		${WRKSRC}/README.spamcontrol ${WRKSRC}/README.wildmat \
-		${WRKSRC}/README_spamcontrol.html \
-		${WRKSRC}/RELEASE_22.spamcontrol \
-		${WRKSRC}/RELEASE_23.spamcontrol \
-		${WRKSRC}/SMTPREPLY.spamcontrol ${WRKSRC}/TESTING.spamcontrol \
-		${WRKSRC}/TODO.spamcontrol ${WRKSRC}/badloadertypes \
-		${WRKSRC}/badmailfrom ${WRKSRC}/badmimetypes \
-		${WRKSRC}/badrcptto ${WRKSRC}/conf-spamcontrol \
-		${WRKSRC}/install_spamcontrol.sh ${WRKSRC}/tarpitcount
+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
 
@@ -123,48 +134,26 @@ SELECTED_OPTIONS+=	bigtodo=yes
 SELECTED_OPTIONS+=	bigtodo=no
 .endif
 
-slaveport-pre-fetch:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following build options:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "WITH_RELAYMAILFROM	Permit to open relay based"
-	@${ECHO_MSG} "			on mailfrom (may be dangerous)"
-	@${ECHO_MSG} "WITH_QUITASAP		Close SMTP session in case of a"
-	@${ECHO_MSG} "			filter condition (violates SMTP RFC)"
-	@${ECHO_MSG} "WITHOUT_REQBRACKETS	Disable function that requires"
-	@${ECHO_MSG} "			brackets in <addresses>"
-	@${ECHO_MSG} "WITHOUT_VERP		Disable VERP addresses for recipients"
-	@${ECHO_MSG} "WITH_RECIPIENTS550	In case of non existing"
-	@${ECHO_MSG} "			recipients get a direct 550 reply"
-	@${ECHO_MSG} "			instead of a deferred bounce (via 450)"
-	@${ECHO_MSG} "WITH_LOCALMFREQAUTH	Require authentication when"
-	@${ECHO_MSG} "			mailfrom is @ your local-domains"
-	@${ECHO_MSG} "WITH_AUTHCRAM		Aditional CRAM-MD5 support; needs"
-	@${ECHO_MSG} "			a CRAM-MD5 supporting PAM (ie. cmd5chkpw)"
-	@${ECHO_MSG} "WITH_MOREIPME		Scott Gifford's additional control"
-	@${ECHO_MSG} "			files moreipme and notipme"
-	@${ECHO_MSG} "WITH_BIGTODO		Bruce Guenter's BigToDo patch	consider"
-	@${ECHO_MSG} "			raising conf-split in the first place"
-	@${ECHO_MSG} ""
-
 post-extract:
 	@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${SPAMCONTROL_DIST}
 
 slaveport-post-patch:
-	cd ${WRKSRC} && ${PATCH} < ${.CURDIR}/files/patch-qmail-smtpd.c.patch
+	@cd ${WRKSRC} && \
+	${PATCH} -s < ${.CURDIR}/files/patch-qmail-smtpd.c.patch
 
-post-configure:
+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
-	@${MKDIR} ${PREFIX}/scripts
 	@cd ${WRKSRC} && ./install_spamcontrol.sh
 
 post-install:
+	@${MKDIR} ${PREFIX}/scripts
 .for script in ${SCRIPTS}
-	@${INSTALL_SCRIPT} ${WRKSRC}/${script} ${PREFIX}/scripts
+	@${INSTALL_SCRIPT} ${WRKDIR}/scripts/${script} ${PREFIX}/scripts
 .endfor
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/qmail-spamcontrol/pkg-descr b/mail/qmail-spamcontrol/pkg-descr
index 2b568d6d401b..b8c0852ade82 100644
--- a/mail/qmail-spamcontrol/pkg-descr
+++ b/mail/qmail-spamcontrol/pkg-descr
@@ -1,5 +1,5 @@
 SpamControl is a collection of patches for qmail developed and maintained
-by Erwin Hoffman (feh@fehcom.de).
+by Erwin Hoffmann (feh@fehcom.de).
 
 Some SpamControl features: smtp-auth (plain, login and cram-md5),
 requirement of brackets on addresses, qmail-queue, bigtodo, moreipme,