[55206] trunk/dports/python

ram at macports.org ram at macports.org
Fri Aug 7 07:14:53 PDT 2009


Revision: 55206
          http://trac.macports.org/changeset/55206
Author:   ram at macports.org
Date:     2009-08-07 07:14:51 -0700 (Fri, 07 Aug 2009)
Log Message:
-----------
python/py{,25,26}-matplotlib: update to 0.99.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
    trunk/dports/python/py25-matplotlib/Portfile
    trunk/dports/python/py25-matplotlib/files/patch-disable_optional_deps.diff
    trunk/dports/python/py25-matplotlib/files/patch-setupext.py.diff
    trunk/dports/python/py26-matplotlib/Portfile
    trunk/dports/python/py26-matplotlib/files/patch-disable_optional_deps.diff
    trunk/dports/python/py26-matplotlib/files/patch-setupext.py.diff

Modified: trunk/dports/python/py-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py-matplotlib/Portfile	2009-08-07 13:53:23 UTC (rev 55205)
+++ trunk/dports/python/py-matplotlib/Portfile	2009-08-07 14:14:51 UTC (rev 55206)
@@ -5,7 +5,7 @@
 
 categories-append  graphics math
 name               py-matplotlib
-version            0.98.5.3
+version            0.99.0
 maintainers        nomaintainer
 platforms          darwin
 
@@ -21,9 +21,9 @@
 master_sites       sourceforge:matplotlib
 distname           matplotlib-${version}
 
-checksums          md5 6594f30cd08dde06c80bcdcca8aeae08 \
-                   sha1 2f6c894cf407192b3b60351bcc6468c0385d47b6 \
-                   rmd160 e884893b8c7b44b38dcd93556f64095a1923ad9f
+checksums          md5 8e019e17396e816cc2ef52843532e727 \
+                   sha1 5c267e96ecebe0654683b6325f423c53ae5ccd39 \
+                   rmd160 e69f3d6c877e2854becf71a25e4ba56f2ced8735
 
 depends_lib-append port:freetype \
                    port:libpng \

Modified: trunk/dports/python/py-matplotlib/files/patch-disable_optional_deps.diff
===================================================================
--- trunk/dports/python/py-matplotlib/files/patch-disable_optional_deps.diff	2009-08-07 13:53:23 UTC (rev 55205)
+++ trunk/dports/python/py-matplotlib/files/patch-disable_optional_deps.diff	2009-08-07 14:14:51 UTC (rev 55206)
@@ -1,6 +1,6 @@
---- setupext.py.orig	2008-12-26 09:37:15.000000000 +0000
-+++ setupext.py	2008-12-26 10:54:54.000000000 +0000
-@@ -350,43 +350,58 @@
+--- setupext.py	2009-08-01 14:15:24.000000000 -0500
++++ setupext.py	2009-08-07 08:51:38.000000000 -0500
+@@ -338,43 +338,58 @@
      return '.'.join(temp)
  
  def check_for_qt():
@@ -86,7 +86,7 @@
  
  def check_for_datetime():
      try:
-@@ -503,36 +518,51 @@
+@@ -433,36 +448,51 @@
              return False
  
  def check_for_dvipng():
@@ -133,14 +133,13 @@
 +            return False
 +    else:
          print_status("ghostscript", "no")
--        return False
-+        return True
+         return False
  
  def check_for_latex():
 -    try:
 -        stdin, stdout = run_child_process('latex -version')
 -        line = stdout.readlines()[0]
--        pattern = '3\.1\d+'
+-        pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
 -        match = re.search(pattern, line)
 -        print_status("latex", match.group(0))
 -        return True
@@ -150,7 +149,7 @@
 +        try:
 +            stdin, stdout = run_child_process('latex -version')
 +            line = stdout.readlines()[0]
-+            pattern = '3\.1\d+'
++            pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
 +            match = re.search(pattern, line)
 +            print_status("latex", match.group(0))
 +            return True

Modified: trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff
===================================================================
--- trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff	2009-08-07 13:53:23 UTC (rev 55205)
+++ trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff	2009-08-07 14:14:51 UTC (rev 55206)
@@ -1,16 +1,16 @@
---- setupext.py.orig	2008-05-29 17:47:10.000000000 -0500
-+++ setupext.py	2008-06-28 15:39:22.000000000 -0500
+--- setupext.py	2009-08-01 14:15:24.000000000 -0500
++++ setupext.py	2009-08-07 08:35:26.000000000 -0500
 @@ -50,8 +50,7 @@
      'linux2' : ['/usr/local', '/usr'],
      'linux'  : ['/usr/local', '/usr',],
      'cygwin' : ['/usr/local', '/usr',],
 -    'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
--                '/usr', '/sw', '/usr/X11R6'],
+-                '/usr', '/sw'],
 +    'darwin' : ['@@MPORTS_PREFIX@@'],
      'freebsd4' : ['/usr/local', '/usr'],
      'freebsd5' : ['/usr/local', '/usr'],
      'freebsd6' : ['/usr/local', '/usr'],
-@@ -328,6 +327,7 @@
+@@ -320,6 +319,7 @@
                       [os.path.join(p, 'lib64')     for p in basedir[sys.platform] ] )
  
      module.include_dirs.extend(incdirs)
@@ -18,7 +18,7 @@
      module.include_dirs.append('.')
      module.library_dirs.extend(libdirs)
  
-@@ -982,10 +982,10 @@
+@@ -949,10 +949,10 @@
      return tcl_lib, tcl_inc, tk_lib, tk_inc
  
  def hardcoded_tcl_config():
@@ -33,7 +33,7 @@
      return tcl_lib, tcl_inc, tk_lib, tk_inc
  
  def add_tk_flags(module):
-@@ -1003,52 +1003,6 @@
+@@ -973,52 +973,6 @@
              raise RuntimeError('No tk/win32 support for this python version yet')
          module.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
  

Modified: trunk/dports/python/py25-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py25-matplotlib/Portfile	2009-08-07 13:53:23 UTC (rev 55205)
+++ trunk/dports/python/py25-matplotlib/Portfile	2009-08-07 14:14:51 UTC (rev 55206)
@@ -5,7 +5,7 @@
 
 categories-append  graphics math
 name               py25-matplotlib
-version            0.98.5.3
+version            0.99.0
 maintainers        ram openmaintainer
 platforms          darwin
 
@@ -21,9 +21,9 @@
 master_sites       sourceforge:matplotlib
 distname           matplotlib-${version}
 
-checksums          md5 6594f30cd08dde06c80bcdcca8aeae08 \
-                   sha1 2f6c894cf407192b3b60351bcc6468c0385d47b6 \
-                   rmd160 e884893b8c7b44b38dcd93556f64095a1923ad9f
+checksums          md5 8e019e17396e816cc2ef52843532e727 \
+                   sha1 5c267e96ecebe0654683b6325f423c53ae5ccd39 \
+                   rmd160 e69f3d6c877e2854becf71a25e4ba56f2ced8735
 
 depends_lib-append port:freetype \
                    port:libpng \

Modified: trunk/dports/python/py25-matplotlib/files/patch-disable_optional_deps.diff
===================================================================
--- trunk/dports/python/py25-matplotlib/files/patch-disable_optional_deps.diff	2009-08-07 13:53:23 UTC (rev 55205)
+++ trunk/dports/python/py25-matplotlib/files/patch-disable_optional_deps.diff	2009-08-07 14:14:51 UTC (rev 55206)
@@ -1,6 +1,6 @@
---- setupext.py.orig	2008-12-26 09:37:15.000000000 +0000
-+++ setupext.py	2008-12-26 10:54:54.000000000 +0000
-@@ -350,43 +350,58 @@
+--- setupext.py	2009-08-01 14:15:24.000000000 -0500
++++ setupext.py	2009-08-07 08:51:38.000000000 -0500
+@@ -338,43 +338,58 @@
      return '.'.join(temp)
  
  def check_for_qt():
@@ -86,7 +86,7 @@
  
  def check_for_datetime():
      try:
-@@ -503,36 +518,51 @@
+@@ -433,36 +448,51 @@
              return False
  
  def check_for_dvipng():
@@ -133,14 +133,13 @@
 +            return False
 +    else:
          print_status("ghostscript", "no")
--        return False
-+        return True
+         return False
  
  def check_for_latex():
 -    try:
 -        stdin, stdout = run_child_process('latex -version')
 -        line = stdout.readlines()[0]
--        pattern = '3\.1\d+'
+-        pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
 -        match = re.search(pattern, line)
 -        print_status("latex", match.group(0))
 -        return True
@@ -150,7 +149,7 @@
 +        try:
 +            stdin, stdout = run_child_process('latex -version')
 +            line = stdout.readlines()[0]
-+            pattern = '3\.1\d+'
++            pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
 +            match = re.search(pattern, line)
 +            print_status("latex", match.group(0))
 +            return True

Modified: trunk/dports/python/py25-matplotlib/files/patch-setupext.py.diff
===================================================================
--- trunk/dports/python/py25-matplotlib/files/patch-setupext.py.diff	2009-08-07 13:53:23 UTC (rev 55205)
+++ trunk/dports/python/py25-matplotlib/files/patch-setupext.py.diff	2009-08-07 14:14:51 UTC (rev 55206)
@@ -1,16 +1,16 @@
---- setupext.py.orig	2008-05-29 17:47:10.000000000 -0500
-+++ setupext.py	2008-06-28 15:39:22.000000000 -0500
+--- setupext.py	2009-08-01 14:15:24.000000000 -0500
++++ setupext.py	2009-08-07 08:35:26.000000000 -0500
 @@ -50,8 +50,7 @@
      'linux2' : ['/usr/local', '/usr'],
      'linux'  : ['/usr/local', '/usr',],
      'cygwin' : ['/usr/local', '/usr',],
 -    'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
--                '/usr', '/sw', '/usr/X11R6'],
+-                '/usr', '/sw'],
 +    'darwin' : ['@@MPORTS_PREFIX@@'],
      'freebsd4' : ['/usr/local', '/usr'],
      'freebsd5' : ['/usr/local', '/usr'],
      'freebsd6' : ['/usr/local', '/usr'],
-@@ -328,6 +327,7 @@
+@@ -320,6 +319,7 @@
                       [os.path.join(p, 'lib64')     for p in basedir[sys.platform] ] )
  
      module.include_dirs.extend(incdirs)
@@ -18,7 +18,7 @@
      module.include_dirs.append('.')
      module.library_dirs.extend(libdirs)
  
-@@ -982,10 +982,10 @@
+@@ -949,10 +949,10 @@
      return tcl_lib, tcl_inc, tk_lib, tk_inc
  
  def hardcoded_tcl_config():
@@ -33,7 +33,7 @@
      return tcl_lib, tcl_inc, tk_lib, tk_inc
  
  def add_tk_flags(module):
-@@ -1003,52 +1003,6 @@
+@@ -973,52 +973,6 @@
              raise RuntimeError('No tk/win32 support for this python version yet')
          module.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
  

Modified: trunk/dports/python/py26-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py26-matplotlib/Portfile	2009-08-07 13:53:23 UTC (rev 55205)
+++ trunk/dports/python/py26-matplotlib/Portfile	2009-08-07 14:14:51 UTC (rev 55206)
@@ -5,8 +5,7 @@
 
 categories-append  graphics math
 name               py26-matplotlib
-version            0.98.5.3
-revision           1
+version            0.99.0
 maintainers        ram openmaintainer
 platforms          darwin
 
@@ -22,9 +21,9 @@
 master_sites       sourceforge:matplotlib
 distname           matplotlib-${version}
 
-checksums          md5 6594f30cd08dde06c80bcdcca8aeae08 \
-                   sha1 2f6c894cf407192b3b60351bcc6468c0385d47b6 \
-                   rmd160 e884893b8c7b44b38dcd93556f64095a1923ad9f
+checksums          md5 8e019e17396e816cc2ef52843532e727 \
+                   sha1 5c267e96ecebe0654683b6325f423c53ae5ccd39 \
+                   rmd160 e69f3d6c877e2854becf71a25e4ba56f2ced8735
 
 depends_lib-append port:freetype \
                    port:libpng \

Modified: trunk/dports/python/py26-matplotlib/files/patch-disable_optional_deps.diff
===================================================================
--- trunk/dports/python/py26-matplotlib/files/patch-disable_optional_deps.diff	2009-08-07 13:53:23 UTC (rev 55205)
+++ trunk/dports/python/py26-matplotlib/files/patch-disable_optional_deps.diff	2009-08-07 14:14:51 UTC (rev 55206)
@@ -1,6 +1,6 @@
---- setupext.py.orig	2008-12-26 09:37:15.000000000 +0000
-+++ setupext.py	2008-12-26 10:54:54.000000000 +0000
-@@ -350,43 +350,58 @@
+--- setupext.py	2009-08-01 14:15:24.000000000 -0500
++++ setupext.py	2009-08-07 08:51:38.000000000 -0500
+@@ -338,43 +338,58 @@
      return '.'.join(temp)
  
  def check_for_qt():
@@ -86,7 +86,7 @@
  
  def check_for_datetime():
      try:
-@@ -503,36 +518,51 @@
+@@ -433,36 +448,51 @@
              return False
  
  def check_for_dvipng():
@@ -133,14 +133,13 @@
 +            return False
 +    else:
          print_status("ghostscript", "no")
--        return False
-+        return True
+         return False
  
  def check_for_latex():
 -    try:
 -        stdin, stdout = run_child_process('latex -version')
 -        line = stdout.readlines()[0]
--        pattern = '3\.1\d+'
+-        pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
 -        match = re.search(pattern, line)
 -        print_status("latex", match.group(0))
 -        return True
@@ -150,7 +149,7 @@
 +        try:
 +            stdin, stdout = run_child_process('latex -version')
 +            line = stdout.readlines()[0]
-+            pattern = '3\.1\d+'
++            pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
 +            match = re.search(pattern, line)
 +            print_status("latex", match.group(0))
 +            return True

Modified: trunk/dports/python/py26-matplotlib/files/patch-setupext.py.diff
===================================================================
--- trunk/dports/python/py26-matplotlib/files/patch-setupext.py.diff	2009-08-07 13:53:23 UTC (rev 55205)
+++ trunk/dports/python/py26-matplotlib/files/patch-setupext.py.diff	2009-08-07 14:14:51 UTC (rev 55206)
@@ -1,16 +1,16 @@
---- setupext.py.orig	2008-05-29 17:47:10.000000000 -0500
-+++ setupext.py	2008-06-28 15:39:22.000000000 -0500
+--- setupext.py	2009-08-01 14:15:24.000000000 -0500
++++ setupext.py	2009-08-07 08:35:26.000000000 -0500
 @@ -50,8 +50,7 @@
      'linux2' : ['/usr/local', '/usr'],
      'linux'  : ['/usr/local', '/usr',],
      'cygwin' : ['/usr/local', '/usr',],
 -    'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
--                '/usr', '/sw', '/usr/X11R6'],
+-                '/usr', '/sw'],
 +    'darwin' : ['@@MPORTS_PREFIX@@'],
      'freebsd4' : ['/usr/local', '/usr'],
      'freebsd5' : ['/usr/local', '/usr'],
      'freebsd6' : ['/usr/local', '/usr'],
-@@ -328,6 +327,7 @@
+@@ -320,6 +319,7 @@
                       [os.path.join(p, 'lib64')     for p in basedir[sys.platform] ] )
  
      module.include_dirs.extend(incdirs)
@@ -18,7 +18,7 @@
      module.include_dirs.append('.')
      module.library_dirs.extend(libdirs)
  
-@@ -982,10 +982,10 @@
+@@ -949,10 +949,10 @@
      return tcl_lib, tcl_inc, tk_lib, tk_inc
  
  def hardcoded_tcl_config():
@@ -33,7 +33,7 @@
      return tcl_lib, tcl_inc, tk_lib, tk_inc
  
  def add_tk_flags(module):
-@@ -1003,52 +1003,6 @@
+@@ -973,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/20090807/4250f84f/attachment.html>


More information about the macports-changes mailing list