6 files changed, 104 insertions, 73 deletions

diff --git a/math/py-scientific/Makefile b/math/py-scientific/Makefile
index ca8e92e750b7..c19d5e671977 100644
--- a/math/py-scientific/Makefile
+++ b/math/py-scientific/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scientific
-PORTVERSION=	2.0b1
+PORTVERSION=	2.0.1
 CATEGORIES=	math python
 MASTER_SITES=	http://starship.python.net/crew/hinsen/ \
 		http://dirac.cnrs-orleans.fr/programs/
@@ -15,13 +15,12 @@ DISTNAME=	ScientificPython-${PORTVERSION}
 
 MAINTAINER=	tg@FreeBSD.org
 
-BUILD_DEPENDS=	${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/numpy
+BUILD_DEPENDS=	${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/numpy \
+		${PYDISTUTILS}
 LIB_DEPENDS=	netcdf.1:${PORTSDIR}/math/netcdf
 RUN_DEPENDS=	${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/numpy
 
 USE_PYTHON=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}/Src
-CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 
 NUMPYDIR=	${PYTHON_SITELIBDIR}/Numeric
 SCIENTIFICDIR=	${PYTHON_SITELIBDIR}/Scientific
@@ -29,21 +28,18 @@ DOCDIR=		${PREFIX}/share/doc/py-scientific
 EXAMPLEDIR=	${PREFIX}/share/examples/py-scientific
 
 post-extract:
-	@${SED} -e "s/%%PYTHON_VERSION%%/${PYTHON_VERSION}/g" \
-		< ${FILESDIR}/Setup > ${WRKSRC}/Setup
-	@${CP} ${PYTHON_LIBDIR}/config/Makefile.pre.in ${WRKSRC}
+	@${CP} ${FILESDIR}/setup.* ${WRKSRC}
 
-do-configure:
-	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
+do-build:
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py build)
+
+do-install:
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py install)
 
 post-install:
-	cd ${WRKDIR}/${DISTNAME}; tar cf - Scientific | \
-	    (cd ${PYTHON_SITELIBDIR}; tar xf -)
-	@${PREFIX}/bin/python ${PYTHON_LIBDIR}/compileall.py ${SCIENTIFICDIR}
-	@${PREFIX}/bin/python -O ${PYTHON_LIBDIR}/compileall.py ${SCIENTIFICDIR}
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/Examples/* ${EXAMPLEDIR}
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCDIR}
 	cd ${WRKDIR}/${DISTNAME}/Doc; tar cf - . | \
 	    (cd ${DOCDIR}; tar xf -)
diff --git a/math/py-scientific/distinfo b/math/py-scientific/distinfo
index dd2959cd7206..81f262a1d195 100644
--- a/math/py-scientific/distinfo
+++ b/math/py-scientific/distinfo
@@ -1 +1 @@
-MD5 (ScientificPython-2.0b1.tar.gz) = 2271bf68ac4dba199893006ec71563cc
+MD5 (ScientificPython-2.0.1.tar.gz) = 380248f3167afa1667db44cfe8b3fd3d
diff --git a/math/py-scientific/files/Setup b/math/py-scientific/files/Setup
deleted file mode 100644
index a8cd38fbc4a1..000000000000
--- a/math/py-scientific/files/Setup
+++ /dev/null
@@ -1,8 +0,0 @@
-*shared*
-
-# netCDF interface module
-
-# Change the paths after -I and -L to the directories where
-# the files netcdf.h and libnetcdf.* are located.
-
-Scientific_netcdf -I${PREFIX}/include -I${PREFIX}/include/%%PYTHON_VERSION%%/Numeric -I../Scientific/Include Scientific_netcdf.c -L${PREFIX}/lib -lnetcdf
diff --git a/math/py-scientific/files/setup.cfg b/math/py-scientific/files/setup.cfg
new file mode 100644
index 000000000000..ec0c1e20b120
--- /dev/null
+++ b/math/py-scientific/files/setup.cfg
@@ -0,0 +1,8 @@
+#
+# 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
new file mode 100644
index 000000000000..8ab86fd7038d
--- /dev/null
+++ b/math/py-scientific/files/setup.py
@@ -0,0 +1,33 @@
+#
+# 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 a4033b147334..c633fdf3344c 100644
--- a/math/py-scientific/pkg-plist
+++ b/math/py-scientific/pkg-plist
@@ -67,7 +67,6 @@ lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/TextFile.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/Scientific/Include/scientific_netcdfmodule.h
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Installation.py
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Installation.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Scientific/Installation.pyo
@@ -123,60 +122,63 @@ 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
-share/doc/py-scientific/.redo_ScientificPython
-share/doc/py-scientific/HTML/ScientificPython.html
-share/doc/py-scientific/HTML/ScientificPython_module_1.html
-share/doc/py-scientific/HTML/ScientificPython_module_10.html
-share/doc/py-scientific/HTML/ScientificPython_module_11.html
-share/doc/py-scientific/HTML/ScientificPython_module_12.html
-share/doc/py-scientific/HTML/ScientificPython_module_13.html
-share/doc/py-scientific/HTML/ScientificPython_module_14.html
-share/doc/py-scientific/HTML/ScientificPython_module_15.html
-share/doc/py-scientific/HTML/ScientificPython_module_16.html
-share/doc/py-scientific/HTML/ScientificPython_module_17.html
-share/doc/py-scientific/HTML/ScientificPython_module_18.html
-share/doc/py-scientific/HTML/ScientificPython_module_19.html
-share/doc/py-scientific/HTML/ScientificPython_module_2.html
-share/doc/py-scientific/HTML/ScientificPython_module_20.html
-share/doc/py-scientific/HTML/ScientificPython_module_21.html
-share/doc/py-scientific/HTML/ScientificPython_module_22.html
-share/doc/py-scientific/HTML/ScientificPython_module_23.html
-share/doc/py-scientific/HTML/ScientificPython_module_24.html
-share/doc/py-scientific/HTML/ScientificPython_module_25.html
-share/doc/py-scientific/HTML/ScientificPython_module_26.html
-share/doc/py-scientific/HTML/ScientificPython_module_27.html
-share/doc/py-scientific/HTML/ScientificPython_module_28.html
-share/doc/py-scientific/HTML/ScientificPython_module_29.html
-share/doc/py-scientific/HTML/ScientificPython_module_3.html
-share/doc/py-scientific/HTML/ScientificPython_module_30.html
-share/doc/py-scientific/HTML/ScientificPython_module_31.html
-share/doc/py-scientific/HTML/ScientificPython_module_32.html
-share/doc/py-scientific/HTML/ScientificPython_module_33.html
-share/doc/py-scientific/HTML/ScientificPython_module_34.html
-share/doc/py-scientific/HTML/ScientificPython_module_35.html
-share/doc/py-scientific/HTML/ScientificPython_module_4.html
-share/doc/py-scientific/HTML/ScientificPython_module_5.html
-share/doc/py-scientific/HTML/ScientificPython_module_6.html
-share/doc/py-scientific/HTML/ScientificPython_module_7.html
-share/doc/py-scientific/HTML/ScientificPython_module_8.html
-share/doc/py-scientific/HTML/ScientificPython_module_9.html
-share/doc/py-scientific/ScientificPython.xml
-share/doc/py-scientific/ScientificPython_A4.ps
-share/doc/py-scientific/ScientificPython_letter.ps
-share/examples/py-scientific/README
-share/examples/py-scientific/Setup.template
-share/examples/py-scientific/compile.py
-share/examples/py-scientific/demomodule.c
-share/examples/py-scientific/netcdf_demo.py
+%%PORTDOCS%%share/doc/py-scientific/CHANGELOG
+%%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
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_11.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_12.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_13.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_14.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_15.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_16.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_17.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_18.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_19.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_2.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_20.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_21.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_22.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_23.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_24.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_25.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_26.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_27.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_28.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_29.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_3.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_30.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_31.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_32.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_33.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_34.html
+%%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_4.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
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_8.html
+%%PORTDOCS%%share/doc/py-scientific/HTML/Scientific_9.html
+%%PORTDOCS%%share/doc/py-scientific/PDF/manual.pdf
+%%PORTDOCS%%share/doc/py-scientific/XML/Scientific.xml
+%%PORTDOCS%%share/doc/py-scientific/XML/scientific_python.xml
+%%PORTDOCS%%share/examples/py-scientific/README
+%%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/netcdf_demo.py
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/Statistics
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/Physics
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/Scientific/Include
 @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 share/doc/py-scientific/HTML
-@dirrm share/doc/py-scientific
-@dirrm share/examples/py-scientific
+%%PORTDOCS%%@dirrm share/doc/py-scientific/XML
+%%PORTDOCS%%@dirrm share/doc/py-scientific/PDF
+%%PORTDOCS%%@dirrm share/doc/py-scientific/HTML
+%%PORTDOCS%%@dirrm share/doc/py-scientific
+%%PORTDOCS%%@dirrm share/examples/py-scientific