From owner-svn-ports-all@FreeBSD.ORG  Thu Oct 16 13:52:43 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 06177DDB;
 Thu, 16 Oct 2014 13:52:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 E6563924;
 Thu, 16 Oct 2014 13:52:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9GDqghN043439;
 Thu, 16 Oct 2014 13:52:42 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9GDqgAh043438;
 Thu, 16 Oct 2014 13:52:42 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201410161352.s9GDqgAh043438@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: feld set sender to feld@FreeBSD.org
 using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 16 Oct 2014 13:52:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r371007 - head/dns/unbound
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Oct 2014 13:52:43 -0000

Author: feld
Date: Thu Oct 16 13:52:42 2014
New Revision: 371007
URL: https://svnweb.freebsd.org/changeset/ports/371007
QAT: https://qat.redports.org/buildarchive/r371007/

Log:
  Correct last patch. There is only one libevent now.
  
  Pointyhat -> feld
  
  PR:		191532

Modified:
  head/dns/unbound/Makefile

Modified: head/dns/unbound/Makefile
==============================================================================
--- head/dns/unbound/Makefile	Thu Oct 16 13:19:40 2014	(r371006)
+++ head/dns/unbound/Makefile	Thu Oct 16 13:52:42 2014	(r371007)
@@ -32,7 +32,7 @@ PLIST_SUB+=	PYTHON=${PYTHON} MUNIN=${MUN
 OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN DOCS LIBEVENT
 OPTIONS_DEFAULT=THREADS ECDSA
 
-LIBEVENT_DESC=	Build against libevent (devel/libevent2)
+LIBEVENT_DESC=	Build against libevent (devel/libevent2) (BROKEN on >=10)
 GOST_DESC=	Enable GOST support (requires OpenSSL >= 1.0)
 ECDSA_DESC=	Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0)
 MUNIN_DESC=	Install Munin plugin
@@ -79,6 +79,9 @@ MUNIN=		"@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLIBEVENT}
+.if ${OSVERSION} >= 1000015
+BROKEN=	Unbound with libevent crashes on FreeBSD 10+ due to Capsicum
+.endif
 LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2
 USES+=		pkgconfig
 CONFIGURE_ARGS+=--with-libevent
@@ -88,12 +91,6 @@ LDFLAGS+=	$$(pkg-config libevent --libs-
 CONFIGURE_ARGS+=--with-libevent=no
 .endif
 
-.if ${PORT_OPTIONS:MLIBEVENT14} || ${PORT_OPTIONS:MLIBEVENT20}
-.if ${OSVERSION} >= 1000015
-BROKEN=	Unbound with libevent crashes on FreeBSD 10+ due to Capsicum
-.endif
-.endif
-
 .if empty(PORT_OPTIONS:MTHREADS)
 CONFIGURE_ARGS+=--without-pthreads
 .endif