CVS commit: pkgsrc/devel/re2

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Aug  6 16:23:21 UTC 2020

Modified Files:
        pkgsrc/devel/re2: Makefile PLIST distinfo

Log Message:
re2: updated to 20200801

20200801:
Unknown changes


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/re2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/re2/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/re2/distinfo

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

Modified files:

Index: pkgsrc/devel/re2/Makefile
diff -u pkgsrc/devel/re2/Makefile:1.7 pkgsrc/devel/re2/Makefile:1.8
--- pkgsrc/devel/re2/Makefile:1.7       Tue Apr 21 12:31:19 2020
+++ pkgsrc/devel/re2/Makefile   Thu Aug  6 16:23:21 2020
@@ -1,22 +1,33 @@
-# $NetBSD: Makefile,v 1.7 2020/04/21 12:31:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2020/08/06 16:23:21 adam Exp $
 
-DISTNAME=      re2-20200101
+DISTNAME=      re2-${GITHUB_TAG:S/-//g}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=google/}
-GITHUB_TAG=    2020-01-01
+GITHUB_TAG=    2020-08-01
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/google/re2
 COMMENT=       Regular expression library
 LICENSE=       modified-bsd
 
-USE_LANGUAGES+=        c c++
-USE_TOOLS+=    gmake gsed pkg-config
+USE_CMAKE=     yes
+USE_LANGUAGES= c c++11
+TEST_ENV=      LD_LIBRARY_PATH=${WRKSRC}
+TEST_TARGET=   test
+
+CMAKE_ARGS+=   -DBUILD_SHARED_LIBS=ON
+
+PKGCONFIG_OVERRIDE=    re2.pc
+INSTALLATION_DIRS+=    lib/pkgconfig
 
 SUBST_CLASSES+=                path
 SUBST_MESSAGE.path=    Fixup pathnames
 SUBST_STAGE.path=      pre-configure
-SUBST_FILES.path=      Makefile
-SUBST_SED.path=                -e 's|/usr/local|${PREFIX}|g'
+SUBST_FILES.path=      re2.pc
+SUBST_SED.path=                -e 's,@includedir@,${PREFIX}/include,'
+SUBST_SED.path+=       -e 's,@libdir@,${PREFIX}/lib,'
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/re2.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/re2/PLIST
diff -u pkgsrc/devel/re2/PLIST:1.2 pkgsrc/devel/re2/PLIST:1.3
--- pkgsrc/devel/re2/PLIST:1.2  Sat Aug 13 14:04:22 2016
+++ pkgsrc/devel/re2/PLIST      Thu Aug  6 16:23:21 2020
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2016/08/13 14:04:22 mef Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/08/06 16:23:21 adam Exp $
 include/re2/filtered_re2.h
 include/re2/re2.h
 include/re2/set.h
 include/re2/stringpiece.h
-lib/libre2.a
+lib/cmake/re2/re2Config-noconfig.cmake
+lib/cmake/re2/re2Config.cmake
 lib/libre2.so
-lib/libre2.so.0
-lib/libre2.so.0.0.0
 lib/pkgconfig/re2.pc

Index: pkgsrc/devel/re2/distinfo
diff -u pkgsrc/devel/re2/distinfo:1.6 pkgsrc/devel/re2/distinfo:1.7
--- pkgsrc/devel/re2/distinfo:1.6       Wed Feb 26 16:20:43 2020
+++ pkgsrc/devel/re2/distinfo   Thu Aug  6 16:23:21 2020
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2020/02/26 16:20:43 nia Exp $
+$NetBSD: distinfo,v 1.7 2020/08/06 16:23:21 adam Exp $
 
-SHA1 (re2-20200101.tar.gz) = 7a131caa1d906924c0e7ca5e977ec5f0ff67e538
-RMD160 (re2-20200101.tar.gz) = f0b7e70504586852fdbb12c6995240df7cef45d6
-SHA512 (re2-20200101.tar.gz) = ca9c5e3b63b55074ad1d74b73bcf115ae285b3b8989bb56de0bccdfd7b423df742cfd1d1b6eb963da6dc550b81f492eaef9a9c582e354906b8dd1b92fb451ed0
-Size (re2-20200101.tar.gz) = 391298 bytes
+SHA1 (re2-20200801.tar.gz) = ac4796e631461c27cd05629097a6931c1d5b13a4
+RMD160 (re2-20200801.tar.gz) = 466113d0439912c66df4346ab25e34f84f197824
+SHA512 (re2-20200801.tar.gz) = 1ae261155a1eb96606788eb736faa4dc3240d85f47e3b4c412a4f85f7e4cc69f7c7cbab98397aaf725def1cbc9c5da2c679cfb5573a442d60897740766ae2967
+Size (re2-20200801.tar.gz) = 404076 bytes