summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2015-11-21 19:31:02 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2015-11-21 19:31:02 +0000
commit60709cdc9a8f39056f96d86b0aef3e521e536ec7 (patch)
treef37e5f127054a815b825ff37bfa652c5e5200097 /mail
parentUpdate to version 15.11.0 (diff)
- remove option TLSEXT_PADDING, now default
- make portlint happier
Notes
Notes: svn path=/head/; revision=402187
Diffstat (limited to 'mail')
-rw-r--r--mail/sendmail/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 8fce41c1db5f..05490382c336 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -38,7 +38,7 @@ 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 TLSEXT_PADDING DOCS
+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
NO_OPTIONS_SORT=yes
SHMEM_DESC= System V shared memory support
@@ -52,7 +52,6 @@ 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
-TLSEXT_PADDING_DESC= Enable TLSEXT padding
BDB_USE= BDB=yes
LDAP_USE= OPENLDAP=yes
@@ -99,7 +98,7 @@ MAKE_PKGNAMES= for i in "" +tls; do \
done done done done
ALL_PKGNAMES!= ${MAKE_PKGNAMES}
-CONFLICTS2!= ${MAKE_PKGNAMES} | grep -v "${PORTNAME}${PKGNAMESUFFIX:S|${PKGNAMESUFFIX2}||}-8."
+CONFLICTS2!= ${MAKE_PKGNAMES} | ${GREP} -v "${PORTNAME}${PKGNAMESUFFIX:S|${PKGNAMESUFFIX2}||}-8."
CONFLICTS+= ${CONFLICTS2}
# Build site.config.m4