[127698] trunk/dports/comms/telepathy-gabble

[devans at macports.org]

Revision: 127698
          https://trac.macports.org/changeset/127698
Author:   devans at macports.org
Date:     2014-11-01 05:38:18 -0700 (Sat, 01 Nov 2014)
Log Message:
-----------
telepathy-gabble: drop python variants, build with python27.

Modified Paths:
--------------
    trunk/dports/comms/telepathy-gabble/Portfile
    trunk/dports/comms/telepathy-gabble/files/patch-configure.diff

Modified: trunk/dports/comms/telepathy-gabble/Portfile
===================================================================
--- trunk/dports/comms/telepathy-gabble/Portfile	2014-11-01 11:25:36 UTC (rev 127697)
+++ trunk/dports/comms/telepathy-gabble/Portfile	2014-11-01 12:38:18 UTC (rev 127698)
@@ -5,7 +5,7 @@
 
 name            telepathy-gabble
 version         0.18.3
-revision        1
+revision        2
 license         LGPL-2.1 MIT
 description     The ${name} component of Telepathy - a Flexible Communications Framework
 long_description \
@@ -28,34 +28,19 @@
                 port:libxslt \
                 port:libsoup \
                 port:libnice \
-                port:cyrus-sasl2
+                port:cyrus-sasl2 \
+                port:py27-twisted
 
 patchfiles      patch-configure.diff \
                 patch-lib-ext-wocky-Makefile.in.diff
 
+configure.python \
+                ${prefix}/bin/python2.7
+
 configure.args  --disable-silent-rules \
                 --without-ca-certificates \
                 --disable-Werror
 
-variant python25 conflicts python26 python27 description {Use python 2.5} {
-    configure.python          ${prefix}/bin/python2.5
-    depends_lib-append        port:py25-twisted
-}
-
-variant python26 conflicts python25 python27 description {Use python 2.6} {
-    configure.python          ${prefix}/bin/python2.6
-    depends_lib-append        port:py26-twisted
-}
-
-variant python27 conflicts python25 python26 description {Use python 2.7} {
-    configure.python          ${prefix}/bin/python2.7
-    depends_lib-append        port:py27-twisted
-}
-
-if {![variant_isset python25] && ![variant_isset python26]} {
-    default_variants +python27
-}
-
 livecheck.type  regex
 livecheck.url   ${master_sites}
 livecheck.regex ${name}-(\[0-9\]+\\.\[0-9\]*\[02468\](\\.\[0-9\]+)*)${extract.suffix}

Modified: trunk/dports/comms/telepathy-gabble/files/patch-configure.diff
===================================================================
--- trunk/dports/comms/telepathy-gabble/files/patch-configure.diff	2014-11-01 11:25:36 UTC (rev 127697)
+++ trunk/dports/comms/telepathy-gabble/files/patch-configure.diff	2014-11-01 12:38:18 UTC (rev 127698)
@@ -1,6 +1,6 @@
---- configure.orig	2013-09-06 03:21:50.000000000 -0700
-+++ configure	2013-09-08 21:11:30.000000000 -0700
-@@ -14122,9 +14122,9 @@
+--- configure.orig	2014-05-07 07:48:12.000000000 -0700
++++ configure	2014-11-01 05:16:07.000000000 -0700
+@@ -14128,9 +14128,9 @@
  
  
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141101/79222faf/attachment.html>