From 3482ca23ca87d9f2c9dff3b04dd20fc59db9262c Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 4 Jan 2017 00:54:34 +0000
Subject: [PATCH] MFstable/11 r311215:

MFC r310711:

Don't explicitly build tcp wrappers support into bsnmpd; make it conditional
on MK_TCP_WRAPPERS != "no"

This likely fixes an issue seen where some of the USE_TCPWRAPPERS code didn't
work as advertised


git-svn-id: svn://svn.freebsd.org/base/stable/10@311218 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 usr.sbin/bsnmpd/bsnmpd/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile
index ddef72413..b9e99a0b1 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile
@@ -125,10 +125,9 @@ DEFSDIR= ${SHAREDIR}/snmp/defs
 
 CFLAGS+= -DSNMPTREE_TYPES
 CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT
-CFLAGS+= -DUSE_TCPWRAPPERS
 CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY
-DPADD=	${LIBBEGEMOT} ${LIBBSNMP} ${LIBWRAP}
-LDADD=	-lbegemot -lbsnmp -lwrap
+DPADD=	${LIBBEGEMOT} ${LIBBSNMP}
+LDADD=	-lbegemot -lbsnmp
 
 LDFLAGS= -Wl,-export-dynamic
 
@@ -136,6 +135,12 @@ LDFLAGS= -Wl,-export-dynamic
 CFLAGS+= -DHAVE_LIBCRYPTO
 .endif
 
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+=	-DUSE_TCPWRAPPERS
+DPADD+=		${LIBWRAP}
+LDADD+=		-lwrap
+.endif
+
 oid.h: tree.def Makefile
 	gensnmptree -e ${XSYM} < ${.ALLSRC:M*.def} > ${.TARGET}
 
-- 
2.45.0