<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6234fdee8be21da75e7b8cb0c24fc09a4c81623d">https://github.com/macports/macports-ports/commit/6234fdee8be21da75e7b8cb0c24fc09a4c81623d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6234fdee8be21da75e7b8cb0c24fc09a4c81623d
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Fri Jan 4 22:43:23 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> monotone: fix build with pcre 8.42
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://bugzilla.redhat.com/show_bug.cgi?id=1555231 for details.
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/57852.
</span>---
devel/monotone/Portfile | 8 +--
...onotone-1.1-Adapt-to-changes-in-pcre-8.42.patch | 66 ++++++++++++++++++++++
2 files changed, 70 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/monotone/Portfile b/devel/monotone/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df1a2e9..3021eef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/monotone/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/monotone/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name monotone
version 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories devel
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,12 +33,12 @@ depends_lib port:zlib \
</span> port:sqlite3 \
port:botan
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # botan is not universal
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-libiconv-prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --infodir=${prefix}/share/info \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- botan_CFLAGS="-I${prefix}/include/botan-1.10" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args botan_CFLAGS="-I${prefix}/include/botan-1.10" \
</span> botan_LIBS="-lbotan-1.10"
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/monotone/files/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch b/devel/monotone/files/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d53f0dd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/monotone/files/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,66 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 70f209ad582121750d54e3692b1e62c7f36af6f9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 7 May 2018 14:09:06 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Adapt to changes in pcre-8.42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pcre-8.42 replaced internal real_pcre with real_pcre8_or_16. This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+broke monotone that decided not to use the public "pcre" type.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This patch adapts monotone to the pcre >= 8.42.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Petr Písař <ppisar@redhat.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/pcrewrap.cc | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/pcrewrap.hh | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 4 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/pcrewrap.cc b/src/pcrewrap.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8c0c9d1..30bafff 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/pcrewrap.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/pcrewrap.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +74,7 @@ get_capturecount(void const * bd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace pcre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef map<char const *,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pair<struct real_pcre const *, struct pcre_extra const *> >
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pair<struct real_pcre8_or_16 const *, struct pcre_extra const *> >
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ regex_cache;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class regex_cache_manager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,7 +86,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void store(char const * pattern,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pair<struct real_pcre const *, struct pcre_extra const *>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pair<struct real_pcre8_or_16 const *, struct pcre_extra const *>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cache[pattern] = data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/pcrewrap.hh b/src/pcrewrap.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3359cdd..5008e88 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/pcrewrap.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/pcrewrap.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // definitions and so we don't actually expose it here. Unfortunately, this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // means we have to hope this pair of forward declarations will not change...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct real_pcre;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++struct real_pcre8_or_16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct pcre_extra;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace pcre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,7 @@ namespace pcre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ regex & operator=(regex const &);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct real_pcre const * basedat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct real_pcre8_or_16 const * basedat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct pcre_extra const * extradat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // used by constructors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.14.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>