Upgrade to 17.1.1.

PR:		22869
Submitted by:	Johann Visagie <johann@egenetics.com>

15 files changed, 69 insertions, 156 deletions

diff --git a/math/numpy/Makefile b/math/numpy/Makefile
index 44ebdf301246..5b3b92222e58 100644
--- a/math/numpy/Makefile
+++ b/math/numpy/Makefile
@@ -6,26 +6,34 @@
 #
 
 PORTNAME=	numeric
-PORTVERSION=	16.1.1
+PORTVERSION=	17.1.1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	numpy
-PKGNAMEPREFIX=	py-
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Numeric-${PORTVERSION}
 
 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}
 
 DOCDIR=		${PREFIX}/share/doc/py-numeric
 EXAMPLEDIR=	${PREFIX}/share/examples/py-numeric
 
-post-install:
+post-extract:
+.for dir in FFT LALITE RANLIB RNG
+	@(cd ${WRKSRC}/Packages/${dir}; \
+		${LN} -sf ../../../Include Include/Numeric)
+.endfor
+
+do-build:
+	@(cd ${WRKSRC}; ${PYTHON_CMD} setup_all.py build)
+
+do-install:
+	@(cd ${WRKSRC}; ${PYTHON_CMD} setup_all.py install)
+
 	@${MKDIR} ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${EXAMPLEDIR}
 	@${MKDIR} ${EXAMPLEDIR}/NumTut
diff --git a/math/numpy/distinfo b/math/numpy/distinfo
index 8aa4cf607e54..307be3c8efae 100644
--- a/math/numpy/distinfo
+++ b/math/numpy/distinfo
@@ -1 +1 @@
-MD5 (Numeric-16.1.1.tar.gz) = a20f535b1761a19fb791456cee37b812
+MD5 (Numeric-17.1.1.tar.gz) = c7066fc081820bbe8afcefbd03eaa0ee
diff --git a/math/numpy/files/patch-Makefile b/math/numpy/files/patch-Makefile
deleted file mode 100644
index b59f96b8a968..000000000000
--- a/math/numpy/files/patch-Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile	2000/08/31 17:23:34	1.1
-+++ Makefile	2000/08/31 17:35:38
-@@ -5,8 +5,20 @@
- 	@echo "Currently that is:"
- 	@which ${PYTHON_CMD}
- 
--all: MA RNG FFT
-+all:: main MA RNG FFT
-+
-+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)
-+
-+install:: main_install MA_install RNG_install FFT_install
-+
-+main_install:
-+	${PYTHON_CMD} setup.py install
-+
-+MA_install RNG_install FFT_install:
-+	(cd Packages/${@:S/_install//}; ${PYTHON_CMD} setup.py install)
-+
- 
diff --git a/math/numpy/files/patch-setup.py b/math/numpy/files/patch-setup.py
deleted file mode 100644
index e3da257d0019..000000000000
--- a/math/numpy/files/patch-setup.py
+++ /dev/null
@@ -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 --git a/math/numpy/pkg-plist b/math/numpy/pkg-plist
index 53d2618a7547..8f9e4fab95fa 100644
--- a/math/numpy/pkg-plist
+++ b/math/numpy/pkg-plist
@@ -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/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/FFT/fftpack.so
+lib/%%PYTHON_VERSION%%/site-packages/MA/MA_version.py
+lib/%%PYTHON_VERSION%%/site-packages/MA/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/activeattr.py
+lib/%%PYTHON_VERSION%%/site-packages/MA/activeattr.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Numeric.pth
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/ArrayPrinter.py
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/ArrayPrinter.pyc
@@ -34,15 +36,13 @@ lib/%%PYTHON_VERSION%%/site-packages/Numeric/lapack_lite.so
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/multiarray.so
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/ranlib.so
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/umath.so
-lib/%%PYTHON_VERSION%%/site-packages/Numeric/version.py
-lib/%%PYTHON_VERSION%%/site-packages/Numeric/version.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/numeric_version.py
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/numeric_version.pyc
 lib/%%PYTHON_VERSION%%/site-packages/RNG/RNG.so
 lib/%%PYTHON_VERSION%%/site-packages/RNG/Statistics.py
 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
diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index 44ebdf301246..5b3b92222e58 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -6,26 +6,34 @@
 #
 
 PORTNAME=	numeric
-PORTVERSION=	16.1.1
+PORTVERSION=	17.1.1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	numpy
-PKGNAMEPREFIX=	py-
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Numeric-${PORTVERSION}
 
 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}
 
 DOCDIR=		${PREFIX}/share/doc/py-numeric
 EXAMPLEDIR=	${PREFIX}/share/examples/py-numeric
 
-post-install:
+post-extract:
+.for dir in FFT LALITE RANLIB RNG
+	@(cd ${WRKSRC}/Packages/${dir}; \
+		${LN} -sf ../../../Include Include/Numeric)
+.endfor
+
+do-build:
+	@(cd ${WRKSRC}; ${PYTHON_CMD} setup_all.py build)
+
+do-install:
+	@(cd ${WRKSRC}; ${PYTHON_CMD} setup_all.py install)
+
 	@${MKDIR} ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${EXAMPLEDIR}
 	@${MKDIR} ${EXAMPLEDIR}/NumTut
diff --git a/math/py-numeric/distinfo b/math/py-numeric/distinfo
index 8aa4cf607e54..307be3c8efae 100644
--- a/math/py-numeric/distinfo
+++ b/math/py-numeric/distinfo
@@ -1 +1 @@
-MD5 (Numeric-16.1.1.tar.gz) = a20f535b1761a19fb791456cee37b812
+MD5 (Numeric-17.1.1.tar.gz) = c7066fc081820bbe8afcefbd03eaa0ee
diff --git a/math/py-numeric/files/patch-Makefile b/math/py-numeric/files/patch-Makefile
deleted file mode 100644
index b59f96b8a968..000000000000
--- a/math/py-numeric/files/patch-Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile	2000/08/31 17:23:34	1.1
-+++ Makefile	2000/08/31 17:35:38
-@@ -5,8 +5,20 @@
- 	@echo "Currently that is:"
- 	@which ${PYTHON_CMD}
- 
--all: MA RNG FFT
-+all:: main MA RNG FFT
-+
-+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)
-+
-+install:: main_install MA_install RNG_install FFT_install
-+
-+main_install:
-+	${PYTHON_CMD} setup.py install
-+
-+MA_install RNG_install FFT_install:
-+	(cd Packages/${@:S/_install//}; ${PYTHON_CMD} setup.py install)
-+
- 
diff --git a/math/py-numeric/files/patch-setup.py b/math/py-numeric/files/patch-setup.py
deleted file mode 100644
index e3da257d0019..000000000000
--- a/math/py-numeric/files/patch-setup.py
+++ /dev/null
@@ -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 --git a/math/py-numeric/pkg-plist b/math/py-numeric/pkg-plist
index 53d2618a7547..8f9e4fab95fa 100644
--- a/math/py-numeric/pkg-plist
+++ b/math/py-numeric/pkg-plist
@@ -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/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/FFT/fftpack.so
+lib/%%PYTHON_VERSION%%/site-packages/MA/MA_version.py
+lib/%%PYTHON_VERSION%%/site-packages/MA/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/activeattr.py
+lib/%%PYTHON_VERSION%%/site-packages/MA/activeattr.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Numeric.pth
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/ArrayPrinter.py
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/ArrayPrinter.pyc
@@ -34,15 +36,13 @@ lib/%%PYTHON_VERSION%%/site-packages/Numeric/lapack_lite.so
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/multiarray.so
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/ranlib.so
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/umath.so
-lib/%%PYTHON_VERSION%%/site-packages/Numeric/version.py
-lib/%%PYTHON_VERSION%%/site-packages/Numeric/version.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/numeric_version.py
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/numeric_version.pyc
 lib/%%PYTHON_VERSION%%/site-packages/RNG/RNG.so
 lib/%%PYTHON_VERSION%%/site-packages/RNG/Statistics.py
 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
diff --git a/math/py-numeric17/Makefile b/math/py-numeric17/Makefile
index 44ebdf301246..5b3b92222e58 100644
--- a/math/py-numeric17/Makefile
+++ b/math/py-numeric17/Makefile
@@ -6,26 +6,34 @@
 #
 
 PORTNAME=	numeric
-PORTVERSION=	16.1.1
+PORTVERSION=	17.1.1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	numpy
-PKGNAMEPREFIX=	py-
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Numeric-${PORTVERSION}
 
 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}
 
 DOCDIR=		${PREFIX}/share/doc/py-numeric
 EXAMPLEDIR=	${PREFIX}/share/examples/py-numeric
 
-post-install:
+post-extract:
+.for dir in FFT LALITE RANLIB RNG
+	@(cd ${WRKSRC}/Packages/${dir}; \
+		${LN} -sf ../../../Include Include/Numeric)
+.endfor
+
+do-build:
+	@(cd ${WRKSRC}; ${PYTHON_CMD} setup_all.py build)
+
+do-install:
+	@(cd ${WRKSRC}; ${PYTHON_CMD} setup_all.py install)
+
 	@${MKDIR} ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${EXAMPLEDIR}
 	@${MKDIR} ${EXAMPLEDIR}/NumTut
diff --git a/math/py-numeric17/distinfo b/math/py-numeric17/distinfo
index 8aa4cf607e54..307be3c8efae 100644
--- a/math/py-numeric17/distinfo
+++ b/math/py-numeric17/distinfo
@@ -1 +1 @@
-MD5 (Numeric-16.1.1.tar.gz) = a20f535b1761a19fb791456cee37b812
+MD5 (Numeric-17.1.1.tar.gz) = c7066fc081820bbe8afcefbd03eaa0ee
diff --git a/math/py-numeric17/files/patch-Makefile b/math/py-numeric17/files/patch-Makefile
deleted file mode 100644
index b59f96b8a968..000000000000
--- a/math/py-numeric17/files/patch-Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile	2000/08/31 17:23:34	1.1
-+++ Makefile	2000/08/31 17:35:38
-@@ -5,8 +5,20 @@
- 	@echo "Currently that is:"
- 	@which ${PYTHON_CMD}
- 
--all: MA RNG FFT
-+all:: main MA RNG FFT
-+
-+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)
-+
-+install:: main_install MA_install RNG_install FFT_install
-+
-+main_install:
-+	${PYTHON_CMD} setup.py install
-+
-+MA_install RNG_install FFT_install:
-+	(cd Packages/${@:S/_install//}; ${PYTHON_CMD} setup.py install)
-+
- 
diff --git a/math/py-numeric17/files/patch-setup.py b/math/py-numeric17/files/patch-setup.py
deleted file mode 100644
index e3da257d0019..000000000000
--- a/math/py-numeric17/files/patch-setup.py
+++ /dev/null
@@ -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 --git a/math/py-numeric17/pkg-plist b/math/py-numeric17/pkg-plist
index 53d2618a7547..8f9e4fab95fa 100644
--- a/math/py-numeric17/pkg-plist
+++ b/math/py-numeric17/pkg-plist
@@ -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/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/FFT/fftpack.so
+lib/%%PYTHON_VERSION%%/site-packages/MA/MA_version.py
+lib/%%PYTHON_VERSION%%/site-packages/MA/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/activeattr.py
+lib/%%PYTHON_VERSION%%/site-packages/MA/activeattr.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Numeric.pth
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/ArrayPrinter.py
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/ArrayPrinter.pyc
@@ -34,15 +36,13 @@ lib/%%PYTHON_VERSION%%/site-packages/Numeric/lapack_lite.so
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/multiarray.so
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/ranlib.so
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/umath.so
-lib/%%PYTHON_VERSION%%/site-packages/Numeric/version.py
-lib/%%PYTHON_VERSION%%/site-packages/Numeric/version.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/numeric_version.py
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/numeric_version.pyc
 lib/%%PYTHON_VERSION%%/site-packages/RNG/RNG.so
 lib/%%PYTHON_VERSION%%/site-packages/RNG/Statistics.py
 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