svn commit: r400488 - in head/www/libevhtp: . files
Jason Unovitch
junovitch at FreeBSD.org
Fri Oct 30 02:25:42 UTC 2015
Author: junovitch
Date: Fri Oct 30 02:25:40 2015
New Revision: 400488
URL: https://svnweb.freebsd.org/changeset/ports/400488
Log:
www/libevhtp: update 1.2.9 -> 1.2.10 and assorted fixes
- Update PORTVERSION, GH_TAGNAME, and distinfo for 1.2.10
- include/onigposix.h in PLIST when EVHTP_DISABLE_REGEX is not selected
- include/evthr.h when option EVHTP_DISABLE_EVTHR is not selected
- Add patch to ensure symbol gets exported from evhtp.h
- Recreated patch files for portlint
PR: 204054
Submitted by: trasz (original patch, multiple changes from maintainer)
Approved by: Ricky Gallamore <ultima1252 at gmail.com> (maintainer)
Added:
head/www/libevhtp/files/patch-evhtp.h (contents, props changed)
Modified:
head/www/libevhtp/Makefile
head/www/libevhtp/distinfo
head/www/libevhtp/files/patch-evhtp.c
Modified: head/www/libevhtp/Makefile
==============================================================================
--- head/www/libevhtp/Makefile Fri Oct 30 01:58:13 2015 (r400487)
+++ head/www/libevhtp/Makefile Fri Oct 30 02:25:40 2015 (r400488)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= libevhtp
-PORTVERSION= 1.2.9
-PORTREVISION= 3
+PORTVERSION= 1.2.10
CATEGORIES= www
MAINTAINER= ultima1252 at gmail.com
@@ -15,10 +14,10 @@ LIB_DEPENDS= libevent.so:${PORTSDIR}/dev
USE_GITHUB= yes
GH_ACCOUNT= ellzey
-GH_TAGNAME= 3886506
+GH_TAGNAME= ba4c44e
USES= cmake:outsource
-USE_LDCONFIG= YES
+USE_LDCONFIG= yes
CMAKE_ARGS= -DCMAKE_INCLUDE_PATH:PATH=include/event2 \
-DCMAKE_LIBRARY_PATH:PATH=lib/event2
CMAKE_BUILD_TYPE= Release
@@ -46,15 +45,18 @@ OPTIONS_DEFAULT= EVHTP_BUILD_SHARED
.include <bsd.port.options.mk>
-PLIST_FILES= include/evhtp.h\
+PLIST_FILES= include/evhtp.h \
include/evhtp-config.h \
- include/evthr.h \
include/htparse.h
-.if !exists(${LOCALBASE}/include/onigposix.h)
+.if !exists(${LOCALBASE}/include/onigposix.h) && !${PORT_OPTIONS:MEVHTP_DISABLE_REGEX}
PLIST_FILES+= include/onigposix.h
.endif
+.if !${PORT_OPTIONS:MEVHTP_DISABLE_EVTHR}
+PLIST_FILES+= include/evthr.h
+.endif
+
.if ${PORT_OPTIONS:MEVHTP_BUILD_SHARED}
PLIST_FILES+= lib/libevhtp.so
.else
Modified: head/www/libevhtp/distinfo
==============================================================================
--- head/www/libevhtp/distinfo Fri Oct 30 01:58:13 2015 (r400487)
+++ head/www/libevhtp/distinfo Fri Oct 30 02:25:40 2015 (r400488)
@@ -1,2 +1,2 @@
-SHA256 (ellzey-libevhtp-1.2.9-3886506_GH0.tar.gz) = b012587dfbf3e12fb2939d4f4856f966513c754bd6f0accffff8d8edef3b629d
-SIZE (ellzey-libevhtp-1.2.9-3886506_GH0.tar.gz) = 360681
+SHA256 (ellzey-libevhtp-1.2.10-ba4c44e_GH0.tar.gz) = d5b022e2a3847ed7344bc7bca7ac7feb6b4a7e877d12452a15a96ba1c760d25a
+SIZE (ellzey-libevhtp-1.2.10-ba4c44e_GH0.tar.gz) = 373482
Modified: head/www/libevhtp/files/patch-evhtp.c
==============================================================================
--- head/www/libevhtp/files/patch-evhtp.c Fri Oct 30 01:58:13 2015 (r400487)
+++ head/www/libevhtp/files/patch-evhtp.c Fri Oct 30 02:25:40 2015 (r400488)
@@ -1,5 +1,5 @@
---- evhtp.c.orig 2014-03-23 11:50:50.000000000 +0000
-+++ evhtp.c 2014-09-13 12:37:11.000000000 +0000
+--- evhtp.c.orig 2015-02-24 07:55:55 UTC
++++ evhtp.c
@@ -7,6 +7,7 @@
#include <strings.h>
#include <inttypes.h>
@@ -8,7 +8,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
-@@ -2740,7 +2741,14 @@
+@@ -3170,7 +3171,14 @@ evhtp_bind_sockaddr(evhtp_t * htp, struc
sock = evconnlistener_get_fd(htp->server);
Added: head/www/libevhtp/files/patch-evhtp.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/libevhtp/files/patch-evhtp.h Fri Oct 30 02:25:40 2015 (r400488)
@@ -0,0 +1,11 @@
+--- evhtp.h.orig 2015-10-29 19:51:50 UTC
++++ evhtp.h
+@@ -1285,7 +1285,7 @@ EVHTP_EXPORT evhtp_connection_t *
+ evhtp_connection_new(evbase_t * evbase, const char * addr, uint16_t port);
+
+ #ifndef DISABLE_SSL
+-evhtp_connection_t * evhtp_connection_ssl_new(evbase_t * evbase, const char * addr, uint16_t port, evhtp_ssl_ctx_t * ctx);
++EVHTP_EXPORT evhtp_connection_t * evhtp_connection_ssl_new(evbase_t * evbase, const char * addr, uint16_t port, evhtp_ssl_ctx_t * ctx);
+ #endif
+
+
More information about the svn-ports-all
mailing list