[121285] users/devans/GNOME-3/stable/dports/gnome
devans at macports.org
devans at macports.org
Sat Jun 21 22:42:22 PDT 2014
Revision: 121285
https://trac.macports.org/changeset/121285
Author: devans at macports.org
Date: 2014-06-21 22:42:22 -0700 (Sat, 21 Jun 2014)
Log Message:
-----------
GNOME-3/stable: merge recent changes from trunk
* devhelp
* empathy
* gnome-online-accounts
* yelp
* zenity
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile
users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile
users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile
users/devans/GNOME-3/stable/dports/gnome/zenity/Portfile
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/gnome/devhelp/
users/devans/GNOME-3/stable/dports/gnome/empathy/
users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/
users/devans/GNOME-3/stable/dports/gnome/yelp/
users/devans/GNOME-3/stable/dports/gnome/zenity/
Property changes on: users/devans/GNOME-3/stable/dports/gnome/devhelp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/devhelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/devhelp:108265-119100
/users/devans/GNOME-3/unstable/dports/gnome/devhelp:116416-118152
/users/rmstonecipher/gnome/devhelp:102363-103172
+ /branches/mld-qt-481/dports/gnome/devhelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/devhelp:108265-121283
/users/devans/GNOME-3/unstable/dports/gnome/devhelp:116416-118152
/users/rmstonecipher/gnome/devhelp:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile 2014-06-22 05:39:20 UTC (rev 121284)
+++ users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile 2014-06-22 05:42:22 UTC (rev 121285)
@@ -38,22 +38,8 @@
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 cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} 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
}
Property changes on: users/devans/GNOME-3/stable/dports/gnome/empathy
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/empathy:108265-120599
/users/devans/GNOME-3/unstable/dports/gnome/empathy:114069-118152
+ /trunk/dports/gnome/empathy:108265-121283
/users/devans/GNOME-3/unstable/dports/gnome/empathy:114069-118152
Modified: users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile 2014-06-22 05:39:20 UTC (rev 121284)
+++ users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile 2014-06-22 05:42:22 UTC (rev 121285)
@@ -69,22 +69,8 @@
port:gnome-settings-daemon \
port:yelp
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} 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
}
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/gnome-online-accounts:113257-119520
/users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts:114069-118152
+ /trunk/dports/gnome/gnome-online-accounts:113257-121283
/users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts:114069-118152
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile 2014-06-22 05:39:20 UTC (rev 121284)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile 2014-06-22 05:42:22 UTC (rev 121285)
@@ -120,22 +120,8 @@
}
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} 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
}
Property changes on: users/devans/GNOME-3/stable/dports/gnome/yelp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/yelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/yelp:108265-117591
/users/devans/GNOME-3/unstable/dports/gnome/yelp:114069-118154
/users/rmstonecipher/gnome/yelp:102363-103172
+ /branches/mld-qt-481/dports/gnome/yelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/yelp:108265-121283
/users/devans/GNOME-3/unstable/dports/gnome/yelp:114069-118154
/users/rmstonecipher/gnome/yelp:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile 2014-06-22 05:39:20 UTC (rev 121284)
+++ users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile 2014-06-22 05:42:22 UTC (rev 121285)
@@ -67,22 +67,8 @@
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
}
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} 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
}
Property changes on: users/devans/GNOME-3/stable/dports/gnome/zenity
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/zenity:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/zenity:108265-118273
/users/rmstonecipher/gnome/zenity:102363-103172
+ /branches/mld-qt-481/dports/gnome/zenity:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/zenity:108265-121283
/users/rmstonecipher/gnome/zenity:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/zenity/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/zenity/Portfile 2014-06-22 05:39:20 UTC (rev 121284)
+++ users/devans/GNOME-3/stable/dports/gnome/zenity/Portfile 2014-06-22 05:42:22 UTC (rev 121285)
@@ -43,22 +43,8 @@
configure.args --disable-silent-rules
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} 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
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140621/d606bc90/attachment-0001.html>
More information about the macports-changes
mailing list