[114235] trunk/dports
jeremyhu at macports.org
jeremyhu at macports.org
Tue Dec 3 01:25:31 PST 2013
Revision: 114235
https://trac.macports.org/changeset/114235
Author: jeremyhu at macports.org
Date: 2013-12-03 01:25:31 -0800 (Tue, 03 Dec 2013)
Log Message:
-----------
multiple: Update webkit-gtk dependency to be satisfied by webkit-gtk-2.0 port if installed
Modified Paths:
--------------
trunk/dports/devel/webkit-sharp/Portfile
trunk/dports/gnome/devhelp/Portfile
trunk/dports/gnome/empathy/Portfile
trunk/dports/gnome/epiphany/Portfile
trunk/dports/gnome/gnome-online-accounts/Portfile
trunk/dports/gnome/gnucash/Portfile
trunk/dports/gnome/gnucash-devel/Portfile
trunk/dports/gnome/liferea/Portfile
trunk/dports/gnome/seed/Portfile
trunk/dports/gnome/yelp/Portfile
trunk/dports/gnome/zenity/Portfile
trunk/dports/graphics/birdfont/Portfile
trunk/dports/graphics/gimp2/Portfile
trunk/dports/mail/claws-mail/Portfile
trunk/dports/multimedia/gtkpod/Portfile
trunk/dports/python/py26-webkitgtk/Portfile
trunk/dports/python/py27-webkitgtk/Portfile
trunk/dports/textproc/bibledit/Portfile
trunk/dports/www/midori/Portfile
trunk/dports/www/uzbl/Portfile
Modified: trunk/dports/devel/webkit-sharp/Portfile
===================================================================
--- trunk/dports/devel/webkit-sharp/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/devel/webkit-sharp/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -24,7 +24,7 @@
depends_lib port:gtk-sharp2 \
port:mono \
- port:webkit-gtk
+ path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
# mono is not universal
universal_variant no
Modified: trunk/dports/gnome/devhelp/Portfile
===================================================================
--- trunk/dports/gnome/devhelp/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/gnome/devhelp/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -33,7 +33,7 @@
depends_lib port:desktop-file-utils \
port:gnome-icon-theme \
port:gtk3 \
- port:webkit-gtk3
+ path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
configure.args --with-webkit2=no \
--disable-schemas-compile
Modified: trunk/dports/gnome/empathy/Portfile
===================================================================
--- trunk/dports/gnome/empathy/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/gnome/empathy/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -43,7 +43,7 @@
port:libnotify \
port:gcr \
port:pulseaudio \
- port:webkit-gtk3 \
+ path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
port:libsoup \
port:libgee \
port:telepathy-farstream \
Modified: trunk/dports/gnome/epiphany/Portfile
===================================================================
--- trunk/dports/gnome/epiphany/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/gnome/epiphany/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -31,7 +31,7 @@
port:gnome-icon-theme \
port:gnome-icon-theme-symbolic \
port:gtk3 \
- port:webkit-gtk3 \
+ path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
port:gnome-desktop \
port:libxslt\
port:libsoup \
Modified: trunk/dports/gnome/gnome-online-accounts/Portfile
===================================================================
--- trunk/dports/gnome/gnome-online-accounts/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/gnome/gnome-online-accounts/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -25,7 +25,7 @@
port:intltool
depends_lib port:gtk3 \
- port:webkit-gtk3 \
+ path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
port:libsoup \
port:json-glib \
port:rest \
Modified: trunk/dports/gnome/gnucash/Portfile
===================================================================
--- trunk/dports/gnome/gnucash/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/gnome/gnucash/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -51,7 +51,7 @@
port:slib-guile \
port:libgnomeui \
port:libgnomeprintui \
- port:webkit-gtk \
+ path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
port:goffice08 \
port:icu \
port:p5.12-finance-quote
@@ -71,7 +71,7 @@
variant gtkhtml description {Use gtkhtml instead of webkit-gtk for html rendering} {
configure.args-delete --with-html-engine=webkit
- depends_lib-delete port:webkit-gtk
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append port:libgtkhtml3
}
Modified: trunk/dports/gnome/gnucash-devel/Portfile
===================================================================
--- trunk/dports/gnome/gnucash-devel/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/gnome/gnucash-devel/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -55,7 +55,7 @@
port:slib-guile \
port:libgnomeui \
port:libgnomeprintui \
- port:webkit-gtk \
+ path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
port:goffice08 \
port:icu \
port:p5.12-finance-quote
@@ -73,7 +73,7 @@
variant gtkhtml description {Use gtkhtml instead of webkit-gtk for html rendering} {
configure.args-delete --with-html-engine=webkit
- depends_lib-delete port:webkit-gtk
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append port:libgtkhtml3
}
Modified: trunk/dports/gnome/liferea/Portfile
===================================================================
--- trunk/dports/gnome/liferea/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/gnome/liferea/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -31,7 +31,7 @@
port:libxml2 \
port:libxslt \
port:sqlite3 \
- port:webkit-gtk \
+ path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
port:libglade2
configure.args --disable-lua
Modified: trunk/dports/gnome/seed/Portfile
===================================================================
--- trunk/dports/gnome/seed/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/gnome/seed/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -29,7 +29,7 @@
port:readline \
port:gnome-js-common \
path:lib/pkgconfig/cairo.pc:cairo \
- port:webkit-gtk3 \
+ path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
port:dbus-glib \
port:libffi \
port:mpfr \
Modified: trunk/dports/gnome/yelp/Portfile
===================================================================
--- trunk/dports/gnome/yelp/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/gnome/yelp/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -34,7 +34,7 @@
port:gnome-icon-theme \
port:gnome-icon-theme-symbolic \
port:gtk3 \
- port:webkit-gtk3 \
+ path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
port:sqlite3 \
port:xz \
port:bzip2 \
Modified: trunk/dports/gnome/zenity/Portfile
===================================================================
--- trunk/dports/gnome/zenity/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/gnome/zenity/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -30,7 +30,7 @@
depends_lib port:gtk3 \
port:libnotify \
- port:webkit-gtk3
+ path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
# Don't do intltool's INTLTOOL_PERL dance
use_autoreconf yes
Modified: trunk/dports/graphics/birdfont/Portfile
===================================================================
--- trunk/dports/graphics/birdfont/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/graphics/birdfont/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -23,7 +23,7 @@
depends_build port:pkgconfig \
port:vala
-depends_lib port:webkit-gtk \
+depends_lib path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
port:gtk2 \
port:libxml2
Modified: trunk/dports/graphics/gimp2/Portfile
===================================================================
--- trunk/dports/graphics/gimp2/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/graphics/gimp2/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -185,7 +185,7 @@
#
variant help_browser description {Enable Gimp help browser} {
- depends_lib-append port:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
configure.args-delete --without-webkit
}
Modified: trunk/dports/mail/claws-mail/Portfile
===================================================================
--- trunk/dports/mail/claws-mail/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/mail/claws-mail/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -39,7 +39,7 @@
port:gnutls \
port:libgcrypt \
port:enchant \
- port:webkit-gtk
+ path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
# claws uses gdk/gdkx.h, which is not installed by gtk2 +quartz.
require_active_variants \
Modified: trunk/dports/multimedia/gtkpod/Portfile
===================================================================
--- trunk/dports/multimedia/gtkpod/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/multimedia/gtkpod/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -29,7 +29,7 @@
port:libid3tag \
path:lib/libmp4v2.dylib:mp4v2 \
port:libvorbis \
- port:webkit-gtk
+ path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
use_autoconf yes
Modified: trunk/dports/python/py26-webkitgtk/Portfile
===================================================================
--- trunk/dports/python/py26-webkitgtk/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/python/py26-webkitgtk/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -14,7 +14,7 @@
platforms darwin
depends_build port:pkgconfig
-depends_lib port:webkit-gtk port:icu port:python26 port:py26-pygtk port:libffi
+depends_lib path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk port:icu port:python26 port:py26-pygtk port:libffi
distname pywebkitgtk-${version}
master_sites http://pywebkitgtk.googlecode.com/files/
Modified: trunk/dports/python/py27-webkitgtk/Portfile
===================================================================
--- trunk/dports/python/py27-webkitgtk/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/python/py27-webkitgtk/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -15,7 +15,7 @@
platforms darwin
depends_build port:pkgconfig
-depends_lib port:webkit-gtk port:icu port:python27 port:py27-pygtk port:libffi
+depends_lib path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk port:icu port:python27 port:py27-pygtk port:libffi
distname pywebkitgtk-${version}
master_sites http://pywebkitgtk.googlecode.com/files/
Modified: trunk/dports/textproc/bibledit/Portfile
===================================================================
--- trunk/dports/textproc/bibledit/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/textproc/bibledit/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -31,7 +31,7 @@
port:nspr \
port:gtksourceview2 \
port:libsoup \
- port:webkit-gtk
+ path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
distname ${name}-gtk-${version}
worksrcdir ${name}-gtk-${version}
Modified: trunk/dports/www/midori/Portfile
===================================================================
--- trunk/dports/www/midori/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/www/midori/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -31,7 +31,7 @@
# glib 2.16.5 or later is required:
depends_lib port:gtk2 \
path:include/gio/gio.h:glib2 \
- port:webkit-gtk\
+ path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk\
port:libxml2 \
port:libunique \
port:libnotify \
Modified: trunk/dports/www/uzbl/Portfile
===================================================================
--- trunk/dports/www/uzbl/Portfile 2013-12-03 09:18:32 UTC (rev 114234)
+++ trunk/dports/www/uzbl/Portfile 2013-12-03 09:25:31 UTC (rev 114235)
@@ -22,7 +22,7 @@
depends_build port:pkgconfig
depends_lib port:gtk2 \
- port:webkit-gtk \
+ path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
port:libsoup
use_configure no
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131203/0d21e709/attachment-0001.html>
More information about the macports-changes
mailing list