Bug 178218

Summary: [patch] dns/unbound: add libevent-2.0 option
Product: Ports & Packages Reporter: Jan Beich <jbeich>
Component: Individual Port(s)Assignee: Sergey Matveychuk <sem>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
unbound_libevent2.diff none

Description Jan Beich freebsd_committer freebsd_triage 2013-04-28 12:50:00 UTC 

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
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-04-28 12:50:08 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->sem

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-04-29 17:10:19 UTC 
Author: sem
Date: Mon Apr 29 16:10:07 2013
New Revision: 316830
URL: http://svnweb.freebsd.org/changeset/ports/316830

Log:
  - Add libevent-2.0 option
  
  PR:		ports/178218
  Submitted by:	Jan Beich <jbeich at tormail.org>

Modified:
  head/dns/unbound/Makefile

Modified: head/dns/unbound/Makefile
==============================================================================
--- head/dns/unbound/Makefile	Mon Apr 29 16:01:47 2013	(r316829)
+++ head/dns/unbound/Makefile	Mon Apr 29 16:10:07 2013	(r316830)
@@ -45,10 +45,15 @@ PORTDOCS=	CREDITS Changelog FEATURES LIC
 		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 +95,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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Sergey Matveychuk freebsd_committer freebsd_triage 2013-04-29 17:10:36 UTC 
State Changed
From-To: open->closed

Committed. Thanks!