Date: Thu, 25 Apr 2013 17:14:49 -0800 From: Jan Beich <jbeich@tormail.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/178218: [patch] dns/unbound: add libevent-2.0 option Message-ID: <1UWQ0g-000EgU-CU@internal.tormail.org> Resent-Message-ID: <201304281150.r3SBo0pa041964@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1UWQ0g-000EgU-CU>