[119723] trunk/dports/net/pidgin/Portfile

[devans at macports.org]

Revision: 119723
          https://trac.macports.org/changeset/119723
Author:   devans at macports.org
Date:     2014-05-04 11:21:31 -0700 (Sun, 04 May 2014)
Log Message:
-----------
pidgin: disable +x11 if +quartz is set, remove redundant actions from variant quartz, add python variants to make python version selection more predictable, rebuild with new default variants.

Modified Paths:
--------------
    trunk/dports/net/pidgin/Portfile

Modified: trunk/dports/net/pidgin/Portfile
===================================================================
--- trunk/dports/net/pidgin/Portfile	2014-05-04 17:12:24 UTC (rev 119722)
+++ trunk/dports/net/pidgin/Portfile	2014-05-04 18:21:31 UTC (rev 119723)
@@ -5,7 +5,7 @@
 
 name                pidgin
 version             2.10.7
-revision            5
+revision            6
 categories          net
 platforms           darwin
 license             GPL-2+
@@ -115,7 +115,7 @@
 # Legacy no_x11 variant to be removed after May 2015.
 variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
 
-if {[variant_isset no_x11]} {
+if {[variant_isset no_x11] || [variant_isset quartz]} {
     default_variants -x11
 } else {
     default_variants +x11
@@ -123,12 +123,6 @@
 
 variant quartz conflicts x11 {
     configure.args-append   --disable-gestures
-
-    depends_build-append    port:intltool
-
-    post-patch {
-        system "cd ${worksrcpath} && ${filespath}/autogen.sh"
-    }
 }
 
 variant spellcheck description {Allow spell checking} {
@@ -136,6 +130,23 @@
     configure.args-delete   --disable-gtkspell
 }
 
+# Python is only required if --enable-dbus is used, and only for
+# the build process to generate the dbus code, not for running pidgin.
+
+variant python26 conflicts python27 description {Generate dbus code using Python 2.6} {
+    depends_build-append    port:python26
+    configure.args-append   --with-python=${prefix}/bin/python2.6
+}
+    
+variant python27 conflicts python26 description {Generate dbus code using Python 2.7} {
+    depends_build-append    port:python27
+    configure.args-append   --with-python=${prefix}/bin/python2.7
+}
+
+if {![variant_isset python26]} {
+    default_variants    +python27
+}
+    
 post-activate {
     system "dbus-uuidgen --ensure"
     system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140504/f53d2bb4/attachment.html>