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

devans at macports.org devans at macports.org
Fri Oct 24 16:28:57 PDT 2014


Revision: 127292
          https://trac.macports.org/changeset/127292
Author:   devans at macports.org
Date:     2014-10-24 16:28:57 -0700 (Fri, 24 Oct 2014)
Log Message:
-----------
GNOME-3/stable: empathy, merge format changes from trunk, update to version 3.12.7, drop python variants and build with python27, drop +location as default variant due to broken geoclue2, allow parallel build.

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-125385
/users/devans/GNOME-3/unstable/dports/gnome/empathy:114069-118152
   + /trunk/dports/gnome/empathy:108265-127180
/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	2014-10-24 23:26:52 UTC (rev 127291)
+++ users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile	2014-10-24 23:28:57 UTC (rev 127292)
@@ -1,73 +1,71 @@
 # -*- 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.12.6
-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
-long_description \
-                Empathy is an instant-messaging(chat) program which supports text, \
-                voice, video, file transfers, and inter-application communication (tubes) \
-                over many different protocols(AIM, MSN, Google/Jabber, Facebook, SIP, Yahoo, etc).
-maintainers     devans openmaintainer
-categories      gnome
-platforms       darwin
-homepage        https://wiki.gnome.org/Apps/Empathy
-master_sites    gnome:sources/${name}/${branch}/
+name                empathy
+version             3.12.7
+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
+long_description    Empathy is an instant-messaging(chat) program which supports text, \
+                    voice, video, file transfers, and inter-application communication (tubes) \
+                    over many different protocols(AIM, MSN, Google/Jabber, Facebook, SIP, Yahoo, etc).
+maintainers         devans openmaintainer
+categories          gnome
+platforms           darwin
+homepage            https://wiki.gnome.org/Apps/Empathy
+master_sites        gnome:sources/${name}/${branch}/
 
-use_xz          yes
+use_xz              yes
 
-checksums       rmd160  8b003613779cdfe4dd9f1075c89c29c5ddc100e6 \
-                sha256  bf52e0c0af6179925dbf37b406d42d4a5f5e60131052a7f6a7e1822891fa0f6f
+checksums           rmd160  74d58c3a1f769a872ad0cadb707d843670a853e4 \
+                    sha256  abcc6e325474d158ba21dfc864183617cf832c3570ccefe9e32f275b94452794
 
-depends_build   port:pkgconfig \
-                port:intltool \
-                port:itstool \
-                port:yelp-tools \
-                port:gnome-common \
-                port:autoconf \
-                port:automake \
-                port:libtool \
-                port:libxslt
+depends_build       port:pkgconfig \
+                    port:intltool \
+                    port:itstool \
+                    port:yelp-tools \
+                    port:gnome-common \
+                    port:autoconf \
+                    port:automake \
+                    port:libtool \
+                    port:libxslt \
+                    port:python27
 
-depends_lib     port:desktop-file-utils \
-                port:gnome-icon-theme \
-                port:gnome-icon-theme-symbolic \
-                port:gtk3 \
-                port:dbus-glib \
-                port:folks \
-                port:libsecret \
-                port:gnutls \
-                port:gsettings-desktop-schemas \
-                port:libxml2 \
-                port:telepathy-glib \
-                port:telepathy-logger \
-                port:libcanberra \
-                port:libnotify \
-                port:gcr \
-                port:pulseaudio \
-                path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
-                port:libsoup \
-                port:libgee  \
-                port:telepathy-farstream \
-                port:clutter-gtk \
-                port:clutter-gst \
-                port:gstreamer1 \
-                port:enchant \
-                port:iso-codes \
-                port:xorg-libX11
+depends_lib         port:desktop-file-utils \
+                    port:gtk3 \
+                    port:dbus-glib \
+                    port:folks \
+                    port:libsecret \
+                    port:gnutls \
+                    port:gsettings-desktop-schemas \
+                    port:libxml2 \
+                    port:telepathy-glib \
+                    port:telepathy-logger \
+                    port:libcanberra \
+                    port:libnotify \
+                    port:gcr \
+                    port:pulseaudio \
+                    path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
+                    port:libsoup \
+                    port:libgee  \
+                    port:telepathy-farstream \
+                    port:clutter-gtk \
+                    port:clutter-gst \
+                    port:gstreamer1 \
+                    port:enchant \
+                    port:iso-codes \
+                    port:xorg-libX11
 
-depends_run     port:telepathy-mission-control \
-                port:telepathy-idle \
-                port:telepathy-gabble \
-                port:telepathy-haze \
-                port:telepathy-salut \
-                port:gnome-keyring \
-                port:gnome-settings-daemon \
-                port:yelp
+depends_run         port:telepathy-mission-control \
+                    port:telepathy-idle \
+                    port:telepathy-gabble \
+                    port:telepathy-haze \
+                    port:telepathy-salut \
+                    port:gnome-keyring \
+                    port:gnome-settings-daemon \
+                    port:yelp
 
 platform darwin {
     if {${configure.cxx_stdlib} eq "libstdc++"} {
@@ -76,28 +74,33 @@
     }
 }
 
-configure.cmd   ./autogen.sh
+configure.cmd       ./autogen.sh
+configure.python    ${prefix}/bin/python2.7
 
-configure.args  --x-includes=${prefix}/include \
-                --x-libraries=${prefix}/lib \
-                --enable-gst-1.0=yes \
-                --enable-debug \
-                --enable-gudev=no \
-                --enable-spell=yes \
-                --enable-map=no \
-                --enable-location=no \
-                --enable-geocode=no \
-                --enable-nautilus-sendto=no \
-                --enable-goa=no \
-                --without-cheese \
-                --enable-ubuntu-online-accounts=no \
-                --disable-coding-style-checks \
-                --disable-schemas-compile \
-                --disable-silent-rules \
-                --disable-Werror
+configure.args      --x-includes=${prefix}/include \
+                    --x-libraries=${prefix}/lib \
+                    --enable-gst-1.0=yes \
+                    --enable-debug \
+                    --enable-gudev=no \
+                    --enable-spell=yes \
+                    --enable-map=no \
+                    --enable-location=no \
+                    --enable-geocode=no \
+                    --enable-nautilus-sendto=no \
+                    --enable-goa=no \
+                    --without-cheese \
+                    --enable-ubuntu-online-accounts=no \
+                    --disable-coding-style-checks \
+                    --disable-schemas-compile \
+                    --disable-silent-rules \
+                    --disable-Werror
 
-use_parallel_build no
+#
+# folks is not universal
+#
 
+universal_variant   no
+
 variant map description {Enable map view} {
     depends_lib-append      port:libchamplain
     configure.args-replace  --enable-map=no --enable-map=yes
@@ -108,7 +111,7 @@
     configure.args-replace  --enable-geocode=no --enable-geocode=yes
 }
 
-variant location description {Enable location awareness using geoclue} {
+variant location description {Enable location awareness using geoclue2 (broken)} {
     depends_lib-append      port:geoclue2
     configure.args-replace  --enable-location=no --enable-location=yes
 }
@@ -119,33 +122,12 @@
     configure.args-replace  --enable-goa=no --enable-goa=yes
 }
 
-default_variants +map +geocode +goa +location
+default_variants    +map +geocode +goa
 
-#
-# folks is not universal
-#
-
-universal_variant no
-
-variant python26 conflicts python27 description {Build using Python 2.6} {
-    configure.python          ${prefix}/bin/python2.6
-    depends_build-append      port:python26
-}
-
-variant python27 conflicts python26 description {Build using Python 2.7} {
-    configure.python          ${prefix}/bin/python2.7
-    depends_build-append      port:python27
-}
-
-if {![variant_isset python26]} {
-    default_variants +python27
-}
-
-
 post-activate {
     system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
-livecheck.type  gnome
+livecheck.type      gnome
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141024/372c295d/attachment.html>


More information about the macports-changes mailing list