Changeset 83061

Timestamp:

08/24/11 18:18:00 (4 years ago)

Author:

jmr@…

Message:

xorg-libxcb, xorg-xcb-proto: fix python31 and python32 variants (#26418)

Location:

trunk/dports/x11

Files:

• xorg-libxcb/Portfile (modified) (3 diffs)
• xorg-libxcb/files (added)
• xorg-libxcb/files/libxcb-python3.patch (added)
• xorg-xcb-proto/Portfile (modified) (3 diffs)
• xorg-xcb-proto/files (added)
• xorg-xcb-proto/files/xcbproto-python3.patch (added)

trunk/dports/x11/xorg-libxcb/Portfile

@@ -28 +28 @@
                 port:xorg-libpthread-stubs
 
+if {[variant_isset python31] || [variant_isset python32]} {
+    patchfiles-append libxcb-python3.patch
+    post-patch {
+        system -W ${worksrcpath}/src "$2to3 -w *.py"
+    }
+}
+
+set 2to3 ""
 variant python25 conflicts python26 python27 python31 python32 description {Use python 2.5} {
     depends_run-append      port:python25
@@ -46 +54 @@
     depends_run-append      port:python31
     configure.python        ${prefix}/bin/python3.1
+    set 2to3 "${prefix}/bin/2to3-3.1"
 }
 
@@ -51 +60 @@
     depends_run-append      port:python32
     configure.python        ${prefix}/bin/python3.2
+    set 2to3 "${prefix}/bin/2to3-3.2"
 }
 

trunk/dports/x11/xorg-xcb-proto/Portfile

@@ -23 +23 @@
 depends_run     port:libxml2
 
+if {[variant_isset python31] || [variant_isset python32]} {
+    patchfiles-append xcbproto-python3.patch
+    post-patch {
+        system -W ${worksrcpath}/xcbgen "$2to3 -w *.py"
+    }
+}
+
+set 2to3 ""
 variant python25 conflicts python26 python27 python31 python32 description {Use python 2.5} {
     depends_run-append      port:python25
@@ -41 +49 @@
     depends_run-append      port:python31
     configure.python        ${prefix}/bin/python3.1
+    set 2to3 "${prefix}/bin/2to3-3.1"
 }
 
@@ -46 +55 @@
     depends_run-append      port:python32
     configure.python        ${prefix}/bin/python3.2
+    set 2to3 "${prefix}/bin/2to3-3.2"
 }