[114237] trunk/dports
jeremyhu at macports.org
jeremyhu at macports.org
Tue Dec 3 01:36:15 PST 2013
Revision: 114237
https://trac.macports.org/changeset/114237
Author: jeremyhu at macports.org
Date: 2013-12-03 01:36:15 -0800 (Tue, 03 Dec 2013)
Log Message:
-----------
misc: Automatically prefer webkit-gtk-2.0 over webkit-gtk if using libstdc++
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:31:37 UTC (rev 114236)
+++ trunk/dports/devel/webkit-sharp/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -28,3 +28,23 @@
# mono is not universal
universal_variant no
+
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
Modified: trunk/dports/gnome/devhelp/Portfile
===================================================================
--- trunk/dports/gnome/devhelp/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/devhelp/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -35,6 +35,26 @@
port:gtk3 \
path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
configure.args --with-webkit2=no \
--disable-schemas-compile
Modified: trunk/dports/gnome/empathy/Portfile
===================================================================
--- trunk/dports/gnome/empathy/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/empathy/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -62,6 +62,26 @@
port:gnome-settings-daemon \
port:yelp
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
patchfiles patch-configure.diff
configure.args --x-includes=${prefix}/include \
Modified: trunk/dports/gnome/epiphany/Portfile
===================================================================
--- trunk/dports/gnome/epiphany/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/epiphany/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -48,6 +48,26 @@
depends_run port:gnome-settings-daemon
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
patchfiles patch-configure.diff
configure.cflags-append -Wno-format-nonliteral
Modified: trunk/dports/gnome/gnome-online-accounts/Portfile
===================================================================
--- trunk/dports/gnome/gnome-online-accounts/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/gnome-online-accounts/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -37,5 +37,25 @@
configure.cflags-append -Wno-format-nonliteral
configure.args --enable-introspection=yes
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
livecheck.type gnome
Modified: trunk/dports/gnome/gnucash/Portfile
===================================================================
--- trunk/dports/gnome/gnucash/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/gnucash/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -58,6 +58,26 @@
depends_run port:yelp
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
# aqbanking and libgtkhtml3 are not universal
universal_variant no
Modified: trunk/dports/gnome/gnucash-devel/Portfile
===================================================================
--- trunk/dports/gnome/gnucash-devel/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/gnucash-devel/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -60,6 +60,26 @@
port:icu \
port:p5.12-finance-quote
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
# aqbanking and libgtkhtml3 are not universal
universal_variant no
Modified: trunk/dports/gnome/liferea/Portfile
===================================================================
--- trunk/dports/gnome/liferea/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/liferea/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -34,6 +34,26 @@
path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
port:libglade2
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
configure.args --disable-lua
variant lua description {LUA scripting support} {
Modified: trunk/dports/gnome/seed/Portfile
===================================================================
--- trunk/dports/gnome/seed/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/seed/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -38,4 +38,24 @@
configure.args --disable-gettext-module
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
livecheck.type gnome
Modified: trunk/dports/gnome/yelp/Portfile
===================================================================
--- trunk/dports/gnome/yelp/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/yelp/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -59,4 +59,24 @@
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
}
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
livecheck.type gnome
Modified: trunk/dports/gnome/zenity/Portfile
===================================================================
--- trunk/dports/gnome/zenity/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/zenity/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -38,4 +38,24 @@
configure.args --disable-silent-rules
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
livecheck.type gnome
Modified: trunk/dports/graphics/birdfont/Portfile
===================================================================
--- trunk/dports/graphics/birdfont/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/graphics/birdfont/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -57,3 +57,23 @@
file attributes ${worksrcpath}/build/BirdFont.app/Contents/MacOS/birdfont.sh -permissions 0755
file copy ${worksrcpath}/build/BirdFont.app ${destroot}${applications_dir}
}
+
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
Modified: trunk/dports/graphics/gimp2/Portfile
===================================================================
--- trunk/dports/graphics/gimp2/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/graphics/gimp2/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -69,6 +69,26 @@
depends_run path:share/gimp/2.0/help:gimp-help-en
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
patchfiles patch-etc-gimprc.diff \
patch-freetype-includes.diff \
patch-brush-outline-not-displayed-bz719593.diff \
Modified: trunk/dports/mail/claws-mail/Portfile
===================================================================
--- trunk/dports/mail/claws-mail/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/mail/claws-mail/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -45,6 +45,26 @@
require_active_variants \
gtk2 x11
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
configure.args --disable-jpilot \
--disable-acpi_notifier-plugin \
--disable-archive-plugin \
Modified: trunk/dports/multimedia/gtkpod/Portfile
===================================================================
--- trunk/dports/multimedia/gtkpod/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/multimedia/gtkpod/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -31,6 +31,26 @@
port:libvorbis \
path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
use_autoconf yes
# python-related tweaks
Modified: trunk/dports/python/py26-webkitgtk/Portfile
===================================================================
--- trunk/dports/python/py26-webkitgtk/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/python/py26-webkitgtk/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -25,6 +25,26 @@
set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
configure.pre_args-delete --prefix=${prefix}
configure.pre_args-append --prefix=${python_prefix}
configure.args-append --includedir=${python_prefix}/include/python2.6
Modified: trunk/dports/python/py27-webkitgtk/Portfile
===================================================================
--- trunk/dports/python/py27-webkitgtk/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/python/py27-webkitgtk/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -24,6 +24,26 @@
sha1 74ff2222d9aa9af6ab0aa4279b28dd2b26f5824e \
rmd160 e857939e65a9a409390f1fd256310988f592935f
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
set python_prefix ${frameworks_dir}/Python.framework/Versions/2.7
configure.pre_args-delete --prefix=${prefix}
Modified: trunk/dports/textproc/bibledit/Portfile
===================================================================
--- trunk/dports/textproc/bibledit/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/textproc/bibledit/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -35,3 +35,23 @@
distname ${name}-gtk-${version}
worksrcdir ${name}-gtk-${version}
+
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
Modified: trunk/dports/www/midori/Portfile
===================================================================
--- trunk/dports/www/midori/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/www/midori/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -37,6 +37,26 @@
port:libnotify \
port:vala
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
# Not autoconf
configure.env-append LINKFLAGS="-L${prefix}/lib"
configure.universal_args-delete --disable-dependency-tracking
Modified: trunk/dports/www/uzbl/Portfile
===================================================================
--- trunk/dports/www/uzbl/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/www/uzbl/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
@@ -33,3 +33,23 @@
CC="${configure.cc} [get_canonical_archflags]"
eval destroot.args ${build.args}
+
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131203/a9a3e9f8/attachment-0001.html>
More information about the macports-changes
mailing list