From owner-svn-src-stable-11@freebsd.org  Sat Feb  4 16:52:49 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 AD867CD0242;
 Sat,  4 Feb 2017 16:52:49 +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 7CB26D95;
 Sat,  4 Feb 2017 16:52:49 +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 v14GqmxV078932;
 Sat, 4 Feb 2017 16:52:48 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v14Gqms4078931;
 Sat, 4 Feb 2017 16:52:48 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201702041652.v14Gqms4078931@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:52:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r313229 - stable/11/usr.sbin/ypserv
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Feb 2017 16:52:49 -0000

Author: ngie
Date: Sat Feb  4 16:52:48 2017
New Revision: 313229
URL: https://svnweb.freebsd.org/changeset/base/313229

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

Modified:
  stable/11/usr.sbin/ypserv/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/ypserv/Makefile
==============================================================================
--- stable/11/usr.sbin/ypserv/Makefile	Sat Feb  4 16:49:50 2017	(r313228)
+++ stable/11/usr.sbin/ypserv/Makefile	Sat Feb  4 16:52:48 2017	(r313229)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 RPCDIR=	${.CURDIR}/../../include/rpcsvc
 .PATH: ${RPCDIR} \
        ${.CURDIR}/common
@@ -10,11 +12,14 @@ SRCS=	yp_svc.c yp_server.c yp_dblookup.c
 	ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c \
 	yplib_host.c
 
-CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I.
+CFLAGS+= -DDB_CACHE -I.
 
 WARNS?=	0
 
-LIBADD=	wrap
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+=	-DTCP_WRAPPER
+LIBADD+=	wrap
+.endif
 
 CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h