Use USE_PYTHON. Fix building with other python versions than 1.5.2.

3 files changed, 148 insertions, 146 deletions

diff --git a/math/py-scientific/Makefile b/math/py-scientific/Makefile
index 8fd6aecbbd27..ca8e92e750b7 100644
--- a/math/py-scientific/Makefile
+++ b/math/py-scientific/Makefile
@@ -10,35 +10,37 @@ PORTVERSION=	2.0b1
 CATEGORIES=	math python
 MASTER_SITES=	http://starship.python.net/crew/hinsen/ \
 		http://dirac.cnrs-orleans.fr/programs/
-PKGNAMEPREFIX=	py-
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	ScientificPython-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tg@FreeBSD.org
 
 BUILD_DEPENDS=	${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/numpy
 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}
 
-PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
-NUMPYDIR=	${PYTHONSCRIPTDIR}/site-packages/Numeric
-SCIENTIFICDIR=	${PYTHONSCRIPTDIR}/site-packages/Scientific
+NUMPYDIR=	${PYTHON_SITELIBDIR}/Numeric
+SCIENTIFICDIR=	${PYTHON_SITELIBDIR}/Scientific
 DOCDIR=		${PREFIX}/share/doc/py-scientific
 EXAMPLEDIR=	${PREFIX}/share/examples/py-scientific
 
 post-extract:
-	@${CP} ${FILESDIR}/Setup ${WRKSRC}
-	@${CP} ${PYTHONSCRIPTDIR}/config/Makefile.pre.in ${WRKSRC}
+	@${SED} -e "s/%%PYTHON_VERSION%%/${PYTHON_VERSION}/g" \
+		< ${FILESDIR}/Setup > ${WRKSRC}/Setup
+	@${CP} ${PYTHON_LIBDIR}/config/Makefile.pre.in ${WRKSRC}
 
 do-configure:
-	@(cd ${WRKSRC} && ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
+	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
 
 post-install:
 	cd ${WRKDIR}/${DISTNAME}; tar cf - Scientific | \
-	    (cd ${PYTHONSCRIPTDIR}/site-packages; tar xf -)
-	@${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${SCIENTIFICDIR}
-	@${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${SCIENTIFICDIR}
+	    (cd ${PYTHON_SITELIBDIR}; tar xf -)
+	@${PREFIX}/bin/python ${PYTHON_LIBDIR}/compileall.py ${SCIENTIFICDIR}
+	@${PREFIX}/bin/python -O ${PYTHON_LIBDIR}/compileall.py ${SCIENTIFICDIR}
 	@${MKDIR} ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/Examples/* ${EXAMPLEDIR}
 .if !defined(NOPORTDOCS)
diff --git a/math/py-scientific/files/Setup b/math/py-scientific/files/Setup
index ccf81774e778..a8cd38fbc4a1 100644
--- a/math/py-scientific/files/Setup
+++ b/math/py-scientific/files/Setup
@@ -5,4 +5,4 @@
 # 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/python1.5/Numeric -I../Scientific/Include Scientific_netcdf.c -L${PREFIX}/lib -lnetcdf
+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/pkg-plist b/math/py-scientific/pkg-plist
index 89a1669689a5..a4033b147334 100644
--- a/math/py-scientific/pkg-plist
+++ b/math/py-scientific/pkg-plist
@@ -1,128 +1,128 @@
-lib/python1.5/site-packages/Scientific/DictWithDefault.py
-lib/python1.5/site-packages/Scientific/DictWithDefault.pyc
-lib/python1.5/site-packages/Scientific/DictWithDefault.pyo
-lib/python1.5/site-packages/Scientific/Functions/Derivatives.py
-lib/python1.5/site-packages/Scientific/Functions/Derivatives.pyc
-lib/python1.5/site-packages/Scientific/Functions/Derivatives.pyo
-lib/python1.5/site-packages/Scientific/Functions/FindRoot.py
-lib/python1.5/site-packages/Scientific/Functions/FindRoot.pyc
-lib/python1.5/site-packages/Scientific/Functions/FindRoot.pyo
-lib/python1.5/site-packages/Scientific/Functions/FirstDerivatives.py
-lib/python1.5/site-packages/Scientific/Functions/FirstDerivatives.pyc
-lib/python1.5/site-packages/Scientific/Functions/FirstDerivatives.pyo
-lib/python1.5/site-packages/Scientific/Functions/Interpolation.py
-lib/python1.5/site-packages/Scientific/Functions/Interpolation.pyc
-lib/python1.5/site-packages/Scientific/Functions/Interpolation.pyo
-lib/python1.5/site-packages/Scientific/Functions/LeastSquares.py
-lib/python1.5/site-packages/Scientific/Functions/LeastSquares.pyc
-lib/python1.5/site-packages/Scientific/Functions/LeastSquares.pyo
-lib/python1.5/site-packages/Scientific/Functions/Polynomial.py
-lib/python1.5/site-packages/Scientific/Functions/Polynomial.pyc
-lib/python1.5/site-packages/Scientific/Functions/Polynomial.pyo
-lib/python1.5/site-packages/Scientific/Functions/Romberg.py
-lib/python1.5/site-packages/Scientific/Functions/Romberg.pyc
-lib/python1.5/site-packages/Scientific/Functions/Romberg.pyo
-lib/python1.5/site-packages/Scientific/Functions/__init__.py
-lib/python1.5/site-packages/Scientific/Functions/__init__.pyc
-lib/python1.5/site-packages/Scientific/Functions/__init__.pyo
-lib/python1.5/site-packages/Scientific/Geometry/Objects3D.py
-lib/python1.5/site-packages/Scientific/Geometry/Objects3D.pyc
-lib/python1.5/site-packages/Scientific/Geometry/Objects3D.pyo
-lib/python1.5/site-packages/Scientific/Geometry/Quaternion.py
-lib/python1.5/site-packages/Scientific/Geometry/Quaternion.pyc
-lib/python1.5/site-packages/Scientific/Geometry/Quaternion.pyo
-lib/python1.5/site-packages/Scientific/Geometry/TensorAnalysis.py
-lib/python1.5/site-packages/Scientific/Geometry/TensorAnalysis.pyc
-lib/python1.5/site-packages/Scientific/Geometry/TensorAnalysis.pyo
-lib/python1.5/site-packages/Scientific/Geometry/TensorModule.py
-lib/python1.5/site-packages/Scientific/Geometry/TensorModule.pyc
-lib/python1.5/site-packages/Scientific/Geometry/TensorModule.pyo
-lib/python1.5/site-packages/Scientific/Geometry/Transformation.py
-lib/python1.5/site-packages/Scientific/Geometry/Transformation.pyc
-lib/python1.5/site-packages/Scientific/Geometry/Transformation.pyo
-lib/python1.5/site-packages/Scientific/Geometry/VectorModule.py
-lib/python1.5/site-packages/Scientific/Geometry/VectorModule.pyc
-lib/python1.5/site-packages/Scientific/Geometry/VectorModule.pyo
-lib/python1.5/site-packages/Scientific/Geometry/__init__.py
-lib/python1.5/site-packages/Scientific/Geometry/__init__.pyc
-lib/python1.5/site-packages/Scientific/Geometry/__init__.pyo
-lib/python1.5/site-packages/Scientific/IO/ArrayIO.py
-lib/python1.5/site-packages/Scientific/IO/ArrayIO.pyc
-lib/python1.5/site-packages/Scientific/IO/ArrayIO.pyo
-lib/python1.5/site-packages/Scientific/IO/FortranFormat.py
-lib/python1.5/site-packages/Scientific/IO/FortranFormat.pyc
-lib/python1.5/site-packages/Scientific/IO/FortranFormat.pyo
-lib/python1.5/site-packages/Scientific/IO/NetCDF.py
-lib/python1.5/site-packages/Scientific/IO/NetCDF.pyc
-lib/python1.5/site-packages/Scientific/IO/NetCDF.pyo
-lib/python1.5/site-packages/Scientific/IO/PDB.py
-lib/python1.5/site-packages/Scientific/IO/PDB.pyc
-lib/python1.5/site-packages/Scientific/IO/PDB.pyo
-lib/python1.5/site-packages/Scientific/IO/PDBExportFilters.py
-lib/python1.5/site-packages/Scientific/IO/PDBExportFilters.pyc
-lib/python1.5/site-packages/Scientific/IO/PDBExportFilters.pyo
-lib/python1.5/site-packages/Scientific/IO/TextFile.py
-lib/python1.5/site-packages/Scientific/IO/TextFile.pyc
-lib/python1.5/site-packages/Scientific/IO/TextFile.pyo
-lib/python1.5/site-packages/Scientific/IO/__init__.py
-lib/python1.5/site-packages/Scientific/IO/__init__.pyc
-lib/python1.5/site-packages/Scientific/IO/__init__.pyo
-lib/python1.5/site-packages/Scientific/Include/scientific_netcdfmodule.h
-lib/python1.5/site-packages/Scientific/Installation.py
-lib/python1.5/site-packages/Scientific/Installation.pyc
-lib/python1.5/site-packages/Scientific/Installation.pyo
-lib/python1.5/site-packages/Scientific/Mathematica.py
-lib/python1.5/site-packages/Scientific/Mathematica.pyc
-lib/python1.5/site-packages/Scientific/Mathematica.pyo
-lib/python1.5/site-packages/Scientific/NumberDict.py
-lib/python1.5/site-packages/Scientific/NumberDict.pyc
-lib/python1.5/site-packages/Scientific/NumberDict.pyo
-lib/python1.5/site-packages/Scientific/Physics/PhysicalQuantities.py
-lib/python1.5/site-packages/Scientific/Physics/PhysicalQuantities.pyc
-lib/python1.5/site-packages/Scientific/Physics/PhysicalQuantities.pyo
-lib/python1.5/site-packages/Scientific/Physics/Potential.py
-lib/python1.5/site-packages/Scientific/Physics/Potential.pyc
-lib/python1.5/site-packages/Scientific/Physics/Potential.pyo
-lib/python1.5/site-packages/Scientific/Physics/__init__.py
-lib/python1.5/site-packages/Scientific/Physics/__init__.pyc
-lib/python1.5/site-packages/Scientific/Physics/__init__.pyo
-lib/python1.5/site-packages/Scientific/Statistics/Histogram.py
-lib/python1.5/site-packages/Scientific/Statistics/Histogram.pyc
-lib/python1.5/site-packages/Scientific/Statistics/Histogram.pyo
-lib/python1.5/site-packages/Scientific/Statistics/__init__.py
-lib/python1.5/site-packages/Scientific/Statistics/__init__.pyc
-lib/python1.5/site-packages/Scientific/Statistics/__init__.pyo
-lib/python1.5/site-packages/Scientific/TkWidgets/TkPlotCanvas.py
-lib/python1.5/site-packages/Scientific/TkWidgets/TkPlotCanvas.pyc
-lib/python1.5/site-packages/Scientific/TkWidgets/TkPlotCanvas.pyo
-lib/python1.5/site-packages/Scientific/TkWidgets/TkVisualizationCanvas.py
-lib/python1.5/site-packages/Scientific/TkWidgets/TkVisualizationCanvas.pyc
-lib/python1.5/site-packages/Scientific/TkWidgets/TkVisualizationCanvas.pyo
-lib/python1.5/site-packages/Scientific/TkWidgets/__init__.py
-lib/python1.5/site-packages/Scientific/TkWidgets/__init__.pyc
-lib/python1.5/site-packages/Scientific/TkWidgets/__init__.pyo
-lib/python1.5/site-packages/Scientific/Visualization/Color.py
-lib/python1.5/site-packages/Scientific/Visualization/Color.pyc
-lib/python1.5/site-packages/Scientific/Visualization/Color.pyo
-lib/python1.5/site-packages/Scientific/Visualization/VMD.py
-lib/python1.5/site-packages/Scientific/Visualization/VMD.pyc
-lib/python1.5/site-packages/Scientific/Visualization/VMD.pyo
-lib/python1.5/site-packages/Scientific/Visualization/VRML.py
-lib/python1.5/site-packages/Scientific/Visualization/VRML.pyc
-lib/python1.5/site-packages/Scientific/Visualization/VRML.pyo
-lib/python1.5/site-packages/Scientific/Visualization/VRML2.py
-lib/python1.5/site-packages/Scientific/Visualization/VRML2.pyc
-lib/python1.5/site-packages/Scientific/Visualization/VRML2.pyo
-lib/python1.5/site-packages/Scientific/Visualization/__init__.py
-lib/python1.5/site-packages/Scientific/Visualization/__init__.pyc
-lib/python1.5/site-packages/Scientific/Visualization/__init__.pyo
-lib/python1.5/site-packages/Scientific/__init__.py
-lib/python1.5/site-packages/Scientific/__init__.pyc
-lib/python1.5/site-packages/Scientific/__init__.pyo
-lib/python1.5/site-packages/Scientific/indexing.py
-lib/python1.5/site-packages/Scientific/indexing.pyc
-lib/python1.5/site-packages/Scientific/indexing.pyo
-lib/python1.5/site-packages/Scientific_netcdf.so
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/DictWithDefault.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/DictWithDefault.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/DictWithDefault.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/Derivatives.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/Derivatives.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/Derivatives.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/FindRoot.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/FindRoot.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/FindRoot.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/FirstDerivatives.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/FirstDerivatives.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/FirstDerivatives.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/Interpolation.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/Interpolation.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/Interpolation.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/LeastSquares.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/LeastSquares.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/LeastSquares.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/Polynomial.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/Polynomial.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/Polynomial.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/Romberg.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/Romberg.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/Romberg.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Functions/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/Objects3D.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/Objects3D.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/Objects3D.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/Quaternion.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/Quaternion.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/Quaternion.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/TensorAnalysis.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/TensorAnalysis.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/TensorAnalysis.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/TensorModule.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/TensorModule.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/TensorModule.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/Transformation.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/Transformation.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/Transformation.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/VectorModule.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/VectorModule.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/VectorModule.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Geometry/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/ArrayIO.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/ArrayIO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/ArrayIO.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/FortranFormat.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/FortranFormat.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/FortranFormat.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/NetCDF.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/NetCDF.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/NetCDF.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/PDB.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/PDB.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/PDB.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/PDBExportFilters.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/PDBExportFilters.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/PDBExportFilters.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/TextFile.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/IO/TextFile.pyc
+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
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Mathematica.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Mathematica.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Mathematica.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/NumberDict.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/NumberDict.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/NumberDict.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Physics/PhysicalQuantities.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Physics/PhysicalQuantities.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Physics/PhysicalQuantities.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Physics/Potential.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Physics/Potential.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Physics/Potential.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Physics/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Physics/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Physics/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Statistics/Histogram.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Statistics/Histogram.pyc
+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/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/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/TkWidgets/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/Color.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/Color.pyc
+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/VRML.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/VRML.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/VRML.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/VRML2.py
+lib/%%PYTHON_VERSION%%/site-packages/Scientific/Visualization/VRML2.pyc
+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/__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
 share/doc/py-scientific/.redo_ScientificPython
 share/doc/py-scientific/HTML/ScientificPython.html
 share/doc/py-scientific/HTML/ScientificPython_module_1.html
@@ -168,15 +168,15 @@ 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
-@dirrm lib/python1.5/site-packages/Scientific/Visualization
-@dirrm lib/python1.5/site-packages/Scientific/TkWidgets
-@dirrm lib/python1.5/site-packages/Scientific/Statistics
-@dirrm lib/python1.5/site-packages/Scientific/Physics
-@dirrm lib/python1.5/site-packages/Scientific/Include
-@dirrm lib/python1.5/site-packages/Scientific/IO
-@dirrm lib/python1.5/site-packages/Scientific/Geometry
-@dirrm lib/python1.5/site-packages/Scientific/Functions
-@dirrm lib/python1.5/site-packages/Scientific
+@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