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
cvs diff -r1.24 -r1.25 pkgsrc/graphics/py-matplotlib/Makefile (expand / switch to unified diff)

--- 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,29 +1,30 @@ @@ -1,29 +1,30 @@
1# $NetBSD: Makefile,v 1.24 2009/09/23 09:54:45 tron Exp $ 1# $NetBSD: Makefile,v 1.25 2010/05/17 16:22:59 drochner Exp $
2# 2#
3 3
4DISTNAME= matplotlib-0.98.4 4DISTNAME= matplotlib-0.99.1.2
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 5PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
6CATEGORIES= graphics python 6CATEGORIES= graphics python
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://matplotlib.sourceforge.net/ 10HOMEPAGE= http://matplotlib.sourceforge.net/
11COMMENT= Matlab-style plotting package for Python 11COMMENT= Matlab-style plotting package for Python
12 12
13DEPENDS+= ${PYPKGPREFIX}-pytz>=2008b:../../time/py-pytz 13DEPENDS+= ${PYPKGPREFIX}-pytz>=2008b:../../time/py-pytz
14DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.2:../../time/py-dateutil 14DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.2:../../time/py-dateutil
15 15
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
 18WRKSRC= ${WRKDIR}/matplotlib-0.99.1.1
18USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
19USE_TOOLS+= pkg-config 20USE_TOOLS+= pkg-config
20PY_PATCHPLIST= yes 21PY_PATCHPLIST= yes
21PYDISTUTILSPKG= yes 22PYDISTUTILSPKG= yes
22 23
23.include "../../lang/python/extension.mk" 24.include "../../lang/python/extension.mk"
24 25
25.include "../../devel/zlib/buildlink3.mk" 26.include "../../devel/zlib/buildlink3.mk"
26.include "../../graphics/freetype2/buildlink3.mk" 27.include "../../graphics/freetype2/buildlink3.mk"
27.include "../../graphics/png/buildlink3.mk" 28.include "../../graphics/png/buildlink3.mk"
28.include "../../math/py-numpy/buildlink3.mk" 29.include "../../math/py-numpy/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/graphics/py-matplotlib/PLIST (expand / switch to unified diff)

--- 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,46 +1,40 @@ @@ -1,46 +1,40 @@
1@comment $NetBSD: PLIST,v 1.11 2009/08/05 11:02:12 markd Exp $ 1@comment $NetBSD: PLIST,v 1.12 2010/05/17 16:22:59 drochner Exp $
2${PYSITELIB}/configobj.py 
3${PYSITELIB}/configobj.pyc 
4${PYSITELIB}/configobj.pyo 
5${PYSITELIB}/matplotlib/__init__.py 2${PYSITELIB}/matplotlib/__init__.py
6${PYSITELIB}/matplotlib/__init__.pyc 3${PYSITELIB}/matplotlib/__init__.pyc
7${PYSITELIB}/matplotlib/__init__.pyo 4${PYSITELIB}/matplotlib/__init__.pyo
8${PYSITELIB}/matplotlib/_cm.py 5${PYSITELIB}/matplotlib/_cm.py
9${PYSITELIB}/matplotlib/_cm.pyc 6${PYSITELIB}/matplotlib/_cm.pyc
10${PYSITELIB}/matplotlib/_cm.pyo 7${PYSITELIB}/matplotlib/_cm.pyo
11${PYSITELIB}/matplotlib/_cntr.so 8${PYSITELIB}/matplotlib/_cntr.so
12${PYSITELIB}/matplotlib/_delaunay.so 9${PYSITELIB}/matplotlib/_delaunay.so
13${PYSITELIB}/matplotlib/_image.so 10${PYSITELIB}/matplotlib/_image.so
14${PYSITELIB}/matplotlib/_mathtext_data.py 11${PYSITELIB}/matplotlib/_mathtext_data.py
15${PYSITELIB}/matplotlib/_mathtext_data.pyc 12${PYSITELIB}/matplotlib/_mathtext_data.pyc
16${PYSITELIB}/matplotlib/_mathtext_data.pyo 13${PYSITELIB}/matplotlib/_mathtext_data.pyo
17${PYSITELIB}/matplotlib/_path.so 14${PYSITELIB}/matplotlib/_path.so
18${PYSITELIB}/matplotlib/_png.so 15${PYSITELIB}/matplotlib/_png.so
19${PYSITELIB}/matplotlib/_pylab_helpers.py 16${PYSITELIB}/matplotlib/_pylab_helpers.py
20${PYSITELIB}/matplotlib/_pylab_helpers.pyc 17${PYSITELIB}/matplotlib/_pylab_helpers.pyc
21${PYSITELIB}/matplotlib/_pylab_helpers.pyo 18${PYSITELIB}/matplotlib/_pylab_helpers.pyo
22${PYSITELIB}/matplotlib/afm.py 19${PYSITELIB}/matplotlib/afm.py
23${PYSITELIB}/matplotlib/afm.pyc 20${PYSITELIB}/matplotlib/afm.pyc
24${PYSITELIB}/matplotlib/afm.pyo 21${PYSITELIB}/matplotlib/afm.pyo
25${PYSITELIB}/matplotlib/artist.py 22${PYSITELIB}/matplotlib/artist.py
26${PYSITELIB}/matplotlib/artist.pyc 23${PYSITELIB}/matplotlib/artist.pyc
27${PYSITELIB}/matplotlib/artist.pyo 24${PYSITELIB}/matplotlib/artist.pyo
28${PYSITELIB}/matplotlib/axes.py 25${PYSITELIB}/matplotlib/axes.py
29${PYSITELIB}/matplotlib/axes.pyc 26${PYSITELIB}/matplotlib/axes.pyc
30${PYSITELIB}/matplotlib/axes.pyo 27${PYSITELIB}/matplotlib/axes.pyo
31${PYSITELIB}/matplotlib/axes3d.py 
32${PYSITELIB}/matplotlib/axes3d.pyc 
33${PYSITELIB}/matplotlib/axes3d.pyo 
34${PYSITELIB}/matplotlib/axis.py 28${PYSITELIB}/matplotlib/axis.py
35${PYSITELIB}/matplotlib/axis.pyc 29${PYSITELIB}/matplotlib/axis.pyc
36${PYSITELIB}/matplotlib/axis.pyo 30${PYSITELIB}/matplotlib/axis.pyo
37${PYSITELIB}/matplotlib/backend_bases.py 31${PYSITELIB}/matplotlib/backend_bases.py
38${PYSITELIB}/matplotlib/backend_bases.pyc 32${PYSITELIB}/matplotlib/backend_bases.pyc
39${PYSITELIB}/matplotlib/backend_bases.pyo 33${PYSITELIB}/matplotlib/backend_bases.pyo
40${PYSITELIB}/matplotlib/backends/Matplotlib.nib/classes.nib 34${PYSITELIB}/matplotlib/backends/Matplotlib.nib/classes.nib
41${PYSITELIB}/matplotlib/backends/Matplotlib.nib/info.nib 35${PYSITELIB}/matplotlib/backends/Matplotlib.nib/info.nib
42${PYSITELIB}/matplotlib/backends/Matplotlib.nib/keyedobjects.nib 36${PYSITELIB}/matplotlib/backends/Matplotlib.nib/keyedobjects.nib
43${PYSITELIB}/matplotlib/backends/__init__.py 37${PYSITELIB}/matplotlib/backends/__init__.py
44${PYSITELIB}/matplotlib/backends/__init__.pyc 38${PYSITELIB}/matplotlib/backends/__init__.pyc
45${PYSITELIB}/matplotlib/backends/__init__.pyo 39${PYSITELIB}/matplotlib/backends/__init__.pyo
46${PYSITELIB}/matplotlib/backends/_backend_agg.so 40${PYSITELIB}/matplotlib/backends/_backend_agg.so
@@ -124,53 +118,26 @@ ${PYSITELIB}/matplotlib/cbook.pyc @@ -124,53 +118,26 @@ ${PYSITELIB}/matplotlib/cbook.pyc
124${PYSITELIB}/matplotlib/cbook.pyo 118${PYSITELIB}/matplotlib/cbook.pyo
125${PYSITELIB}/matplotlib/cm.py 119${PYSITELIB}/matplotlib/cm.py
126${PYSITELIB}/matplotlib/cm.pyc 120${PYSITELIB}/matplotlib/cm.pyc
127${PYSITELIB}/matplotlib/cm.pyo 121${PYSITELIB}/matplotlib/cm.pyo
128${PYSITELIB}/matplotlib/collections.py 122${PYSITELIB}/matplotlib/collections.py
129${PYSITELIB}/matplotlib/collections.pyc 123${PYSITELIB}/matplotlib/collections.pyc
130${PYSITELIB}/matplotlib/collections.pyo 124${PYSITELIB}/matplotlib/collections.pyo
131${PYSITELIB}/matplotlib/colorbar.py 125${PYSITELIB}/matplotlib/colorbar.py
132${PYSITELIB}/matplotlib/colorbar.pyc 126${PYSITELIB}/matplotlib/colorbar.pyc
133${PYSITELIB}/matplotlib/colorbar.pyo 127${PYSITELIB}/matplotlib/colorbar.pyo
134${PYSITELIB}/matplotlib/colors.py 128${PYSITELIB}/matplotlib/colors.py
135${PYSITELIB}/matplotlib/colors.pyc 129${PYSITELIB}/matplotlib/colors.pyc
136${PYSITELIB}/matplotlib/colors.pyo 130${PYSITELIB}/matplotlib/colors.pyo
137${PYSITELIB}/matplotlib/config/__init__.py 
138${PYSITELIB}/matplotlib/config/__init__.pyc 
139${PYSITELIB}/matplotlib/config/__init__.pyo 
140${PYSITELIB}/matplotlib/config/checkdep.py 
141${PYSITELIB}/matplotlib/config/checkdep.pyc 
142${PYSITELIB}/matplotlib/config/checkdep.pyo 
143${PYSITELIB}/matplotlib/config/cutils.py 
144${PYSITELIB}/matplotlib/config/cutils.pyc 
145${PYSITELIB}/matplotlib/config/cutils.pyo 
146${PYSITELIB}/matplotlib/config/mplconfig.py 
147${PYSITELIB}/matplotlib/config/mplconfig.pyc 
148${PYSITELIB}/matplotlib/config/mplconfig.pyo 
149${PYSITELIB}/matplotlib/config/mpltraits.py 
150${PYSITELIB}/matplotlib/config/mpltraits.pyc 
151${PYSITELIB}/matplotlib/config/mpltraits.pyo 
152${PYSITELIB}/matplotlib/config/rcparams.py 
153${PYSITELIB}/matplotlib/config/rcparams.pyc 
154${PYSITELIB}/matplotlib/config/rcparams.pyo 
155${PYSITELIB}/matplotlib/config/rcsetup.py 
156${PYSITELIB}/matplotlib/config/rcsetup.pyc 
157${PYSITELIB}/matplotlib/config/rcsetup.pyo 
158${PYSITELIB}/matplotlib/config/tconfig.py 
159${PYSITELIB}/matplotlib/config/tconfig.pyc 
160${PYSITELIB}/matplotlib/config/tconfig.pyo 
161${PYSITELIB}/matplotlib/config/verbose.py 
162${PYSITELIB}/matplotlib/config/verbose.pyc 
163${PYSITELIB}/matplotlib/config/verbose.pyo 
164${PYSITELIB}/matplotlib/contour.py 131${PYSITELIB}/matplotlib/contour.py
165${PYSITELIB}/matplotlib/contour.pyc 132${PYSITELIB}/matplotlib/contour.pyc
166${PYSITELIB}/matplotlib/contour.pyo 133${PYSITELIB}/matplotlib/contour.pyo
167${PYSITELIB}/matplotlib/dates.py 134${PYSITELIB}/matplotlib/dates.py
168${PYSITELIB}/matplotlib/dates.pyc 135${PYSITELIB}/matplotlib/dates.pyc
169${PYSITELIB}/matplotlib/dates.pyo 136${PYSITELIB}/matplotlib/dates.pyo
170${PYSITELIB}/matplotlib/delaunay/__init__.py 137${PYSITELIB}/matplotlib/delaunay/__init__.py
171${PYSITELIB}/matplotlib/delaunay/__init__.pyc 138${PYSITELIB}/matplotlib/delaunay/__init__.pyc
172${PYSITELIB}/matplotlib/delaunay/__init__.pyo 139${PYSITELIB}/matplotlib/delaunay/__init__.pyo
173${PYSITELIB}/matplotlib/delaunay/interpolate.py 140${PYSITELIB}/matplotlib/delaunay/interpolate.py
174${PYSITELIB}/matplotlib/delaunay/interpolate.pyc 141${PYSITELIB}/matplotlib/delaunay/interpolate.pyc
175${PYSITELIB}/matplotlib/delaunay/interpolate.pyo 142${PYSITELIB}/matplotlib/delaunay/interpolate.pyo
176${PYSITELIB}/matplotlib/delaunay/testfuncs.py 143${PYSITELIB}/matplotlib/delaunay/testfuncs.py
@@ -185,26 +152,29 @@ ${PYSITELIB}/matplotlib/dviread.pyo @@ -185,26 +152,29 @@ ${PYSITELIB}/matplotlib/dviread.pyo
185${PYSITELIB}/matplotlib/figure.py 152${PYSITELIB}/matplotlib/figure.py
186${PYSITELIB}/matplotlib/figure.pyc 153${PYSITELIB}/matplotlib/figure.pyc
187${PYSITELIB}/matplotlib/figure.pyo 154${PYSITELIB}/matplotlib/figure.pyo
188${PYSITELIB}/matplotlib/finance.py 155${PYSITELIB}/matplotlib/finance.py
189${PYSITELIB}/matplotlib/finance.pyc 156${PYSITELIB}/matplotlib/finance.pyc
190${PYSITELIB}/matplotlib/finance.pyo 157${PYSITELIB}/matplotlib/finance.pyo
191${PYSITELIB}/matplotlib/font_manager.py 158${PYSITELIB}/matplotlib/font_manager.py
192${PYSITELIB}/matplotlib/font_manager.pyc 159${PYSITELIB}/matplotlib/font_manager.pyc
193${PYSITELIB}/matplotlib/font_manager.pyo 160${PYSITELIB}/matplotlib/font_manager.pyo
194${PYSITELIB}/matplotlib/fontconfig_pattern.py 161${PYSITELIB}/matplotlib/fontconfig_pattern.py
195${PYSITELIB}/matplotlib/fontconfig_pattern.pyc 162${PYSITELIB}/matplotlib/fontconfig_pattern.pyc
196${PYSITELIB}/matplotlib/fontconfig_pattern.pyo 163${PYSITELIB}/matplotlib/fontconfig_pattern.pyo
197${PYSITELIB}/matplotlib/ft2font.so 164${PYSITELIB}/matplotlib/ft2font.so
 165${PYSITELIB}/matplotlib/hatch.py
 166${PYSITELIB}/matplotlib/hatch.pyc
 167${PYSITELIB}/matplotlib/hatch.pyo
198${PYSITELIB}/matplotlib/image.py 168${PYSITELIB}/matplotlib/image.py
199${PYSITELIB}/matplotlib/image.pyc 169${PYSITELIB}/matplotlib/image.pyc
200${PYSITELIB}/matplotlib/image.pyo 170${PYSITELIB}/matplotlib/image.pyo
201${PYSITELIB}/matplotlib/legend.py 171${PYSITELIB}/matplotlib/legend.py
202${PYSITELIB}/matplotlib/legend.pyc 172${PYSITELIB}/matplotlib/legend.pyc
203${PYSITELIB}/matplotlib/legend.pyo 173${PYSITELIB}/matplotlib/legend.pyo
204${PYSITELIB}/matplotlib/lines.py 174${PYSITELIB}/matplotlib/lines.py
205${PYSITELIB}/matplotlib/lines.pyc 175${PYSITELIB}/matplotlib/lines.pyc
206${PYSITELIB}/matplotlib/lines.pyo 176${PYSITELIB}/matplotlib/lines.pyo
207${PYSITELIB}/matplotlib/mathtext.py 177${PYSITELIB}/matplotlib/mathtext.py
208${PYSITELIB}/matplotlib/mathtext.pyc 178${PYSITELIB}/matplotlib/mathtext.pyc
209${PYSITELIB}/matplotlib/mathtext.pyo 179${PYSITELIB}/matplotlib/mathtext.pyo
210${PYSITELIB}/matplotlib/mlab.py 180${PYSITELIB}/matplotlib/mlab.py
@@ -358,50 +328,41 @@ ${PYSITELIB}/matplotlib/mpl-data/images/ @@ -358,50 +328,41 @@ ${PYSITELIB}/matplotlib/mpl-data/images/
358${PYSITELIB}/matplotlib/mpl-data/images/zoom_to_rect.png 328${PYSITELIB}/matplotlib/mpl-data/images/zoom_to_rect.png
359${PYSITELIB}/matplotlib/mpl-data/images/zoom_to_rect.ppm 329${PYSITELIB}/matplotlib/mpl-data/images/zoom_to_rect.ppm
360${PYSITELIB}/matplotlib/mpl-data/images/zoom_to_rect.svg 330${PYSITELIB}/matplotlib/mpl-data/images/zoom_to_rect.svg
361${PYSITELIB}/matplotlib/mpl-data/images/zoom_to_rect.xpm 331${PYSITELIB}/matplotlib/mpl-data/images/zoom_to_rect.xpm
362${PYSITELIB}/matplotlib/mpl-data/lineprops.glade 332${PYSITELIB}/matplotlib/mpl-data/lineprops.glade
363${PYSITELIB}/matplotlib/mpl-data/matplotlib.conf 333${PYSITELIB}/matplotlib/mpl-data/matplotlib.conf
364${PYSITELIB}/matplotlib/mpl-data/matplotlibrc 334${PYSITELIB}/matplotlib/mpl-data/matplotlibrc
365${PYSITELIB}/matplotlib/mpl.py 335${PYSITELIB}/matplotlib/mpl.py
366${PYSITELIB}/matplotlib/mpl.pyc 336${PYSITELIB}/matplotlib/mpl.pyc
367${PYSITELIB}/matplotlib/mpl.pyo 337${PYSITELIB}/matplotlib/mpl.pyo
368${PYSITELIB}/matplotlib/numerix/__init__.py 338${PYSITELIB}/matplotlib/numerix/__init__.py
369${PYSITELIB}/matplotlib/numerix/__init__.pyc 339${PYSITELIB}/matplotlib/numerix/__init__.pyc
370${PYSITELIB}/matplotlib/numerix/__init__.pyo 340${PYSITELIB}/matplotlib/numerix/__init__.pyo
371${PYSITELIB}/matplotlib/numerix/_na_imports.py 
372${PYSITELIB}/matplotlib/numerix/_na_imports.pyc 
373${PYSITELIB}/matplotlib/numerix/_na_imports.pyo 
374${PYSITELIB}/matplotlib/numerix/_nc_imports.py 
375${PYSITELIB}/matplotlib/numerix/_nc_imports.pyc 
376${PYSITELIB}/matplotlib/numerix/_nc_imports.pyo 
377${PYSITELIB}/matplotlib/numerix/_sp_imports.py 341${PYSITELIB}/matplotlib/numerix/_sp_imports.py
378${PYSITELIB}/matplotlib/numerix/_sp_imports.pyc 342${PYSITELIB}/matplotlib/numerix/_sp_imports.pyc
379${PYSITELIB}/matplotlib/numerix/_sp_imports.pyo 343${PYSITELIB}/matplotlib/numerix/_sp_imports.pyo
380${PYSITELIB}/matplotlib/numerix/fft/__init__.py 344${PYSITELIB}/matplotlib/numerix/fft/__init__.py
381${PYSITELIB}/matplotlib/numerix/fft/__init__.pyc 345${PYSITELIB}/matplotlib/numerix/fft/__init__.pyc
382${PYSITELIB}/matplotlib/numerix/fft/__init__.pyo 346${PYSITELIB}/matplotlib/numerix/fft/__init__.pyo
383${PYSITELIB}/matplotlib/numerix/linear_algebra/__init__.py 347${PYSITELIB}/matplotlib/numerix/linear_algebra/__init__.py
384${PYSITELIB}/matplotlib/numerix/linear_algebra/__init__.pyc 348${PYSITELIB}/matplotlib/numerix/linear_algebra/__init__.pyc
385${PYSITELIB}/matplotlib/numerix/linear_algebra/__init__.pyo 349${PYSITELIB}/matplotlib/numerix/linear_algebra/__init__.pyo
386${PYSITELIB}/matplotlib/numerix/ma/__init__.py 350${PYSITELIB}/matplotlib/numerix/ma/__init__.py
387${PYSITELIB}/matplotlib/numerix/ma/__init__.pyc 351${PYSITELIB}/matplotlib/numerix/ma/__init__.pyc
388${PYSITELIB}/matplotlib/numerix/ma/__init__.pyo 352${PYSITELIB}/matplotlib/numerix/ma/__init__.pyo
389${PYSITELIB}/matplotlib/numerix/mlab/__init__.py 353${PYSITELIB}/matplotlib/numerix/mlab/__init__.py
390${PYSITELIB}/matplotlib/numerix/mlab/__init__.pyc 354${PYSITELIB}/matplotlib/numerix/mlab/__init__.pyc
391${PYSITELIB}/matplotlib/numerix/mlab/__init__.pyo 355${PYSITELIB}/matplotlib/numerix/mlab/__init__.pyo
392${PYSITELIB}/matplotlib/numerix/npyma/__init__.py 
393${PYSITELIB}/matplotlib/numerix/npyma/__init__.pyc 
394${PYSITELIB}/matplotlib/numerix/npyma/__init__.pyo 
395${PYSITELIB}/matplotlib/numerix/random_array/__init__.py 356${PYSITELIB}/matplotlib/numerix/random_array/__init__.py
396${PYSITELIB}/matplotlib/numerix/random_array/__init__.pyc 357${PYSITELIB}/matplotlib/numerix/random_array/__init__.pyc
397${PYSITELIB}/matplotlib/numerix/random_array/__init__.pyo 358${PYSITELIB}/matplotlib/numerix/random_array/__init__.pyo
398${PYSITELIB}/matplotlib/nxutils.so 359${PYSITELIB}/matplotlib/nxutils.so
399${PYSITELIB}/matplotlib/offsetbox.py 360${PYSITELIB}/matplotlib/offsetbox.py
400${PYSITELIB}/matplotlib/offsetbox.pyc 361${PYSITELIB}/matplotlib/offsetbox.pyc
401${PYSITELIB}/matplotlib/offsetbox.pyo 362${PYSITELIB}/matplotlib/offsetbox.pyo
402${PYSITELIB}/matplotlib/patches.py 363${PYSITELIB}/matplotlib/patches.py
403${PYSITELIB}/matplotlib/patches.pyc 364${PYSITELIB}/matplotlib/patches.pyc
404${PYSITELIB}/matplotlib/patches.pyo 365${PYSITELIB}/matplotlib/patches.pyo
405${PYSITELIB}/matplotlib/path.py 366${PYSITELIB}/matplotlib/path.py
406${PYSITELIB}/matplotlib/path.pyc 367${PYSITELIB}/matplotlib/path.pyc
407${PYSITELIB}/matplotlib/path.pyo 368${PYSITELIB}/matplotlib/path.pyo
@@ -422,53 +383,125 @@ ${PYSITELIB}/matplotlib/pyparsing.pyc @@ -422,53 +383,125 @@ ${PYSITELIB}/matplotlib/pyparsing.pyc
422${PYSITELIB}/matplotlib/pyparsing.pyo 383${PYSITELIB}/matplotlib/pyparsing.pyo
423${PYSITELIB}/matplotlib/pyplot.py 384${PYSITELIB}/matplotlib/pyplot.py
424${PYSITELIB}/matplotlib/pyplot.pyc 385${PYSITELIB}/matplotlib/pyplot.pyc
425${PYSITELIB}/matplotlib/pyplot.pyo 386${PYSITELIB}/matplotlib/pyplot.pyo
426${PYSITELIB}/matplotlib/quiver.py 387${PYSITELIB}/matplotlib/quiver.py
427${PYSITELIB}/matplotlib/quiver.pyc 388${PYSITELIB}/matplotlib/quiver.pyc
428${PYSITELIB}/matplotlib/quiver.pyo 389${PYSITELIB}/matplotlib/quiver.pyo
429${PYSITELIB}/matplotlib/rcsetup.py 390${PYSITELIB}/matplotlib/rcsetup.py
430${PYSITELIB}/matplotlib/rcsetup.pyc 391${PYSITELIB}/matplotlib/rcsetup.pyc
431${PYSITELIB}/matplotlib/rcsetup.pyo 392${PYSITELIB}/matplotlib/rcsetup.pyo
432${PYSITELIB}/matplotlib/scale.py 393${PYSITELIB}/matplotlib/scale.py
433${PYSITELIB}/matplotlib/scale.pyc 394${PYSITELIB}/matplotlib/scale.pyc
434${PYSITELIB}/matplotlib/scale.pyo 395${PYSITELIB}/matplotlib/scale.pyo
 396${PYSITELIB}/matplotlib/sphinxext/__init__.py
 397${PYSITELIB}/matplotlib/sphinxext/__init__.pyc
 398${PYSITELIB}/matplotlib/sphinxext/__init__.pyo
 399${PYSITELIB}/matplotlib/sphinxext/mathmpl.py
 400${PYSITELIB}/matplotlib/sphinxext/mathmpl.pyc
 401${PYSITELIB}/matplotlib/sphinxext/mathmpl.pyo
 402${PYSITELIB}/matplotlib/sphinxext/only_directives.py
 403${PYSITELIB}/matplotlib/sphinxext/only_directives.pyc
 404${PYSITELIB}/matplotlib/sphinxext/only_directives.pyo
 405${PYSITELIB}/matplotlib/sphinxext/plot_directive.py
 406${PYSITELIB}/matplotlib/sphinxext/plot_directive.pyc
 407${PYSITELIB}/matplotlib/sphinxext/plot_directive.pyo
 408${PYSITELIB}/matplotlib/spines.py
 409${PYSITELIB}/matplotlib/spines.pyc
 410${PYSITELIB}/matplotlib/spines.pyo
435${PYSITELIB}/matplotlib/table.py 411${PYSITELIB}/matplotlib/table.py
436${PYSITELIB}/matplotlib/table.pyc 412${PYSITELIB}/matplotlib/table.pyc
437${PYSITELIB}/matplotlib/table.pyo 413${PYSITELIB}/matplotlib/table.pyo
438${PYSITELIB}/matplotlib/texmanager.py 414${PYSITELIB}/matplotlib/texmanager.py
439${PYSITELIB}/matplotlib/texmanager.pyc 415${PYSITELIB}/matplotlib/texmanager.pyc
440${PYSITELIB}/matplotlib/texmanager.pyo 416${PYSITELIB}/matplotlib/texmanager.pyo
441${PYSITELIB}/matplotlib/text.py 417${PYSITELIB}/matplotlib/text.py
442${PYSITELIB}/matplotlib/text.pyc 418${PYSITELIB}/matplotlib/text.pyc
443${PYSITELIB}/matplotlib/text.pyo 419${PYSITELIB}/matplotlib/text.pyo
444${PYSITELIB}/matplotlib/ticker.py 420${PYSITELIB}/matplotlib/ticker.py
445${PYSITELIB}/matplotlib/ticker.pyc 421${PYSITELIB}/matplotlib/ticker.pyc
446${PYSITELIB}/matplotlib/ticker.pyo 422${PYSITELIB}/matplotlib/ticker.pyo
 423${PYSITELIB}/matplotlib/tight_bbox.py
 424${PYSITELIB}/matplotlib/tight_bbox.pyc
 425${PYSITELIB}/matplotlib/tight_bbox.pyo
447${PYSITELIB}/matplotlib/transforms.py 426${PYSITELIB}/matplotlib/transforms.py
448${PYSITELIB}/matplotlib/transforms.pyc 427${PYSITELIB}/matplotlib/transforms.pyc
449${PYSITELIB}/matplotlib/transforms.pyo 428${PYSITELIB}/matplotlib/transforms.pyo
450${PYSITELIB}/matplotlib/ttconv.so 429${PYSITELIB}/matplotlib/ttconv.so
451${PYSITELIB}/matplotlib/type1font.py 430${PYSITELIB}/matplotlib/type1font.py
452${PYSITELIB}/matplotlib/type1font.pyc 431${PYSITELIB}/matplotlib/type1font.pyc
453${PYSITELIB}/matplotlib/type1font.pyo 432${PYSITELIB}/matplotlib/type1font.pyo
454${PYSITELIB}/matplotlib/units.py 433${PYSITELIB}/matplotlib/units.py
455${PYSITELIB}/matplotlib/units.pyc 434${PYSITELIB}/matplotlib/units.pyc
456${PYSITELIB}/matplotlib/units.pyo 435${PYSITELIB}/matplotlib/units.pyo
457${PYSITELIB}/matplotlib/widgets.py 436${PYSITELIB}/matplotlib/widgets.py
458${PYSITELIB}/matplotlib/widgets.pyc 437${PYSITELIB}/matplotlib/widgets.pyc
459${PYSITELIB}/matplotlib/widgets.pyo 438${PYSITELIB}/matplotlib/widgets.pyo
460${PYSITELIB}/matplotlib/windowing.py 439${PYSITELIB}/matplotlib/windowing.py
461${PYSITELIB}/matplotlib/windowing.pyc 440${PYSITELIB}/matplotlib/windowing.pyc
462${PYSITELIB}/matplotlib/windowing.pyo 441${PYSITELIB}/matplotlib/windowing.pyo
463${PYSITELIB}/mpl_toolkits/__init__.py 442${PYSITELIB}/mpl_toolkits/__init__.py
464${PYSITELIB}/mpl_toolkits/__init__.pyc 443${PYSITELIB}/mpl_toolkits/__init__.pyc
465${PYSITELIB}/mpl_toolkits/__init__.pyo 444${PYSITELIB}/mpl_toolkits/__init__.pyo
 445${PYSITELIB}/mpl_toolkits/axes_grid/__init__.py
 446${PYSITELIB}/mpl_toolkits/axes_grid/__init__.pyc
 447${PYSITELIB}/mpl_toolkits/axes_grid/__init__.pyo
 448${PYSITELIB}/mpl_toolkits/axes_grid/anchored_artists.py
 449${PYSITELIB}/mpl_toolkits/axes_grid/anchored_artists.pyc
 450${PYSITELIB}/mpl_toolkits/axes_grid/anchored_artists.pyo
 451${PYSITELIB}/mpl_toolkits/axes_grid/angle_helper.py
 452${PYSITELIB}/mpl_toolkits/axes_grid/angle_helper.pyc
 453${PYSITELIB}/mpl_toolkits/axes_grid/angle_helper.pyo
 454${PYSITELIB}/mpl_toolkits/axes_grid/axes_divider.py
 455${PYSITELIB}/mpl_toolkits/axes_grid/axes_divider.pyc
 456${PYSITELIB}/mpl_toolkits/axes_grid/axes_divider.pyo
 457${PYSITELIB}/mpl_toolkits/axes_grid/axes_grid.py
 458${PYSITELIB}/mpl_toolkits/axes_grid/axes_grid.pyc
 459${PYSITELIB}/mpl_toolkits/axes_grid/axes_grid.pyo
 460${PYSITELIB}/mpl_toolkits/axes_grid/axes_rgb.py
 461${PYSITELIB}/mpl_toolkits/axes_grid/axes_rgb.pyc
 462${PYSITELIB}/mpl_toolkits/axes_grid/axes_rgb.pyo
 463${PYSITELIB}/mpl_toolkits/axes_grid/axes_size.py
 464${PYSITELIB}/mpl_toolkits/axes_grid/axes_size.pyc
 465${PYSITELIB}/mpl_toolkits/axes_grid/axes_size.pyo
 466${PYSITELIB}/mpl_toolkits/axes_grid/axislines.py
 467${PYSITELIB}/mpl_toolkits/axes_grid/axislines.pyc
 468${PYSITELIB}/mpl_toolkits/axes_grid/axislines.pyo
 469${PYSITELIB}/mpl_toolkits/axes_grid/clip_path.py
 470${PYSITELIB}/mpl_toolkits/axes_grid/clip_path.pyc
 471${PYSITELIB}/mpl_toolkits/axes_grid/clip_path.pyo
 472${PYSITELIB}/mpl_toolkits/axes_grid/grid_finder.py
 473${PYSITELIB}/mpl_toolkits/axes_grid/grid_finder.pyc
 474${PYSITELIB}/mpl_toolkits/axes_grid/grid_finder.pyo
 475${PYSITELIB}/mpl_toolkits/axes_grid/grid_helper_curvelinear.py
 476${PYSITELIB}/mpl_toolkits/axes_grid/grid_helper_curvelinear.pyc
 477${PYSITELIB}/mpl_toolkits/axes_grid/grid_helper_curvelinear.pyo
 478${PYSITELIB}/mpl_toolkits/axes_grid/inset_locator.py
 479${PYSITELIB}/mpl_toolkits/axes_grid/inset_locator.pyc
 480${PYSITELIB}/mpl_toolkits/axes_grid/inset_locator.pyo
 481${PYSITELIB}/mpl_toolkits/axes_grid/parasite_axes.py
 482${PYSITELIB}/mpl_toolkits/axes_grid/parasite_axes.pyc
 483${PYSITELIB}/mpl_toolkits/axes_grid/parasite_axes.pyo
466${PYSITELIB}/mpl_toolkits/exceltools.py 484${PYSITELIB}/mpl_toolkits/exceltools.py
467${PYSITELIB}/mpl_toolkits/exceltools.pyc 485${PYSITELIB}/mpl_toolkits/exceltools.pyc
468${PYSITELIB}/mpl_toolkits/exceltools.pyo 486${PYSITELIB}/mpl_toolkits/exceltools.pyo
469${PYSITELIB}/mpl_toolkits/gtktools.py 487${PYSITELIB}/mpl_toolkits/gtktools.py
470${PYSITELIB}/mpl_toolkits/gtktools.pyc 488${PYSITELIB}/mpl_toolkits/gtktools.pyc
471${PYSITELIB}/mpl_toolkits/gtktools.pyo 489${PYSITELIB}/mpl_toolkits/gtktools.pyo
 490${PYSITELIB}/mpl_toolkits/mplot3d/__init__.py
 491${PYSITELIB}/mpl_toolkits/mplot3d/__init__.pyc
 492${PYSITELIB}/mpl_toolkits/mplot3d/__init__.pyo
 493${PYSITELIB}/mpl_toolkits/mplot3d/art3d.py
 494${PYSITELIB}/mpl_toolkits/mplot3d/art3d.pyc
 495${PYSITELIB}/mpl_toolkits/mplot3d/art3d.pyo
 496${PYSITELIB}/mpl_toolkits/mplot3d/axes3d.py
 497${PYSITELIB}/mpl_toolkits/mplot3d/axes3d.pyc
 498${PYSITELIB}/mpl_toolkits/mplot3d/axes3d.pyo
 499${PYSITELIB}/mpl_toolkits/mplot3d/axis3d.py
 500${PYSITELIB}/mpl_toolkits/mplot3d/axis3d.pyc
 501${PYSITELIB}/mpl_toolkits/mplot3d/axis3d.pyo
 502${PYSITELIB}/mpl_toolkits/mplot3d/proj3d.py
 503${PYSITELIB}/mpl_toolkits/mplot3d/proj3d.pyc
 504${PYSITELIB}/mpl_toolkits/mplot3d/proj3d.pyo
472${PYSITELIB}/pylab.py 505${PYSITELIB}/pylab.py
473${PYSITELIB}/pylab.pyc 506${PYSITELIB}/pylab.pyc
474${PYSITELIB}/pylab.pyo 507${PYSITELIB}/pylab.pyo
cvs diff -r1.9 -r1.10 pkgsrc/graphics/py-matplotlib/distinfo (expand / switch to unified diff)

--- 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 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.9 2009/08/05 11:02:12 markd Exp $ 1$NetBSD: distinfo,v 1.10 2010/05/17 16:22:59 drochner Exp $
2 2
3SHA1 (matplotlib-0.98.4.tar.gz) = 68f99ff3e9a68a1ed94f4c275ef231c1ac84e96f 3SHA1 (matplotlib-0.99.1.2.tar.gz) = c3f9053a8522e2541d93ee55e8b447165708ac15
4RMD160 (matplotlib-0.98.4.tar.gz) = cd0a8be26296eb30fb7e0ab506c8145228152a84 4RMD160 (matplotlib-0.99.1.2.tar.gz) = 11daee415102dff944d9c45de22c48c83e76dde7
5Size (matplotlib-0.98.4.tar.gz) = 9406439 bytes 5Size (matplotlib-0.99.1.2.tar.gz) = 11940390 bytes
6SHA1 (patch-aa) = 418da6795362454a91d8e569e21dc8222a9ce7e3 6SHA1 (patch-aa) = 1f900684fec67a895fc1999f72d5c164376b40a6
cvs diff -r1.15 -r1.16 pkgsrc/graphics/py-matplotlib-gtk2/Attic/Makefile (expand / switch to unified diff)

--- 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,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:48 sno Exp $ 1# $NetBSD: Makefile,v 1.16 2010/05/17 16:22:59 drochner Exp $
2# 2#
3 3
4DISTNAME= matplotlib-0.98.4 4DISTNAME= matplotlib-0.99.1.2
5PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-0.98.4 5PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-0.99.1.2
6PKGREVISION= 1 
7CATEGORIES= graphics python 6CATEGORIES= graphics python
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/}
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://matplotlib.sourceforge.net/ 10HOMEPAGE= http://matplotlib.sourceforge.net/
12COMMENT= GTK frontend for matplotlib 11COMMENT= GTK frontend for matplotlib
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
 15WRKSRC= ${WRKDIR}/matplotlib-0.99.1.1
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17PY_PATCHPLIST= yes 17PY_PATCHPLIST= yes
18PYDISTUTILSPKG= yes 18PYDISTUTILSPKG= yes
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
20 20
21PYTHON_VERSIONS_ACCEPTED= 26 25 21PYTHON_VERSIONS_ACCEPTED= 26 25
22 22
23.include "../../lang/python/extension.mk" 23.include "../../lang/python/extension.mk"
24.include "../../graphics/py-matplotlib/buildlink3.mk" 24.include "../../graphics/py-matplotlib/buildlink3.mk"
25.include "../../devel/zlib/buildlink3.mk" 25.include "../../devel/zlib/buildlink3.mk"
26.include "../../graphics/freetype2/buildlink3.mk" 26.include "../../graphics/freetype2/buildlink3.mk"
27.include "../../graphics/png/buildlink3.mk" 27.include "../../graphics/png/buildlink3.mk"
28.include "../../math/py-numpy/buildlink3.mk" 28.include "../../math/py-numpy/buildlink3.mk"
cvs diff -r1.3 -r1.4 pkgsrc/graphics/py-matplotlib-gtk2/Attic/distinfo (expand / switch to unified diff)

--- 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 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.3 2009/08/05 11:02:12 markd Exp $ 1$NetBSD: distinfo,v 1.4 2010/05/17 16:22:59 drochner Exp $
2 2
3SHA1 (matplotlib-0.98.4.tar.gz) = 68f99ff3e9a68a1ed94f4c275ef231c1ac84e96f 3SHA1 (matplotlib-0.99.1.2.tar.gz) = c3f9053a8522e2541d93ee55e8b447165708ac15
4RMD160 (matplotlib-0.98.4.tar.gz) = cd0a8be26296eb30fb7e0ab506c8145228152a84 4RMD160 (matplotlib-0.99.1.2.tar.gz) = 11daee415102dff944d9c45de22c48c83e76dde7
5Size (matplotlib-0.98.4.tar.gz) = 9406439 bytes 5Size (matplotlib-0.99.1.2.tar.gz) = 11940390 bytes
6SHA1 (patch-aa) = 03791f9ce158e89882af266398f22a21c3a12091 6SHA1 (patch-aa) = 77580934adc8641202776af79cd3d1993983552d
7SHA1 (patch-ab) = 73eac4c875d4d788657e053f9eb201d6f0003fd4 7SHA1 (patch-ab) = ee836eef8a183e79fc25cd0a5a2538d6f54cbef3
cvs diff -r1.3 -r1.4 pkgsrc/graphics/py-matplotlib-gtk2/patches/Attic/patch-aa (expand / switch to unified diff)

--- 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,48 +1,45 @@ @@ -1,48 +1,45 @@
1$NetBSD: patch-aa,v 1.3 2009/08/05 11:02:12 markd Exp $ 1$NetBSD: patch-aa,v 1.4 2010/05/17 16:22:59 drochner Exp $
2 2
3--- setupext.py.orig 2008-12-10 14:53:21.000000000 +1300 3--- setupext.py.orig 2009-08-23 05:27:32.000000000 +0000
4+++ setupext.py 4+++ setupext.py
5@@ -97,18 +97,18 @@ numpy_inc_dirs = [] 5@@ -103,16 +103,16 @@ numpy_inc_dirs = []
6 # matplotlib build options, which can be altered using setup.cfg 6 # matplotlib build options, which can be altered using setup.cfg
7 options = {'display_status': True, 7 options = {'display_status': True,
8 'verbose': False, 8 'verbose': False,
9- 'provide_pytz': 'auto', 9- 'provide_pytz': 'auto',
10- 'provide_dateutil': 'auto', 10- 'provide_dateutil': 'auto',
11- 'provide_configobj': 'auto', 
12+ 'provide_pytz': False, 
13+ 'provide_dateutil': False, 
14+ 'provide_configobj': False, 
15 'provide_traits': False, 
16- 'build_agg': True, 11- 'build_agg': True,
17- 'build_gtk': 'auto', 12- 'build_gtk': 'auto',
18- 'build_gtkagg': 'auto', 13- 'build_gtkagg': 'auto',
19- 'build_tkagg': 'auto', 14- 'build_tkagg': 'auto',
20- 'build_wxagg': 'auto', 15- 'build_wxagg': 'auto',
21- 'build_macosx': 'auto', 16- 'build_macosx': 'auto',
22- 'build_image': True, 17- 'build_image': True,
23- 'build_windowing': True, 18- 'build_windowing': True,
 19+ 'provide_pytz': 'False',
 20+ 'provide_dateutil': 'False',
24+ 'build_agg': False, 21+ 'build_agg': False,
25+ 'build_gtk': True, 22+ 'build_gtk': 'True',
26+ 'build_gtkagg': True, 23+ 'build_gtkagg': 'True',
27+ 'build_tkagg': False, 24+ 'build_tkagg': 'False',
28+ 'build_wxagg': False, 25+ 'build_wxagg': 'False',
29+ 'build_macosx': False, 26+ 'build_macosx': 'False',
30+ 'build_image': False, 27+ 'build_image': False,
31+ 'build_windowing': False, 28+ 'build_windowing': False,
32 'backend': None, 29 'backend': None}
33 'numerix': None} 
34  30
35@@ -325,11 +325,8 @@ def check_for_libpng(): 31 # Based on the contents of setup.cfg, determine the build options
 32@@ -320,11 +320,8 @@ def check_for_libpng():
36 return True 33 return True
37  34
38 def add_base_flags(module): 35 def add_base_flags(module):
39- incdirs = filter(os.path.exists, 36- incdirs = filter(os.path.exists,
40- [os.path.join(p, 'include') for p in basedir[sys.platform] ]) 37- [os.path.join(p, 'include') for p in basedir[sys.platform] ])
41- libdirs = filter(os.path.exists, 38- libdirs = filter(os.path.exists,
42- [os.path.join(p, 'lib') for p in basedir[sys.platform] ]+ 39- [os.path.join(p, 'lib') for p in basedir[sys.platform] ]+
43- [os.path.join(p, 'lib64') for p in basedir[sys.platform] ] ) 40- [os.path.join(p, 'lib64') for p in basedir[sys.platform] ] )
44+ incdirs = os.path.join(os.environ['LOCALBASE'], 'include') 41+ incdirs = os.path.join(os.environ['LOCALBASE'], 'include')
45+ libdirs = os.path.join(os.environ['LOCALBASE'], 'lib') 42+ libdirs = os.path.join(os.environ['LOCALBASE'], 'lib')
46  43
47 module.include_dirs.extend(incdirs) 44 module.include_dirs.extend(incdirs)
48 module.include_dirs.append('.') 45 module.include_dirs.append('.')
cvs diff -r1.3 -r1.4 pkgsrc/graphics/py-matplotlib-gtk2/patches/Attic/patch-ab (expand / switch to unified diff)

--- 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,66 +1,53 @@ @@ -1,66 +1,53 @@
1$NetBSD: patch-ab,v 1.3 2009/08/05 11:02:12 markd Exp $ 1$NetBSD: patch-ab,v 1.4 2010/05/17 16:22:59 drochner Exp $
2 2
3--- setup.py.orig 2008-12-10 14:53:21.000000000 +1300 3--- setup.py.orig 2008-12-10 14:53:21.000000000 +1300
4+++ setup.py 4+++ setup.py
5@@ -93,12 +93,12 @@ if not check_for_numpy(): 5@@ -101,12 +101,12 @@ if not check_for_numpy():
6 if not check_for_freetype(): 6 if not check_for_freetype():
7 sys.exit(1) 7 sys.exit(1)
8  8
9-build_ft2font(ext_modules, packages) 9-build_ft2font(ext_modules, packages)
10-build_ttconv(ext_modules, packages) 10-build_ttconv(ext_modules, packages)
11-build_contour(ext_modules, packages) 11-build_contour(ext_modules, packages)
12-build_delaunay(ext_modules, packages) 12-build_delaunay(ext_modules, packages)
13-build_nxutils(ext_modules, packages) 13-build_nxutils(ext_modules, packages)
14-build_path(ext_modules, packages) 14-build_path(ext_modules, packages)
15+#build_ft2font(ext_modules, packages) 15+#build_ft2font(ext_modules, packages)
16+#build_ttconv(ext_modules, packages) 16+#build_ttconv(ext_modules, packages)
17+#build_contour(ext_modules, packages) 17+#build_contour(ext_modules, packages)
18+#build_delaunay(ext_modules, packages) 18+#build_delaunay(ext_modules, packages)
19+#build_nxutils(ext_modules, packages) 19+#build_nxutils(ext_modules, packages)
20+#build_path(ext_modules, packages) 20+#build_path(ext_modules, packages)
21  21
22 print_raw("") 22 print_raw("")
23 print_raw("OPTIONAL BACKEND DEPENDENCIES") 23 print_raw("OPTIONAL BACKEND DEPENDENCIES")
24@@ -139,13 +139,13 @@ if options['build_wxagg']: 24@@ -147,13 +147,13 @@ if options['build_wxagg']:
25 print_message("WxAgg extension not required for wxPython >= 2.8") 25 print_message("WxAgg extension not required for wxPython >= 2.8")
26 rc['backend'] = 'WXAgg' 26 rc['backend'] = 'WXAgg'
27  27
28-hasgtk = check_for_gtk() 28-hasgtk = check_for_gtk()
29+hasgtk = 1 # check_for_gtk() 29+hasgtk = 1 # check_for_gtk()
30 if options['build_gtk']: 30 if options['build_gtk']:
31 if hasgtk or (options['build_gtk'] is True): 31 if hasgtk or (options['build_gtk'] is True):
32 build_gdk(ext_modules, packages) 32 build_gdk(ext_modules, packages)
33 if options['build_gtkagg']: 33 if options['build_gtkagg']:
34 if hasgtk or (options['build_gtkagg'] is True): 34 if hasgtk or (options['build_gtkagg'] is True):
35- options['build_agg'] = 1 35- options['build_agg'] = 1
36+ options['build_agg'] = 0 36+ options['build_agg'] = 0
37 build_gtkagg(ext_modules, packages) 37 build_gtkagg(ext_modules, packages)
38 rc['backend'] = 'GTKAgg' 38 rc['backend'] = 'GTKAgg'
39  39
40@@ -212,9 +212,9 @@ check_for_pdftops() 40@@ -257,11 +257,11 @@ distrib = setup(name="matplotlib",
41 # TODO: comment out for mpl release: 
42 print_raw("") 
43 print_raw("EXPERIMENTAL CONFIG PACKAGE DEPENDENCIES") 
44-packages.append('matplotlib.config') 
45-if check_provide_configobj(): py_modules.append('configobj') 
46-if check_provide_traits(): build_traits(ext_modules, packages) 
47+#packages.append('matplotlib.config') 
48+#if check_provide_configobj(): py_modules.append('configobj') 
49+#if check_provide_traits(): build_traits(ext_modules, packages) 
50  
51 print_raw("") 
52 print_raw("[Edit setup.cfg to suppress the above messages]") 
53@@ -255,11 +255,11 @@ distrib = setup(name="matplotlib", 
54 interfaces and hardcopy output formats. There is a 'pylab' mode 41 interfaces and hardcopy output formats. There is a 'pylab' mode
55 which emulates matlab graphics 42 which emulates matlab graphics
56 """, 43 """,
57- packages = packages, 44- packages = packages,
58+# packages = packages, 45+# packages = packages,
59 platforms='any', 46 platforms='any',
60- py_modules = py_modules, 47- py_modules = py_modules,
61+# py_modules = py_modules, 48+# py_modules = py_modules,
62 ext_modules = ext_modules, 49 ext_modules = ext_modules,
63 package_dir = {'': 'lib'}, 50 package_dir = {'': 'lib'},
64- package_data = package_data, 51- package_data = package_data,
65+# package_data = package_data, 52+# package_data = package_data,
66 **additional_params 53 **additional_params
cvs diff -r1.4 -r1.5 pkgsrc/graphics/py-matplotlib-tk/Attic/Makefile (expand / switch to unified diff)

--- 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,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: Makefile,v 1.4 2009/09/23 09:54:45 tron Exp $ 1# $NetBSD: Makefile,v 1.5 2010/05/17 16:22:59 drochner Exp $
2# 2#
3 3
4DISTNAME= matplotlib-0.98.4 4DISTNAME= matplotlib-0.99.1.2
5PKGNAME= ${PYPKGPREFIX}-matplotlib-tk-0.98.4 5PKGNAME= ${PYPKGPREFIX}-matplotlib-tk-0.99.1.2
6CATEGORIES= graphics python 6CATEGORIES= graphics python
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://matplotlib.sourceforge.net/ 10HOMEPAGE= http://matplotlib.sourceforge.net/
11COMMENT= Tk frontend for matplotlib 11COMMENT= Tk frontend for matplotlib
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
 15WRKSRC= ${WRKDIR}/matplotlib-0.99.1.1
15USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
16PY_PATCHPLIST= yes 17PY_PATCHPLIST= yes
17PYDISTUTILSPKG= yes 18PYDISTUTILSPKG= yes
18USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
19 20
20 21
21.include "../../lang/python/extension.mk" 22.include "../../lang/python/extension.mk"
22.include "../../graphics/py-matplotlib/buildlink3.mk" 23.include "../../graphics/py-matplotlib/buildlink3.mk"
23.include "../../devel/zlib/buildlink3.mk" 24.include "../../devel/zlib/buildlink3.mk"
24.include "../../graphics/freetype2/buildlink3.mk" 25.include "../../graphics/freetype2/buildlink3.mk"
25.include "../../graphics/png/buildlink3.mk" 26.include "../../graphics/png/buildlink3.mk"
26.include "../../math/py-numpy/buildlink3.mk" 27.include "../../math/py-numpy/buildlink3.mk"
27.include "../../x11/py-Tk/buildlink3.mk" 28.include "../../x11/py-Tk/buildlink3.mk"
cvs diff -r1.3 -r1.4 pkgsrc/graphics/py-matplotlib-tk/Attic/distinfo (expand / switch to unified diff)

--- 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 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.3 2009/08/05 11:02:12 markd Exp $ 1$NetBSD: distinfo,v 1.4 2010/05/17 16:22:59 drochner Exp $
2 2
3SHA1 (matplotlib-0.98.4.tar.gz) = 68f99ff3e9a68a1ed94f4c275ef231c1ac84e96f 3SHA1 (matplotlib-0.99.1.2.tar.gz) = c3f9053a8522e2541d93ee55e8b447165708ac15
4RMD160 (matplotlib-0.98.4.tar.gz) = cd0a8be26296eb30fb7e0ab506c8145228152a84 4RMD160 (matplotlib-0.99.1.2.tar.gz) = 11daee415102dff944d9c45de22c48c83e76dde7
5Size (matplotlib-0.98.4.tar.gz) = 9406439 bytes 5Size (matplotlib-0.99.1.2.tar.gz) = 11940390 bytes
6SHA1 (patch-aa) = 63d0e5eb866f2e4dd1ed1dc25e12040f5e0f2383 6SHA1 (patch-aa) = 193497e854113548345f10fc21b0d258f6376267
7SHA1 (patch-ab) = 291205d748e0109378f076a8a2b5c5e23d176cb2 7SHA1 (patch-ab) = 0a89e0d6fd96e3f998ab92130596c248061c36e3
cvs diff -r1.2 -r1.3 pkgsrc/graphics/py-matplotlib-tk/patches/Attic/patch-aa (expand / switch to unified diff)

--- 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,50 +1,45 @@ @@ -1,50 +1,45 @@
1$NetBSD: patch-aa,v 1.2 2009/08/05 11:02:12 markd Exp $ 1$NetBSD: patch-aa,v 1.3 2010/05/17 16:22:59 drochner Exp $
2 2
3Only turn on building of the Tk part. 3--- setupext.py.orig 2009-08-23 05:27:32.000000000 +0000
4 
5--- setupext.py.orig 2008-12-10 14:53:21.000000000 +1300 
6+++ setupext.py 4+++ setupext.py
7@@ -97,18 +97,18 @@ numpy_inc_dirs = [] 5@@ -103,16 +103,16 @@ numpy_inc_dirs = []
8 # matplotlib build options, which can be altered using setup.cfg 6 # matplotlib build options, which can be altered using setup.cfg
9 options = {'display_status': True, 7 options = {'display_status': True,
10 'verbose': False, 8 'verbose': False,
11- 'provide_pytz': 'auto', 9- 'provide_pytz': 'auto',
12- 'provide_dateutil': 'auto', 10- 'provide_dateutil': 'auto',
13- 'provide_configobj': 'auto', 
14+ 'provide_pytz': False, 
15+ 'provide_dateutil': False, 
16+ 'provide_configobj': False, 
17 'provide_traits': False, 
18- 'build_agg': True, 11- 'build_agg': True,
19- 'build_gtk': 'auto', 12- 'build_gtk': 'auto',
20- 'build_gtkagg': 'auto', 13- 'build_gtkagg': 'auto',
21- 'build_tkagg': 'auto', 14- 'build_tkagg': 'auto',
22- 'build_wxagg': 'auto', 15- 'build_wxagg': 'auto',
23- 'build_macosx': 'auto', 16- 'build_macosx': 'auto',
24- 'build_image': True, 17- 'build_image': True,
25- 'build_windowing': True, 18- 'build_windowing': True,
 19+ 'provide_pytz': False,
 20+ 'provide_dateutil': False,
26+ 'build_agg': False, 21+ 'build_agg': False,
27+ 'build_gtk': False, 22+ 'build_gtk': False,
28+ 'build_gtkagg': False, 23+ 'build_gtkagg': False,
29+ 'build_tkagg': True, 24+ 'build_tkagg': True,
30+ 'build_wxagg': False, 25+ 'build_wxagg': False,
31+ 'build_macosx': False, 26+ 'build_macosx': False,
32+ 'build_image': False, 27+ 'build_image': False,
33+ 'build_windowing': False, 28+ 'build_windowing': False,
34 'backend': None, 29 'backend': None}
35 'numerix': None} 
36  30
37@@ -325,11 +325,8 @@ def check_for_libpng(): 31 # Based on the contents of setup.cfg, determine the build options
 32@@ -320,11 +320,8 @@ def check_for_libpng():
38 return True 33 return True
39  34
40 def add_base_flags(module): 35 def add_base_flags(module):
41- incdirs = filter(os.path.exists, 36- incdirs = filter(os.path.exists,
42- [os.path.join(p, 'include') for p in basedir[sys.platform] ]) 37- [os.path.join(p, 'include') for p in basedir[sys.platform] ])
43- libdirs = filter(os.path.exists, 38- libdirs = filter(os.path.exists,
44- [os.path.join(p, 'lib') for p in basedir[sys.platform] ]+ 39- [os.path.join(p, 'lib') for p in basedir[sys.platform] ]+
45- [os.path.join(p, 'lib64') for p in basedir[sys.platform] ] ) 40- [os.path.join(p, 'lib64') for p in basedir[sys.platform] ] )
46+ incdirs = os.path.join(os.environ['LOCALBASE'], 'include') 41+ incdirs = os.path.join(os.environ['LOCALBASE'], 'include')
47+ libdirs = os.path.join(os.environ['LOCALBASE'], 'lib') 42+ libdirs = os.path.join(os.environ['LOCALBASE'], 'lib')
48  43
49 module.include_dirs.extend(incdirs) 44 module.include_dirs.extend(incdirs)
50 module.include_dirs.append('.') 45 module.include_dirs.append('.')
cvs diff -r1.2 -r1.3 pkgsrc/graphics/py-matplotlib-tk/patches/Attic/patch-ab (expand / switch to unified diff)

--- 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,69 +1,53 @@ @@ -1,69 +1,53 @@
1$NetBSD: patch-ab,v 1.2 2009/08/05 11:02:12 markd Exp $ 1$NetBSD: patch-ab,v 1.3 2010/05/17 16:22:59 drochner Exp $
2 2
3Ensure we skip installation of the non-Tk stuff, installed 3--- setup.py.orig 2009-08-01 19:15:24.000000000 +0000
4by py-matplotlib itself. 
5 
6--- setup.py.orig 2008-12-10 14:53:21.000000000 +1300 
7+++ setup.py 4+++ setup.py
8@@ -93,12 +93,12 @@ if not check_for_numpy(): 5@@ -105,12 +105,12 @@ if not check_for_numpy():
9 if not check_for_freetype(): 6 if not check_for_freetype():
10 sys.exit(1) 7 sys.exit(1)
11  8
12-build_ft2font(ext_modules, packages) 9-build_ft2font(ext_modules, packages)
13-build_ttconv(ext_modules, packages) 10-build_ttconv(ext_modules, packages)
14-build_contour(ext_modules, packages) 11-build_contour(ext_modules, packages)
15-build_delaunay(ext_modules, packages) 12-build_delaunay(ext_modules, packages)
16-build_nxutils(ext_modules, packages) 13-build_nxutils(ext_modules, packages)
17-build_path(ext_modules, packages) 14-build_path(ext_modules, packages)
18+#build_ft2font(ext_modules, packages) 15+#build_ft2font(ext_modules, packages)
19+#build_ttconv(ext_modules, packages) 16+#build_ttconv(ext_modules, packages)
20+#build_contour(ext_modules, packages) 17+#build_contour(ext_modules, packages)
21+#build_delaunay(ext_modules, packages) 18+#build_delaunay(ext_modules, packages)
22+#build_nxutils(ext_modules, packages) 19+#build_nxutils(ext_modules, packages)
23+#build_path(ext_modules, packages) 20+#build_path(ext_modules, packages)
24  21
25 print_raw("") 22 print_raw("")
26 print_raw("OPTIONAL BACKEND DEPENDENCIES") 23 print_raw("OPTIONAL BACKEND DEPENDENCIES")
27@@ -139,13 +139,13 @@ if options['build_wxagg']: 24@@ -151,13 +151,13 @@ if options['build_wxagg']:
28 print_message("WxAgg extension not required for wxPython >= 2.8") 25 print_message("WxAgg extension not required for wxPython >= 2.8")
29 rc['backend'] = 'WXAgg' 26 rc['backend'] = 'WXAgg'
30  27
31-hasgtk = check_for_gtk() 28-hasgtk = check_for_gtk()
32+hasgtk = 1 # check_for_gtk() 29+hasgtk = 1 # check_for_gtk()
33 if options['build_gtk']: 30 if options['build_gtk']:
34 if hasgtk or (options['build_gtk'] is True): 31 if hasgtk or (options['build_gtk'] is True):
35 build_gdk(ext_modules, packages) 32 build_gdk(ext_modules, packages)
36 if options['build_gtkagg']: 33 if options['build_gtkagg']:
37 if hasgtk or (options['build_gtkagg'] is True): 34 if hasgtk or (options['build_gtkagg'] is True):
38- options['build_agg'] = 1 35- options['build_agg'] = 1
39+ options['build_agg'] = 0 36+ options['build_agg'] = 0
40 build_gtkagg(ext_modules, packages) 37 build_gtkagg(ext_modules, packages)
41 rc['backend'] = 'GTKAgg' 38 rc['backend'] = 'GTKAgg'
42  39
43@@ -212,9 +212,9 @@ check_for_pdftops() 40@@ -258,11 +258,11 @@ distrib = setup(name="matplotlib",
44 # TODO: comment out for mpl release: 
45 print_raw("") 
46 print_raw("EXPERIMENTAL CONFIG PACKAGE DEPENDENCIES") 
47-packages.append('matplotlib.config') 
48-if check_provide_configobj(): py_modules.append('configobj') 
49-if check_provide_traits(): build_traits(ext_modules, packages) 
50+#packages.append('matplotlib.config') 
51+#if check_provide_configobj(): py_modules.append('configobj') 
52+#if check_provide_traits(): build_traits(ext_modules, packages) 
53  
54 print_raw("") 
55 print_raw("[Edit setup.cfg to suppress the above messages]") 
56@@ -255,11 +255,11 @@ distrib = setup(name="matplotlib", 
57 interfaces and hardcopy output formats. There is a 'pylab' mode 41 interfaces and hardcopy output formats. There is a 'pylab' mode
58 which emulates matlab graphics 42 which emulates matlab graphics
59 """, 43 """,
60- packages = packages, 44- packages = packages,
61+# packages = packages, 45+# packages = packages,
62 platforms='any', 46 platforms='any',
63- py_modules = py_modules, 47- py_modules = py_modules,
64+# py_modules = py_modules, 48+# py_modules = py_modules,
65 ext_modules = ext_modules, 49 ext_modules = ext_modules,
66 package_dir = {'': 'lib'}, 50 package_dir = {'': 'lib'},
67- package_data = package_data, 51- package_data = package_data,
68+# package_data = package_data, 52+# package_data = package_data,
69 **additional_params 53 **additional_params
cvs diff -r1.6 -r1.7 pkgsrc/graphics/py-matplotlib/patches/Attic/patch-aa (expand / switch to unified diff)

--- 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,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-aa,v 1.6 2009/08/05 11:02:12 markd Exp $ 1$NetBSD: patch-aa,v 1.7 2010/05/17 16:22:59 drochner Exp $
2 2
3--- setupext.py.orig 2008-12-10 14:53:21.000000000 +1300 3--- setupext.py.orig 2008-12-10 14:53:21.000000000 +1300
4+++ setupext.py 4+++ setupext.py
5@@ -102,10 +102,10 @@ options = {'display_status': True, 5@@ -99,10 +99,10 @@ options = {'display_status': True,
6 'provide_configobj': 'auto', 6 'provide_pytz': 'auto',
7 'provide_traits': False, 7 'provide_dateutil': 'auto',
8 'build_agg': True, 8 'build_agg': True,
9- 'build_gtk': 'auto', 9- 'build_gtk': 'auto',
10- 'build_gtkagg': 'auto', 10- 'build_gtkagg': 'auto',
11- 'build_tkagg': 'auto', 11- 'build_tkagg': 'auto',
12- 'build_wxagg': 'auto', 12- 'build_wxagg': 'auto',
13+ 'build_gtk': False, 13+ 'build_gtk': False,
14+ 'build_gtkagg': False, 14+ 'build_gtkagg': False,
15+ 'build_tkagg': False, 15+ 'build_tkagg': False,
16+ 'build_wxagg': False, 16+ 'build_wxagg': False,
17 'build_macosx': 'auto', 17 'build_macosx': 'auto',
18 'build_image': True, 18 'build_image': True,
19 'build_windowing': True, 19 'build_windowing': True,
20@@ -325,11 +325,8 @@ def check_for_libpng(): 20@@ -315,11 +315,8 @@ def check_for_libpng():
21 return True 21 return True
22  22
23 def add_base_flags(module): 23 def add_base_flags(module):
24- incdirs = filter(os.path.exists, 24- incdirs = filter(os.path.exists,
25- [os.path.join(p, 'include') for p in basedir[sys.platform] ]) 25- [os.path.join(p, 'include') for p in basedir[sys.platform] ])
26- libdirs = filter(os.path.exists, 26- libdirs = filter(os.path.exists,
27- [os.path.join(p, 'lib') for p in basedir[sys.platform] ]+ 27- [os.path.join(p, 'lib') for p in basedir[sys.platform] ]+
28- [os.path.join(p, 'lib64') for p in basedir[sys.platform] ] ) 28- [os.path.join(p, 'lib64') for p in basedir[sys.platform] ] )
29+ incdirs = [os.path.join(os.environ['LOCALBASE'], 'include')] 29+ incdirs = [os.path.join(os.environ['LOCALBASE'], 'include')]
30+ libdirs = [os.path.join(os.environ['LOCALBASE'], 'lib')] 30+ libdirs = [os.path.join(os.environ['LOCALBASE'], 'lib')]
31  31
32 module.include_dirs.extend(incdirs) 32 module.include_dirs.extend(incdirs)
33 module.include_dirs.append('.') 33 module.include_dirs.append('.')