Revision: 116644 https://trac.macports.org/changeset/116644 Author: devans@macports.org Date: 2014-01-31 16:32:35 -0800 (Fri, 31 Jan 2014) Log Message: ----------- GNOME-3/unstable/dports: devhelp, sync with stable. Modified Paths: -------------- users/devans/GNOME-3/unstable/dports/gnome/devhelp/Portfile Property Changed: ---------------- users/devans/GNOME-3/unstable/dports/gnome/devhelp/ Property changes on: users/devans/GNOME-3/unstable/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-114987 /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-116642 /users/devans/GNOME-3/stable/dports/gnome/devhelp:116273-116643 /users/rmstonecipher/gnome/devhelp:102363-103172 Modified: users/devans/GNOME-3/unstable/dports/gnome/devhelp/Portfile =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/devhelp/Portfile 2014-02-01 00:24:32 UTC (rev 116643) +++ users/devans/GNOME-3/unstable/dports/gnome/devhelp/Portfile 2014-02-01 00:32:35 UTC (rev 116644) @@ -17,7 +17,7 @@ maintainers devans openmaintainer categories gnome platforms darwin -homepage http://live.gnome.org/Apps/Devhelp +homepage https://wiki.gnome.org/Apps/Devhelp master_sites gnome:sources/${name}/${branch}/ use_xz yes @@ -35,21 +35,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 }