From owner-svn-ports-head@freebsd.org Wed Mar 3 14:13:21 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 96C8356BCAF; Wed, 3 Mar 2021 14:13:21 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DrGDx3vpPz3pQj; Wed, 3 Mar 2021 14:13:21 +0000 (UTC) (envelope-from crees@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 78F042BD2; Wed, 3 Mar 2021 14:13:21 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 123EDLI7096821; Wed, 3 Mar 2021 14:13:21 GMT (envelope-from crees@FreeBSD.org) Received: (from crees@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 123EDK65096817; Wed, 3 Mar 2021 14:13:20 GMT (envelope-from crees@FreeBSD.org) Message-Id: <202103031413.123EDK65096817@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: crees set sender to crees@FreeBSD.org using -f From: Chris Rees Date: Wed, 3 Mar 2021 14:13:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567086 - in head/devel/re2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: crees X-SVN-Commit-Paths: in head/devel/re2: . files X-SVN-Commit-Revision: 567086 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Mar 2021 14:13:21 -0000 Author: crees Date: Wed Mar 3 14:13:20 2021 New Revision: 567086 URL: https://svnweb.freebsd.org/changeset/ports/567086 Log: devel/re2: update to 20210202 Switch to CMake Revert upstream commit 5bd6137 and slightly improve support PR: ports/253255 Submitted by: daniel.engberg.lists@pyret.net Approved by: maintainer timeout (sunpoet, 3w6d) Tested: https://gitlab.com/swills/freebsd-ports/-/pipelines/259017091 Added: head/devel/re2/files/ head/devel/re2/files/patch-CMakeLists.txt (contents, props changed) Modified: head/devel/re2/Makefile head/devel/re2/distinfo head/devel/re2/pkg-plist Modified: head/devel/re2/Makefile ============================================================================== --- head/devel/re2/Makefile Wed Mar 3 14:11:51 2021 (r567085) +++ head/devel/re2/Makefile Wed Mar 3 14:13:20 2021 (r567086) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= re2 -PORTVERSION= 20210201 +DISTVERSION= 20210202 CATEGORIES= devel MAINTAINER= sunpoet@FreeBSD.org @@ -11,18 +11,17 @@ COMMENT= Fast C++ regex library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= compiler:c++11-lang gmake pathfix - -MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" SED_INPLACE="${SED} -i ''" prefix=${PREFIX} +USES= cmake compiler:c++11-lang pkgconfig USE_LDCONFIG= yes -PATHFIX_MAKEFILEIN= Makefile - GH_ACCOUNT= google -GH_TAGNAME= ${PORTVERSION:C|(....)(..)(..)|\1-\2-\3|} +GH_TAGNAME= ${DISTVERSION:C|(....)(..)(..)|\1-\2-\3|} USE_GITHUB= yes +CMAKE_ON= BUILD_SHARED_LIBS +CMAKE_OFF= RE2_BUILD_TESTING + post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libre2.so + @${CP} -a ${INSTALL_WRKSRC}/libre2.so.* ${STAGEDIR}${PREFIX}/lib/ .include Modified: head/devel/re2/distinfo ============================================================================== --- head/devel/re2/distinfo Wed Mar 3 14:11:51 2021 (r567085) +++ head/devel/re2/distinfo Wed Mar 3 14:13:20 2021 (r567086) @@ -1,3 +1,3 @@ -TIMESTAMP = 1612296107 -SHA256 (google-re2-20210201-2021-02-01_GH0.tar.gz) = d3e15031ced791b39f11964816ca2d4213f25d3b67fbbe82972c7b7666c456ba -SIZE (google-re2-20210201-2021-02-01_GH0.tar.gz) = 403036 +TIMESTAMP = 1612466789 +SHA256 (google-re2-20210202-2021-02-02_GH0.tar.gz) = 1396ab50c06c1a8885fb68bf49a5ecfd989163015fd96699a180d6414937f33f +SIZE (google-re2-20210202-2021-02-02_GH0.tar.gz) = 402958 Added: head/devel/re2/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/re2/files/patch-CMakeLists.txt Wed Mar 3 14:13:20 2021 (r567086) @@ -0,0 +1,39 @@ +--- CMakeLists.txt.orig 2021-02-02 00:24:20 UTC ++++ CMakeLists.txt +@@ -1,3 +1,4 @@ ++ + # Copyright 2015 The RE2 Authors. All Rights Reserved. + # Use of this source code is governed by a BSD-style + # license that can be found in the LICENSE file. +@@ -147,12 +148,29 @@ set(RE2_HEADERS + re2/stringpiece.h + ) + ++macro(extract_version file setting_name) ++ file(STRINGS ${file} VERSION_NUMBER REGEX "^${setting_name}") ++ string(REPLACE "=" ";" VERSION_NUMBER_LIST ${VERSION_NUMBER}) ++ list(GET VERSION_NUMBER_LIST 1 ${setting_name}) ++endmacro(extract_version) ++ ++extract_version(Makefile SONAME) ++ ++set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) ++set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/re2.pc ${CMAKE_CURRENT_BINARY_DIR}/re2.pc @ONLY) ++ + install(FILES ${RE2_HEADERS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/re2) +-install(TARGETS re2 EXPORT re2Config ++install(TARGETS re2 EXPORT re2-config + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +-install(EXPORT re2Config ++install(EXPORT re2-config + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/re2 NAMESPACE re2::) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/re2.pc ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig) ++ADD_CUSTOM_TARGET(install_files ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink libre2.so libre2.so.${SONAME} ++ COMMAND ${CMAKE_COMMAND} -E create_symlink libre2.so libre2.so.${SONAME}.0.0) Modified: head/devel/re2/pkg-plist ============================================================================== --- head/devel/re2/pkg-plist Wed Mar 3 14:11:51 2021 (r567085) +++ head/devel/re2/pkg-plist Wed Mar 3 14:13:20 2021 (r567086) @@ -2,8 +2,9 @@ include/re2/filtered_re2.h include/re2/re2.h include/re2/set.h include/re2/stringpiece.h -lib/libre2.a +lib/cmake/re2/re2-config-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/re2/re2-config.cmake lib/libre2.so -lib/libre2.so.10 -lib/libre2.so.10.0.0 +lib/libre2.so.9 +lib/libre2.so.9.0.0 libdata/pkgconfig/re2.pc