[96406] trunk/dports/python/py-matplotlib
ram at macports.org
ram at macports.org
Wed Aug 8 20:41:03 PDT 2012
Revision: 96406
https://trac.macports.org/changeset/96406
Author: ram at macports.org
Date: 2012-08-08 20:41:00 -0700 (Wed, 08 Aug 2012)
Log Message:
-----------
python/py-matplotlib: update to 1.1.1
Modified Paths:
--------------
trunk/dports/python/py-matplotlib/Portfile
trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff
Removed Paths:
-------------
trunk/dports/python/py-matplotlib/files/patch-add_renderer_outline_aa.h.diff
trunk/dports/python/py-matplotlib/files/patch-disable_optional_deps.diff
Modified: trunk/dports/python/py-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py-matplotlib/Portfile 2012-08-09 02:59:29 UTC (rev 96405)
+++ trunk/dports/python/py-matplotlib/Portfile 2012-08-09 03:41:00 UTC (rev 96406)
@@ -5,8 +5,7 @@
categories-append graphics math
name py-matplotlib
-version 1.1.0
-revision 3
+version 1.1.1
maintainers ram openmaintainer
platforms darwin
license {PSF BSD}
@@ -23,9 +22,8 @@
master_sites sourceforge:matplotlib
distname matplotlib-${version}
-checksums md5 57a627f30b3b27821f808659889514c2 \
- sha1 435b4f04a7e099b79f66451d69ad0b5ce66030ae \
- rmd160 9313fc6407271c46f3ac5af4c53df5ea57982711
+checksums rmd160 d6289c7d001c078300ce360d33d424bd3eb93e13 \
+ sha256 63b275eb8d98903264557ffbd6ec0fee2c31b5badb3678fce1ac7044594620ab
python.versions 24 25 26 27
@@ -50,9 +48,7 @@
port:libpng
patchfiles patch-setupext.py.diff \
- patch-setup.cfg.diff \
- patch-disable_optional_deps.diff \
- patch-add_renderer_outline_aa.h.diff
+ patch-setup.cfg.diff
build.env MPLIB_BASE="${prefix}" PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig/"
Deleted: trunk/dports/python/py-matplotlib/files/patch-add_renderer_outline_aa.h.diff
===================================================================
--- trunk/dports/python/py-matplotlib/files/patch-add_renderer_outline_aa.h.diff 2012-08-09 02:59:29 UTC (rev 96405)
+++ trunk/dports/python/py-matplotlib/files/patch-add_renderer_outline_aa.h.diff 2012-08-09 03:41:00 UTC (rev 96406)
@@ -1,11 +0,0 @@
---- agg24/include/agg_renderer_outline_aa.h
-+++ agg24/include/agg_renderer_outline_aa.h
-@@ -1365,7 +1365,7 @@ namespace agg
- //---------------------------------------------------------------------
- void profile(const line_profile_aa& prof) { m_profile = &prof; }
- const line_profile_aa& profile() const { return *m_profile; }
-- line_profile_aa& profile() { return *m_profile; }
-+ const line_profile_aa& profile() { return *m_profile; }
-
- //---------------------------------------------------------------------
- int subpixel_width() const { return m_profile->subpixel_width(); }
Deleted: trunk/dports/python/py-matplotlib/files/patch-disable_optional_deps.diff
===================================================================
--- trunk/dports/python/py-matplotlib/files/patch-disable_optional_deps.diff 2012-08-09 02:59:29 UTC (rev 96405)
+++ trunk/dports/python/py-matplotlib/files/patch-disable_optional_deps.diff 2012-08-09 03:41:00 UTC (rev 96406)
@@ -1,162 +0,0 @@
---- 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():
-- try:
-- import pyqtconfig
-- except ImportError:
-+ MP_QT=False
-+ if MP_QT:
-+ try:
-+ import pyqtconfig
-+ except ImportError:
-+ print_status("Qt", "no")
-+ return False
-+ else:
-+ try:
-+ qt_version = pyqtconfig.Configuration().qt_version
-+ qt_version = convert_qt_version(qt_version)
-+ except AttributeError:
-+ qt_version = "<unknown>"
-+ print_status("Qt", "Qt: %s, PyQt: %s" %
-+ (qt_version,
-+ pyqtconfig.Configuration().pyqt_version_str))
-+ return True
-+ else:
- print_status("Qt", "no")
- return False
-- else:
-- try:
-- qt_version = pyqtconfig.Configuration().qt_version
-- qt_version = convert_qt_version(qt_version)
-- except AttributeError:
-- qt_version = "<unknown>"
-- print_status("Qt", "Qt: %s, PyQt: %s" %
-- (qt_version,
-- pyqtconfig.Configuration().pyqt_version_str))
-- return True
-
- def check_for_qt4():
-- try:
-- from PyQt4 import pyqtconfig
-- except ImportError:
-+ MP_QT4=False
-+ if MP_QT4:
-+ try:
-+ from PyQt4 import pyqtconfig
-+ except ImportError:
-+ print_status("Qt4", "no")
-+ return False
-+ else:
-+ print_status("Qt4", "Qt: %s, PyQt4: %s" %
-+ (convert_qt_version(pyqtconfig.Configuration().qt_version),
-+ pyqtconfig.Configuration().pyqt_version_str))
-+ return True
-+ else:
- print_status("Qt4", "no")
- return False
-- else:
-- print_status("Qt4", "Qt: %s, PyQt4: %s" %
-- (convert_qt_version(pyqtconfig.Configuration().qt_version),
-- pyqtconfig.Configuration().pyqt_version_str))
-- return True
-
- def check_for_cairo():
-- try:
-- import cairo
-- except ImportError:
-+ MP_Cairo=False
-+ if MP_Cairo:
-+ try:
-+ import cairo
-+ except ImportError:
-+ print_status("Cairo", "no")
-+ return False
-+ else:
-+ print_status("Cairo", cairo.version)
-+ return True
-+ else:
- print_status("Cairo", "no")
- return False
-- else:
-- print_status("Cairo", cairo.version)
-- return True
-
- def check_for_datetime():
- try:
-@@ -477,36 +492,51 @@
- return False
-
- def check_for_dvipng():
-- try:
-- stdin, stdout = run_child_process('dvipng -version')
-- 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].decode().split()[-1])
-+ return True
-+ except (IndexError, ValueError):
-+ print_status("dvipng", "no")
-+ return False
-+ else:
- print_status("dvipng", "no")
- return False
-
- def check_for_ghostscript():
-- try:
-- if sys.platform == 'win32':
-- command = 'gswin32c --version'
-- else:
-- command = 'gs --version'
-- stdin, stdout = run_child_process(command)
-- print_status("ghostscript", stdout.read().decode()[:-1])
-- return True
-- except (IndexError, ValueError):
-+ MP_GhostScript=False
-+ if MP_GhostScript:
-+ try:
-+ if sys.platform == 'win32':
-+ command = 'gswin32c --version'
-+ else:
-+ command = 'gs --version'
-+ stdin, stdout = run_child_process(command)
-+ print_status("ghostscript", stdout.read().decode()[:-1])
-+ return True
-+ except (IndexError, ValueError):
-+ print_status("ghostscript", "no")
-+ return False
-+ else:
- print_status("ghostscript", "no")
- return False
-
- def check_for_latex():
-- try:
-- stdin, stdout = run_child_process('latex -version')
-- line = stdout.readlines()[0].decode()
-- pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
-- match = re.search(pattern, line)
-- print_status("latex", match.group(0))
-- return True
-- except (IndexError, ValueError, AttributeError):
-+ MP_LaTeX=False
-+ if MP_LaTeX:
-+ try:
-+ stdin, stdout = run_child_process('latex -version')
-+ line = stdout.readlines()[0].decode()
-+ pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
-+ match = re.search(pattern, line)
-+ print_status("latex", match.group(0))
-+ return True
-+ except (IndexError, ValueError, AttributeError):
-+ print_status("latex", "no")
-+ return False
-+ else:
- print_status("latex", "no")
- return False
-
Modified: trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff
===================================================================
--- trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff 2012-08-09 02:59:29 UTC (rev 96405)
+++ trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff 2012-08-09 03:41:00 UTC (rev 96406)
@@ -1,5 +1,5 @@
---- setupext.py 2011-10-15 18:44:20.000000000 -0500
-+++ setupext.py 2011-10-15 18:43:56.000000000 -0500
+--- setupext.py 2012-08-08 22:08:49.000000000 -0500
++++ setupext.py 2012-08-08 22:26:48.000000000 -0500
@@ -58,15 +58,7 @@
'linux3' : ['/usr/local', '/usr'],
'linux' : ['/usr/local', '/usr',],
@@ -25,7 +25,172 @@
module.include_dirs.append('.')
module.library_dirs.extend(libdirs)
-@@ -912,10 +905,10 @@
+@@ -389,33 +382,43 @@
+ return '.'.join(temp)
+
+ def check_for_qt():
+- try:
+- import pyqtconfig
+- except ImportError:
++ MP_QT=False
++ if MP_QT:
++ try:
++ import pyqtconfig
++ except ImportError:
++ print_status("Qt", "no")
++ return False
++ else:
++ try:
++ qt_version = pyqtconfig.Configuration().qt_version
++ qt_version = convert_qt_version(qt_version)
++ except AttributeError:
++ qt_version = "<unknown>"
++ print_status("Qt", "Qt: %s, PyQt: %s" %
++ (qt_version,
++ pyqtconfig.Configuration().pyqt_version_str))
++ return True
++ else:
+ print_status("Qt", "no")
+ return False
+- else:
+- try:
+- qt_version = pyqtconfig.Configuration().qt_version
+- qt_version = convert_qt_version(qt_version)
+- except AttributeError:
+- qt_version = "<unknown>"
+- print_status("Qt", "Qt: %s, PyQt: %s" %
+- (qt_version,
+- pyqtconfig.Configuration().pyqt_version_str))
+- return True
+
+ def check_for_qt4():
+- try:
+- from PyQt4 import pyqtconfig
+- except ImportError:
++ MP_QT4=False
++ if MP_QT4:
++ try:
++ from PyQt4 import pyqtconfig
++ except ImportError:
++ print_status("Qt4", "no")
++ return False
++ else:
++ print_status("Qt4", "Qt: %s, PyQt4: %s" %
++ (convert_qt_version(pyqtconfig.Configuration().qt_version),
++ pyqtconfig.Configuration().pyqt_version_str))
++ return True
++ else:
+ print_status("Qt4", "no")
+ return False
+- else:
+- print_status("Qt4", "Qt: %s, PyQt4: %s" %
+- (convert_qt_version(pyqtconfig.Configuration().qt_version),
+- pyqtconfig.Configuration().pyqt_version_str))
+- return True
+
+ def check_for_pyside():
+ try:
+@@ -430,14 +433,19 @@
+ return True
+
+ def check_for_cairo():
+- try:
+- import cairo
+- except ImportError:
++ MP_Cairo=False
++ if MP_Cairo:
++ try:
++ import cairo
++ except ImportError:
++ print_status("Cairo", "no")
++ return False
++ else:
++ print_status("Cairo", cairo.version)
++ return True
++ else:
+ print_status("Cairo", "no")
+ return False
+- else:
+- print_status("Cairo", cairo.version)
+- return True
+
+ def check_for_datetime():
+ try:
+@@ -496,36 +504,51 @@
+ return False
+
+ def check_for_dvipng():
+- try:
+- stdin, stdout = run_child_process('dvipng -version')
+- 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].decode().split()[-1])
++ return True
++ except (IndexError, ValueError):
++ print_status("dvipng", "no")
++ return False
++ else:
+ print_status("dvipng", "no")
+ return False
+
+ def check_for_ghostscript():
+- try:
+- if sys.platform == 'win32':
+- command = 'gswin32c --version'
+- else:
+- command = 'gs --version'
+- stdin, stdout = run_child_process(command)
+- print_status("ghostscript", stdout.read().decode()[:-1])
+- return True
+- except (IndexError, ValueError):
++ MP_GhostScript=False
++ if MP_GhostScript:
++ try:
++ if sys.platform == 'win32':
++ command = 'gswin32c --version'
++ else:
++ command = 'gs --version'
++ stdin, stdout = run_child_process(command)
++ print_status("ghostscript", stdout.read().decode()[:-1])
++ return True
++ except (IndexError, ValueError):
++ print_status("ghostscript", "no")
++ return False
++ else:
+ print_status("ghostscript", "no")
+ return False
+
+ def check_for_latex():
+- try:
+- stdin, stdout = run_child_process('latex -version')
+- line = stdout.readlines()[0].decode()
+- pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
+- match = re.search(pattern, line)
+- print_status("latex", match.group(0))
+- return True
+- except (IndexError, ValueError, AttributeError):
++ MP_LaTeX=False
++ if MP_LaTeX:
++ try:
++ stdin, stdout = run_child_process('latex -version')
++ line = stdout.readlines()[0].decode()
++ pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
++ match = re.search(pattern, line)
++ print_status("latex", match.group(0))
++ return True
++ except (IndexError, ValueError, AttributeError):
++ print_status("latex", "no")
++ return False
++ else:
+ print_status("latex", "no")
+ return False
+
+@@ -926,10 +949,10 @@
return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver
def hardcoded_tcl_config():
@@ -40,7 +205,7 @@
return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk'
def add_tk_flags(module):
-@@ -936,52 +929,6 @@
+@@ -950,52 +973,6 @@
raise RuntimeError('No tk/win32 support for this python version yet')
module.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120808/c19a6c42/attachment-0001.html>
More information about the macports-changes
mailing list