[119725] users/devans/dports/net/pidgin

[devans at macports.org]

Revision: 119725
          https://trac.macports.org/changeset/119725
Author:   devans at macports.org
Date:     2014-05-04 14:53:01 -0700 (Sun, 04 May 2014)
Log Message:
-----------
devans/dports: pidgin, merge additional variant changes from trunk.

Modified Paths:
--------------
    users/devans/dports/net/pidgin/Portfile

Property Changed:
----------------
    users/devans/dports/net/pidgin/


Property changes on: users/devans/dports/net/pidgin
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/net/pidgin:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/net/pidgin:118533-119701
   + /branches/mld-qt-481/dports/net/pidgin:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/net/pidgin:118533-119724

Modified: users/devans/dports/net/pidgin/Portfile
===================================================================
--- users/devans/dports/net/pidgin/Portfile	2014-05-04 21:35:11 UTC (rev 119724)
+++ users/devans/dports/net/pidgin/Portfile	2014-05-04 21:53:01 UTC (rev 119725)
@@ -116,7 +116,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
@@ -124,12 +124,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} {
@@ -137,6 +131,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/2503a391/attachment.html>