Update to 2.8.1. Switch to distutils.mk.

2.8 --> 2.8.1
-------------

Improvements:

- The installation procedure was updated to work with recent
  NumPy versions and in a wider range of environments.

4 files changed, 14 insertions, 16 deletions

diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile
index d76ca78a7ed..dabe26879e3 100644
--- a/math/py-Scientific/Makefile
+++ b/math/py-Scientific/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2014/02/12 23:18:11 tron Exp $
+# $NetBSD: Makefile,v 1.37 2014/04/16 14:51:24 wiz Exp $
 
-DISTNAME=	ScientificPython-2.8
+DISTNAME=	ScientificPython-2.8.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Python//}
-PKGREVISION=	2
 CATEGORIES=	math python
-MASTER_SITES=	http://sourcesup.cru.fr/frs/download.php/2309/
+MASTER_SITES=	http://sourcesup.cru.fr/frs/download.php/4411/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://dirac.cnrs-orleans.fr/ScientificPython/
@@ -12,13 +11,11 @@ COMMENT=	Python modules for scientific computing
 
 CONFLICTS+=	py-Scientific-[0-9]*
 
-PYDISTUTILSPKG=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.8
-
 MAKE_ENV+=	NETCDF_PREFIX=${BUILDLINK_PREFIX.netcdf}
 
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 PLIST_SUBST+=	OSVER=${OS_VERSION:C/^(.).*/\1/}
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.8.1
 
 INSTALLATION_DIRS=	bin
 
@@ -31,7 +28,7 @@ post-install:
 		${DESTDIR}${PREFIX}/bin/mpipython${PYVERSSUFFIX}
 
 .include "../../devel/netcdf/buildlink3.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../parallel/mpi-ch/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/math/py-Scientific/PLIST b/math/py-Scientific/PLIST
index b7c1e36ab36..ddad4a8b4db 100644
--- a/math/py-Scientific/PLIST
+++ b/math/py-Scientific/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2010/05/29 03:18:54 obache Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/04/16 14:51:24 wiz Exp $
 bin/bsp_virtual
 bin/mpipython${PYVERSSUFFIX}
 bin/task_manager
@@ -9,6 +9,7 @@ ${PYINC}/Scientific/bspmodule.h
 ${PYINC}/Scientific/mpimodule.h
 ${PYINC}/Scientific/netcdf.h
 ${PYINC}/Scientific/netcdfmodule.h
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/Scientific/BSP/Console.py
 ${PYSITELIB}/Scientific/BSP/Console.pyc
 ${PYSITELIB}/Scientific/BSP/Console.pyo
diff --git a/math/py-Scientific/distinfo b/math/py-Scientific/distinfo
index 7f003d86ac8..e71412ff282 100644
--- a/math/py-Scientific/distinfo
+++ b/math/py-Scientific/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2010/05/29 03:18:54 obache Exp $
+$NetBSD: distinfo,v 1.7 2014/04/16 14:51:24 wiz Exp $
 
-SHA1 (ScientificPython-2.8.tar.gz) = c0847eac6359d70b0e4687c5c65af49b3986e55b
-RMD160 (ScientificPython-2.8.tar.gz) = 0501829586253fe3986458529c436b6d93e6667f
-Size (ScientificPython-2.8.tar.gz) = 559613 bytes
+SHA1 (ScientificPython-2.8.1.tar.gz) = 40842ffec473371ba3c9710ba609844007616388
+RMD160 (ScientificPython-2.8.1.tar.gz) = 53131b769acafd0ef5e6b3e5f022e40ffa2b4663
+Size (ScientificPython-2.8.1.tar.gz) = 559819 bytes
 SHA1 (patch-aa) = c7f353e9264749e3afff633fb28623f053b39f1c
-SHA1 (patch-ab) = 0063518cd630597e271ba0b4934ae6b5ed116785
+SHA1 (patch-ab) = 5a9e4a8c744b02a10cb21e1f85b7cefa00109bef
diff --git a/math/py-Scientific/patches/patch-ab b/math/py-Scientific/patches/patch-ab
index b89b208ed56..464bc21371a 100644
--- a/math/py-Scientific/patches/patch-ab
+++ b/math/py-Scientific/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2010/05/29 03:18:54 obache Exp $
+$NetBSD: patch-ab,v 1.3 2014/04/16 14:51:24 wiz Exp $
 
 * Fixed NumPy as numeric package for user-destdir installation.
 * Honor CFLAGS and LDFLAGS.
@@ -36,7 +36,7 @@ $NetBSD: patch-ab,v 1.2 2010/05/29 03:18:54 obache Exp $
      linkforshared = ' '.join(items)
  
 -cmd = '%s %s -o mpipython -I%s %s %s -L%s -lpython%s %s %s' % \
-+cmd = '%s %s %s -o mpipython -I../../Include %s -I%s %s %s -L%s -lmpich -lpython%s %s %s' % \
++cmd = '%s %s %s -o mpipython -I../../Include %s -I%s %s %s -L%s -lmpich -lopa -lmpl -lpython%s %s %s' % \
      (mpicompiler, 
 +     ldflags,
       linkforshared,