From johann@sanbi.ac.za  Wed Nov 15 04:56:30 2000
Return-Path: <johann@sanbi.ac.za>
Received: from fling.sanbi.ac.za (fling.sanbi.ac.za [196.38.142.119])
	by hub.freebsd.org (Postfix) with ESMTP
	id BF7EA37B66E; Wed, 15 Nov 2000 04:55:39 -0800 (PST)
Received: from johann by fling.sanbi.ac.za with local (Exim 3.13 #4)
	id 13w267-0002o2-00; Wed, 15 Nov 2000 14:55:31 +0200
Message-Id: <E13w267-0002o2-00@fling.sanbi.ac.za>
Date: Wed, 15 Nov 2000 14:55:31 +0200
From: johann@egenetics.com
Sender: johann@sanbi.ac.za
To: FreeBSD-gnats-submit@freebsd.org
Cc: tg@freebsd.org
Subject: Port update: math/numpy
X-Send-Pr-Version: 3.2

>Number:         22869
>Category:       ports
>Synopsis:       Port update: math/numpy
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 15 05:00:01 PST 2000
>Closed-Date:    Fri Nov 17 04:19:52 PST 2000
>Last-Modified:  Fri Nov 17 04:21:40 PST 2000
>Originator:     Johann Visagie
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Electric Genetics
>Environment:
>Description:
- Update to version 17.0 of Numerical Python.
- Apparently there is no longer a dependency on the external LAPACK libraries
  (NumPy now includes a "lite" version of LAPACK).
- Removed files:  files/patch-setup.py (due to the fact that there's no
  longer a dependency on LAPACK).
>How-To-Repeat:
>Fix:
diff -ruN numpy.bak/Makefile numpy/Makefile
--- numpy.bak/Makefile	Wed Nov 15 14:49:24 2000
+++ numpy/Makefile	Wed Nov 15 14:47:30 2000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	numeric
-PORTVERSION=	16.1.1
+PORTVERSION=	17.0
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	numpy
@@ -16,8 +16,6 @@
 MAINTAINER=	tg@FreeBSD.org
 
 BUILD_DEPENDS=	${PYDISTUTILS}
-LIB_DEPENDS=	lapack.3:${PORTSDIR}/math/lapack \
-		blas.2:${PORTSDIR}/math/lapack
 
 USE_PYTHON=	yes
 MAKE_ENV=	PYTHON_CMD=${PYTHON_CMD}
diff -ruN numpy.bak/distinfo numpy/distinfo
--- numpy.bak/distinfo	Wed Nov 15 14:49:24 2000
+++ numpy/distinfo	Wed Nov 15 13:05:41 2000
@@ -1 +1 @@
-MD5 (Numeric-16.1.1.tar.gz) = a20f535b1761a19fb791456cee37b812
+MD5 (Numeric-17.0.tar.gz) = 77dfd17281fc68197a278bc0bf40334a
diff -ruN numpy.bak/files/patch-Makefile numpy/files/patch-Makefile
--- numpy.bak/files/patch-Makefile	Wed Nov 15 14:49:24 2000
+++ numpy/files/patch-Makefile	Wed Nov 15 14:02:13 2000
@@ -1,25 +1,26 @@
---- Makefile	2000/08/31 17:23:34	1.1
-+++ Makefile	2000/08/31 17:35:38
-@@ -5,8 +5,20 @@
+--- Makefile.orig	Sun Sep 17 19:07:38 2000
++++ Makefile	Wed Nov 15 14:02:00 2000
+@@ -5,10 +5,21 @@
  	@echo "Currently that is:"
- 	@which ${PYTHON_CMD}
+ 	@which python
  
--all: MA RNG FFT
-+all:: main MA RNG FFT
+-all: MA RNG FFT LALITE RANLIB
++all:: main MA RNG FFT LALITE RANLIB
 +
 +main:
 +	${PYTHON_CMD} setup.py build
  
- MA RNG FFT:
--	(cd Packages/$@; ${PYTHON_CMD} setup.py install)
-+	(cd Packages/$@; mkdir -p Include ; ln -sf ../../../Include Include/Numeric; ${PYTHON_CMD} setup.py build)
+ MA RNG FFT LALITE RANLIB:
+-	(cd Packages/$@; python setup.py install)
++	(cd Packages/$@; mkdir -p Include; ln -sf ../../../Include Include/Numeric; ${PYTHON_CMD} setup.py build)
 +
-+install:: main_install MA_install RNG_install FFT_install
++install:: main_install MA_install RNG_install FFT_install LALITE_install RANLIB_install
 +
 +main_install:
 +	${PYTHON_CMD} setup.py install
 +
-+MA_install RNG_install FFT_install:
++MA_install RNG_install FFT_install LALITE_install RANLIB_install:
 +	(cd Packages/${@:S/_install//}; ${PYTHON_CMD} setup.py install)
-+
  
+ clean:
+ 	/bin/rm -fr Packages/*/build build dist
diff -ruN numpy.bak/files/patch-setup.py numpy/files/patch-setup.py
--- numpy.bak/files/patch-setup.py	Wed Nov 15 14:49:24 2000
+++ numpy/files/patch-setup.py	Thu Jan  1 02:00:00 1970
@@ -1,12 +0,0 @@
---- setup.py.orig	Tue Sep 12 22:27:29 2000
-+++ setup.py	Thu Sep 21 17:17:55 2000
-@@ -27,6 +27,9 @@
- LAPACKLIBDIR = None  
- # places to look and what to look for
- POSSIBLE_DIRECTORIES = ['/usr/local/lib', '/usr/lib', 'lapack_lite']
-+# add sys.prefix + '/lib', on the assumption that python was
-+# installed in the same directory as all other local software
-+POSSIBLE_DIRECTORIES.append(sys.prefix + '/lib')
- if sys.platform == 'win32':
-     BLASNAMES = ['blas.lib']
-     LAPACKNAMES = ['lapack.lib']
diff -ruN numpy.bak/pkg-descr numpy/pkg-descr
--- numpy.bak/pkg-descr	Wed Nov 15 14:49:24 2000
+++ numpy/pkg-descr	Wed Nov 15 14:48:50 2000
@@ -17,4 +17,4 @@
        + Fourier Transforms (FFTPACK)
        + Random Numbers (RANLIB)
 
-WWW: http://xfiles.llnl.gov/python.htm
+WWW: http://numpy.sourceforge.net/
diff -ruN numpy.bak/pkg-plist numpy/pkg-plist
--- numpy.bak/pkg-plist	Wed Nov 15 14:49:24 2000
+++ numpy/pkg-plist	Wed Nov 15 14:41:52 2000
@@ -1,16 +1,18 @@
 include/%%PYTHON_VERSION%%/Numeric/arrayobject.h
+include/%%PYTHON_VERSION%%/Numeric/f2c.h
 include/%%PYTHON_VERSION%%/Numeric/ranlib.h
 include/%%PYTHON_VERSION%%/Numeric/ufuncobject.h
 lib/%%PYTHON_VERSION%%/site-packages/FFT/FFT.py
 lib/%%PYTHON_VERSION%%/site-packages/FFT/FFT.pyc
 lib/%%PYTHON_VERSION%%/site-packages/FFT/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/FFT/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FFT/fftpack.so
 lib/%%PYTHON_VERSION%%/site-packages/MA/MA.py
 lib/%%PYTHON_VERSION%%/site-packages/MA/MA.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MA/version.py
-lib/%%PYTHON_VERSION%%/site-packages/MA/version.pyc
 lib/%%PYTHON_VERSION%%/site-packages/MA/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/MA/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/MA/version.py
+lib/%%PYTHON_VERSION%%/site-packages/MA/version.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Numeric.pth
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/ArrayPrinter.py
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/ArrayPrinter.pyc
@@ -41,8 +43,6 @@
 lib/%%PYTHON_VERSION%%/site-packages/RNG/Statistics.pyc
 lib/%%PYTHON_VERSION%%/site-packages/RNG/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/RNG/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/fftpack.so
-@unexec rmdir %B 2>/dev/null || true
 @comment share/doc/py-numeric/numpy.pdf
 share/examples/py-numeric/NumTut/__init__.py
 share/examples/py-numeric/NumTut/greece.pik

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->tg 
Responsible-Changed-By: sobomax 
Responsible-Changed-When: Wed Nov 15 06:02:45 PST 2000 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=22869 
State-Changed-From-To: open->closed 
State-Changed-By: tg 
State-Changed-When: Fri Nov 17 04:19:52 PST 2000 
State-Changed-Why:  
Thanks for the PR. I chose to do things slightly differently 
to remove both patch files. 

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