Upgrade to 23.8.

4 files changed, 36 insertions, 51 deletions

diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index 5f3b9ac5c4a2..44ac583fe653 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -6,12 +6,15 @@
 #
 
 PORTNAME=	numeric
-PORTVERSION=	23.7
+PORTVERSION=	23.8
 CATEGORIES=	math python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	numpy
+MASTER_SITES=	http://numeric.scipy.org/:doc \
+		${MASTER_SITE_SOURCEFORGE:S/$/:source/}
+MASTER_SITE_SUBDIR=	numpy/:source
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	Numeric-${PORTVERSION}
+DISTFILES=	Numeric-${PORTVERSION}${EXTRACT_SUFX}:source \
+		numpy.pdf:doc
+EXTRACT_ONLY=	Numeric-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	tg@FreeBSD.org
 COMMENT=	The Numeric Extension to Python
@@ -19,7 +22,8 @@ COMMENT=	The Numeric Extension to Python
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
-EXAMPLEDIR=	${PREFIX}/share/examples/py-numeric
+DOCSDIR=	${PREFIX}/share/doc/py-numeric
+EXAMPLESDIR=	${PREFIX}/share/examples/py-numeric
 
 .include <bsd.port.pre.mk>
 
@@ -30,10 +34,17 @@ pre-fetch:
 	@${FALSE}
 .endif
 
+post-extract:
+	@${CP} ${DISTDIR}/numpy.pdf ${WRKSRC}
+
 post-install:
-	@${MKDIR} ${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${EXAMPLEDIR}
-	@${MKDIR} ${EXAMPLEDIR}/NumTut
-	${INSTALL_DATA} ${WRKSRC}/Demo/NumTut/* ${EXAMPLEDIR}/NumTut
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR}/NumTut
+	${INSTALL_DATA} ${WRKSRC}/Demo/NumTut/* ${EXAMPLESDIR}/NumTut
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/numpy.pdf ${DOCSDIR}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/math/py-numeric/distinfo b/math/py-numeric/distinfo
index c48dd9240e68..90d21a8d8e98 100644
--- a/math/py-numeric/distinfo
+++ b/math/py-numeric/distinfo
@@ -1,2 +1,4 @@
-MD5 (Numeric-23.7.tar.gz) = 8054781c58ae9cf6fe498316860b5ea8
-SIZE (Numeric-23.7.tar.gz) = 725824
+MD5 (Numeric-23.8.tar.gz) = 0b3aa8453d4912368b980ddcff19f6d1
+SIZE (Numeric-23.8.tar.gz) = 725817
+MD5 (numpy.pdf) = 258b3758645568724ab1a3ead67db78a
+SIZE (numpy.pdf) = 1234555
diff --git a/math/py-numeric/files/patch-setup.py b/math/py-numeric/files/patch-setup.py
deleted file mode 100644
index 3aff4d580963..000000000000
--- a/math/py-numeric/files/patch-setup.py
+++ /dev/null
@@ -1,30 +0,0 @@
---- setup.py.orig	Wed Jan 12 12:46:37 2005
-+++ setup.py	Wed Jan 12 12:48:15 2005
-@@ -33,19 +33,19 @@
- 
- # delete all but the first one in this list if using your own LAPACK/BLAS
- sourcelist = [os.path.join('Src', 'lapack_litemodule.c'),
--              #os.path.join('Src', 'blas_lite.c'), 
--              #os.path.join('Src', 'f2c_lite.c'), 
--              #os.path.join('Src', 'zlapack_lite.c'),
--              #os.path.join('Src', 'dlapack_lite.c')
-+              os.path.join('Src', 'blas_lite.c'), 
-+              os.path.join('Src', 'f2c_lite.c'), 
-+              os.path.join('Src', 'zlapack_lite.c'),
-+              os.path.join('Src', 'dlapack_lite.c')
-              ]
- # set these to use your own BLAS;
- 
--library_dirs_list = ['/usr/lib/atlas']
--libraries_list = ['lapack', 'cblas', 'f77blas', 'atlas', 'g2c'] 
-+library_dirs_list = []
-+libraries_list = []
- 
- # set to true (1), if you also want BLAS optimized matrixmultiply/dot/innerproduct
--use_dotblas = 1 
--include_dirs = ['/usr/include/atlas']  
-+use_dotblas = 0 
-+include_dirs = []  
-                    # You may need to set this to find cblas.h
-                    #  e.g. on UNIX using ATLAS this should be ['/usr/include/atlas']
- extra_link_args = []
diff --git a/math/py-numeric/pkg-plist b/math/py-numeric/pkg-plist
index 110a85ae2c50..d821367a8d01 100644
--- a/math/py-numeric/pkg-plist
+++ b/math/py-numeric/pkg-plist
@@ -59,16 +59,18 @@
 %%PYTHON_SITELIBDIR%%/Numeric/numeric_version.pyo
 %%PYTHON_SITELIBDIR%%/Numeric/ranlib.so
 %%PYTHON_SITELIBDIR%%/Numeric/umath.so
-share/examples/py-numeric/NumTut/__init__.py
-share/examples/py-numeric/NumTut/greece.pik
-share/examples/py-numeric/NumTut/mkpic.py
-share/examples/py-numeric/NumTut/testview.py
-share/examples/py-numeric/NumTut/view.py
-share/examples/py-numeric/life.py
-share/examples/py-numeric/mandelbrot.py
-share/examples/py-numeric/sieve.py
-@dirrm share/examples/py-numeric/NumTut
-@dirrm share/examples/py-numeric
+%%DOCSDIR%%/numpy.pdf
+%%EXAMPLESDIR%%/NumTut/__init__.py
+%%EXAMPLESDIR%%/NumTut/greece.pik
+%%EXAMPLESDIR%%/NumTut/mkpic.py
+%%EXAMPLESDIR%%/NumTut/testview.py
+%%EXAMPLESDIR%%/NumTut/view.py
+%%EXAMPLESDIR%%/life.py
+%%EXAMPLESDIR%%/mandelbrot.py
+%%EXAMPLESDIR%%/sieve.py
+@dirrm %%EXAMPLESDIR%%/NumTut
+@dirrm %%EXAMPLESDIR%%
+@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/Numeric/RNG
 @dirrm %%PYTHON_SITELIBDIR%%/Numeric/MA
 @dirrm %%PYTHON_SITELIBDIR%%/Numeric/FFT