tk: do not rely on X11 headers for quartz variant

macports · Sep 18, 2018 · d907eee · d907eee
1 parent 9391a0e
commit d907eee
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/x11/tk/Portfile b/x11/tk/Portfile
@@ -5,7 +5,7 @@ PortGroup           muniversal 1.0
 
 name                tk
 version             8.6.8
-revision            2
+revision            3
 categories          x11
 license             Tcl/Tk
 maintainers         {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
@@ -77,15 +77,20 @@ if {${os.platform} eq "darwin" && ${os.subplatform} eq "macosx" && ${os.major} >
                     port:fontconfig \
                     port:Xft2 \
                     port:xorg-libXScrnSaver
-        # tk.h still includes and uses types from X11/Xlib.h
-        depends_lib-append \
-                    port:xorg-libX11
         configure.ldflags-delete \
                     -lfontconfig
         configure.args-append \
                     --enable-aqua
         post-destroot {
-            delete ${destroot}${prefix}/include/X11
+            move \
+                ${destroot}${prefix}/include/X11 \
+                ${destroot}${prefix}/include/X11_tk
+            fs-traverse fl ${destroot}${prefix}/include {
+                if {[file extension ${fl}] eq ".h"} {
+                    reinplace -q "s|include <X11/|include <X11_tk/|g" ${fl}
+                    reinplace -q "s|include \"X11/|include \"X11_tk/|g" ${fl}
+                }
+            }
         }
     }