CVS commit: pkgsrc/devel/re2

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Fri Mar 31 17:19:24 UTC 2017

Modified Files:
        pkgsrc/devel/re2: Makefile distinfo
Added Files:
        pkgsrc/devel/re2/patches: patch-Makefile

Log Message:
Update devel/re2 to 2017-03-01. No changelog released.
Improve portability by avoiding in-place sed.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/re2/Makefile pkgsrc/devel/re2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/re2/patches/patch-Makefile

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.3 pkgsrc/devel/re2/Makefile:1.4
--- pkgsrc/devel/re2/Makefile:1.3       Mon Jan  2 08:05:50 2017
+++ pkgsrc/devel/re2/Makefile   Fri Mar 31 17:19:23 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2017/01/02 08:05:50 mef Exp $
+# $NetBSD: Makefile,v 1.4 2017/03/31 17:19:23 fhajny Exp $
 
-DISTNAME=      re2-20170101
+DISTNAME=      re2-20170301
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=google/}
 GITHUB_TAG=    2017-01-01
Index: pkgsrc/devel/re2/distinfo
diff -u pkgsrc/devel/re2/distinfo:1.3 pkgsrc/devel/re2/distinfo:1.4
--- pkgsrc/devel/re2/distinfo:1.3       Mon Jan  2 08:05:50 2017
+++ pkgsrc/devel/re2/distinfo   Fri Mar 31 17:19:23 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2017/01/02 08:05:50 mef Exp $
+$NetBSD: distinfo,v 1.4 2017/03/31 17:19:23 fhajny Exp $
 
-SHA1 (re2-20170101.tar.gz) = b2b8c60bfd2d413081771c5ee0efec6ff063f381
-RMD160 (re2-20170101.tar.gz) = 3a9903ca2b10e5b2020808954d026240d2f0f2cc
-SHA512 (re2-20170101.tar.gz) = 52ec99fe1bfb2754e11e3767a561208f14c3e5c03142c37b43df7cf5a406896396854a3776ae536ddf293a770d8ca80f9c761c2c476394693a5954c15550a731
-Size (re2-20170101.tar.gz) = 379866 bytes
+SHA1 (re2-20170301.tar.gz) = b2b8c60bfd2d413081771c5ee0efec6ff063f381
+RMD160 (re2-20170301.tar.gz) = 3a9903ca2b10e5b2020808954d026240d2f0f2cc
+SHA512 (re2-20170301.tar.gz) = 52ec99fe1bfb2754e11e3767a561208f14c3e5c03142c37b43df7cf5a406896396854a3776ae536ddf293a770d8ca80f9c761c2c476394693a5954c15550a731
+Size (re2-20170301.tar.gz) = 379866 bytes
+SHA1 (patch-Makefile) = 874a72ed6365e4724eb28c9f677d8441cec3d831

Added files:

Index: pkgsrc/devel/re2/patches/patch-Makefile
diff -u /dev/null pkgsrc/devel/re2/patches/patch-Makefile:1.1
--- /dev/null   Fri Mar 31 17:19:24 2017
+++ pkgsrc/devel/re2/patches/patch-Makefile     Fri Mar 31 17:19:23 2017
@@ -0,0 +1,24 @@
+$NetBSD: patch-Makefile,v 1.1 2017/03/31 17:19:23 fhajny Exp $
+
+Avoid in-place sed for better portability.
+
+--- Makefile.orig      2017-03-31 17:05:44.915188459 +0000
++++ Makefile
+@@ -290,11 +290,12 @@ install: obj/libre2.a obj/so/libre2.$(SO
+       $(INSTALL) obj/so/libre2.$(SOEXT) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER00)
+       ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER)
+       ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXT)
+-      $(INSTALL_DATA) re2.pc $(DESTDIR)$(libdir)/pkgconfig/re2.pc
+-      $(SED_INPLACE) -e "s#@prefix@#${prefix}#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc
+-      $(SED_INPLACE) -e "s#@exec_prefix@#${exec_prefix}#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc
+-      $(SED_INPLACE) -e "s#@includedir@#${includedir}#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc
+-      $(SED_INPLACE) -e "s#@libdir@#${libdir}#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc
++      sed \
++              -e "s#@prefix@#${prefix}#" \
++              -e "s#@exec_prefix@#${exec_prefix}#" \
++              -e "s#@includedir@#${includedir}#" \
++              -e "s#@libdir@#${libdir}#" \
++              re2.pc > $(DESTDIR)$(libdir)/pkgconfig/re2.pc
+ 
+ testinstall: static-testinstall shared-testinstall
+       @echo