[85687] trunk/dports/python/py-matplotlib
ram at macports.org
ram at macports.org
Sat Oct 15 17:17:20 PDT 2011
Revision: 85687
http://trac.macports.org/changeset/85687
Author: ram at macports.org
Date: 2011-10-15 17:17:17 -0700 (Sat, 15 Oct 2011)
Log Message:
-----------
python/py-matplotlib: update to 1.1.0
Modified Paths:
--------------
trunk/dports/python/py-matplotlib/Portfile
trunk/dports/python/py-matplotlib/files/patch-disable_optional_deps.diff
trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff
Removed Paths:
-------------
trunk/dports/python/py-matplotlib/files/patch-04b4e50919.diff
trunk/dports/python/py-matplotlib/files/patch-dviread.diff
Modified: trunk/dports/python/py-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py-matplotlib/Portfile 2011-10-15 23:14:20 UTC (rev 85686)
+++ trunk/dports/python/py-matplotlib/Portfile 2011-10-16 00:17:17 UTC (rev 85687)
@@ -5,8 +5,7 @@
categories-append graphics math
name py-matplotlib
-version 1.0.1
-revision 5
+version 1.1.0
maintainers ram openmaintainer
platforms darwin
@@ -22,9 +21,9 @@
master_sites sourceforge:matplotlib
distname matplotlib-${version}
-checksums md5 2196c0482d5b33dc8d33f67bbafc1323 \
- sha1 c7a832f28a66817626e7a8af21e14ea0e15f4008 \
- rmd160 e3e326f7f31ef995253da483444cb593b8e6753b
+checksums md5 57a627f30b3b27821f808659889514c2 \
+ sha1 435b4f04a7e099b79f66451d69ad0b5ce66030ae \
+ rmd160 9313fc6407271c46f3ac5af4c53df5ea57982711
python.versions 24 25 26 27
@@ -50,9 +49,7 @@
patchfiles patch-setupext.py.diff \
patch-setup.cfg.diff \
- patch-disable_optional_deps.diff \
- patch-04b4e50919.diff \
- patch-dviread.diff
+ patch-disable_optional_deps.diff
build.env MPLIB_BASE="${prefix}" PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig/"
@@ -65,11 +62,8 @@
if {${name} != ${subport}} {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport} \
${destroot}${prefix}/share/${subport}
- xinstall -m 644 -W ${worksrcpath} CHANGELOG INSTALL \
- INTERACTIVE KNOWN_BUGS README.txt TODO \
+ xinstall -m 644 -W ${worksrcpath} CHANGELOG README.txt TODO \
${destroot}${prefix}/share/doc/${subport}
- file copy ${worksrcpath}/license \
- ${destroot}${prefix}/share/doc/${subport}
file copy ${worksrcpath}/examples \
${destroot}${prefix}/share/${subport}
}
Deleted: trunk/dports/python/py-matplotlib/files/patch-04b4e50919.diff
===================================================================
--- trunk/dports/python/py-matplotlib/files/patch-04b4e50919.diff 2011-10-15 23:14:20 UTC (rev 85686)
+++ trunk/dports/python/py-matplotlib/files/patch-04b4e50919.diff 2011-10-16 00:17:17 UTC (rev 85687)
@@ -1,16 +0,0 @@
---- setupext.py
-+++ setupext.py
-@@ -843,8 +843,12 @@ def check_for_tk():
- gotit = False
-
- if gotit:
-+ try:
-+ tk_v = Tkinter.__version__.split()[-2]
-+ except IndexError:
-+ tk_v = 'version not identified'
- print_status("Tkinter", "Tkinter: %s, Tk: %s, Tcl: %s" %
-- (Tkinter.__version__.split()[-2], Tkinter.TkVersion, Tkinter.TclVersion))
-+ (tk_v, Tkinter.TkVersion, Tkinter.TclVersion))
- else:
- print_status("Tkinter", "no")
- if explanation is not None:
Modified: trunk/dports/python/py-matplotlib/files/patch-disable_optional_deps.diff
===================================================================
--- trunk/dports/python/py-matplotlib/files/patch-disable_optional_deps.diff 2011-10-15 23:14:20 UTC (rev 85686)
+++ trunk/dports/python/py-matplotlib/files/patch-disable_optional_deps.diff 2011-10-16 00:17:17 UTC (rev 85687)
@@ -1,6 +1,6 @@
---- setupext.py 2009-08-01 14:15:24.000000000 -0500
-+++ setupext.py 2009-08-07 08:51:38.000000000 -0500
-@@ -338,43 +338,58 @@
+--- setupext.py.orig 2011-10-15 18:46:24.000000000 -0500
++++ setupext.py 2011-10-15 18:54:35.000000000 -0500
+@@ -382,43 +382,58 @@
return '.'.join(temp)
def check_for_qt():
@@ -86,20 +86,20 @@
def check_for_datetime():
try:
-@@ -433,36 +448,51 @@
+@@ -477,36 +492,51 @@
return False
def check_for_dvipng():
- try:
- stdin, stdout = run_child_process('dvipng -version')
-- print_status("dvipng", stdout.readlines()[1].split()[-1])
+- print_status("dvipng", stdout.readlines()[1].decode().split()[-1])
- return True
- except (IndexError, ValueError):
+ MP_LaTeX=False
+ if MP_LaTeX:
+ try:
+ stdin, stdout = run_child_process('dvipng -version')
-+ print_status("dvipng", stdout.readlines()[1].split()[-1])
++ print_status("dvipng", stdout.readlines()[1].decode().split()[-1])
+ return True
+ except (IndexError, ValueError):
+ print_status("dvipng", "no")
@@ -115,7 +115,7 @@
- else:
- command = 'gs --version'
- stdin, stdout = run_child_process(command)
-- print_status("ghostscript", stdout.read()[:-1])
+- print_status("ghostscript", stdout.read().decode()[:-1])
- return True
- except (IndexError, ValueError):
+ MP_GhostScript=False
@@ -126,7 +126,7 @@
+ else:
+ command = 'gs --version'
+ stdin, stdout = run_child_process(command)
-+ print_status("ghostscript", stdout.read()[:-1])
++ print_status("ghostscript", stdout.read().decode()[:-1])
+ return True
+ except (IndexError, ValueError):
+ print_status("ghostscript", "no")
@@ -138,7 +138,7 @@
def check_for_latex():
- try:
- stdin, stdout = run_child_process('latex -version')
-- line = stdout.readlines()[0]
+- line = stdout.readlines()[0].decode()
- pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
- match = re.search(pattern, line)
- print_status("latex", match.group(0))
@@ -148,7 +148,7 @@
+ if MP_LaTeX:
+ try:
+ stdin, stdout = run_child_process('latex -version')
-+ line = stdout.readlines()[0]
++ line = stdout.readlines()[0].decode()
+ pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
+ match = re.search(pattern, line)
+ print_status("latex", match.group(0))
Deleted: trunk/dports/python/py-matplotlib/files/patch-dviread.diff
===================================================================
--- trunk/dports/python/py-matplotlib/files/patch-dviread.diff 2011-10-15 23:14:20 UTC (rev 85686)
+++ trunk/dports/python/py-matplotlib/files/patch-dviread.diff 2011-10-16 00:17:17 UTC (rev 85687)
@@ -1,38 +0,0 @@
---- lib/matplotlib/dviread.py 2010/07/06 14:37:14 8512
-+++ lib/matplotlib/dviread.py 2011/02/07 16:42:17 8955
-@@ -714,22 +714,30 @@
- subsetting, but I have no example of << in my TeX installation.
- """
- texname, psname = words[:2]
-- effects, encoding, filename = '', None, None
-+ effects, encodings, filename = '', [], None
- for word in words[2:]:
- if not word.startswith('<'):
- effects = word
- else:
- word = word.lstrip('<')
- if word.startswith('['):
-- assert encoding is None
-- encoding = word[1:]
-+ encodings.append(word[1:])
- elif word.endswith('.enc'):
-- assert encoding is None
-- encoding = word
-+ encodings.append(word)
- else:
- assert filename is None
- filename = word
-
-+ if len(encodings) > 1:
-+ # TODO this is a stopgap workaround, need to handle this correctly
-+ matplotlib.verbose.report('Multiple encodings for %s = %s, skipping'
-+ % (texname, psname), 'debug')
-+ return
-+ elif len(encodings) == 1:
-+ encoding, = encodings
-+ else:
-+ encoding = None
-+
- eff = effects.split()
- effects = {}
- try:
Modified: trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff
===================================================================
--- trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff 2011-10-15 23:14:20 UTC (rev 85686)
+++ trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff 2011-10-16 00:17:17 UTC (rev 85687)
@@ -1,7 +1,7 @@
---- setupext.py 2009-08-23 06:27:32.000000000 +0100
-+++ setupext.py 2010-01-04 22:59:27.000000000 +0000
-@@ -50,15 +50,7 @@
- 'linux2' : ['/usr/local', '/usr'],
+--- setupext.py 2011-10-15 18:44:20.000000000 -0500
++++ setupext.py 2011-10-15 18:43:56.000000000 -0500
+@@ -58,15 +58,7 @@
+ 'linux3' : ['/usr/local', '/usr'],
'linux' : ['/usr/local', '/usr',],
'cygwin' : ['/usr/local', '/usr',],
- '_darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
@@ -17,16 +17,16 @@
'freebsd4' : ['/usr/local', '/usr'],
'freebsd5' : ['/usr/local', '/usr'],
'freebsd6' : ['/usr/local', '/usr'],
-@@ -327,6 +319,7 @@
- [os.path.join(p, 'lib64') for p in basedir[sys.platform] ] )
+@@ -371,6 +363,7 @@
+ [os.path.join(p, 'lib64') for p in basedirlist ] )
module.include_dirs.extend(incdirs)
+ module.include_dirs.extend(['@@MPORTS_PREFIX@@/include/python@@PYTHON_BRANCH@@'])
module.include_dirs.append('.')
module.library_dirs.extend(libdirs)
-@@ -956,10 +949,10 @@
- return tcl_lib, tcl_inc, tk_lib, tk_inc
+@@ -912,10 +905,10 @@
+ return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver
def hardcoded_tcl_config():
- tcl_inc = "/usr/local/include"
@@ -37,10 +37,10 @@
+ tk_inc = "@@MPORTS_PREFIX@@/include"
+ tcl_lib = "@@MPORTS_PREFIX@@/lib"
+ tk_lib = "@@MPORTS_PREFIX@@/lib"
- return tcl_lib, tcl_inc, tk_lib, tk_inc
+ return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk'
def add_tk_flags(module):
-@@ -980,52 +973,6 @@
+@@ -936,52 +929,6 @@
raise RuntimeError('No tk/win32 support for this python version yet')
module.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
@@ -77,8 +77,8 @@
- #
- tk_include_dirs = [
- join(F, fw + '.framework', H)
-- for fw in 'Tcl', 'Tk'
-- for H in 'Headers', 'Versions/Current/PrivateHeaders'
+- for fw in ('Tcl', 'Tk')
+- for H in ('Headers', 'Versions/Current/PrivateHeaders')
- ]
-
- # For 8.4a2, the X11 headers are not included. Rather than include a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111015/69a1e703/attachment.html>
More information about the macports-changes
mailing list