[79644] trunk/dports/python/py27-matplotlib

[ram at macports.org]

Revision: 79644
          http://trac.macports.org/changeset/79644
Author:   ram at macports.org
Date:     2011-06-22 03:04:09 -0700 (Wed, 22 Jun 2011)
Log Message:
-----------
python/py27-matplotlib: work around bad Tkinter version report, apply
upstream fix (04b4e50), closes #29893

Modified Paths:
--------------
    trunk/dports/python/py27-matplotlib/Portfile

Added Paths:
-----------
    trunk/dports/python/py27-matplotlib/files/patch-04b4e50919.diff

Modified: trunk/dports/python/py27-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py27-matplotlib/Portfile	2011-06-22 05:56:36 UTC (rev 79643)
+++ trunk/dports/python/py27-matplotlib/Portfile	2011-06-22 10:04:09 UTC (rev 79644)
@@ -6,7 +6,7 @@
 categories-append  graphics math
 name               py27-matplotlib
 version            1.0.1
-revision           1
+revision           2
 maintainers        ram openmaintainer
 platforms          darwin
 
@@ -36,7 +36,8 @@
 
 patchfiles         patch-setupext.py.diff \
                    patch-setup.cfg.diff \
-                   patch-disable_optional_deps.diff
+                   patch-disable_optional_deps.diff \
+                   patch-04b4e50919.diff
 
 build.env          MPLIB_BASE="${prefix}" PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig/"
 

Added: trunk/dports/python/py27-matplotlib/files/patch-04b4e50919.diff
===================================================================
--- trunk/dports/python/py27-matplotlib/files/patch-04b4e50919.diff	                        (rev 0)
+++ trunk/dports/python/py27-matplotlib/files/patch-04b4e50919.diff	2011-06-22 10:04:09 UTC (rev 79644)
@@ -0,0 +1,16 @@
+--- setupext.py
++++ setupext.py
+@@ -843,8 +843,12 @@ def check_for_tk():
+                 gotit = False
+ 
+     if gotit:
++        try:
++            tk_v = Tkinter.__version__.split()[-2]
++        except IndexError:
++            tk_v = 'version not identified'
+         print_status("Tkinter", "Tkinter: %s, Tk: %s, Tcl: %s" %
+-                     (Tkinter.__version__.split()[-2], Tkinter.TkVersion, Tkinter.TclVersion))
++                     (tk_v, Tkinter.TkVersion, Tkinter.TclVersion))
+     else:
+         print_status("Tkinter", "no")
+     if explanation is not None:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110622/17799506/attachment.html>