[99786] trunk/dports/python/py-matplotlib

[ram at macports.org]

Revision: 99786
          https://trac.macports.org/changeset/99786
Author:   ram at macports.org
Date:     2012-11-17 08:59:05 -0800 (Sat, 17 Nov 2012)
Log Message:
-----------
python/py-matplotlib: upate to 1.2.0

Modified Paths:
--------------
    trunk/dports/python/py-matplotlib/Portfile
    trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff

Modified: trunk/dports/python/py-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py-matplotlib/Portfile	2012-11-17 16:35:16 UTC (rev 99785)
+++ trunk/dports/python/py-matplotlib/Portfile	2012-11-17 16:59:05 UTC (rev 99786)
@@ -2,11 +2,11 @@
 
 PortSystem         1.0
 PortGroup          python 1.0
+PortGroup          github 1.0
 
 categories-append  graphics math
+github.setup       matplotlib matplotlib 1.2.0 v
 name               py-matplotlib
-version            1.1.1
-revision           2
 maintainers        ram openmaintainer
 platforms          darwin
 license            {PSF BSD}
@@ -19,13 +19,9 @@
                    output backends. This port provides variants for the \
                    different GUIs (gtk2, tkinter, wxpython).
 
-homepage           http://matplotlib.sourceforge.net
-master_sites       sourceforge:matplotlib
-distname           matplotlib-${version}
+checksums          rmd160 ef8e5e83479633529e0cb60bb1033401fa9b390a \
+                   sha256 3c22488acd6d4ed0721c1cfe0c3563aaec41c8cf1e06270d19841f8b2b46fdce
 
-checksums          rmd160 d6289c7d001c078300ce360d33d424bd3eb93e13 \
-                   sha256 63b275eb8d98903264557ffbd6ec0fee2c31b5badb3678fce1ac7044594620ab
-
 python.versions    24 25 26 27
 
 if {${subport} == "py24-matplotlib"} {
@@ -137,11 +133,7 @@
 
 }
 
-if {${name} == ${subport}} {
-  livecheck.type     regex
-  livecheck.url      ${homepage}
-  livecheck.regex    {Matplotlib (\d+(\.\d+)*) is available}
-} else {
+if {${name} != ${subport}} {
   livecheck.type     none
   notes "
 The default backend is the interactive Mac OS X backend. Different\

Modified: trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff
===================================================================
--- trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff	2012-11-17 16:35:16 UTC (rev 99785)
+++ trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff	2012-11-17 16:59:05 UTC (rev 99786)
@@ -1,23 +1,15 @@
---- 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',],
-     'cygwin' : ['/usr/local', '/usr',],
--    '_darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
--                '/usr', '/sw'],
--    # it appears builds with darwin are broken because of all the
--    # different flags the deps can be compile with, so I am pushing
--    # people to :
--    #   make -f make.osx fetch deps mpl_build mpl_install
--
--    'darwin' : [],
--
+--- setupext.py	2012-11-08 10:38:38.000000000 -0600
++++ setupext.py	2012-11-17 10:46:42.000000000 -0600
+@@ -57,7 +57,7 @@
+ basedir = defaultdict(lambda: ['/usr/local', '/usr'], {
+     # execptions to the ['/usr/local', '/usr'] defaults
+     'win32'  : ['win32_static',],
+-    'darwin' : ['/usr/local/', '/usr', '/usr/X11', '/opt/local'],
 +    'darwin' : ['@@MPORTS_PREFIX@@'],
-     'freebsd4' : ['/usr/local', '/usr'],
-     'freebsd5' : ['/usr/local', '/usr'],
-     'freebsd6' : ['/usr/local', '/usr'],
-@@ -371,6 +363,7 @@
+     'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
+     'gnu0' : ['/usr'],
+     'aix5' : ['/usr/local'],
+@@ -386,6 +386,7 @@
                       [os.path.join(p, 'lib64')     for p in basedirlist ] )
  
      module.include_dirs.extend(incdirs)
@@ -25,7 +17,7 @@
      module.include_dirs.append('.')
      module.library_dirs.extend(libdirs)
  
-@@ -389,33 +382,43 @@
+@@ -404,33 +405,43 @@
      return '.'.join(temp)
  
  def check_for_qt():
@@ -90,7 +82,7 @@
  
  def check_for_pyside():
      try:
-@@ -430,14 +433,19 @@
+@@ -445,14 +456,19 @@
          return True
  
  def check_for_cairo():
@@ -114,11 +106,11 @@
 -        print_status("Cairo", cairo.version)
 -        return True
  
- def check_for_datetime():
-     try:
-@@ -496,36 +504,51 @@
-             return False
+ def check_provide_pytz():
+     if options['provide_pytz'] is True:
+@@ -531,36 +547,51 @@
  
+ 
  def check_for_dvipng():
 -    try:
 -        stdin, stdout = run_child_process('dvipng -version')
@@ -190,7 +182,7 @@
          print_status("latex", "no")
          return False
  
-@@ -926,10 +949,10 @@
+@@ -974,10 +1005,10 @@
      return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver
  
  def hardcoded_tcl_config():
@@ -205,7 +197,7 @@
      return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk'
  
  def add_tk_flags(module):
-@@ -950,52 +973,6 @@
+@@ -998,52 +1029,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/20121117/41cc2581/attachment-0001.html>