[121286] users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts

[devans at macports.org]

Revision: 121286
          https://trac.macports.org/changeset/121286
Author:   devans at macports.org
Date:     2014-06-21 22:48:01 -0700 (Sat, 21 Jun 2014)
Log Message:
-----------
GNOME-3/unstable: gnome-online-accounts, merge cxxstdlib changes from stable.

Modified Paths:
--------------
    users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/Portfile

Property Changed:
----------------
    users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/


Property changes on: users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/gnome/gnome-online-accounts:113257-119520
/users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts:119562-119583
/users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts:114069-118152
   + /trunk/dports/gnome/gnome-online-accounts:113257-121283
/users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts:119562-121285
/users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts:114069-118152

Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/Portfile	2014-06-22 05:42:22 UTC (rev 121285)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/Portfile	2014-06-22 05:48:01 UTC (rev 121286)
@@ -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
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140621/9d261e0d/attachment.html>