From jbeich@tormail.org  Sun Apr 28 11:46:34 2013
Return-Path: <jbeich@tormail.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 266A2F38
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <jbeich@tormail.org>)
	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 <jbeich@tormail.org>)
	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 <jbeich@tormail.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] dns/unbound: add libevent-2.0 option

>Number:         178218
>Category:       ports
>Synopsis:       [patch] dns/unbound: add libevent-2.0 option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sem
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 28 11:50:00 UTC 2013
>Closed-Date:    Mon Apr 29 16:10:37 UTC 2013
>Last-Modified:  Mon Apr 29 16:20:00 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->sem 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Apr 28 11:50:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178218 
State-Changed-From-To: open->closed 
State-Changed-By: sem 
State-Changed-When: Mon Apr 29 16:10:36 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178218 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/178218: commit references a PR
Date: Mon, 29 Apr 2013 16:10:19 +0000 (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"
 
>Unformatted:
