From db@db.net  Sat Nov 18 23:12:09 2006
Return-Path: <db@db.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 10E6A16A40F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 18 Nov 2006 23:12:09 +0000 (UTC)
	(envelope-from db@db.net)
Received: from diana.db.net (diana.db.net [204.228.225.212])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1486943D67
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 18 Nov 2006 23:12:03 +0000 (GMT)
	(envelope-from db@db.net)
Received: from db by diana.db.net with local (Exim 4.63 (FreeBSD))
	(envelope-from <db@db.net>)
	id 1GlZH4-000IYE-KB; Sat, 18 Nov 2006 16:07:02 -0700
Message-Id: <E1GlZH4-000IYE-KB@diana.db.net>
Date: Sat, 18 Nov 2006 16:07:02 -0700
From: Diane Bruce <db@db.net>
Sender: Diane Bruce <db@diana.db.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: tonymaher@optusnet.com.au
Subject: [PATCH] math/py-numpy: ensure f2py does not have version appended
X-Send-Pr-Version: 3.113
X-GNATS-Notify: tonymaher@optusnet.com.au

>Number:         105653
>Category:       ports
>Synopsis:       [PATCH] math/py-numpy: ensure f2py does not have version appended
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    xride
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 18 23:20:14 GMT 2006
>Closed-Date:    Fri Dec 29 13:08:28 GMT 2006
>Last-Modified:  Fri Dec 29 13:08:28 GMT 2006
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->xride 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Nov 18 23:20:30 UTC 2006 
Responsible-Changed-Why:  
xride@ wants his PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105653 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Nov 18 23:20:37 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105653 
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Tue Dec 26 12:30:37 UTC 2006 
State-Changed-Why:  
Maintainership has been assigned to db@, so this PR is now a maintainer-update. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105653 
Class-Changed-From-To: change-request->maintainer-update 
Class-Changed-By: linimon 
Class-Changed-When: Tue Dec 26 12:31:20 UTC 2006 
Class-Changed-Why:  
Submitter claimed maintainership. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105653 
State-Changed-From-To: open->closed 
State-Changed-By: xride 
State-Changed-When: Fri Dec 29 13:06:51 UTC 2006 
State-Changed-Why:  
There is newer pr: 106551 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105653 
>Unformatted:
