[139221] users/devans/GNOME-3/stable/dports/www

devans at macports.org devans at macports.org
Fri Aug 7 14:52:58 PDT 2015


Revision: 139221
          https://trac.macports.org/changeset/139221
Author:   devans at macports.org
Date:     2015-08-07 14:52:58 -0700 (Fri, 07 Aug 2015)
Log Message:
-----------
GNOME-3/stable: webkit-gtk, webkit-gtk-devel, reformat, general cleanup, no change in installed files.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile
    users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/Portfile

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/www/webkit-gtk/
    users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/


Property changes on: users/devans/GNOME-3/stable/dports/www/webkit-gtk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/www/webkit-gtk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit-gtk:127269-135275
   + /branches/mld-qt-481/dports/www/webkit-gtk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit-gtk:127269-139220

Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile	2015-08-07 21:43:20 UTC (rev 139220)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile	2015-08-07 21:52:58 UTC (rev 139221)
@@ -5,57 +5,53 @@
 # 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
-PortGroup   compiler_blacklist_versions 1.0
+PortSystem          1.0
+PortGroup           conflicts_build 1.0
+PortGroup           muniversal 1.0
+PortGroup           compiler_blacklist_versions 1.0
 
-name        webkit-gtk
-epoch       2
-version     2.4.9
-description Apple's WebKit HTML rendering library for GTK+
-long_description ${description}
-maintainers jeremyhu devans
-categories  www gnome
-platforms   darwin freebsd
-license     LGPL-2+ BSD
-homepage    http://webkitgtk.org/
-master_sites    http://webkitgtk.org/releases/
+name                webkit-gtk
+epoch               2
+version             2.4.9
+description         Apple's WebKit HTML rendering library for GTK+
+long_description    ${description}
+maintainers         jeremyhu devans
+categories          www gnome
+platforms           darwin freebsd
+license             LGPL-2+ BSD
+homepage            http://webkitgtk.org/
+master_sites        http://webkitgtk.org/releases/
 
-use_xz      yes
-distname    webkitgtk-${version}
+use_xz              yes
+distname            webkitgtk-${version}
 
-dist_subdir webkit-gtk
+dist_subdir         webkit-gtk
 
 checksums           rmd160  122468435539d69665d5206ae266fb36ff2d86c2 \
                     sha256  afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564
 
-depends_lib \
-        path:lib/pkgconfig/glib-2.0.pc:glib2 \
-        port:bison \
-        port:flex \
-        port:enchant \
-        port:geoclue2 \
-        port:gobject-introspection \
-        port:harfbuzz-icu \
-        port:icu \
-        port:libxslt \
-        port:libpng \
-        port:libsecret \
-        port:libsoup \
-        port:mesa \
-        port:sqlite3 \
-        port:webp \
-        port:xorg-libXt
+depends_build       port:pkgconfig \
+                    port:gtk-doc \
+                    port:python27 \
+                    port:py27-simplejson
 
-depends_build   \
-        port:gtk-doc \
-        port:pkgconfig \
-        port:python27 \
-        port:py27-simplejson
+depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
+                    port:bison \
+                    port:flex \
+                    port:enchant \
+                    port:geoclue2 \
+                    port:gobject-introspection \
+                    port:harfbuzz-icu \
+                    port:icu \
+                    port:libxslt \
+                    port:libpng \
+                    port:libsecret \
+                    port:libsoup \
+                    port:mesa \
+                    port:sqlite3 \
+                    port:webp \
+                    port:xorg-libXt
 
-configure.python    ${prefix}/bin/python2.7
-
 # case-insensitive.patch: https://bugs.webkit.org/show_bug.cgi?id=65811
 # our-icu.patch: No upstream bug report, probably not wanted
 # ruby-1.8.patch: https://bugs.webkit.org/show_bug.cgi?id=126327
@@ -65,34 +61,36 @@
 # leopard-malloc.patch: https://bugs.webkit.org/show_bug.cgi?id=140143
 # leopard-platform.patch: https://bugs.webkit.org/show_bug.cgi?id=140143
 
-patchfiles \
-        clang-assertions.patch \
-        case-insensitive.patch \
-        our-icu.patch \
-        ruby-1.8.patch \
-        quartz-webcore.patch \
-        gstreamer.patch \
-        leopard-platform.patch \
-        leopard-malloc.patch \
-        libedit.patch
+patchfiles          clang-assertions.patch \
+                    case-insensitive.patch \
+                    our-icu.patch \
+                    ruby-1.8.patch \
+                    quartz-webcore.patch \
+                    gstreamer.patch \
+                    leopard-platform.patch \
+                    leopard-malloc.patch \
+                    libedit.patch
 
 conflicts_build     google-test
 
+# https://trac.macports.org/ticket/36329
+configure.perl      /usr/bin/perl
+configure.python    /usr/bin/python
+
 # --disable-webkit2: https://bugs.webkit.org/show_bug.cgi?id=126416
 # --disable-web-audio: https://bugs.webkit.org/show_bug.cgi?id=126438
 # --disable-jit: https://bugs.webkit.org/show_bug.cgi?id=133293
-configure.args  \
-        --disable-webkit2 \
-        --disable-web-audio \
-        --enable-x11-target=yes \
-        --enable-quartz-target=no \
-        --enable-wayland-target=no \
-        --enable-introspection \
-        --disable-video \
-        --enable-svg \
-        --enable-geolocation \
-        --enable-webgl \
-        --disable-jit
+configure.args      --disable-webkit2 \
+                    --disable-web-audio \
+                    --enable-x11-target=yes \
+                    --enable-quartz-target=no \
+                    --enable-wayland-target=no \
+                    --enable-introspection \
+                    --disable-video \
+                    --enable-svg \
+                    --enable-geolocation \
+                    --enable-webgl \
+                    --disable-jit
 
 platform darwin {
     pre-configure {
@@ -104,7 +102,7 @@
 }
 
 subport webkit-gtk3 {
-    conflicts   webkit-gtk3-devel webkit-gtk3-2.0
+    conflicts webkit-gtk3-devel webkit-gtk3-2.0
     depends_lib-append      port:gtk3
     configure.args-append   --with-gtk=3.0
 
@@ -137,7 +135,7 @@
 }
 
 if {${name} eq ${subport}} {
-    conflicts   webkit-gtk-devel webkit-gtk-2.0
+    conflicts webkit-gtk-devel webkit-gtk-2.0
     depends_lib-append      port:gtk2
     configure.args-append   --with-gtk=2.0
 }
@@ -162,18 +160,18 @@
 }
 
 # We don't want to use the headers from the installed WebKit
-configure.cppflags-delete -I${prefix}/include
+configure.cppflags-delete   -I${prefix}/include
 
 # google-test suite build fix
-configure.cppflags-append -DGTEST_USE_OWN_TR1_TUPLE=1
+configure.cppflags-append   -DGTEST_USE_OWN_TR1_TUPLE=1
 
 # https://trac.macports.org/ticket/41560#comment:2
-configure.cflags-append -ftemplate-depth=256
-configure.cxxflags-append -ftemplate-depth=256
+configure.cflags-append     -ftemplate-depth=256
+configure.cxxflags-append   -ftemplate-depth=256
 
 autoreconf.env-append ACLOCAL="aclocal -I Source/autotools"
-use_autoreconf  yes
-autoreconf.args -fvi
+use_autoreconf      yes
+autoreconf.args     -fvi
 
 lappend merger_dont_diff ${prefix}/include/webkitgtk-1.0/webkitdom/WebKitDOMNavigator.h
 
@@ -206,8 +204,8 @@
 #}
 
 # 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
+depends_build-append    port:gmake
+build.cmd               ${prefix}/bin/gmake
 
 build.args-append V=1
 
@@ -236,12 +234,12 @@
         configure.args-append   --enable-video
 }
 
-default_variants +video
+default_variants    +video
 
 if {[string match *clang* ${configure.cxx}]} {
     configure.cxxflags-append -Wno-c++11-extensions
 }
 
-livecheck.type  regex
-livecheck.url   http://webkitgtk.org/news.html
-livecheck.regex "webkitgtk(\\d+\\.\\d*\[024\](?:\\.\\d+)*)-released"
+livecheck.type      regex
+livecheck.url       http://webkitgtk.org/news.html
+livecheck.regex     "webkitgtk(\\d+\\.\\d*\[024\](?:\\.\\d+)*)-released"


Property changes on: users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/www/webkit-gtk-devel:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit-gtk-devel:127269-131880
   + /branches/mld-qt-481/dports/www/webkit-gtk-devel:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit-gtk-devel:127269-139220

Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/Portfile	2015-08-07 21:43:20 UTC (rev 139220)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/Portfile	2015-08-07 21:52:58 UTC (rev 139221)
@@ -5,53 +5,51 @@
 # 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
-PortGroup   compiler_blacklist_versions 1.0
+PortSystem          1.0
+PortGroup           conflicts_build 1.0
+PortGroup           muniversal 1.0
+PortGroup           compiler_blacklist_versions 1.0
 
-name        webkit-gtk-devel
-epoch       2
-version     2.4.7
-revision    1
-description Apple's WebKit HTML rendering library for GTK+
-long_description ${description}
-maintainers jeremyhu devans
-categories  www gnome
-platforms   darwin freebsd
-license     LGPL-2+ BSD
-homepage    http://webkitgtk.org/
-master_sites    http://webkitgtk.org/releases/
+name                webkit-gtk-devel
+epoch               2
+version             2.4.7
+revision            1
+description         Apple's WebKit HTML rendering library for GTK+
+long_description    ${description}
+maintainers         jeremyhu devans
+categories          www gnome
+platforms           darwin freebsd
+license             LGPL-2+ BSD
+homepage            http://webkitgtk.org/
+master_sites        http://webkitgtk.org/releases/
 
-use_xz      yes
-distname    webkitgtk-${version}
+use_xz              yes
+distname            webkitgtk-${version}
 
-dist_subdir webkit-gtk
+dist_subdir         webkit-gtk
 
 checksums           sha1    10d4cd1c1f7454adc576c6b97fa3d262b6665764 \
                     rmd160  25e1732f7e04ee0e15d7292aa5ef693d5c25679d \
                     sha256  f5cf26e39abf1d6b2d25f1398348fef6bbe6c03fb4f99e11c569091c05197d38
 
-depends_lib \
-        path:lib/pkgconfig/glib-2.0.pc:glib2 \
-        port:bison \
-        port:flex \
-        port:enchant \
-        port:geoclue2 \
-        port:gobject-introspection \
-        port:harfbuzz-icu \
-        port:libxslt \
-        port:libpng \
-        port:libsecret \
-        port:libsoup \
-        port:mesa \
-        port:sqlite3 \
-        port:webp \
-        port:xorg-libXt
+depends_build       port:pkgconfig \
+                    port:gtk-doc
 
-depends_build   \
-        port:gtk-doc \
-        port:pkgconfig
+depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
+                    port:bison \
+                    port:flex \
+                    port:enchant \
+                    port:geoclue2 \
+                    port:gobject-introspection \
+                    port:harfbuzz-icu \
+                    port:libxslt \
+                    port:libpng \
+                    port:libsecret \
+                    port:libsoup \
+                    port:mesa \
+                    port:sqlite3 \
+                    port:webp \
+                    port:xorg-libXt
 
 # case-insensitive.patch: https://bugs.webkit.org/show_bug.cgi?id=65811
 # our-icu.patch: No upstream bug report, probably not wanted
@@ -60,37 +58,35 @@
 # clang-check.patch: https://bugs.webkit.org/show_bug.cgi?id=126324
 # gstreamer.patch: https://bugs.webkit.org/show_bug.cgi?id=126437
 # libedit.patch: https://bugs.webkit.org/show_bug.cgi?id=127059
+patchfiles          clang-assertions.patch \
+                    case-insensitive.patch \
+                    our-icu.patch \
+                    quartz-duplicate-symbols.patch \
+                    quartz-webcore.patch \
+                    clang-check.patch \
+                    gstreamer.patch \
+                    libedit.patch
 
-patchfiles \
-        clang-assertions.patch \
-        case-insensitive.patch \
-        our-icu.patch \
-        quartz-duplicate-symbols.patch \
-        quartz-webcore.patch \
-        clang-check.patch \
-        gstreamer.patch \
-        libedit.patch
-
 conflicts_build     google-test
 
 # https://trac.macports.org/ticket/36329
+configure.perl      /usr/bin/perl
 configure.python    /usr/bin/python
 
 # --disable-webkit2: https://bugs.webkit.org/show_bug.cgi?id=126416
 # --disable-web-audio: https://bugs.webkit.org/show_bug.cgi?id=126438
 # --disable-jit: https://bugs.webkit.org/show_bug.cgi?id=133293
-configure.args  \
-        --disable-webkit2 \
-        --disable-web-audio \
-        --enable-x11-target=yes \
-        --enable-quartz-target=no \
-        --enable-wayland-target=no \
-        --enable-introspection \
-        --disable-video \
-        --enable-svg \
-        --enable-geolocation \
-        --enable-webgl \
-        --disable-jit
+configure.args      --disable-webkit2 \
+                    --disable-web-audio \
+                    --enable-x11-target=yes \
+                    --enable-quartz-target=no \
+                    --enable-wayland-target=no \
+                    --enable-introspection \
+                    --disable-video \
+                    --enable-svg \
+                    --enable-geolocation \
+                    --enable-webgl \
+                    --disable-jit
 
 platform darwin {
     pre-configure {
@@ -102,7 +98,7 @@
 }
 
 subport webkit-gtk3-devel {
-    conflicts   webkit-gtk3 webkit-gtk3-2.0
+    conflicts webkit-gtk3 webkit-gtk3-2.0
     depends_lib-append      port:gtk3
     configure.args-append   --with-gtk=3.0
 
@@ -135,7 +131,7 @@
 }
 
 if {${name} eq ${subport}} {
-    conflicts   webkit-gtk webkit-gtk-2.0
+    conflicts webkit-gtk webkit-gtk-2.0
     depends_lib-append      port:gtk2
     configure.args-append   --with-gtk=2.0
 }
@@ -160,18 +156,18 @@
 }
 
 # We don't want to use the headers from the installed WebKit
-configure.cppflags-delete -I${prefix}/include
+configure.cppflags-delete   -I${prefix}/include
 
 # google-test suite build fix
-configure.cppflags-append -DGTEST_USE_OWN_TR1_TUPLE=1
+configure.cppflags-append   -DGTEST_USE_OWN_TR1_TUPLE=1
 
 # https://trac.macports.org/ticket/41560#comment:2
-configure.cflags-append -ftemplate-depth=256
-configure.cxxflags-append -ftemplate-depth=256
+configure.cflags-append     -ftemplate-depth=256
+configure.cxxflags-append   -ftemplate-depth=256
 
 autoreconf.env-append ACLOCAL="aclocal -I Source/autotools"
-use_autoreconf  yes
-autoreconf.args -fvi
+use_autoreconf      yes
+autoreconf.args     -fvi
 
 lappend merger_dont_diff ${prefix}/include/webkitgtk-1.0/webkitdom/WebKitDOMNavigator.h
 
@@ -204,8 +200,8 @@
 #}
 
 # 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
+depends_build-append    port:gmake
+build.cmd               ${prefix}/bin/gmake
 
 build.args-append V=1
 
@@ -240,12 +236,12 @@
         configure.args-append   --enable-video
 }
 
-default_variants +video
+default_variants    +video
 
 if {[string match *clang* ${configure.cxx}]} {
     configure.cxxflags-append -Wno-c++11-extensions
 }
 
-livecheck.type  regex
-livecheck.url   http://webkitgtk.org/news.html
-livecheck.regex "webkitgtk(\\d+(?:\\.\\d+)*)-released"
+livecheck.type      regex
+livecheck.url       http://webkitgtk.org/news.html
+livecheck.regex     "webkitgtk(\\d+(?:\\.\\d+)*)-released"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150807/d3a8ed8f/attachment-0001.html>


More information about the macports-changes mailing list