From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Apr 28 11:50:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C5F8525C for ; Sun, 28 Apr 2013 11:50:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id A977B1236 for ; Sun, 28 Apr 2013 11:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r3SBo05o041965 for ; Sun, 28 Apr 2013 11:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r3SBo0pa041964; Sun, 28 Apr 2013 11:50:00 GMT (envelope-from gnats) Resent-Date: Sun, 28 Apr 2013 11:50:00 GMT Resent-Message-Id: <201304281150.r3SBo0pa041964@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jan Beich Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 266A2F38 for ; Sun, 28 Apr 2013 11:46:34 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from outgoing.tormail.org (outgoing.tormail.org [82.221.96.22]) by mx1.freebsd.org (Postfix) with ESMTP id DDEA11213 for ; Sun, 28 Apr 2013 11:46:33 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=internal.tormail.org) by outgoing.tormail.org with esmtp (Exim 4.72) (envelope-from ) id 1UWQ3q-0006Wq-SP for FreeBSD-gnats-submit@freebsd.org; Sun, 28 Apr 2013 15:46:32 +0400 Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1UWQ0g-000EgU-CU for FreeBSD-gnats-submit@freebsd.org; Sun, 28 Apr 2013 11:43:15 +0000 Message-Id: <1UWQ0g-000EgU-CU@internal.tormail.org> Date: Thu, 25 Apr 2013 17:14:49 -0800 From: Jan Beich To: FreeBSD-gnats-submit@freebsd.org Subject: ports/178218: [patch] dns/unbound: add libevent-2.0 option X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Apr 2013 11:50:00 -0000 >Number: 178218 >Category: ports >Synopsis: [patch] dns/unbound: add libevent-2.0 option >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Apr 28 11:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Jan Beich >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: >Description: >How-To-Repeat: >Fix: configure.ac cannot handle our non-default --includedir and --libdir without relying on pkg.m4 which nothing else uses yet. $ fgrep -r PKG_CHECK_MODULES $(make -V WRKSRC) Exit 1 --- unbound_libevent2.diff begins here --- Index: dns/unbound/Makefile =================================================================== --- dns/unbound/Makefile (revision 316532) +++ dns/unbound/Makefile (working copy) @@ -45,10 +45,15 @@ PORTDOCS= CREDITS Changelog FEATURES LICENSE READM ietf67-design-02.pdf requirements.txt PLIST_SUB+= PYTHON=${PYTHON} MUNIN=${MUNIN} -OPTIONS_DEFINE= LIBEVENT THREADS PYTHON GOST ECDSA MUNIN +OPTIONS_DEFINE= THREADS PYTHON GOST ECDSA MUNIN OPTIONS_DEFAULT=THREADS ECDSA +OPTIONS_RADIO= LIBEVENT +OPTIONS_RADIO_LIBEVENT= LIBEVENT14 LIBEVENT20 + LIBEVENT_DESC= Enable whenever using many (10000) outgoing ports +LIBEVENT14_DESC=Build against libevent-1.4 (devel/libevent) +LIBEVENT20_DESC=Build against libevent-2.0 (devel/libevent2) GOST_DESC= Enable GOST support (requires OpenSSL from ports) ECDSA_DESC= Enable ECDSA (elliptic curve) support MUNIN_DESC= Install Munin plugin @@ -90,9 +99,16 @@ MUNIN= MUNIN= "@comment " .endif -.if ${PORT_OPTIONS:MLIBEVENT} +.if ${PORT_OPTIONS:MLIBEVENT14} LIB_DEPENDS+= event-1:${PORTSDIR}/devel/libevent CONFIGURE_ARGS+=--with-libevent=${LOCALBASE} +.elif ${PORT_OPTIONS:MLIBEVENT20} +LIB_DEPENDS+= event-2:${PORTSDIR}/devel/libevent2 +USES+= pkgconfig +CONFIGURE_ARGS+=--with-libevent=${NONEXISTENT} +CONFIGURE_ENV+= found_libevent=yes +CPPFLAGS+= $$(pkg-config libevent --cflags-only-I) +LDFLAGS+= $$(pkg-config libevent --libs-only-L) .else CONFIGURE_ARGS+=--with-libevent=no .endif --- unbound_libevent2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: