From 1434c65b1cc3e8151bb089237a46d41b5f12299b Mon Sep 17 00:00:00 2001 From: djm Date: Sat, 9 Jul 2005 06:14:04 +0000 Subject: [PATCH] update to matplotlib-0.82, set SHARED_ONLY, make demos usable in-place --- graphics/py-matplotlib/Makefile | 25 ++++++++--- graphics/py-matplotlib/distinfo | 8 ++-- .../patches/patch-examples_contour_demo_py | 10 +++++ .../patches/patch-examples_contourf_demo_py | 10 +++++ .../patches/patch-examples_dash_control_py | 10 +++++ .../patches/patch-examples_dashtick_py | 12 ++++++ .../patches/patch-examples_date_demo2_py | 10 +++++ .../patches/patch-examples_image_interp_py | 24 +++++++++++ .../patches/patch-examples_log_demo_py | 10 +++++ .../patches/patch-examples_masked_demo_py | 11 +++++ .../patches/patch-examples_mathtext_demo_py | 11 +++++ .../patches/patch-examples_pcolor_demo_py | 12 ++++++ .../patches/patch-examples_pie_demo_py | 11 +++++ .../patches/patch-examples_polar_demo_py | 10 +++++ .../patches/patch-examples_print_stdout_py | 10 +++++ .../patches/patch-examples_simple_plot_py | 11 +++++ .../patches/patch-examples_tex_demo_py | 12 ++++++ .../patches/patch-examples_unicode_demo_py | 10 +++++ .../patches/patch-lib_matplotlib___init___py | 8 ++-- graphics/py-matplotlib/patches/patch-setup_py | 10 ++--- .../py-matplotlib/patches/patch-setupext_py | 18 ++++---- graphics/py-matplotlib/pkg/PFRAG.shared | 10 ----- graphics/py-matplotlib/pkg/PLIST | 42 ++++++++++++++++++- 23 files changed, 265 insertions(+), 40 deletions(-) create mode 100644 graphics/py-matplotlib/patches/patch-examples_contour_demo_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_contourf_demo_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_dash_control_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_dashtick_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_date_demo2_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_image_interp_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_log_demo_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_masked_demo_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_mathtext_demo_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_pcolor_demo_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_pie_demo_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_polar_demo_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_print_stdout_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_simple_plot_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_tex_demo_py create mode 100644 graphics/py-matplotlib/patches/patch-examples_unicode_demo_py delete mode 100644 graphics/py-matplotlib/pkg/PFRAG.shared diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile index 8b9cd26052d..851155db0f6 100644 --- a/graphics/py-matplotlib/Makefile +++ b/graphics/py-matplotlib/Makefile @@ -1,8 +1,10 @@ -# $OpenBSD: Makefile,v 1.8 2005/05/09 11:47:50 djm Exp $ +# $OpenBSD: Makefile,v 1.9 2005/07/09 06:14:04 djm Exp $ + +SHARED_ONLY= Yes COMMENT= "Python charting and plotting API" -DISTNAME= matplotlib-0.80 +DISTNAME= matplotlib-0.82 PKGNAME= py-${DISTNAME} CATEGORIES= graphics devel @@ -36,17 +38,28 @@ LIB_DEPENDS= png.3::graphics/png MAKE_ENV+= EXTRA_INCLUDES="${WRKSRC} ${LOCALBASE}/include/libpng" -# This file interferes with update-patches +# The matplotlib distributors seem to have an uncanny knack for breaking +# update-patches by shipping .orig files, over several releases... post-extract: - @rm -f ${WRKSRC}/lib/matplotlib/legend.py.orig + @find ${WRKSRC} -type f -name \*.orig | xargs rm -f post-install: + # examples ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-matplotlib - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-matplotlib/data - ${INSTALL_DATA} ${WRKSRC}/examples/*.* ${WRKSRC}/examples/README \ + ${INSTALL_DATA} ${WRKSRC}/examples/README ${WRKSRC}/examples/*.glade \ ${PREFIX}/share/examples/py-matplotlib + ${INSTALL_SCRIPT} ${WRKSRC}/examples/*.py \ + ${PREFIX}/share/examples/py-matplotlib + # examples/data + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-matplotlib/data ${INSTALL_DATA} ${WRKSRC}/examples/data/* \ ${PREFIX}/share/examples/py-matplotlib/data + # examples/widgets + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-matplotlib/widgets + ${INSTALL_DATA} ${WRKSRC}/examples/widgets/README \ + ${PREFIX}/share/examples/py-matplotlib/widgets + ${INSTALL_SCRIPT} ${WRKSRC}/examples/widgets/*.py \ + ${PREFIX}/share/examples/py-matplotlib/widgets VMEM_WARNING= Yes NO_REGRESS= Yes diff --git a/graphics/py-matplotlib/distinfo b/graphics/py-matplotlib/distinfo index 5c85fcf2a5c..c5dab7c8f87 100644 --- a/graphics/py-matplotlib/distinfo +++ b/graphics/py-matplotlib/distinfo @@ -1,4 +1,4 @@ -MD5 (matplotlib-0.80.tar.gz) = 0374c439d3fcbca193c1333b84713674 -RMD160 (matplotlib-0.80.tar.gz) = 503924ec1567605f53b3f01656129035b688362e -SHA1 (matplotlib-0.80.tar.gz) = 639bc10a311319459214d4d23c8c94003d2589ac -SIZE (matplotlib-0.80.tar.gz) = 2332845 +MD5 (matplotlib-0.82.tar.gz) = a5ef59a9eed934708eedef5a0125d8d8 +RMD160 (matplotlib-0.82.tar.gz) = b00329a490af6e90036bd80f64f4e1f8b6a82311 +SHA1 (matplotlib-0.82.tar.gz) = bff563644c2ad7fe7fb7e8fc0a9d96a00a033323 +SIZE (matplotlib-0.82.tar.gz) = 2688579 diff --git a/graphics/py-matplotlib/patches/patch-examples_contour_demo_py b/graphics/py-matplotlib/patches/patch-examples_contour_demo_py new file mode 100644 index 00000000000..65f5b7ee970 --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_contour_demo_py @@ -0,0 +1,10 @@ +$OpenBSD: patch-examples_contour_demo_py,v 1.1 2005/07/09 06:14:04 djm Exp $ +--- examples/contour_demo.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/contour_demo.py Sat Jul 9 13:01:26 2005 +@@ -67,5 +67,5 @@ title('Lines with colorbar') + hot() # Now change the colormap for the contour lines and colorbar + + +-savefig('contour_demo') ++#savefig('contour_demo') + show() diff --git a/graphics/py-matplotlib/patches/patch-examples_contourf_demo_py b/graphics/py-matplotlib/patches/patch-examples_contourf_demo_py new file mode 100644 index 00000000000..69e79b375ac --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_contourf_demo_py @@ -0,0 +1,10 @@ +$OpenBSD: patch-examples_contourf_demo_py,v 1.1 2005/07/09 06:14:04 djm Exp $ +--- examples/contourf_demo.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/contourf_demo.py Sat Jul 9 13:01:32 2005 +@@ -40,5 +40,5 @@ levs2, colls2 = contour(X, Y, Z, levels, + colors = 'r', + origin=origin, + hold='on') +-savefig('contourf_demo') ++#savefig('contourf_demo') + show() diff --git a/graphics/py-matplotlib/patches/patch-examples_dash_control_py b/graphics/py-matplotlib/patches/patch-examples_dash_control_py new file mode 100644 index 00000000000..d2f1b2adfc5 --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_dash_control_py @@ -0,0 +1,10 @@ +$OpenBSD: patch-examples_dash_control_py,v 1.1 2005/07/09 06:14:04 djm Exp $ +--- examples/dash_control.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/dash_control.py Sat Jul 9 13:01:42 2005 +@@ -10,5 +10,5 @@ dashes = [5,2,10,5] # 5 points on, 2 off + + l, = plot(arange(20), '--') + l.set_dashes(dashes) +-savefig('dash_control') ++#savefig('dash_control') + show() diff --git a/graphics/py-matplotlib/patches/patch-examples_dashtick_py b/graphics/py-matplotlib/patches/patch-examples_dashtick_py new file mode 100644 index 00000000000..92188a1e3c7 --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_dashtick_py @@ -0,0 +1,12 @@ +$OpenBSD: patch-examples_dashtick_py,v 1.1 2005/07/09 06:14:04 djm Exp $ +--- examples/dashtick.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/dashtick.py Sat Jul 9 13:01:57 2005 +@@ -53,7 +53,7 @@ def test_dashticklabel(): + pylab.plot(x, y) + axis.set_xlim((0.0, 6.0)) + axis.set_ylim((0.0, 6.0)) +- pylab.savefig('dashticklabel') ++ #pylab.savefig('dashticklabel') + pylab.show() + + if __name__ == '__main__': diff --git a/graphics/py-matplotlib/patches/patch-examples_date_demo2_py b/graphics/py-matplotlib/patches/patch-examples_date_demo2_py new file mode 100644 index 00000000000..a2a093a22c7 --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_date_demo2_py @@ -0,0 +1,10 @@ +$OpenBSD: patch-examples_date_demo2_py,v 1.1 2005/07/09 06:14:04 djm Exp $ +--- examples/date_demo2.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/date_demo2.py Sat Jul 9 13:02:01 2005 +@@ -40,5 +40,5 @@ labels = ax.get_xticklabels() + setp(labels, rotation=45) + + grid(True) +-savefig('date_demo2') ++#savefig('date_demo2') + show() diff --git a/graphics/py-matplotlib/patches/patch-examples_image_interp_py b/graphics/py-matplotlib/patches/patch-examples_image_interp_py new file mode 100644 index 00000000000..12a8f28ac2e --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_image_interp_py @@ -0,0 +1,24 @@ +$OpenBSD: patch-examples_image_interp_py,v 1.1 2005/07/09 06:14:04 djm Exp $ +--- examples/image_interp.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/image_interp.py Sat Jul 9 13:02:43 2005 +@@ -50,17 +50,17 @@ from pylab import * + A = rand(5,5) + figure(1) + imshow(A, interpolation='nearest') +-savefig('agg_nearest') ++#savefig('agg_nearest') + grid(True) + + figure(2) + imshow(A, interpolation='bilinear') +-savefig('agg_bilinear') ++#savefig('agg_bilinear') + grid(True) + + figure(3) + imshow(A, interpolation='bicubic') +-savefig('agg_bicubic') ++#savefig('agg_bicubic') + grid(True) + + show() diff --git a/graphics/py-matplotlib/patches/patch-examples_log_demo_py b/graphics/py-matplotlib/patches/patch-examples_log_demo_py new file mode 100644 index 00000000000..e3cbf9705c1 --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_log_demo_py @@ -0,0 +1,10 @@ +$OpenBSD: patch-examples_log_demo_py,v 1.1 2005/07/09 06:14:04 djm Exp $ +--- examples/log_demo.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/log_demo.py Sat Jul 9 13:03:00 2005 +@@ -22,5 +22,5 @@ subplot(313) + loglog(t, 20*exp(-t/10.0), basex=4) + grid(True) + ylabel('loglog base 4 on x') +-savefig('log_demo') ++#savefig('log_demo') + show() diff --git a/graphics/py-matplotlib/patches/patch-examples_masked_demo_py b/graphics/py-matplotlib/patches/patch-examples_masked_demo_py new file mode 100644 index 00000000000..bb07ac12d6b --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_masked_demo_py @@ -0,0 +1,11 @@ +$OpenBSD: patch-examples_masked_demo_py,v 1.1 2005/07/09 06:14:04 djm Exp $ +--- examples/masked_demo.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/masked_demo.py Sat Jul 9 13:03:09 2005 +@@ -24,6 +24,6 @@ setp(lines[2], markersize = 10) + legend( ('No mask', 'Masked if > 0.5', 'Masked if < -0.5') , + loc = 'upper right') + title('Masked line demo') +-savefig('test.svg') ++#savefig('test.svg') + #savefig('test.ps') + show() diff --git a/graphics/py-matplotlib/patches/patch-examples_mathtext_demo_py b/graphics/py-matplotlib/patches/patch-examples_mathtext_demo_py new file mode 100644 index 00000000000..63e24f0087e --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_mathtext_demo_py @@ -0,0 +1,11 @@ +$OpenBSD: patch-examples_mathtext_demo_py,v 1.1 2005/07/09 06:14:04 djm Exp $ +--- examples/mathtext_demo.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/mathtext_demo.py Sat Jul 9 13:03:16 2005 +@@ -21,6 +21,6 @@ tex = r'$\cal{R}\prod_{i=\alpha_{i+1}}^\ + text(1, 1.6, tex, fontsize=20) + + #title(r'$\Delta_i^j \hspace{0.4} \rm{versus} \hspace{0.4} \Delta_{i+1}^j$', fontsize=20) +-savefig('mathtext_demo.ps') ++#savefig('mathtext_demo.ps') + + show() diff --git a/graphics/py-matplotlib/patches/patch-examples_pcolor_demo_py b/graphics/py-matplotlib/patches/patch-examples_pcolor_demo_py new file mode 100644 index 00000000000..df84cad2aba --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_pcolor_demo_py @@ -0,0 +1,12 @@ +$OpenBSD: patch-examples_pcolor_demo_py,v 1.1 2005/07/09 06:14:05 djm Exp $ +--- examples/pcolor_demo.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/pcolor_demo.py Sat Jul 9 13:03:42 2005 +@@ -22,7 +22,7 @@ Z = func3(X, Y) + pcolor(X, Y, Z, shading='flat') + colorbar() + axis([-3,3,-3,3]) +-savefig('pcolor_demo') ++#savefig('pcolor_demo') + show() + + diff --git a/graphics/py-matplotlib/patches/patch-examples_pie_demo_py b/graphics/py-matplotlib/patches/patch-examples_pie_demo_py new file mode 100644 index 00000000000..1a7c05abf90 --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_pie_demo_py @@ -0,0 +1,11 @@ +$OpenBSD: patch-examples_pie_demo_py,v 1.1 2005/07/09 06:14:05 djm Exp $ +--- examples/pie_demo.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/pie_demo.py Sat Jul 9 13:03:51 2005 +@@ -30,6 +30,6 @@ figure(2, figsize=(8,8)) + explode=(0, 0.05, 0, 0) + pie(fracs, explode=explode, labels=labels, autopct='%1.1f%%', shadow=True) + +-savefig('pie_demo') ++#savefig('pie_demo') + show() + diff --git a/graphics/py-matplotlib/patches/patch-examples_polar_demo_py b/graphics/py-matplotlib/patches/patch-examples_polar_demo_py new file mode 100644 index 00000000000..5c8b5d6256b --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_polar_demo_py @@ -0,0 +1,10 @@ +$OpenBSD: patch-examples_polar_demo_py,v 1.1 2005/07/09 06:14:05 djm Exp $ +--- examples/polar_demo.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/polar_demo.py Sat Jul 9 13:03:54 2005 +@@ -53,5 +53,5 @@ theta = 2*2*pi*r + polar(theta, r, color='#ee8d18', lw=3) + + title("And there was much rejoicing!", fontsize=20) +-savefig('polar_demo') ++#savefig('polar_demo') + show() diff --git a/graphics/py-matplotlib/patches/patch-examples_print_stdout_py b/graphics/py-matplotlib/patches/patch-examples_print_stdout_py new file mode 100644 index 00000000000..28726a77c3b --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_print_stdout_py @@ -0,0 +1,10 @@ +$OpenBSD: patch-examples_print_stdout_py,v 1.1 2005/07/09 06:14:05 djm Exp $ +--- examples/print_stdout.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/print_stdout.py Sat Jul 9 13:04:09 2005 +@@ -8,5 +8,5 @@ from pylab import * + + plot([1,2,3]) + +-savefig(sys.stdout) ++#savefig(sys.stdout) + show() diff --git a/graphics/py-matplotlib/patches/patch-examples_simple_plot_py b/graphics/py-matplotlib/patches/patch-examples_simple_plot_py new file mode 100644 index 00000000000..83f41af55f5 --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_simple_plot_py @@ -0,0 +1,11 @@ +$OpenBSD: patch-examples_simple_plot_py,v 1.1 2005/07/09 06:14:05 djm Exp $ +--- examples/simple_plot.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/simple_plot.py Sat Jul 9 13:04:24 2005 +@@ -11,6 +11,6 @@ ylabel('voltage (mV)') + title('About as simple as it gets, folks') + grid(True) + #savefig('simple_plot.png') +-savefig('simple_plot') ++#savefig('simple_plot') + + show() diff --git a/graphics/py-matplotlib/patches/patch-examples_tex_demo_py b/graphics/py-matplotlib/patches/patch-examples_tex_demo_py new file mode 100644 index 00000000000..12d045ecc9f --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_tex_demo_py @@ -0,0 +1,12 @@ +$OpenBSD: patch-examples_tex_demo_py,v 1.1 2005/07/09 06:14:05 djm Exp $ +--- examples/tex_demo.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/tex_demo.py Sat Jul 9 13:04:37 2005 +@@ -28,7 +28,7 @@ ylabel(r'\it{voltage (mV)}',fontsize=16) + title(r"\TeX\ is Number $\displaystyle\sum_{n=1}^\infty\frac{-e^{i\pi}}{2^n}$!", + fontsize=16, color='r') + grid(True) +-savefig('tex_demo.eps') ++#savefig('tex_demo.eps') + + + show() diff --git a/graphics/py-matplotlib/patches/patch-examples_unicode_demo_py b/graphics/py-matplotlib/patches/patch-examples_unicode_demo_py new file mode 100644 index 00000000000..79c4dbb3b70 --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-examples_unicode_demo_py @@ -0,0 +1,10 @@ +$OpenBSD: patch-examples_unicode_demo_py,v 1.1 2005/07/09 06:14:05 djm Exp $ +--- examples/unicode_demo.py.orig Sat Jul 9 13:00:48 2005 ++++ examples/unicode_demo.py Sat Jul 9 13:04:46 2005 +@@ -9,5 +9,5 @@ ylabel( unicode('Andr\xc3\xa9 was here!' + text( 0.5, 2.5, unicode('Institut für Festkörperphysik', 'latin-1'), rotation=45) + text( 1, 1.5, u'AVA (check kerning)') + +-savefig('test.ps') ++#savefig('test.ps') + show() diff --git a/graphics/py-matplotlib/patches/patch-lib_matplotlib___init___py b/graphics/py-matplotlib/patches/patch-lib_matplotlib___init___py index 8e6ddfc158d..5fbc279862f 100644 --- a/graphics/py-matplotlib/patches/patch-lib_matplotlib___init___py +++ b/graphics/py-matplotlib/patches/patch-lib_matplotlib___init___py @@ -1,6 +1,6 @@ -$OpenBSD: patch-lib_matplotlib___init___py,v 1.3 2005/05/09 11:47:50 djm Exp $ ---- lib/matplotlib/__init__.py.orig Wed Apr 13 00:45:58 2005 -+++ lib/matplotlib/__init__.py Mon May 9 21:22:28 2005 +$OpenBSD: patch-lib_matplotlib___init___py,v 1.4 2005/07/09 06:14:05 djm Exp $ +--- lib/matplotlib/__init__.py.orig Thu Jun 16 04:27:37 2005 ++++ lib/matplotlib/__init__.py Thu Jun 30 20:55:58 2005 @@ -285,21 +285,21 @@ def _get_data_path(): path = os.environ['MATPLOTLIBDATA'] if os.path.isdir(path): return path @@ -27,4 +27,4 @@ $OpenBSD: patch-lib_matplotlib___init___py,v 1.3 2005/05/09 11:47:50 djm Exp $ + 'share','py-matplotlib') if os.path.isdir(path): return path - + # CODE ADDED TO SUPPORT PY2EXE - you will need to copy diff --git a/graphics/py-matplotlib/patches/patch-setup_py b/graphics/py-matplotlib/patches/patch-setup_py index aff682042ec..fb395b57544 100644 --- a/graphics/py-matplotlib/patches/patch-setup_py +++ b/graphics/py-matplotlib/patches/patch-setup_py @@ -1,6 +1,6 @@ -$OpenBSD: patch-setup_py,v 1.4 2005/05/09 11:47:50 djm Exp $ ---- setup.py.orig Thu Mar 31 07:42:51 2005 -+++ setup.py Mon May 9 21:20:52 2005 +$OpenBSD: patch-setup_py,v 1.5 2005/07/09 06:14:05 djm Exp $ +--- setup.py.orig Thu Jun 16 01:21:27 2005 ++++ setup.py Thu Jun 30 20:55:58 2005 @@ -35,8 +35,8 @@ BUILD_GTK = 'auto' # build TK GUI with Agg renderer ; requires Tkinter Python extension # and Tk includes @@ -12,7 +12,7 @@ $OpenBSD: patch-setup_py,v 1.4 2005/05/09 11:47:50 djm Exp $ # build a small extension to manage the focus on win32 platforms. #BUILD_WINDOWING = 0 -@@ -79,7 +79,7 @@ data.extend(glob.glob('images/*.png')) +@@ -84,7 +84,7 @@ data.extend(glob.glob('images/*.png')) data.extend(glob.glob('images/*.ppm')) data.append('.matplotlibrc') @@ -21,7 +21,7 @@ $OpenBSD: patch-setup_py,v 1.4 2005/05/09 11:47:50 djm Exp $ # Figure out which array packages to provide binary support for # and define the NUMERIX value: Numeric, numarray, or both. -@@ -155,27 +155,31 @@ build_swigagg(ext_modules, packages) +@@ -161,27 +161,31 @@ build_swigagg(ext_modules, packages) build_transforms(ext_modules, packages, NUMERIX) build_enthought(ext_modules, packages) diff --git a/graphics/py-matplotlib/patches/patch-setupext_py b/graphics/py-matplotlib/patches/patch-setupext_py index d6ce0744f77..b04830338f5 100644 --- a/graphics/py-matplotlib/patches/patch-setupext_py +++ b/graphics/py-matplotlib/patches/patch-setupext_py @@ -1,15 +1,15 @@ -$OpenBSD: patch-setupext_py,v 1.3 2005/05/09 11:47:50 djm Exp $ ---- setupext.py.orig Wed Mar 30 03:25:37 2005 -+++ setupext.py Mon May 9 21:19:02 2005 -@@ -35,6 +35,7 @@ basedir = { +$OpenBSD: patch-setupext_py,v 1.4 2005/07/09 06:14:05 djm Exp $ +--- setupext.py.orig Thu Jun 9 03:57:59 2005 ++++ setupext.py Thu Jun 30 20:56:09 2005 +@@ -34,6 +34,7 @@ WIN32 + import os + + basedir = { ++ 'openbsd3' : [os.getenv('X11BASE') or '/usr/X11R6', os.getenv('LOCALBASE') or '/usr/local', '/usr',], 'win32' : ['win32_static',], 'linux2' : ['/usr/local', '/usr',], 'linux' : ['/usr/local', '/usr',], -+ 'openbsd3' : [os.getenv('X11BASE') or '/usr/X11R6', os.getenv('LOCALBASE') or '/usr/local', '/usr',], - 'darwin' : ['/usr/local', '/usr', '/sw', '/usr/X11R6'], - 'freebsd4' : ['/usr/local', '/usr'], - 'freebsd5' : ['/usr/local', '/usr'], -@@ -89,6 +90,8 @@ def temp_copy(_from, _to): +@@ -94,6 +95,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 deleted file mode 100644 index 62542f2a09c..00000000000 --- a/graphics/py-matplotlib/pkg/PFRAG.shared +++ /dev/null @@ -1,10 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2005/05/09 11:47:50 djm Exp $ -lib/python${MODPY_VERSION}/site-packages/matplotlib/_agg.so -lib/python${MODPY_VERSION}/site-packages/matplotlib/_nc_backend_gdk.so -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/_gtkagg.so -lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/_nc_backend_agg.so -lib/python${MODPY_VERSION}/site-packages/matplotlib/enthought/traits/ctraits.so -lib/python${MODPY_VERSION}/site-packages/matplotlib/ft2font.so diff --git a/graphics/py-matplotlib/pkg/PLIST b/graphics/py-matplotlib/pkg/PLIST index f74a9edc04e..40a0cfbbeea 100644 --- a/graphics/py-matplotlib/pkg/PLIST +++ b/graphics/py-matplotlib/pkg/PLIST @@ -1,14 +1,20 @@ -@comment $OpenBSD: PLIST,v 1.4 2005/05/09 11:47:50 djm Exp $ -%%SHARED%% +@comment $OpenBSD: PLIST,v 1.5 2005/07/09 06:14:05 djm Exp $ +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/_agg.so 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/_nc_backend_gdk.so +lib/python${MODPY_VERSION}/site-packages/matplotlib/_nc_cntr.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/_pylab_helpers.py lib/python${MODPY_VERSION}/site-packages/matplotlib/_pylab_helpers.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/_transforms.py @@ -28,8 +34,12 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/backend_bases.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/ lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/__init__.py lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/_gtkagg.so +lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/_nc_backend_agg.so lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_agg.py lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_agg.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_agg2.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_agg2.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_cairo.py lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_cairo.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/backend_fltkagg.py @@ -95,6 +105,7 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/enthought/traits/__init__.py lib/python${MODPY_VERSION}/site-packages/matplotlib/enthought/traits/__init__.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/enthought/traits/category.py lib/python${MODPY_VERSION}/site-packages/matplotlib/enthought/traits/category.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/enthought/traits/ctraits.so lib/python${MODPY_VERSION}/site-packages/matplotlib/enthought/traits/has_traits.py lib/python${MODPY_VERSION}/site-packages/matplotlib/enthought/traits/has_traits.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/enthought/traits/info_traits.py @@ -182,6 +193,7 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/finance.py lib/python${MODPY_VERSION}/site-packages/matplotlib/finance.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/font_manager.py lib/python${MODPY_VERSION}/site-packages/matplotlib/font_manager.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/ft2font.so 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/legend.py @@ -222,12 +234,16 @@ 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 lib/python${MODPY_VERSION}/site-packages/matplotlib/table.pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/texmanager.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/texmanager.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/text.py lib/python${MODPY_VERSION}/site-packages/matplotlib/text.pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/ticker.py lib/python${MODPY_VERSION}/site-packages/matplotlib/ticker.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/widgets.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/widgets.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 @@ -237,6 +253,7 @@ share/examples/py-matplotlib/README share/examples/py-matplotlib/__init__.py share/examples/py-matplotlib/accented_text.py share/examples/py-matplotlib/agg_oo.py +share/examples/py-matplotlib/agg_test.py share/examples/py-matplotlib/alignment_test.py share/examples/py-matplotlib/anim.py share/examples/py-matplotlib/anim_tk.py @@ -251,6 +268,7 @@ share/examples/py-matplotlib/barchart_demo.py share/examples/py-matplotlib/barh_demo.py share/examples/py-matplotlib/boxplot_demo.py share/examples/py-matplotlib/break.py +share/examples/py-matplotlib/color_by_yvalue.py share/examples/py-matplotlib/color_demo.py share/examples/py-matplotlib/colours.py share/examples/py-matplotlib/contour_demo.py @@ -263,6 +281,8 @@ share/examples/py-matplotlib/cursor_demo.py share/examples/py-matplotlib/custom_ticker1.py share/examples/py-matplotlib/customize_rc.py share/examples/py-matplotlib/dash_control.py +share/examples/py-matplotlib/dashpointlabel.py +share/examples/py-matplotlib/dashtick.py share/examples/py-matplotlib/data/ share/examples/py-matplotlib/data/AAPL.dat share/examples/py-matplotlib/data/INTC.dat @@ -285,6 +305,7 @@ share/examples/py-matplotlib/dynamic_image_gtkagg.py 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_qt.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 @@ -298,6 +319,7 @@ share/examples/py-matplotlib/figtext.py share/examples/py-matplotlib/fill_between.py share/examples/py-matplotlib/fill_between_posneg.py share/examples/py-matplotlib/fill_demo.py +share/examples/py-matplotlib/fill_demo2.py share/examples/py-matplotlib/fill_spiral.py share/examples/py-matplotlib/finance_demo.py share/examples/py-matplotlib/font_indexing.py @@ -307,6 +329,7 @@ share/examples/py-matplotlib/fonts_demo_kw.py share/examples/py-matplotlib/ftface_props.py share/examples/py-matplotlib/ganged_plots.py share/examples/py-matplotlib/gdtest.py +share/examples/py-matplotlib/glyph_to_path.py share/examples/py-matplotlib/gtk_spreadsheet.py share/examples/py-matplotlib/histogram_demo.py share/examples/py-matplotlib/histogram_demo_canvasagg.py @@ -325,6 +348,7 @@ share/examples/py-matplotlib/layer_images.py share/examples/py-matplotlib/legend_auto.py share/examples/py-matplotlib/legend_demo.py share/examples/py-matplotlib/legend_demo2.py +share/examples/py-matplotlib/line_collection.py share/examples/py-matplotlib/line_styles.py share/examples/py-matplotlib/log_bar.py share/examples/py-matplotlib/log_demo.py @@ -332,6 +356,7 @@ share/examples/py-matplotlib/log_test.py share/examples/py-matplotlib/logo.py share/examples/py-matplotlib/major_minor_demo1.py share/examples/py-matplotlib/major_minor_demo2.py +share/examples/py-matplotlib/masked_demo.py share/examples/py-matplotlib/mathtext_demo.py share/examples/py-matplotlib/matplotlib_icon.py share/examples/py-matplotlib/matshow.py @@ -342,6 +367,7 @@ share/examples/py-matplotlib/mri_demo.py share/examples/py-matplotlib/mri_with_eeg.py share/examples/py-matplotlib/multiline.py share/examples/py-matplotlib/multiple_figs_demo.py +share/examples/py-matplotlib/newscalarformatter_demo.py share/examples/py-matplotlib/object_picker.py share/examples/py-matplotlib/pcolor_demo.py share/examples/py-matplotlib/pcolor_demo2.py @@ -368,8 +394,11 @@ share/examples/py-matplotlib/specgram_demo.py share/examples/py-matplotlib/stem_plot.py share/examples/py-matplotlib/stock_demo.py share/examples/py-matplotlib/subplot_demo.py +share/examples/py-matplotlib/subplot_toolbar.py +share/examples/py-matplotlib/subplots_adjust.py share/examples/py-matplotlib/system_monitor.py share/examples/py-matplotlib/table_demo.py +share/examples/py-matplotlib/tex_demo.py share/examples/py-matplotlib/text_handles.py share/examples/py-matplotlib/text_rotation.py share/examples/py-matplotlib/text_themes.py @@ -380,6 +409,12 @@ share/examples/py-matplotlib/unicode_demo.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/widgets/ +share/examples/py-matplotlib/widgets/README +share/examples/py-matplotlib/widgets/buttons.py +share/examples/py-matplotlib/widgets/check_buttons.py +share/examples/py-matplotlib/widgets/radio_buttons.py +share/examples/py-matplotlib/widgets/sliders.py share/examples/py-matplotlib/wxcursor_demo.py share/examples/py-matplotlib/zorder_demo.py share/py-matplotlib/ @@ -488,6 +523,9 @@ share/py-matplotlib/stock_zoom-in.ppm share/py-matplotlib/stock_zoom-in.xpm share/py-matplotlib/stock_zoom-out.ppm share/py-matplotlib/stock_zoom-out.xpm +share/py-matplotlib/subplots.png +share/py-matplotlib/subplots.ppm +share/py-matplotlib/subplots.xpm share/py-matplotlib/zoom_to_rect.png share/py-matplotlib/zoom_to_rect.ppm share/py-matplotlib/zoom_to_rect.svg