3 files changed, 16 insertions, 160 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 05490382c336..c65d2cd8f477 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 e1155e46585f..000000000000
--- 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/sendmail/files/sharedlibrary.m4 b/mail/sendmail/files/sharedlibrary.m4
deleted file mode 100644
index 80241e29b298..000000000000
--- a/mail/sendmail/files/sharedlibrary.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-divert(-1)
-#
-# Copyright (c) 1999-2001, 2006 Sendmail, Inc. and its suppliers.
-#	All rights reserved.
-#
-# By using this file, you agree to the terms and conditions set
-# forth in the LICENSE file which can be found at the top level of
-# the sendmail distribution.
-#
-#
-#  Definitions for Makefile construction for sendmail
-#
-#	$Id: library.m4,v 8.11 2006/09/05 22:56:53 ca Exp $
-#
-divert(0)dnl
-include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl
-bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl
-bldPUSH_TARGET(bldCURRENT_PRODUCT.so)dnl
-bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl
-bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl
-
-include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4')
-divert(bldTARGETS_SECTION)
-bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
-	${LD} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so -Wl,confSONAME -Wl,bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'}
-ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
-
-install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so
-ifdef(`bldINSTALLABLE', `	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.so ${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER}')
-
-bldCURRENT_PRODUCT-clean:
-	rm -f ${OBJS} bldCURRENT_PRODUCT.so ${MANPAGES}
-
-divert(0)
-COPTS+= confCCOPTS_SO