Wed Apr 16 14:51:24 2014 UTC ()
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.


(wiz)
diff -r1.36 -r1.37 pkgsrc/math/py-Scientific/Makefile
diff -r1.8 -r1.9 pkgsrc/math/py-Scientific/PLIST
diff -r1.6 -r1.7 pkgsrc/math/py-Scientific/distinfo
diff -r1.2 -r1.3 pkgsrc/math/py-Scientific/patches/patch-ab
cvs diff -r1.36 -r1.37 pkgsrc/math/py-Scientific/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-Scientific/Attic/Makefile 2014/02/12 23:18:11 1.36
+++ pkgsrc/math/py-Scientific/Attic/Makefile 2014/04/16 14:51:24 1.37
@@ -1,38 +1,35 @@ @@ -1,38 +1,35 @@
1# $NetBSD: Makefile,v 1.36 2014/02/12 23:18:11 tron Exp $ 1# $NetBSD: Makefile,v 1.37 2014/04/16 14:51:24 wiz Exp $
2 2
3DISTNAME= ScientificPython-2.8 3DISTNAME= ScientificPython-2.8.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Python//} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Python//}
5PKGREVISION= 2 
6CATEGORIES= math python 5CATEGORIES= math python
7MASTER_SITES= http://sourcesup.cru.fr/frs/download.php/2309/ 6MASTER_SITES= http://sourcesup.cru.fr/frs/download.php/4411/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://dirac.cnrs-orleans.fr/ScientificPython/ 9HOMEPAGE= http://dirac.cnrs-orleans.fr/ScientificPython/
11COMMENT= Python modules for scientific computing 10COMMENT= Python modules for scientific computing
12 11
13CONFLICTS+= py-Scientific-[0-9]* 12CONFLICTS+= py-Scientific-[0-9]*
14 13
15PYDISTUTILSPKG= yes 
16PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.8 
17 
18MAKE_ENV+= NETCDF_PREFIX=${BUILDLINK_PREFIX.netcdf} 14MAKE_ENV+= NETCDF_PREFIX=${BUILDLINK_PREFIX.netcdf}
19 15
20PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} 16PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
21PLIST_SUBST+= OSVER=${OS_VERSION:C/^(.).*/\1/} 17PLIST_SUBST+= OSVER=${OS_VERSION:C/^(.).*/\1/}
 18PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.8.1
22 19
23INSTALLATION_DIRS= bin 20INSTALLATION_DIRS= bin
24 21
25post-build: 22post-build:
26 ${RUN} cd ${WRKSRC}/Src/MPI && ${SETENV} CFLAGS=${CFLAGS:Q} \ 23 ${RUN} cd ${WRKSRC}/Src/MPI && ${SETENV} CFLAGS=${CFLAGS:Q} \
27 LDFLAGS="${LDFLAGS} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" ${PYTHONBIN} compile.py 24 LDFLAGS="${LDFLAGS} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" ${PYTHONBIN} compile.py
28 25
29post-install: 26post-install:
30 ${INSTALL_PROGRAM} ${WRKSRC}/Src/MPI/mpipython \ 27 ${INSTALL_PROGRAM} ${WRKSRC}/Src/MPI/mpipython \
31 ${DESTDIR}${PREFIX}/bin/mpipython${PYVERSSUFFIX} 28 ${DESTDIR}${PREFIX}/bin/mpipython${PYVERSSUFFIX}
32 29
33.include "../../devel/netcdf/buildlink3.mk" 30.include "../../devel/netcdf/buildlink3.mk"
34.include "../../lang/python/extension.mk" 31.include "../../lang/python/distutils.mk"
35.include "../../math/py-numpy/buildlink3.mk" 32.include "../../math/py-numpy/buildlink3.mk"
36.include "../../parallel/mpi-ch/buildlink3.mk" 33.include "../../parallel/mpi-ch/buildlink3.mk"
37.include "../../mk/pthread.buildlink3.mk" 34.include "../../mk/pthread.buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/math/py-Scientific/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/math/py-Scientific/Attic/PLIST 2010/05/29 03:18:54 1.8
+++ pkgsrc/math/py-Scientific/Attic/PLIST 2014/04/16 14:51:24 1.9
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1@comment $NetBSD: PLIST,v 1.8 2010/05/29 03:18:54 obache Exp $ 1@comment $NetBSD: PLIST,v 1.9 2014/04/16 14:51:24 wiz Exp $
2bin/bsp_virtual 2bin/bsp_virtual
3bin/mpipython${PYVERSSUFFIX} 3bin/mpipython${PYVERSSUFFIX}
4bin/task_manager 4bin/task_manager
5${PYINC}/Scientific/PyBSP_API.h 5${PYINC}/Scientific/PyBSP_API.h
6${PYINC}/Scientific/PyMPI_API.h 6${PYINC}/Scientific/PyMPI_API.h
7${PYINC}/Scientific/arrayobject.h 7${PYINC}/Scientific/arrayobject.h
8${PYINC}/Scientific/bspmodule.h 8${PYINC}/Scientific/bspmodule.h
9${PYINC}/Scientific/mpimodule.h 9${PYINC}/Scientific/mpimodule.h
10${PYINC}/Scientific/netcdf.h 10${PYINC}/Scientific/netcdf.h
11${PYINC}/Scientific/netcdfmodule.h 11${PYINC}/Scientific/netcdfmodule.h
 12${PYSITELIB}/${EGG_FILE}
12${PYSITELIB}/Scientific/BSP/Console.py 13${PYSITELIB}/Scientific/BSP/Console.py
13${PYSITELIB}/Scientific/BSP/Console.pyc 14${PYSITELIB}/Scientific/BSP/Console.pyc
14${PYSITELIB}/Scientific/BSP/Console.pyo 15${PYSITELIB}/Scientific/BSP/Console.pyo
15${PYSITELIB}/Scientific/BSP/IO.py 16${PYSITELIB}/Scientific/BSP/IO.py
16${PYSITELIB}/Scientific/BSP/IO.pyc 17${PYSITELIB}/Scientific/BSP/IO.pyc
17${PYSITELIB}/Scientific/BSP/IO.pyo 18${PYSITELIB}/Scientific/BSP/IO.pyo
18${PYSITELIB}/Scientific/BSP/RemoteObjects.py 19${PYSITELIB}/Scientific/BSP/RemoteObjects.py
19${PYSITELIB}/Scientific/BSP/RemoteObjects.pyc 20${PYSITELIB}/Scientific/BSP/RemoteObjects.pyc
20${PYSITELIB}/Scientific/BSP/RemoteObjects.pyo 21${PYSITELIB}/Scientific/BSP/RemoteObjects.pyo
21${PYSITELIB}/Scientific/BSP/__init__.py 22${PYSITELIB}/Scientific/BSP/__init__.py
22${PYSITELIB}/Scientific/BSP/__init__.pyc 23${PYSITELIB}/Scientific/BSP/__init__.pyc
23${PYSITELIB}/Scientific/BSP/__init__.pyo 24${PYSITELIB}/Scientific/BSP/__init__.pyo
24${PYSITELIB}/Scientific/BSP/core.py 25${PYSITELIB}/Scientific/BSP/core.py
cvs diff -r1.6 -r1.7 pkgsrc/math/py-Scientific/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/math/py-Scientific/Attic/distinfo 2010/05/29 03:18:54 1.6
+++ pkgsrc/math/py-Scientific/Attic/distinfo 2014/04/16 14:51:24 1.7
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.6 2010/05/29 03:18:54 obache Exp $ 1$NetBSD: distinfo,v 1.7 2014/04/16 14:51:24 wiz Exp $
2 2
3SHA1 (ScientificPython-2.8.tar.gz) = c0847eac6359d70b0e4687c5c65af49b3986e55b 3SHA1 (ScientificPython-2.8.1.tar.gz) = 40842ffec473371ba3c9710ba609844007616388
4RMD160 (ScientificPython-2.8.tar.gz) = 0501829586253fe3986458529c436b6d93e6667f 4RMD160 (ScientificPython-2.8.1.tar.gz) = 53131b769acafd0ef5e6b3e5f022e40ffa2b4663
5Size (ScientificPython-2.8.tar.gz) = 559613 bytes 5Size (ScientificPython-2.8.1.tar.gz) = 559819 bytes
6SHA1 (patch-aa) = c7f353e9264749e3afff633fb28623f053b39f1c 6SHA1 (patch-aa) = c7f353e9264749e3afff633fb28623f053b39f1c
7SHA1 (patch-ab) = 0063518cd630597e271ba0b4934ae6b5ed116785 7SHA1 (patch-ab) = 5a9e4a8c744b02a10cb21e1f85b7cefa00109bef
cvs diff -r1.2 -r1.3 pkgsrc/math/py-Scientific/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/math/py-Scientific/patches/Attic/patch-ab 2010/05/29 03:18:54 1.2
+++ pkgsrc/math/py-Scientific/patches/Attic/patch-ab 2014/04/16 14:51:24 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ab,v 1.2 2010/05/29 03:18:54 obache Exp $ 1$NetBSD: patch-ab,v 1.3 2014/04/16 14:51:24 wiz Exp $
2 2
3* Fixed NumPy as numeric package for user-destdir installation. 3* Fixed NumPy as numeric package for user-destdir installation.
4* Honor CFLAGS and LDFLAGS. 4* Honor CFLAGS and LDFLAGS.
5 5
6--- Src/MPI/compile.py.orig 2008-08-18 12:54:41.000000000 +0000 6--- Src/MPI/compile.py.orig 2008-08-18 12:54:41.000000000 +0000
7+++ Src/MPI/compile.py 7+++ Src/MPI/compile.py
8@@ -5,7 +5,6 @@ 8@@ -5,7 +5,6 @@
9 import distutils 9 import distutils
10 import distutils.sysconfig 10 import distutils.sysconfig
11 import os, sys 11 import os, sys
12-from Scientific import N 12-from Scientific import N
13  13
14 cfgDict = distutils.sysconfig.get_config_vars() 14 cfgDict = distutils.sysconfig.get_config_vars()
@@ -26,21 +26,21 @@ $NetBSD: patch-ab,v 1.2 2010/05/29 03:18 @@ -26,21 +26,21 @@ $NetBSD: patch-ab,v 1.2 2010/05/29 03:18
26+ cflags = os.environ['CFLAGS'] 26+ cflags = os.environ['CFLAGS']
27+ 27+
28 extra_compile_args = "" 28 extra_compile_args = ""
29-if N.package == "NumPy": 29-if N.package == "NumPy":
30+if True: 30+if True:
31 arrayobject_h_include = os.path.join(sys.prefix, 31 arrayobject_h_include = os.path.join(sys.prefix,
32 "lib/python%s.%s/site-packages/numpy/core/include" 32 "lib/python%s.%s/site-packages/numpy/core/include"
33 % sys.version_info [:2]) 33 % sys.version_info [:2])
34@@ -32,9 +39,11 @@ if sys.platform == 'darwin': 34@@ -32,9 +39,11 @@ if sys.platform == 'darwin':
35 items[i] = os.path.join(frameworkdir[0], items[i]) 35 items[i] = os.path.join(frameworkdir[0], items[i])
36 linkforshared = ' '.join(items) 36 linkforshared = ' '.join(items)
37  37
38-cmd = '%s %s -o mpipython -I%s %s %s -L%s -lpython%s %s %s' % \ 38-cmd = '%s %s -o mpipython -I%s %s %s -L%s -lpython%s %s %s' % \
39+cmd = '%s %s %s -o mpipython -I../../Include %s -I%s %s %s -L%s -lmpich -lpython%s %s %s' % \ 39+cmd = '%s %s %s -o mpipython -I../../Include %s -I%s %s %s -L%s -lmpich -lopa -lmpl -lpython%s %s %s' % \
40 (mpicompiler,  40 (mpicompiler,
41+ ldflags, 41+ ldflags,
42 linkforshared, 42 linkforshared,
43+ cflags, 43+ cflags,
44 cfgDict['INCLUDEPY'], 44 cfgDict['INCLUDEPY'],
45 extra_compile_args, 45 extra_compile_args,
46 sources, 46 sources,