move to canonical pkg name (pyX.Y-pkg-vers),

append version suffix to extended python interpreter,
don't install docs (separate pkg now)

2 files changed, 9 insertions, 69 deletions

diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile
index 5e75b7877af..4d365d2e8da 100644
--- a/math/py-Scientific/Makefile
+++ b/math/py-Scientific/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2002/01/16 20:32:42 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2002/01/17 12:02:25 drochner Exp $
 
 DISTNAME=	ScientificPython-2.2
-PKGNAME=	py-Scientific-2.2
+PKGNAME=	${PYPKGPREFIX}-Scientific-2.2
 CATEGORIES=	math
 MASTER_SITES=	http://starship.python.net/crew/hinsen/ \
 		http://dirac.cnrs-orleans.fr/programs/
@@ -10,6 +10,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://starship.python.net/crew/hinsen/scientific.html
 COMMENT=	Python modules for scientific computing
 
+CONFLICTS+=	py-Scientific-*
+
 DEPENDS+=	netcdf>=3.0:../../devel/netcdf
 DEPENDS+=	mpich>=1.2.1:../../parallel/mpi-ch
 BUILDLINK_DEPENDS.python20=	python20>=2.0.1nb1
@@ -22,6 +24,7 @@ PYBINMODULE=	yes
 NETCDFPREFIX_DEFAULT=${LOCALBASE}
 MPICHPREFIX_DEFAULT=${LOCALBASE}
 EVAL_PREFIX+=	NETCDFPREFIX=netcdf MPICHPREFIX=mpich
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 do-configure:
 	${SED} -e "s|@NETCDFPREFIX@|${NETCDFPREFIX}|g"			\
@@ -35,16 +38,8 @@ post-build:
 	cd ${WRKSRC}/Src/MPI && ${PYTHONBIN} compile.py
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Src/MPI/mpipython ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-Scientific
-	cd ${WRKSRC} && ${INSTALL_DATA} README COPYRIGHT 		\
-		Doc/PDF/manual.pdf ${PREFIX}/share/doc/py-Scientific/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/py-Scientific
-	${INSTALL_DATA} ${WRKSRC}/Doc/HTML/* 				\
-	${PREFIX}/share/doc/html/py-Scientific/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-Scientific
-	${INSTALL_DATA} ${WRKSRC}/Examples/* 				\
-	${PREFIX}/share/examples/py-Scientific/
+	${INSTALL_PROGRAM} ${WRKSRC}/Src/MPI/mpipython \
+		${PREFIX}/bin/mpipython${PYVERSSUFFIX}
 
 .include "../../lang/python/extension.buildlink.mk"
 .include "../../math/py-Numeric/buildlink.mk"
diff --git a/math/py-Scientific/PLIST b/math/py-Scientific/PLIST
index ded197c309d..452ba4c0a1a 100644
--- a/math/py-Scientific/PLIST
+++ b/math/py-Scientific/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/16 19:45:27 drochner Exp $
-bin/mpipython
+@comment $NetBSD: PLIST,v 1.3 2002/01/17 12:02:25 drochner Exp $
+bin/mpipython${PYVERSSUFFIX}
 ${PYINC}/Scientific/PyMPI_API.h
 ${PYINC}/Scientific/mpimodule.h
 ${PYINC}/Scientific/netcdfmodule.h
@@ -98,58 +98,6 @@ ${PYSITELIB}/Scientific/Mathematica.pyc
 ${PYSITELIB}/Scientific/NumberDict.pyc
 ${PYSITELIB}/Scientific/__init__.pyc
 ${PYSITELIB}/Scientific/indexing.pyc
-share/doc/html/py-Scientific/Scientific.html
-share/doc/html/py-Scientific/Scientific_1.html
-share/doc/html/py-Scientific/Scientific_10.html
-share/doc/html/py-Scientific/Scientific_11.html
-share/doc/html/py-Scientific/Scientific_12.html
-share/doc/html/py-Scientific/Scientific_13.html
-share/doc/html/py-Scientific/Scientific_14.html
-share/doc/html/py-Scientific/Scientific_15.html
-share/doc/html/py-Scientific/Scientific_16.html
-share/doc/html/py-Scientific/Scientific_17.html
-share/doc/html/py-Scientific/Scientific_18.html
-share/doc/html/py-Scientific/Scientific_19.html
-share/doc/html/py-Scientific/Scientific_2.html
-share/doc/html/py-Scientific/Scientific_20.html
-share/doc/html/py-Scientific/Scientific_21.html
-share/doc/html/py-Scientific/Scientific_22.html
-share/doc/html/py-Scientific/Scientific_23.html
-share/doc/html/py-Scientific/Scientific_24.html
-share/doc/html/py-Scientific/Scientific_25.html
-share/doc/html/py-Scientific/Scientific_26.html
-share/doc/html/py-Scientific/Scientific_27.html
-share/doc/html/py-Scientific/Scientific_28.html
-share/doc/html/py-Scientific/Scientific_29.html
-share/doc/html/py-Scientific/Scientific_3.html
-share/doc/html/py-Scientific/Scientific_30.html
-share/doc/html/py-Scientific/Scientific_31.html
-share/doc/html/py-Scientific/Scientific_32.html
-share/doc/html/py-Scientific/Scientific_33.html
-share/doc/html/py-Scientific/Scientific_34.html
-share/doc/html/py-Scientific/Scientific_35.html
-share/doc/html/py-Scientific/Scientific_36.html
-share/doc/html/py-Scientific/Scientific_37.html
-share/doc/html/py-Scientific/Scientific_38.html
-share/doc/html/py-Scientific/Scientific_39.html
-share/doc/html/py-Scientific/Scientific_4.html
-share/doc/html/py-Scientific/Scientific_40.html
-share/doc/html/py-Scientific/Scientific_41.html
-share/doc/html/py-Scientific/Scientific_42.html
-share/doc/html/py-Scientific/Scientific_5.html
-share/doc/html/py-Scientific/Scientific_6.html
-share/doc/html/py-Scientific/Scientific_7.html
-share/doc/html/py-Scientific/Scientific_8.html
-share/doc/html/py-Scientific/Scientific_9.html
-share/doc/py-Scientific/COPYRIGHT
-share/doc/py-Scientific/README
-share/doc/py-Scientific/manual.pdf
-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/mpi.py
-share/examples/py-Scientific/netcdf_demo.py
 @dirrm ${PYINC}/Scientific
 @dirrm ${PYSITELIB}/Scientific/Functions
 @dirrm ${PYSITELIB}/Scientific/Geometry
@@ -162,6 +110,3 @@ share/examples/py-Scientific/netcdf_demo.py
 @dirrm ${PYSITELIB}/Scientific/Visualization
 @dirrm ${PYSITELIB}/Scientific/${LOWER_OPSYS}1
 @dirrm ${PYSITELIB}/Scientific
-@dirrm share/examples/py-Scientific
-@dirrm share/doc/py-Scientific
-@dirrm share/doc/html/py-Scientific