Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Nov 2015 19:31:02 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r402187 - head/mail/sendmail
Message-ID:  <201511211931.tALJV2DK044504@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dinoex
Date: Sat Nov 21 19:31:02 2015
New Revision: 402187
URL: https://svnweb.freebsd.org/changeset/ports/402187

Log:
  - remove option TLSEXT_PADDING, now default
  - make portlint happier

Modified:
  head/mail/sendmail/Makefile

Modified: head/mail/sendmail/Makefile
==============================================================================
--- head/mail/sendmail/Makefile	Sat Nov 21 19:15:00 2015	(r402186)
+++ head/mail/sendmail/Makefile	Sat Nov 21 19:31:02 2015	(r402187)
@@ -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
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511211931.tALJV2DK044504>