Ticket #38844: Portfile-tk.diff

Portfile

@@ -4 +4 @@
 
 name            tk
 version         8.6.0
-revision        1
+revision        2
 categories      x11
 license         Tcl/Tk
 maintainers     mww openmaintainer
@@ -66 +66 @@
 if {${os.platform} == "darwin" && ${os.subplatform} == "macosx" && ${os.major} >= 10} {
     variant quartz conflicts x11 {
         depends_lib-delete port:Xft2 port:xorg-libXScrnSaver port:fontconfig
-        # 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
+
+        # tk.h still includes and uses types from X11/Xlib.h
+        # Revert to "depends_lib-append port:xorg-libX11" if all else fails.
+        patchfiles-append    patch-no-x11h.diff
+        post-patch {
+            file copy ${workpath}/tk${version}/xlib/X11/Xlib.h ${workpath}/tk${version}/generic/tkX11Xlib.h
+        }
         post-destroot {
             delete ${destroot}${prefix}/include/X11
         }