From: sthen <sthen@openbsd.org>
Date: Thu, 15 Oct 2015 21:22:11 +0000 (+0000)
Subject: don't allow NSD to pick up libevent from /usr/local if the libevent2
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a708e7f84b67a4594a8038195bb6024c706eb62c;p=openbsd

don't allow NSD to pick up libevent from /usr/local if the libevent2
package is installed.
---

diff --git a/usr.sbin/nsd/Makefile.bsd-wrapper b/usr.sbin/nsd/Makefile.bsd-wrapper
index e37034ea212..8257adeae9c 100644
--- a/usr.sbin/nsd/Makefile.bsd-wrapper
+++ b/usr.sbin/nsd/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.11 2014/11/30 05:54:38 brad Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.12 2015/10/15 21:22:11 sthen Exp $
 
 .include <bsd.own.mk>
 
@@ -20,6 +20,7 @@ CONFIGURE_OPTS=	--prefix=/usr \
 		--with-dbfile=${CHROOTDIR}/db/nsd.db \
 		--with-xfrdir=${CHROOTDIR}/run/xfr \
 		--with-xfrdfile=${CHROOTDIR}/run/xfrd.state \
+		--with-libevent=/usr \
 		--enable-ratelimit \
 		--enable-root-server