<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cd3df09ec2166ffc843a3b6fc924404d23aa66ed">https://github.com/macports/macports-ports/commit/cd3df09ec2166ffc843a3b6fc924404d23aa66ed</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cd3df09ec2166ffc843a3b6fc924404d23aa66ed
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Dec 27 12:58:36 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> botan: workaround for Clang's lack of TR1 support
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/40968
</span>---
security/botan/Portfile | 17 ++++++++++++++++-
security/botan/files/patch-tr1.diff | 11 +++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/botan/Portfile b/security/botan/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c1965fe..40d97cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/botan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/botan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup muniversal 1.0
</span>
name botan
version 1.10.17
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories security devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +43,21 @@ post-patch {
</span> }
configure.args-append --cc-bin=${configure.cxx}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# the SSL interface requires TR1 (see doc/log.txt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-tr1-implementation=system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TR1 is not supported on recent versions of clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/40968
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.compiler}] && ${configure.cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-tr1.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach fl {tls_record.h rec_wri.cpp tls_client.h tls_client.cpp tls_server.h tls_server.cpp} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|std::tr1::|std::|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/ssl/${fl}
</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;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cmd ${prefix}/bin/python2.7 ./configure.py
configure.args-append --docdir=share/doc --with-openssl --with-zlib --with-bzip2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/botan/files/patch-tr1.diff b/security/botan/files/patch-tr1.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ab053e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/botan/files/patch-tr1.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ssl/tls_record.h.orig 2017-10-01 23:00:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ssl/tls_record.h 2017-12-27 09:35:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(BOTAN_BUILD_COMPILER_IS_MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <functional>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #include <tr1/functional>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <functional>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(BOTAN_USE_BOOST_TR1)
</span></pre><pre style='margin:0'>
</pre>