Upgrade to 2.2.

7 files changed, 59 insertions, 50 deletions

diff --git a/math/py-scientific/Makefile b/math/py-scientific/Makefile
index c19d5e671977..d7397513355c 100644
--- a/math/py-scientific/Makefile
+++ b/math/py-scientific/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scientific
-PORTVERSION=	2.0.1
+PORTVERSION=	2.2
 CATEGORIES=	math python
 MASTER_SITES=	http://starship.python.net/crew/hinsen/ \
 		http://dirac.cnrs-orleans.fr/programs/
@@ -27,9 +27,6 @@ SCIENTIFICDIR=	${PYTHON_SITELIBDIR}/Scientific
 DOCDIR=		${PREFIX}/share/doc/py-scientific
 EXAMPLEDIR=	${PREFIX}/share/examples/py-scientific
 
-post-extract:
-	@${CP} ${FILESDIR}/setup.* ${WRKSRC}
-
 do-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py build)
 
@@ -37,12 +34,13 @@ do-install:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py install)
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/Examples/* ${EXAMPLEDIR}
 	@${MKDIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DOCDIR}
+.if !defined(NOPORTDOCS)
 	cd ${WRKDIR}/${DISTNAME}/Doc; tar cf - . | \
 	    (cd ${DOCDIR}; tar xf -)
+	@${MKDIR} ${EXAMPLEDIR}
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/Examples/* ${EXAMPLEDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/py-scientific/distinfo b/math/py-scientific/distinfo
index 81f262a1d195..4773bec05954 100644
--- a/math/py-scientific/distinfo
+++ b/math/py-scientific/distinfo
@@ -1 +1 @@
-MD5 (ScientificPython-2.0.1.tar.gz) = 380248f3167afa1667db44cfe8b3fd3d
+MD5 (ScientificPython-2.2.tar.gz) = a722bf223191082d63d2e9ae6f334895
diff --git a/math/py-scientific/files/patch-setup.cfg b/math/py-scientific/files/patch-setup.cfg
new file mode 100644
index 000000000000..598060352f10
--- /dev/null
+++ b/math/py-scientific/files/patch-setup.cfg
@@ -0,0 +1,9 @@
+--- setup.cfg.orig	Wed Mar 28 16:14:46 2001
++++ setup.cfg	Mon Apr  2 18:52:18 2001
+@@ -3,3 +3,6 @@
+ packager = "Konrad Hinsen <hinsen@cnrs-orleans.fr>"
+ group = "Libraries/Python"
+ doc_files = README README.MPI Doc/HTML  Doc/PDF  Doc/XML
++
++[install]
++optimize = 1
diff --git a/math/py-scientific/files/patch-setup.py b/math/py-scientific/files/patch-setup.py
new file mode 100644
index 000000000000..ea99a1f0b531
--- /dev/null
+++ b/math/py-scientific/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	Thu Mar 29 17:08:38 2001
++++ setup.py	Mon Apr  2 18:50:48 2001
+@@ -11,7 +11,7 @@
+ 
+ 
+ if netcdf_prefix is None:
+-    for netcdf_prefix in ['/usr/local', '/usr']:
++    for netcdf_prefix in [sys.prefix, '/usr']:
+         netcdf_include = os.path.join(netcdf_prefix, 'include')
+         netcdf_lib = os.path.join(netcdf_prefix, 'lib')
+         if os.path.exists(os.path.join(netcdf_include, 'netcdf.h')):
diff --git a/math/py-scientific/files/setup.cfg b/math/py-scientific/files/setup.cfg
deleted file mode 100644
index ec0c1e20b120..000000000000
--- a/math/py-scientific/files/setup.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# setup configuration for ScientificPython
-#
-
-# installation
-[install]
-compile = 1
-optimize = 1
diff --git a/math/py-scientific/files/setup.py b/math/py-scientific/files/setup.py
deleted file mode 100644
index 8ab86fd7038d..000000000000
--- a/math/py-scientific/files/setup.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# setup script for ScientificPython
-#
-
-from distutils.core import setup, Extension
-from distutils.sysconfig import get_python_inc
-import os, sys
-
-incdirs = [os.path.join(get_python_inc(plat_specific = 1), "Numeric")]
-incdirs.append(os.path.join(sys.prefix, "include"))
-incdirs.append(os.path.join("Scientific", "Include"))
-
-libdirs = [os.path.join(sys.prefix, "lib")]
-
-setup(name = "ScientificPython",
-      version = "2.0.1",
-      description = "Various useful scientific modules for Python.",
-      packages = ["Scientific",
-                  "Scientific.Functions",
-                  "Scientific.Geometry",
-                  "Scientific.IO",
-                  "Scientific.Physics",
-                  "Scientific.Statistics",
-                  "Scientific.TkWidgets",
-                  "Scientific.Visualization"],
-      ext_modules = [Extension("Scientific_netcdf",
-                               ["Src/Scientific_netcdf.c"],
-                               include_dirs = incdirs,
-                               library_dirs = libdirs,
-                               libraries = ["netcdf"]
-                               )
-                     ],
-      )
diff --git a/math/py-scientific/pkg-plist b/math/py-scientific/pkg-plist
index c633fdf3344c..b67d164af70d 100644
--- a/math/py-scientific/pkg-plist
+++ b/math/py-scientific/pkg-plist
@@ -1,3 +1,6 @@
+include/%%PYTHON_VERSION%%/Scientific/PyMPI_API.h
+include/%%PYTHON_VERSION%%/Scientific/mpimodule.h
+include/%%PYTHON_VERSION%%/Scientific/netcdfmodule.h
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/DictWithDefault.py
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/DictWithDefault.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/DictWithDefault.pyo
@@ -70,6 +73,12 @@ lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Installation.py
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Installation.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Installation.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/MPI/IO.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/MPI/IO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/MPI/IO.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/MPI/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/MPI/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/MPI/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Mathematica.py
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Mathematica.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Mathematica.pyo
@@ -91,12 +100,21 @@ lib/%%PYTHON_VERSION%%/site-packages/Scientific/Statistics/Histogram.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Statistics/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Statistics/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Statistics/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Threading/TaskManager.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Threading/TaskManager.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Threading/TaskManager.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Threading/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Threading/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Threading/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets/TkPlotCanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets/TkPlotCanvas.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets/TkPlotCanvas.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets/TkVisualizationCanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets/TkVisualizationCanvas.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets/TkVisualizationCanvas.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets/Utility.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets/Utility.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets/Utility.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets/__init__.pyo
@@ -106,6 +124,9 @@ lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/Color.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/VMD.py
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/VMD.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/VMD.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/VPython.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/VPython.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/VPython.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/VRML.py
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/VRML.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/VRML.pyo
@@ -115,14 +136,15 @@ lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/VRML2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/%%PYTHON_PLATFORM%%/Scientific_netcdf.so
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/indexing.py
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/indexing.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/indexing.pyo
-lib/%%PYTHON_VERSION%%/site-packages/Scientific_netcdf.so
 %%PORTDOCS%%share/doc/py-scientific/CHANGELOG
+%%PORTDOCS%%share/doc/py-scientific/COPYRIGHT
 %%PORTDOCS%%share/doc/py-scientific/HTML/Scientific.html
 %%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_1.html
 %%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_10.html
@@ -155,7 +177,12 @@ lib/%%PYTHON_VERSION%%/site-packages/Scientific_netcdf.so
 %%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_35.html
 %%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_36.html
 %%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_37.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_38.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_39.html
 %%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_4.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_40.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_41.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_42.html
 %%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_5.html
 %%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_6.html
 %%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_7.html
@@ -168,15 +195,20 @@ lib/%%PYTHON_VERSION%%/site-packages/Scientific_netcdf.so
 %%PORTDOCS%%share/examples/py-scientific/Setup.template
 %%PORTDOCS%%share/examples/py-scientific/compile.py
 %%PORTDOCS%%share/examples/py-scientific/demomodule.c
+%%PORTDOCS%%share/examples/py-scientific/mpi.py
 %%PORTDOCS%%share/examples/py-scientific/netcdf_demo.py
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/%%PYTHON_PLATFORM%%
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/Threading
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/Statistics
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/Physics
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/MPI
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific
+@dirrm include/%%PYTHON_VERSION%%/Scientific
 %%PORTDOCS%%@dirrm share/doc/py-scientific/XML
 %%PORTDOCS%%@dirrm share/doc/py-scientific/PDF
 %%PORTDOCS%%@dirrm share/doc/py-scientific/HTML