[115729] users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts

[devans at macports.org]

Revision: 115729
          https://trac.macports.org/changeset/115729
Author:   devans at macports.org
Date:     2014-01-09 15:06:11 -0800 (Thu, 09 Jan 2014)
Log Message:
-----------
GNOME-3/stable/dports: gnome-online-accounts, sync with trunk.

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

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


Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/gnome/gnome-online-accounts:113257-115728

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile	2014-01-09 22:15:13 UTC (rev 115728)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile	2014-01-09 23:06:11 UTC (rev 115729)
@@ -22,7 +22,8 @@
                 sha256  0b2418c1845337b6574a12d2075d319d8aaa5bbc4b0d1d123108c5da00e11b97
 
 depends_build   port:pkgconfig \
-                port:intltool
+                port:intltool \
+                port:gtk-doc
 
 depends_lib     port:gtk3 \
                 path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
@@ -39,8 +40,29 @@
 
 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 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++"} {
+       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
+    }
+}
+
+platform darwin {
     set cxx_stdlib {}
 
     if {[info exists configure.cxx_stdlib] &&
@@ -61,3 +83,4 @@
 }
 
 livecheck.type  gnome
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140109/91ede9fe/attachment.html>