6 files changed, 30 insertions, 52 deletions

diff --git a/mail/raysfilter/Makefile b/mail/raysfilter/Makefile
index e1fc3c0fa51e..3a5fca21957e 100644
--- a/mail/raysfilter/Makefile
+++ b/mail/raysfilter/Makefile
@@ -32,18 +32,14 @@ LIBS+=		-lmilter -lsm -lsmutil
 LIBS+=		-lmilter -lsmutil
 .endif
 
-.if defined(BATCH)
-SENDMAIL_WITH_MILTER=	yes
-.endif
-
 .if defined(SENDMAIL_WITH_SFIO)
 LIBS+=		-lsfio
 .endif
 
-.if ! defined(SENDMAIL_WITH_MILTER)
+.if defined(SENDMAIL_WITHOUT_MILTER)
 pre-fetch:
 	@${ECHO_MSG}
-	@${ECHO_MSG} You must set variable SENDMAIL_WITH_MILTER to YES,
+	@${ECHO_MSG} You must unset variable SENDMAIL_WITHOUT_MILTER,
 	@${ECHO_MSG} and rebuild sendmail in the ports
 	@${FALSE}
 .endif
diff --git a/mail/sendmail-old/Makefile b/mail/sendmail-old/Makefile
index 9463e2be41c7..499f680f7be5 100644
--- a/mail/sendmail-old/Makefile
+++ b/mail/sendmail-old/Makefile
@@ -29,15 +29,11 @@ MAN8=		sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
 
 # Options to define Features:
 # SENDMAIL_WITHOUT_IPV6=yes
-# SENDMAIL_WITH_MILTER=yes
+# SENDMAIL_WITHOUT_MILTER=yes
 # SENDMAIL_WITH_TLS=yes
 # SENDMAIL_WITH_SASL=yes
 # SENDMAIL_WITH_SFIO=yes
 # SENDMAIL_WITH_LDAP=yes
-.if defined(BATCH)
-# all on for package build
-SENDMAIL_WITH_MILTER=yes
-.endif
 
 .if defined(SENDMAIL_WITH_LDAP)
 PKGNAMESUFFIX?=	-ldap
@@ -79,7 +75,7 @@ SITE+=	${FILESDIR}/site.config.m4.sasl
 .if defined(SENDMAIL_WITH_LDAP)
 SITE+=	${FILESDIR}/site.config.m4.ldap
 .endif
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 SITE+=	${FILESDIR}/site.config.m4.milter
 .endif
 .if exists(${FILESDIR}/site.config.m4.local)
@@ -98,14 +94,14 @@ do-configure:
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=" -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
 		${SITE} > ${WCONF}/site.config.m4
 
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 post-build:
 	( cd ${WRKSRC}/libmilter && ${MAKE} )
 .endif
 
 pre-install:
 	@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 	@${CAT} ${FILESDIR}/pkg-milter >>${PLIST}
 .endif
 .if !defined(NOPORTDOCS)
@@ -126,7 +122,7 @@ pre-install:
 post-install:
 	( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
 	( cd ${WRKSRC}/rmail && ${MAKE} force-install )
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 	${MKDIR} ${PREFIX}/include/libmilter
 	${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
 		${PREFIX}/include/libmilter/
@@ -156,7 +152,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sendmail/README ${DOCSDIR}/SENDMAIL
 	${INSTALL_DATA} ${WRKSRC}/mail.local/README ${DOCSDIR}/MAIL.LOCAL
 	${INSTALL_DATA} ${WRKSRC}/smrsh/README ${DOCSDIR}/SMRSH
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 	${INSTALL_DATA} ${WRKSRC}/libmilter/README ${DOCSDIR}/MILTER
 .endif
 .endif
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index d73a371a3f7a..ce96da1d5dcb 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -27,14 +27,10 @@ MAN8=		sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
 
 # Options to define Features:
 # SENDMAIL_WITHOUT_IPV6=yes
-# SENDMAIL_WITH_MILTER=yes
+# SENDMAIL_WITHOUT_MILTER=yes
 # SENDMAIL_WITH_TLS=yes
 # SENDMAIL_WITH_SASL=yes
 # SENDMAIL_WITH_LDAP=yes
-.if defined(BATCH)
-# all on for package build
-SENDMAIL_WITH_MILTER=yes
-.endif
 
 .if defined(SENDMAIL_WITH_LDAP)
 PKGNAMESUFFIX?=	-ldap
@@ -69,7 +65,7 @@ SITE+=	${FILESDIR}/site.config.m4.sasl
 .if defined(SENDMAIL_WITH_LDAP)
 SITE+=	${FILESDIR}/site.config.m4.ldap
 .endif
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 SITE+=	${FILESDIR}/site.config.m4.milter
 .endif
 .if exists(${FILESDIR}/site.config.m4.local)
@@ -89,17 +85,18 @@ post-extract:
 		> ${WRKSRC}/sm-client.sh
 
 do-configure:
+	${PERL} -pi -e "s,\`-O\',\`${CFLAGS}\'," ${WRKSRC}/devtools/OS/FreeBSD
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=" -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
 		${SITE} > ${WCONF}/site.config.m4
 
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 post-build:
 	( cd ${WRKSRC}/libmilter && ${MAKE} )
 .endif
 
 pre-install:
 	@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 	@${CAT} ${FILESDIR}/pkg-milter >>${PLIST}
 .endif
 	if ! pw groupshow smmsp; then pw groupadd smmsp -g 90; fi
@@ -123,7 +120,7 @@ pre-install:
 post-install:
 	( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
 	( cd ${WRKSRC}/rmail && ${MAKE} force-install )
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 	${MKDIR} ${PREFIX}/include/libmilter
 	${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
 		${WRKSRC}/include/libmilter/mfdef.h \
@@ -161,7 +158,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sendmail/README ${DOCSDIR}/SENDMAIL
 	${INSTALL_DATA} ${WRKSRC}/mail.local/README ${DOCSDIR}/MAIL.LOCAL
 	${INSTALL_DATA} ${WRKSRC}/smrsh/README ${DOCSDIR}/SMRSH
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 	${INSTALL_DATA} ${WRKSRC}/libmilter/README ${DOCSDIR}/MILTER
 	${MKDIR} ${DOCSDIR}/libmilter
 	@${TAR} -C ${WRKSRC}/libmilter/docs -cf - . | \
diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile
index 9463e2be41c7..499f680f7be5 100644
--- a/mail/sendmail811/Makefile
+++ b/mail/sendmail811/Makefile
@@ -29,15 +29,11 @@ MAN8=		sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
 
 # Options to define Features:
 # SENDMAIL_WITHOUT_IPV6=yes
-# SENDMAIL_WITH_MILTER=yes
+# SENDMAIL_WITHOUT_MILTER=yes
 # SENDMAIL_WITH_TLS=yes
 # SENDMAIL_WITH_SASL=yes
 # SENDMAIL_WITH_SFIO=yes
 # SENDMAIL_WITH_LDAP=yes
-.if defined(BATCH)
-# all on for package build
-SENDMAIL_WITH_MILTER=yes
-.endif
 
 .if defined(SENDMAIL_WITH_LDAP)
 PKGNAMESUFFIX?=	-ldap
@@ -79,7 +75,7 @@ SITE+=	${FILESDIR}/site.config.m4.sasl
 .if defined(SENDMAIL_WITH_LDAP)
 SITE+=	${FILESDIR}/site.config.m4.ldap
 .endif
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 SITE+=	${FILESDIR}/site.config.m4.milter
 .endif
 .if exists(${FILESDIR}/site.config.m4.local)
@@ -98,14 +94,14 @@ do-configure:
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=" -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
 		${SITE} > ${WCONF}/site.config.m4
 
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 post-build:
 	( cd ${WRKSRC}/libmilter && ${MAKE} )
 .endif
 
 pre-install:
 	@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 	@${CAT} ${FILESDIR}/pkg-milter >>${PLIST}
 .endif
 .if !defined(NOPORTDOCS)
@@ -126,7 +122,7 @@ pre-install:
 post-install:
 	( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
 	( cd ${WRKSRC}/rmail && ${MAKE} force-install )
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 	${MKDIR} ${PREFIX}/include/libmilter
 	${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
 		${PREFIX}/include/libmilter/
@@ -156,7 +152,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sendmail/README ${DOCSDIR}/SENDMAIL
 	${INSTALL_DATA} ${WRKSRC}/mail.local/README ${DOCSDIR}/MAIL.LOCAL
 	${INSTALL_DATA} ${WRKSRC}/smrsh/README ${DOCSDIR}/SMRSH
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 	${INSTALL_DATA} ${WRKSRC}/libmilter/README ${DOCSDIR}/MILTER
 .endif
 .endif
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
index d73a371a3f7a..ce96da1d5dcb 100644
--- a/mail/sendmail812/Makefile
+++ b/mail/sendmail812/Makefile
@@ -27,14 +27,10 @@ MAN8=		sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
 
 # Options to define Features:
 # SENDMAIL_WITHOUT_IPV6=yes
-# SENDMAIL_WITH_MILTER=yes
+# SENDMAIL_WITHOUT_MILTER=yes
 # SENDMAIL_WITH_TLS=yes
 # SENDMAIL_WITH_SASL=yes
 # SENDMAIL_WITH_LDAP=yes
-.if defined(BATCH)
-# all on for package build
-SENDMAIL_WITH_MILTER=yes
-.endif
 
 .if defined(SENDMAIL_WITH_LDAP)
 PKGNAMESUFFIX?=	-ldap
@@ -69,7 +65,7 @@ SITE+=	${FILESDIR}/site.config.m4.sasl
 .if defined(SENDMAIL_WITH_LDAP)
 SITE+=	${FILESDIR}/site.config.m4.ldap
 .endif
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 SITE+=	${FILESDIR}/site.config.m4.milter
 .endif
 .if exists(${FILESDIR}/site.config.m4.local)
@@ -89,17 +85,18 @@ post-extract:
 		> ${WRKSRC}/sm-client.sh
 
 do-configure:
+	${PERL} -pi -e "s,\`-O\',\`${CFLAGS}\'," ${WRKSRC}/devtools/OS/FreeBSD
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=" -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
 		${SITE} > ${WCONF}/site.config.m4
 
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 post-build:
 	( cd ${WRKSRC}/libmilter && ${MAKE} )
 .endif
 
 pre-install:
 	@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 	@${CAT} ${FILESDIR}/pkg-milter >>${PLIST}
 .endif
 	if ! pw groupshow smmsp; then pw groupadd smmsp -g 90; fi
@@ -123,7 +120,7 @@ pre-install:
 post-install:
 	( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
 	( cd ${WRKSRC}/rmail && ${MAKE} force-install )
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 	${MKDIR} ${PREFIX}/include/libmilter
 	${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
 		${WRKSRC}/include/libmilter/mfdef.h \
@@ -161,7 +158,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sendmail/README ${DOCSDIR}/SENDMAIL
 	${INSTALL_DATA} ${WRKSRC}/mail.local/README ${DOCSDIR}/MAIL.LOCAL
 	${INSTALL_DATA} ${WRKSRC}/smrsh/README ${DOCSDIR}/SMRSH
-.if defined(SENDMAIL_WITH_MILTER)
+.if ! defined(SENDMAIL_WITHOUT_MILTER)
 	${INSTALL_DATA} ${WRKSRC}/libmilter/README ${DOCSDIR}/MILTER
 	${MKDIR} ${DOCSDIR}/libmilter
 	@${TAR} -C ${WRKSRC}/libmilter/docs -cf - . | \
diff --git a/mail/vbsfilter/Makefile b/mail/vbsfilter/Makefile
index fd7adb18811f..ff9d75d7af69 100644
--- a/mail/vbsfilter/Makefile
+++ b/mail/vbsfilter/Makefile
@@ -30,18 +30,14 @@ LIBS+=		-lmilter -lsm -lsmutil
 LIBS+=		-lmilter -lsmutil
 .endif
 
-.if defined(BATCH)
-SENDMAIL_WITH_MILTER=	yes
-.endif
-
 .if defined(SENDMAIL_WITH_SFIO)
 LIBS+=		-lsfio
 .endif
 
-.if ! defined(SENDMAIL_WITH_MILTER)
+.if defined(SENDMAIL_WITHOUT_MILTER)
 pre-fetch:
 	@${ECHO_MSG}
-	@${ECHO_MSG} You must set variable SENDMAIL_WITH_MILTER to YES,
+	@${ECHO_MSG} You must unset variable SENDMAIL_WITHOUT_MILTER,
 	@${ECHO_MSG} and rebuild sendmail in the ports
 	@${FALSE}
 .endif