Convert to buildlink3.

3 files changed, 28 insertions, 32 deletions

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/+$//}