<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/3760f1c5a8395f7b5a748ba27e9c2994c8f1db8f">https://github.com/macports/macports-ports/commit/3760f1c5a8395f7b5a748ba27e9c2994c8f1db8f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3760f1c5a8395f7b5a748ba27e9c2994c8f1db8f
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun May 5 17:29:23 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> blt: rename man files to avoid conflicts
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Avoid conflicts with tk and tcllib.
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/45110
</span>---
devel/tcllib/Portfile | 2 --
x11/blt/Portfile | 13 +++++--------
2 files changed, 5 insertions(+), 10 deletions(-)
<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 6287f9c..d135652 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,5 +28,3 @@ 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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 22d6f1f..acf5d29 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;'>@@ -4,7 +4,7 @@ PortGroup active_variants 1.1
</span>
name blt
version 2.4z
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> categories x11
license MIT
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,11 +80,8 @@ post-destroot {
</span> system -W ${destroot}${prefix}/lib "ln -sf libBLTlite.2.4.dylib libBLTlite.2.dylib"
system -W ${destroot}${prefix}/lib "ln -sf libBLTlite.2.4.dylib libBLTlite.dylib"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # These manpages conflict with those installed by tk.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # blt's busy.n and tk's busy.n appear to describe the same function so I don't mind deleting blt's.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/share/man/mann/busy.n
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/share/man/mann/bitmap.n ${destroot}${prefix}/share/man/mann/blt-bitmap.n
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # prevent conflict with Tk and tcllib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach fl [glob -tails -directory ${destroot}${prefix}/share/man/mann *.n] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/share/man/mann/${fl} ${destroot}${prefix}/share/man/mann/blt-${fl}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts tcllib
</span></pre><pre style='margin:0'>
</pre>