update to 2.4.5

2.4.3 --> 2.4.4:
----------------
Bug fixes:
NetCDF error messages should now be correct. No more "unknown errors"!

2.4 --> 2.4.1:
--------------
Bug fixes:
- Scientific.MPI did not contain the _C_API object needed by C extension
  modules that call MPI.
- The arguments to the receiveString method are now optional, as documented.

2.3.3 --> 2.4:
--------------
Bug fixes:
- Memory function calculation in Scientific.Signals.Models
  returned a wrong value for the first point.
- Some indexing problems in Scientific.IO.NetCDF were fixed;
  none of them caused wrong results, just unjustified exceptions.

2.3.2 --> 2.3.3:
----------------
Bug fixes:
- The method divide() assumed the wrong coefficient order.
New features:
- Module Scientific.Signals.Models
- Class Scientific.Statistics.Histogram.WeightedHistogram

2.3.1 --> 2.3.2:
----------------
Incompatible changes:
- Specification of routines in Scientific.BSP changed.

2.2 --> 2.3.1
-------------
New features:
- New modules Scientific.BSP and Scientific.BSP.IO

6 files changed, 76 insertions, 45 deletions

diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile
index 8477b0751af..6aa99ded652 100644
--- a/math/py-Scientific/Makefile
+++ b/math/py-Scientific/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 21:48:02 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/18 23:57:50 recht Exp $
 
-DISTNAME=	ScientificPython-2.2
-PKGNAME=	${PYPKGPREFIX}-Scientific-2.2
+DISTNAME=	ScientificPython-2.4.5
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Python//}
 CATEGORIES=	math
-MASTER_SITES=	http://starship.python.net/crew/hinsen/ \
-		http://dirac.cnrs-orleans.fr/programs/
+MASTER_SITES=	http://starship.python.net/crew/hinsen/ScientificPython/ \
+		http://dirac.cnrs-orleans.fr/programs/ScientificPython/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://starship.python.net/crew/hinsen/scientific.html
@@ -15,27 +15,20 @@ CONFLICTS+=	py-Scientific-*
 DEPENDS+=	mpich>=1.2.1:../../parallel/mpi-ch
 BUILDLINK_DEPENDS.python20=	python20>=2.0.1nb1
 BUILDLINK_DEPENDS.python21=	python21>=2.1.1nb1
-PYTHON_VERSIONS_ACCEPTED=	20 21 # doesn't compile for 22
+#PYTHON_VERSIONS_ACCEPTED=	20 21 # doesn't compile for 22
 
 USE_BUILDLINK2=	yes
 PYDISTUTILSPKG=	yes
 PYBINMODULE=	yes
 
-NETCDFPREFIX_DEFAULT=${LOCALBASE}
-MPICHPREFIX_DEFAULT=${LOCALBASE}
+MAKE_ENV+=	NETCDF_PREFIX=${LOCALBASE}
+
 EVAL_PREFIX+=	NETCDFPREFIX=netcdf MPICHPREFIX=mpich
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
-do-configure:
-	${SED} -e "s|@NETCDFPREFIX@|${NETCDFPREFIX}|g"			\
-	       -e "s|@MPICHPREFIX@|${MPICHPREFIX}|g"			\
-	${WRKSRC}/setup.py > ${WRKSRC}/setup.py.tmp
-	${MV} -f ${WRKSRC}/setup.py.tmp ${WRKSRC}/setup.py
-	${SED} -e "s|@MPICHPREFIX@|${MPICHPREFIX}|g"			\
-	${FILESDIR}/Setup.in > ${WRKSRC}/Src/MPI/Setup.in
-
 post-build:
-	cd ${WRKSRC}/Src/MPI && ${PYTHONBIN} compile.py
+	@(cd ${WRKSRC}/Src/MPI && ${SETENV} CFLAGS="${CFLAGS}" \
+	  LDFLAGS="${LDFLAGS}" ${PYTHONBIN} compile.py)
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Src/MPI/mpipython \
@@ -44,4 +37,5 @@ post-install:
 .include "../../devel/netcdf/buildlink2.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-Numeric/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-Scientific/PLIST b/math/py-Scientific/PLIST
index 9fd59c9f53d..b627ece1e45 100644
--- a/math/py-Scientific/PLIST
+++ b/math/py-Scientific/PLIST
@@ -1,8 +1,22 @@
-@comment $NetBSD: PLIST,v 1.4 2003/09/14 16:43:51 recht Exp $
-bin/mpipython2.0
+@comment $NetBSD: PLIST,v 1.5 2004/01/18 23:57:50 recht Exp $
+bin/mpipython${PYVERSSUFFIX}
+${PYINC}/Scientific/PyBSP_API.h
 ${PYINC}/Scientific/PyMPI_API.h
+${PYINC}/Scientific/bspmodule.h
 ${PYINC}/Scientific/mpimodule.h
 ${PYINC}/Scientific/netcdfmodule.h
+${PYSITELIB}/Scientific/BSP/Console.py
+${PYSITELIB}/Scientific/BSP/Console.pyc
+${PYSITELIB}/Scientific/BSP/Console.pyo
+${PYSITELIB}/Scientific/BSP/IO.py
+${PYSITELIB}/Scientific/BSP/IO.pyc
+${PYSITELIB}/Scientific/BSP/IO.pyo
+${PYSITELIB}/Scientific/BSP/__init__.py
+${PYSITELIB}/Scientific/BSP/__init__.pyc
+${PYSITELIB}/Scientific/BSP/__init__.pyo
+${PYSITELIB}/Scientific/BSP/core.py
+${PYSITELIB}/Scientific/BSP/core.pyc
+${PYSITELIB}/Scientific/BSP/core.pyo
 ${PYSITELIB}/Scientific/DictWithDefault.py
 ${PYSITELIB}/Scientific/DictWithDefault.pyc
 ${PYSITELIB}/Scientific/DictWithDefault.pyo
@@ -24,6 +38,9 @@ ${PYSITELIB}/Scientific/Functions/LeastSquares.pyo
 ${PYSITELIB}/Scientific/Functions/Polynomial.py
 ${PYSITELIB}/Scientific/Functions/Polynomial.pyc
 ${PYSITELIB}/Scientific/Functions/Polynomial.pyo
+${PYSITELIB}/Scientific/Functions/Rational.py
+${PYSITELIB}/Scientific/Functions/Rational.pyc
+${PYSITELIB}/Scientific/Functions/Rational.pyo
 ${PYSITELIB}/Scientific/Functions/Romberg.py
 ${PYSITELIB}/Scientific/Functions/Romberg.pyc
 ${PYSITELIB}/Scientific/Functions/Romberg.pyo
@@ -81,6 +98,9 @@ ${PYSITELIB}/Scientific/MPI/IO.pyo
 ${PYSITELIB}/Scientific/MPI/__init__.py
 ${PYSITELIB}/Scientific/MPI/__init__.pyc
 ${PYSITELIB}/Scientific/MPI/__init__.pyo
+${PYSITELIB}/Scientific/MPI/core.py
+${PYSITELIB}/Scientific/MPI/core.pyc
+${PYSITELIB}/Scientific/MPI/core.pyo
 ${PYSITELIB}/Scientific/Mathematica.py
 ${PYSITELIB}/Scientific/Mathematica.pyc
 ${PYSITELIB}/Scientific/Mathematica.pyo
@@ -96,6 +116,12 @@ ${PYSITELIB}/Scientific/Physics/Potential.pyo
 ${PYSITELIB}/Scientific/Physics/__init__.py
 ${PYSITELIB}/Scientific/Physics/__init__.pyc
 ${PYSITELIB}/Scientific/Physics/__init__.pyo
+${PYSITELIB}/Scientific/Signals/Models.py
+${PYSITELIB}/Scientific/Signals/Models.pyc
+${PYSITELIB}/Scientific/Signals/Models.pyo
+${PYSITELIB}/Scientific/Signals/__init__.py
+${PYSITELIB}/Scientific/Signals/__init__.pyc
+${PYSITELIB}/Scientific/Signals/__init__.pyo
 ${PYSITELIB}/Scientific/Statistics/Histogram.py
 ${PYSITELIB}/Scientific/Statistics/Histogram.pyc
 ${PYSITELIB}/Scientific/Statistics/Histogram.pyo
@@ -150,10 +176,12 @@ ${PYSITELIB}/Scientific/${LOWER_OPSYS}1/Scientific_netcdf.so
 @dirrm ${PYSITELIB}/Scientific/TkWidgets
 @dirrm ${PYSITELIB}/Scientific/Threading
 @dirrm ${PYSITELIB}/Scientific/Statistics
+@dirrm ${PYSITELIB}/Scientific/Signals
 @dirrm ${PYSITELIB}/Scientific/Physics
 @dirrm ${PYSITELIB}/Scientific/MPI
 @dirrm ${PYSITELIB}/Scientific/IO
 @dirrm ${PYSITELIB}/Scientific/Geometry
 @dirrm ${PYSITELIB}/Scientific/Functions
+@dirrm ${PYSITELIB}/Scientific/BSP
 @dirrm ${PYSITELIB}/Scientific
 @dirrm ${PYINC}/Scientific
diff --git a/math/py-Scientific/distinfo b/math/py-Scientific/distinfo
index dce72ec9911..08230fbf016 100644
--- a/math/py-Scientific/distinfo
+++ b/math/py-Scientific/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/05/10 17:03:28 drochner Exp $
+$NetBSD: distinfo,v 1.4 2004/01/18 23:57:50 recht Exp $
 
-SHA1 (ScientificPython-2.2.tar.gz) = f1fcf1ef1a54a1fd84b1e5df569dac13a1648225
-Size (ScientificPython-2.2.tar.gz) = 335561 bytes
-SHA1 (patch-aa) = 1e4efc4a5393d11f7bd30fba229a541dde199b80
+SHA1 (ScientificPython-2.4.5.tar.gz) = 452b04a20dd065fd9ea01092ae2e1e726406d2be
+Size (ScientificPython-2.4.5.tar.gz) = 487379 bytes
+SHA1 (patch-aa) = 651049ac032c3b0a232ec052e80e2cdb1134b4e0
+SHA1 (patch-ab) = b682b71ecfbe0c815203f74bf19ae5870d113f8f
diff --git a/math/py-Scientific/files/Setup.in b/math/py-Scientific/files/Setup.in
deleted file mode 100644
index fd34be958a4..00000000000
--- a/math/py-Scientific/files/Setup.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# Uncomment the following line and change it to reflect the
-# requirements of your MPI installation; the line below is for MPICH
-# installed in a standard location searched by the compiler and
-# linker.
-
-# NOTE: The MPI compiler is specified at the top of compile.py .
-
-Scientific_mpi -I../../Include Scientific_mpi.c -L@MPICHPREFIX@/lib -lmpich
diff --git a/math/py-Scientific/patches/patch-aa b/math/py-Scientific/patches/patch-aa
index 85d7b66d9fd..846e9e68b7f 100644
--- a/math/py-Scientific/patches/patch-aa
+++ b/math/py-Scientific/patches/patch-aa
@@ -1,21 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2001/05/10 17:03:28 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2004/01/18 23:57:50 recht Exp $
 
---- setup.py.orig	Thu May 10 18:29:09 2001
-+++ setup.py	Thu May 10 18:30:26 2001
-@@ -7,7 +7,7 @@
- 
- # If your netCDF installation is in a non-standard place, set the following
- # variable to the base directory.
--netcdf_prefix = None
-+netcdf_prefix = '@NETCDFPREFIX@'
- 
- 
- if netcdf_prefix is None:
-@@ -28,6 +28,7 @@
+--- setup.py.orig	2004-01-15 11:53:49.000000000 +0100
++++ setup.py	2004-01-18 17:06:15.000000000 +0100
+@@ -32,6 +32,7 @@
                               ['Src/Scientific_netcdf.c'],
                               include_dirs=['Include', netcdf_include],
                               library_dirs=[netcdf_lib],
 +                             runtime_library_dirs=[netcdf_lib],
                               libraries = ['netcdf'])]
  
- class modified_install_headers(install_headers):
+ packages = ['Scientific', 'Scientific.Functions',
diff --git a/math/py-Scientific/patches/patch-ab b/math/py-Scientific/patches/patch-ab
new file mode 100644
index 00000000000..ba33668fbc2
--- /dev/null
+++ b/math/py-Scientific/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.1 2004/01/18 23:57:50 recht Exp $
+
+--- Src/MPI/compile.py.orig	2003-12-19 20:33:31.000000000 +0100
++++ Src/MPI/compile.py	2004-01-18 21:57:52.000000000 +0100
+@@ -12,10 +12,19 @@
+ mpicompiler = 'mpicc'
+ sources='mpipython.c Scientific_mpi.c'
+ 
++ldflags=""
++if os.environ.has_key('LDFLAGS'):
++    ldflags = os.environ['LDFLAGS']
+ 
+-cmd = '%s %s -o mpipython -I%s %s -L%s -lpython%s %s %s' % \
++cflags=""
++if os.environ.has_key('CFLAGS'):
++    cflags = os.environ['CFLAGS']
++
++cmd = '%s %s %s -o mpipython -I../../Include %s -I%s %s -L%s -lmpich -lpython%s %s %s' % \
+     (mpicompiler, 
++    ldflags,
+     cfgDict['LINKFORSHARED'],
++    cflags,
+     cfgDict['INCLUDEPY'],
+     sources,
+     cfgDict['LIBPL'],