summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2004-04-24 21:01:28 +0000
committerwiz <wiz@pkgsrc.org>2004-04-24 21:01:28 +0000
commit35bc4b8404f3bb372ac1c6b5cabea680f87b10a6 (patch)
tree2ab7a10d7f29a466b9b218e58ac294b72b6ca1c4 /math
parent46ffcd5d8b67ae94a6860b58e22c8abadcdc31e3 (diff)
downloadpkgsrc-35bc4b8404f3bb372ac1c6b5cabea680f87b10a6.tar.gz
Convert to bl3, and fix PLIST on NetBSD-2*.
Diffstat (limited to 'math')
-rw-r--r--math/py-Scientific/Makefile13
-rw-r--r--math/py-Scientific/PLIST6
2 files changed, 10 insertions, 9 deletions
diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile
index 0dad3fcf306..0ada01344a8 100644
--- a/math/py-Scientific/Makefile
+++ b/math/py-Scientific/Makefile
@@ -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 @@ CONFLICTS+= py-Scientific-*
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 @@ MAKE_ENV+= NETCDF_PREFIX=${LOCALBASE}
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 @@ post-install:
${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 --git a/math/py-Scientific/PLIST b/math/py-Scientific/PLIST
index b627ece1e45..d019db82fa8 100644
--- a/math/py-Scientific/PLIST
+++ b/math/py-Scientific/PLIST
@@ -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/__init__.pyo
${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