Attachment #222166 for bug #253255




# $FreeBSD$

PORTNAME=	re2
DISTVERSION=	20210202
CATEGORIES=	devel

MAINTAINER=	sunpoet@FreeBSD.org

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		cmake compiler:c++11-lang pkgconfig

MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" SED_INPLACE="${SED} -i ''" prefix=${PREFIX}
USE_LDCONFIG=	yes

PATHFIX_MAKEFILEIN=	Makefile

GH_ACCOUNT=	google
GH_TAGNAME=	${DISTVERSION:C|(....)(..)(..)|\1-\2-\3|}
USE_GITHUB=	yes

CMAKE_ON=	BUILD_SHARED_LIBS
CMAKE_OFF=	RE2_BUILD_TESTING

post-install:
	@${CP} -a ${INSTALL_WRKSRC}/libre2.so.* ${STAGEDIR}${PREFIX}/lib/

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/devel/re2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1585907194	1	TIMESTAMP = 1612466789
2	SHA256 (google-re2-20200401-2020-04-01_GH0.tar.gz) = 98794bc5416326817498384a9c43cbb5a406bab8da9f84f83c39ecad43ed5cea	2	SHA256 (google-re2-20210202-2021-02-02_GH0.tar.gz) = 1396ab50c06c1a8885fb68bf49a5ecfd989163015fd96699a180d6414937f33f
3	SIZE (google-re2-20200401-2020-04-01_GH0.tar.gz) = 402511	3	SIZE (google-re2-20210202-2021-02-02_GH0.tar.gz) = 402958




--- 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)

Lines 2-9 include/re2/filtered_re2.h Link Here

(-)b/devel/re2/pkg-plist (-4 / +4 lines)
2	include/re2/re2.h	2	include/re2/re2.h
3	include/re2/set.h	3	include/re2/set.h
4	include/re2/stringpiece.h	4	include/re2/stringpiece.h
5	lib/libre2.a	5	lib/cmake/re2/re2-config-%%CMAKE_BUILD_TYPE%%.cmake
		6	lib/cmake/re2/re2-config.cmake
6	lib/libre2.so	7	lib/libre2.so
7	lib/libre2.so.6	8	lib/libre2.so.9
8	lib/libre2.so.6.0.0	9	lib/libre2.so.9.0.0
9	libdata/pkgconfig/re2.pc	10	libdata/pkgconfig/re2.pc
10	-

Return to bug 253255

Lines 2-8 Link Here

(-)b/devel/re2/Makefile (-8 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= re2	4	PORTNAME= re2
5	PORTVERSION= 20200401	5	DISTVERSION= 20210202
6	CATEGORIES= devel	6	CATEGORIES= devel
7		7
8	MAINTAINER= sunpoet@FreeBSD.org	8	MAINTAINER= sunpoet@FreeBSD.org
Lines 11-28 COMMENT= Fast C++ regex library Link Here
11	LICENSE= BSD3CLAUSE	11	LICENSE= BSD3CLAUSE
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
14	USES= compiler:c++11-lang gmake pathfix	14	USES= cmake compiler:c++11-lang pkgconfig
15
16	MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" SED_INPLACE="${SED} -i ''" prefix=${PREFIX}
17	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
18		16
19	PATHFIX_MAKEFILEIN= Makefile
20
21	GH_ACCOUNT= google	17	GH_ACCOUNT= google
22	GH_TAGNAME= ${PORTVERSION:C\|(....)(..)(..)\|\1-\2-\3\|}	18	GH_TAGNAME= ${DISTVERSION:C\|(....)(..)(..)\|\1-\2-\3\|}
23	USE_GITHUB= yes	19	USE_GITHUB= yes
24		20
		21	CMAKE_ON= BUILD_SHARED_LIBS
		22	CMAKE_OFF= RE2_BUILD_TESTING
		23
25	post-install:	24	post-install:
26	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libre2.so	25	@${CP} -a ${INSTALL_WRKSRC}/libre2.so.* ${STAGEDIR}${PREFIX}/lib/
27		26
28	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Added Link Here

(-)b/devel/re2/files/patch-CMakeLists.txt (+39 lines)
1	--- CMakeLists.txt.orig 2021-02-02 00:24:20 UTC
2	+++ CMakeLists.txt
3	@@ -1,3 +1,4 @@
4	+
5	# Copyright 2015 The RE2 Authors. All Rights Reserved.
6	# Use of this source code is governed by a BSD-style
7	# license that can be found in the LICENSE file.
8	@@ -147,12 +148,29 @@ set(RE2_HEADERS
9	re2/stringpiece.h
10	)
11
12	+macro(extract_version file setting_name)
13	+ file(STRINGS ${file} VERSION_NUMBER REGEX "^${setting_name}")
14	+ string(REPLACE "=" ";" VERSION_NUMBER_LIST ${VERSION_NUMBER})
15	+ list(GET VERSION_NUMBER_LIST 1 ${setting_name})
16	+endmacro(extract_version)
17	+
18	+extract_version(Makefile SONAME)
19	+
20	+set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
21	+set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
22	+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/re2.pc ${CMAKE_CURRENT_BINARY_DIR}/re2.pc @ONLY)
23	+
24	install(FILES ${RE2_HEADERS}
25	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/re2)
26	-install(TARGETS re2 EXPORT re2Config
27	+install(TARGETS re2 EXPORT re2-config
28	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
29	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
30	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
31	INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
32	-install(EXPORT re2Config
33	+install(EXPORT re2-config
34	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/re2 NAMESPACE re2::)
35	+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/re2.pc
36	+ DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
37	+ADD_CUSTOM_TARGET(install_files ALL
38	+ COMMAND ${CMAKE_COMMAND} -E create_symlink libre2.so libre2.so.${SONAME}
39	+ COMMAND ${CMAKE_COMMAND} -E create_symlink libre2.so libre2.so.${SONAME}.0.0)