[90543] trunk/dports/x11/xorg-xcb-proto

[jeremyhu at macports.org]

Revision: 90543
          http://trac.macports.org/changeset/90543
Author:   jeremyhu at macports.org
Date:     2012-03-08 10:33:44 -0800 (Thu, 08 Mar 2012)
Log Message:
-----------
xorg-xcb-proto: Bump to 1.7

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

Removed Paths:
-------------
    trunk/dports/x11/xorg-xcb-proto/files/xcbproto-python3.patch

Modified: trunk/dports/x11/xorg-xcb-proto/Portfile
===================================================================
--- trunk/dports/x11/xorg-xcb-proto/Portfile	2012-03-08 16:58:52 UTC (rev 90542)
+++ trunk/dports/x11/xorg-xcb-proto/Portfile	2012-03-08 18:33:44 UTC (rev 90543)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name		xorg-xcb-proto
-version		1.6
+version		1.7
 categories	x11 devel
 license		X11
 maintainers	jeremyhu openmaintainer
@@ -15,21 +15,16 @@
 master_sites	 ${homepage}/dist/
 
 distname	xcb-proto-${version}
-checksums           md5     04313e1d914b44d0e457f6c494fc178b \
-                    sha1    e82418557c7f59f29da9ec18e0906d6d78e3a164 \
-                    rmd160  61ffea8c3ab4b745f04eccc10c64f7f1c356692c
+checksums           sha1    f47772de91394aa9ad8ee8a5b57a71072d438b2b \
+                    rmd160  e8cfbddfb9650347e4339d9421446067cef8099c \
+                    sha256  e67eb7263f222133fb9d1de70928724bea3a448cdcd99d0fa4c63c04fc124b38
 use_bzip2	yes
 
 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"
-    }
-}
+patchfiles 0001-xcbgen-Address-API-incompatability-between-xcb-proto.patch
+patch.pre_args -p1
 
-set 2to3 ""
 variant python25 conflicts python26 python27 python31 python32 description {Use python 2.5} {
     depends_run-append      port:python25
     configure.python        ${prefix}/bin/python2.5
@@ -48,13 +43,11 @@
 variant python31 conflicts python25 python26 python27 python32 description {Use python 3.1} {
     depends_run-append      port:python31
     configure.python        ${prefix}/bin/python3.1
-    set 2to3 "${prefix}/bin/2to3-3.1"
 }
 
 variant python32 conflicts python25 python26 python27 python31 description {Use python 3.2} {
     depends_run-append      port:python32
     configure.python        ${prefix}/bin/python3.2
-    set 2to3 "${prefix}/bin/2to3-3.2"
 }
 
 if {![variant_isset python25] && ![variant_isset python26] && ![variant_isset python31] && ![variant_isset python32]} {

Deleted: trunk/dports/x11/xorg-xcb-proto/files/xcbproto-python3.patch
===================================================================
--- trunk/dports/x11/xorg-xcb-proto/files/xcbproto-python3.patch	2012-03-08 16:58:52 UTC (rev 90542)
+++ trunk/dports/x11/xorg-xcb-proto/files/xcbproto-python3.patch	2012-03-08 18:33:44 UTC (rev 90543)
@@ -1,20 +0,0 @@
---- xcbgen/matcher.py
-+++ xcbgen/matcher.py
-@@ -9,14 +9,15 @@ we do not create a new type object, we just record the existing one under a new
- from os.path import join
- from xml.etree.cElementTree import parse
- 
--import state
--from xtypes import *
-+from xcbgen.xtypes import *
- 
- def import_(node, module, namespace):
-     '''
-     For imports, we load the file, create a new namespace object,
-     execute recursively, then record the import (for header files, etc.)
-     '''
-+    # To avoid circular import error
-+    from xcbgen import state
-     new_file = join(namespace.dir, '%s.xml' % node.text)
-     new_root = parse(new_file).getroot()
-     new_namespace = state.Namespace(new_file)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120308/72f0da01/attachment-0001.html>