pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Convert to buildlink3.
details: https://anonhg.NetBSD.org/pkgsrc/rev/97b97a6935f9
branches: trunk
changeset: 474351:97b97a6935f9
user: snj <snj%pkgsrc.org@localhost>
date: Tue Apr 27 21:26:08 2004 +0000
description:
Convert to buildlink3.
diffstat:
cad/tkgate/Makefile | 6 +++---
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 ++++++++--------
13 files changed, 50 insertions(+), 58 deletions(-)
diffs (281 lines):
diff -r 7587e199a82f -r 97b97a6935f9 cad/tkgate/Makefile
--- a/cad/tkgate/Makefile Tue Apr 27 21:12:43 2004 +0000
+++ b/cad/tkgate/Makefile Tue Apr 27 21:26:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/04/16 03:44:34 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/27 21:30:06 snj Exp $
#
DISTNAME= tkgate-1.6i
@@ -14,7 +14,7 @@
BUILD_DEPENDS+= bison>=1.35:../../devel/bison
BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
USE_IMAKE= yes
USE_GNU_TOOLS+= m4
@@ -33,5 +33,5 @@
${ECHO} "${TKGATE_SITENAME}" > ${WRKSRC}/sitename.txt
( cd ${WRKSRC} && ${CONFIGURE_ENV} ./configure )
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 7587e199a82f -r 97b97a6935f9 math/R/buildlink2.mk
--- a/math/R/buildlink2.mk Tue Apr 27 21:12:43 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 7587e199a82f -r 97b97a6935f9 math/R/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/math/R/buildlink3.mk Tue Apr 27 21:26:08 2004 +0000
@@ -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 -r 7587e199a82f -r 97b97a6935f9 math/octave/Makefile
--- a/math/octave/Makefile Tue Apr 27 21:12:43 2004 +0000
+++ b/math/octave/Makefile Tue Apr 27 21:26:08 2004 +0000
@@ -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 @@
CONFLICTS+= octave-2.1.*
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
USE_X11= yes
GNU_CONFIGURE= yes
USE_FORTRAN= yes
diff -r 7587e199a82f -r 97b97a6935f9 math/p5-Math-Bezier/Makefile
--- a/math/p5-Math-Bezier/Makefile Tue Apr 27 21:12:43 2004 +0000
+++ b/math/p5-Math-Bezier/Makefile Tue Apr 27 21:26:08 2004 +0000
@@ -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 @@
MAINTAINER= tech-pkg%NetBSD.org@localhost
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 -r 7587e199a82f -r 97b97a6935f9 math/p5-Math-Interpolate/Makefile
--- a/math/p5-Math-Interpolate/Makefile Tue Apr 27 21:12:43 2004 +0000
+++ b/math/p5-Math-Interpolate/Makefile Tue Apr 27 21:26:08 2004 +0000
@@ -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 @@
MAINTAINER= tech-pkg%NetBSD.org@localhost
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 -r 7587e199a82f -r 97b97a6935f9 math/p5-Math-MatrixReal/Makefile
--- a/math/p5-Math-MatrixReal/Makefile Tue Apr 27 21:12:43 2004 +0000
+++ b/math/p5-Math-MatrixReal/Makefile Tue Apr 27 21:26:08 2004 +0000
@@ -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 @@
MAINTAINER= tech-pkg%NetBSD.org@localhost
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 -r 7587e199a82f -r 97b97a6935f9 math/p5-Math-Pari/Makefile
--- a/math/p5-Math-Pari/Makefile Tue Apr 27 21:12:43 2004 +0000
+++ b/math/p5-Math-Pari/Makefile Tue Apr 27 21:26:08 2004 +0000
@@ -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 @@
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 -r 7587e199a82f -r 97b97a6935f9 math/p5-Number-Latin/Makefile
--- a/math/p5-Number-Latin/Makefile Tue Apr 27 21:12:43 2004 +0000
+++ b/math/p5-Number-Latin/Makefile Tue Apr 27 21:26:08 2004 +0000
@@ -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 @@
MAINTAINER= norm%sandbox.org.uk@localhost
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 -r 7587e199a82f -r 97b97a6935f9 math/p5-Spreadsheet-ParseExcel/Makefile
--- a/math/p5-Spreadsheet-ParseExcel/Makefile Tue Apr 27 21:12:43 2004 +0000
+++ b/math/p5-Spreadsheet-ParseExcel/Makefile Tue Apr 27 21:26:08 2004 +0000
@@ -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 @@
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 -r 7587e199a82f -r 97b97a6935f9 math/p5-Spreadsheet-WriteExcel/Makefile
--- a/math/p5-Spreadsheet-WriteExcel/Makefile Tue Apr 27 21:12:43 2004 +0000
+++ b/math/p5-Spreadsheet-WriteExcel/Makefile Tue Apr 27 21:26:08 2004 +0000
@@ -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 @@
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 -r 7587e199a82f -r 97b97a6935f9 math/py-rpy/Makefile
--- a/math/py-rpy/Makefile Tue Apr 27 21:12:43 2004 +0000
+++ b/math/py-rpy/Makefile Tue Apr 27 21:26:08 2004 +0000
@@ -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 @@
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 -r 7587e199a82f -r 97b97a6935f9 math/tela/Makefile
--- a/math/tela/Makefile Tue Apr 27 21:12:43 2004 +0000
+++ b/math/tela/Makefile Tue Apr 27 21:26:08 2004 +0000
@@ -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 @@
GNU_CONFIGURE= # defined
USE_FORTRAN= # defined
USE_X11= # defined
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= yes
INSTALL_TARGET= install installdocs
@@ -28,10 +28,10 @@
$$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"
Home |
Main Index |
Thread Index |
Old Index