Update py-Scientific to 2.8.

Based on PR#43282 by Wen Heping.

2.7.9 --> 2.7.10
----------------

Bug fixes:

- Removed all occurrences of "as" as a variable name for compatibility
  with Python 2.6.

- Installation without the netCDF module did not work.

Improvements:

- Vector.dyadicProduct() was replaced by a more efficient implementation.

- Scientific.IO.PDB: Atom objects now have a parent attribute whose
  value is the containing group.


2.7.8 --> 2.7.9
---------------

License change: ScientificPython is now distributed under the
CeCILL-C license, which is an adaptation of the LGPL to French
law. The previously used CeCILL license, similar to the GPL, was
considered too restrictive.

Bug fixes:

- MPI interfaces did not work correctly with NumPy and/or Python 2.5.

Improvements:

- Compilation script for mpipython works around a Python configuration
  bug under MacOS X.
- Docstrings have been cleaned up.

2.7.7 --> 2.7.8
---------------

Bug fixes:

- Due to a typo in Scientific.IO.PDBSpaceGroups, some space group
  names were not found in the space group table.

Improvements:

- Vector objects can now be multiplied with NumPy scalar objects
  (which is what you get when extracting numbers from NumPy
  arrays). Due to the way NumPy scalars handle multiplication, the
  result used to be an array rather than a Vector, which caused
  various applications to crash.

- The build procedure under Windows has been improved. It can
  generate a binary installer that includes the netCDF DLL,
  making ScientificPython independent of a netCDF installation.

2.7.6 --> 2.7.7
---------------

Bug fixes:

- Installation on Windows didn't work because the Unix maths libraries
  don't exist there.


Improvements:

- InterpolatingFunction and TensorField objects can represent
  periodic functions/fields.

- DistributedComputing: the watchdog period of slave processes is now
  a user-definable parameter.

- PDBSpaceGroups was simplified, making it shorter and faster to load.

- Scientific.N contains the array type object in the variable array_type.
  This makes it possible to write Pyrex modules using arrays in such a
  way that they always use the numeric module for which ScientificPython
  was compiled.


2.7.5 --> 2.7.6
---------------

Bug fixes:

- NumPy compatibility fixes.

- Pyro 3.6 compatibility fix in DistributedComputing.MasterSlave


2.7.4 --> 2.7.5
---------------

New features:

- Scaling, inversion, and shear transformations added to
  Geometry.Transformations

Improvements:

- PDB parser handles CRYST1, SCALEn and MTRIXn records
- Better identification of the Numerics package that is being used

Bug fixes:

- Scientific_affinitypropagation.c compiles with NumPy


2.7.3 --> 2.7.4
---------------

New features:

- New module Clustering.AffinityPropagation.
- New class BSP.ParRootSequence.

Bug fixes:

- Replaced float equality test in Functions.InterpolatingFunction
- Removed exception for order > 1 in Derivatives.DerivVar.__init__
- Fixed reading of non-string attributes from netCDF files.

Improvements:

- New methods getBinIndices and getBinCount in Statistics.Histogram.Histogram
- Physics.PhysicalQuantities: unit definitions added to doc string

2.7.2 --> 2.7.3
---------------

Improvements:

- Added multi-module setup for master-slave computations.
- More information available through task_manager.
- task_manager can start slave processes.

2.7.1 --> 2.7.2
---------------

Bug fixes:

- Scientific_netcdf would not compile with NumPy under Python 2.4
  because NumPy also defined Py_ssize_t.

2.7 --> 2.7.1
-------------

Improvements:

- NumPy compatibility. Scientific_netcdf was revised by hand.
  The Python code was run through numpy.oldnumeric.alter_code1 to
  identify the critical sections, which were then all handled in
  some way. It is possible that there are still incompatibilities
  of the kind that numpy.oldnumeric.alter_code1 cannot detect


2.5.12hg --> 2.7
----------------

New features:

- Subpackage Scientific.DistributedComputing for easy parallelization
  of independent tasks.

2.5.11 --> 2.5.12hg
-------------------

Bug fixes:

- VRML2 output would crash for scenes containing Line objects
- Pyrex implmentation of vector objects could crash instead of raising
  an exception in divide operations.
- Pyrex implmentation of vector objects would raise exceptions incorrectly
  under Python 2.5

Improvements:

- builds Macintosh packages with documentation and examples

2.5.10 --> 2.5.11
-----------------

Bug fixes:

- Pyrex implementation of vector objects raised exceptions in comparisons
- Pyrex implementation of vector objects did not accept negative indices
- Some object deletions during conversion to epydoc had to be reversed

Improvements:

- Two test suites

2.5.9 --> 2.5.10
----------------

Bug fixes:

- Fixed netCDF error handling

Improvements:

- Support for NumPy (not very well tested yet)
- Scientific.NumberDict more efficient

2.5.8 --> 2.5.9
---------------

Improvements:

- Scientifc.IO.NetCDF supports the new 64-bit data structures in Python 2.5
  (not yet tested on a 64-bit machine)
- Docstrings modified for use with Epydoc.

2.5.7 --> 2.5.8
---------------

Bug fixes:

- Syntax error in Scientific.IO.PDB
- Attribute deletion in netCDF file and variable objects caused a crash.

2.5.6 --> 2.5.7
----------------

Bug fixes:

- Tensor-vector multiplication was incorrect with the Pyrex implementation
  of vector objects.

2.5.5 --> 2.5.6
----------------

Bug fixes:

- Scientific.BSP.ParClass did not pass on __call__ and __getitem__
  to local class
- Scientific.BSP.ParClass: Class wrappers did not always return the right
  global object.

2.5.4 --> 2.5.5
----------------

Bug fixes:

- Scientific.IO.NetCDF.NetCDFVariable.assignValue() had incomplete error
  reporting. Some errors would not raise exceptions as required.


2.5.3 --> 2.5.4
----------------

Improvements:

- A "test" method on MPI request objects permits to check if data
  is available (thanks to Jakob Schiotz for this addition).

Bug fixes:

- The new Pyrex vector objects could not be pickled.

2.5.1 --> 2.5.3
----------------

Improvements:

- The class Scientific.Geometry.Vector has been reimplemented in Pyrex,
  yielding much faster vector operations. There is, however, the restriction
  that the vector elements must be of type "float". For the rare applications
  where this condition is not fulfilled (such as
  Scientific.Functions.Derivatives.DerivVector), the Python implementation
  remains accessible as Scientific.Geometry.VectorModule.Vector.

2.4.9 --> 2.5.1
----------------

Improvements:

- Vector and Tensor objects permit comparison with other types
  of objects (which always return False)
- Numarray can be used instead of Numeric as far as possible
  (see README for details)

2.4.7 --> 2.4.9:
----------------

Bug fixes:

- Integer array attributes caused a TypeError with recent versions of
  Numeric (that don't do silent casts from Long to Int any more).

Additions:

- Method "threeAngles" in Geometry.Transformation.Rotation.


2.4.6 --> 2.4.7:
----------------

Bug fixes:

- Scientific.BSP: alltrue() and anytrue() sometimes returned wrong results.

Additions:

- Scientific.Visualization.VMD can now correctly launch VMD under Windows

5 files changed, 117 insertions, 43 deletions

diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile
index 4e173de2f20..d4950dc83ad 100644
--- a/math/py-Scientific/Makefile
+++ b/math/py-Scientific/Makefile
@@ -1,33 +1,30 @@
-# $NetBSD: Makefile,v 1.31 2009/03/05 18:51:30 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2010/05/29 03:18:54 obache Exp $
 
-DISTNAME=	ScientificPython-2.4.5
+DISTNAME=	ScientificPython-2.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Python//}
-PKGREVISION=	2
 CATEGORIES=	math python
-MASTER_SITES=	http://starship.python.net/crew/hinsen/ScientificPython/ \
-		http://dirac.cnrs-orleans.fr/programs/ScientificPython/
+MASTER_SITES=	http://sourcesup.cru.fr/frs/download.php/2309/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://starship.python.net/crew/hinsen/scientific.html
+HOMEPAGE=	http://dirac.cnrs-orleans.fr/ScientificPython/
 COMMENT=	Python modules for scientific computing
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CONFLICTS+=	py-Scientific-*
+CONFLICTS+=	py-Scientific-[0-9]*
 
 PYDISTUTILSPKG=	yes
 
-MAKE_ENV+=	NETCDF_PREFIX=${LOCALBASE:Q}
+MAKE_ENV+=	NETCDF_PREFIX=${BUILDLINK_PREFIX.netcdf}
 
-EVAL_PREFIX+=	NETCDFPREFIX=netcdf MPICHPREFIX=mpich
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 PLIST_SUBST+=	OSVER=${OS_VERSION:C/^(.).*/\1/}
 
 INSTALLATION_DIRS=	bin
 
 post-build:
-	@(cd ${WRKSRC}/Src/MPI && ${SETENV} CFLAGS="${CFLAGS}" \
-	  LDFLAGS="${LDFLAGS} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" ${PYTHONBIN} compile.py)
+	${RUN} cd ${WRKSRC}/Src/MPI && ${SETENV} CFLAGS=${CFLAGS:Q} \
+	  LDFLAGS="${LDFLAGS} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" ${PYTHONBIN} compile.py
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Src/MPI/mpipython \
@@ -35,7 +32,7 @@ post-install:
 
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-.include "../../math/py-Numeric/buildlink3.mk"
+.include "../../math/py-numpy/buildlink3.mk"
 .include "../../parallel/mpi-ch/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-Scientific/PLIST b/math/py-Scientific/PLIST
index ab3ec4854ca..b7c1e36ab36 100644
--- a/math/py-Scientific/PLIST
+++ b/math/py-Scientific/PLIST
@@ -1,9 +1,13 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:05:47 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/05/29 03:18:54 obache Exp $
+bin/bsp_virtual
 bin/mpipython${PYVERSSUFFIX}
+bin/task_manager
 ${PYINC}/Scientific/PyBSP_API.h
 ${PYINC}/Scientific/PyMPI_API.h
+${PYINC}/Scientific/arrayobject.h
 ${PYINC}/Scientific/bspmodule.h
 ${PYINC}/Scientific/mpimodule.h
+${PYINC}/Scientific/netcdf.h
 ${PYINC}/Scientific/netcdfmodule.h
 ${PYSITELIB}/Scientific/BSP/Console.py
 ${PYSITELIB}/Scientific/BSP/Console.pyc
@@ -11,15 +15,36 @@ ${PYSITELIB}/Scientific/BSP/Console.pyo
 ${PYSITELIB}/Scientific/BSP/IO.py
 ${PYSITELIB}/Scientific/BSP/IO.pyc
 ${PYSITELIB}/Scientific/BSP/IO.pyo
+${PYSITELIB}/Scientific/BSP/RemoteObjects.py
+${PYSITELIB}/Scientific/BSP/RemoteObjects.pyc
+${PYSITELIB}/Scientific/BSP/RemoteObjects.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/Clustering/AffinityPropagation.py
+${PYSITELIB}/Scientific/Clustering/AffinityPropagation.pyc
+${PYSITELIB}/Scientific/Clustering/AffinityPropagation.pyo
+${PYSITELIB}/Scientific/Clustering/__init__.py
+${PYSITELIB}/Scientific/Clustering/__init__.pyc
+${PYSITELIB}/Scientific/Clustering/__init__.pyo
 ${PYSITELIB}/Scientific/DictWithDefault.py
 ${PYSITELIB}/Scientific/DictWithDefault.pyc
 ${PYSITELIB}/Scientific/DictWithDefault.pyo
+${PYSITELIB}/Scientific/DistributedComputing/MasterSlave.py
+${PYSITELIB}/Scientific/DistributedComputing/MasterSlave.pyc
+${PYSITELIB}/Scientific/DistributedComputing/MasterSlave.pyo
+${PYSITELIB}/Scientific/DistributedComputing/TaskManager.py
+${PYSITELIB}/Scientific/DistributedComputing/TaskManager.pyc
+${PYSITELIB}/Scientific/DistributedComputing/TaskManager.pyo
+${PYSITELIB}/Scientific/DistributedComputing/__init__.py
+${PYSITELIB}/Scientific/DistributedComputing/__init__.pyc
+${PYSITELIB}/Scientific/DistributedComputing/__init__.pyo
+${PYSITELIB}/Scientific/FFT.py
+${PYSITELIB}/Scientific/FFT.pyc
+${PYSITELIB}/Scientific/FFT.pyo
 ${PYSITELIB}/Scientific/Functions/Derivatives.py
 ${PYSITELIB}/Scientific/Functions/Derivatives.pyc
 ${PYSITELIB}/Scientific/Functions/Derivatives.pyo
@@ -83,15 +108,18 @@ ${PYSITELIB}/Scientific/IO/PDB.pyo
 ${PYSITELIB}/Scientific/IO/PDBExportFilters.py
 ${PYSITELIB}/Scientific/IO/PDBExportFilters.pyc
 ${PYSITELIB}/Scientific/IO/PDBExportFilters.pyo
+${PYSITELIB}/Scientific/IO/PDBSpaceGroups.py
+${PYSITELIB}/Scientific/IO/PDBSpaceGroups.pyc
+${PYSITELIB}/Scientific/IO/PDBSpaceGroups.pyo
 ${PYSITELIB}/Scientific/IO/TextFile.py
 ${PYSITELIB}/Scientific/IO/TextFile.pyc
 ${PYSITELIB}/Scientific/IO/TextFile.pyo
 ${PYSITELIB}/Scientific/IO/__init__.py
 ${PYSITELIB}/Scientific/IO/__init__.pyc
 ${PYSITELIB}/Scientific/IO/__init__.pyo
-${PYSITELIB}/Scientific/Installation.py
-${PYSITELIB}/Scientific/Installation.pyc
-${PYSITELIB}/Scientific/Installation.pyo
+${PYSITELIB}/Scientific/LA.py
+${PYSITELIB}/Scientific/LA.pyc
+${PYSITELIB}/Scientific/LA.pyo
 ${PYSITELIB}/Scientific/MPI/IO.py
 ${PYSITELIB}/Scientific/MPI/IO.pyc
 ${PYSITELIB}/Scientific/MPI/IO.pyo
@@ -104,6 +132,12 @@ ${PYSITELIB}/Scientific/MPI/core.pyo
 ${PYSITELIB}/Scientific/Mathematica.py
 ${PYSITELIB}/Scientific/Mathematica.pyc
 ${PYSITELIB}/Scientific/Mathematica.pyo
+${PYSITELIB}/Scientific/N.py
+${PYSITELIB}/Scientific/N.pyc
+${PYSITELIB}/Scientific/N.pyo
+${PYSITELIB}/Scientific/NRNG.py
+${PYSITELIB}/Scientific/NRNG.pyc
+${PYSITELIB}/Scientific/NRNG.pyo
 ${PYSITELIB}/Scientific/NumberDict.py
 ${PYSITELIB}/Scientific/NumberDict.pyc
 ${PYSITELIB}/Scientific/NumberDict.pyo
@@ -116,6 +150,18 @@ ${PYSITELIB}/Scientific/Physics/Potential.pyo
 ${PYSITELIB}/Scientific/Physics/__init__.py
 ${PYSITELIB}/Scientific/Physics/__init__.pyc
 ${PYSITELIB}/Scientific/Physics/__init__.pyo
+${PYSITELIB}/Scientific/QtWidgets/QtPlotCanvas.py
+${PYSITELIB}/Scientific/QtWidgets/QtPlotCanvas.pyc
+${PYSITELIB}/Scientific/QtWidgets/QtPlotCanvas.pyo
+${PYSITELIB}/Scientific/QtWidgets/QtVisualizationCanvas.py
+${PYSITELIB}/Scientific/QtWidgets/QtVisualizationCanvas.pyc
+${PYSITELIB}/Scientific/QtWidgets/QtVisualizationCanvas.pyo
+${PYSITELIB}/Scientific/QtWidgets/__init__.py
+${PYSITELIB}/Scientific/QtWidgets/__init__.pyc
+${PYSITELIB}/Scientific/QtWidgets/__init__.pyo
+${PYSITELIB}/Scientific/QtWidgets/qt_fake.py
+${PYSITELIB}/Scientific/QtWidgets/qt_fake.pyc
+${PYSITELIB}/Scientific/QtWidgets/qt_fake.pyo
 ${PYSITELIB}/Scientific/Signals/Models.py
 ${PYSITELIB}/Scientific/Signals/Models.pyc
 ${PYSITELIB}/Scientific/Signals/Models.pyo
@@ -149,6 +195,9 @@ ${PYSITELIB}/Scientific/TkWidgets/__init__.pyo
 ${PYSITELIB}/Scientific/Visualization/Color.py
 ${PYSITELIB}/Scientific/Visualization/Color.pyc
 ${PYSITELIB}/Scientific/Visualization/Color.pyo
+${PYSITELIB}/Scientific/Visualization/PyMOL.py
+${PYSITELIB}/Scientific/Visualization/PyMOL.pyc
+${PYSITELIB}/Scientific/Visualization/PyMOL.pyo
 ${PYSITELIB}/Scientific/Visualization/VMD.py
 ${PYSITELIB}/Scientific/Visualization/VMD.pyc
 ${PYSITELIB}/Scientific/Visualization/VMD.pyo
@@ -167,7 +216,14 @@ ${PYSITELIB}/Scientific/Visualization/__init__.pyo
 ${PYSITELIB}/Scientific/__init__.py
 ${PYSITELIB}/Scientific/__init__.pyc
 ${PYSITELIB}/Scientific/__init__.pyo
+${PYSITELIB}/Scientific/__pkginfo__.py
+${PYSITELIB}/Scientific/__pkginfo__.pyc
+${PYSITELIB}/Scientific/__pkginfo__.pyo
 ${PYSITELIB}/Scientific/indexing.py
 ${PYSITELIB}/Scientific/indexing.pyc
 ${PYSITELIB}/Scientific/indexing.pyo
+${PYSITELIB}/Scientific/${LOWER_OPSYS}${OSVER}/Scientific_affinitypropagation.so
+${PYSITELIB}/Scientific/${LOWER_OPSYS}${OSVER}/Scientific_interpolation.so
 ${PYSITELIB}/Scientific/${LOWER_OPSYS}${OSVER}/Scientific_netcdf.so
+${PYSITELIB}/Scientific/${LOWER_OPSYS}${OSVER}/Scientific_numerics_package_id.so
+${PYSITELIB}/Scientific/${LOWER_OPSYS}${OSVER}/Scientific_vector.so
diff --git a/math/py-Scientific/distinfo b/math/py-Scientific/distinfo
index 0692b1a5266..7f003d86ac8 100644
--- a/math/py-Scientific/distinfo
+++ b/math/py-Scientific/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 12:06:57 agc Exp $
+$NetBSD: distinfo,v 1.6 2010/05/29 03:18:54 obache Exp $
 
-SHA1 (ScientificPython-2.4.5.tar.gz) = 452b04a20dd065fd9ea01092ae2e1e726406d2be
-RMD160 (ScientificPython-2.4.5.tar.gz) = 5a5620856fce81726110e12a03871b39d4b462b0
-Size (ScientificPython-2.4.5.tar.gz) = 487379 bytes
-SHA1 (patch-aa) = 651049ac032c3b0a232ec052e80e2cdb1134b4e0
-SHA1 (patch-ab) = b682b71ecfbe0c815203f74bf19ae5870d113f8f
+SHA1 (ScientificPython-2.8.tar.gz) = c0847eac6359d70b0e4687c5c65af49b3986e55b
+RMD160 (ScientificPython-2.8.tar.gz) = 0501829586253fe3986458529c436b6d93e6667f
+Size (ScientificPython-2.8.tar.gz) = 559613 bytes
+SHA1 (patch-aa) = c7f353e9264749e3afff633fb28623f053b39f1c
+SHA1 (patch-ab) = 0063518cd630597e271ba0b4934ae6b5ed116785
diff --git a/math/py-Scientific/patches/patch-aa b/math/py-Scientific/patches/patch-aa
index 846e9e68b7f..cd90875af92 100644
--- a/math/py-Scientific/patches/patch-aa
+++ b/math/py-Scientific/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2004/01/18 23:57:50 recht Exp $
+$NetBSD: patch-aa,v 1.4 2010/05/29 03:18:54 obache Exp $
 
---- 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],
+--- setup.py.orig	2008-10-28 13:31:44.000000000 +0000
++++ setup.py
+@@ -113,6 +113,7 @@ else:
+                              include_dirs=['Include', netcdf_include]
+                                           + arrayobject_h_include,
                               library_dirs=[netcdf_lib],
 +                             runtime_library_dirs=[netcdf_lib],
-                              libraries = ['netcdf'])]
+                              libraries = ['netcdf'],
+                              extra_compile_args=extra_compile_args)]
  
- packages = ['Scientific', 'Scientific.Functions',
diff --git a/math/py-Scientific/patches/patch-ab b/math/py-Scientific/patches/patch-ab
index ba33668fbc2..b89b208ed56 100644
--- a/math/py-Scientific/patches/patch-ab
+++ b/math/py-Scientific/patches/patch-ab
@@ -1,25 +1,46 @@
-$NetBSD: patch-ab,v 1.1 2004/01/18 23:57:50 recht Exp $
+$NetBSD: patch-ab,v 1.2 2010/05/29 03:18:54 obache 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 @@
+* Fixed NumPy as numeric package for user-destdir installation.
+* Honor CFLAGS and LDFLAGS.
+
+--- Src/MPI/compile.py.orig	2008-08-18 12:54:41.000000000 +0000
++++ Src/MPI/compile.py
+@@ -5,7 +5,6 @@
+ import distutils
+ import distutils.sysconfig
+ import os, sys
+-from Scientific import N
+ 
+ cfgDict = distutils.sysconfig.get_config_vars()
+ 
+@@ -13,8 +12,16 @@ cfgDict = distutils.sysconfig.get_config
  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' % \
+ extra_compile_args = ""
+-if N.package == "NumPy":
++if True:
+     arrayobject_h_include = os.path.join(sys.prefix,
+                             "lib/python%s.%s/site-packages/numpy/core/include"
+                                           % sys.version_info [:2])
+@@ -32,9 +39,11 @@ if sys.platform == 'darwin':
+             items[i] = os.path.join(frameworkdir[0], items[i])
+     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' % \
      (mpicompiler, 
-+    ldflags,
-     cfgDict['LINKFORSHARED'],
-+    cflags,
-     cfgDict['INCLUDEPY'],
-     sources,
-     cfgDict['LIBPL'],
++     ldflags,
+      linkforshared,
++     cflags,
+      cfgDict['INCLUDEPY'],
+      extra_compile_args,
+      sources,