From owner-svn-src-all@freebsd.org  Sat Feb  4 16:45:45 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE078CD0E12;
 Sat,  4 Feb 2017 16:45:45 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AA45F2DD;
 Sat,  4 Feb 2017 16:45:45 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v14Gjiua074888;
 Sat, 4 Feb 2017 16:45:44 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v14GjidQ074887;
 Sat, 4 Feb 2017 16:45:44 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201702041645.v14GjidQ074887@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 4 Feb 2017 16:45:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r313225 - stable/10/usr.sbin/sendmail
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Feb 2017 16:45:46 -0000

Author: ngie
Date: Sat Feb  4 16:45:44 2017
New Revision: 313225
URL: https://svnweb.freebsd.org/changeset/base/313225

Log:
  MFC r311471:
  
  Conditionalize wrap(3) use based on MK_TCP_WRAPPERS instead of
  always building support into sendmail.

Modified:
  stable/10/usr.sbin/sendmail/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/sendmail/Makefile
==============================================================================
--- stable/10/usr.sbin/sendmail/Makefile	Sat Feb  4 16:43:35 2017	(r313224)
+++ stable/10/usr.sbin/sendmail/Makefile	Sat Feb  4 16:45:44 2017	(r313225)
@@ -37,7 +37,7 @@ NIS=	-DNIS
 MAPS=	-DMAP_REGEX -DDNSMAP
 
 CFLAGS+= -I${SMDIR} -I${SENDMAIL_DIR}/include -I.
-CFLAGS+= ${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS}
+CFLAGS+= ${DBMDEF} ${NIS} ${MAPS}
 
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DNETINET6 -DIPV6_FULL=0
@@ -45,8 +45,8 @@ CFLAGS+= -DNETINET6 -DIPV6_FULL=0
 
 WARNS?=	0
 
-DPADD=	${LIBUTIL} ${LIBWRAP}
-LDADD=	-lutil -lwrap
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
 
 LIBSMDIR=	${.OBJDIR}/../../lib/libsm
 LIBSM=		${LIBSMDIR}/libsm.a
@@ -67,6 +67,12 @@ DPADD+=		${LIBSSL} ${LIBCRYPTO}
 LDADD+=		-lssl -lcrypto
 .endif
 
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+=	-DTCPWRAPPERS
+DPADD+=		${LIBWRAP}
+LDADD+=		-lwrap
+.endif
+
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
 DPADD+=${SENDMAIL_DPADD}