Attachment 233482 Details for Bug 260402 – patch

[patch] patch

re2.patch (text/plain), 1.57 KB, created by Yuri Victorovich on 2022-04-25 16:14:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2022-04-25 16:14:29 UTC

Size: 1.57 KB

patch

obsolete

>diff --git a/devel/re2/Makefile b/devel/re2/Makefile
>index d21fb245fecb..8903a09a8415 100644
>--- a/devel/re2/Makefile
>+++ b/devel/re2/Makefile
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	re2
> PORTVERSION=	20220401
>+PORTREVISION=	1
> CATEGORIES=	devel
> 
> MAINTAINER=	sunpoet@FreeBSD.org
>@@ -10,18 +11,21 @@ COMMENT=	Fast C++ regex library
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		compiler:c++11-lang gmake pathfix
>+BUILD_DEPENDS=	gmake:devel/gmake
> 
>-MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" SED_INPLACE="${SED} -i ''" prefix=${PREFIX}
>+USES=		cmake:testing compiler:c++11-lang
> USE_LDCONFIG=	yes
> 
>-PATHFIX_MAKEFILEIN=	Makefile
>-
> GH_ACCOUNT=	google
> GH_TAGNAME=	${PORTVERSION:C|(....)(..)(..)|\1-\2-\3|}
> USE_GITHUB=	yes
> 
>-post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libre2.so
>+CMAKE_ON=		BUILD_SHARED_LIBS
>+CMAKE_OFF=		RE2_BUILD_TESTING
>+CMAKE_TESTING_ON=	RE2_BUILD_TESTING
>+
>+post-install: # install .pc file
>+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} common-install
>+	@${RM} ${STAGEDIR}${PREFIX}/lib/pkgconfig/re2.pc-e
> 
> .include <bsd.port.mk>
>diff --git a/devel/re2/pkg-plist b/devel/re2/pkg-plist
>index 410f894cf70c..90b26419cff2 100644
>--- a/devel/re2/pkg-plist
>+++ b/devel/re2/pkg-plist
>@@ -2,8 +2,11 @@ include/re2/filtered_re2.h
> include/re2/re2.h
> include/re2/set.h
> include/re2/stringpiece.h
>-lib/libre2.a
>+lib/cmake/re2/re2Config.cmake
>+lib/cmake/re2/re2ConfigVersion.cmake
>+lib/cmake/re2/re2Targets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/re2/re2Targets.cmake
> lib/libre2.so
> lib/libre2.so.9
> lib/libre2.so.9.0.0
>-libdata/pkgconfig/re2.pc
>+lib/pkgconfig/re2.pc

Actions: View | Diff

Attachments on bug 260402: 230092 | 230093 | 233454 | 233482 | 233484 | 234102 | 238046 | 239890 | 242859