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

[devans at macports.org]

Revision: 139880
          https://trac.macports.org/changeset/139880
Author:   devans at macports.org
Date:     2015-08-31 05:38:01 -0700 (Mon, 31 Aug 2015)
Log Message:
-----------
GNOME-3/stable: empathy, merge recent licensing commits from trunk.

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

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-136146
/users/devans/GNOME-3/unstable/dports/gnome/empathy:114069-118152
   + /trunk/dports/gnome/empathy:108265-139879
/users/devans/GNOME-3/unstable/dports/gnome/empathy:114069-118152

Modified: users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile	2015-08-31 12:07:53 UTC (rev 139879)
+++ users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile	2015-08-31 12:38:01 UTC (rev 139880)
@@ -5,7 +5,7 @@
 
 name                empathy
 version             3.12.10
-license             GPL-2+ LGPL-2.1+ GFDL-1.3+ CC-BY-SA-3.0
+license             GPL-2+ LGPL-2.1+ GFDL-1.3+ CC-BY-SA-3
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Empathy is an instant-messaging(chat) program for GNOME
 long_description    Empathy is an instant-messaging(chat) program which supports text, \
@@ -67,6 +67,8 @@
                     port:gnome-settings-daemon \
                     port:yelp
 
+license_noconflict  dbus-glib gnutls
+
 platform darwin {
     if {${configure.cxx_stdlib} eq "libstdc++"} {
        depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150831/5cf20000/attachment.html>