[43076] trunk/dports/x11/xorg-xcb-proto/Portfile

jeremyhu at macports.org jeremyhu at macports.org
Wed Dec 3 21:53:49 PST 2008


Revision: 43076
          http://trac.macports.org/changeset/43076
Author:   jeremyhu at macports.org
Date:     2008-12-03 21:53:49 -0800 (Wed, 03 Dec 2008)
Log Message:
-----------
xcbproto: Formatting cleanup suggestions from Ryan

Modified Paths:
--------------
    trunk/dports/x11/xorg-xcb-proto/Portfile

Modified: trunk/dports/x11/xorg-xcb-proto/Portfile
===================================================================
--- trunk/dports/x11/xorg-xcb-proto/Portfile	2008-12-04 05:52:06 UTC (rev 43075)
+++ trunk/dports/x11/xorg-xcb-proto/Portfile	2008-12-04 05:53:49 UTC (rev 43076)
@@ -20,31 +20,33 @@
 
 universal_variant no
 
-set pyversion   2.6
-depends_run     port:libxml2 \
-                port:python[strsed ${pyversion} {g/[.]//}]
-configure.env   PYTHON=${prefix}/bin/python${pyversion}  
+depends_run     port:libxml2
 
-variant python25 description {Use python 2.5 for xcbgen} {
-    depends_run-delete      port:python[strsed ${pyversion} {g/[.]//}]
-    configure.env-delete    PYTHON=${prefix}/bin/python${pyversion}
+default_variants +python26
 
-    set pyversion           2.5
+variant python25 conflicts python26 python30 description {Use python 2.5 for xcbgen} {
+    depends_run-append      port:python25
+    configure.python        ${prefix}/bin/python2.5
+}
 
-    depends_lib-append      port:python[strsed ${pyversion} {g/[.]//}]
-    configure.env-append    PYTHON=${prefix}/bin/python${pyversion}
+variant python26 conflicts python25 python30 description {Use python 2.6 for xcbgen} {
+    set pyversion           2.6
+
+    depends_run-append      port:python26
+    configure.python        ${prefix}/bin/python2.6
 }
 
-variant python30 description {Use python 3.0 for xcbgen} {
-    depends_run-delete      port:python[strsed ${pyversion} {g/[.]//}]
-    configure.env-delete    PYTHON=${prefix}/bin/python${pyversion}
-
+variant python30 conflicts python25 python26 description {Use python 3.0 for xcbgen} {
     set pyversion           3.0
 
-    depends_lib-append      port:python[strsed ${pyversion} {g/[.]//}]
-    configure.env-append    PYTHON=${prefix}/bin/python${pyversion}
+    depends_run-append      port:python30
+    configure.python        ${prefix}/bin/python3.0
 }
 
+if {![variant_isset python25] && ![variant_isset python30]} {
+    default_variants +python26
+}
+
 livecheck.check regex
 livecheck.url   ${master_sites}?C=M&O=D
 livecheck.regex xcb-proto-(\\d+(?:\\.\\d+)*)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081203/dac59e58/attachment.html>


More information about the macports-changes mailing list