ports/141004: [PATCH] net/libevnet: update to 0.3.11 + misc. cleanups

[Sahil Tandon]

>Number:         141004
>Category:       ports
>Synopsis:       [PATCH] net/libevnet: update to 0.3.11 + misc. cleanups
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 29 20:50:07 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Sahil Tandon
>Release:        FreeBSD 7.2-RELEASE i386
>Organization:
>Environment:

	
>Description:
- Update to 0.3.11
- Remove files/patch-src::lookup.c (adopted upstream)
- Remove files/patch-Makefile; replicate instead in Makefile while respecting custom LOCALBASE

Note: There is a warning in the build phase about the redefinition of _REENTRANT; this same warning was also present in the build logs (confirmed on pointyhat) for the previous version of the port[1].  This obviously occurs because -D_REENTRANT is passed via CPPFLAGS.  It appears innocuous and I did not remove the definition because I must assume it is there for a good readon(tm). :)  I defer to the maintainer to decide whether we should keep that flag!
>How-To-Repeat:
	
>Fix:

	



--- libevnet.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/libevnet/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile	4 Oct 2009 02:20:08 -0000	1.8
+++ Makefile	29 Nov 2009 20:37:15 -0000
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libevnet
-PORTVERSION=	0.3.8
-PORTREVISION=	5
+PORTVERSION=	0.3.11
 CATEGORIES=	net
 MASTER_SITES=	http://www.25thandclement.com/~william/projects/releases/
 EXTRACT_SUFX=	.tgz
@@ -19,9 +18,15 @@
 BUILD_DEPENDS=	${LOCALBASE}/lib/libarena.a:${PORTSDIR}/devel/libarena
 LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent \
 		cares.2:${PORTSDIR}/dns/c-ares
-RUN_DEPENDS=	${LOCALBASE}/lib/libarena.a:${PORTSDIR}/devel/libarena
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 
+CPPFLAGS=	-I${LOCALBASE}/include \
+		-DUSE_OPENSSL -DUSE_CARES -DUSE_IPV6 -DUSE_PTHREADS \
+		-DHAVE_STRLCPY -DHAVE_STRLCAT -D_REENTRANT
+
+MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}"
+
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/libevnet/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	11 Jun 2007 15:16:21 -0000	1.2
+++ distinfo	29 Nov 2009 20:37:15 -0000
@@ -1,3 +1,3 @@
-MD5 (libevnet-0.3.8.tgz) = 1f8b8f6aec64cf6d183ad48f92bb46ec
-SHA256 (libevnet-0.3.8.tgz) = 72c5ce004e8190e902475e0602e93f60a0c4cd165c6a4d79af7e49774caa5cac
-SIZE (libevnet-0.3.8.tgz) = 81265
+MD5 (libevnet-0.3.11.tgz) = 5aa32a4bafb3790fa7f177e91af20908
+SHA256 (libevnet-0.3.11.tgz) = 99ac2c2ac7fb6708b31481d8b04af9c197ba6fc6a9af812edec183f2bc6d07c5
+SIZE (libevnet-0.3.11.tgz) = 103977
Index: files/patch-Makefile
===================================================================
RCS file: files/patch-Makefile
diff -N files/patch-Makefile
--- files/patch-Makefile	11 Jun 2007 15:16:21 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- Makefile.orig	Mon Jun 11 23:07:29 2007
-+++ Makefile	Mon Jun 11 23:07:58 2007
-@@ -1,3 +1,7 @@
-+CPPFLAGS += -I/usr/local/include
-+CPPFLAGS += -DUSE_OPENSSL -DUSE_CARES -DUSE_IPV6 -DUSE_PTHREADS
-+CPPFLAGS += -DHAVE_STRLCPY -DHAVE_STRLCAT
-+CPPFLAGS += -D_REENTRANT
- 
- #
- # Setup our targets
Index: files/patch-src::lookup.c
===================================================================
RCS file: files/patch-src::lookup.c
diff -N files/patch-src::lookup.c
--- files/patch-src::lookup.c	4 Oct 2009 02:20:08 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
---- src/lookup.c.orig	2009-10-04 10:13:19.191192582 +0800
-+++ src/lookup.c	2009-10-04 10:15:44.531364833 +0800
-@@ -2037,7 +2037,7 @@
- } /* lookup_additional_query() */
- 
- 
--static void lookup_catch_ares(void *, int, unsigned char *, int);
-+static void lookup_catch_ares(void *, int, int, unsigned char *, int);
- 
- static void lookup_issue_query(struct lookup *l, struct lookup_query *q, const char *qname, size_t qnamelen, int rtype) {
- 	struct ares_channel *c;
-@@ -2052,7 +2052,7 @@
- 	q->channel	= c;
- 
- 	if (l->opts.query_max != 0 && q->live_queries_made >= l->opts.query_max) {
--		lookup_catch_ares(q, ARES_ENODATA, NULL, 0);
-+		lookup_catch_ares(q, ARES_ENODATA, 0, NULL, 0);
- 	} else {
- 		++q->live_queries_made;
- 		ares_query(c->channel, qname, C_IN, lookup_rtype2arpa(rtype), lookup_catch_ares, q);
-@@ -2708,7 +2708,7 @@
- } /* lookup_process() */
- 
- 
--static void lookup_catch_ares(void *l_, int ares_errno, unsigned char *abuf, int alen) {
-+static void lookup_catch_ares(void *l_, int ares_errno, int timeouts, unsigned char *abuf, int alen) {
- 	int lookup_errno	= LOOKUP_ESUCCESS;
- 	struct lookup_query *q;
- 	struct lookup *l;
--- libevnet.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: