Enable exiscan content scanning unless the new knob WITHOUT_EXISCAN

is defined.

Bump PORTREVISION accordingly.

3 files changed, 42 insertions, 6 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index e0da03e3219a..0299f05eeb06 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -7,27 +7,35 @@
 
 PORTNAME=	exim
 PORTVERSION=	${EXIM_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
 		http://www.exim.org/ftp/exim4/ \
 		ftp://ftp.is.co.za/networking/mail/transport/exim/exim4/
+.if !defined(WITHOUT_EXISCAN)
+MASTER_SITES+=	http://duncanthrax.net/exiscan/
+.endif
 DISTFILES=	exim-${EXIM_VERSION}.tar.bz2 \
 		exim-texinfo-${EXIM_DOCVERSION}.tar.bz2
+.if !defined(WITHOUT_EXISCAN)
+DISTFILES+=	exiscan-${EXISCAN_VERSION}.tar.gz
+EXTRACT_ONLY=	exim-${EXIM_VERSION}.tar.bz2 \
+		exim-texinfo-${EXIM_DOCVERSION}.tar.bz2
+.endif
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
 USE_BZIP2=	yes
-
 MAN8=		exim.8
 
 EXIM_VERSION=	4.10
 EXIM_DOCVERSION=	4.10
+EXISCAN_VERSION=	4.10-15
 
 PLIST_SUB+=     EXIM_VERSION="${EXIM_VERSION}"
 
 .if defined(NOPORTDOCS)
-PKGMESSAGE=	${FILESDIR}/POST-INSTALL-NOTES
+PKGMESSAGE=	${WRKDIR}/POST-INSTALL-NOTES
 .endif
 
 MAKE_ENV+=	OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH}
@@ -37,6 +45,10 @@ MAKE_ENV+=	OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH}
 # XFree86 to be installed if it is not present.
 #WITH_EXIMON=	yes
 
+# If WITHOUT_EXISCAN is defined, exim will be built without exiscan
+# email content scanner support.
+#WITHOUT_EXISCAN=	yes
+
 # Define WITH_TCP_WRAPPERS, WITH_LDAP, WITH_MYSQL, and WITH_PGSQL to
 # link against libwrap, an LDAP library (see below), liblibmysqlclient
 # and libpq respectively.  Define WITH_PWCHECK to link against libsasl
@@ -101,8 +113,14 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/eximon:${PORTSDIR}/mail/exim-monitor
 .include <bsd.port.pre.mk>
 
 PORTDOC_FILES=	Exim3.upgrade Exim4.upgrade OptionLists.txt README \
-		dbm.discuss.txt exim.8 filter.txt pcre.txt pcretest.txt \
+		dbm.discuss.txt filter.txt pcre.txt pcretest.txt \
 		spec.txt
+.if !defined(WITHOUT_EXISCAN)
+PORTDOC_FILES+=	exiscan-readme.txt
+PLIST_SUB+=             EXISCAN=""
+.else
+PLIST_SUB+=             EXISCAN="@comment "
+.endif
 
 .if ${OSVERSION} < 400014
 WITHOUT_IPV6=	yes
@@ -166,7 +184,7 @@ SEDLIST+=	-e 's,XX_MYSQL_[^ ]*_XX,,'
 .if defined(WITH_PWCHECK)
 RUN_DEPENDS+=	${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
 SEDLIST+=	-e 's,^\# SUPPORT_CYRUS_PWCHECK=,SUPPORT_CYRUS_PWCHECK=,' \
-		-e 's,^\# CYRUS_PWCHECK_SOCKET=,CYRUS_PWCHECK_SOCKET=,' 
+		-e 's,^\# CYRUS_PWCHECK_SOCKET=,CYRUS_PWCHECK_SOCKET=,'
 .endif
 
 .if !defined(WITHOUT_PAM)
@@ -223,6 +241,22 @@ SEDLIST+=	-e 's,^\# LOOKUP_CDB=,LOOKUP_CDB=,'
 SEDLIST+=	-e 's,^\# TRANSPORT_LMTP=,TRANSPORT_LMTP=,'
 .endif
 
+post-extract:
+.if !defined(WITHOUT_EXISCAN)
+	cd ${WRKDIR} && ${TAR} -xzf ${DISTDIR}/exiscan-${EXISCAN_VERSION}.tar.gz
+.endif
+
+post-patch:
+.if !defined(WITHOUT_EXISCAN)
+	cd ${WRKSRC} && ${PATCH} -p1 \
+	    < ../exiscan-${EXISCAN_VERSION}/exiscan-${EXISCAN_VERSION}.patch \
+	    > ${WRKDIR}/patch-exiscan.log 2>&1
+	@${CAT} ${FILESDIR}/POST-INSTALL-NOTES.exiscan \
+	    ${FILESDIR}/POST-INSTALL-NOTES > ${WRKDIR}/POST-INSTALL-NOTES
+.else
+	@${CAT} ${FILESDIR}/POST-INSTALL-NOTES > ${WRKDIR}/POST-INSTALL-NOTES
+.endif
+
 do-configure:
 	${MKDIR} ${WRKSRC}/Local
 	${SED} ${SEDLIST} < ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile
@@ -238,7 +272,7 @@ post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/exim.sh ${PREFIX}/etc/rc.d
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/exim
-	${INSTALL_DATA} ${FILESDIR}/POST-INSTALL-NOTES ${PREFIX}/share/doc/exim
+	${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${PREFIX}/share/doc/exim
 .for file in ${PORTDOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/exim
 .endfor
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index afd4701097c9..e8c1aa1d613f 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,2 +1,3 @@
 MD5 (exim-4.10.tar.bz2) = eb92cbba59bb2320b9912c46cd3fa4d0
 MD5 (exim-texinfo-4.10.tar.bz2) = 2a2a34a2457d249d568a58e985f263c0
+MD5 (exiscan-4.10-15.tar.gz) = 4eb1daede44f4005f568a7e88b6e1e39
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index 8b2dd3f0bc43..3d98d4f2a2ac 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -27,6 +27,7 @@ sbin/exiqsumm
 %%PORTDOCS%%share/doc/exim/pcre.txt
 %%PORTDOCS%%share/doc/exim/pcretest.txt
 %%PORTDOCS%%share/doc/exim/spec.txt
+%%PORTDOCS%%%%EXISCAN%%share/doc/exim/exiscan-readme.txt
 @unexec install-info --delete %D/info/exim.info %D/info/dir
 @unexec install-info --delete %D/info/exim_filter.info %D/info/dir
 @exec install-info --section="Exim" --entry "* Exim Specification: (exim).       Exim manual" %D/info/exim.info %D/info/dir