<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/d907eeeef7cfb9f19c2c3b153cabe1fb6c96214b">https://github.com/macports/macports-ports/commit/d907eeeef7cfb9f19c2c3b153cabe1fb6c96214b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d907eeeef7cfb9f19c2c3b153cabe1fb6c96214b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Sep 18 06:20:56 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> tk: do not rely on X11 headers for quartz variant
</span>---
x11/tk/Portfile | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tk/Portfile b/x11/tk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 815e3e6..86f814f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup muniversal 1.0
</span>
name tk
version 8.6.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories x11
license Tcl/Tk
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,15 +77,20 @@ if {${os.platform} eq "darwin" && ${os.subplatform} eq "macosx" && ${os.major} >
</span> port:fontconfig \
port:Xft2 \
port:xorg-libXScrnSaver
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # tk.h still includes and uses types from X11/Xlib.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libX11
</span> configure.ldflags-delete \
-lfontconfig
configure.args-append \
--enable-aqua
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/include/X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/include/X11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/include/X11_tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse fl ${destroot}${prefix}/include {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file extension ${fl}] eq ".h"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|include <X11/|include <X11_tk/|g" ${fl}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|include \"X11/|include \"X11_tk/|g" ${fl}
</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>