hange extension.mk to also install optimized files for distutils packages.

Inspired by FreeBSD "ports".

Fix the PLISTs accordingly.
Also, while at it, remove now obsolete compileall.py calls in post-install
targets and insure that extension.mk is in included before builinlinks of
other Python modules.

Discussed with/ok'ed by drochner@.

3 files changed, 106 insertions, 57 deletions

diff --git a/math/py-Scientific/PLIST b/math/py-Scientific/PLIST
index 452ba4c0a1a..9fd59c9f53d 100644
--- a/math/py-Scientific/PLIST
+++ b/math/py-Scientific/PLIST
@@ -1,112 +1,159 @@
-@comment $NetBSD: PLIST,v 1.3 2002/01/17 12:02:25 drochner Exp $
-bin/mpipython${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.4 2003/09/14 16:43:51 recht Exp $
+bin/mpipython2.0
 ${PYINC}/Scientific/PyMPI_API.h
 ${PYINC}/Scientific/mpimodule.h
 ${PYINC}/Scientific/netcdfmodule.h
 ${PYSITELIB}/Scientific/DictWithDefault.py
-${PYSITELIB}/Scientific/Installation.py
-${PYSITELIB}/Scientific/Mathematica.py
-${PYSITELIB}/Scientific/NumberDict.py
-${PYSITELIB}/Scientific/__init__.py
-${PYSITELIB}/Scientific/indexing.py
+${PYSITELIB}/Scientific/DictWithDefault.pyc
+${PYSITELIB}/Scientific/DictWithDefault.pyo
 ${PYSITELIB}/Scientific/Functions/Derivatives.py
-${PYSITELIB}/Scientific/Functions/FindRoot.py
-${PYSITELIB}/Scientific/Functions/FirstDerivatives.py
-${PYSITELIB}/Scientific/Functions/Interpolation.py
-${PYSITELIB}/Scientific/Functions/LeastSquares.py
-${PYSITELIB}/Scientific/Functions/Polynomial.py
-${PYSITELIB}/Scientific/Functions/Romberg.py
-${PYSITELIB}/Scientific/Functions/__init__.py
 ${PYSITELIB}/Scientific/Functions/Derivatives.pyc
+${PYSITELIB}/Scientific/Functions/Derivatives.pyo
+${PYSITELIB}/Scientific/Functions/FindRoot.py
 ${PYSITELIB}/Scientific/Functions/FindRoot.pyc
+${PYSITELIB}/Scientific/Functions/FindRoot.pyo
+${PYSITELIB}/Scientific/Functions/FirstDerivatives.py
 ${PYSITELIB}/Scientific/Functions/FirstDerivatives.pyc
+${PYSITELIB}/Scientific/Functions/FirstDerivatives.pyo
+${PYSITELIB}/Scientific/Functions/Interpolation.py
 ${PYSITELIB}/Scientific/Functions/Interpolation.pyc
+${PYSITELIB}/Scientific/Functions/Interpolation.pyo
+${PYSITELIB}/Scientific/Functions/LeastSquares.py
 ${PYSITELIB}/Scientific/Functions/LeastSquares.pyc
+${PYSITELIB}/Scientific/Functions/LeastSquares.pyo
+${PYSITELIB}/Scientific/Functions/Polynomial.py
 ${PYSITELIB}/Scientific/Functions/Polynomial.pyc
+${PYSITELIB}/Scientific/Functions/Polynomial.pyo
+${PYSITELIB}/Scientific/Functions/Romberg.py
 ${PYSITELIB}/Scientific/Functions/Romberg.pyc
+${PYSITELIB}/Scientific/Functions/Romberg.pyo
+${PYSITELIB}/Scientific/Functions/__init__.py
 ${PYSITELIB}/Scientific/Functions/__init__.pyc
+${PYSITELIB}/Scientific/Functions/__init__.pyo
 ${PYSITELIB}/Scientific/Geometry/Objects3D.py
-${PYSITELIB}/Scientific/Geometry/Quaternion.py
-${PYSITELIB}/Scientific/Geometry/TensorAnalysis.py
-${PYSITELIB}/Scientific/Geometry/TensorModule.py
-${PYSITELIB}/Scientific/Geometry/Transformation.py
-${PYSITELIB}/Scientific/Geometry/VectorModule.py
-${PYSITELIB}/Scientific/Geometry/__init__.py
 ${PYSITELIB}/Scientific/Geometry/Objects3D.pyc
+${PYSITELIB}/Scientific/Geometry/Objects3D.pyo
+${PYSITELIB}/Scientific/Geometry/Quaternion.py
 ${PYSITELIB}/Scientific/Geometry/Quaternion.pyc
+${PYSITELIB}/Scientific/Geometry/Quaternion.pyo
+${PYSITELIB}/Scientific/Geometry/TensorAnalysis.py
 ${PYSITELIB}/Scientific/Geometry/TensorAnalysis.pyc
+${PYSITELIB}/Scientific/Geometry/TensorAnalysis.pyo
+${PYSITELIB}/Scientific/Geometry/TensorModule.py
 ${PYSITELIB}/Scientific/Geometry/TensorModule.pyc
+${PYSITELIB}/Scientific/Geometry/TensorModule.pyo
+${PYSITELIB}/Scientific/Geometry/Transformation.py
 ${PYSITELIB}/Scientific/Geometry/Transformation.pyc
+${PYSITELIB}/Scientific/Geometry/Transformation.pyo
+${PYSITELIB}/Scientific/Geometry/VectorModule.py
 ${PYSITELIB}/Scientific/Geometry/VectorModule.pyc
+${PYSITELIB}/Scientific/Geometry/VectorModule.pyo
+${PYSITELIB}/Scientific/Geometry/__init__.py
 ${PYSITELIB}/Scientific/Geometry/__init__.pyc
+${PYSITELIB}/Scientific/Geometry/__init__.pyo
 ${PYSITELIB}/Scientific/IO/ArrayIO.py
-${PYSITELIB}/Scientific/IO/FortranFormat.py
-${PYSITELIB}/Scientific/IO/NetCDF.py
-${PYSITELIB}/Scientific/IO/PDB.py
-${PYSITELIB}/Scientific/IO/PDBExportFilters.py
-${PYSITELIB}/Scientific/IO/TextFile.py
-${PYSITELIB}/Scientific/IO/__init__.py
 ${PYSITELIB}/Scientific/IO/ArrayIO.pyc
+${PYSITELIB}/Scientific/IO/ArrayIO.pyo
+${PYSITELIB}/Scientific/IO/FortranFormat.py
 ${PYSITELIB}/Scientific/IO/FortranFormat.pyc
+${PYSITELIB}/Scientific/IO/FortranFormat.pyo
+${PYSITELIB}/Scientific/IO/NetCDF.py
 ${PYSITELIB}/Scientific/IO/NetCDF.pyc
+${PYSITELIB}/Scientific/IO/NetCDF.pyo
+${PYSITELIB}/Scientific/IO/PDB.py
 ${PYSITELIB}/Scientific/IO/PDB.pyc
+${PYSITELIB}/Scientific/IO/PDB.pyo
+${PYSITELIB}/Scientific/IO/PDBExportFilters.py
 ${PYSITELIB}/Scientific/IO/PDBExportFilters.pyc
+${PYSITELIB}/Scientific/IO/PDBExportFilters.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/MPI/IO.py
-${PYSITELIB}/Scientific/MPI/__init__.py
 ${PYSITELIB}/Scientific/MPI/IO.pyc
+${PYSITELIB}/Scientific/MPI/IO.pyo
+${PYSITELIB}/Scientific/MPI/__init__.py
 ${PYSITELIB}/Scientific/MPI/__init__.pyc
+${PYSITELIB}/Scientific/MPI/__init__.pyo
+${PYSITELIB}/Scientific/Mathematica.py
+${PYSITELIB}/Scientific/Mathematica.pyc
+${PYSITELIB}/Scientific/Mathematica.pyo
+${PYSITELIB}/Scientific/NumberDict.py
+${PYSITELIB}/Scientific/NumberDict.pyc
+${PYSITELIB}/Scientific/NumberDict.pyo
 ${PYSITELIB}/Scientific/Physics/PhysicalQuantities.py
-${PYSITELIB}/Scientific/Physics/Potential.py
-${PYSITELIB}/Scientific/Physics/__init__.py
 ${PYSITELIB}/Scientific/Physics/PhysicalQuantities.pyc
+${PYSITELIB}/Scientific/Physics/PhysicalQuantities.pyo
+${PYSITELIB}/Scientific/Physics/Potential.py
 ${PYSITELIB}/Scientific/Physics/Potential.pyc
+${PYSITELIB}/Scientific/Physics/Potential.pyo
+${PYSITELIB}/Scientific/Physics/__init__.py
 ${PYSITELIB}/Scientific/Physics/__init__.pyc
+${PYSITELIB}/Scientific/Physics/__init__.pyo
 ${PYSITELIB}/Scientific/Statistics/Histogram.py
-${PYSITELIB}/Scientific/Statistics/__init__.py
 ${PYSITELIB}/Scientific/Statistics/Histogram.pyc
+${PYSITELIB}/Scientific/Statistics/Histogram.pyo
+${PYSITELIB}/Scientific/Statistics/__init__.py
 ${PYSITELIB}/Scientific/Statistics/__init__.pyc
+${PYSITELIB}/Scientific/Statistics/__init__.pyo
 ${PYSITELIB}/Scientific/Threading/TaskManager.py
-${PYSITELIB}/Scientific/Threading/__init__.py
 ${PYSITELIB}/Scientific/Threading/TaskManager.pyc
+${PYSITELIB}/Scientific/Threading/TaskManager.pyo
+${PYSITELIB}/Scientific/Threading/__init__.py
 ${PYSITELIB}/Scientific/Threading/__init__.pyc
+${PYSITELIB}/Scientific/Threading/__init__.pyo
 ${PYSITELIB}/Scientific/TkWidgets/TkPlotCanvas.py
-${PYSITELIB}/Scientific/TkWidgets/TkVisualizationCanvas.py
-${PYSITELIB}/Scientific/TkWidgets/Utility.py
-${PYSITELIB}/Scientific/TkWidgets/__init__.py
 ${PYSITELIB}/Scientific/TkWidgets/TkPlotCanvas.pyc
+${PYSITELIB}/Scientific/TkWidgets/TkPlotCanvas.pyo
+${PYSITELIB}/Scientific/TkWidgets/TkVisualizationCanvas.py
 ${PYSITELIB}/Scientific/TkWidgets/TkVisualizationCanvas.pyc
+${PYSITELIB}/Scientific/TkWidgets/TkVisualizationCanvas.pyo
+${PYSITELIB}/Scientific/TkWidgets/Utility.py
 ${PYSITELIB}/Scientific/TkWidgets/Utility.pyc
+${PYSITELIB}/Scientific/TkWidgets/Utility.pyo
+${PYSITELIB}/Scientific/TkWidgets/__init__.py
 ${PYSITELIB}/Scientific/TkWidgets/__init__.pyc
+${PYSITELIB}/Scientific/TkWidgets/__init__.pyo
 ${PYSITELIB}/Scientific/Visualization/Color.py
-${PYSITELIB}/Scientific/Visualization/VMD.py
-${PYSITELIB}/Scientific/Visualization/VPython.py
-${PYSITELIB}/Scientific/Visualization/VRML.py
-${PYSITELIB}/Scientific/Visualization/VRML2.py
-${PYSITELIB}/Scientific/Visualization/__init__.py
 ${PYSITELIB}/Scientific/Visualization/Color.pyc
+${PYSITELIB}/Scientific/Visualization/Color.pyo
+${PYSITELIB}/Scientific/Visualization/VMD.py
 ${PYSITELIB}/Scientific/Visualization/VMD.pyc
+${PYSITELIB}/Scientific/Visualization/VMD.pyo
+${PYSITELIB}/Scientific/Visualization/VPython.py
 ${PYSITELIB}/Scientific/Visualization/VPython.pyc
+${PYSITELIB}/Scientific/Visualization/VPython.pyo
+${PYSITELIB}/Scientific/Visualization/VRML.py
 ${PYSITELIB}/Scientific/Visualization/VRML.pyc
+${PYSITELIB}/Scientific/Visualization/VRML.pyo
+${PYSITELIB}/Scientific/Visualization/VRML2.py
 ${PYSITELIB}/Scientific/Visualization/VRML2.pyc
+${PYSITELIB}/Scientific/Visualization/VRML2.pyo
+${PYSITELIB}/Scientific/Visualization/__init__.py
 ${PYSITELIB}/Scientific/Visualization/__init__.pyc
-${PYSITELIB}/Scientific/${LOWER_OPSYS}1/Scientific_netcdf.so
-${PYSITELIB}/Scientific/DictWithDefault.pyc
-${PYSITELIB}/Scientific/Installation.pyc
-${PYSITELIB}/Scientific/Mathematica.pyc
-${PYSITELIB}/Scientific/NumberDict.pyc
+${PYSITELIB}/Scientific/Visualization/__init__.pyo
+${PYSITELIB}/Scientific/__init__.py
 ${PYSITELIB}/Scientific/__init__.pyc
+${PYSITELIB}/Scientific/__init__.pyo
+${PYSITELIB}/Scientific/indexing.py
 ${PYSITELIB}/Scientific/indexing.pyc
-@dirrm ${PYINC}/Scientific
-@dirrm ${PYSITELIB}/Scientific/Functions
-@dirrm ${PYSITELIB}/Scientific/Geometry
-@dirrm ${PYSITELIB}/Scientific/IO
-@dirrm ${PYSITELIB}/Scientific/MPI
-@dirrm ${PYSITELIB}/Scientific/Physics
-@dirrm ${PYSITELIB}/Scientific/Statistics
-@dirrm ${PYSITELIB}/Scientific/Threading
-@dirrm ${PYSITELIB}/Scientific/TkWidgets
-@dirrm ${PYSITELIB}/Scientific/Visualization
+${PYSITELIB}/Scientific/indexing.pyo
+${PYSITELIB}/Scientific/${LOWER_OPSYS}1/Scientific_netcdf.so
 @dirrm ${PYSITELIB}/Scientific/${LOWER_OPSYS}1
+@dirrm ${PYSITELIB}/Scientific/Visualization
+@dirrm ${PYSITELIB}/Scientific/TkWidgets
+@dirrm ${PYSITELIB}/Scientific/Threading
+@dirrm ${PYSITELIB}/Scientific/Statistics
+@dirrm ${PYSITELIB}/Scientific/Physics
+@dirrm ${PYSITELIB}/Scientific/MPI
+@dirrm ${PYSITELIB}/Scientific/IO
+@dirrm ${PYSITELIB}/Scientific/Geometry
+@dirrm ${PYSITELIB}/Scientific/Functions
 @dirrm ${PYSITELIB}/Scientific
+@dirrm ${PYINC}/Scientific
diff --git a/math/py-rpy/Makefile b/math/py-rpy/Makefile
index 6fe42d29397..3defa191994 100644
--- a/math/py-rpy/Makefile
+++ b/math/py-rpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:48:04 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/14 16:43:51 recht Exp $
 #
 
 DISTNAME=	rpy-0.3
@@ -13,7 +13,7 @@ COMMENT=	R interface for Python
 USE_BUILDLINK2=	YES
 PYDISTUTILSPKG=	yes
 
+.include "../../lang/python/extension.mk"
 .include "../../math/py-Numeric/buildlink2.mk"
 .include "../../math/R/buildlink2.mk"
-.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-rpy/PLIST b/math/py-rpy/PLIST
index 7fbe5a701c7..f8d6d4e0068 100644
--- a/math/py-rpy/PLIST
+++ b/math/py-rpy/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/10 12:30:58 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/14 16:43:51 recht Exp $
 ${PYSITELIB}/rpy.py
 ${PYSITELIB}/rpy.pyc
+${PYSITELIB}/rpy.pyo
 ${PYSITELIB}/io.py
 ${PYSITELIB}/io.pyc
+${PYSITELIB}/io.pyo
 ${PYSITELIB}/_rpymodule.so