[108797] trunk/dports/www/webkit-gtk/Portfile

[devans at macports.org]

Revision: 108797
          https://trac.macports.org/changeset/108797
Author:   devans at macports.org
Date:     2013-08-01 18:56:17 -0700 (Thu, 01 Aug 2013)
Log Message:
-----------
webkit-gtk: add new subport webkit-gtk3, disable introspection due to build failure (#39598), add explicit dependencies on bison, flex, still broken due to bison 3.0 upgrade (#39923, #39910).

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

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2013-08-02 01:47:49 UTC (rev 108796)
+++ trunk/dports/www/webkit-gtk/Portfile	2013-08-02 01:56:17 UTC (rev 108797)
@@ -1,7 +1,6 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-
 PortSystem  1.0
 PortGroup   conflicts_build 1.0
 PortGroup   muniversal 1.0
@@ -28,10 +27,10 @@
 
 depends_lib \
         path:lib/pkgconfig/glib-2.0.pc:glib2 \
+        port:bison \
+        port:flex \
         port:enchant \
         port:geoclue \
-        port:gobject-introspection \
-        port:gtk2 \
         port:harfbuzz-icu \
         port:libxslt \
         port:libpng \
@@ -70,14 +69,49 @@
 configure.python    /usr/bin/python
 
 configure.args  \
-        --with-gtk=2.0 \
         --disable-webkit2 \
-        --enable-introspection \
         --disable-video \
         --enable-svg \
         --enable-geolocation \
         --enable-webgl
 
+subport webkit-gtk3 {
+    depends_lib-append      port:gtk3
+#
+# gobject-introspection is broken in gtk3 (#35944)
+#
+    configure.args-append   --with-gtk=3.0 \
+                            --enable-introspection=no
+#
+# move gtk-docs to allow parallel install with webkit-gtk
+#
+    if {[variant_isset universal]} {
+        merger-post-destroot {
+            foreach arch ${universal_archs_to_use} {
+                set docpath ${workpath}/destroot-${arch}${prefix}/share/gtk-doc/html
+                move ${docpath}/webkitgtk ${docpath}/webkitgtk3
+                move ${docpath}/webkitgtk3/webkitgtk.devhelp2 ${docpath}/webkitgtk3/webkitgtk3.devhelp2
+            }
+        }
+    } else {
+        post-destroot {
+           set docpath ${destroot}${prefix}/share/gtk-doc/html
+           move ${docpath}/webkitgtk ${docpath}/webkitgtk3
+           move ${docpath}/webkitgtk3/webkitgtk.devhelp2 ${docpath}/webkitgtk3/webkitgtk3.devhelp2
+        }
+    }
+}
+
+if {${name} == ${subport}} {
+    depends_lib-append      port:gtk2 \
+                            port:gobject-introspection
+#
+# webkit-gtk build fails with introspection enabled (#39598)
+#
+    configure.args-append   --with-gtk=2.0 \
+                            --enable-introspection=no
+}
+
 # https://bugs.webkit.org/show_bug.cgi?id=94488
 configure.universal_args-delete --disable-dependency-tracking
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130801/248413c7/attachment.html>