Index: mail/qmail/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/qmail/Makefile,v
retrieving revision 1.117
diff -u -r1.117 Makefile
--- mail/qmail/Makefile	8 Sep 2006 13:12:13 -0000	1.117
+++ mail/qmail/Makefile	1 Feb 2007 17:53:37 -0000
@@ -176,7 +176,8 @@
 		REQBRACKETS	"Require brackets in <addresses>" on \
 		VERP		"VERP addresses for recipients" on \
 		MOREIPME	"Add control files (more|not)ipme" off \
-		BIGTODO		"Bruce Guenter's BigToDo patch" off
+		BIGTODO		"Bruce Guenter's BigToDo patch" off \
+		EXTFORK		"Allow qmail-smtpd fork external progs" off
 .endif
 .if !defined(SLAVE_LDAP)
 OPTIONS+=	RCDLINK "create rc.d/qmail.sh" on
@@ -456,6 +457,12 @@
 PATCHFILES+=	tarpit.patch:tarpit
 .endif
 
+.if defined(WITH_EXTFORK) && defined(SLAVE_SPAMCONTROL)
+MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:extfork/}
+MASTER_SITE_SUBDIR+=	garga/qmail/:extfork
+DISTFILES+=	smtpextfork-spamcontrol-${SPAMCONTROL_VERSION}.patch:extfork
+.endif
+
 # Some default values, these can be modified by make command line
 .if defined(WITH_BIG_CONCURRENCY_PATCH) && !defined(BARRIER_BIG_CONCURRENCY_PATCH)
 WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT?=	509
@@ -562,17 +569,20 @@
 . for option in ${SELECTED_OPTIONS}
 	@${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol
 . endfor
-	@cd ${WRKSRC} && ./install_spamcontrol.sh && \
-		${PATCH} < ${FILESDIR}/extra-patch-spamcontrol-qmail-smtpd.c
-.if defined(WITH_SPF_PATCH) && defined(SPF_SPAMCONTROL_PATCH)
+	@cd ${WRKSRC} && ./install_spamcontrol.sh
+	@${PATCH} -d ${WRKSRC} < ${FILESDIR}/extra-patch-spamcontrol-qmail-smtpd.c
+. if defined(WITH_SPF_PATCH) && defined(SPF_SPAMCONTROL_PATCH)
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SPF_SPAMCONTROL_PATCH}
-. if defined(WITH_EXTTODO_PATCH) && defined(EXTTODO_PATCH)
+.  if defined(WITH_EXTTODO_PATCH) && defined(EXTTODO_PATCH)
 	@${PATCH} -p1 -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${EXTTODO_PATCH}
+.  endif
 . endif
-.endif
-.if defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)
+. if defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/outgoingip.patch-spamcontrol
-.endif
+. endif
+. if defined(WITH_EXTFORK)
+	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/smtpextfork-spamcontrol-${SPAMCONTROL_VERSION}.patch
+. endif
 .elif defined(SLAVE_TLS)
 	@${HEAD} -105 ${DISTDIR}/${DIST_SUBDIR}/qmail-1.03-tls-${TLS_PATCH_DATE}-renato.patch > \
 		${WRKDIR}/TLS.readme
Index: mail/qmail/distinfo
===================================================================
RCS file: /home/pcvs/ports/mail/qmail/distinfo,v
retrieving revision 1.57
diff -u -r1.57 distinfo
--- mail/qmail/distinfo	1 Feb 2007 17:14:17 -0000	1.57
+++ mail/qmail/distinfo	1 Feb 2007 17:53:37 -0000
@@ -94,3 +94,6 @@
 MD5 (qmail/ext_todo-20030105+big-todo.103.patch) = 5878870ef85d6a83ba9465ce94d9cd42
 SHA256 (qmail/ext_todo-20030105+big-todo.103.patch) = 4e44ad403b21f5910b6af11295b82296bc8c0f18bc40dcfecfb95c11e5a296f7
 SIZE (qmail/ext_todo-20030105+big-todo.103.patch) = 2523
+MD5 (qmail/smtpextfork-spamcontrol-2417.patch) = 54e4d8686a621166b006765c83c14cb0
+SHA256 (qmail/smtpextfork-spamcontrol-2417.patch) = 422b8b37c6e447f1a9ae1ffec8d00aee98bceafa963927c6331480ad90e99563
+SIZE (qmail/smtpextfork-spamcontrol-2417.patch) = 6865