Date: Tue, 12 Jan 2016 19:55:48 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405906 - head/www/libevhtp Message-ID: <201601121955.u0CJtmwM041976@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Tue Jan 12 19:55:47 2016 New Revision: 405906 URL: https://svnweb.freebsd.org/changeset/ports/405906 Log: www/libevhtp: fix conflicts with oniguruma*... ... as well as fix some breaks when oniguruma* is installed. - Removed striped hierarchy for headers - Removed system oniguruma detection - Fixed headers PR: 206093 Submitted by: Ultima1252@gmail.com (maintainer) Modified: head/www/libevhtp/Makefile head/www/libevhtp/pkg-plist Modified: head/www/libevhtp/Makefile ============================================================================== --- head/www/libevhtp/Makefile Tue Jan 12 19:46:15 2016 (r405905) +++ head/www/libevhtp/Makefile Tue Jan 12 19:55:47 2016 (r405906) @@ -2,6 +2,7 @@ PORTNAME= libevhtp PORTVERSION= 1.2.11 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= ultima1252@gmail.com @@ -37,8 +38,13 @@ STATIC_CMAKE_ON= -DEVHTP_BUILD_SHARED:ST STATIC_CMAKE_OFF= -DEVHTP_BUILD_SHARED:STRING=ON post-patch: - @${REINPLACE_CMD} 's/\/evhtp//' ${WRKSRC}/evhtp.pc.in - @${REINPLACE_CMD} 's/INCLUDE_INSTALL_DIR}\/evhtp/INCLUDE_INSTALL_DIR}/ ; s/lib\/pkgconfig/libdata\/pkgconfig/ ; s/PATCH_VERSION [0-9]*/PATCH_VERSION ${PORTVERSION:S/1.2.//}/' \ + @${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 + +post-build: + @${REINPLACE_CMD} 's/<onigposix.h>/"onigposix.h"/' \ + ${WRKSRC}/evhtp.h .include <bsd.port.mk> Modified: head/www/libevhtp/pkg-plist ============================================================================== --- head/www/libevhtp/pkg-plist Tue Jan 12 19:46:15 2016 (r405905) +++ head/www/libevhtp/pkg-plist Tue Jan 12 19:55:47 2016 (r405906) @@ -1,9 +1,9 @@ -include/evhtp.h -include/evhtp-config.h -include/htparse.h +include/evhtp/evhtp.h +include/evhtp/evhtp-config.h +include/evhtp/htparse.h libdata/pkgconfig/evhtp.pc %%NO_STATIC%%lib/libevhtp.so %%NO_STATIC%%lib/libevhtp.so.%%PORTVERSION%% -%%REGEX%%include/onigposix.h -%%THREADS%%include/evthr.h +%%REGEX%%include/evhtp/onigposix.h +%%THREADS%%include/evhtp/evthr.h %%STATIC%%lib/libevhtp.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601121955.u0CJtmwM041976>