Convert to buildlink3.

4 files changed, 26 insertions, 34 deletions

diff --git a/lang/lua4/Makefile b/lang/lua4/Makefile
index 57dc1cc00ca..87ad0236eab 100644
--- a/lang/lua4/Makefile
+++ b/lang/lua4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/12/30 17:27:31 cjep Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/28 00:28:18 snj Exp $
 
 DISTNAME=	lua-4.0.1
 PKGNAME=	lua4-4.01
@@ -20,7 +20,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.lua.org/
 COMMENT=	Powerful light-weight language for extending applications
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 BUILD_DIRS=	${WRKSRC}/objdir
 
diff --git a/lang/lua4/buildlink2.mk b/lang/lua4/buildlink2.mk
deleted file mode 100644
index 96811dd03e8..00000000000
--- a/lang/lua4/buildlink2.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/29 23:15:36 jtb Exp $
-#
-# This Makefile fragment is included by packages that use lua4.
-#
-
-.if !defined(LUA4_BUILDLINK2_MK)
-LUA4_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		lua4
-BUILDLINK_DEPENDS.lua4?=	lua4>=4.0.1
-BUILDLINK_PKGSRCDIR.lua4?=	../../lang/lua4
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.lua4=lua4
-BUILDLINK_PREFIX.lua4_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.lua4+=	include/lauxlib4.h
-BUILDLINK_FILES.lua4+=	include/lua4.h
-BUILDLINK_FILES.lua4+=	include/luadebug4.h
-BUILDLINK_FILES.lua4+=	include/lualib4.h
-BUILDLINK_FILES.lua4+=	lib/liblua4.*
-BUILDLINK_FILES.lua4+=	lib/liblualib4.*
-
-BUILDLINK_TARGETS+=	lua4-buildlink
-
-lua4-buildlink: _BUILDLINK_USE
-
-.endif	# LUA4_BUILDLINK2_MK
diff --git a/lang/lua4/buildlink3.mk b/lang/lua4/buildlink3.mk
new file mode 100644
index 00000000000..bc2030aee56
--- /dev/null
+++ b/lang/lua4/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/28 00:28:18 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LUA4_BUILDLINK3_MK:=	${LUA4_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	lua4
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlua4}
+BUILDLINK_PACKAGES+=	lua4
+
+.if !empty(LUA4_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.lua4+=	lua4>=4.0.1
+BUILDLINK_PKGSRCDIR.lua4?=	../../lang/lua4
+.endif	# LUA4_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/elinks04/Makefile b/www/elinks04/Makefile
index 5afa8d67652..8f23b34cb5e 100644
--- a/www/elinks04/Makefile
+++ b/www/elinks04/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/04/05 15:21:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/28 00:28:18 snj Exp $
 
 DISTNAME=		elinks-0.4.3
 PKGREVISION=		2
@@ -10,14 +10,14 @@ MAINTAINER=		dawszy@arhea.net
 HOMEPAGE=		http://elinks.or.cz/
 COMMENT=		Extended/Enhanced Links
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--without-x
 
-.include "../../archivers/bzip2/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../lang/lua4/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/lua4/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"