Mon May 17 16:22:59 2010 UTC ()
update to 0.99.2.1
changes:
-new frameworks: mplot3d, axes grid, axis spine placement
-bugfixes
(drochner)
diff -r1.24 -r1.25 pkgsrc/graphics/py-matplotlib/Makefile
diff -r1.11 -r1.12 pkgsrc/graphics/py-matplotlib/PLIST
diff -r1.9 -r1.10 pkgsrc/graphics/py-matplotlib/distinfo
diff -r1.15 -r1.16 pkgsrc/graphics/py-matplotlib-gtk2/Makefile
diff -r1.3 -r1.4 pkgsrc/graphics/py-matplotlib-gtk2/distinfo
diff -r1.3 -r1.4 pkgsrc/graphics/py-matplotlib-gtk2/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/graphics/py-matplotlib-gtk2/patches/patch-ab
diff -r1.4 -r1.5 pkgsrc/graphics/py-matplotlib-tk/Makefile
diff -r1.3 -r1.4 pkgsrc/graphics/py-matplotlib-tk/distinfo
diff -r1.2 -r1.3 pkgsrc/graphics/py-matplotlib-tk/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/graphics/py-matplotlib-tk/patches/patch-ab
diff -r1.6 -r1.7 pkgsrc/graphics/py-matplotlib/patches/patch-aa
--- pkgsrc/graphics/py-matplotlib/Makefile 2009/09/23 09:54:45 1.24
+++ pkgsrc/graphics/py-matplotlib/Makefile 2010/05/17 16:22:59 1.25
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2009/09/23 09:54:45 tron Exp $
+# $NetBSD: Makefile,v 1.25 2010/05/17 16:22:59 drochner Exp $
#
-DISTNAME= matplotlib-0.98.4
+DISTNAME= matplotlib-0.99.1.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/}
@@ -15,6 +15,7 @@
PKG_DESTDIR_SUPPORT= user-destdir
+WRKSRC= ${WRKDIR}/matplotlib-0.99.1.1
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
PY_PATCHPLIST= yes
--- pkgsrc/graphics/py-matplotlib/PLIST 2009/08/05 11:02:12 1.11
+++ pkgsrc/graphics/py-matplotlib/PLIST 2010/05/17 16:22:59 1.12
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/08/05 11:02:12 markd Exp $
-${PYSITELIB}/configobj.py
-${PYSITELIB}/configobj.pyc
-${PYSITELIB}/configobj.pyo
+@comment $NetBSD: PLIST,v 1.12 2010/05/17 16:22:59 drochner Exp $
${PYSITELIB}/matplotlib/__init__.py
${PYSITELIB}/matplotlib/__init__.pyc
${PYSITELIB}/matplotlib/__init__.pyo
@@ -28,9 +25,6 @@
${PYSITELIB}/matplotlib/axes.py
${PYSITELIB}/matplotlib/axes.pyc
${PYSITELIB}/matplotlib/axes.pyo
-${PYSITELIB}/matplotlib/axes3d.py
-${PYSITELIB}/matplotlib/axes3d.pyc
-${PYSITELIB}/matplotlib/axes3d.pyo
${PYSITELIB}/matplotlib/axis.py
${PYSITELIB}/matplotlib/axis.pyc
${PYSITELIB}/matplotlib/axis.pyo
@@ -134,33 +128,6 @@
${PYSITELIB}/matplotlib/colors.py
${PYSITELIB}/matplotlib/colors.pyc
${PYSITELIB}/matplotlib/colors.pyo
-${PYSITELIB}/matplotlib/config/__init__.py
-${PYSITELIB}/matplotlib/config/__init__.pyc
-${PYSITELIB}/matplotlib/config/__init__.pyo
-${PYSITELIB}/matplotlib/config/checkdep.py
-${PYSITELIB}/matplotlib/config/checkdep.pyc
-${PYSITELIB}/matplotlib/config/checkdep.pyo
-${PYSITELIB}/matplotlib/config/cutils.py
-${PYSITELIB}/matplotlib/config/cutils.pyc
-${PYSITELIB}/matplotlib/config/cutils.pyo
-${PYSITELIB}/matplotlib/config/mplconfig.py
-${PYSITELIB}/matplotlib/config/mplconfig.pyc
-${PYSITELIB}/matplotlib/config/mplconfig.pyo
-${PYSITELIB}/matplotlib/config/mpltraits.py
-${PYSITELIB}/matplotlib/config/mpltraits.pyc
-${PYSITELIB}/matplotlib/config/mpltraits.pyo
-${PYSITELIB}/matplotlib/config/rcparams.py
-${PYSITELIB}/matplotlib/config/rcparams.pyc
-${PYSITELIB}/matplotlib/config/rcparams.pyo
-${PYSITELIB}/matplotlib/config/rcsetup.py
-${PYSITELIB}/matplotlib/config/rcsetup.pyc
-${PYSITELIB}/matplotlib/config/rcsetup.pyo
-${PYSITELIB}/matplotlib/config/tconfig.py
-${PYSITELIB}/matplotlib/config/tconfig.pyc
-${PYSITELIB}/matplotlib/config/tconfig.pyo
-${PYSITELIB}/matplotlib/config/verbose.py
-${PYSITELIB}/matplotlib/config/verbose.pyc
-${PYSITELIB}/matplotlib/config/verbose.pyo
${PYSITELIB}/matplotlib/contour.py
${PYSITELIB}/matplotlib/contour.pyc
${PYSITELIB}/matplotlib/contour.pyo
@@ -195,6 +162,9 @@
${PYSITELIB}/matplotlib/fontconfig_pattern.pyc
${PYSITELIB}/matplotlib/fontconfig_pattern.pyo
${PYSITELIB}/matplotlib/ft2font.so
+${PYSITELIB}/matplotlib/hatch.py
+${PYSITELIB}/matplotlib/hatch.pyc
+${PYSITELIB}/matplotlib/hatch.pyo
${PYSITELIB}/matplotlib/image.py
${PYSITELIB}/matplotlib/image.pyc
${PYSITELIB}/matplotlib/image.pyo
@@ -368,12 +338,6 @@
${PYSITELIB}/matplotlib/numerix/__init__.py
${PYSITELIB}/matplotlib/numerix/__init__.pyc
${PYSITELIB}/matplotlib/numerix/__init__.pyo
-${PYSITELIB}/matplotlib/numerix/_na_imports.py
-${PYSITELIB}/matplotlib/numerix/_na_imports.pyc
-${PYSITELIB}/matplotlib/numerix/_na_imports.pyo
-${PYSITELIB}/matplotlib/numerix/_nc_imports.py
-${PYSITELIB}/matplotlib/numerix/_nc_imports.pyc
-${PYSITELIB}/matplotlib/numerix/_nc_imports.pyo
${PYSITELIB}/matplotlib/numerix/_sp_imports.py
${PYSITELIB}/matplotlib/numerix/_sp_imports.pyc
${PYSITELIB}/matplotlib/numerix/_sp_imports.pyo
@@ -389,9 +353,6 @@
${PYSITELIB}/matplotlib/numerix/mlab/__init__.py
${PYSITELIB}/matplotlib/numerix/mlab/__init__.pyc
${PYSITELIB}/matplotlib/numerix/mlab/__init__.pyo
-${PYSITELIB}/matplotlib/numerix/npyma/__init__.py
-${PYSITELIB}/matplotlib/numerix/npyma/__init__.pyc
-${PYSITELIB}/matplotlib/numerix/npyma/__init__.pyo
${PYSITELIB}/matplotlib/numerix/random_array/__init__.py
${PYSITELIB}/matplotlib/numerix/random_array/__init__.pyc
${PYSITELIB}/matplotlib/numerix/random_array/__init__.pyo
@@ -432,6 +393,21 @@
${PYSITELIB}/matplotlib/scale.py
${PYSITELIB}/matplotlib/scale.pyc
${PYSITELIB}/matplotlib/scale.pyo
+${PYSITELIB}/matplotlib/sphinxext/__init__.py
+${PYSITELIB}/matplotlib/sphinxext/__init__.pyc
+${PYSITELIB}/matplotlib/sphinxext/__init__.pyo
+${PYSITELIB}/matplotlib/sphinxext/mathmpl.py
+${PYSITELIB}/matplotlib/sphinxext/mathmpl.pyc
+${PYSITELIB}/matplotlib/sphinxext/mathmpl.pyo
+${PYSITELIB}/matplotlib/sphinxext/only_directives.py
+${PYSITELIB}/matplotlib/sphinxext/only_directives.pyc
+${PYSITELIB}/matplotlib/sphinxext/only_directives.pyo
+${PYSITELIB}/matplotlib/sphinxext/plot_directive.py
+${PYSITELIB}/matplotlib/sphinxext/plot_directive.pyc
+${PYSITELIB}/matplotlib/sphinxext/plot_directive.pyo
+${PYSITELIB}/matplotlib/spines.py
+${PYSITELIB}/matplotlib/spines.pyc
+${PYSITELIB}/matplotlib/spines.pyo
${PYSITELIB}/matplotlib/table.py
${PYSITELIB}/matplotlib/table.pyc
${PYSITELIB}/matplotlib/table.pyo
@@ -444,6 +420,9 @@
${PYSITELIB}/matplotlib/ticker.py
${PYSITELIB}/matplotlib/ticker.pyc
${PYSITELIB}/matplotlib/ticker.pyo
+${PYSITELIB}/matplotlib/tight_bbox.py
+${PYSITELIB}/matplotlib/tight_bbox.pyc
+${PYSITELIB}/matplotlib/tight_bbox.pyo
${PYSITELIB}/matplotlib/transforms.py
${PYSITELIB}/matplotlib/transforms.pyc
${PYSITELIB}/matplotlib/transforms.pyo
@@ -463,12 +442,66 @@
${PYSITELIB}/mpl_toolkits/__init__.py
${PYSITELIB}/mpl_toolkits/__init__.pyc
${PYSITELIB}/mpl_toolkits/__init__.pyo
+${PYSITELIB}/mpl_toolkits/axes_grid/__init__.py
+${PYSITELIB}/mpl_toolkits/axes_grid/__init__.pyc
+${PYSITELIB}/mpl_toolkits/axes_grid/__init__.pyo
+${PYSITELIB}/mpl_toolkits/axes_grid/anchored_artists.py
+${PYSITELIB}/mpl_toolkits/axes_grid/anchored_artists.pyc
+${PYSITELIB}/mpl_toolkits/axes_grid/anchored_artists.pyo
+${PYSITELIB}/mpl_toolkits/axes_grid/angle_helper.py
+${PYSITELIB}/mpl_toolkits/axes_grid/angle_helper.pyc
+${PYSITELIB}/mpl_toolkits/axes_grid/angle_helper.pyo
+${PYSITELIB}/mpl_toolkits/axes_grid/axes_divider.py
+${PYSITELIB}/mpl_toolkits/axes_grid/axes_divider.pyc
+${PYSITELIB}/mpl_toolkits/axes_grid/axes_divider.pyo
+${PYSITELIB}/mpl_toolkits/axes_grid/axes_grid.py
+${PYSITELIB}/mpl_toolkits/axes_grid/axes_grid.pyc
+${PYSITELIB}/mpl_toolkits/axes_grid/axes_grid.pyo
+${PYSITELIB}/mpl_toolkits/axes_grid/axes_rgb.py
+${PYSITELIB}/mpl_toolkits/axes_grid/axes_rgb.pyc
+${PYSITELIB}/mpl_toolkits/axes_grid/axes_rgb.pyo
+${PYSITELIB}/mpl_toolkits/axes_grid/axes_size.py
+${PYSITELIB}/mpl_toolkits/axes_grid/axes_size.pyc
+${PYSITELIB}/mpl_toolkits/axes_grid/axes_size.pyo
+${PYSITELIB}/mpl_toolkits/axes_grid/axislines.py
+${PYSITELIB}/mpl_toolkits/axes_grid/axislines.pyc
+${PYSITELIB}/mpl_toolkits/axes_grid/axislines.pyo
+${PYSITELIB}/mpl_toolkits/axes_grid/clip_path.py
+${PYSITELIB}/mpl_toolkits/axes_grid/clip_path.pyc
+${PYSITELIB}/mpl_toolkits/axes_grid/clip_path.pyo
+${PYSITELIB}/mpl_toolkits/axes_grid/grid_finder.py
+${PYSITELIB}/mpl_toolkits/axes_grid/grid_finder.pyc
+${PYSITELIB}/mpl_toolkits/axes_grid/grid_finder.pyo
+${PYSITELIB}/mpl_toolkits/axes_grid/grid_helper_curvelinear.py
+${PYSITELIB}/mpl_toolkits/axes_grid/grid_helper_curvelinear.pyc
+${PYSITELIB}/mpl_toolkits/axes_grid/grid_helper_curvelinear.pyo
+${PYSITELIB}/mpl_toolkits/axes_grid/inset_locator.py
+${PYSITELIB}/mpl_toolkits/axes_grid/inset_locator.pyc
+${PYSITELIB}/mpl_toolkits/axes_grid/inset_locator.pyo
+${PYSITELIB}/mpl_toolkits/axes_grid/parasite_axes.py
+${PYSITELIB}/mpl_toolkits/axes_grid/parasite_axes.pyc
+${PYSITELIB}/mpl_toolkits/axes_grid/parasite_axes.pyo
${PYSITELIB}/mpl_toolkits/exceltools.py
${PYSITELIB}/mpl_toolkits/exceltools.pyc
${PYSITELIB}/mpl_toolkits/exceltools.pyo
${PYSITELIB}/mpl_toolkits/gtktools.py
${PYSITELIB}/mpl_toolkits/gtktools.pyc
${PYSITELIB}/mpl_toolkits/gtktools.pyo
+${PYSITELIB}/mpl_toolkits/mplot3d/__init__.py
+${PYSITELIB}/mpl_toolkits/mplot3d/__init__.pyc
+${PYSITELIB}/mpl_toolkits/mplot3d/__init__.pyo
+${PYSITELIB}/mpl_toolkits/mplot3d/art3d.py
+${PYSITELIB}/mpl_toolkits/mplot3d/art3d.pyc
+${PYSITELIB}/mpl_toolkits/mplot3d/art3d.pyo
+${PYSITELIB}/mpl_toolkits/mplot3d/axes3d.py
+${PYSITELIB}/mpl_toolkits/mplot3d/axes3d.pyc
+${PYSITELIB}/mpl_toolkits/mplot3d/axes3d.pyo
+${PYSITELIB}/mpl_toolkits/mplot3d/axis3d.py
+${PYSITELIB}/mpl_toolkits/mplot3d/axis3d.pyc
+${PYSITELIB}/mpl_toolkits/mplot3d/axis3d.pyo
+${PYSITELIB}/mpl_toolkits/mplot3d/proj3d.py
+${PYSITELIB}/mpl_toolkits/mplot3d/proj3d.pyc
+${PYSITELIB}/mpl_toolkits/mplot3d/proj3d.pyo
${PYSITELIB}/pylab.py
${PYSITELIB}/pylab.pyc
${PYSITELIB}/pylab.pyo
--- pkgsrc/graphics/py-matplotlib/distinfo 2009/08/05 11:02:12 1.9
+++ pkgsrc/graphics/py-matplotlib/distinfo 2010/05/17 16:22:59 1.10
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2009/08/05 11:02:12 markd Exp $
+$NetBSD: distinfo,v 1.10 2010/05/17 16:22:59 drochner Exp $
-SHA1 (matplotlib-0.98.4.tar.gz) = 68f99ff3e9a68a1ed94f4c275ef231c1ac84e96f
+SHA1 (matplotlib-0.99.1.2.tar.gz) = c3f9053a8522e2541d93ee55e8b447165708ac15
-RMD160 (matplotlib-0.98.4.tar.gz) = cd0a8be26296eb30fb7e0ab506c8145228152a84
+RMD160 (matplotlib-0.99.1.2.tar.gz) = 11daee415102dff944d9c45de22c48c83e76dde7
-Size (matplotlib-0.98.4.tar.gz) = 9406439 bytes
+Size (matplotlib-0.99.1.2.tar.gz) = 11940390 bytes
-SHA1 (patch-aa) = 418da6795362454a91d8e569e21dc8222a9ce7e3
+SHA1 (patch-aa) = 1f900684fec67a895fc1999f72d5c164376b40a6
--- pkgsrc/graphics/py-matplotlib-gtk2/Attic/Makefile 2009/08/26 19:57:48 1.15
+++ pkgsrc/graphics/py-matplotlib-gtk2/Attic/Makefile 2010/05/17 16:22:59 1.16
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:48 sno Exp $
+# $NetBSD: Makefile,v 1.16 2010/05/17 16:22:59 drochner Exp $
#
-DISTNAME= matplotlib-0.98.4
-PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-0.98.4
-PKGREVISION= 1
+DISTNAME= matplotlib-0.99.1.2
+PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-0.99.1.2
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/}
@@ -13,6 +12,7 @@
PKG_DESTDIR_SUPPORT= user-destdir
+WRKSRC= ${WRKDIR}/matplotlib-0.99.1.1
USE_TOOLS+= pkg-config
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
--- pkgsrc/graphics/py-matplotlib-gtk2/Attic/distinfo 2009/08/05 11:02:12 1.3
+++ pkgsrc/graphics/py-matplotlib-gtk2/Attic/distinfo 2010/05/17 16:22:59 1.4
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2009/08/05 11:02:12 markd Exp $
+$NetBSD: distinfo,v 1.4 2010/05/17 16:22:59 drochner Exp $
-SHA1 (matplotlib-0.98.4.tar.gz) = 68f99ff3e9a68a1ed94f4c275ef231c1ac84e96f
+SHA1 (matplotlib-0.99.1.2.tar.gz) = c3f9053a8522e2541d93ee55e8b447165708ac15
-RMD160 (matplotlib-0.98.4.tar.gz) = cd0a8be26296eb30fb7e0ab506c8145228152a84
+RMD160 (matplotlib-0.99.1.2.tar.gz) = 11daee415102dff944d9c45de22c48c83e76dde7
-Size (matplotlib-0.98.4.tar.gz) = 9406439 bytes
+Size (matplotlib-0.99.1.2.tar.gz) = 11940390 bytes
-SHA1 (patch-aa) = 03791f9ce158e89882af266398f22a21c3a12091
+SHA1 (patch-aa) = 77580934adc8641202776af79cd3d1993983552d
-SHA1 (patch-ab) = 73eac4c875d4d788657e053f9eb201d6f0003fd4
+SHA1 (patch-ab) = ee836eef8a183e79fc25cd0a5a2538d6f54cbef3
--- pkgsrc/graphics/py-matplotlib-gtk2/patches/Attic/patch-aa 2009/08/05 11:02:12 1.3
+++ pkgsrc/graphics/py-matplotlib-gtk2/patches/Attic/patch-aa 2010/05/17 16:22:59 1.4
@@ -1,18 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2009/08/05 11:02:12 markd Exp $
+$NetBSD: patch-aa,v 1.4 2010/05/17 16:22:59 drochner Exp $
---- setupext.py.orig 2008-12-10 14:53:21.000000000 +1300
+--- setupext.py.orig 2009-08-23 05:27:32.000000000 +0000
+++ setupext.py
-@@ -97,18 +97,18 @@ numpy_inc_dirs = []
+@@ -103,16 +103,16 @@ numpy_inc_dirs = []
# matplotlib build options, which can be altered using setup.cfg
options = {'display_status': True,
'verbose': False,
- 'provide_pytz': 'auto',
- 'provide_dateutil': 'auto',
-- 'provide_configobj': 'auto',
-+ 'provide_pytz': False,
-+ 'provide_dateutil': False,
-+ 'provide_configobj': False,
- 'provide_traits': False,
- 'build_agg': True,
- 'build_gtk': 'auto',
- 'build_gtkagg': 'auto',
@@ -21,18 +16,20 @@
- 'build_macosx': 'auto',
- 'build_image': True,
- 'build_windowing': True,
++ 'provide_pytz': 'False',
++ 'provide_dateutil': 'False',
+ 'build_agg': False,
-+ 'build_gtk': True,
-+ 'build_gtkagg': True,
-+ 'build_tkagg': False,
-+ 'build_wxagg': False,
-+ 'build_macosx': False,
++ 'build_gtk': 'True',
++ 'build_gtkagg': 'True',
++ 'build_tkagg': 'False',
++ 'build_wxagg': 'False',
++ 'build_macosx': 'False',
+ 'build_image': False,
+ 'build_windowing': False,
- 'backend': None,
- 'numerix': None}
+ 'backend': None}
-@@ -325,11 +325,8 @@ def check_for_libpng():
+ # Based on the contents of setup.cfg, determine the build options
+@@ -320,11 +320,8 @@ def check_for_libpng():
return True
def add_base_flags(module):
--- pkgsrc/graphics/py-matplotlib-gtk2/patches/Attic/patch-ab 2009/08/05 11:02:12 1.3
+++ pkgsrc/graphics/py-matplotlib-gtk2/patches/Attic/patch-ab 2010/05/17 16:22:59 1.4
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2009/08/05 11:02:12 markd Exp $
+$NetBSD: patch-ab,v 1.4 2010/05/17 16:22:59 drochner Exp $
--- setup.py.orig 2008-12-10 14:53:21.000000000 +1300
+++ setup.py
-@@ -93,12 +93,12 @@ if not check_for_numpy():
+@@ -101,12 +101,12 @@ if not check_for_numpy():
if not check_for_freetype():
sys.exit(1)
@@ -21,7 +21,7 @@
print_raw("")
print_raw("OPTIONAL BACKEND DEPENDENCIES")
-@@ -139,13 +139,13 @@ if options['build_wxagg']:
+@@ -147,13 +147,13 @@ if options['build_wxagg']:
print_message("WxAgg extension not required for wxPython >= 2.8")
rc['backend'] = 'WXAgg'
@@ -37,20 +37,7 @@
build_gtkagg(ext_modules, packages)
rc['backend'] = 'GTKAgg'
-@@ -212,9 +212,9 @@ check_for_pdftops()
- # TODO: comment out for mpl release:
- print_raw("")
- print_raw("EXPERIMENTAL CONFIG PACKAGE DEPENDENCIES")
--packages.append('matplotlib.config')
--if check_provide_configobj(): py_modules.append('configobj')
--if check_provide_traits(): build_traits(ext_modules, packages)
-+#packages.append('matplotlib.config')
-+#if check_provide_configobj(): py_modules.append('configobj')
-+#if check_provide_traits(): build_traits(ext_modules, packages)
-
- print_raw("")
- print_raw("[Edit setup.cfg to suppress the above messages]")
-@@ -255,11 +255,11 @@ distrib = setup(name="matplotlib",
+@@ -257,11 +257,11 @@ distrib = setup(name="matplotlib",
interfaces and hardcopy output formats. There is a 'pylab' mode
which emulates matlab graphics
""",
--- pkgsrc/graphics/py-matplotlib-tk/Attic/Makefile 2009/09/23 09:54:45 1.4
+++ pkgsrc/graphics/py-matplotlib-tk/Attic/Makefile 2010/05/17 16:22:59 1.5
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/09/23 09:54:45 tron Exp $
+# $NetBSD: Makefile,v 1.5 2010/05/17 16:22:59 drochner Exp $
#
-DISTNAME= matplotlib-0.98.4
-PKGNAME= ${PYPKGPREFIX}-matplotlib-tk-0.98.4
+DISTNAME= matplotlib-0.99.1.2
+PKGNAME= ${PYPKGPREFIX}-matplotlib-tk-0.99.1.2
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/}
@@ -12,6 +12,7 @@
PKG_DESTDIR_SUPPORT= user-destdir
+WRKSRC= ${WRKDIR}/matplotlib-0.99.1.1
USE_TOOLS+= pkg-config
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
--- pkgsrc/graphics/py-matplotlib-tk/Attic/distinfo 2009/08/05 11:02:12 1.3
+++ pkgsrc/graphics/py-matplotlib-tk/Attic/distinfo 2010/05/17 16:22:59 1.4
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2009/08/05 11:02:12 markd Exp $
+$NetBSD: distinfo,v 1.4 2010/05/17 16:22:59 drochner Exp $
-SHA1 (matplotlib-0.98.4.tar.gz) = 68f99ff3e9a68a1ed94f4c275ef231c1ac84e96f
+SHA1 (matplotlib-0.99.1.2.tar.gz) = c3f9053a8522e2541d93ee55e8b447165708ac15
-RMD160 (matplotlib-0.98.4.tar.gz) = cd0a8be26296eb30fb7e0ab506c8145228152a84
+RMD160 (matplotlib-0.99.1.2.tar.gz) = 11daee415102dff944d9c45de22c48c83e76dde7
-Size (matplotlib-0.98.4.tar.gz) = 9406439 bytes
+Size (matplotlib-0.99.1.2.tar.gz) = 11940390 bytes
-SHA1 (patch-aa) = 63d0e5eb866f2e4dd1ed1dc25e12040f5e0f2383
+SHA1 (patch-aa) = 193497e854113548345f10fc21b0d258f6376267
-SHA1 (patch-ab) = 291205d748e0109378f076a8a2b5c5e23d176cb2
+SHA1 (patch-ab) = 0a89e0d6fd96e3f998ab92130596c248061c36e3
--- pkgsrc/graphics/py-matplotlib-tk/patches/Attic/patch-aa 2009/08/05 11:02:12 1.2
+++ pkgsrc/graphics/py-matplotlib-tk/patches/Attic/patch-aa 2010/05/17 16:22:59 1.3
@@ -1,20 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2009/08/05 11:02:12 markd Exp $
+$NetBSD: patch-aa,v 1.3 2010/05/17 16:22:59 drochner Exp $
-Only turn on building of the Tk part.
-
---- setupext.py.orig 2008-12-10 14:53:21.000000000 +1300
+--- setupext.py.orig 2009-08-23 05:27:32.000000000 +0000
+++ setupext.py
-@@ -97,18 +97,18 @@ numpy_inc_dirs = []
+@@ -103,16 +103,16 @@ numpy_inc_dirs = []
# matplotlib build options, which can be altered using setup.cfg
options = {'display_status': True,
'verbose': False,
- 'provide_pytz': 'auto',
- 'provide_dateutil': 'auto',
-- 'provide_configobj': 'auto',
-+ 'provide_pytz': False,
-+ 'provide_dateutil': False,
-+ 'provide_configobj': False,
- 'provide_traits': False,
- 'build_agg': True,
- 'build_gtk': 'auto',
- 'build_gtkagg': 'auto',
@@ -23,6 +16,8 @@
- 'build_macosx': 'auto',
- 'build_image': True,
- 'build_windowing': True,
++ 'provide_pytz': False,
++ 'provide_dateutil': False,
+ 'build_agg': False,
+ 'build_gtk': False,
+ 'build_gtkagg': False,
@@ -31,10 +26,10 @@
+ 'build_macosx': False,
+ 'build_image': False,
+ 'build_windowing': False,
- 'backend': None,
- 'numerix': None}
+ 'backend': None}
-@@ -325,11 +325,8 @@ def check_for_libpng():
+ # Based on the contents of setup.cfg, determine the build options
+@@ -320,11 +320,8 @@ def check_for_libpng():
return True
def add_base_flags(module):
--- pkgsrc/graphics/py-matplotlib-tk/patches/Attic/patch-ab 2009/08/05 11:02:12 1.2
+++ pkgsrc/graphics/py-matplotlib-tk/patches/Attic/patch-ab 2010/05/17 16:22:59 1.3
@@ -1,11 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2009/08/05 11:02:12 markd Exp $
+$NetBSD: patch-ab,v 1.3 2010/05/17 16:22:59 drochner Exp $
-Ensure we skip installation of the non-Tk stuff, installed
-by py-matplotlib itself.
-
---- setup.py.orig 2008-12-10 14:53:21.000000000 +1300
+--- setup.py.orig 2009-08-01 19:15:24.000000000 +0000
+++ setup.py
-@@ -93,12 +93,12 @@ if not check_for_numpy():
+@@ -105,12 +105,12 @@ if not check_for_numpy():
if not check_for_freetype():
sys.exit(1)
@@ -24,7 +21,7 @@
print_raw("")
print_raw("OPTIONAL BACKEND DEPENDENCIES")
-@@ -139,13 +139,13 @@ if options['build_wxagg']:
+@@ -151,13 +151,13 @@ if options['build_wxagg']:
print_message("WxAgg extension not required for wxPython >= 2.8")
rc['backend'] = 'WXAgg'
@@ -40,20 +37,7 @@
build_gtkagg(ext_modules, packages)
rc['backend'] = 'GTKAgg'
-@@ -212,9 +212,9 @@ check_for_pdftops()
- # TODO: comment out for mpl release:
- print_raw("")
- print_raw("EXPERIMENTAL CONFIG PACKAGE DEPENDENCIES")
--packages.append('matplotlib.config')
--if check_provide_configobj(): py_modules.append('configobj')
--if check_provide_traits(): build_traits(ext_modules, packages)
-+#packages.append('matplotlib.config')
-+#if check_provide_configobj(): py_modules.append('configobj')
-+#if check_provide_traits(): build_traits(ext_modules, packages)
-
- print_raw("")
- print_raw("[Edit setup.cfg to suppress the above messages]")
-@@ -255,11 +255,11 @@ distrib = setup(name="matplotlib",
+@@ -258,11 +258,11 @@ distrib = setup(name="matplotlib",
interfaces and hardcopy output formats. There is a 'pylab' mode
which emulates matlab graphics
""",
--- pkgsrc/graphics/py-matplotlib/patches/Attic/patch-aa 2009/08/05 11:02:12 1.6
+++ pkgsrc/graphics/py-matplotlib/patches/Attic/patch-aa 2010/05/17 16:22:59 1.7
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.6 2009/08/05 11:02:12 markd Exp $
+$NetBSD: patch-aa,v 1.7 2010/05/17 16:22:59 drochner Exp $
--- setupext.py.orig 2008-12-10 14:53:21.000000000 +1300
+++ setupext.py
-@@ -102,10 +102,10 @@ options = {'display_status': True,
- 'provide_configobj': 'auto',
- 'provide_traits': False,
+@@ -99,10 +99,10 @@ options = {'display_status': True,
+ 'provide_pytz': 'auto',
+ 'provide_dateutil': 'auto',
'build_agg': True,
- 'build_gtk': 'auto',
- 'build_gtkagg': 'auto',
@@ -17,7 +17,7 @@
'build_macosx': 'auto',
'build_image': True,
'build_windowing': True,
-@@ -325,11 +325,8 @@ def check_for_libpng():
+@@ -315,11 +315,8 @@ def check_for_libpng():
return True
def add_base_flags(module):