summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtb <jtb>2001-03-25 21:43:02 +0000
committerjtb <jtb>2001-03-25 21:43:02 +0000
commitd139d0e976d4dfe976069ff6946ff78490abe892 (patch)
treee89e13cb85a31b48f394d6cbff0b78f19564f11a
parentde2512851fd92c1e30e6a7f51e2b03bc95562709 (diff)
downloadpkgsrc-d139d0e976d4dfe976069ff6946ff78490abe892.tar.gz
Changed the build process to work with the recently updated mpi-ch package
which installs its parts in locations different to the previous version.
-rw-r--r--math/py-Scientific/Makefile4
-rw-r--r--math/py-Scientific/files/Setup.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile
index 05247bbeede..c1578a0eeb6 100644
--- a/math/py-Scientific/Makefile
+++ b/math/py-Scientific/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 18:22:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/03/25 21:43:02 jtb Exp $
DISTNAME= ScientificPython-2.0.1
PKGNAME= py-Scientific-2.0.1
@@ -12,7 +12,7 @@ COMMENT= Python modules for scientific computing
DEPENDS+= python>=1.5:../../lang/python
DEPENDS+= netcdf>=3.0:../../devel/netcdf
-DEPENDS+= mpich-[0-9]*:../../parallel/mpi-ch
+DEPENDS+= mpich->=1.2.1:../../parallel/mpi-ch
DEPENDS+= py-Numeric-[0-9]*:../../math/py-Numeric
.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "vax"
diff --git a/math/py-Scientific/files/Setup.in b/math/py-Scientific/files/Setup.in
index a94517d3422..a3a8f706eb7 100644
--- a/math/py-Scientific/files/Setup.in
+++ b/math/py-Scientific/files/Setup.in
@@ -2,4 +2,4 @@
Scientific_netcdf -I@NETCDFPREFIX@/include -I../Scientific/Include \
Scientific_netcdf.c -Wl,-R@NETCDFPREFIX@/lib -L@NETCDFPREFIX@/lib -lnetcdf
-Scientific_mpi -I@MPICHPREFIX@/include -I@MPICHPREFIX@/libdata/netbsd/ch_p4/ -I../Scientific/Include Scientific_mpi.c -L@MPICHPREFIX@/libdata/netbsd/ch_p4/ -lmpich
+Scientific_mpi -I@MPICHPREFIX@/include -I@MPICHPREFIX@/include -I../Scientific/Include Scientific_mpi.c -L@MPICHPREFIX@/lib -lmpich