Update matplotlib to 1.4.2:

- take MAINTAINER
- switch regress tests to the new maintained test suite

tweaks and ok shadchin@

graphics/py-matplotlib/Makefile

@@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.50 2014/08/14 07:06:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.51 2014/12/23 13:48:54 daniel Exp $
 
 COMMENT=	Python charting and plotting API
 
-MODPY_EGG_VERSION =	1.2.1
-REVISION =		1
+MODPY_EGG_VERSION =	1.4.2
 DISTNAME =		matplotlib-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		graphics devel math
 
 HOMEPAGE=	http://matplotlib.sourceforge.net/
 
+MAINTAINER =	Daniel Dickman <daniel@openbsd.org>
+
 # BSD-like
 PERMIT_PACKAGE_CDROM=	Yes
 
@@ -27,15 +28,20 @@ MODULES=	lang/python \
 		devel/gettext \
 		x11/tk
 
+MODPY_SETUPTOOLS = Yes
+
 RUN_DEPENDS=	devel/py-tz \
 		devel/py-dateutil \
+		devel/py-parsing \
 		math/py-numpy \
 		x11/py-gtk2 \
 		graphics/py-Pillow \
 		${MODPY_TKINTER_DEPENDS}
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	graphics/png
-TEST_DEPENDS =	${RUN_DEPENDS}
+TEST_DEPENDS =	${RUN_DEPENDS} \
+		devel/py-six \
+		devel/py-nose
 
 MAKE_ENV+=	EXTRA_INCLUDES="${WRKSRC} ${MODTCL_INCDIR} ${MODTK_INCDIR}" \
 		LDSHARED="${CC} -shared -fPIC"
@@ -49,9 +55,9 @@ post-install:
 	cd ${WRKSRC}/examples && pax -rw * \
 	    ${PREFIX}/share/examples/py-matplotlib
 
+# http://matplotlib.org/devel/testing.html
 do-test: fake
-	cd ${WRKSRC}/examples/tests && ${MAKE_ENV} \
-	    PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \
-	    ${MODPY_BIN} backend_driver.py
+	${MAKE_ENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} ${MODPY_BIN} -c \
+		'import matplotlib ; matplotlib.test()'
 
 .include <bsd.port.mk>

graphics/py-matplotlib/distinfo

@@ -1,2 +1,2 @@
-SHA256 (matplotlib-1.2.1.tar.gz) = UuGJcq7YXzCwXO9Bd47HdoXfYBLwWYzSFumW3pueops=
-SIZE (matplotlib-1.2.1.tar.gz) = 38446200
+SHA256 (matplotlib-1.4.2.tar.gz) = F6PHFU8VLY3+0fN1F8Coxdtq3k9jNPaEmJw22rhN21Q=
+SIZE (matplotlib-1.4.2.tar.gz) = 50139344

graphics/py-matplotlib/patches/patch-setupext_py

@@ -1,11 +1,11 @@
-$OpenBSD: patch-setupext_py,v 1.14 2014/01/10 19:05:07 landry Exp $
---- setupext.py.orig	Fri Jan 10 19:53:17 2014
-+++ setupext.py	Fri Jan 10 19:56:08 2014
-@@ -1167,6 +1167,7 @@ def build_tkagg(ext_modules, packages):
-                        define_macros=defines
-                        )
+$OpenBSD: patch-setupext_py,v 1.15 2014/12/23 13:48:54 daniel Exp $
+--- setupext.py.orig	Wed Oct 22 21:54:01 2014
++++ setupext.py	Tue Dec 16 11:30:47 2014
+@@ -1365,6 +1365,7 @@ class BackendTkAgg(OptionalBackendPackage):
+             ]
  
-+    module.include_dirs.extend(['${X11BASE}/include'])
-     add_tk_flags(module) # do this first
-     add_agg_flags(module)
-     add_ft2font_flags(module)
+         ext = make_extension('matplotlib.backends._tkagg', sources)
++        ext.include_dirs.extend(['${X11BASE}/include'])
+         self.add_flags(ext)
+         Numpy().add_flags(ext)
+         LibAgg().add_flags(ext)