Convert to buildlink3.

11 files changed, 54 insertions, 56 deletions

diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 52ece6ea077..1b74fb66be9 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/02/01 01:43:29 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/09 00:45:45 snj Exp $
 #
 
 DISTNAME=		aqsis-0.6.4
@@ -16,12 +16,12 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 USE_GNU_TOOLS+=		make
 USE_X11=		yes
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 GCC_REQD+=		2.95.3
 USE_GCC_SHLIB=		yes
 
-.include "../../devel/libargparse/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
+.include "../../devel/libargparse/buildlink3.mk"
+.include "../../graphics/Mesa/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/denemo/Makefile b/graphics/denemo/Makefile
index c20136adc7b..cc6ce024346 100644
--- a/graphics/denemo/Makefile
+++ b/graphics/denemo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/26 02:27:41 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/09 00:45:45 snj Exp $
 #
 
 DISTNAME=	denemo-0.5.4
@@ -13,7 +13,7 @@ COMMENT=	GUI musical score editor written in C/GTK+
 DEPENDS+=	lilypond-[0-9]*:../../print/lilypond
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 375c5c7a3ce..d5e49ec09b5 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:41 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2004/05/09 00:45:45 snj Exp $
 #
 
 DISTNAME=	giram-0.3.5
@@ -13,7 +13,7 @@ COMMENT=	Giram Is Really A Modeller
 DEPENDS+=	povray-[0-9]*:../../graphics/povray
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_PKGINSTALL=		YES
 USE_X11=		YES
@@ -39,7 +39,7 @@ CONF_FILES+=	${PREFIX}/share/examples/giram/gtkrc_user	\
 CONF_FILES+=	${PREFIX}/share/examples/giram/ps-menurc	\
 		${PKG_SYSCONFDIR}/0.3/ps-menurc
 
-.include "../../graphics/lib3ds/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../graphics/lib3ds/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/p5-GDGraph/Makefile b/graphics/p5-GDGraph/Makefile
index ed508e7724a..5b41c2a94b2 100644
--- a/graphics/p5-GDGraph/Makefile
+++ b/graphics/p5-GDGraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/04/29 17:45:45 abs Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/09 00:45:45 snj Exp $
 #
 
 DISTNAME=	GDGraph-1.43
@@ -13,7 +13,7 @@ COMMENT=	GDGraph is a package to generate charts, using Lincoln Stein's GD.pm
 
 DEPENDS+=       p5-GDTextUtil>=0.75:../../graphics/p5-GDTextUtil
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GD/Graph/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/graphics/p5-GDGraph3d/Makefile b/graphics/p5-GDGraph3d/Makefile
index 347145bf5b1..e7575445fe0 100644
--- a/graphics/p5-GDGraph3d/Makefile
+++ b/graphics/p5-GDGraph3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/29 19:46:34 abs Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/09 00:45:45 snj Exp $
 
 DISTNAME=	GDGraph3d-0.56
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=	GDGraph3d is a pkg to generate charts, using Lincoln Stein's GD.pm
 
 DEPENDS+=       p5-GDGraph>=1.30:../../graphics/p5-GDGraph
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GD/Graph3d/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/graphics/p5-GDTextUtil/Makefile b/graphics/p5-GDTextUtil/Makefile
index 3300e0f0a8a..282171d99a5 100644
--- a/graphics/p5-GDTextUtil/Makefile
+++ b/graphics/p5-GDTextUtil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/10/27 20:49:02 seb Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/09 00:45:45 snj Exp $
 #
 
 DISTNAME=	GDTextUtil-0.80
@@ -14,7 +14,7 @@ COMMENT=	Perl 5 text utilities for use with the GD drawing package
 
 DEPENDS+=	p5-GD>=1.30:../../graphics/p5-GD
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GD/Text/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/graphics/p5-GIFgraph/Makefile b/graphics/p5-GIFgraph/Makefile
index 4cf3b9f36af..303be16fadc 100644
--- a/graphics/p5-GIFgraph/Makefile
+++ b/graphics/p5-GIFgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:42:03 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/09 00:45:45 snj Exp $
 #
 
 DISTNAME=	GIFgraph-1.20
@@ -15,7 +15,7 @@ COMMENT=	GIFgraph is a package to generate graphs, using GD::Graph
 DEPENDS+=       p5-GDGraph>=1.33:../../graphics/p5-GDGraph
 DEPENDS+=	p5-PerlMagick>=5.3.9:../../graphics/p5-PerlMagick
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GIFgraph/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile
index 5a035af4556..7c93404d036 100644
--- a/graphics/plplot/Makefile
+++ b/graphics/plplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/03/08 20:27:14 minskim Exp $
+# $NetBSD: Makefile,v 1.35 2004/05/09 00:45:45 snj Exp $
 
 DISTNAME=		plplot-5.2.1
 CATEGORIES=		graphics
@@ -8,7 +8,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://plplot.sourceforge.net/
 COMMENT=		Scientific plotting package
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		# defined
 USE_GNU_TOOLS+=		m4 make
 USE_FORTRAN=		# defined
@@ -56,13 +56,13 @@ post-patch:
 post-install:
 	cd ${PREFIX}/bin && ${LN} -fs libtool plplot_libtool
 
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/gd/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../devel/libtool/buildlink2.mk"
-.include "../../x11/tk83/buildlink2.mk"
-.include "../../lang/tcl83/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/libtool/buildlink3.mk"
+.include "../../x11/tk83/buildlink3.mk"
+.include "../../lang/tcl83/buildlink3.mk"
 .include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plplot/buildlink2.mk b/graphics/plplot/buildlink2.mk
deleted file mode 100644
index 1668974370c..00000000000
--- a/graphics/plplot/buildlink2.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/07/10 08:55:04 jtb Exp $
-#
-# This Makefile fragment is included by packages that use plplot.
-#
-
-.if !defined(PLPLOT_BUILDLINK2_MK)
-PLPLOT_BUILDLINK2_MK=		# defined
-
-BUILDLINK_PACKAGES+=		plplot
-BUILDLINK_DEPENDS.plplot?=	plplot>=5.2.1
-BUILDLINK_PKGSRCDIR.plplot?=	../../graphics/plplot
-
-EVAL_PREFIX+=			BUILDLINK_PREFIX.plplot=plplot
-BUILDLINK_PREFIX.plplot_DEFAULT=${LOCALBASE}
-BUILDLINK_FILES.plplot+=	include/plplot/*
-BUILDLINK_FILES.plplot+=	lib/libplplot.*
-
-BUILDLINK_TARGETS+=		plplot-buildlink
-
-plplot-buildlink: _BUILDLINK_USE
-
-.endif	# PLPLOT_BUILDLINK2_MK
diff --git a/graphics/plplot/buildlink3.mk b/graphics/plplot/buildlink3.mk
new file mode 100644
index 00000000000..006e9fed7d4
--- /dev/null
+++ b/graphics/plplot/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/09 00:45:45 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+PLPLOT_BUILDLINK3_MK:=	${PLPLOT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	plplot
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nplplot}
+BUILDLINK_PACKAGES+=	plplot
+
+.if !empty(PLPLOT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.plplot+=	plplot>=5.2.1
+BUILDLINK_PKGSRCDIR.plplot?=	../../graphics/plplot
+.endif	# PLPLOT_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/yplot/Makefile b/graphics/yplot/Makefile
index 6d54684b086..add1819a047 100644
--- a/graphics/yplot/Makefile
+++ b/graphics/yplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/03/26 02:27:42 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2004/05/09 00:45:45 snj Exp $
 
 DISTNAME=		yplot-1.1.2
 PKGREVISION=		1
@@ -9,25 +9,27 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://yplot.sourceforge.net/
 COMMENT=		Yorick interface to PLplot
 
-DEPENDS+=		yorick-1.5*:../../math/yorick
-DEPENDS+=		plplot>=5.0.3:../../graphics/plplot
 BUILD_DEPENDS+=		teTeX>=1.0:../../print/teTeX
 
 .if (${MACHINE_ARCH} == "sparc64")
 BROKEN=			Compiling hangs, needs attention.
 .endif
 
+USE_BUILDLINK3=		yes
 CONFIGURE_ENV+=		PLPLOT_PREFIX=${BUILDLINK_PREFIX.plplot}
 EVAL_PREFIX+=		YORICK_PREFIX=yorick
 CONFIGURE_ENV+=		YORICK_HOME=${YORICK_PREFIX}
 CONFIGURE_ENV+=		YORICK_SITE=${YORICK_PREFIX}/share/yorick
 
+BUILDLINK_DEPMETHOD.yorick=	full
+
 GNU_CONFIGURE=		yes
 MAKEFILE=		Makefile.build
 
 PYTHON_FOR_BUILD_ONLY=	yes
 PYTHON_PATCH_SCRIPTS=	parse_documentation.py
 
-.include "../../graphics/plplot/buildlink2.mk"
+.include "../../graphics/plplot/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../math/yorick/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"