[116190] users/devans/GNOME-3/unstable/dports/gnome/empathy

[devans at macports.org]

Revision: 116190
          https://trac.macports.org/changeset/116190
Author:   devans at macports.org
Date:     2014-01-21 00:25:03 -0800 (Tue, 21 Jan 2014)
Log Message:
-----------
GNOME-3/unstable/dports: empathy, sync with stable, update to version 3.11.4.

Modified Paths:
--------------
    users/devans/GNOME-3/unstable/dports/gnome/empathy/Portfile
    users/devans/GNOME-3/unstable/dports/gnome/empathy/files/patch-configure.diff

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


Property changes on: users/devans/GNOME-3/unstable/dports/gnome/empathy
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/gnome/empathy:108265-109982
   + /trunk/dports/gnome/empathy:108265-115773
/users/devans/GNOME-3/stable/dports/gnome/empathy:114069-116188

Modified: users/devans/GNOME-3/unstable/dports/gnome/empathy/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/empathy/Portfile	2014-01-21 08:19:09 UTC (rev 116189)
+++ users/devans/GNOME-3/unstable/dports/gnome/empathy/Portfile	2014-01-21 08:25:03 UTC (rev 116190)
@@ -1,10 +1,10 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem      1.0
 
 name            empathy
-version         3.10.2
+version         3.11.4
 license         GPL-2+ LGPL-2.1+ GFDL-1.3+ Attribution-ShareAlike-3.0
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     Empathy is an instant-messaging(chat) program for GNOME
@@ -15,13 +15,13 @@
 maintainers     devans openmaintainer
 categories      gnome
 platforms       darwin
-homepage        http://live.gnome.org/Empathy
+homepage        https://wiki.gnome.org/Apps/Empathy
 master_sites    gnome:sources/${name}/${branch}/
 
 use_xz          yes
 
-checksums       rmd160  118fe2f8910c1d50a5134ce6525bd8fc9e6d9508 \
-                sha256  9d8e082a448f3e9450a31f0ec21f01e34cf1c15b192cfa30842d71537796cfbf
+checksums       rmd160  dbcd74fdc1088f0a42315e704bfdf74b4520269b \
+                sha256  cc965c4e68710548429539e70bb6795da9a397ffd80d88e67e1386b774492d29
 
 depends_build   port:pkgconfig \
                 port:intltool \
@@ -43,7 +43,7 @@
                 port:libnotify \
                 port:gcr \
                 port:pulseaudio \
-                port:webkit-gtk3 \
+                path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
                 port:libsoup \
                 port:libgee  \
                 port:telepathy-farstream \
@@ -62,6 +62,27 @@
                 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++"} {
+       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
+    }
+}
+
 patchfiles      patch-configure.diff
 
 configure.args  --x-includes=${prefix}/include \
@@ -82,6 +103,8 @@
                 --disable-silent-rules \
                 --disable-Werror
 
+use_parallel_build no
+
 variant map description {Enable map view} {
     depends_lib-append      port:libchamplain
     configure.args-replace  --enable-map=no --enable-map=yes
@@ -93,7 +116,7 @@
 }
 
 variant location description {Enable location awareness using geoclue} {
-    depends_lib-append      port:geoclue
+    depends_lib-append      port:geoclue2
     configure.args-replace  --enable-location=no --enable-location=yes
 }
 
@@ -103,7 +126,7 @@
     configure.args-replace  --enable-goa=no --enable-goa=yes
 }
 
-default_variants +map +geocode +goa 
+default_variants +map +geocode +goa +location
 
 #
 # folks is not universal
@@ -121,8 +144,6 @@
     depends_build-append      port:python27
 }
 
-default_variants +map +goa
-
 if {![variant_isset python26]} {
     default_variants +python27
 }

Modified: users/devans/GNOME-3/unstable/dports/gnome/empathy/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/empathy/files/patch-configure.diff	2014-01-21 08:19:09 UTC (rev 116189)
+++ users/devans/GNOME-3/unstable/dports/gnome/empathy/files/patch-configure.diff	2014-01-21 08:25:03 UTC (rev 116190)
@@ -1,6 +1,6 @@
---- configure.orig	2013-09-09 06:40:52.000000000 -0700
-+++ configure	2013-09-09 09:05:49.000000000 -0700
-@@ -13611,9 +13611,9 @@
+--- configure.orig	2014-01-20 06:53:18.000000000 -0800
++++ configure	2014-01-21 00:19:44.000000000 -0800
+@@ -13614,9 +13614,9 @@
  
  
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140121/6084b246/attachment.html>