From owner-svn-src-all@freebsd.org  Fri Jan  6 04:10:34 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 7305ECA0DD9;
 Fri,  6 Jan 2017 04:10:34 +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 42C4E1EE0;
 Fri,  6 Jan 2017 04:10:34 +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 v064AXUL062126;
 Fri, 6 Jan 2017 04:10:33 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v064AX12062125;
 Fri, 6 Jan 2017 04:10:33 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201701060410.v064AX12062125@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: Fri, 6 Jan 2017 04:10:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311469 - head/usr.sbin/ypserv
X-SVN-Group: head
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: Fri, 06 Jan 2017 04:10:34 -0000

Author: ngie
Date: Fri Jan  6 04:10:33 2017
New Revision: 311469
URL: https://svnweb.freebsd.org/changeset/base/311469

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

Modified:
  head/usr.sbin/ypserv/Makefile

Modified: head/usr.sbin/ypserv/Makefile
==============================================================================
--- head/usr.sbin/ypserv/Makefile	Fri Jan  6 03:55:28 2017	(r311468)
+++ head/usr.sbin/ypserv/Makefile	Fri Jan  6 04:10:33 2017	(r311469)
@@ -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