Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1712334565152560"
MIME-Version: 1.0
Date: Fri, 5 Apr 2024 16:29:25 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/devel/re2
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20240405162925.E3153FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1712334565152560
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Fri Apr  5 16:29:25 UTC 2024

Modified Files:
	pkgsrc/devel/re2: Makefile distinfo
Added Files:
	pkgsrc/devel/re2/patches: patch-re2Config.cmake.in

Log Message:
re2: updated to 20240401

2024-04-01
Full Changelog: https://github.com/google/re2/compare/2024-03-01...2024-04-01


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/re2/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/re2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/re2/patches/patch-re2Config.cmake.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1712334565152560
Content-Disposition: inline
Content-Length: 2415
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/re2/Makefile
diff -u pkgsrc/devel/re2/Makefile:1.18 pkgsrc/devel/re2/Makefile:1.19
--- pkgsrc/devel/re2/Makefile:1.18	Sun Mar  3 11:35:11 2024
+++ pkgsrc/devel/re2/Makefile	Fri Apr  5 16:29:25 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2024/03/03 11:35:11 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2024/04/05 16:29:25 adam Exp $
 
 DISTNAME=	re2-${GITHUB_TAG:S/-//g}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=google/}
-GITHUB_TAG=	2024-03-01
+GITHUB_TAG=	2024-04-01
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/google/re2

Index: pkgsrc/devel/re2/distinfo
diff -u pkgsrc/devel/re2/distinfo:1.17 pkgsrc/devel/re2/distinfo:1.18
--- pkgsrc/devel/re2/distinfo:1.17	Sun Mar  3 11:35:11 2024
+++ pkgsrc/devel/re2/distinfo	Fri Apr  5 16:29:25 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.17 2024/03/03 11:35:11 wiz Exp $
+$NetBSD: distinfo,v 1.18 2024/04/05 16:29:25 adam Exp $
 
-BLAKE2s (re2-20240301.tar.gz) = d5c7eb5e44922e809d75536a85c8837b0aaff949ebd2339b96985a9179ffd66c
-SHA512 (re2-20240301.tar.gz) = 89ee19a1ab1c64635010537b31854ae9c33a4e6d8c7031a1bd7571b95d35e459101e8e618bec217ca8929f22a216ba2682e546f09bda38438f2d4141ae886f1e
-Size (re2-20240301.tar.gz) = 389495 bytes
+BLAKE2s (re2-20240401.tar.gz) = f8c6a94ed430c8d26f28cfb71dfffe427eec8b236e3c76eef7f74ec4b5f0f6f6
+SHA512 (re2-20240401.tar.gz) = 1511d163ee90c724705cc16d2995e777a7d894ff8133bd3457a26d8c6a9dcb8ccdd2e77b73681e623317a1edbbd3c928569358af91e72ce8612f7b7b61108283
+Size (re2-20240401.tar.gz) = 389819 bytes
+SHA1 (patch-re2Config.cmake.in) = 65238a05f277bc1c7dabab51109b565d23c6ee72

Added files:

Index: pkgsrc/devel/re2/patches/patch-re2Config.cmake.in
diff -u /dev/null pkgsrc/devel/re2/patches/patch-re2Config.cmake.in:1.1
--- /dev/null	Fri Apr  5 16:29:25 2024
+++ pkgsrc/devel/re2/patches/patch-re2Config.cmake.in	Fri Apr  5 16:29:25 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-re2Config.cmake.in,v 1.1 2024/04/05 16:29:25 adam Exp $
+
+Fix for CMake 3.29.
+https://github.com/google/re2/issues/488
+
+--- re2Config.cmake.in.orig	2024-04-05 16:12:34.658881208 +0000
++++ re2Config.cmake.in
+@@ -6,7 +6,7 @@
+ 
+ include(CMakeFindDependencyMacro)
+ 
+-set_and_check(re2_INCLUDE_DIR ${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@)
++set_and_check(re2_INCLUDE_DIR @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@)
+ 
+ if(UNIX)
+   set(THREADS_PREFER_PTHREAD_FLAG ON)


--_----------=_1712334565152560--