- Update to 0.91.2 [1]

- portlint fix
- Respect NOPORTEXAMPLES

PR:		ports/121893
Submitted by:	Geoffrey Mainland <mainland AT apeiron.net> (maintainer)

math/py-matplotlib/Makefile

@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	matplotlib
-PORTVERSION=	0.90.0
-PORTREVISION=	1
+PORTVERSION=	0.91.2
 CATEGORIES=	math python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,14 +15,14 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	mainland@apeiron.net
 COMMENT=	A plotting library uses a syntax familiar to matlab users
 
-BUILD_DEPENDS=	${PYNUMERIC} \
+BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_SITELIBDIR}/${PYPYTZ_EGG}:${PORTSDIR}/devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
 		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${LOCALBASE}/lib/libagg.a:${PORTSDIR}/graphics/agg
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		png.5:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	${PYNUMERIC} \
+RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 .if defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT}
@@ -49,12 +48,10 @@ post-patch:
 		-e s,%%USE_TCL%%,${USE_TCL}, \
 		${WRKSRC}/setupext.py
 
+.if !defined(NOPORTEXAMPLES)
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
+.endif
 
-.include <bsd.port.pre.mk>
-
-PYPYTZ_EGG!=	${MAKE} -f ${PORTSDIR}/devel/py-pytz/Makefile -V PYPYTZ_EGG
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

math/py-matplotlib/distinfo

@@ -1,3 +1,3 @@
-MD5 (matplotlib-0.90.0.tar.gz) = 31ea12395826080b5be9c1e292cda6f1
-SHA256 (matplotlib-0.90.0.tar.gz) = c3c34a58a62706c48b98a16a0702a8114f2674780197ac715cd66f65fac5478d
-SIZE (matplotlib-0.90.0.tar.gz) = 2795281
+MD5 (matplotlib-0.91.2.tar.gz) = 7abe21ca9e26df4a44f3208d6007fe16
+SHA256 (matplotlib-0.91.2.tar.gz) = c25f6350b0047c0983d14933344006f95e48f22131de111db40af15bc21c15d2
+SIZE (matplotlib-0.91.2.tar.gz) = 6457944

math/py-matplotlib/files/patch-lib__matplotlib__afm.py

@@ -0,0 +1,11 @@
+--- lib/matplotlib/afm.py.orig  2008-02-22 14:38:41.000000000 -0500
++++ lib/matplotlib/afm.py      2008-02-22 14:39:40.000000000 -0500
+@@ -164,7 +164,7 @@
+         num = _to_int(vals[0].split()[1])
+         wx = _to_float(vals[1].split()[1])
+         name = vals[2].split()[1]
+-        bbox = _to_list_of_ints(vals[3][2:])
++        bbox = _to_list_of_floats(vals[3][2:])
+         # Workaround: If the character name is 'Euro', give it the corresponding
+         # character code, according to WinAnsiEncoding (see PDF Reference).
+         if name == 'Euro':

math/py-matplotlib/files/patch-setupext.py

@@ -1,9 +1,9 @@
---- setupext.py.orig	2007-02-01 04:32:51.000000000 -0500
-+++ setupext.py	2007-12-19 21:26:33.000000000 -0500
-@@ -50,9 +50,11 @@
+--- setupext.py.orig	2007-12-24 13:23:32.000000000 -0500
++++ setupext.py	2008-02-22 12:23:24.000000000 -0500
+@@ -52,9 +52,11 @@
      'cygwin' : ['/usr/local', '/usr',],
      'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
-                 '/usr', '/sw'],
+                 '/usr', '/sw', '/usr/X11R6'],
 -    'freebsd4' : ['/usr/local', '/usr'],
 -    'freebsd5' : ['/usr/local', '/usr'],
 -    'freebsd6' : ['/usr/local', '/usr'],
@@ -15,15 +15,16 @@
      'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
      'gnukfreebsd5' : ['/usr/local', '/usr'],
      'gnukfreebsd6' : ['/usr/local', '/usr'],
-@@ -455,9 +457,9 @@
+@@ -983,9 +985,9 @@
+             tk_lib = "/usr/local/lib"
+             tk_ver = ""
+         # Add final versions of directories and libraries to module lists
+-        module.include_dirs.extend([tcl_inc, tk_inc])
+-        module.library_dirs.extend([tcl_lib, tk_lib])
+-        module.libraries.extend(['tk' + tk_ver, 'tcl' + tk_ver])
++        module.include_dirs.extend(["%%TCL_INCLUDEDIR%%", "%%TK_INCLUDEDIR%%"])
++        module.library_dirs.extend(["%%TCL_LIBDIR%%", "%%TK_LIBDIR%%"])
++        module.libraries.extend(['tk%%USE_TK%%', 'tcl%%USE_TCL%%'])
+     
+     return message
  
-     # you're still here? ok we'll try it this way
-     o = find_tcltk() # todo: try/except
--    module.include_dirs.extend([o.tcl_inc, o.tk_inc])
-+    module.include_dirs.extend(["%%TCL_INCLUDEDIR%%", "%%TK_INCLUDEDIR%%"])
-     module.library_dirs.extend([o.tcl_lib, o.tk_lib])
--    module.libraries.extend(['tk'+o.tkv, 'tcl'+o.tkv])
-+    module.libraries.extend(['tk%%USE_TK%%', 'tcl%%USE_TCL%%'])
- 
- 
- def add_windowing_flags(module):

math/py-matplotlib/files/patch-src__mplutils.cpp

@@ -0,0 +1,7 @@
+--- src/mplutils.cpp.orig	Wed Mar  9 16:35:35 2005
++++ src/mplutils.cpp	Wed Mar  9 16:36:19 2005
+@@ -1,3 +1,4 @@
++#include <stdio.h>
+ #include <iostream>
+ #include <cstdarg>
+ #include "mplutils.h"