Revision: 115556 https://trac.macports.org/changeset/115556 Author: jeremyhu@macports.org Date: 2014-01-04 16:27:30 -0800 (Sat, 04 Jan 2014) Log Message: ----------- webkit-gtk-devel: Rename some docs to avoid collission between gtk2 and gtk3 ports Modified Paths: -------------- trunk/dports/www/webkit-gtk-devel/Portfile Modified: trunk/dports/www/webkit-gtk-devel/Portfile =================================================================== --- trunk/dports/www/webkit-gtk-devel/Portfile 2014-01-04 21:56:52 UTC (rev 115555) +++ trunk/dports/www/webkit-gtk-devel/Portfile 2014-01-05 00:27:30 UTC (rev 115556) @@ -1,6 +1,10 @@ # -*- 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$ +# We have an umbrella radar tracking webkit-gtk issues on OS X. Please relate +# any future issues with this tracker. +# http://bugs.webkit.org/show_bug.cgi?id=126492 + PortSystem 1.0 PortGroup conflicts_build 1.0 PortGroup muniversal 1.0 @@ -106,6 +110,7 @@ } subport webkit-gtk3-devel { + revision 1 conflicts webkit-gtk3 webkit-gtk3-2.0 depends_lib-append port:gtk3 configure.args-append --with-gtk=3.0 @@ -124,6 +129,7 @@ foreach arch ${universal_archs_to_use} { set docpath ${workpath}/destroot-${arch}${prefix}/share/gtk-doc/html move ${docpath}/webkitgtk ${docpath}/webkitgtk3 + move ${docpath}/webkitdomgtk ${docpath}/webkitdomgtk3 move ${docpath}/webkitgtk3/webkitgtk.devhelp2 ${docpath}/webkitgtk3/webkitgtk3.devhelp2 } } @@ -131,6 +137,7 @@ post-destroot { set docpath ${destroot}${prefix}/share/gtk-doc/html move ${docpath}/webkitgtk ${docpath}/webkitgtk3 + move ${docpath}/webkitdomgtk ${docpath}/webkitdomgtk3 move ${docpath}/webkitgtk3/webkitgtk.devhelp2 ${docpath}/webkitgtk3/webkitgtk3.devhelp2 } } @@ -215,9 +222,7 @@ # file copy ${worksrcpath}/Programs/.libs/GtkLauncher ${destroot}${prefix}/bin #} -# I'm not sure if this is needed or for what versions of make. I just hit a snag and this -# may have fixed it, or it may have been a 1-off issue, or I may have been impatient. -# TODO: Remove? +# Apple's gnumake (patched 3.81) gets wedged at some point during the build process depends_build-append port:gmake build.cmd ${prefix}/bin/gmake