[33719] trunk/dports/python

ram at macports.org ram at macports.org
Sun Feb 3 16:58:17 PST 2008


Revision: 33719
          http://trac.macosforge.org/projects/macports/changeset/33719
Author:   ram at macports.org
Date:     2008-02-03 16:58:16 -0800 (Sun, 03 Feb 2008)

Log Message:
-----------
py-numpy/py25-numpy: apply patch to fix f2py error when compiling a
Fortran module block, closes #14171

Modified Paths:
--------------
    trunk/dports/python/py-numpy/Portfile
    trunk/dports/python/py25-numpy/Portfile

Added Paths:
-----------
    trunk/dports/python/py-numpy/files/patch-f2py_rules.py.diff
    trunk/dports/python/py25-numpy/files/patch-f2py_rules.py.diff

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2008-02-04 00:51:42 UTC (rev 33718)
+++ trunk/dports/python/py-numpy/Portfile	2008-02-04 00:58:16 UTC (rev 33719)
@@ -1,11 +1,11 @@
 # $Id$
 
-PortSystem 1.0
-PortGroup  python24 1.0
+PortSystem              1.0
+PortGroup               python24 1.0
 
 name                    py-numpy
 version                 1.0.4
-revision                6
+revision                7
 categories              python
 platforms               darwin
 maintainers             ram openmaintainer
@@ -20,7 +20,8 @@
                         sha1 9a1f09358c3310cf990eecd06dc2eb54aec78321 \
                         rmd160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5
 
-patchfiles              patch-g95_link.diff
+patchfiles              patch-g95_link.diff \
+                        patch-f2py_rules.py.diff
 
 depends_lib-append      port:fftw-3
 

Added: trunk/dports/python/py-numpy/files/patch-f2py_rules.py.diff
===================================================================
--- trunk/dports/python/py-numpy/files/patch-f2py_rules.py.diff	                        (rev 0)
+++ trunk/dports/python/py-numpy/files/patch-f2py_rules.py.diff	2008-02-04 00:58:16 UTC (rev 33719)
@@ -0,0 +1,11 @@
+--- numpy/f2py/rules.py	2008-02-03 19:22:50.000000000 -0500
++++ numpy/f2py/rules.py	2008-02-03 19:23:24.000000000 -0500
+@@ -1219,7 +1219,7 @@
+         f.write('!     This file is autogenerated with f2py (version:%s)\n'%(f2py_version))
+         f.write('!     It contains Fortran 90 wrappers to fortran functions.\n')
+         lines = []
+-        for l in '\n\n'.join(funcwrappers2)+'\n'.split('\n'):
++        for l in ('\n\n'.join(funcwrappers2)+'\n').split('\n'):
+             if len(l)>72 and l[0]==' ':
+                 lines.append(l[:72]+'&\n     &')
+                 l = l[72:]

Modified: trunk/dports/python/py25-numpy/Portfile
===================================================================
--- trunk/dports/python/py25-numpy/Portfile	2008-02-04 00:51:42 UTC (rev 33718)
+++ trunk/dports/python/py25-numpy/Portfile	2008-02-04 00:58:16 UTC (rev 33719)
@@ -1,11 +1,11 @@
 # $Id$
 
-PortSystem 1.0
-PortGroup  python25 1.0
+PortSystem              1.0
+PortGroup               python25 1.0
 
 name                    py25-numpy
 version                 1.0.4
-revision                6
+revision                7
 categories              python
 platforms               darwin
 maintainers             ram openmaintainer
@@ -20,7 +20,8 @@
                         sha1 9a1f09358c3310cf990eecd06dc2eb54aec78321 \
                         rmd160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5
 
-patchfiles              patch-g95_link.diff
+patchfiles              patch-g95_link.diff \
+                        patch-f2py_rules.py.diff
 
 depends_lib-append      port:fftw-3 \
                         port:py25-hashlib

Added: trunk/dports/python/py25-numpy/files/patch-f2py_rules.py.diff
===================================================================
--- trunk/dports/python/py25-numpy/files/patch-f2py_rules.py.diff	                        (rev 0)
+++ trunk/dports/python/py25-numpy/files/patch-f2py_rules.py.diff	2008-02-04 00:58:16 UTC (rev 33719)
@@ -0,0 +1,11 @@
+--- numpy/f2py/rules.py	2008-02-03 19:22:50.000000000 -0500
++++ numpy/f2py/rules.py	2008-02-03 19:23:24.000000000 -0500
+@@ -1219,7 +1219,7 @@
+         f.write('!     This file is autogenerated with f2py (version:%s)\n'%(f2py_version))
+         f.write('!     It contains Fortran 90 wrappers to fortran functions.\n')
+         lines = []
+-        for l in '\n\n'.join(funcwrappers2)+'\n'.split('\n'):
++        for l in ('\n\n'.join(funcwrappers2)+'\n').split('\n'):
+             if len(l)>72 and l[0]==' ':
+                 lines.append(l[:72]+'&\n     &')
+                 l = l[72:]

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080203/574ee813/attachment.html


More information about the macports-changes mailing list