From 868561119b9e914286ddf18e485f49a58811c71a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 18 Sep 2014 21:15:30 +0200
Subject: [PATCH] re2: update to 20140304.

---
 srcpkgs/re2/patches/re2-cross-compile.patch | 31 ---------------------
 srcpkgs/re2/patches/re2-symbols-r0.patch    | 10 -------
 srcpkgs/re2/template                        | 10 +++----
 3 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/re2/patches/re2-cross-compile.patch
 delete mode 100644 srcpkgs/re2/patches/re2-symbols-r0.patch

diff --git a/srcpkgs/re2/patches/re2-cross-compile.patch b/srcpkgs/re2/patches/re2-cross-compile.patch
deleted file mode 100644
index c3ebe6aeb8c..00000000000
--- a/srcpkgs/re2/patches/re2-cross-compile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.orig	2012-10-21 17:15:03.000000000 +0400
-+++ Makefile	2013-04-23 19:42:13.789582841 +0400
-@@ -9,13 +9,13 @@
- # CCPCRE=-I/usr/local/include -DUSEPCRE
- # LDPCRE=-L/usr/local/lib -lpcre
- 
--CXX=g++
--CXXFLAGS=-Wall -O3 -g -pthread  # can override
--RE2_CXXFLAGS=-Wno-sign-compare -c -I. $(CCPCRE)  # required
--LDFLAGS=-pthread
--AR=ar
-+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
-+NM?=nm
- NMFLAGS=-p
- 
- # Variables mandated by GNU, the arbiter of all good taste on the internet.
-@@ -25,7 +25,7 @@
- bindir=$(exec_prefix)/bin
- includedir=$(prefix)/include
- libdir=$(exec_prefix)/lib
--INSTALL=install
-+INSTALL?=install
- INSTALL_PROGRAM=$(INSTALL)
- INSTALL_DATA=$(INSTALL) -m 644
- 
diff --git a/srcpkgs/re2/patches/re2-symbols-r0.patch b/srcpkgs/re2/patches/re2-symbols-r0.patch
deleted file mode 100644
index 1fb9f2e35c4..00000000000
--- a/srcpkgs/re2/patches/re2-symbols-r0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libre2.symbols.orig	2012-11-07 04:45:57.000000000 +0100
-+++ libre2.symbols	2012-11-07 04:46:20.000000000 +0100
-@@ -10,6 +10,7 @@
- 		_ZlsRSoRKN3re211StringPieceE;
- 		# re2::FilteredRE2*
- 		_ZN3re211FilteredRE2*;
-+		_ZNK3re211FilteredRE2*;
- 	local:
- 		*;
- };
diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template
index 65cb62521a3..d1ed5eda691 100644
--- a/srcpkgs/re2/template
+++ b/srcpkgs/re2/template
@@ -1,23 +1,23 @@
 # Template build file for 're2'.
 pkgname=re2
-version=20130115
-revision=2
+version=20140304
+revision=1
 wrksrc=re2
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 short_desc="An efficient, principled regular expression library"
 maintainer="ojab <ojab@ojab.ru>"
-license="LGPL2.1"
+license="LGPL-2.1"
 homepage="https://code.google.com/p/re2/"
-checksum=a95d83ed8203817587f7cc368b6f7199d8a4b1558372c306b07201058b92e1fe
 distfiles="https://${pkgname}.googlecode.com/files/${pkgname}-${version}.tgz"
+checksum=0bffd1a57de2f4b218ca0f77d8850bfd59c82944a98256c6edba25260e0196a7
 
 re2-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
+		vmove usr/lib/*.a
 		vmove usr/lib/*.so
 	}
 }