- split libmilter from sendmail into a seperate port

- bump PORTREVISION
Submitted by:	matthew (Matthew Seaman)

32 files changed, 218 insertions, 161 deletions

diff --git a/mail/Makefile b/mail/Makefile
index c1c8f22..fb9705a 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -200,6 +200,7 @@
     SUBDIR += libesmtp
     SUBDIR += libetpan
     SUBDIR += libmapi
+    SUBDIR += libmilter
     SUBDIR += libpst
     SUBDIR += librfc822
     SUBDIR += libsieve
diff --git a/mail/antivirus-milter/Makefile b/mail/antivirus-milter/Makefile
index 87da622..3872961 100644
--- a/mail/antivirus-milter/Makefile
+++ b/mail/antivirus-milter/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	antivirus
 PORTVERSION=	3.30
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	LOCAL/dinoex
 
@@ -28,6 +28,7 @@ ANTIVIRUS_DIR?=	/var/spool/antivirus
 .if defined(WITH_SENDMAIL_PORT)
 LIBS+=		${LDFLAGS}
 .endif
+
 MAKE_ENV+=	SENDMAILBASE="${MILTERBASE}" \
 		SENDMAILOBJ="${MILTERBASE}" \
 		LIBS="${LIBS}"
diff --git a/mail/archivesmtp/Makefile b/mail/archivesmtp/Makefile
index cc4718c..b559745 100644
--- a/mail/archivesmtp/Makefile
+++ b/mail/archivesmtp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	archivesmtp
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dancingfortune.com/projects/archivesmtp/files/
 
diff --git a/mail/batv-milter/Makefile b/mail/batv-milter/Makefile
index 6e478f9..eb13ba1 100644
--- a/mail/batv-milter/Makefile
+++ b/mail/batv-milter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	batv-milter
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index daf9f69..de61ffc 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dk-milter
 PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/DomainKeys%20Milter/${PORTVERSION}
 
diff --git a/mail/enma/Makefile b/mail/enma/Makefile
index 4ce9469..6e843eb 100644
--- a/mail/enma/Makefile
+++ b/mail/enma/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	enma
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/ENMA/${PORTVERSION}
 
diff --git a/mail/libmilter/Makefile b/mail/libmilter/Makefile
new file mode 100644
index 0000000..d4baa52
--- /dev/null
+++ b/mail/libmilter/Makefile
@@ -0,0 +1,93 @@
+# $FreeBSD$
+
+PORTNAME=	libmilter
+PORTVERSION=	8.15.2
+CATEGORIES=	mail ipv6
+MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/
+DISTNAME=	sendmail.${PORTVERSION}
+
+MAINTAINER=	dinoex@FreeBSD.org
+COMMENT=	Library providing Sendmail Mail Filter API
+
+LICENSE=	Sendmail
+LICENSE_NAME=	Sendmail License
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_PERMS=	${_LICENSE_PERMS_DEFAULT}
+
+MILTER_SOVER?=	6
+
+OPTIONS_DEFINE?=	IPV6 MILTER_SHARED MILTER_POOL DOCS
+OPTIONS_DEFAULT?=	IPV6 MILTER_SHARED MILTER_POOL
+NO_OPTIONS_SORT=yes
+MILTER_SHARED_DESC=	Build shared libmilter
+MILTER_POOL_DESC=	Enable milter thread pools
+
+WRKSRC=		${WRKDIR}/sendmail-${PORTVERSION}
+WCONF=		${WRKSRC}/devtools/Site
+SITE=		${FILESDIR}/site.config.m4
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MIPV6}
+SITE+=		${FILESDIR}/site.config.m4.ipv6
+.endif
+.if ${PORT_OPTIONS:MMILTER_POOL}
+SITE+=		${FILESDIR}/site.config.m4.pool
+.endif
+
+.if ${PORT_OPTIONS:MMILTER_SHARED}
+PLIST_SUB+=	MILTER_SHARED=""
+PLIST_SUB+=	MILTER_SOVER=${MILTER_SOVER}
+MAKE_ENV+=	MILTER_SOVER=${MILTER_SOVER}
+USE_LDCONFIG=	yes
+.else
+PLIST_SUB+=	MILTER_SHARED="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MMILTER_SHARED}
+post-patch:
+	@${CP} -pR ${WRKSRC}/libmilter ${WRKSRC}/libsharedmilter
+	${CP} ${FILESDIR}/sharedlibrary.m4 \
+		${WRKSRC}/devtools/M4/UNIX/sharedlibrary.m4
+	${REINPLACE_CMD} -e 's=`library=`sharedlibrary=' \
+		${WRKSRC}/libsharedmilter/Makefile.m4
+.endif
+
+do-configure:
+	${REINPLACE_CMD} -e "s|\`-O\'|\`${CFLAGS}\'|" \
+		-e 's|%%CC%%|${CC}|' -e 's|%%LD%%|${LD}|' \
+		${WRKSRC}/devtools/OS/FreeBSD
+	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
+		-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
+		${SITE} > ${WCONF}/site.config.m4
+
+do-build:
+	(cd ${BUILD_WRKSRC}/libmilter; ${SETENV} ${MAKE_ENV} ${MAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+
+do-build-MILTER_SHARED-on:
+	(cd ${BUILD_WRKSRC}/libsharedmilter; ${SETENV} ${MAKE_ENV} \
+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/libmilter
+	${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
+		${WRKSRC}/include/libmilter/mfdef.h \
+		${STAGEDIR}${PREFIX}/include/libmilter/
+	${INSTALL_DATA} \
+		${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \
+		${STAGEDIR}${PREFIX}/lib/
+
+post-install-MILTER_SHARED-on:
+	${INSTALL_LIB} \
+		${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsharedmilter/libmilter.so \
+		${STAGEDIR}${PREFIX}/lib/libmilter.so.${MILTER_SOVER}
+	${LN} -sf libmilter.so.${MILTER_SOVER} \
+		${STAGEDIR}${PREFIX}/lib/libmilter.so
+
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/libmilter/README ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/libmilter/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
+
+.include <bsd.port.mk>
diff --git a/mail/libmilter/distinfo b/mail/libmilter/distinfo
new file mode 100644
index 0000000..9dedb3f
--- /dev/null
+++ b/mail/libmilter/distinfo
@@ -0,0 +1,2 @@
+SHA256 (sendmail.8.15.2.tar.gz) = 24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439
+SIZE (sendmail.8.15.2.tar.gz) = 2207417
diff --git a/mail/libmilter/files/patch-FreeBSD b/mail/libmilter/files/patch-FreeBSD
new file mode 100644
index 0000000..f75af45
--- /dev/null
+++ b/mail/libmilter/files/patch-FreeBSD
@@ -0,0 +1,11 @@
+--- devtools/OS/FreeBSD.orig	2003-07-03 03:07:45.000000000 +0200
++++ devtools/OS/FreeBSD	2013-11-16 07:06:27.000000000 +0100
+@@ -6,7 +6,7 @@
+ define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
+ define(`confLIBS', `-lutil')
+ 
+-define(`confLD', `cc')
++define(`confCC', `%%CC%%')
+ define(`confMTLDOPTS', `-pthread')
+ define(`confMTCCOPTS', `-D_THREAD_SAFE')
+ define(`confLDOPTS_SO', `-shared')
diff --git a/mail/sendmail/files/sharedlibrary.m4 b/mail/libmilter/files/sharedlibrary.m4
index 80241e2..80241e2 100644
--- a/mail/sendmail/files/sharedlibrary.m4
+++ b/mail/libmilter/files/sharedlibrary.m4
diff --git a/mail/libmilter/files/site.config.m4 b/mail/libmilter/files/site.config.m4
new file mode 100644
index 0000000..ce3979d
--- /dev/null
+++ b/mail/libmilter/files/site.config.m4
@@ -0,0 +1 @@
+APPENDDEF(`conf_libmilter_ENVDEF', `-DMILTER')
diff --git a/mail/libmilter/files/site.config.m4.ipv6 b/mail/libmilter/files/site.config.m4.ipv6
new file mode 100644
index 0000000..35eed81
--- /dev/null
+++ b/mail/libmilter/files/site.config.m4.ipv6
@@ -0,0 +1 @@
+APPENDDEF(`conf_libmilter_ENVDEF', `-DNETINET6')
diff --git a/mail/libmilter/files/site.config.m4.pool b/mail/libmilter/files/site.config.m4.pool
new file mode 100644
index 0000000..8de1896
--- /dev/null
+++ b/mail/libmilter/files/site.config.m4.pool
@@ -0,0 +1,2 @@
+APPENDDEF(`conf_libmilter_ENVDEF', `-DSM_CONF_POLL=1')
+APPENDDEF(`conf_libmilter_ENVDEF', `-D_FFR_WORKERS_POOL=1')
diff --git a/mail/libmilter/pkg-descr b/mail/libmilter/pkg-descr
new file mode 100644
index 0000000..ba76cf7
--- /dev/null
+++ b/mail/libmilter/pkg-descr
@@ -0,0 +1,5 @@
+The sendmail Mail Filter API (Milter) is designed to allow third-party
+programs access to mail messages as they are being processed in order to
+filter meta-information and content.
+
+WWW: http://www.sendmail.com/sm/open_source/milter/
diff --git a/mail/libmilter/pkg-plist b/mail/libmilter/pkg-plist
new file mode 100644
index 0000000..a7834ba
--- /dev/null
+++ b/mail/libmilter/pkg-plist
@@ -0,0 +1,57 @@
+include/libmilter/mfapi.h
+include/libmilter/mfdef.h
+lib/libmilter.a
+%%MILTER_SHARED%%lib/libmilter.so.%%MILTER_SOVER%%
+%%MILTER_SHARED%%lib/libmilter.so
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/api.html
+%%PORTDOCS%%%%DOCSDIR%%/design.html
+%%PORTDOCS%%%%DOCSDIR%%/figure1.fig
+%%PORTDOCS%%%%DOCSDIR%%/figure1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/figure1.ps
+%%PORTDOCS%%%%DOCSDIR%%/figure2.fig
+%%PORTDOCS%%%%DOCSDIR%%/figure2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/figure2.ps
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/other.html
+%%PORTDOCS%%%%DOCSDIR%%/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/sample.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_addheader.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_addrcpt.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_addrcpt_par.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_chgfrom.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_chgheader.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_delrcpt.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_getpriv.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_getsymval.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_insheader.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_main.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_opensocket.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_progress.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_quarantine.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_register.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_replacebody.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_setbacklog.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_setconn.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_setdbg.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_setmlreply.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_setpriv.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_setreply.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_setsymlist.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_settimeout.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_stop.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_version.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_abort.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_body.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_close.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_connect.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_data.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_envfrom.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_envrcpt.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_eoh.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_eom.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_header.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_helo.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_negotiate.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_unknown.html
diff --git a/mail/milter-greylist-devel/Makefile b/mail/milter-greylist-devel/Makefile
index 94baabc..13bfdcb 100644
--- a/mail/milter-greylist-devel/Makefile
+++ b/mail/milter-greylist-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	milter-greylist
 PORTVERSION=	4.6.a1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/ \
 		http://fossies.org/unix/privat/ \
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index 8e84e93..4dfe382 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	milter-greylist
 PORTVERSION=	4.4.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/ \
 		http://fossies.org/unix/privat/
diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile
index 3f39afa..0298141 100644
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	milter-regex
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/
 
diff --git a/mail/noattach/Makefile b/mail/noattach/Makefile
index 911c5dc..81e39f1 100644
--- a/mail/noattach/Makefile
+++ b/mail/noattach/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	noattach
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.rhnet.is/pub/noattach/
 
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 7205587..6406e6f 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		opendkim
 PORTVERSION=		2.10.3
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		mail security
 MASTER_SITES=		SF/${PORTNAME} \
 			SF/${PORTNAME}/Previous%20Releases \
diff --git a/mail/raysfilter/Makefile b/mail/raysfilter/Makefile
index 8c49450..9b220ad 100644
--- a/mail/raysfilter/Makefile
+++ b/mail/raysfilter/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	raysfilter
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	LOCAL/dinoex
 DISTNAME=	rays-filter-${PORTVERSION}
@@ -15,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/GNU-public-licence.txt
 USES=		shebangfix
 CTARGETS+=	rays-filter
 CFLAGS+=	-Wall
-LIBS+=		-lpthread
+LIBS+=		-lpthread -lmilter
 SHEBANG_FILES=	mf-analyze
 ETCFILES=	header-list.conf mail-filter.conf string-list.conf
 BINFILES=	mf-reset mf-start mf-stop mf-archive mf-analyze mf-memory
@@ -28,17 +29,6 @@ OPTIONS_DEFINE=	DOCS
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.if exists(${LOCALBASE}/include/libmilter/mfdef.h) \
-|| defined(WITH_SENDMAIL_BASE)
-LIBS+=		-lmilter
-.else
-LIBS+=		-lmilter -lsmutil
-.endif
-
-.if defined(SENDMAIL_WITH_SFIO)
-LIBS+=		-lsfio
-.endif
-
 .for i in ${CTARGETS}
 ${i}:
 	cd ${WRKSRC} && \
diff --git a/mail/rbl-milter/Makefile b/mail/rbl-milter/Makefile
index 1d1c2d1..c698c6b 100644
--- a/mail/rbl-milter/Makefile
+++ b/mail/rbl-milter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rbl-milter
 PORTVERSION=	0.30
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://opensource.confusticate.com/rbl-milter/
 
@@ -20,4 +20,5 @@ CONFIGURE_ARGS+=	--with-sendmail=${MILTERBASE} \
 			--with-sendmail-obj=${MILTERBASE}/lib
 
 .include "${.CURDIR}/../sendmail/bsd.milter.mk"
+
 .include <bsd.port.mk>
diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile
index e0ef6cab..cc4a719 100644
--- a/mail/rmilter/Makefile
+++ b/mail/rmilter/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rmilter
 PORTVERSION=	1.7.3
+PORTREVISION=	1
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
diff --git a/mail/scam-backscatter/Makefile b/mail/scam-backscatter/Makefile
index 75bd63f..4601dbe 100644
--- a/mail/scam-backscatter/Makefile
+++ b/mail/scam-backscatter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	scam-backscatter
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.elandsys.com/scam/scam-backscatter/ \
 		http://dist.epipe.com/mirrors/scam-backscatter/
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 0549038..c65d2cd 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	sendmail
 PORTVERSION=	8.15.2
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/
 PKGNAMESUFFIX?=	${TLS_SUFFIX}${SASL_SUFFIX}${LDAP_SUFFIX}${BDB_SUFFIX}${PKGNAMESUFFIX2}
@@ -10,6 +11,11 @@ DISTNAME=	${PORTNAME}.${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Reliable, highly configurable mail transfer agent with utilities
 
+LICENSE=	Sendmail
+LICENSE_NAME=	Sendmail License
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_PERMS=	${_LICENSE_PERMS_DEFAULT}
+
 CONFLICTS?=	courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-*
 
 USERS=		smmsp
@@ -38,8 +44,8 @@ SENDMAIL=	${PREFIX}/sbin/sendmail
 BASEMAIL=	/usr/libexec/sendmail/sendmail
 MILTER_SOVER?=	6
 
-OPTIONS_DEFINE?=	SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD LDAP BDB SOCKETMAP CYRUSLOOKUP PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL DOCS
-OPTIONS_DEFAULT?=	SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL
+OPTIONS_DEFINE?=	SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD LDAP BDB SOCKETMAP CYRUSLOOKUP PICKY_HELO_CHECK MILTER DOCS
+OPTIONS_DEFAULT?=	SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD PICKY_HELO_CHECK MILTER
 NO_OPTIONS_SORT=yes
 SHMEM_DESC=		System V shared memory support
 LA_DESC=		load averages support
@@ -49,9 +55,7 @@ BDB_DESC=		Berkeley DB version 4 support
 SOCKETMAP_DESC=		Enable socketmap feature
 CYRUSLOOKUP_DESC=	Enable cyruslookup feature
 PICKY_HELO_CHECK_DESC=	Enable picky HELO check
-MILTER_DESC=		Build libmilter
-MILTER_SHARED_DESC=	Build shared libmilter
-MILTER_POOL_DESC=	Enable milter thread pools
+MILTER_DESC=		Enable milter support
 
 BDB_USE=	BDB=yes
 LDAP_USE=	OPENLDAP=yes
@@ -119,16 +123,6 @@ SITE+=	${FILESDIR}/site.config.m4.milter
 USE_OPENSSL=	yes
 .endif
 
-.if ${PORT_OPTIONS:MMILTER}
-.if ${PORT_OPTIONS:MMILTER_SHARED}
-PLIST_SUB+=	MILTER_SHARED=""
-PLIST_SUB+=	MILTER_SOVER=${MILTER_SOVER}
-MAKE_ENV+=	MILTER_SOVER=${MILTER_SOVER}
-.else
-PLIST_SUB+=	MILTER_SHARED="@comment "
-.endif
-.endif
-
 SED_SCRIPT=	-e "s|\`-O\'|\`${CFLAGS}\'|" \
 		-e 's|%%CC%%|${CC}|' -e 's|%%LD%%|${LD}|'
 
@@ -141,13 +135,6 @@ post-patch:
 		-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
 		-e "s=%%PORTSDIR%%=${PORTSDIR}=g" \
 		${PKGDIR}/pkg-message > ${WRKSRC}/pkg-message
-.if ${PORT_OPTIONS:MMILTER} && ${PORT_OPTIONS:MMILTER_SHARED}
-	@${CP} -pR ${WRKSRC}/libmilter ${WRKSRC}/libsharedmilter
-	${CP} ${FILESDIR}/sharedlibrary.m4 \
-		${WRKSRC}/devtools/M4/UNIX/sharedlibrary.m4
-	${REINPLACE_CMD} -e 's=`library=`sharedlibrary=' \
-		${WRKSRC}/libsharedmilter/Makefile.m4
-.endif
 
 do-configure:
 	${REINPLACE_CMD} ${SED_SCRIPT} ${WRKSRC}/devtools/OS/FreeBSD
@@ -192,30 +179,13 @@ do-configure:
 	'APPENDDEF(`confENVDEF'\'', `-DLA_TYPE=LA_ZERO'\'')' \
 		>> ${WCONF}/site.config.m4
 .endif
-.if ${PORT_OPTIONS:MMILTER} && ${PORT_OPTIONS:MMILTER_POOL}
-	${ECHO_CMD} \
-	 'APPENDDEF(`conf_libmilter_ENVDEF'\'', `-DSM_CONF_POLL=1'\'')' \
-		>> ${WCONF}/site.config.m4
-	${ECHO_CMD} \
-	 'APPENDDEF(`conf_libmilter_ENVDEF'\'', `-D_FFR_WORKERS_POOL=1'\'')' \
-		>> ${WCONF}/site.config.m4
-.endif
 
 post-build:
 	(cd ${WRKSRC}/doc/op && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} op.txt)
-.if ${PORT_OPTIONS:MMILTER}
-	(cd ${BUILD_WRKSRC}/libmilter; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-.if ${PORT_OPTIONS:MMILTER_SHARED}
-	(cd ${BUILD_WRKSRC}/libsharedmilter; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-.endif
-.endif
 
 pre-install:
 	${MKDIR} ${STAGEDIR}/etc/mail
 	@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
-.if ${PORT_OPTIONS:MMILTER}
-	@${CAT} ${FILESDIR}/pkg-milter >>${PLIST}
-.endif
 	@cd ${WRKSRC} && ${FIND} cf -type f | \
 	${AWK} '{print "share/sendmail/" $$1}' >>${PLIST}
 .if ${PORT_OPTIONS:MDOCS}
@@ -235,22 +205,6 @@ post-install:
 	 ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} force-install)
 	(cd ${WRKSRC}/rmail && \
 	 ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} force-install)
-.if ${PORT_OPTIONS:MMILTER}
-	${MKDIR} ${STAGEDIR}${PREFIX}/include/libmilter
-	${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
-		${WRKSRC}/include/libmilter/mfdef.h \
-		${STAGEDIR}${PREFIX}/include/libmilter/
-	${INSTALL_DATA} \
-	 ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \
-	 ${STAGEDIR}${PREFIX}/lib/
-.if ${PORT_OPTIONS:MMILTER_SHARED}
-	${INSTALL_LIB} \
-	 ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsharedmilter/libmilter.so \
-	 ${STAGEDIR}${PREFIX}/lib/libmilter.so.${MILTER_SOVER}
-	${LN} -sf libmilter.so.${MILTER_SOVER} \
-		${STAGEDIR}${PREFIX}/lib/libmilter.so
-.endif
-.endif
 .for i in ${LMAN8}
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man8/
 .endfor
@@ -263,7 +217,13 @@ post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/sendmail
 	${TAR} -C ${WRKSRC} -cf - cf | \
 		${TAR} -C ${STAGEDIR}${PREFIX}/share/sendmail -xf -
-.if ${PORT_OPTIONS:MDOCS}
+	${RM} ${STAGEDIR}${PREFIX}/man/cat*/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vacation
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rmail
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/*
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${STAGEDIR}${DOCSDIR}/op.ps
@@ -272,21 +232,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sendmail/README ${STAGEDIR}${DOCSDIR}/SENDMAIL
 	${INSTALL_DATA} ${WRKSRC}/mail.local/README ${STAGEDIR}${DOCSDIR}/MAIL.LOCAL
 	${INSTALL_DATA} ${WRKSRC}/smrsh/README ${STAGEDIR}${DOCSDIR}/SMRSH
-.if ${PORT_OPTIONS:MMILTER}
-	${INSTALL_DATA} ${WRKSRC}/libmilter/README ${STAGEDIR}${DOCSDIR}/MILTER
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/libmilter
-	${TAR} -C ${WRKSRC}/libmilter/docs -cf - . | \
-		${TAR} -C ${STAGEDIR}${DOCSDIR}/libmilter -xf -
-.endif
 .if ${PORT_OPTIONS:MCYRUSLOOKUP}
 	${INSTALL_DATA} ${FILESDIR}/CYRUS_LOOKUP ${STAGEDIR}${DOCSDIR}/CYRUS_LOOKUP
 .endif
-.endif
-	${RM} ${STAGEDIR}${PREFIX}/man/cat*/*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vacation
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rmail
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/*
 
 mailer.base:
 	@${SED} \
diff --git a/mail/sendmail/files/pkg-milter b/mail/sendmail/files/pkg-milter
deleted file mode 100644
index e1155e4..0000000
--- a/mail/sendmail/files/pkg-milter
+++ /dev/null
@@ -1,57 +0,0 @@
-include/libmilter/mfapi.h
-include/libmilter/mfdef.h
-lib/libmilter.a
-%%MILTER_SHARED%%lib/libmilter.so.%%MILTER_SOVER%%
-%%MILTER_SHARED%%lib/libmilter.so
-%%PORTDOCS%%share/doc/sendmail/MILTER
-%%PORTDOCS%%share/doc/sendmail/libmilter/api.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/design.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure1.fig
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure1.jpg
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure1.ps
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure2.fig
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure2.jpg
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure2.ps
-%%PORTDOCS%%share/doc/sendmail/libmilter/index.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/installation.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/other.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/overview.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/sample.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_addheader.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_addrcpt.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_addrcpt_par.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_chgfrom.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_chgheader.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_delrcpt.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_getpriv.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_getsymval.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_insheader.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_main.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_opensocket.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_progress.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_quarantine.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_register.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_replacebody.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setbacklog.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setconn.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setdbg.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setmlreply.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setpriv.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setreply.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setsymlist.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_settimeout.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_stop.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_version.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_abort.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_body.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_close.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_connect.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_data.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_envfrom.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_envrcpt.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_eoh.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_eom.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_header.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_helo.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_negotiate.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_unknown.html
diff --git a/mail/sentinel/Makefile b/mail/sentinel/Makefile
index cb94b0a..cfbcdbc 100644
--- a/mail/sentinel/Makefile
+++ b/mail/sentinel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sentinel
 PORTVERSION=	1.7b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/smfilter/${PORTNAME}/Sentinel%20${PORTVERSION}
 
@@ -15,16 +15,15 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	NOSUBJECT DOCS
+
+NOSUBJECT_DESC=		do not decode subject
+NOSUBJECT_CFLAGS=	-DDO_NOT_DECODE_SUBJECT
 
 .include <bsd.port.pre.mk>
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.if defined(WITHOUT_SENTINEL_DECODE_SUBJECT)
-CFLAGS+=	-DDO_NOT_DECODE_SUBJECT
-.endif
-
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${CC} ${CFLAGS} -o ${PORTNAME} sentinel.c ${LDFLAGS} \
diff --git a/mail/sid-milter/Makefile b/mail/sid-milter/Makefile
index b231fee..75a2a06 100644
--- a/mail/sid-milter/Makefile
+++ b/mail/sid-milter/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	sid-milter
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/SenderID%20Milter/${PORTVERSION}
 
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index 7298bf1..355fcc6 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	spamass-milter
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SAVANNAH/spamass-milt
 
diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile
index 40168fb..7eb18da 100644
--- a/mail/spamilter/Makefile
+++ b/mail/spamilter/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	spamilter
 PORTVERSION=	0.60
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.wanlink.com/spamilter/download/
 
@@ -69,9 +69,9 @@ post-install:
 .for i in ${BINFILES}
 	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin/
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCSFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/mail/vbsfilter/Makefile b/mail/vbsfilter/Makefile
index 92d9c13..253670a 100644
--- a/mail/vbsfilter/Makefile
+++ b/mail/vbsfilter/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	vbsfilter
 PORTVERSION=	1.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.dinoex.de/pub/approved/
 EXTRACT_SUFX=	.c
@@ -24,10 +24,6 @@ CFLAGS+=	-Wall
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.if defined(SENDMAIL_WITH_SFIO)
-LIBS+=		-lsfio
-.endif
-
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${_DISTDIR}vbsfilter-${PORTVERSION}.c ${WRKSRC}
diff --git a/security/amavisd-milter/Makefile b/security/amavisd-milter/Makefile
index cee39b1..6f927cc 100644
--- a/security/amavisd-milter/Makefile
+++ b/security/amavisd-milter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	amavisd-milter
 PORTVERSION=	1.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}