Convert to buildlink3.

4 files changed, 30 insertions, 34 deletions

diff --git a/graphics/gnuplot-nox11/Makefile b/graphics/gnuplot-nox11/Makefile
index 9e2fa95a73a..ee2c4816351 100644
--- a/graphics/gnuplot-nox11/Makefile
+++ b/graphics/gnuplot-nox11/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/08/09 10:53:29 seb Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/17 01:14:19 snj Exp $
 #
 
 DISTNAME=		gnuplot-3.7.3
-SVR4_PKGNAME=		gplot
 PKGNAME=                ${DISTNAME:C/-/-nox11-/}
+SVR4_PKGNAME=		gplot
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnuplot/} \
 			ftp://ftp.ucc.ie/pub/gnuplot/ \
@@ -15,7 +15,7 @@ COMMENT=		Gnuplot is a nice plotting utility
 
 CONFLICTS+=		gnuplot-[0-9]*
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 # because of missing rl_complete_with_tilde_expansion and rl_terminal_name
 USE_GNU_READLINE=	YES
 GNU_CONFIGURE=		YES
@@ -27,8 +27,8 @@ CONFIGURE_ARGS+=	--with-plot=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 CONFIGURE_ARGS+=	--without-x
 
-.include "../../devel/readline/buildlink2.mk"
-.include "../../graphics/plotutils-nox11/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../print/pdflib/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../graphics/plotutils-nox11/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../print/pdflib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plotutils-nox11/Makefile b/graphics/plotutils-nox11/Makefile
index 73fd3205c73..db280c4dd9d 100644
--- a/graphics/plotutils-nox11/Makefile
+++ b/graphics/plotutils-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/04/03 09:29:58 heinz Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/17 01:14:19 snj Exp $
 #
 
 DISTNAME=		plotutils-2.4.1
@@ -15,7 +15,7 @@ CONFLICTS+=		plotutils-[0-9]*
 DISTINFO_FILE=		${.CURDIR}/../../graphics/plotutils/distinfo
 PATCHDIR=		${.CURDIR}/../../graphics/plotutils/patches
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GCC_SHLIB=		yes
 
 INFO_FILES=	plotutils.info
@@ -29,5 +29,5 @@ USE_GNU_TOOLS.IRIX+=	awk
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/libxmi/ltconfig
 
-.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plotutils-nox11/buildlink2.mk b/graphics/plotutils-nox11/buildlink2.mk
deleted file mode 100644
index c51247a2bd1..00000000000
--- a/graphics/plotutils-nox11/buildlink2.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/06/07 17:39:24 jschauma Exp $
-
-.if !defined(PLOTUTILS_BUILDLINK2_MK)
-PLOTUTILS_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		plotutils-nox11
-BUILDLINK_DEPENDS.plotutils-nox11?=	plotutils-nox11>=2.4.1
-BUILDLINK_PKGSRCDIR.plotutils-nox11?=	../../graphics/plotutils-nox11
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.plotutils=plotutils
-BUILDLINK_PREFIX.plotutils-nox11_DEFAULT=	${PREFIX}
-BUILDLINK_FILES.plotutils-nox11+=	include/plot.h
-BUILDLINK_FILES.plotutils-nox11+=	include/plotcompat.h
-BUILDLINK_FILES.plotutils-nox11+=	include/plotter.h
-BUILDLINK_FILES.plotutils-nox11+=	lib/libplot.*
-BUILDLINK_FILES.plotutils-nox11+=	lib/libplotter.*
-
-.include "../../graphics/png/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	plotutils-nox11-buildlink
-
-plotutils-nox11-buildlink: _BUILDLINK_USE
-
-.endif	# PLOTUTILS_BUILDLINK2_MK
diff --git a/graphics/plotutils-nox11/buildlink3.mk b/graphics/plotutils-nox11/buildlink3.mk
new file mode 100644
index 00000000000..0ddd518e8ba
--- /dev/null
+++ b/graphics/plotutils-nox11/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/17 01:14:19 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+PLOTUTILS_NOX11_BUILDLINK3_MK:=	${PLOTUTILS_NOX11_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	plotutils-nox11
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nplotutils-nox11}
+BUILDLINK_PACKAGES+=	plotutils-nox11
+
+.if !empty(PLOTUTILS_NOX11_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.plotutils-nox11+=	plotutils-nox11>=2.4.1
+BUILDLINK_PKGSRCDIR.plotutils-nox11?=	../../graphics/plotutils-nox11
+.endif	# PLOTUTILS_NOX11_BUILDLINK3_MK
+
+.include "../../graphics/png/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}