[pkgsrc/trunk]: pkgsrc/math/py-Scientific Convert to bl3, and fix PLIST on Ne...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/20fba1077d55
branches:  trunk
changeset: 473808:20fba1077d55
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Apr 24 21:01:28 2004 +0000

description:
Convert to bl3, and fix PLIST on NetBSD-2*.

diffstat:

 math/py-Scientific/Makefile |  13 +++++++------
 math/py-Scientific/PLIST    |   6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (60 lines):

diff -r c4b894c5a74c -r 20fba1077d55 math/py-Scientific/Makefile
--- a/math/py-Scientific/Makefile       Sat Apr 24 21:00:07 2004 +0000
+++ b/math/py-Scientific/Makefile       Sat Apr 24 21:01:28 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/02/12 16:53:50 recht Exp $
+# $NetBSD: Makefile,v 1.19 2004/04/24 21:01:28 wiz Exp $
 
 DISTNAME=      ScientificPython-2.4.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/Python//}
@@ -15,7 +15,7 @@
 BUILDLINK_DEPENDS.python20=    python20>=2.0.1nb1
 BUILDLINK_DEPENDS.python21=    python21>=2.1.1nb1
 
-USE_BUILDLINK2=        yes
+USE_BUILDLINK3=        yes
 PYDISTUTILSPKG=        yes
 PYBINMODULE=   yes
 
@@ -23,6 +23,7 @@
 
 EVAL_PREFIX+=  NETCDFPREFIX=netcdf MPICHPREFIX=mpich
 PLIST_SUBST+=  PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+=  OSVER=${OS_VERSION:C/^(.).*/\1/}
 
 post-build:
        @(cd ${WRKSRC}/Src/MPI && ${SETENV} CFLAGS="${CFLAGS}" \
@@ -32,9 +33,9 @@
        ${INSTALL_PROGRAM} ${WRKSRC}/Src/MPI/mpipython \
                ${PREFIX}/bin/mpipython${PYVERSSUFFIX}
 
-.include "../../devel/netcdf/buildlink2.mk"
+.include "../../devel/netcdf/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-.include "../../math/py-Numeric/buildlink2.mk"
-.include "../../parallel/mpi-ch/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../math/py-Numeric/buildlink3.mk"
+.include "../../parallel/mpi-ch/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c4b894c5a74c -r 20fba1077d55 math/py-Scientific/PLIST
--- a/math/py-Scientific/PLIST  Sat Apr 24 21:00:07 2004 +0000
+++ b/math/py-Scientific/PLIST  Sat Apr 24 21:01:28 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/01/18 23:57:50 recht Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/04/24 21:01:28 wiz Exp $
 bin/mpipython${PYVERSSUFFIX}
 ${PYINC}/Scientific/PyBSP_API.h
 ${PYINC}/Scientific/PyMPI_API.h
@@ -170,8 +170,8 @@
 ${PYSITELIB}/Scientific/indexing.py
 ${PYSITELIB}/Scientific/indexing.pyc
 ${PYSITELIB}/Scientific/indexing.pyo
-${PYSITELIB}/Scientific/${LOWER_OPSYS}1/Scientific_netcdf.so
-@dirrm ${PYSITELIB}/Scientific/${LOWER_OPSYS}1
+${PYSITELIB}/Scientific/${LOWER_OPSYS}${OSVER}/Scientific_netcdf.so
+@dirrm ${PYSITELIB}/Scientific/${LOWER_OPSYS}${OSVER}
 @dirrm ${PYSITELIB}/Scientific/Visualization
 @dirrm ${PYSITELIB}/Scientific/TkWidgets
 @dirrm ${PYSITELIB}/Scientific/Threading