From dd82c3374a510a82280213f437ea3bd18955650b Mon Sep 17 00:00:00 2001 From: snj Date: Tue, 27 Apr 2004 21:26:08 +0000 Subject: Convert to buildlink3. --- math/R/buildlink2.mk | 27 --------------------------- math/R/buildlink3.mk | 19 +++++++++++++++++++ math/octave/Makefile | 4 ++-- math/p5-Math-Bezier/Makefile | 4 ++-- math/p5-Math-Interpolate/Makefile | 4 ++-- math/p5-Math-MatrixReal/Makefile | 4 ++-- math/p5-Math-Pari/Makefile | 4 ++-- math/p5-Number-Latin/Makefile | 4 ++-- math/p5-Spreadsheet-ParseExcel/Makefile | 4 ++-- math/p5-Spreadsheet-WriteExcel/Makefile | 4 ++-- math/py-rpy/Makefile | 8 ++++---- math/tela/Makefile | 16 ++++++++-------- 12 files changed, 47 insertions(+), 55 deletions(-) delete mode 100644 math/R/buildlink2.mk create mode 100644 math/R/buildlink3.mk (limited to 'math') diff --git a/math/R/buildlink2.mk b/math/R/buildlink2.mk deleted file mode 100644 index 63c0b50fd43..00000000000 --- a/math/R/buildlink2.mk +++ /dev/null @@ -1,27 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.3 2003/12/03 12:05:18 markd Exp $ -# -# This Makefile fragment is included by packages that use the R shared library. -# - -.if !defined(R_BUILDLINK2_MK) -R_BUILDLINK2_MK= # defined - -BUILDLINK_PACKAGES+= R -BUILDLINK_DEPENDS.R?= R>=1.7.0 -BUILDLINK_PKGSRCDIR.R?= ../../math/R - -EVAL_PREFIX+= BUILDLINK_PREFIX.R=R -BUILDLINK_PREFIX.R_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.R= lib/R/bin/libR.* -BUILDLINK_FILES.R+= lib/R/include/* -BUILDLINK_FILES.R+= lib/R/include/R_ext/* - -BUILDLINK_CPPFLAGS.R= -I${BUILDLINK_PREFIX.R}/lib/R/include -BUILDLINK_LDFLAGS.R= -L${BUILDLINK_PREFIX.R}/lib/R/bin -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.R}/lib/R/bin -FIX_RPATH+= BUILDLINK_LDFLAGS.R - -BUILDLINK_TARGETS+= R-buildlink - -R-buildlink: _BUILDLINK_USE - -.endif # R_BUILDLINK2_MK diff --git a/math/R/buildlink3.mk b/math/R/buildlink3.mk new file mode 100644 index 00000000000..22b44204017 --- /dev/null +++ b/math/R/buildlink3.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 21:26:08 snj Exp $ +# XXX BUILDLINK_DEPMETHOD.R?= build + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +R_BUILDLINK3_MK:= ${R_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= R +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NR} +BUILDLINK_PACKAGES+= R + +.if !empty(R_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.R+= R>=1.7.0 +BUILDLINK_PKGSRCDIR.R?= ../../math/R +.endif # R_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/math/octave/Makefile b/math/octave/Makefile index 94e4f80fbb0..893eae1776e 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2004/03/26 02:27:45 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2004/04/27 21:26:08 snj Exp $ # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp DISTNAME= octave-2.0.17 @@ -20,7 +20,7 @@ DEPENDS+= gnuplot{,-nox11}>=3.7:../../graphics/gnuplot CONFLICTS+= octave-2.1.* -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_X11= yes GNU_CONFIGURE= yes USE_FORTRAN= yes diff --git a/math/p5-Math-Bezier/Makefile b/math/p5-Math-Bezier/Makefile index b7d3e78c00e..38c9a513efb 100644 --- a/math/p5-Math-Bezier/Makefile +++ b/math/p5-Math-Bezier/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/17 21:47:54 grant Exp $ +# $NetBSD: Makefile,v 1.5 2004/04/27 21:26:08 snj Exp $ DISTNAME= Math-Bezier-0.01 PKGNAME= p5-${DISTNAME} @@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Math/} MAINTAINER= tech-pkg@NetBSD.org COMMENT= Perl module for the solution of Bezier curves -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Math/Bezier/.packlist .include "../../lang/perl5/module.mk" diff --git a/math/p5-Math-Interpolate/Makefile b/math/p5-Math-Interpolate/Makefile index 02009db25d1..31f68ffaa2d 100644 --- a/math/p5-Math-Interpolate/Makefile +++ b/math/p5-Math-Interpolate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 21:47:56 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/04/27 21:26:08 snj Exp $ DISTNAME= Math-Interpolate-1.05 PKGNAME= p5-${DISTNAME} @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Math/} MAINTAINER= tech-pkg@NetBSD.org COMMENT= Perl module for interpolating data -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Math/Interpolate/.packlist .include "../../lang/perl5/module.mk" diff --git a/math/p5-Math-MatrixReal/Makefile b/math/p5-Math-MatrixReal/Makefile index c7e4695d9a9..ab253eca8b4 100644 --- a/math/p5-Math-MatrixReal/Makefile +++ b/math/p5-Math-MatrixReal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 21:47:56 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/04/27 21:26:08 snj Exp $ DISTNAME= Math-MatrixReal-1.3a5 PKGNAME= p5-${DISTNAME} @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Math/} MAINTAINER= tech-pkg@NetBSD.org COMMENT= Perl module for performing operations on real matrices -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Math/MatrixReal/.packlist .include "../../lang/perl5/module.mk" diff --git a/math/p5-Math-Pari/Makefile b/math/p5-Math-Pari/Makefile index d1e06581795..492f1ef37c1 100644 --- a/math/p5-Math-Pari/Makefile +++ b/math/p5-Math-Pari/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/02/22 22:04:54 heinz Exp $ +# $NetBSD: Makefile,v 1.13 2004/04/27 21:26:08 snj Exp $ # DISTNAME= Math-Pari-2.010501 @@ -17,7 +17,7 @@ COMMENT= Perl5 interface to the pari math library GCC_REQD= 2.95 MAKE_ENV+= MP_NOGNUPLOT=1 -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Math/Pari/.packlist #TEST_TARGET= # the tests need looking at diff --git a/math/p5-Number-Latin/Makefile b/math/p5-Number-Latin/Makefile index 8e70a39ff74..2cab35385bd 100644 --- a/math/p5-Number-Latin/Makefile +++ b/math/p5-Number-Latin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/10/18 21:55:32 abs Exp $ +# $NetBSD: Makefile,v 1.2 2004/04/27 21:26:09 snj Exp $ DISTNAME= Number-Latin-1.01 PKGNAME= p5-${DISTNAME} @@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Number/} MAINTAINER= norm@sandbox.org.uk COMMENT= Perl module for "lower/upper-latin" numbering system -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Number/Latin/.packlist .include "../../lang/perl5/module.mk" diff --git a/math/p5-Spreadsheet-ParseExcel/Makefile b/math/p5-Spreadsheet-ParseExcel/Makefile index e39f5988cb4..1fde81dedde 100644 --- a/math/p5-Spreadsheet-ParseExcel/Makefile +++ b/math/p5-Spreadsheet-ParseExcel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/07/17 21:47:58 grant Exp $ +# $NetBSD: Makefile,v 1.4 2004/04/27 21:26:09 snj Exp $ # DISTNAME= Spreadsheet-ParseExcel-0.2602 @@ -11,7 +11,7 @@ COMMENT= Perl module to get information from an Excel file DEPENDS+= p5-OLE-Storage_Lite>=0.08:../../devel/p5-OLE-Storage_Lite -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Spreadsheet/ParseExcel/.packlist .include "../../lang/perl5/module.mk" diff --git a/math/p5-Spreadsheet-WriteExcel/Makefile b/math/p5-Spreadsheet-WriteExcel/Makefile index 35cef159749..a5c0f5d586f 100644 --- a/math/p5-Spreadsheet-WriteExcel/Makefile +++ b/math/p5-Spreadsheet-WriteExcel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/17 21:47:59 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/04/27 21:26:09 snj Exp $ # DISTNAME= Spreadsheet-WriteExcel-0.41 @@ -12,7 +12,7 @@ COMMENT= Create Excel data files DEPENDS+= p5-Parse-RecDescent-*:../../devel/p5-Parse-RecDescent DEPENDS+= p5-File-Temp-*:../../devel/p5-File-Temp -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Spreadsheet/WriteExcel/.packlist .include "../../lang/perl5/module.mk" diff --git a/math/py-rpy/Makefile b/math/py-rpy/Makefile index 0015ffa6262..fa3ef9c13a2 100644 --- a/math/py-rpy/Makefile +++ b/math/py-rpy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/12/04 13:50:33 adam Exp $ +# $NetBSD: Makefile,v 1.6 2004/04/27 21:26:09 snj Exp $ # DISTNAME= rpy-0.3.1 @@ -10,10 +10,10 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://rpy.sourceforge.net/ COMMENT= R interface for Python -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES PYDISTUTILSPKG= YES .include "../../lang/python/extension.mk" -.include "../../math/py-Numeric/buildlink2.mk" -.include "../../math/R/buildlink2.mk" +.include "../../math/py-Numeric/buildlink3.mk" +.include "../../math/R/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/tela/Makefile b/math/tela/Makefile index 5a2af8cccaf..d1c8c21938a 100644 --- a/math/tela/Makefile +++ b/math/tela/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/07/17 21:48:14 grant Exp $ +# $NetBSD: Makefile,v 1.15 2004/04/27 21:26:09 snj Exp $ DISTNAME= tela-1.34 CATEGORIES= math @@ -14,7 +14,7 @@ DEPENDS+= plotmtv-[0-9]*:../../graphics/plotmtv GNU_CONFIGURE= # defined USE_FORTRAN= # defined USE_X11= # defined -USE_BUILDLINK2= # defined +USE_BUILDLINK3= yes INSTALL_TARGET= install installdocs @@ -28,10 +28,10 @@ pre-configure: $$f > $$f.tmp && ${MV} -f $$f.tmp $$f; \ done -.include "../../math/lapack/buildlink2.mk" -.include "../../math/blas/buildlink2.mk" -.include "../../devel/readline/buildlink2.mk" -.include "../../devel/hdf/buildlink2.mk" -.include "../../devel/zlib/buildlink2.mk" -.include "../../graphics/jpeg/buildlink2.mk" +.include "../../math/lapack/buildlink3.mk" +.include "../../math/blas/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" +.include "../../devel/hdf/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3