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

[devans at macports.org]

Revision: 108839
          https://trac.macports.org/changeset/108839
Author:   devans at macports.org
Date:     2013-08-02 20:44:54 -0700 (Fri, 02 Aug 2013)
Log Message:
-----------
webkit-gtk3: use merger_dont_diff when merging with diff results in nested block comments.

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

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2013-08-03 00:18:48 UTC (rev 108838)
+++ trunk/dports/www/webkit-gtk/Portfile	2013-08-03 03:44:54 UTC (rev 108839)
@@ -76,6 +76,7 @@
         --enable-webgl
 
 subport webkit-gtk3 {
+    revision 1
     depends_lib-append      port:gtk3
 #
 # gobject-introspection is broken in gtk3 (#35944)
@@ -86,6 +87,12 @@
 # move gtk-docs to allow parallel install with webkit-gtk
 #
     if {[variant_isset universal]} {
+#
+# using diff to merge derived include files sometimes
+# results in a corrupted file due to nested /* */ blocks
+#
+        global merger_dont_diff
+        set merger_dont_diff    "${prefix}/include/webkitgtk-3.0/webkitdom/WebKitDOMNavigator.h"
         merger-post-destroot {
             foreach arch ${universal_archs_to_use} {
                 set docpath ${workpath}/destroot-${arch}${prefix}/share/gtk-doc/html
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130802/b4d37c84/attachment.html>