wip/re2-git: make the package build again

[Roland Illig <rillig%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Roland Illig <rillig%NetBSD.org@localhost>
Pushed By:	rillig
Date:		Sun Feb 25 13:32:41 2018 +0000
Changeset:	ae05ac54cbae62dbfce4e5ae15720a73ae4f66a7

Modified Files:
	re2-git/PLIST
	re2-git/distinfo
	re2-git/patches/patch-Makefile

Log Message:
wip/re2-git: make the package build again

Since 2012, the Makefile has changed and the set of installed files
also.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ae05ac54cbae62dbfce4e5ae15720a73ae4f66a7

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

diffstat:
 re2-git/PLIST                  |  2 +-
 re2-git/distinfo               |  2 +-
 re2-git/patches/patch-Makefile | 31 +++++--------------------------
 3 files changed, 7 insertions(+), 28 deletions(-)

diffs:
diff --git a/re2-git/PLIST b/re2-git/PLIST
index 0833d247e7..ef711c1aa3 100644
--- a/re2-git/PLIST
+++ b/re2-git/PLIST
@@ -3,8 +3,8 @@ include/re2/filtered_re2.h
 include/re2/re2.h
 include/re2/set.h
 include/re2/stringpiece.h
-include/re2/variadic_function.h
 lib/libre2.a
 lib/libre2.so
 lib/libre2.so.0
 lib/libre2.so.0.0.0
+lib/pkgconfig/re2.pc
diff --git a/re2-git/distinfo b/re2-git/distinfo
index e11b631702..f250eeb3ba 100644
--- a/re2-git/distinfo
+++ b/re2-git/distinfo
@@ -1,3 +1,3 @@
 $NetBSD: distinfo,v 1.2 2012/01/23 11:57:34 thomasklausner Exp $
 
-SHA1 (patch-Makefile) = ebbc97b2f6bb3209c9e9c8e847da2a2835c78a88
+SHA1 (patch-Makefile) = 315b5af11f68f92b8f426a858d6d1ca24f4763c7
diff --git a/re2-git/patches/patch-Makefile b/re2-git/patches/patch-Makefile
index ce53fc4374..d717143145 100644
--- a/re2-git/patches/patch-Makefile
+++ b/re2-git/patches/patch-Makefile
@@ -1,43 +1,22 @@
-$NetBSD: patch-Makefile,v 1.2 2012/01/23 11:57:34 thomasklausner Exp $
+$NetBSD$
 
 Change some settings so they can be overridden by pkgsrc.
 
---- Makefile.orig	2012-01-23 11:51:01.000000000 +0000
+--- Makefile.orig
 +++ Makefile
-@@ -9,25 +9,25 @@ all: obj/libre2.a obj/so/libre2.so
- # CCPCRE=-I/usr/local/include -DUSEPCRE
- # LDPCRE=-L/usr/local/lib -lpcre
- 
--CXX=g++
--CXXFLAGS=-Wall -O3 -g -pthread  # can override
-+CXX?=g++
-+CXXFLAGS?=-Wall -O3 -g -pthread  # can override
- RE2_CXXFLAGS=-Wno-sign-compare -c -I. $(CCPCRE)  # required
--LDFLAGS=-pthread
--AR=ar
--ARFLAGS=rsc
--NM=nm
--NMFLAGS=-p
-+LDFLAGS?=-pthread
-+AR?=ar
-+ARFLAGS?=rsc
-+NM?=nm
-+NMFLAGS?=-p
+@@ -26,12 +26,12 @@
  
  # Variables mandated by GNU, the arbiter of all good taste on the internet.
  # http://www.gnu.org/prep/standards/standards.html
 -prefix=/usr/local
 +prefix=$(PREFIX)
  exec_prefix=$(prefix)
- bindir=$(exec_prefix)/bin
  includedir=$(prefix)/include
  libdir=$(exec_prefix)/lib
 -INSTALL=install
--INSTALL_PROGRAM=$(INSTALL)
 -INSTALL_DATA=$(INSTALL) -m 644
 +INSTALL?=install
-+INSTALL_PROGRAM?=$(INSTALL)
 +INSTALL_DATA?=$(INSTALL) -m 644
  
- # ABI version
- # http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html
+ # Work around the weirdness of sed(1) on Darwin. :/
+ ifeq ($(shell uname),Darwin)