upgrade to 0.71

4 files changed, 22 insertions, 23 deletions

diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index c7fd3faf0893..a6268e83661c 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	matplotlib
-PORTVERSION=	0.60.2
-PORTREVISION=	1
+PORTVERSION=	0.71
+PORTREVISION=	0
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,8 +27,6 @@ RUN_DEPENDS=	${PYNUMERIC} \
 BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT}
 .endif
 
-BROKEN=		Missing dependency
-
 USE_PYTHON=	2.2+
 USE_PYDISTUTILS=	yes
 USE_GNOME=	gtk20 pygtk2
diff --git a/math/py-matplotlib/distinfo b/math/py-matplotlib/distinfo
index ce5e55ab3c32..b57b1673d025 100644
--- a/math/py-matplotlib/distinfo
+++ b/math/py-matplotlib/distinfo
@@ -1,2 +1,2 @@
-MD5 (matplotlib-0.60.2.tar.gz) = e4d28311bd5457039a8ff7d26028c6d5
-SIZE (matplotlib-0.60.2.tar.gz) = 1533161
+MD5 (matplotlib-0.71.tar.gz) = 286bd4ad537fd9566214e39395a3cb50
+SIZE (matplotlib-0.71.tar.gz) = 2089317
diff --git a/math/py-matplotlib/files/patch-setup.py b/math/py-matplotlib/files/patch-setup.py
index b594846178ec..8dd8f58509ba 100644
--- a/math/py-matplotlib/files/patch-setup.py
+++ b/math/py-matplotlib/files/patch-setup.py
@@ -1,11 +1,11 @@
---- setup.py.orig	Wed Aug  4 11:22:03 2004
-+++ setup.py	Wed Aug  4 11:22:48 2004
-@@ -66,7 +66,7 @@
+--- setup.py.orig	Sat Jan 22 02:42:00 2005
++++ setup.py	Thu Jan 27 17:49:21 2005
+@@ -77,7 +77,7 @@
  data.extend(glob.glob('images/*.ppm'))
  data.append('.matplotlibrc')
  
 -data_files=[('share/matplotlib', data),]
 +data_files=[('share/py-matplotlib', data),]
  
- cxx = glob.glob('CXX/*.cxx')
- cxx.extend(glob.glob('CXX/*.c'))
+ # Figure out which array packages to provide binary support for
+ # and define the NUMERIX value: Numeric, numarray, or both.
diff --git a/math/py-matplotlib/files/patch-setupext.py b/math/py-matplotlib/files/patch-setupext.py
index 9da36040aac7..b4992c04455d 100644
--- a/math/py-matplotlib/files/patch-setupext.py
+++ b/math/py-matplotlib/files/patch-setupext.py
@@ -1,19 +1,20 @@
---- setupext.py.orig	Fri Jul  9 19:51:16 2004
-+++ setupext.py	Wed Aug  4 10:57:03 2004
-@@ -37,6 +37,7 @@
+--- setupext.py.orig	Thu Jan 27 17:47:41 2005
++++ setupext.py	Thu Jan 27 17:49:08 2005
+@@ -37,6 +37,8 @@
      'linux'  : ['/usr/local', '/usr',],
-     'darwin' : [os.getenv('MPLIB_BASE') or '/usr/local', '/usr', '/sw'],
-     'freebsd4' : [os.getenv('MBLIB_BASE') or '/usr/local', '/usr'],
-+    'freebsd5' : [os.getenv('MBLIB_BASE') or '/usr/local', '/usr'],
+     'darwin' : ['/usr/local', '/usr', '/sw', '/usr/X11R6'],
+     'freebsd4' : ['/usr/local', '/usr'],
++    'freebsd5' : ['/usr/local', '/usr'],
++    'freebsd6' : ['/usr/local', '/usr'],
      'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
  }
  
-@@ -220,7 +221,7 @@
-         else:
-             module.include_dirs.extend([o.tcl_inc, o.tk_inc])
-             module.library_dirs.extend([o.tcl_lib, o.tk_lib])
--            module.libraries.extend(['tk'+o.tkv, 'tcl'+o.tkv])
-+            module.libraries.extend(['tk84', 'tcl84'])
+@@ -302,7 +304,7 @@
+     o = find_tcltk()
+     module.include_dirs.extend([o.tcl_inc, o.tk_inc])
+     module.library_dirs.extend([o.tcl_lib, o.tk_lib])
+-    module.libraries.extend(['tk'+o.tkv, 'tcl'+o.tkv])
++    module.libraries.extend(['tk84', 'tcl84'])
  
  
  def add_windowing_flags(module):