py25-matplotlib fails to build against tk-8.5.0

[Adam Mercer]

Hi

After upgrading to tcl/tk 8.5.0 I'm getting the following error when
trying to build py25-matplotlib

DEBUG: Assembled command: 'cd
"/opt/local/var/macports/build/_Users_ram_opt_macports_python_py25-matplotlib/work/matplotlib-0.90.1"
&& /opt/local/bin/python2.5 setup.py build'
Traceback (most recent call last):
  File "setup.py", line 249, in <module>
    tk = Tkinter.Tk()
  File "/opt/local/lib/python2.5/lib-tk/Tkinter.py", line 1638, in __init__
    self._loadtk()
  File "/opt/local/lib/python2.5/lib-tk/Tkinter.py", line 1658, in _loadtk
    % (_tkinter.TK_VERSION, tk_version)
RuntimeError: tk.h version (8.5) doesn't match libtk.a version (8.4)
Error: Target org.macports.build returned: shell command " cd
"/opt/local/var/macports/build/_Users_ram_opt_macports_python_py25-matplotlib/work/matplotlib-0.90.1"
&& /opt/local/bin/python2.5 setup.py build " returned error 1
Command output: Traceback (most recent call last):
  File "setup.py", line 249, in <module>
    tk = Tkinter.Tk()
  File "/opt/local/lib/python2.5/lib-tk/Tkinter.py", line 1638, in __init__
    self._loadtk()
  File "/opt/local/lib/python2.5/lib-tk/Tkinter.py", line 1658, in _loadtk
    % (_tkinter.TK_VERSION, tk_version)
RuntimeError: tk.h version (8.5) doesn't match libtk.a version (8.4)

could it be trying to link against the system tcl/tk?

$ port installed | grep "^  t"
  tcl @8.5.0_0 (active)
  tk @8.5.0_0 (active)
$

Cheers

Adam