<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/829a90023a715367538927144a3d0aced823bc8b">https://github.com/macports/macports-ports/commit/829a90023a715367538927144a3d0aced823bc8b</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 829a900 blt and tcllib conflict
</span>829a900 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 829a90023a715367538927144a3d0aced823bc8b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Dec 22 00:43:02 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> blt and tcllib conflict
</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/45110
</span>---
devel/tcllib/Portfile | 2 ++
x11/blt/Portfile | 2 ++
2 files changed, 4 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tcllib/Portfile b/devel/tcllib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a96dc7..7230fdf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tcllib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tcllib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,3 +28,5 @@ configure.args --mandir=${prefix}/share/man
</span> depends_lib port:tcl \
path:bin/dot:graphviz \
port:tk
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts blt
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/Portfile b/x11/blt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6738229..65a3f46 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,3 +78,5 @@ post-destroot {
</span> # blt's bitmap.n and tk's bitmap.n don't appear to be related at all so I'm keeping and renaming blt's.
move ${destroot}${prefix}/share/man/mann/bitmap.n ${destroot}${prefix}/share/man/mann/blt-bitmap.n
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts tcllib
</span></pre><pre style='margin:0'>
</pre>