Convert to buildlink3.

5 files changed, 56 insertions, 16 deletions

diff --git a/devel/netcdf/Makefile b/devel/netcdf/Makefile
index 66bd7c64037..f0966d2c107 100644
--- a/devel/netcdf/Makefile
+++ b/devel/netcdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/20 12:13:28 agc Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/12 03:51:16 snj Exp $
 
 DISTNAME=	netcdf-3.5.0
 PKGREVISION=	1
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.unidata.ucar.edu/packages/netcdf/index.html
 COMMENT=	Library for array-oriented data access
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 USE_FORTRAN=		# defined
 USE_GCC_SHLIB=		# defined
 USE_LIBTOOL=		# defined
diff --git a/devel/netcdf/buildlink3.mk b/devel/netcdf/buildlink3.mk
new file mode 100644
index 00000000000..ce8b4f87d12
--- /dev/null
+++ b/devel/netcdf/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/12 03:51:16 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+NETCDF_BUILDLINK3_MK:=	${NETCDF_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	netcdf
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnetcdf}
+BUILDLINK_PACKAGES+=	netcdf
+
+.if !empty(NETCDF_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.netcdf+=	netcdf>=3.5
+BUILDLINK_PKGSRCDIR.netcdf?=	../../devel/netcdf
+.endif	# NETCDF_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 09ef095e874..eac7e147a0c 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/20 12:14:05 agc Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/12 03:41:51 snj Exp $
 
 DISTNAME=	ted-2.14.src
 PKGNAME=	ted-2.14
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.nllgg.nl/Ted/
 COMMENT=	X11 based WordPad-like word processor
 
 WRKSRC=		${WRKDIR}/Ted-2.14
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_X11BASE=	YES
 
 AFMDIR=		${PREFIX}/share/Ted/afm
@@ -75,11 +75,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/Ted/TedDocument-en_US.rtf ${INFODIR}
 	${INSTALL_DATA}	${WRKSRC}/Ted/Ted.ad ${PREFIX}/lib/X11/app-defaults/Ted
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/motif.buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index 03493d57fae..3f7c1c19467 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/01/24 15:30:32 grant Exp $
+# $NetBSD: Makefile,v 1.29 2004/04/12 03:48:53 snj Exp $
 #
 
 DISTNAME=       XmHTML-1.1.7
@@ -13,7 +13,7 @@ COMMENT=	Motif Widget capable of displaying HTML 3.2 conforming text
 USE_X11BASE=	YES
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 do-install:
 	${LIBTOOL} ${LIBTOOL_FLAGS} ${INSTALL_DATA} \
@@ -21,9 +21,9 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/XmHTML
 	${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${PREFIX}/include/XmHTML
 
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/motif.buildlink2.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/XmHTML/buildlink3.mk b/x11/XmHTML/buildlink3.mk
new file mode 100644
index 00000000000..8b605e4657b
--- /dev/null
+++ b/x11/XmHTML/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/12 03:48:53 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+XMHTML_BUILDLINK3_MK:=	${XMHTML_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	XmHTML
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXmHTML}
+BUILDLINK_PACKAGES+=	XmHTML
+
+.if !empty(XMHTML_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb2
+BUILDLINK_PKGSRCDIR.XmHTML?=	../../x11/XmHTML
+.endif	# XMHTML_BUILDLINK3_MK
+
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}