Tue Jan 21 21:16:03 2014 UTC ()
sync w/ base pkg


(drochner)
diff -r1.44 -r1.45 pkgsrc/graphics/py-matplotlib-gtk2/Makefile
diff -r1.12 -r1.13 pkgsrc/graphics/py-matplotlib-gtk2/distinfo
diff -r1.9 -r0 pkgsrc/graphics/py-matplotlib-gtk2/patches/patch-aa
diff -r1.8 -r1.9 pkgsrc/graphics/py-matplotlib-gtk2/patches/patch-ab
cvs diff -r1.44 -r1.45 pkgsrc/graphics/py-matplotlib-gtk2/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/py-matplotlib-gtk2/Attic/Makefile 2013/10/10 14:42:15 1.44
+++ pkgsrc/graphics/py-matplotlib-gtk2/Attic/Makefile 2014/01/21 21:16:02 1.45
@@ -1,40 +1,42 @@ @@ -1,40 +1,42 @@
1# $NetBSD: Makefile,v 1.44 2013/10/10 14:42:15 ryoon Exp $ 1# $NetBSD: Makefile,v 1.45 2014/01/21 21:16:02 drochner Exp $
2# 2#
3 3
4DISTNAME= matplotlib-1.2.1 4DISTNAME= matplotlib-1.3.1
5PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-1.2.1 5PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-1.3.1
6PKGREVISION= 2 
7CATEGORIES= graphics python 6CATEGORIES= graphics python
8MASTER_SITES= https://github.com/downloads/matplotlib/matplotlib/ 7MASTER_SITES= https://github.com/downloads/matplotlib/matplotlib/
9FETCH_USING= curl 8FETCH_USING= curl
10 9
11MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://matplotlib.sourceforge.net/ 11HOMEPAGE= http://matplotlib.sourceforge.net/
13COMMENT= GTK frontend for matplotlib 12COMMENT= GTK frontend for matplotlib
14 13
15USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
16PY_PATCHPLIST= yes 15PY_PATCHPLIST= yes
17PYDISTUTILSPKG= yes 16PYDISTUTILSPKG= yes
18USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
19 18
20post-patch: 19post-patch:
21 ( ${ECHO} "[directories]"; \ 20 ( ${ECHO} "[directories]"; \
22 ${ECHO} "basedirlist=/usr"; \ 21 ${ECHO} "basedirlist=/usr"; \
23 ${ECHO} "[provide_packages]"; \ 22 ${ECHO} "[provide_packages]"; \
24 ${ECHO} "pytz = False"; \ 23 ${ECHO} "pytz = False"; \
25 ${ECHO} "dateutil = False"; \ 24 ${ECHO} "dateutil = False"; \
26 ${ECHO} "[gui_support]"; \ 25 ${ECHO} "[gui_support]"; \
27 ${ECHO} "gtk = True"; \ 26 ${ECHO} "gtk = True"; \
28 ${ECHO} "gtkagg = True"; \ 27 ${ECHO} "gtkagg = True"; \
29 ${ECHO} "tkagg = False"; \ 28 ${ECHO} "tkagg = False"; \
30 ${ECHO} "wxagg = False"; \ 29 ${ECHO} "wxagg = False"; \
31 ${ECHO} "macosx = False" ) > ${WRKSRC}/setup.cfg 30 ${ECHO} "macosx = False" ) > ${WRKSRC}/setup.cfg
32 31
33.include "../../lang/python/extension.mk" 32post-install:
 33 ${RM} -r ${DESTDIR}/${PREFIX}/${PYSITELIB}/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
 34
 35.include "../../lang/python/egg.mk"
34.include "../../graphics/py-matplotlib/buildlink3.mk" 36.include "../../graphics/py-matplotlib/buildlink3.mk"
35.include "../../devel/zlib/buildlink3.mk" 37.include "../../devel/zlib/buildlink3.mk"
36.include "../../graphics/freetype2/buildlink3.mk" 38.include "../../graphics/freetype2/buildlink3.mk"
37.include "../../graphics/png/buildlink3.mk" 39.include "../../graphics/png/buildlink3.mk"
38.include "../../math/py-numpy/buildlink3.mk" 40.include "../../math/py-numpy/buildlink3.mk"
39.include "../../x11/py-gtk2/buildlink3.mk" 41.include "../../x11/py-gtk2/buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/graphics/py-matplotlib-gtk2/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/py-matplotlib-gtk2/Attic/distinfo 2013/07/24 11:13:56 1.12
+++ pkgsrc/graphics/py-matplotlib-gtk2/Attic/distinfo 2014/01/21 21:16:02 1.13
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.12 2013/07/24 11:13:56 drochner Exp $ 1$NetBSD: distinfo,v 1.13 2014/01/21 21:16:02 drochner Exp $
2 2
3SHA1 (matplotlib-1.2.1.tar.gz) = 82fc44d0047a713c1b0b1b4ea2503e6a41c57f98 3SHA1 (matplotlib-1.3.1.tar.gz) = 8578afc86424392591c0ee03f7613ffa9b6f68ee
4RMD160 (matplotlib-1.2.1.tar.gz) = c27142f1d6665bc6a748f601558045e7d801dbef 4RMD160 (matplotlib-1.3.1.tar.gz) = 7c2647ae1d6aafdc1c32e47183239c7da0d91956
5Size (matplotlib-1.2.1.tar.gz) = 38446200 bytes 5Size (matplotlib-1.3.1.tar.gz) = 42163182 bytes
6SHA1 (patch-aa) = 7ff4d7f4bbd9a2b19b839f92e0a7b568db4d4fb9 6SHA1 (patch-ab) = 447e2cfd0bf2571fe8e1b77f47a5de9563ec45ee
7SHA1 (patch-ab) = d6b69b74d74a67c90b09f821ffe7da8eec79a855 
File Deleted: pkgsrc/graphics/py-matplotlib-gtk2/patches/Attic/patch-aa
cvs diff -r1.8 -r1.9 pkgsrc/graphics/py-matplotlib-gtk2/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/py-matplotlib-gtk2/patches/Attic/patch-ab 2013/07/24 11:13:56 1.8
+++ pkgsrc/graphics/py-matplotlib-gtk2/patches/Attic/patch-ab 2014/01/21 21:16:02 1.9
@@ -1,55 +1,13 @@ @@ -1,55 +1,13 @@
1$NetBSD: patch-ab,v 1.8 2013/07/24 11:13:56 drochner Exp $ 1$NetBSD: patch-ab,v 1.9 2014/01/21 21:16:02 drochner Exp $
2 2
3--- setup.py.orig 2013-03-26 13:04:37.000000000 +0000 3--- setup.py.orig 2014-01-21 18:50:49.000000000 +0000
4+++ setup.py 4+++ setup.py
5@@ -141,12 +141,12 @@ if not check_for_numpy(__version__numpy_ 5@@ -139,7 +139,7 @@ if __name__ == '__main__':
6 if not check_for_freetype(): 
7 sys.exit(1) 
8  6
9-build_ft2font(ext_modules, packages) 7 required_failed = []
10-build_ttconv(ext_modules, packages) 8 good_packages = []
11-build_contour(ext_modules, packages) 9- for package in mpl_packages:
12-build_delaunay(ext_modules, packages) 10+ for package in [setupext.Numpy(),setupext.CXX(),setupext.LibAgg(),setupext.BackendGtkAgg(),setupext.BackendGtk()]:
13-build_path(ext_modules, packages) 11 if isinstance(package, str):
14-build_tri(ext_modules, packages) 12 print_raw('')
15+#build_ft2font(ext_modules, packages) 13 print_raw(package.upper())
16+#build_ttconv(ext_modules, packages) 
17+#build_contour(ext_modules, packages) 
18+#build_delaunay(ext_modules, packages) 
19+#build_path(ext_modules, packages) 
20+#build_tri(ext_modules, packages) 
21  
22 print_raw("") 
23 print_raw("OPTIONAL BACKEND DEPENDENCIES") 
24@@ -176,13 +176,13 @@ if options['build_tkagg']: 
25 build_tkagg(ext_modules, packages) 
26 rc['backend'] = 'TkAgg' 
27  
28-hasgtk = check_for_gtk() 
29+hasgtk = 1 
30 if options['build_gtk']: 
31 if hasgtk or (options['build_gtk'] is True): 
32 build_gdk(ext_modules, packages) 
33 if options['build_gtkagg']: 
34 if hasgtk or (options['build_gtkagg'] is True): 
35- options['build_agg'] = 1 
36+ options['build_agg'] = 0 
37 build_gtkagg(ext_modules, packages) 
38 rc['backend'] = 'GTKAgg' 
39  
40@@ -323,12 +323,12 @@ distrib = setup(name="matplotlib", 
41 which emulates matlab graphics 
42 """, 
43 download_url="https://downloads.sourceforge.net/project/matplotlib/matplotlib/matplotlib-{0}/matplotlib-{0}.tar.gz".format(__version__), 
44- packages = packages, 
45+# packages = packages, 
46 platforms='any', 
47- py_modules = py_modules, 
48+# py_modules = py_modules, 
49 ext_modules = ext_modules, 
50 package_dir = package_dir, 
51- package_data = package_data, 
52+# package_data = package_data, 
53 classifiers = classifiers, 
54 cmdclass = {'build_py': build_py}, 
55 **additional_params