[33490] trunk/dports/python
ram at macports.org
ram at macports.org
Sun Jan 27 14:06:59 PST 2008
Revision: 33490
http://trac.macosforge.org/projects/macports/changeset/33490
Author: ram at macports.org
Date: 2008-01-27 14:06:57 -0800 (Sun, 27 Jan 2008)
Log Message:
-----------
py-matplotlib/py25-matplotlib: update to 0.91.2
Modified Paths:
--------------
trunk/dports/python/py-matplotlib/Portfile
trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff
trunk/dports/python/py25-matplotlib/Portfile
trunk/dports/python/py25-matplotlib/files/patch-setupext.py.diff
Modified: trunk/dports/python/py-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py-matplotlib/Portfile 2008-01-27 22:02:46 UTC (rev 33489)
+++ trunk/dports/python/py-matplotlib/Portfile 2008-01-27 22:06:57 UTC (rev 33490)
@@ -4,8 +4,7 @@
PortGroup python24 1.0
categories-append graphics math
name py-matplotlib
-version 0.90.1
-revision 1
+version 0.91.2
maintainers ram openmaintainer
description matlab-like syntax for creating plots in python
@@ -19,14 +18,18 @@
homepage http://matplotlib.sourceforge.net
master_sites sourceforge:matplotlib
distname matplotlib-${version}
-checksums md5 e1344bd72660e7c9c0b7540a72cc45b8
+checksums md5 7abe21ca9e26df4a44f3208d6007fe16 \
+ sha1 1424fe2f105dc82080920f89f97f1e6cb639952b \
+ rmd160 dfffd6d4925d96ccffdc45e5da4e8426d24c095c
+
platforms darwin
depends_lib-append port:freetype \
port:libpng \
port:py-dateutil \
- port:py-tz
+ port:py-tz \
+ port:py-numpy
patchfiles patch-setupext.py.diff
@@ -59,19 +62,10 @@
reinplace "s|^BUILD_WXAGG\[\[:space:\]\]*=\[\[:space:\]\]*'auto'|BUILD_WXAGG=0|" \
${worksrcpath}/setup.py
}
- if {[variant_isset numarray]} {
- reinplace "s|NUMERIX.-1.|'numarray'|" ${worksrcpath}/setup.py
- }
- if {[variant_isset numeric]} {
- reinplace "s|NUMERIX.-1.|'numeric'|" ${worksrcpath}/setup.py
- }
- if {[variant_isset numpy]} {
- reinplace "s|NUMERIX.-1.|'numpy'|" ${worksrcpath}/setup.py
- }
}
post-patch {
- reinplace "s|@@DPORTS_PREFIX@@|${prefix}|" ${worksrcpath}/setupext.py
+ reinplace "s|@@MPORTS_PREFIX@@|${prefix}|" ${worksrcpath}/setupext.py
}
post-destroot {
@@ -98,18 +92,6 @@
variant wxpython conflicts gtk2 tkinter description "Use wxAgg for interactive plotting" {
depends_lib-append port:py-wxpython
}
-variant numarray conflicts numpy Numeric description "Use numarray as array-object" {
- depends_lib-append port:py-numarray
-}
-variant Numeric conflicts numarray numpy description "Use Numeric as array-object" {
- depends_lib-append port:py-numeric
-}
-variant numpy conflicts numarray Numeric description "Use numpy as array-object" {
- depends_lib-append port:py-numpy
-}
if { ![variant_isset gtk2] && ![variant_isset tkinter] && ![variant_isset wxpython] } {
default_variants +tkinter
}
-if { ![variant_isset numarray] && ![variant_isset Numeric] && ![variant_isset numpy] } {
- default_variants +numpy
-}
Modified: trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff
===================================================================
--- trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff 2008-01-27 22:02:46 UTC (rev 33489)
+++ trunk/dports/python/py-matplotlib/files/patch-setupext.py.diff 2008-01-27 22:06:57 UTC (rev 33490)
@@ -1,20 +1,20 @@
---- setupext.py.orig 2007-02-01 01:32:51.000000000 -0800
-+++ setupext.py 2007-03-30 15:51:37.000000000 -0700
-@@ -48,8 +48,7 @@
- 'linux2' : ['/usr/local', '/usr',],
+--- setupext.py.orig 2008-01-27 20:09:49.000000000 +0100
++++ setupext.py 2008-01-27 20:11:05.000000000 +0100
+@@ -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'],
-+ 'darwin' : ['@@DPORTS_PREFIX@@', '/usr'],
+- '/usr', '/sw', '/usr/X11R6'],
++ 'darwin' : ['@@MPORTS_PREFIX@@', '/usr'],
'freebsd4' : ['/usr/local', '/usr'],
'freebsd5' : ['/usr/local', '/usr'],
'freebsd6' : ['/usr/local', '/usr'],
-@@ -132,6 +131,7 @@
+@@ -327,6 +326,7 @@
[os.path.join(p, 'lib64') for p in basedir[sys.platform] ] )
module.include_dirs.extend(incdirs)
-+ module.include_dirs.extend(['@@DPORTS_PREFIX@@/include/python2.4'])
++ module.include_dirs.extend(['@@MPORTS_PREFIX@@/include/python2.4'])
module.include_dirs.append('.')
module.library_dirs.extend(libdirs)
Modified: trunk/dports/python/py25-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py25-matplotlib/Portfile 2008-01-27 22:02:46 UTC (rev 33489)
+++ trunk/dports/python/py25-matplotlib/Portfile 2008-01-27 22:06:57 UTC (rev 33490)
@@ -4,8 +4,7 @@
PortGroup python25 1.0
categories-append graphics math
name py25-matplotlib
-version 0.90.1
-revision 1
+version 0.91.2
maintainers ram openmaintainer
description matlab-like syntax for creating plots in python
@@ -19,14 +18,18 @@
homepage http://matplotlib.sourceforge.net
master_sites sourceforge:matplotlib
distname matplotlib-${version}
-checksums md5 e1344bd72660e7c9c0b7540a72cc45b8
+checksums md5 7abe21ca9e26df4a44f3208d6007fe16 \
+ sha1 1424fe2f105dc82080920f89f97f1e6cb639952b \
+ rmd160 dfffd6d4925d96ccffdc45e5da4e8426d24c095c
+
platforms darwin
depends_lib-append port:freetype \
port:libpng \
port:py25-dateutil \
- port:py25-tz
+ port:py25-tz \
+ port:py25-numpy
patchfiles patch-setupext.py.diff
@@ -59,19 +62,10 @@
reinplace "s|^BUILD_WXAGG\[\[:space:\]\]*=\[\[:space:\]\]*'auto'|BUILD_WXAGG=0|" \
${worksrcpath}/setup.py
}
- if {[variant_isset numarray]} {
- reinplace "s|NUMERIX.-1.|'numarray'|" ${worksrcpath}/setup.py
- }
- if {[variant_isset numeric]} {
- reinplace "s|NUMERIX.-1.|'numeric'|" ${worksrcpath}/setup.py
- }
- if {[variant_isset numpy]} {
- reinplace "s|NUMERIX.-1.|'numpy'|" ${worksrcpath}/setup.py
- }
}
post-patch {
- reinplace "s|@@DPORTS_PREFIX@@|${prefix}|" ${worksrcpath}/setupext.py
+ reinplace "s|@@MPORTS_PREFIX@@|${prefix}|" ${worksrcpath}/setupext.py
}
post-destroot {
@@ -98,18 +92,6 @@
variant wxpython conflicts gtk2 tkinter description "Use wxAgg for interactive plotting" {
depends_lib-append port:py25-wxpython
}
-variant numarray conflicts numpy Numeric description "Use numarray as array-object" {
- depends_lib-append port:py25-numarray
-}
-variant Numeric conflicts numarray numpy description "Use Numeric as array-object" {
- depends_lib-append port:py25-numeric
-}
-variant numpy conflicts numarray Numeric description "Use numpy as array-object" {
- depends_lib-append port:py25-numpy
-}
if { ![variant_isset gtk2] && ![variant_isset tkinter] && ![variant_isset wxpython] } {
default_variants +tkinter
}
-if { ![variant_isset numarray] && ![variant_isset Numeric] && ![variant_isset numpy] } {
- default_variants +numpy
-}
Modified: trunk/dports/python/py25-matplotlib/files/patch-setupext.py.diff
===================================================================
--- trunk/dports/python/py25-matplotlib/files/patch-setupext.py.diff 2008-01-27 22:02:46 UTC (rev 33489)
+++ trunk/dports/python/py25-matplotlib/files/patch-setupext.py.diff 2008-01-27 22:06:57 UTC (rev 33490)
@@ -1,20 +1,20 @@
---- setupext.py.orig 2007-02-01 01:32:51.000000000 -0800
-+++ setupext.py 2007-03-30 15:51:37.000000000 -0700
-@@ -48,8 +48,7 @@
- 'linux2' : ['/usr/local', '/usr',],
+--- setupext.py.orig 2008-01-27 20:09:49.000000000 +0100
++++ setupext.py 2008-01-27 20:11:05.000000000 +0100
+@@ -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'],
-+ 'darwin' : ['@@DPORTS_PREFIX@@', '/usr'],
+- '/usr', '/sw', '/usr/X11R6'],
++ 'darwin' : ['@@MPORTS_PREFIX@@', '/usr'],
'freebsd4' : ['/usr/local', '/usr'],
'freebsd5' : ['/usr/local', '/usr'],
'freebsd6' : ['/usr/local', '/usr'],
-@@ -132,6 +131,7 @@
+@@ -327,6 +326,7 @@
[os.path.join(p, 'lib64') for p in basedir[sys.platform] ] )
module.include_dirs.extend(incdirs)
-+ module.include_dirs.extend(['@@DPORTS_PREFIX@@/include/python2.5'])
++ module.include_dirs.extend(['@@MPORTS_PREFIX@@/include/python2.5'])
module.include_dirs.append('.')
module.library_dirs.extend(libdirs)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080127/e1e0a6c0/attachment.html
More information about the macports-changes
mailing list