Date: Wed, 10 Jan 2018 20:07:52 +0000 (UTC) From: Richard Gallamore <ultima@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458690 - in branches/2018Q1/www/libevhtp: . files Message-ID: <201801102007.w0AK7qTM091626@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ultima Date: Wed Jan 10 20:07:52 2018 New Revision: 458690 URL: https://svnweb.freebsd.org/changeset/ports/458690 Log: MFH: r458045 * Updated to 1.2.15 * Uses system oniguruma when REGEX option is enabled, default on Reviewed by: mat Security: https://vuxml.freebsd.org/freebsd/b396cf6c-62e6-11e7-9def-b499baebfeaf.html Differential Revision: https://reviews.freebsd.org/D13742 Approved by: ports-secteam (swills) Added: branches/2018Q1/www/libevhtp/files/patch-CMakeLists.txt - copied unchanged from r458045, head/www/libevhtp/files/patch-CMakeLists.txt Deleted: branches/2018Q1/www/libevhtp/files/patch-evhtp.c Modified: branches/2018Q1/www/libevhtp/Makefile branches/2018Q1/www/libevhtp/distinfo branches/2018Q1/www/libevhtp/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/libevhtp/Makefile ============================================================================== --- branches/2018Q1/www/libevhtp/Makefile Wed Jan 10 20:04:04 2018 (r458689) +++ branches/2018Q1/www/libevhtp/Makefile Wed Jan 10 20:07:52 2018 (r458690) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libevhtp -PORTVERSION= 1.2.11 -PORTREVISION= 4 +PORTVERSION= 1.2.15 CATEGORIES= www MAINTAINER= ultima@FreeBSD.org @@ -13,35 +12,28 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:devel/libevent -USE_GITHUB= yes -GH_ACCOUNT= ellzey - USES= cmake:outsource USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= criticalstack + CMAKE_ARGS= -DCMAKE_INCLUDE_PATH:PATH=include/event2 \ -DCMAKE_LIBRARY_PATH:PATH=lib/event2 PLIST_SUB+= PORTVERSION=${PORTVERSION} -OPTIONS_DEFINE= SSL THREADS STATIC DEBUG -OPTIONS_DEFAULT=SSL THREADS +OPTIONS_DEFINE= REGEX SSL THREADS STATIC DEBUG +OPTIONS_DEFAULT=REGEX SSL THREADS OPTIONS_SUB= yes -SSL_CMAKE_ON= -DEVHTP_DISABLE_SSL:STRING=OFF -SSL_CMAKE_OFF= -DEVHTP_DISABLE_SSL:STRING=ON -THREADS_CMAKE_ON= -DEVHTP_DISABLE_EVTHR:STRING=OFF -THREADS_CMAKE_OFF= -DEVHTP_DISABLE_EVTHR:STRING=ON -STATIC_CMAKE_ON= -DEVHTP_BUILD_SHARED:STRING=OFF -STATIC_CMAKE_OFF= -DEVHTP_BUILD_SHARED:STRING=ON +REGEX_CMAKE_BOOL_OFF= EVHTP_DISABLE_REGEX +REGEX_LIB_DEPENDS= libonig.so:devel/oniguruma -post-patch: - @${REINPLACE_CMD} '/HAS_SYS_ONIG onig/d ; s/lib\/pkgconfig/libdata\/pkgconfig/ ; s/PATCH_VERSION [0-9]*/PATCH_VERSION ${PORTVERSION:S/1.2.//}/' \ - ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} 's/<evhtp-config.h>/"evhtp-config.h"/ ; s/<evthr.h>/"evthr.h"/ ; s/<htparse.h>/"htparse.h"/' \ - ${WRKSRC}/evhtp.h ${WRKSRC}/evthr.h +SSL_CMAKE_BOOL_OFF= EVHTP_DISABLE_SSL +SSL_USES= ssl -post-build: - @${REINPLACE_CMD} 's/<onigposix.h>/"onigposix.h"/' \ - ${WRKSRC}/evhtp.h +THREADS_CMAKE_BOOL_OFF= EVHTP_DISABLE_EVTHR + +STATIC_CMAKE_BOOL_OFF= EVHTP_BUILD_SHARED .include <bsd.port.mk> Modified: branches/2018Q1/www/libevhtp/distinfo ============================================================================== --- branches/2018Q1/www/libevhtp/distinfo Wed Jan 10 20:04:04 2018 (r458689) +++ branches/2018Q1/www/libevhtp/distinfo Wed Jan 10 20:07:52 2018 (r458690) @@ -1,2 +1,3 @@ -SHA256 (ellzey-libevhtp-1.2.11_GH0.tar.gz) = 0e60ef0b75c9e0351d18e015c9a688a70d9c66d2ca3f6a44a7da7153e11e067d -SIZE (ellzey-libevhtp-1.2.11_GH0.tar.gz) = 429931 +TIMESTAMP = 1514908590 +SHA256 (criticalstack-libevhtp-1.2.15_GH0.tar.gz) = f78ee8a34492e266fc1b6b9d4003825659df672da1cf918120217a0ee0d14ed3 +SIZE (criticalstack-libevhtp-1.2.15_GH0.tar.gz) = 171933 Copied: branches/2018Q1/www/libevhtp/files/patch-CMakeLists.txt (from r458045, head/www/libevhtp/files/patch-CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/libevhtp/files/patch-CMakeLists.txt Wed Jan 10 20:07:52 2018 (r458690, copy of r458045, head/www/libevhtp/files/patch-CMakeLists.txt) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2018-01-02 16:30:26 UTC ++++ CMakeLists.txt +@@ -196,7 +196,7 @@ add_library (evhtp ${EVHTP_LIBTYPE} ${LIBEVH + target_link_libraries (evhtp ${LIBEVHTP_EXTERNAL_LIBS}) + + if (EVHTP_BUILD_SHARED) +- set_target_properties(evhtp PROPERTIES VERSION "${PROJECT_VERSION}" 0 OUTPUT_NAME "evhtp") ++ set_target_properties(evhtp PROPERTIES VERSION "${PROJECT_VERSION}" SOVERSION 0 OUTPUT_NAME "evhtp") + endif() + + add_subdirectory(examples) Modified: branches/2018Q1/www/libevhtp/pkg-plist ============================================================================== --- branches/2018Q1/www/libevhtp/pkg-plist Wed Jan 10 20:04:04 2018 (r458689) +++ branches/2018Q1/www/libevhtp/pkg-plist Wed Jan 10 20:07:52 2018 (r458690) @@ -1,9 +1,10 @@ +include/evhtp.h +include/evhtp/config.h include/evhtp/evhtp.h -include/evhtp/evhtp-config.h -include/evhtp/htparse.h -libdata/pkgconfig/evhtp.pc +include/evhtp/parser.h +%%THREADS%%include/evhtp/thread.h %%NO_STATIC%%lib/libevhtp.so +%%NO_STATIC%%lib/libevhtp.so.0 %%NO_STATIC%%lib/libevhtp.so.%%PORTVERSION%% -include/evhtp/onigposix.h -%%THREADS%%include/evhtp/evthr.h %%STATIC%%lib/libevhtp.a +libdata/pkgconfig/evhtp.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801102007.w0AK7qTM091626>