<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/a11b15ca0f34af6272ed560aba505e08da45e360">https://github.com/macports/macports-ports/commit/a11b15ca0f34af6272ed560aba505e08da45e360</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 a11b15c  tk: Fix conflict with xorg-xproto
</span>a11b15c is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a11b15ca0f34af6272ed560aba505e08da45e360
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri May 25 14:10:50 2018 -0500

<span style='display:block; white-space:pre;color:#404040;'>    tk: Fix conflict with xorg-xproto
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Reverts unintentional change in e3710d6800e803ebaa9528d3bdb38fb2fcade513
</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/56531
</span>---
 x11/tk/Portfile | 11 ++++++-----
 1 file changed, 6 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 1bfc2de..bb6d03c 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;'>@@ -4,6 +4,7 @@ PortSystem          1.0
</span> 
 name                tk
 version             8.6.8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          x11
 license             Tcl/Tk
 maintainers         nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,15 +70,15 @@ if {${os.platform} eq "darwin" && ${os.subplatform} eq "macosx" && ${os.major} >
</span>                     port:Xft2 \
                     port:xorg-libXScrnSaver
         # tk.h still includes and uses types from X11/Xlib.h
<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><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:xorg-libX11
</span>         configure.ldflags-delete \
                     -lfontconfig
         configure.args-append \
                     --enable-aqua
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#        post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#            delete ${destroot}${prefix}/include/X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            delete ${destroot}${prefix}/include/X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
 
     variant x11 conflicts quartz {}
</pre><pre style='margin:0'>

</pre>