[115656] users/devans/GNOME-3/stable/dports/gnome/empathy

[devans at macports.org]

Revision: 115656
          https://trac.macports.org/changeset/115656
Author:   devans at macports.org
Date:     2014-01-08 08:21:02 -0800 (Wed, 08 Jan 2014)
Log Message:
-----------
GNOME-3/stable/dports: empathy, sync with trunk, update to version 3.10.3.

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

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


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

Modified: users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile	2014-01-08 16:18:11 UTC (rev 115655)
+++ users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile	2014-01-08 16:21:02 UTC (rev 115656)
@@ -1,11 +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
-revision        1
+version         3.10.3
 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
@@ -21,8 +20,8 @@
 
 use_xz          yes
 
-checksums       rmd160  118fe2f8910c1d50a5134ce6525bd8fc9e6d9508 \
-                sha256  9d8e082a448f3e9450a31f0ec21f01e34cf1c15b192cfa30842d71537796cfbf
+checksums       rmd160  7b62ac6943013581d9d9e7ba1d19e534def391d4 \
+                sha256  49366acdd3c3ef9a74f63eb09920803c4c9df83056acbf8a7899e7890a9fb196
 
 depends_build   port:pkgconfig \
                 port:intltool \
@@ -63,21 +62,22 @@
                 port:gnome-settings-daemon \
                 port:yelp
 
+# 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
     }
@@ -116,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
 }
 
@@ -126,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

Modified: users/devans/GNOME-3/stable/dports/gnome/empathy/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/empathy/files/patch-configure.diff	2014-01-08 16:18:11 UTC (rev 115655)
+++ users/devans/GNOME-3/stable/dports/gnome/empathy/files/patch-configure.diff	2014-01-08 16:21:02 UTC (rev 115656)
@@ -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-07 01:30:42.000000000 -0800
++++ configure	2014-01-08 06:44:59.000000000 -0800
+@@ -13634,9 +13634,9 @@
  
  
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140108/bf0b6d73/attachment.html>