From 83cb5da15133ea5bff296ffed0deb2449511a48b Mon Sep 17 00:00:00 2001 From: djm Date: Wed, 2 Feb 2005 23:16:18 +0000 Subject: [PATCH] matplotlib-0.71 --- graphics/py-matplotlib/Makefile | 16 +++--- graphics/py-matplotlib/distinfo | 8 +-- .../patches/patch-lib_matplotlib___init___py | 14 ++--- graphics/py-matplotlib/patches/patch-setup_py | 42 +++++++++------ .../py-matplotlib/patches/patch-setupext_py | 8 +-- graphics/py-matplotlib/pkg/PFRAG.shared | 3 +- graphics/py-matplotlib/pkg/PLIST | 54 +++++++++++++++---- 7 files changed, 95 insertions(+), 50 deletions(-) diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile index 6b7f18e807d..7ccf3b11559 100644 --- a/graphics/py-matplotlib/Makefile +++ b/graphics/py-matplotlib/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2005/01/28 00:17:26 alek Exp $ +# $OpenBSD: Makefile,v 1.6 2005/02/02 23:16:18 djm Exp $ COMMENT= "Python charting and plotting API" -DISTNAME= matplotlib-0.64 -PKGNAME= py-${DISTNAME}p2 +DISTNAME= matplotlib-0.71 +PKGNAME= py-${DISTNAME} CATEGORIES= graphics devel HOMEPAGE= http://matplotlib.sourceforge.net/ @@ -18,11 +18,11 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xext Xft Xinerama Xrender atk-1.0.0.0 fontconfig \ - freetype gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 \ - glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \ - gtk-x11-2.0.0.0 Xcursor m pango-1.0.0.0 \ - pangox-1.0.0.0 pangoxft-1.0.0.0 stdc++ z +WANTLIB= X11 Xcursor Xext Xft Xinerama Xrender atk-1.0.0.0 \ + fontconfig freetype gdk-x11-2.0.0.0 \ + gdk_pixbuf-2.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 \ + gobject-2.0.0.0 gtk-x11-2.0.0.0 intl m \ + pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 stdc++ z MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/} diff --git a/graphics/py-matplotlib/distinfo b/graphics/py-matplotlib/distinfo index c6b3567f83f..2d2fd66e0b8 100644 --- a/graphics/py-matplotlib/distinfo +++ b/graphics/py-matplotlib/distinfo @@ -1,4 +1,4 @@ -MD5 (matplotlib-0.64.tar.gz) = f82246711c225ab55c1d256000ca9345 -RMD160 (matplotlib-0.64.tar.gz) = b8a8ac9b383e848dd2523243da4cad4a08be237e -SHA1 (matplotlib-0.64.tar.gz) = 6821dc33c8edb89fdcc304fbe587da8be1392a54 -SIZE (matplotlib-0.64.tar.gz) = 2024199 +MD5 (matplotlib-0.71.tar.gz) = 286bd4ad537fd9566214e39395a3cb50 +RMD160 (matplotlib-0.71.tar.gz) = c9a68ac40d70b0ac7ec89d23b835efbf2f1bd58d +SHA1 (matplotlib-0.71.tar.gz) = bf429c25829fafc3bec0cafc5f4457958d656406 +SIZE (matplotlib-0.71.tar.gz) = 2089317 diff --git a/graphics/py-matplotlib/patches/patch-lib_matplotlib___init___py b/graphics/py-matplotlib/patches/patch-lib_matplotlib___init___py index 3c567f68de7..1566a2fcec2 100644 --- a/graphics/py-matplotlib/patches/patch-lib_matplotlib___init___py +++ b/graphics/py-matplotlib/patches/patch-lib_matplotlib___init___py @@ -1,10 +1,10 @@ -$OpenBSD: patch-lib_matplotlib___init___py,v 1.1.1.1 2004/11/11 04:05:26 djm Exp $ ---- lib/matplotlib/__init__.py.orig Tue Nov 9 21:59:25 2004 -+++ lib/matplotlib/__init__.py Tue Nov 9 21:59:48 2004 -@@ -286,15 +286,15 @@ def get_home(): +$OpenBSD: patch-lib_matplotlib___init___py,v 1.2 2005/02/02 23:16:18 djm Exp $ +--- lib/matplotlib/__init__.py.orig Sat Jan 22 07:22:37 2005 ++++ lib/matplotlib/__init__.py Wed Feb 2 17:06:03 2005 +@@ -294,15 +294,15 @@ def _get_data_path(): + path = os.environ['MATPLOTLIBDATA'] + if os.path.isdir(path): return path - def _get_data_path(): - 'get the path to matplotlib data' - path = os.path.join(distutils.sysconfig.PREFIX, 'share', 'matplotlib') + path = os.path.join(distutils.sysconfig.PREFIX, 'share', 'py-matplotlib') if os.path.isdir(path): return path @@ -19,4 +19,4 @@ $OpenBSD: patch-lib_matplotlib___init___py,v 1.1.1.1 2004/11/11 04:05:26 djm Exp + 'share','py-matplotlib') if os.path.isdir(path): return path - if os.environ.has_key('MATPLOTLIBDATA'): + diff --git a/graphics/py-matplotlib/patches/patch-setup_py b/graphics/py-matplotlib/patches/patch-setup_py index 4f99d26d734..3c318d961a5 100644 --- a/graphics/py-matplotlib/patches/patch-setup_py +++ b/graphics/py-matplotlib/patches/patch-setup_py @@ -1,7 +1,7 @@ -$OpenBSD: patch-setup_py,v 1.1.1.1 2004/11/11 04:05:26 djm Exp $ ---- setup.py.orig Fri Nov 5 02:41:42 2004 -+++ setup.py Tue Nov 9 20:53:39 2004 -@@ -67,7 +67,7 @@ data.extend(glob.glob('images/*.png')) +$OpenBSD: patch-setup_py,v 1.2 2005/02/02 23:16:18 djm Exp $ +--- setup.py.orig Sat Jan 22 05:42:00 2005 ++++ setup.py Wed Feb 2 17:04:46 2005 +@@ -77,7 +77,7 @@ data.extend(glob.glob('images/*.png')) data.extend(glob.glob('images/*.ppm')) data.append('.matplotlibrc') @@ -10,18 +10,28 @@ $OpenBSD: patch-setup_py,v 1.1.1.1 2004/11/11 04:05:26 djm Exp $ # Figure out which array packages to provide binary support for # and define the NUMERIX value: Numeric, numarray, or both. -@@ -122,9 +122,11 @@ if havedate: # dates require python23 da +@@ -148,14 +148,16 @@ if havedate: # dates require python23 da + build_transforms(ext_modules, packages, NUMERIX) - - if BUILD_GTKAGG: -- try: import gtk -- except ImportError: print 'GTKAgg requires pygtk' -- else: + +-if BUILD_GTKAGG: +- try: +- import gtk +- except ImportError: +- print 'GTKAgg requires pygtk' +- BUILD_GTKAGG=0 +- except RuntimeError: +- print 'pygtk present but import failed' +# Dependencies ensure that py-gtk2 exists, so this isn't necessary. Also, +# the "import gtk" tries to access $DISPLAY at build time! -+# try: import gtk -+# except ImportError: print 'GTKAgg requires pygtk' -+# else: - BUILD_AGG = 1 - build_gtkagg(ext_modules, packages) - ++#if BUILD_GTKAGG: ++# try: ++# import gtk ++# except ImportError: ++# print 'GTKAgg requires pygtk' ++# BUILD_GTKAGG=0 ++# except RuntimeError: ++# print 'pygtk present but import failed' + if BUILD_GTKAGG: + BUILD_AGG = 1 + build_gtkagg(ext_modules, packages) diff --git a/graphics/py-matplotlib/patches/patch-setupext_py b/graphics/py-matplotlib/patches/patch-setupext_py index f05b5a668cf..111615774d3 100644 --- a/graphics/py-matplotlib/patches/patch-setupext_py +++ b/graphics/py-matplotlib/patches/patch-setupext_py @@ -1,6 +1,6 @@ -$OpenBSD: patch-setupext_py,v 1.1.1.1 2004/11/11 04:05:26 djm Exp $ ---- setupext.py.orig Fri Nov 5 02:27:13 2004 -+++ setupext.py Tue Nov 9 20:53:10 2004 +$OpenBSD: patch-setupext_py,v 1.2 2005/02/02 23:16:18 djm Exp $ +--- setupext.py.orig Wed Dec 15 10:16:24 2004 ++++ setupext.py Wed Feb 2 17:03:26 2005 @@ -35,6 +35,7 @@ basedir = { 'win32' : ['win32_static',], 'linux2' : ['/usr/local', '/usr',], @@ -9,7 +9,7 @@ $OpenBSD: patch-setupext_py,v 1.1.1.1 2004/11/11 04:05:26 djm Exp $ 'darwin' : ['/usr/local', '/usr', '/sw', '/usr/X11R6'], 'freebsd4' : ['/usr/local', '/usr'], 'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',], -@@ -82,6 +83,8 @@ def temp_copy(_from, _to): +@@ -83,6 +84,8 @@ def temp_copy(_from, _to): def add_base_flags(module): incdirs = [os.path.join(p, 'include') for p in basedir[sys.platform] if os.path.exists(p)] diff --git a/graphics/py-matplotlib/pkg/PFRAG.shared b/graphics/py-matplotlib/pkg/PFRAG.shared index 0e1e116433f..dd041ff8b18 100644 --- a/graphics/py-matplotlib/pkg/PFRAG.shared +++ b/graphics/py-matplotlib/pkg/PFRAG.shared @@ -1,4 +1,5 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2004/11/11 04:05:26 djm Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.2 2005/02/02 23:16:18 djm Exp $ +lib/python${MODPY_VERSION}/site-packages/matplotlib/_nc_contour.so lib/python${MODPY_VERSION}/site-packages/matplotlib/_nc_image.so lib/python${MODPY_VERSION}/site-packages/matplotlib/_nc_transforms.so lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/_backend_agg.so diff --git a/graphics/py-matplotlib/pkg/PLIST b/graphics/py-matplotlib/pkg/PLIST index 6f4520a9af7..9b8c0bc8057 100644 --- a/graphics/py-matplotlib/pkg/PLIST +++ b/graphics/py-matplotlib/pkg/PLIST @@ -1,14 +1,18 @@ -@comment $OpenBSD: PLIST,v 1.2 2004/11/11 12:41:33 alek Exp $ +@comment $OpenBSD: PLIST,v 1.3 2005/02/02 23:16:18 djm Exp $ %%SHARED%% +lib/python${MODPY_VERSION}/ +lib/python${MODPY_VERSION}/site-packages/ lib/python${MODPY_VERSION}/site-packages/matplotlib/ lib/python${MODPY_VERSION}/site-packages/matplotlib/__init__.py lib/python${MODPY_VERSION}/site-packages/matplotlib/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/_contour.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/_contour.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/_image.py lib/python${MODPY_VERSION}/site-packages/matplotlib/_image.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/_mathtext_data.py lib/python${MODPY_VERSION}/site-packages/matplotlib/_mathtext_data.pyc -lib/python${MODPY_VERSION}/site-packages/matplotlib/_matlab_helpers.py -lib/python${MODPY_VERSION}/site-packages/matplotlib/_matlab_helpers.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/_pylab_helpers.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/_pylab_helpers.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/_transforms.py lib/python${MODPY_VERSION}/site-packages/matplotlib/_transforms.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/afm.py @@ -32,6 +36,8 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_fltkagg.py lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_fltkagg.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_gd.py lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_gd.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_gdk.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_gdk.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_gtk.py lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_gtk.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_gtkagg.py @@ -82,14 +88,29 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/matlab.py lib/python${MODPY_VERSION}/site-packages/matplotlib/matlab.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/mlab.py lib/python${MODPY_VERSION}/site-packages/matplotlib/mlab.pyc -lib/python${MODPY_VERSION}/site-packages/matplotlib/na_imports.py -lib/python${MODPY_VERSION}/site-packages/matplotlib/na_imports.pyc -lib/python${MODPY_VERSION}/site-packages/matplotlib/nc_imports.py -lib/python${MODPY_VERSION}/site-packages/matplotlib/nc_imports.pyc -lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix.py -lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/ +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/__init__.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/_na_imports.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/_na_imports.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/_nc_imports.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/_nc_imports.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/fft/ +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/fft/__init__.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/fft/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/linear_algebra/ +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/linear_algebra/__init__.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/linear_algebra/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/mlab/ +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/mlab/__init__.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/mlab/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/random_array/ +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/random_array/__init__.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/numerix/random_array/__init__.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/patches.py lib/python${MODPY_VERSION}/site-packages/matplotlib/patches.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/pylab.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/pylab.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/pyparsing.py lib/python${MODPY_VERSION}/site-packages/matplotlib/pyparsing.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/table.py @@ -102,9 +123,12 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/transforms.py lib/python${MODPY_VERSION}/site-packages/matplotlib/transforms.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/windowing.py lib/python${MODPY_VERSION}/site-packages/matplotlib/windowing.pyc +lib/python${MODPY_VERSION}/site-packages/pylab.py +lib/python${MODPY_VERSION}/site-packages/pylab.pyc share/examples/py-matplotlib/ share/examples/py-matplotlib/README share/examples/py-matplotlib/__init__.py +share/examples/py-matplotlib/accented_text.py share/examples/py-matplotlib/alignment_test.py share/examples/py-matplotlib/anim.py share/examples/py-matplotlib/anim_tk.py @@ -120,6 +144,8 @@ share/examples/py-matplotlib/barh_demo.py share/examples/py-matplotlib/break.py share/examples/py-matplotlib/color_demo.py share/examples/py-matplotlib/colours.py +share/examples/py-matplotlib/contour_demo.py +share/examples/py-matplotlib/contour_demo2.py share/examples/py-matplotlib/coords_demo.py share/examples/py-matplotlib/coords_report.py share/examples/py-matplotlib/csd_demo.py @@ -149,6 +175,7 @@ share/examples/py-matplotlib/dynamic_image_wxagg.py share/examples/py-matplotlib/embedding_in_gtk.py share/examples/py-matplotlib/embedding_in_gtk2.py share/examples/py-matplotlib/embedding_in_tk.py +share/examples/py-matplotlib/embedding_in_tk2.py share/examples/py-matplotlib/embedding_in_wx.py share/examples/py-matplotlib/embedding_in_wx2.py share/examples/py-matplotlib/embedding_in_wx3.py @@ -180,6 +207,7 @@ share/examples/py-matplotlib/integral_demo.py share/examples/py-matplotlib/interactive.py share/examples/py-matplotlib/interactive2.py share/examples/py-matplotlib/invert_axes.py +share/examples/py-matplotlib/keypress_demo.py share/examples/py-matplotlib/layer_images.py share/examples/py-matplotlib/legend_demo.py share/examples/py-matplotlib/legend_demo2.py @@ -203,17 +231,20 @@ share/examples/py-matplotlib/object_picker.py share/examples/py-matplotlib/pcolor_demo.py share/examples/py-matplotlib/pcolor_demo2.py share/examples/py-matplotlib/pcolor_small.py +share/examples/py-matplotlib/picker_demo.py +share/examples/py-matplotlib/pie_demo.py share/examples/py-matplotlib/polar_demo.py -share/examples/py-matplotlib/polar_demo2.py share/examples/py-matplotlib/polar_scatter.py share/examples/py-matplotlib/poormans_contour.py share/examples/py-matplotlib/print_stdout.py +share/examples/py-matplotlib/printing_in_wx.py share/examples/py-matplotlib/psd_demo.py share/examples/py-matplotlib/pstest.py share/examples/py-matplotlib/pythonic_matplotlib.py share/examples/py-matplotlib/scatter_demo.py share/examples/py-matplotlib/scatter_demo2.py share/examples/py-matplotlib/scatter_profile.py +share/examples/py-matplotlib/set_and_get.py share/examples/py-matplotlib/simple_plot.py share/examples/py-matplotlib/specgram_demo.py share/examples/py-matplotlib/stem_plot.py @@ -222,13 +253,16 @@ share/examples/py-matplotlib/subplot_demo.py share/examples/py-matplotlib/system_monitor.py share/examples/py-matplotlib/table_demo.py share/examples/py-matplotlib/text_handles.py +share/examples/py-matplotlib/text_rotation.py share/examples/py-matplotlib/text_themes.py share/examples/py-matplotlib/to_numeric.py +share/examples/py-matplotlib/toggle_images.py share/examples/py-matplotlib/two_scales.py share/examples/py-matplotlib/vertical_ticklabels.py share/examples/py-matplotlib/vline_demo.py share/examples/py-matplotlib/webapp_demo.py share/examples/py-matplotlib/wxcursor_demo.py +share/examples/py-matplotlib/zorder_demo.py share/py-matplotlib/ share/py-matplotlib/.matplotlibrc share/py-matplotlib/Vera.ttf