sync w/ base pkg

4 files changed, 23 insertions, 113 deletions

diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile
index 4b9e2748a04..f6583b6cb27 100644
--- a/graphics/py-matplotlib-gtk2/Makefile
+++ b/graphics/py-matplotlib-gtk2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2013/10/10 14:42:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.45 2014/01/21 21:16:02 drochner Exp $
 #
 
-DISTNAME=		matplotlib-1.2.1
-PKGNAME=		${PYPKGPREFIX}-matplotlib-gtk-1.2.1
-PKGREVISION=		2
+DISTNAME=		matplotlib-1.3.1
+PKGNAME=		${PYPKGPREFIX}-matplotlib-gtk-1.3.1
 CATEGORIES=		graphics python
 MASTER_SITES=		https://github.com/downloads/matplotlib/matplotlib/
 FETCH_USING=		curl
@@ -30,7 +29,10 @@ post-patch:
 	${ECHO} "wxagg = False"; \
 	${ECHO} "macosx = False" ) > ${WRKSRC}/setup.cfg
 
-.include "../../lang/python/extension.mk"
+post-install:
+	${RM} -r ${DESTDIR}/${PREFIX}/${PYSITELIB}/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
+
+.include "../../lang/python/egg.mk"
 .include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/graphics/py-matplotlib-gtk2/distinfo b/graphics/py-matplotlib-gtk2/distinfo
index 9e36ac0179a..cc2cbc77abb 100644
--- a/graphics/py-matplotlib-gtk2/distinfo
+++ b/graphics/py-matplotlib-gtk2/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.12 2013/07/24 11:13:56 drochner Exp $
+$NetBSD: distinfo,v 1.13 2014/01/21 21:16:02 drochner Exp $
 
-SHA1 (matplotlib-1.2.1.tar.gz) = 82fc44d0047a713c1b0b1b4ea2503e6a41c57f98
-RMD160 (matplotlib-1.2.1.tar.gz) = c27142f1d6665bc6a748f601558045e7d801dbef
-Size (matplotlib-1.2.1.tar.gz) = 38446200 bytes
-SHA1 (patch-aa) = 7ff4d7f4bbd9a2b19b839f92e0a7b568db4d4fb9
-SHA1 (patch-ab) = d6b69b74d74a67c90b09f821ffe7da8eec79a855
+SHA1 (matplotlib-1.3.1.tar.gz) = 8578afc86424392591c0ee03f7613ffa9b6f68ee
+RMD160 (matplotlib-1.3.1.tar.gz) = 7c2647ae1d6aafdc1c32e47183239c7da0d91956
+Size (matplotlib-1.3.1.tar.gz) = 42163182 bytes
+SHA1 (patch-ab) = 447e2cfd0bf2571fe8e1b77f47a5de9563ec45ee
diff --git a/graphics/py-matplotlib-gtk2/patches/patch-aa b/graphics/py-matplotlib-gtk2/patches/patch-aa
deleted file mode 100644
index b07421e3462..00000000000
--- a/graphics/py-matplotlib-gtk2/patches/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2012/12/17 11:52:42 drochner Exp $
-
---- setupext.py.orig	2012-11-06 22:31:09.000000000 +0000
-+++ setupext.py
-@@ -108,13 +108,13 @@ options = {'display_status': True,
-            'provide_pytz': 'auto',
-            'provide_dateutil': 'auto',
-            'provide_six': 'auto',
--           'build_agg': True,
-+           'build_agg': False,
-            'build_gtk': 'auto',
-            'build_gtkagg': 'auto',
-            'build_tkagg': 'auto',
-            'build_macosx': 'auto',
--           'build_image': True,
--           'build_windowing': True,
-+           'build_image': False,
-+           'build_windowing': False,
-            'backend': None,
-            'basedirlist': None}
- 
-@@ -218,12 +218,7 @@ sysconfig.customize_compiler = my_custom
- 
- 
- def run_child_process(cmd):
--    p = subprocess.Popen(cmd, shell=True,
--                         stdin=subprocess.PIPE,
--                         stdout=subprocess.PIPE,
--                         stderr=subprocess.STDOUT,
--                         close_fds=(sys.platform != 'win32'))
--    return p.stdin, p.stdout
-+    return None, os.popen(cmd + " 2>&1")
- 
- class CleanUpFile:
-     """CleanUpFile deletes the specified filename when self is destroyed."""
-@@ -379,11 +374,8 @@ def check_for_libpng():
-     return True
- 
- def add_base_flags(module):
--    incdirs = filter(os.path.exists,
--                     [os.path.join(p, 'include') for p in basedirlist ])
--    libdirs = filter(os.path.exists,
--                     [os.path.join(p, 'lib')     for p in basedirlist ]+
--                     [os.path.join(p, 'lib64')     for p in basedirlist ] )
-+    incdirs = [os.path.join(os.environ['LOCALBASE'], 'include')]
-+    libdirs = [os.path.join(os.environ['LOCALBASE'], 'lib')]
- 
-     module.include_dirs.extend(incdirs)
-     module.include_dirs.append('.')
diff --git a/graphics/py-matplotlib-gtk2/patches/patch-ab b/graphics/py-matplotlib-gtk2/patches/patch-ab
index 7869a075637..412d1a17802 100644
--- a/graphics/py-matplotlib-gtk2/patches/patch-ab
+++ b/graphics/py-matplotlib-gtk2/patches/patch-ab
@@ -1,55 +1,13 @@
-$NetBSD: patch-ab,v 1.8 2013/07/24 11:13:56 drochner Exp $
+$NetBSD: patch-ab,v 1.9 2014/01/21 21:16:02 drochner Exp $
 
---- setup.py.orig	2013-03-26 13:04:37.000000000 +0000
+--- setup.py.orig	2014-01-21 18:50:49.000000000 +0000
 +++ setup.py
-@@ -141,12 +141,12 @@ if not check_for_numpy(__version__numpy_
- if not check_for_freetype():
-     sys.exit(1)
- 
--build_ft2font(ext_modules, packages)
--build_ttconv(ext_modules, packages)
--build_contour(ext_modules, packages)
--build_delaunay(ext_modules, packages)
--build_path(ext_modules, packages)
--build_tri(ext_modules, packages)
-+#build_ft2font(ext_modules, packages)
-+#build_ttconv(ext_modules, packages)
-+#build_contour(ext_modules, packages)
-+#build_delaunay(ext_modules, packages)
-+#build_path(ext_modules, packages)
-+#build_tri(ext_modules, packages)
- 
- print_raw("")
- print_raw("OPTIONAL BACKEND DEPENDENCIES")
-@@ -176,13 +176,13 @@ if options['build_tkagg']:
-         build_tkagg(ext_modules, packages)
-         rc['backend'] = 'TkAgg'
- 
--hasgtk = check_for_gtk()
-+hasgtk = 1
- if options['build_gtk']:
-     if hasgtk or (options['build_gtk'] is True):
-         build_gdk(ext_modules, packages)
- if options['build_gtkagg']:
-     if hasgtk or (options['build_gtkagg'] is True):
--        options['build_agg'] = 1
-+        options['build_agg'] = 0
-         build_gtkagg(ext_modules, packages)
-         rc['backend'] = 'GTKAgg'
- 
-@@ -323,12 +323,12 @@ distrib = setup(name="matplotlib",
-       which emulates matlab graphics
-       """,
-       download_url="https://downloads.sourceforge.net/project/matplotlib/matplotlib/matplotlib-{0}/matplotlib-{0}.tar.gz".format(__version__),
--      packages = packages,
-+#      packages = packages,
-       platforms='any',
--      py_modules = py_modules,
-+#      py_modules = py_modules,
-       ext_modules = ext_modules,
-       package_dir = package_dir,
--      package_data = package_data,
-+#      package_data = package_data,
-       classifiers = classifiers,
-       cmdclass = {'build_py': build_py},
-       **additional_params
+@@ -139,7 +139,7 @@ if __name__ == '__main__':
+ 
+     required_failed = []
+     good_packages = []
+-    for package in mpl_packages:
++    for package in [setupext.Numpy(),setupext.CXX(),setupext.LibAgg(),setupext.BackendGtkAgg(),setupext.BackendGtk()]:
+         if isinstance(package, str):
+             print_raw('')
+             print_raw(package.upper())