diff options
| author | wiz <wiz> | 2002-10-09 17:38:02 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2002-10-09 17:38:02 +0000 |
| commit | 75e2472d484a333eb50784df7dc6169d01003046 (patch) | |
| tree | 47618a3f317ef5ba14f33b1ccf6909e13a580fa9 | |
| parent | 508e63dc61d49931b7884be97d25eef5bbaa3292 (diff) | |
| download | pkgsrc-75e2472d484a333eb50784df7dc6169d01003046.tar.gz | |
buildlink1 -> buildlink2.
| -rw-r--r-- | lang/gauche/Makefile | 9 | ||||
| -rw-r--r-- | math/py-Scientific/Makefile | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile index 0d165b81cf6..f419ca04af3 100644 --- a/lang/gauche/Makefile +++ b/lang/gauche/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/10/02 08:25:13 minoura Exp $ +# $NetBSD: Makefile,v 1.9 2002/10/09 17:38:02 wiz Exp $ # DISTNAME= Gauche-0.6.3 @@ -26,8 +26,9 @@ BROKEN=Test required on NetBSD/i386 a.out .endif GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-slib=${PREFIX}/share/slib -CONFIGURE_ARGS+= --with-iconv=${PREFIX} --with-iconv-lib=iconv +USE_BUILDLINK2= yes +CONFIGURE_ARGS+= --with-slib=${LOCALBASE}/share/slib +CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.libiconv} --with-iconv-lib=iconv CONFIGURE_ENV+= AS="${CC} -x assembler-with-cpp -c" INFO_FILES= gauche-refe.info gauche-refj.info @@ -37,6 +38,6 @@ INFO_FILES= gauche-refe.info gauche-refj.info CONFIGURE_ARGS+= --enable-multibyte=${GAUCHE_MULTIBYTE} .endif -.include "../../converters/libiconv/buildlink.mk" +.include "../../converters/libiconv/buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile index 8e812109859..f510ac4d421 100644 --- a/math/py-Scientific/Makefile +++ b/math/py-Scientific/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/09/21 23:46:54 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2002/10/09 17:39:55 wiz Exp $ DISTNAME= ScientificPython-2.2 PKGNAME= ${PYPKGPREFIX}-Scientific-2.2 @@ -12,12 +12,12 @@ 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 BUILDLINK_DEPENDS.python21= python21>=2.1.1nb1 PYTHON_VERSIONS_ACCEPTED= 20 21 # doesn't compile for 22 +USE_BUILDLINK2= yes PYDISTUTILSPKG= yes PYBINMODULE= yes @@ -41,6 +41,7 @@ post-install: ${INSTALL_PROGRAM} ${WRKSRC}/Src/MPI/mpipython \ ${PREFIX}/bin/mpipython${PYVERSSUFFIX} +.include "../../devel/netcdf/buildlink2.mk" .include "../../lang/python/extension.mk" -.include "../../math/py-Numeric/buildlink.mk" +.include "../../math/py-Numeric/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |