Date: Sat, 18 Nov 2006 16:07:02 -0700 From: Diane Bruce <db@db.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tonymaher@optusnet.com.au Subject: ports/105653: [PATCH] math/py-numpy: ensure f2py does not have version appended Message-ID: <E1GlZH4-000IYE-KB@diana.db.net> Resent-Message-ID: <200611182320.kAINKFHI014038@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105653 >Category: ports >Synopsis: [PATCH] math/py-numpy: ensure f2py does not have version appended >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Nov 18 23:20:14 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Diane Bruce >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: none >Environment: System: FreeBSD diana.db.net 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Sat Oct 14 14:44:56 MDT 2006 >Description: [DESCRIBE CHANGES] Port maintainer (tonymaher@optusnet.com.au) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: This is the same problem as PR 105651 only with py-numpy If PYTHON_VERSION=python2.4 resulting binary is f2py2.4, which is not in the plist >Fix: --- py24-numpy-1.0r1_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/math/py-numpy/Makefile /usr/home/db/py-numpy/Makefile --- /usr/ports/math/py-numpy/Makefile Fri Nov 17 21:53:55 2006 +++ /usr/home/db/py-numpy/Makefile Sat Nov 18 14:24:03 2006 @@ -7,6 +7,7 @@ PORTNAME= numpy PORTVERSION= 1.0r1 +PORTREVISION= 1 CATEGORIES= math python MASTER_SITES= http://numpy.scipy.org/:doc \ ${MASTER_SITE_SOURCEFORGE:S/$/:source/} diff -ruN --exclude=CVS /usr/ports/math/py-numpy/files/patch-numpy_f2py_setup.py /usr/home/db/py-numpy/files/patch-numpy_f2py_setup.py --- /usr/ports/math/py-numpy/files/patch-numpy_f2py_setup.py Tue Nov 14 22:50:40 2006 +++ /usr/home/db/py-numpy/files/patch-numpy_f2py_setup.py Sat Nov 18 15:14:13 2006 @@ -1,6 +1,6 @@ ---- numpy/f2py/setup.py.orig Sat Sep 23 05:25:27 2006 -+++ numpy/f2py/setup.py Sat Sep 23 05:25:41 2006 -@@ -32,8 +32,7 @@ +--- numpy/f2py/setup.py.orig Wed Jul 26 16:04:20 2006 ++++ numpy/f2py/setup.py Sat Nov 18 17:13:33 2006 +@@ -32,14 +32,13 @@ config.add_data_dir('docs') config.add_data_files('src/fortranobject.c', @@ -10,3 +10,10 @@ ) config.make_svn_version_py() + + def generate_f2py_py(build_dir): +- f2py_exe = 'f2py'+os.path.basename(sys.executable)[6:] ++ f2py_exe = 'f2py' + if f2py_exe[-4:]=='.exe': + f2py_exe = f2py_exe[:-4] + '.py' + if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py': --- py24-numpy-1.0r1_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1GlZH4-000IYE-KB>