Upgrade to 1.6.

9 files changed, 42 insertions, 42 deletions

diff --git a/math/numpy/Makefile b/math/numpy/Makefile
index 27b3656..605f2a8 100644
--- a/math/numpy/Makefile
+++ b/math/numpy/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	numpy
-# Version required:	1.4
+# Version required:	1.6
 # Date created:		20 April 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.10 1998/06/30 07:43:01 tg Exp $
+# $Id: Makefile,v 1.11 1998/09/01 07:03:47 tg Exp $
 #
 
-DISTNAME=	LLNLPython5
-PKGNAME=	py-numeric-1.4
+DISTNAME=	LLNLPython6
+PKGNAME=	py-numeric-1.6
 CATEGORIES=	math python
 MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/python/
 EXTRACT_SUFX=	.tgz
@@ -17,13 +17,13 @@ MAINTAINER=	tg@FreeBSD.ORG
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
-WRKSRC=		${WRKDIR}/LLNLPython5/Numerical
+WRKSRC=		${WRKDIR}/${DISTNAME}/Numerical
 CONFIGURE_ENV=	PREFIX=${PREFIX}
 ALL_TARGET=	sharedmods
 MAKE_FLAGS+=	'OPT=${CFLAGS}'
 
 PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
-NUMPYDIR=	${PREFIX}/lib/python1.5/site-packages
+NUMPYDIR=	${PYTHONSCRIPTDIR}/site-packages
 DOCDIR=		${PREFIX}/share/doc/NumPy
 EXAMPLEDIR=	${PREFIX}/share/examples/NumPy
 
diff --git a/math/numpy/distinfo b/math/numpy/distinfo
index 3771e0a..f5e8258 100644
--- a/math/numpy/distinfo
+++ b/math/numpy/distinfo
@@ -1 +1 @@
-MD5 (LLNLPython5.tgz) = 8f20cceac423124ea2007c925f2210d6
+MD5 (LLNLPython6.tgz) = ac69e6a14c01b6bbd095c66b61379c7a
diff --git a/math/numpy/pkg-plist b/math/numpy/pkg-plist
index bf409f3..de74aae 100644
--- a/math/numpy/pkg-plist
+++ b/math/numpy/pkg-plist
@@ -1,12 +1,5 @@
 include/python1.5/arrayobject.h
 include/python1.5/ufuncobject.h
-lib/python1.5/site-packages/_numpymodule.so
-lib/python1.5/site-packages/fast_umathmodule.so
-lib/python1.5/site-packages/fftpack.so
-lib/python1.5/site-packages/lapack_lite.so
-lib/python1.5/site-packages/multiarraymodule.so
-lib/python1.5/site-packages/ranlib.so
-lib/python1.5/site-packages/umathmodule.so
 lib/python1.5/site-packages/ArrayPrinter.py
 lib/python1.5/site-packages/ArrayPrinter.pyc
 lib/python1.5/site-packages/ArrayPrinter.pyo
@@ -34,6 +27,13 @@ lib/python1.5/site-packages/RandomArray.pyo
 lib/python1.5/site-packages/UserArray.py
 lib/python1.5/site-packages/UserArray.pyc
 lib/python1.5/site-packages/UserArray.pyo
+lib/python1.5/site-packages/_numpymodule.so
+lib/python1.5/site-packages/fast_umathmodule.so
+lib/python1.5/site-packages/fftpack.so
+lib/python1.5/site-packages/lapack_lite.so
+lib/python1.5/site-packages/multiarraymodule.so
+lib/python1.5/site-packages/ranlib.so
+lib/python1.5/site-packages/umathmodule.so
 @unexec rmdir %B 2>/dev/null || true
 share/doc/NumPy/doc.html
 share/doc/NumPy/home.html
diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index 27b3656..605f2a8 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	numpy
-# Version required:	1.4
+# Version required:	1.6
 # Date created:		20 April 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.10 1998/06/30 07:43:01 tg Exp $
+# $Id: Makefile,v 1.11 1998/09/01 07:03:47 tg Exp $
 #
 
-DISTNAME=	LLNLPython5
-PKGNAME=	py-numeric-1.4
+DISTNAME=	LLNLPython6
+PKGNAME=	py-numeric-1.6
 CATEGORIES=	math python
 MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/python/
 EXTRACT_SUFX=	.tgz
@@ -17,13 +17,13 @@ MAINTAINER=	tg@FreeBSD.ORG
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
-WRKSRC=		${WRKDIR}/LLNLPython5/Numerical
+WRKSRC=		${WRKDIR}/${DISTNAME}/Numerical
 CONFIGURE_ENV=	PREFIX=${PREFIX}
 ALL_TARGET=	sharedmods
 MAKE_FLAGS+=	'OPT=${CFLAGS}'
 
 PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
-NUMPYDIR=	${PREFIX}/lib/python1.5/site-packages
+NUMPYDIR=	${PYTHONSCRIPTDIR}/site-packages
 DOCDIR=		${PREFIX}/share/doc/NumPy
 EXAMPLEDIR=	${PREFIX}/share/examples/NumPy
 
diff --git a/math/py-numeric/distinfo b/math/py-numeric/distinfo
index 3771e0a..f5e8258 100644
--- a/math/py-numeric/distinfo
+++ b/math/py-numeric/distinfo
@@ -1 +1 @@
-MD5 (LLNLPython5.tgz) = 8f20cceac423124ea2007c925f2210d6
+MD5 (LLNLPython6.tgz) = ac69e6a14c01b6bbd095c66b61379c7a
diff --git a/math/py-numeric/pkg-plist b/math/py-numeric/pkg-plist
index bf409f3..de74aae 100644
--- a/math/py-numeric/pkg-plist
+++ b/math/py-numeric/pkg-plist
@@ -1,12 +1,5 @@
 include/python1.5/arrayobject.h
 include/python1.5/ufuncobject.h
-lib/python1.5/site-packages/_numpymodule.so
-lib/python1.5/site-packages/fast_umathmodule.so
-lib/python1.5/site-packages/fftpack.so
-lib/python1.5/site-packages/lapack_lite.so
-lib/python1.5/site-packages/multiarraymodule.so
-lib/python1.5/site-packages/ranlib.so
-lib/python1.5/site-packages/umathmodule.so
 lib/python1.5/site-packages/ArrayPrinter.py
 lib/python1.5/site-packages/ArrayPrinter.pyc
 lib/python1.5/site-packages/ArrayPrinter.pyo
@@ -34,6 +27,13 @@ lib/python1.5/site-packages/RandomArray.pyo
 lib/python1.5/site-packages/UserArray.py
 lib/python1.5/site-packages/UserArray.pyc
 lib/python1.5/site-packages/UserArray.pyo
+lib/python1.5/site-packages/_numpymodule.so
+lib/python1.5/site-packages/fast_umathmodule.so
+lib/python1.5/site-packages/fftpack.so
+lib/python1.5/site-packages/lapack_lite.so
+lib/python1.5/site-packages/multiarraymodule.so
+lib/python1.5/site-packages/ranlib.so
+lib/python1.5/site-packages/umathmodule.so
 @unexec rmdir %B 2>/dev/null || true
 share/doc/NumPy/doc.html
 share/doc/NumPy/home.html
diff --git a/math/py-numeric17/Makefile b/math/py-numeric17/Makefile
index 27b3656..605f2a8 100644
--- a/math/py-numeric17/Makefile
+++ b/math/py-numeric17/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	numpy
-# Version required:	1.4
+# Version required:	1.6
 # Date created:		20 April 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.10 1998/06/30 07:43:01 tg Exp $
+# $Id: Makefile,v 1.11 1998/09/01 07:03:47 tg Exp $
 #
 
-DISTNAME=	LLNLPython5
-PKGNAME=	py-numeric-1.4
+DISTNAME=	LLNLPython6
+PKGNAME=	py-numeric-1.6
 CATEGORIES=	math python
 MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/python/
 EXTRACT_SUFX=	.tgz
@@ -17,13 +17,13 @@ MAINTAINER=	tg@FreeBSD.ORG
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
-WRKSRC=		${WRKDIR}/LLNLPython5/Numerical
+WRKSRC=		${WRKDIR}/${DISTNAME}/Numerical
 CONFIGURE_ENV=	PREFIX=${PREFIX}
 ALL_TARGET=	sharedmods
 MAKE_FLAGS+=	'OPT=${CFLAGS}'
 
 PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
-NUMPYDIR=	${PREFIX}/lib/python1.5/site-packages
+NUMPYDIR=	${PYTHONSCRIPTDIR}/site-packages
 DOCDIR=		${PREFIX}/share/doc/NumPy
 EXAMPLEDIR=	${PREFIX}/share/examples/NumPy
 
diff --git a/math/py-numeric17/distinfo b/math/py-numeric17/distinfo
index 3771e0a..f5e8258 100644
--- a/math/py-numeric17/distinfo
+++ b/math/py-numeric17/distinfo
@@ -1 +1 @@
-MD5 (LLNLPython5.tgz) = 8f20cceac423124ea2007c925f2210d6
+MD5 (LLNLPython6.tgz) = ac69e6a14c01b6bbd095c66b61379c7a
diff --git a/math/py-numeric17/pkg-plist b/math/py-numeric17/pkg-plist
index bf409f3..de74aae 100644
--- a/math/py-numeric17/pkg-plist
+++ b/math/py-numeric17/pkg-plist
@@ -1,12 +1,5 @@
 include/python1.5/arrayobject.h
 include/python1.5/ufuncobject.h
-lib/python1.5/site-packages/_numpymodule.so
-lib/python1.5/site-packages/fast_umathmodule.so
-lib/python1.5/site-packages/fftpack.so
-lib/python1.5/site-packages/lapack_lite.so
-lib/python1.5/site-packages/multiarraymodule.so
-lib/python1.5/site-packages/ranlib.so
-lib/python1.5/site-packages/umathmodule.so
 lib/python1.5/site-packages/ArrayPrinter.py
 lib/python1.5/site-packages/ArrayPrinter.pyc
 lib/python1.5/site-packages/ArrayPrinter.pyo
@@ -34,6 +27,13 @@ lib/python1.5/site-packages/RandomArray.pyo
 lib/python1.5/site-packages/UserArray.py
 lib/python1.5/site-packages/UserArray.pyc
 lib/python1.5/site-packages/UserArray.pyo
+lib/python1.5/site-packages/_numpymodule.so
+lib/python1.5/site-packages/fast_umathmodule.so
+lib/python1.5/site-packages/fftpack.so
+lib/python1.5/site-packages/lapack_lite.so
+lib/python1.5/site-packages/multiarraymodule.so
+lib/python1.5/site-packages/ranlib.so
+lib/python1.5/site-packages/umathmodule.so
 @unexec rmdir %B 2>/dev/null || true
 share/doc/NumPy/doc.html
 share/doc/NumPy/home.html