5 files changed, 11 insertions, 35 deletions

diff --git a/math/py-scientific/Makefile b/math/py-scientific/Makefile
index 073871997d4b..452be12e9a56 100644
--- a/math/py-scientific/Makefile
+++ b/math/py-scientific/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scientific
-PORTVERSION=	2.4.3
+PORTVERSION=	2.4.9
 CATEGORIES=	math python
 MASTER_SITES=	http://starship.python.net/crew/hinsen/ScientificPython/ \
 		http://dirac.cnrs-orleans.fr/programs/ScientificPython/
diff --git a/math/py-scientific/distinfo b/math/py-scientific/distinfo
index 6056c203f2ab..470889b8444a 100644
--- a/math/py-scientific/distinfo
+++ b/math/py-scientific/distinfo
@@ -1,3 +1,3 @@
-MD5 (ScientificPython-2.4.3.tar.gz) = 02b42a0cfa64a6b1c6b5a467eaccd88a
-SHA256 (ScientificPython-2.4.3.tar.gz) = 92ffd96a88eda4f5e6b4cb4c743780327270bc635659a23364b0d5715f0e1b76
-SIZE (ScientificPython-2.4.3.tar.gz) = 494609
+MD5 (ScientificPython-2.4.9.tar.gz) = a88602846bdb8a1e2c9f21dc3cf81341
+SHA256 (ScientificPython-2.4.9.tar.gz) = 139bca0eed3e307d4e5d6b45b4111d2de8964c7ede657c7ea8ce7f7d218097d7
+SIZE (ScientificPython-2.4.9.tar.gz) = 491370
diff --git a/math/py-scientific/files/patch-Scientific::MPI::core.py b/math/py-scientific/files/patch-Scientific::MPI::core.py
deleted file mode 100644
index c5cf77d2dcec..000000000000
--- a/math/py-scientific/files/patch-Scientific::MPI::core.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- Scientific/MPI/core.py.orig	Sun Dec  5 11:42:48 2004
-+++ Scientific/MPI/core.py	Sun Dec  5 11:43:28 2004
-@@ -315,7 +315,7 @@
-                         return data, 0, data_tag, len(data)
-                 raise MPIError, "no message received"
- 
--            def receiveString(self, None, source=None, tag=None):
-+            def receiveString(self, _None, source=None, tag=None):
-                 array, source, tag, length = self.receive(source, tag)
-                 return array.tostring(), source, tag
- 
diff --git a/math/py-scientific/files/patch-setup.py b/math/py-scientific/files/patch-setup.py
index a2889d86cd8c..c060bc6bfb8b 100644
--- a/math/py-scientific/files/patch-setup.py
+++ b/math/py-scientific/files/patch-setup.py
@@ -1,11 +1,11 @@
---- setup.py~	Fri Jul  4 11:50:18 2003
-+++ setup.py	Fri Jul  4 11:51:08 2003
+--- setup.py.orig	Mon Oct 18 08:34:00 2004
++++ setup.py	Fri Feb 24 15:33:58 2006
 @@ -14,7 +14,7 @@
      try:
          netcdf_prefix=os.environ['NETCDF_PREFIX']
      except KeyError:
--        for netcdf_prefix in ['/usr/local', '/usr']:
-+        for netcdf_prefix in [sys.prefix, '/usr']:
+-        for netcdf_prefix in ['/usr/local', '/usr', '/sw']:
++        for netcdf_prefix in [sys.prefix, '/usr', '/sw']:
              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/pkg-plist b/math/py-scientific/pkg-plist
index e8be1e0954fa..f56af65ec0ce 100644
--- a/math/py-scientific/pkg-plist
+++ b/math/py-scientific/pkg-plist
@@ -87,9 +87,6 @@
 %%PYTHON_SITELIBDIR%%/Scientific/IO/__init__.py
 %%PYTHON_SITELIBDIR%%/Scientific/IO/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Scientific/IO/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Scientific/Installation.py
-%%PYTHON_SITELIBDIR%%/Scientific/Installation.pyc
-%%PYTHON_SITELIBDIR%%/Scientific/Installation.pyo
 %%PYTHON_SITELIBDIR%%/Scientific/MPI/IO.py
 %%PYTHON_SITELIBDIR%%/Scientific/MPI/IO.pyc
 %%PYTHON_SITELIBDIR%%/Scientific/MPI/IO.pyo
@@ -114,18 +111,6 @@
 %%PYTHON_SITELIBDIR%%/Scientific/Physics/__init__.py
 %%PYTHON_SITELIBDIR%%/Scientific/Physics/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Scientific/Physics/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Scientific/QtWidgets/QtPlotCanvas.py
-%%PYTHON_SITELIBDIR%%/Scientific/QtWidgets/QtPlotCanvas.pyc
-%%PYTHON_SITELIBDIR%%/Scientific/QtWidgets/QtPlotCanvas.pyo
-%%PYTHON_SITELIBDIR%%/Scientific/QtWidgets/QtVisualizationCanvas.py
-%%PYTHON_SITELIBDIR%%/Scientific/QtWidgets/QtVisualizationCanvas.pyc
-%%PYTHON_SITELIBDIR%%/Scientific/QtWidgets/QtVisualizationCanvas.pyo
-%%PYTHON_SITELIBDIR%%/Scientific/QtWidgets/Utility.py
-%%PYTHON_SITELIBDIR%%/Scientific/QtWidgets/Utility.pyc
-%%PYTHON_SITELIBDIR%%/Scientific/QtWidgets/Utility.pyo
-%%PYTHON_SITELIBDIR%%/Scientific/QtWidgets/__init__.py
-%%PYTHON_SITELIBDIR%%/Scientific/QtWidgets/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Scientific/QtWidgets/__init__.pyo
 %%PYTHON_SITELIBDIR%%/Scientific/Signals/Models.py
 %%PYTHON_SITELIBDIR%%/Scientific/Signals/Models.pyc
 %%PYTHON_SITELIBDIR%%/Scientific/Signals/Models.pyo
@@ -174,6 +159,9 @@
 %%PYTHON_SITELIBDIR%%/Scientific/Visualization/__init__.py
 %%PYTHON_SITELIBDIR%%/Scientific/Visualization/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Scientific/Visualization/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Scientific/Visualization/PyMOL.py
+%%PYTHON_SITELIBDIR%%/Scientific/Visualization/PyMOL.pyc
+%%PYTHON_SITELIBDIR%%/Scientific/Visualization/PyMOL.pyo
 %%PYTHON_SITELIBDIR%%/Scientific/%%PYTHON_PLATFORM%%/Scientific_netcdf.so
 %%PYTHON_SITELIBDIR%%/Scientific/__init__.py
 %%PYTHON_SITELIBDIR%%/Scientific/__init__.pyc
@@ -252,7 +240,6 @@
 @dirrm %%PYTHON_SITELIBDIR%%/Scientific/Threading
 @dirrm %%PYTHON_SITELIBDIR%%/Scientific/Statistics
 @dirrm %%PYTHON_SITELIBDIR%%/Scientific/Signals
-@dirrm %%PYTHON_SITELIBDIR%%/Scientific/QtWidgets
 @dirrm %%PYTHON_SITELIBDIR%%/Scientific/Physics
 @dirrm %%PYTHON_SITELIBDIR%%/Scientific/MPI
 @dirrm %%PYTHON_SITELIBDIR%%/Scientific/IO