[74724] trunk/dports/gnome/gtk-doc/Portfile

[jmr at macports.org]

Revision: 74724
          http://trac.macports.org/changeset/74724
Author:   jmr at macports.org
Date:     2010-12-30 13:36:07 -0800 (Thu, 30 Dec 2010)
Log Message:
-----------
gtk-doc: restore python dependency (#27823), add python27 variant

Modified Paths:
--------------
    trunk/dports/gnome/gtk-doc/Portfile

Modified: trunk/dports/gnome/gtk-doc/Portfile
===================================================================
--- trunk/dports/gnome/gtk-doc/Portfile	2010-12-30 19:43:21 UTC (rev 74723)
+++ trunk/dports/gnome/gtk-doc/Portfile	2010-12-30 21:36:07 UTC (rev 74724)
@@ -36,10 +36,6 @@
                 port:docbook-xml \
                 port:docbook-xsl
 
-# Default to python 2.6, the current production version of python
-
-configure.python ${prefix}/bin/python2.6
-
 configure.perl ${prefix}/bin/perl
 configure.args  --with-xml-catalog=${prefix}/etc/xml/catalog
 
@@ -50,15 +46,27 @@
     system "${prefix}/bin/scrollkeeper-update"
 }
 
-
-variant python25 description {Configure to use python 2.5 instead of default 2.6} {
-    depends_lib-delete      port:python26
+variant python25 conflicts python26 python27 description {Use python 2.5} {
     depends_lib-append      port:python25
-    depends_run-delete      port:py26-libxml2
     depends_run-append      port:py25-libxml2
     configure.python        ${prefix}/bin/python2.5
 }
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    depends_lib-append      port:python26
+    depends_run-append      port:py26-libxml2
+    configure.python        ${prefix}/bin/python2.6
+}
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    depends_lib-append      port:python27
+    depends_run-append      port:py27-libxml2
+    configure.python        ${prefix}/bin/python2.7
+}
 
+# Default to python 2.6
+if {![variant_isset python25] && ![variant_isset python27]} {
+    default_variants +python26
+}
+
 livecheck.type  regex
 livecheck.url   http://ftp.gnome.org/pub/gnome/sources/${name}/?C=M&O=D
 livecheck.regex {(\d+(?:\.\d+)*)/}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101230/189f17e0/attachment.html>