[38661] trunk/dports/python

[ram at macports.org]

Revision: 38661
          http://trac.macosforge.org/projects/macports/changeset/38661
Author:   ram at macports.org
Date:     2008-07-27 18:59:36 -0700 (Sun, 27 Jul 2008)
Log Message:
-----------
py-numpy/py25-numpy: explictly set python interpreter for f2py

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

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

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2008-07-28 00:53:24 UTC (rev 38660)
+++ trunk/dports/python/py-numpy/Portfile	2008-07-28 01:59:36 UTC (rev 38661)
@@ -5,7 +5,7 @@
 
 name                    py-numpy
 version                 1.1.0
-revision                1
+revision                2
 categories              python
 platforms               darwin
 maintainers             ram openmaintainer
@@ -20,12 +20,15 @@
                         sha1 c36451e05251599294abfefa386835300e2066d5 \
                         rmd160 046d15df1d4c1733886a61677d6f7e9a836f8ea3
 
-patchfiles              patch-g95_link.diff
+patchfiles              patch-g95_link.diff \
+                        patch-f2py_setup.py.diff
 
-depends_lib-append      port:fftw-3
+depends_lib-append      port:fftw-3 \
+                        port:py25-hashlib
 
 post-patch {
   reinplace "s|@@MPORTS_PREFIX@@|${prefix}|" ${worksrcpath}/numpy/distutils/fcompiler/g95.py
+  reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" ${worksrcpath}/numpy/f2py/setup.py
 }
 
 post-destroot {

Added: trunk/dports/python/py-numpy/files/patch-f2py_setup.py.diff
===================================================================
--- trunk/dports/python/py-numpy/files/patch-f2py_setup.py.diff	                        (rev 0)
+++ trunk/dports/python/py-numpy/files/patch-f2py_setup.py.diff	2008-07-28 01:59:36 UTC (rev 38661)
@@ -0,0 +1,20 @@
+--- numpy/f2py/setup.py	2008-07-27 20:43:18.000000000 -0500
++++ numpy/f2py/setup.py	2008-07-27 20:44:46.000000000 -0500
+@@ -52,7 +52,7 @@
+             log.info('Creating %s', target)
+             f = open(target,'w')
+             f.write('''\
+-#!/usr/bin/env %s
++#!@@MPORTS_PYTHON@@
+ # See http://cens.ioc.ee/projects/f2py2e/
+ import os, sys
+ for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]:
+@@ -78,7 +78,7 @@
+     print >> sys.stderr, "Unknown mode:",`mode`
+     sys.exit(1)
+ main()
+-'''%(os.path.basename(sys.executable)))
++''')
+             f.close()
+         return target
+ 

Modified: trunk/dports/python/py25-numpy/Portfile
===================================================================
--- trunk/dports/python/py25-numpy/Portfile	2008-07-28 00:53:24 UTC (rev 38660)
+++ trunk/dports/python/py25-numpy/Portfile	2008-07-28 01:59:36 UTC (rev 38661)
@@ -5,7 +5,7 @@
 
 name                    py25-numpy
 version                 1.1.0
-revision                1
+revision                2
 categories              python
 platforms               darwin
 maintainers             ram openmaintainer
@@ -20,13 +20,15 @@
                         sha1 c36451e05251599294abfefa386835300e2066d5 \
                         rmd160 046d15df1d4c1733886a61677d6f7e9a836f8ea3
 
-patchfiles              patch-g95_link.diff
+patchfiles              patch-g95_link.diff \
+                        patch-f2py_setup.py.diff
 
 depends_lib-append      port:fftw-3 \
                         port:py25-hashlib
 
 post-patch {
   reinplace "s|@@MPORTS_PREFIX@@|${prefix}|" ${worksrcpath}/numpy/distutils/fcompiler/g95.py
+  reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" ${worksrcpath}/numpy/f2py/setup.py
 }
 
 post-destroot {

Added: trunk/dports/python/py25-numpy/files/patch-f2py_setup.py.diff
===================================================================
--- trunk/dports/python/py25-numpy/files/patch-f2py_setup.py.diff	                        (rev 0)
+++ trunk/dports/python/py25-numpy/files/patch-f2py_setup.py.diff	2008-07-28 01:59:36 UTC (rev 38661)
@@ -0,0 +1,20 @@
+--- numpy/f2py/setup.py	2008-07-27 20:43:18.000000000 -0500
++++ numpy/f2py/setup.py	2008-07-27 20:44:46.000000000 -0500
+@@ -52,7 +52,7 @@
+             log.info('Creating %s', target)
+             f = open(target,'w')
+             f.write('''\
+-#!/usr/bin/env %s
++#!@@MPORTS_PYTHON@@
+ # See http://cens.ioc.ee/projects/f2py2e/
+ import os, sys
+ for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]:
+@@ -78,7 +78,7 @@
+     print >> sys.stderr, "Unknown mode:",`mode`
+     sys.exit(1)
+ main()
+-'''%(os.path.basename(sys.executable)))
++''')
+             f.close()
+         return target
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080727/808e5da0/attachment.html