<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1d58825f2d01a26d8d9b9d8cb747f8e2f06e8c5b">https://github.com/macports/macports-ports/commit/1d58825f2d01a26d8d9b9d8cb747f8e2f06e8c5b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1d58825 re2: Update to 2018-04-01
</span>1d58825 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1d58825f2d01a26d8d9b9d8cb747f8e2f06e8c5b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu May 31 00:14:39 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> re2: Update to 2018-04-01
</span>---
devel/re2/Portfile | 46 +++++---------
devel/re2/files/patch-Makefile.diff | 117 ------------------------------------
2 files changed, 15 insertions(+), 148 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/re2/Portfile b/devel/re2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bca2778..7d0873a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/re2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/re2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name re2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20140304
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup google re2 2018-04-01
</span> categories devel textproc
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,47 +15,29 @@ long_description RE2 is a fast, safe, thread-friendly alternative to \
</span> backtracking regular expression engines like those \
used in PCRE, Perl, and Python. It is a C++ library.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://code.google.com/p/re2/
</span> platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites googlecode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 33f49bba5e7f25076f2531af8ce3cc4a0e3916b8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0bffd1a57de2f4b218ca0f77d8850bfd59c82944a98256c6edba25260e0196a7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20131024
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 a96947ba23872a197ce279e33eeb45e955ac0bf6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4cbf7a98e79ba0c3f83b865049bcf3c6d60593b1a7accb60e8e10745a97cd62b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20130622
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 4327e5f8c84c92b04de59a05fa4f4adb0fc7f8cb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 eee28bac36d47df9b0b62cf0959cb919fc23389431e26d5ee44b42c35e36fb0d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .tgz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dc68005f8545c4769645e4e2ccc37a70ddbac3bb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 494b09c9e626abd9e9cf92ccbb2dae4650901945a8d2703fb68305eaaba3a798 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 389763
</span>
use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.cxx}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.args CXX="${configure.cxx}" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${configure.ldflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args {*}${build.args}
</span>
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libpath ${prefix}/lib/libre2.0.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id ${libpath} ${destroot}${libpath}"
</span> # install additional documents.
set docdir ${prefix}/share/doc/re2
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/re2/files/patch-Makefile.diff b/devel/re2/files/patch-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6c912fc..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/re2/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,117 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2011-11-06 02:30:49.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2011-11-06 02:35:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use of this source code is governed by a BSD-style
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # license that can be found in the LICENSE file.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--all: obj/libre2.a obj/so/libre2.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+all: obj/libre2.a obj/dylib/libre2.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to build against PCRE for testing or benchmarking,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # uncomment the next two lines
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ABI version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SONAME=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DYLIBNAME=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # To rebuild the Tables generated by Perl and Python scripts (requires Internet
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # access for Unicode data), uncomment the following line:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,10 +146,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- obj/test/exhaustive_test\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- obj/test/random_test\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SOFILES=$(patsubst obj/%,obj/so/%,$(OFILES))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--STESTOFILES=$(patsubst obj/%,obj/so/%,$(TESTOFILES))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--STESTS=$(patsubst obj/%,obj/so/%,$(TESTS))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SBIGTESTS=$(patsubst obj/%,obj/so/%,$(BIGTESTS))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DYLIBFILES=$(patsubst obj/%,obj/dylib/%,$(OFILES))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+STESTOFILES=$(patsubst obj/%,obj/dylib/%,$(TESTOFILES))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+STESTS=$(patsubst obj/%,obj/dylib/%,$(TESTS))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SBIGTESTS=$(patsubst obj/%,obj/dylib/%,$(BIGTESTS))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DOFILES=$(patsubst obj/%,obj/dbg/%,$(OFILES))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DTESTOFILES=$(patsubst obj/%,obj/dbg/%,$(TESTOFILES))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -164,7 +164,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @mkdir -p $$(dirname $@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) -o $@ -fPIC $(CPPFLAGS) $(CXXFLAGS) $(RE2_CXXFLAGS) $*.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--obj/so/%.o: %.cc $(HFILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+obj/dylib/%.o: %.cc $(HFILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @mkdir -p $$(dirname $@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) -o $@ -fPIC $(CPPFLAGS) $(CXXFLAGS) $(RE2_CXXFLAGS) -DNDEBUG $*.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,10 +176,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @mkdir -p obj/dbg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AR) $(ARFLAGS) obj/dbg/libre2.a $(DOFILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--obj/so/libre2.so: $(SOFILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @mkdir -p obj/so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(MAKE_SHARED_LIBRARY) -o $@.$(SONAME) $(SOFILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ln -sf libre2.so.$(SONAME) $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+obj/dylib/libre2.dylib: $(DYLIBFILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @mkdir -p obj/dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(MAKE_SHARED_LIBRARY) -o $@.$(DYLIBNAME) $(DYLIBFILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -sf libre2.dylib.$(DYLIBNAME) $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- obj/test/%: obj/libre2.a obj/re2/testing/%.o $(TESTOFILES) obj/util/test.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @mkdir -p obj/test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -189,9 +189,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @mkdir -p obj/dbg/test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) -o $@ obj/dbg/re2/testing/$*.o $(DTESTOFILES) obj/dbg/util/test.o obj/dbg/libre2.a $(LDFLAGS) $(LDPCRE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--obj/so/test/%: obj/so/libre2.so obj/libre2.a obj/so/re2/testing/%.o $(STESTOFILES) obj/so/util/test.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @mkdir -p obj/so/test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CXX) -o $@ obj/so/re2/testing/$*.o $(STESTOFILES) obj/so/util/test.o -Lobj/so -lre2 obj/libre2.a $(LDFLAGS) $(LDPCRE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+obj/dylib/test/%: obj/dylib/libre2.dylib obj/libre2.a obj/dylib/re2/testing/%.o $(STESTOFILES) obj/dylib/util/test.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @mkdir -p obj/dylib/test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CXX) -o $@ obj/dylib/re2/testing/$*.o $(STESTOFILES) obj/dylib/util/test.o -Lobj/dylib -lre2 obj/libre2.a $(LDFLAGS) $(LDPCRE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- obj/test/regexp_benchmark: obj/libre2.a obj/re2/testing/regexp_benchmark.o $(TESTOFILES) obj/util/benchmark.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @mkdir -p obj/test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -232,7 +232,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo Running dynamic binary tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @LD_LIBRARY_PATH=obj/so:$(LD_LIBRARY_PATH) ./runtests $(STESTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @LD_LIBRARY_PATH=obj/dylib:$(LD_LIBRARY_PATH) ./runtests $(STESTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debug-bigtest: $(DTESTS) $(DBIGTESTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @./runtests $(DTESTS) $(DBIGTESTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -241,17 +241,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @./runtests $(TESTS) $(BIGTESTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shared-bigtest: $(STESTS) $(SBIGTESTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @LD_LIBRARY_PATH=obj/so:$(LD_LIBRARY_PATH) ./runtests $(STESTS) $(SBIGTESTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @LD_LIBRARY_PATH=obj/dylib:$(LD_LIBRARY_PATH) ./runtests $(STESTS) $(SBIGTESTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- benchmark: obj/test/regexp_benchmark
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--install: obj/libre2.a obj/so/libre2.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install: obj/libre2.a obj/dylib/libre2.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $(DESTDIR)$(includedir)/re2 $(DESTDIR)$(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL_DATA) $(INSTALL_HFILES) $(DESTDIR)$(includedir)/re2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) obj/libre2.a $(DESTDIR)$(libdir)/libre2.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL) obj/so/libre2.so $(DESTDIR)$(libdir)/libre2.so.$(SONAME).0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ln -sf libre2.so.$(SONAME).0.0 $(DESTDIR)$(libdir)/libre2.so.$(SONAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ln -sf libre2.so.$(SONAME).0.0 $(DESTDIR)$(libdir)/libre2.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL) obj/dylib/libre2.dylib $(DESTDIR)$(libdir)/libre2.$(DYLIBNAME).0.0.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -sf libre2.$(DYLIBNAME).0.0.dylib $(DESTDIR)$(libdir)/libre2.$(DYLIBNAME).dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -sf libre2.$(DYLIBNAME).0.0.dylib $(DESTDIR)$(libdir)/libre2.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testinstall:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @mkdir -p obj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -268,9 +268,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Keep gmake from deleting intermediate files it creates.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This makes repeated builds faster and preserves debug info on OS X.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--.PRECIOUS: obj/%.o obj/dbg/%.o obj/so/%.o obj/libre2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- obj/dbg/libre2.a obj/so/libre2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- obj/test/% obj/so/test/% obj/dbg/test/%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.PRECIOUS: obj/%.o obj/dbg/%.o obj/dylib/%.o obj/libre2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ obj/dbg/libre2.a obj/dylib/libre2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ obj/test/% obj/dylib/test/% obj/dbg/test/%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- log:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- make clean
</span></pre><pre style='margin:0'>
</pre>