<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/346a60ff1acc996b7830b877763a114bf09ef934">https://github.com/macports/macports-ports/commit/346a60ff1acc996b7830b877763a114bf09ef934</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 346a60f clustalx: Fix build failures
</span>346a60f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 346a60ff1acc996b7830b877763a114bf09ef934
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Oct 23 02:59:25 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> clustalx: Fix build failures
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix build failures due to lack of <string> include and lack of path to
</span><span style='display:block; white-space:pre;color:#404040;'> Qt frameworks.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/43306
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Include qmake portgroup to simplify the portfile and to use the right
</span><span style='display:block; white-space:pre;color:#404040;'> -arch flags, which also enables the universal variant. This also fixes
</span><span style='display:block; white-space:pre;color:#404040;'> qt4-mac to be a library dependency, which requires increasing the
</span><span style='display:block; white-space:pre;color:#404040;'> revision.
</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/39424
</span>---
science/clustalx/Portfile | 14 ++++++++------
science/clustalx/files/string.patch | 11 +++++++++++
2 files changed, 19 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/clustalx/Portfile b/science/clustalx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1136049..cca4d5b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/clustalx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/clustalx/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 qmake 1.0
</span>
name clustalx
version 2.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories science
maintainers {snc @nerdling} openmaintainer
license LGPL-3 GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,17 +22,19 @@ long_description ${name} provides an integrated environment for performing\
</span> homepage http://www.clustal.org/clustal2/
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:qt4-mac
</span>
master_sites http://www.clustal.org/download/current/ \
ftp://ftp.ebi.ac.uk/pub/software/clustalw2/${version}/
dist_subdir ${name}/${version}_1
checksums rmd160 a50b74d2b698a6ab618c5ce8bcb0139976814ffd \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e10adb728c320598a165ca529f1aa3d2560061de0236e0a0926eaca9554afa05
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e10adb728c320598a165ca529f1aa3d2560061de0236e0a0926eaca9554afa05 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 341649
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ${prefix}/libexec/qt4/bin/qmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles string.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -F${qt_frameworks_dir}
</span>
destroot {
xinstall -d ${destroot}${applications_dir}/${name}.app/Contents/MacOS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,8 +48,6 @@ destroot {
</span> ${destroot}${applications_dir}/${name}.app/Contents/MacOS/
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url ${homepage}
livecheck.regex "currently (\\d+(\\.\\d+)+)"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/clustalx/files/string.patch b/science/clustalx/files/string.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7f534b0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/clustalx/files/string.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit instantiation of undefined template 'std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- clustalW/general/VectorOutOfRange.h.orig 2010-11-17 04:12:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ clustalW/general/VectorOutOfRange.h 2018-10-23 02:30:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,6 +5,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdexcept>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <exception>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace clustalw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>