[144819] trunk/dports/www/webkit2-gtk/Portfile

[jeremyhu at macports.org]

Revision: 144819
          https://trac.macports.org/changeset/144819
Author:   jeremyhu at macports.org
Date:     2016-01-18 23:20:49 -0800 (Mon, 18 Jan 2016)
Log Message:
-----------
webkit2-gtk: Fixup +quartz

Modified Paths:
--------------
    trunk/dports/www/webkit2-gtk/Portfile

Modified: trunk/dports/www/webkit2-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk/Portfile	2016-01-19 06:13:19 UTC (rev 144818)
+++ trunk/dports/www/webkit2-gtk/Portfile	2016-01-19 07:20:49 UTC (rev 144819)
@@ -63,10 +63,8 @@
                     port:libsoup \
                     port:libxml2 \
                     port:libxslt \
-                    port:mesa \
                     port:sqlite3 \
                     port:webp \
-                    port:xorg-libXt \
                     port:zlib
 
 variant llvm37 conflicts llvm38 llvm39 description {Use llvm-3.7} {
@@ -102,8 +100,6 @@
 
 configure.args-append \
     -DPORT=GTK \
-    -DENABLE_X11_TARGET=ON \
-    -DENABLE_QUARTZ_TARGET=OFF \
     -DUSE_SYSTEM_MALLOC=ON \
     -DENABLE_MINIBROWSER=OFF \
     -DENABLE_PLUGIN_PROCESS_GTK2=OFF \
@@ -115,6 +111,12 @@
 # <rdar://problem/24031030>
 configure.optflags  -Os
 
+pre-configure {
+    if {![variant_isset quartz] && ![variant_isset x11]} {
+        error "Either +x11 or +quartz is required"
+    }
+}
+
 post-configure {
     # https://bugs.webkit.org/show_bug.cgi?id=153176
     reinplace {s|\.\./\.\./lib/libWTFGTK\.a||} \
@@ -127,19 +129,24 @@
         ${build.dir}/Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \
         ${build.dir}/Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \
         ${build.dir}/Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \
-        ${build.dir}/Source/WebKit2/CMakeFiles/PluginProcess.dir/link.txt \
         ${build.dir}/Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \
         ${build.dir}/Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt
+    if {[variant_isset x11]} {
+        # ENABLE_PLUGIN_PROCESS is only enabled with +x11
+        reinplace {s|[\./]*\.\./lib/lib[^\.]*\.a||g} \
+            ${build.dir}/Source/WebKit2/CMakeFiles/PluginProcess.dir/link.txt
+
+        if {[variant_isset gtk2]} {
+            reinplace {s|\.\./\.\./lib/libWTFGTK\.a||} \
+                ${build.dir}/Source/WebKit2/CMakeFiles/WebKitPluginProcess2.dir/link.txt
+            reinplace {s|-Wl,-all_load||g} \
+                ${build.dir}/Source/WebKit2/CMakeFiles/WebKitPluginProcess2.dir/link.txt
+        }
+    }
     if {[variant_isset minibrowser]} {
         reinplace {s|[\./]*\.\./lib/lib[^\.]*\.a||g} \
             ${build.dir}/Tools/MiniBrowser/gtk/CMakeFiles/MiniBrowser.dir/link.txt
     }
-    if {[variant_isset gtk2]} {
-        reinplace {s|\.\./\.\./lib/libWTFGTK\.a||} \
-            ${build.dir}/Source/WebKit2/CMakeFiles/WebKitPluginProcess2.dir/link.txt
-        reinplace {s|-Wl,-all_load||g} \
-            ${build.dir}/Source/WebKit2/CMakeFiles/WebKitPluginProcess2.dir/link.txt
-    }
 
     # https://bugs.webkit.org/show_bug.cgi?id=153192
     reinplace {s|\.\./\.\./lib/libWTFGTK\.a|-Wl,-all_load ../../lib/libWTFGTK.a|} \
@@ -164,19 +171,20 @@
 configure.cflags-append     -ftemplate-depth=256
 configure.cxxflags-append   -ftemplate-depth=256
 
-# see bug #24622
-variant quartz {
-    configure.args-delete \
-        -DENABLE_QUARTZ_TARGET=OFF \
-        -DENABLE_X11_TARGET=ON
-
+variant quartz conflicts x11 gtk2 {
     configure.args-append \
         -DENABLE_QUARTZ_TARGET=ON \
         -DENABLE_X11_TARGET=OFF \
         -DENABLE_OPENGL=OFF
+}
 
-    # TODO: See if this will build with OpenGL.framework
-    depends_lib-delete \
+variant x11 conflicts quartz {
+    configure.args-append \
+        -DENABLE_QUARTZ_TARGET=OFF \
+        -DENABLE_X11_TARGET=ON \
+        -DENABLE_OPENGL=ON
+
+    depends_lib-append \
         port:mesa \
         port:xorg-libXt
 }
@@ -186,13 +194,15 @@
     configure.args-append   -DENABLE_MINIBROWSER=ON
 }
 
-variant gtk2 description {Enable support for GTK+2 plugins} {
+variant gtk2 conflicts quartz description {Enable support for GTK+2 plugins} {
     depends_lib-append      port:gtk2
     configure.args-delete   -DENABLE_PLUGIN_PROCESS_GTK2=OFF
     configure.args-append   -DENABLE_PLUGIN_PROCESS_GTK2=ON
 }
 
-default_variants    +gtk2
+if {![variant_isset quartz]} {
+    default_variants-append +x11 +gtk2
+}
 
 post-destroot {
     # https://bugs.webkit.org/show_bug.cgi?id=152651
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160118/58ea519d/attachment.html>