[115137] trunk/dports
jeremyhu at macports.org
jeremyhu at macports.org
Wed Dec 25 18:12:09 PST 2013
Revision: 115137
https://trac.macports.org/changeset/115137
Author: jeremyhu at macports.org
Date: 2013-12-25 18:12:09 -0800 (Wed, 25 Dec 2013)
Log Message:
-----------
misc: Rename cxx_stdlib to cxxstdlib to not conflict with the possible setting in macports.conf
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/graphics/gimp2-devel/Portfile
trunk/dports/graphics/gimp3-devel/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/science/root/Portfile
trunk/dports/textproc/bibledit/Portfile
trunk/dports/www/midori/Portfile
trunk/dports/www/uzbl/Portfile
trunk/dports/www/webkit-gtk/Portfile
Modified: trunk/dports/devel/webkit-sharp/Portfile
===================================================================
--- trunk/dports/devel/webkit-sharp/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/devel/webkit-sharp/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -29,21 +29,22 @@
# mono is not universal
universal_variant no
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/gnome/devhelp/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -36,21 +36,22 @@
port:gtk3 \
path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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
}
Modified: trunk/dports/gnome/empathy/Portfile
===================================================================
--- trunk/dports/gnome/empathy/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/gnome/empathy/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -63,21 +63,22 @@
port:gnome-settings-daemon \
port:yelp
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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
}
Modified: trunk/dports/gnome/epiphany/Portfile
===================================================================
--- trunk/dports/gnome/epiphany/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/gnome/epiphany/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -49,21 +49,22 @@
depends_run port:gnome-settings-daemon
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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
}
Modified: trunk/dports/gnome/gnome-online-accounts/Portfile
===================================================================
--- trunk/dports/gnome/gnome-online-accounts/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/gnome/gnome-online-accounts/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -38,22 +38,23 @@
configure.cflags-append -Wno-format-nonliteral
configure.args --enable-introspection=yes
-
+
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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
}
Modified: trunk/dports/gnome/gnucash/Portfile
===================================================================
--- trunk/dports/gnome/gnucash/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/gnome/gnucash/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -58,21 +58,22 @@
depends_run port:yelp
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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/gnucash-devel/Portfile
===================================================================
--- trunk/dports/gnome/gnucash-devel/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/gnome/gnucash-devel/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -60,21 +60,22 @@
port:icu \
port:p5.12-finance-quote
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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/liferea/Portfile
===================================================================
--- trunk/dports/gnome/liferea/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/gnome/liferea/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -34,21 +34,22 @@
path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
port:libglade2
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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/seed/Portfile
===================================================================
--- trunk/dports/gnome/seed/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/gnome/seed/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -38,21 +38,22 @@
configure.args --disable-gettext-module
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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
}
Modified: trunk/dports/gnome/yelp/Portfile
===================================================================
--- trunk/dports/gnome/yelp/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/gnome/yelp/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -60,21 +60,22 @@
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
}
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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
}
Modified: trunk/dports/gnome/zenity/Portfile
===================================================================
--- trunk/dports/gnome/zenity/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/gnome/zenity/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -38,21 +38,22 @@
configure.args --disable-silent-rules
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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
}
Modified: trunk/dports/graphics/birdfont/Portfile
===================================================================
--- trunk/dports/graphics/birdfont/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/graphics/birdfont/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -58,21 +58,22 @@
file copy ${worksrcpath}/build/BirdFont.app ${destroot}${applications_dir}
}
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/graphics/gimp2/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -70,18 +70,19 @@
depends_run path:share/gimp/2.0/help:gimp-help-en
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
}
@@ -207,7 +208,7 @@
variant help_browser description {Enable Gimp help browser} {
configure.args-delete --without-webkit
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "libstdc++"} {
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
} else {
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
Modified: trunk/dports/graphics/gimp2-devel/Portfile
===================================================================
--- trunk/dports/graphics/gimp2-devel/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/graphics/gimp2-devel/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -73,18 +73,19 @@
depends_run path:share/gimp/2.0/help:gimp-help-en
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
}
@@ -200,7 +201,7 @@
variant help_browser description {Enable Gimp help browser} {
configure.args-delete --without-webkit
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "libstdc++"} {
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
} else {
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
Modified: trunk/dports/graphics/gimp3-devel/Portfile
===================================================================
--- trunk/dports/graphics/gimp3-devel/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/graphics/gimp3-devel/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -74,18 +74,19 @@
depends_run path:share/gimp/2.0/help:gimp-help-en
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
}
@@ -202,7 +203,7 @@
variant help_browser description {Enable Gimp help browser} {
configure.args-delete --without-webkit
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "libstdc++"} {
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
} else {
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
Modified: trunk/dports/mail/claws-mail/Portfile
===================================================================
--- trunk/dports/mail/claws-mail/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/mail/claws-mail/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -45,21 +45,22 @@
require_active_variants \
gtk2 x11
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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/multimedia/gtkpod/Portfile
===================================================================
--- trunk/dports/multimedia/gtkpod/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/multimedia/gtkpod/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -31,21 +31,22 @@
port:libvorbis \
path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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/python/py26-webkitgtk/Portfile
===================================================================
--- trunk/dports/python/py26-webkitgtk/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/python/py26-webkitgtk/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -25,21 +25,22 @@
set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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/python/py27-webkitgtk/Portfile
===================================================================
--- trunk/dports/python/py27-webkitgtk/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/python/py27-webkitgtk/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -24,21 +24,22 @@
sha1 74ff2222d9aa9af6ab0aa4279b28dd2b26f5824e \
rmd160 e857939e65a9a409390f1fd256310988f592935f
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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/science/root/Portfile
===================================================================
--- trunk/dports/science/root/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/science/root/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -112,21 +112,22 @@
--enable-gdml \
--enable-builtin-freetype
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libc++"} {
+ if {${cxxstdlib} eq "libc++"} {
configure.args-delete --disable-c++11
configure.args-append --enable-c++11
}
Modified: trunk/dports/textproc/bibledit/Portfile
===================================================================
--- trunk/dports/textproc/bibledit/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/textproc/bibledit/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -36,21 +36,22 @@
distname ${name}-gtk-${version}
worksrcdir ${name}-gtk-${version}
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/www/midori/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -37,21 +37,22 @@
port:libnotify \
port:vala
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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/uzbl/Portfile
===================================================================
--- trunk/dports/www/uzbl/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/www/uzbl/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -34,21 +34,22 @@
eval destroot.args ${build.args}
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "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/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile 2013-12-26 02:04:14 UTC (rev 115136)
+++ trunk/dports/www/webkit-gtk/Portfile 2013-12-26 02:12:09 UTC (rev 115137)
@@ -84,22 +84,23 @@
--enable-geolocation \
--enable-webgl
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
pre-configure {
- set cxx_stdlib {}
+ set cxxstdlib {}
if {[info exists configure.cxx_stdlib] &&
${configure.cxx_stdlib} ne {} &&
[string match *clang* ${configure.cxx}]} {
- set cxx_stdlib ${configure.cxx_stdlib}
+ set cxxstdlib ${configure.cxx_stdlib}
} elseif {[string match *clang* ${configure.cxx}] &&
${os.major} >= 13} {
- set cxx_stdlib libc++
+ set cxxstdlib libc++
} else {
- set cxx_stdlib libstdc++
+ set cxxstdlib libstdc++
}
- if {${cxx_stdlib} eq "libstdc++"} {
+ if {${cxxstdlib} eq "libstdc++"} {
ui_error "${subport} is not supported for this installation of MacPorts. It requires libc++ be selected as your C++ runtime. Please use ${subport}-2.0 instead"
error "unsupported configuration"
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131225/31306196/attachment-0001.html>
More information about the macports-changes
mailing list