- bump MILTER_SOVER to fix linking on FREEBSD-12

- bump PORTREVISION on ports using libmilter
- rename WITH_SENDMAIL_PORT to WITH_MILTER_PORT
- rename WITH_SENDMAIL_BASE to WITH_MILTER_BASE
- rename WITH_SENDMAIL_STATIC_MILTER to WITH_MILTER_STATIC
- cleanup ifdefs
- fix build on batv-filter with libmilter from ports

30 files changed, 95 insertions, 81 deletions

diff --git a/mail/antivirus-milter/Makefile b/mail/antivirus-milter/Makefile
index 387296181cb6..57c81839847f 100644
--- a/mail/antivirus-milter/Makefile
+++ b/mail/antivirus-milter/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	antivirus
 PORTVERSION=	3.30
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	LOCAL/dinoex
 
@@ -25,9 +25,7 @@ ANTIVIRUS_DIR?=	/var/spool/antivirus
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.if defined(WITH_SENDMAIL_PORT)
 LIBS+=		${LDFLAGS}
-.endif
 
 MAKE_ENV+=	SENDMAILBASE="${MILTERBASE}" \
 		SENDMAILOBJ="${MILTERBASE}" \
diff --git a/mail/archivesmtp/Makefile b/mail/archivesmtp/Makefile
index 540ea73968a8..2e7242ba14c9 100644
--- a/mail/archivesmtp/Makefile
+++ b/mail/archivesmtp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	archivesmtp
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dancingfortune.com/projects/archivesmtp/files/
 
diff --git a/mail/batv-milter/Makefile b/mail/batv-milter/Makefile
index 056bb96ae3b6..0359589a4c1a 100644
--- a/mail/batv-milter/Makefile
+++ b/mail/batv-milter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	batv-milter
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
diff --git a/mail/batv-milter/files/patch-batv-filter_Makefile.m4 b/mail/batv-milter/files/patch-batv-filter_Makefile.m4
index 22b913081b79..4f70acc0266b 100644
--- a/mail/batv-milter/files/patch-batv-filter_Makefile.m4
+++ b/mail/batv-milter/files/patch-batv-filter_Makefile.m4
@@ -1,6 +1,6 @@
---- ./batv-filter/Makefile.m4.orig	2009-04-24 06:11:09.000000000 +0900
-+++ ./batv-filter/Makefile.m4	2009-06-04 07:30:43.000000000 +0900
-@@ -3,6 +3,7 @@
+--- batv-filter/Makefile.m4.orig	2009-04-23 21:11:09 UTC
++++ batv-filter/Makefile.m4
+@@ -3,6 +3,7 @@ include(confBUILDTOOLSDIR`/M4/switch.m4'
  
  define(`confMT', `TRUE')
  define(`confREQUIRE_LIBSM', `true')
@@ -8,7 +8,13 @@
  
  APPENDDEF(`confLIBS', `-lssl -lcrypto')
  dnl Enable and edit these paths as needed:
-@@ -20,7 +21,7 @@
+@@ -15,12 +16,12 @@ dnl Enable these next line if needed to 
+ dnl and the libmilter include files:
+ dnl APPENDDEF(`confINCDIRS', `-I/usr/local/sendmail/include')
+ dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/sendmail/lib')
+-
++APPENDDEF(`confLIBDIRS', `-L/usr/local/lib')
+ 
  bldPRODUCT_START(`executable', `batv-filter')
  define(`bldSOURCES', `batv-filter.c config.c util.c ')
  dnl PREPENDDEF(`confLIBS', ifelse(index(confENVDEF, `-DCOMMERCIAL'), -1, `-lmilter ', `../libmilter/libmilter.a '))
diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile
index 8596ddc89d4c..5e297053f8c5 100644
--- a/mail/dcc-dccd/Makefile
+++ b/mail/dcc-dccd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dcc-dccd
 PORTVERSION=	1.3.159
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dcc-servers.net/dcc/source/old/ \
 		ftp://ftp.dcc-servers.net/src/dcc/old/ \
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index 254ea72d667a..8808d39fc75e 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dk-milter
 PORTVERSION=	1.0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/DomainKeys%20Milter/${PORTVERSION}
 
@@ -21,7 +21,7 @@ IGNORE=		your system does not support sysvipc
 .endif
 
 .if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
-WITH_SENDMAIL_BASE=	yes
+WITH_MILTER_BASE=	yes
 PKGMESSAGE=	pkg-message.postfix
 
 .if defined(WITH_POSTFIX_CURRENT)
@@ -62,11 +62,11 @@ WITHOUT_MILTER_CFLAGS=	yes
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
 SITE+=		${WRKSRC}/site.config.m4.dist
-.if defined(WITH_SENDMAIL_PORT)
+.if defined(WITH_MILTER_PORT)
 SITE+=		${FILESDIR}/site.config.m4.milter
 .endif
 
-.if defined(WITH_SENDMAIL_STATIC_MILTER)
+.if defined(WITH_MILTER_STATIC)
 SITE_SUB+=	-e '\|-static|s|%%STATIC%%||g'
 .else
 SITE_SUB+=	-e '\|-static|s|%%STATIC%%|dnl |g'
diff --git a/mail/enma/Makefile b/mail/enma/Makefile
index 359bcdc2220d..369c3b1e2b77 100644
--- a/mail/enma/Makefile
+++ b/mail/enma/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	enma
 PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/ENMA/${PORTVERSION}
 
diff --git a/mail/libmilter/Makefile b/mail/libmilter/Makefile
index 59dd0b0142f1..b54323ab1d52 100644
--- a/mail/libmilter/Makefile
+++ b/mail/libmilter/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libmilter
 PORTVERSION=	8.15.2
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/
 DISTNAME=	sendmail.${PORTVERSION}
@@ -14,7 +15,7 @@ LICENSE_NAME=	Sendmail License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-MILTER_SOVER?=	6
+MILTER_SOVER?=	7
 
 OPTIONS_DEFINE?=	IPV6 MILTER_SHARED MILTER_POOL DOCS
 OPTIONS_DEFAULT?=	MILTER_SHARED MILTER_POOL
diff --git a/mail/milter-bogom/Makefile b/mail/milter-bogom/Makefile
index 8679068cd347..712c001a6392 100644
--- a/mail/milter-bogom/Makefile
+++ b/mail/milter-bogom/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bogom
 PORTVERSION=	1.9.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.usebox.net/jjm/bogom/ \
 		http://blackshell.usebox.net/bogom/
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index e80925941b15..bed6c1375964 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	milter-greylist
 PORTVERSION=	4.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/ \
 		http://fossies.org/unix/privat/
@@ -20,9 +20,9 @@ USES=		tar:tgz
 ##
 # Use the following quirks to choose which sendmail to use (ports or system):
 #
-#   WITH_SENDMAIL_BASE=yes
+#   WITH_MILTER_BASE=yes
 # or
-#   WITH_SENDMAIL_PORT=yes
+#   WITH_MILTER_PORT=yes
 #
 # If unspecified, check for an up-to-date system version but give an
 # installed port preference over it.
diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile
index 02981410023c..ead1f6bd850d 100644
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	milter-regex
 PORTVERSION=	2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/
 
diff --git a/mail/milter-skem/Makefile b/mail/milter-skem/Makefile
index 2f9e3f70f0f1..ce37141bf74c 100644
--- a/mail/milter-skem/Makefile
+++ b/mail/milter-skem/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	skem
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://virtual-estates.net/skem/
 
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 1797d03eea86..41beb000adab 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mimedefang
 PORTVERSION=	2.83
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mimedefang.org/static/ \
 		http://fossies.org/linux/misc/
@@ -55,9 +56,7 @@ CONFIG_FILES=	mimedefang-filter sa-mimedefang.cf mimedefang-ip-key
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.if defined(WITH_SENDMAIL_PORT)
-CONFIGURE_ARGS+=	--with-milterinc=${LOCALBASE}/include --with-milterlib=${LOCALBASE}/lib
-.endif
+CONFIGURE_ARGS+=	--with-milterinc=${MILTERBASE}/include --with-milterlib=${MILTERBASE}/lib
 
 CLAMAV_BUILD_DEPENDS+=		clamscan:security/clamav
 CLAMAV_RUN_DEPENDS+=		clamscan:security/clamav
diff --git a/mail/noattach/Makefile b/mail/noattach/Makefile
index 83467abda610..1691678df51e 100644
--- a/mail/noattach/Makefile
+++ b/mail/noattach/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	noattach
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/
 
@@ -20,10 +20,8 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.if defined(WITH_SENDMAIL_PORT)
 CONFIGURE_ENV+=	MILTER_INCLUDES="${MILTERINC}"
 MAKE_ENV+=	MILTER_INCLUDES="${MILTERINC}"
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/noattach ${STAGEDIR}${PREFIX}/libexec/noattach
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 6d7563e88a80..d44e2e2eec9a 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opendkim
 PORTVERSION=	2.10.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail security
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/Previous%20Releases \
diff --git a/mail/opendmarc/Makefile b/mail/opendmarc/Makefile
index f45a2dbfd3e8..fdbcd20c1b9f 100644
--- a/mail/opendmarc/Makefile
+++ b/mail/opendmarc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	opendmarc
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/Previous%20Releases
diff --git a/mail/py-milter/Makefile b/mail/py-milter/Makefile
index 687cd40fbb99..e0a13cf7a4f5 100644
--- a/mail/py-milter/Makefile
+++ b/mail/py-milter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	milter
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	${GH_PROJECT}-
 CATEGORIES=	mail python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/mail/raysfilter/Makefile b/mail/raysfilter/Makefile
index 9b220adc81bb..acb5437f81cc 100644
--- a/mail/raysfilter/Makefile
+++ b/mail/raysfilter/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	raysfilter
 PORTVERSION=	1.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	LOCAL/dinoex
 DISTNAME=	rays-filter-${PORTVERSION}
diff --git a/mail/rbl-milter/Makefile b/mail/rbl-milter/Makefile
index c698c6b05d94..757b46aa5142 100644
--- a/mail/rbl-milter/Makefile
+++ b/mail/rbl-milter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rbl-milter
 PORTVERSION=	0.30
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://opensource.confusticate.com/rbl-milter/
 
diff --git a/mail/scam-backscatter/Makefile b/mail/scam-backscatter/Makefile
index 4601dbec8722..be377daa7bee 100644
--- a/mail/scam-backscatter/Makefile
+++ b/mail/scam-backscatter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scam-backscatter
 PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.elandsys.com/scam/scam-backscatter/ \
 		http://dist.epipe.com/mirrors/scam-backscatter/
diff --git a/mail/sendmail/bsd.milter.mk b/mail/sendmail/bsd.milter.mk
index cb675672c981..3da66448b1ae 100644
--- a/mail/sendmail/bsd.milter.mk
+++ b/mail/sendmail/bsd.milter.mk
@@ -9,10 +9,12 @@
 #
 # the user/port can now set this options in the makefiles.
 #
-# WITH_SENDMAIL_STATIC_MILTER=	- Use static milter lib
+# WITH_MILTER_STATIC=		- Use static milter lib
+# WITHOUT_MILTER_CFLAGS=	- do not set CFLAGS
+# WITHOUT_MILTER_LDFLAGS=	- do not set LDFLAGS
 #
-# WITH_SENDMAIL_BASE=yes	- Use milter in the base
-# WITH_SENDMAIL_PORT=yes	- Use milter from ports
+# WITH_MILTER_BASE=yes		- Use milter in the base
+# WITH_MILTER_PORT=yes		- Use milter from ports
 #
 # If unspecified, check for the lib exist in the base system,
 # but gives an installed port preference over it.
@@ -41,49 +43,66 @@
 
 Milter_Include_MAINTAINER=	dinoex@FreeBSD.org
 
-.if	!defined(WITH_SENDMAIL_BASE) && \
+.  if	!defined(WITH_MILTER_BASE) && \
+	!defined(WITH_MILTER_PORT)
+.   if	!defined(WITH_SENDMAIL_BASE) && \
 	!defined(WITH_SENDMAIL_PORT)
-.if	exists(${LOCALBASE}/lib/libmilter.a) || \
-	!exists(/usr/lib/libmilter.a)
+.     if	exists(${LOCALBASE}/lib/libmilter.a) || \
+		!exists(/usr/lib/libmilter.a)
+WITH_MILTER_PORT=yes
 WITH_SENDMAIL_PORT=yes
-.else
+.     else
+WITH_MILTER_BASE=yes
 WITH_SENDMAIL_BASE=yes
-.endif
+.     endif
+.   else
+# convert old macros to new
+.     if	defined(WITH_SENDMAIL_PORT)
+WITH_MILTER_PORT=yes
+.     endif
+.     if	defined(WITH_SENDMAIL_BASE)
+WITH_MILTER_BASE=yes
+.     endif
+.   endif
 .endif
 
-.if defined(WITH_SENDMAIL_PORT)
+.if defined(WITH_MILTER_PORT)
 
-.if defined(WITH_SENDMAIL_STATIC_MILTER)
+.  if defined(WITH_MILTER_STATIC) || defined(WITH_SENDMAIL_STATIC_MILTER)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:mail/${SENDMAIL_MILTER_PORT}
-.else
+.  else
 LIB_DEPENDS+=	libmilter.so.${MILTER_SOVER}:mail/${SENDMAIL_MILTER_PORT}
-.endif
+.  endif
 
 SENDMAIL_MILTER_PORT?=	libmilter
-MILTER_SOVER?=	6
+MILTER_SOVER?=	7
 MILTERBASE?=	${LOCALBASE}
-MILTERINC=	-I${MILTERBASE}/include
 MILTERRPATH=	${MILTERBASE}/lib
-MILTERLIB=	-L${MILTERBASE}/lib -Wl,-rpath,${MILTERRPATH}
 
-.if !defined(WITHOUT_MILTER_CFLAGS)
-.if defined(CFLAGS)
-CFLAGS+=${MILTERINC}
-.else
-CFLAGS=${MILTERINC}
 .endif
+
+.if defined(WITH_MILTER_BASE)
+MILTERBASE?=	/usr
+MILTERRPATH=	${DESTDIR}/usr/lib:${LOCALBASE}/lib
+
+.if !exists(/usr/lib/libmilter.a)
+BROKEN=		Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes
 .endif
 
 .endif
 
-.if defined(WITH_SENDMAIL_BASE)
-MILTERBASE?=	/usr
-MILTERRPATH=	${DESTDIR}/usr/lib:${LOCALBASE}/lib
-MILTERLIB=	-Wl,-rpath,${MILTERRPATH}
+MILTERINC=	-I${MILTERBASE}/include
+.if !defined(WITHOUT_MILTER_CFLAGS)
+.  if defined(CFLAGS)
+CFLAGS+=${MILTERINC}
+.  else
+CFLAGS=${MILTERINC}
+.  endif
 .endif
 
+MILTERLIB=	-L${MILTERBASE}/lib
 .if !defined(WITHOUT_MILTER_LDFLAGS)
-LDFLAGS+=${MILTERLIB}
+LDFLAGS+=	-Wl,-rpath,${MILTERRPATH} ${MILTERLIB}
 .endif
 
 # eof
diff --git a/mail/sentinel/Makefile b/mail/sentinel/Makefile
index 0e175eb64d6a..3522d2872444 100644
--- a/mail/sentinel/Makefile
+++ b/mail/sentinel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sentinel
 PORTVERSION=	1.7b
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	SF/smfilter/${PORTNAME}/Sentinel%20${PORTVERSION}
 
diff --git a/mail/sid-milter/Makefile b/mail/sid-milter/Makefile
index 7ed68766a4f6..2967e6f146ac 100644
--- a/mail/sid-milter/Makefile
+++ b/mail/sid-milter/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	sid-milter
 PORTVERSION=	1.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/SenderID%20Milter/${PORTVERSION}
 
@@ -41,7 +41,7 @@ LIBAR_PLIST_FILES=	include/libar.h lib/libar.a man/man3/ar.3.gz
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.if defined(WITH_SENDMAIL_PORT)
+.if defined(WITH_MILTER_PORT)
 SITE+=		${FILESDIR}/site.config.m4.milter
 .endif
 
diff --git a/mail/smfsav-devel/Makefile b/mail/smfsav-devel/Makefile
index 066ca60f0f88..c93d91eb8c8a 100644
--- a/mail/smfsav-devel/Makefile
+++ b/mail/smfsav-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	smfsav
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://smf-sav.anw.at/
 PKGNAMESUFFIX=	-devel
diff --git a/mail/smfsav/Makefile b/mail/smfsav/Makefile
index 78755ce4e55b..11c66d8e4ad0 100644
--- a/mail/smfsav/Makefile
+++ b/mail/smfsav/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	smfsav
 PORTVERSION=	1.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/smfs
 DISTNAME=	smf-sav-${PORTVERSION}
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index ef6972820f3d..237e451a9972 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spamass-milter
 PORTVERSION=	0.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	SAVANNAH/spamass-milt
 
@@ -15,8 +15,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=	LDAP SENDMAIL_PORT DOCS
-SENDMAIL_PORT_DESC=	Build against sendmail port
+OPTIONS_DEFINE=	LDAP MILTER_PORT DOCS
+MILTER_PORT_DESC=	Build against libmiter port
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile
index ca8d4ccaf2ef..f3ff3e2ce08b 100644
--- a/mail/spamilter/Makefile
+++ b/mail/spamilter/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	spamilter
 PORTVERSION=	0.60
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.wanlink.com/spamilter/download/
 
@@ -47,11 +47,7 @@ LIBSPF_LDFLAGS=		-L${LOCALBASE}/lib
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.if defined(WITH_SENDMAIL_PORT)
-CONFIGURE_ARGS+=	--sendmail-dir "${LOCALBASE}"
-.else
-CONFIGURE_ARGS+=	--sendmail-dir "/usr"
-.endif
+CONFIGURE_ARGS+=	--sendmail-dir "${MILTERBASE}"
 
 post-extract:
 	${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
diff --git a/mail/spfmilter/Makefile b/mail/spfmilter/Makefile
index 451731a7eb0b..f608a72ba307 100644
--- a/mail/spfmilter/Makefile
+++ b/mail/spfmilter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	spfmilter
 PORTVERSION=	2.001
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://acme.com/software/spfmilter/
 
diff --git a/mail/vbsfilter/Makefile b/mail/vbsfilter/Makefile
index 253670aad78f..a0f1a116b516 100644
--- a/mail/vbsfilter/Makefile
+++ b/mail/vbsfilter/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	vbsfilter
 PORTVERSION=	1.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.dinoex.de/pub/approved/
 EXTRACT_SUFX=	.c
diff --git a/security/amavisd-milter/Makefile b/security/amavisd-milter/Makefile
index 761b65d8d7e8..877e37f1dd1f 100644
--- a/security/amavisd-milter/Makefile
+++ b/security/amavisd-milter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	amavisd-milter
 PORTVERSION=	1.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -15,9 +15,9 @@ RUN_DEPENDS=	amavisd:security/amavisd-new
 ##
 # Use the following quirks to choose which sendmail to use (ports or system):
 #
-#   WITH_SENDMAIL_BASE=yes
+#   WITH_MILTER_BASE=yes
 # or
-#   WITH_SENDMAIL_PORT=yes
+#   WITH_MILTER_PORT=yes
 #
 # If unspecified, check for an up-to-date system version but give an
 # installed port preference over it.
@@ -46,13 +46,7 @@ PORTDOCS=	AUTHORS CHANGES INSTALL LICENSE README TODO
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.if defined(WITH_SENDMAIL_BASE) && !exists(/usr/lib/libmilter.a)
-BROKEN=		Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes
-.endif
-
-.if defined(WITH_SENDMAIL_PORT)
 CONFIGURE_ARGS+=--with-sendmail=${MILTERBASE}
-.endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug