From owner-svn-ports-all@freebsd.org Tue Jan 12 19:55:49 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74222A80431; Tue, 12 Jan 2016 19:55:49 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2D24711C2; Tue, 12 Jan 2016 19:55:49 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0CJtmuj041978; Tue, 12 Jan 2016 19:55:48 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0CJtmwM041976; Tue, 12 Jan 2016 19:55:48 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201601121955.u0CJtmwM041976@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Tue, 12 Jan 2016 19:55:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405906 - head/www/libevhtp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2016 19:55:49 -0000 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"/ ; s//"evthr.h"/ ; s//"htparse.h"/' \ + ${WRKSRC}/evhtp.h ${WRKSRC}/evthr.h + +post-build: + @${REINPLACE_CMD} 's//"onigposix.h"/' \ + ${WRKSRC}/evhtp.h .include 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