Convert to buildlink3.

8 files changed, 38 insertions, 19 deletions

diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile
index 07e191e07e6..6b75b93c1df 100644
--- a/comms/p5-pilot-link/Makefile
+++ b/comms/p5-pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/22 07:51:12 grant Exp $
+# $NetBSD: Makefile,v 1.21 2004/04/11 06:59:06 snj Exp $
 #
 
 .include "../../comms/pilot-link/Makefile.common"
@@ -12,7 +12,7 @@ BUILDLINK_DEPENDS.pilot-link-libs=	pilot-link-libs>=${PILOT_LINK_VERS}
 
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 
 CONFIGURE_ARGS+=	--with-perl=${PERL5}
 PERL5_CONFIGURE=	NO
@@ -36,8 +36,8 @@ post-install:
 	${INSTALL_SCRIPT} ${bin} ${PREFIX}/bin
 .endfor
 
-.include "../../comms/pilot-link-libs/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
+.include "../../comms/pilot-link-libs/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index cbab1aece4d..3b817fbaf60 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/01/22 07:51:12 grant Exp $
+# $NetBSD: Makefile,v 1.26 2004/04/11 07:05:33 snj Exp $
 #
 
 DISTNAME=		scmxx-0.6.4
@@ -10,7 +10,7 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.hendrik-sattler.de/scmxx/
 COMMENT=		Data exchange utility for Siemens mobile phones
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_DIR}
 
 GNU_CONFIGURE=		yes
@@ -32,5 +32,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/vCard.vcf			\
 	    ${PREFIX}/share/examples/scmxx
 
-.include "../../converters/libiconv/buildlink2.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/snooper/Makefile b/comms/snooper/Makefile
index f93564d7d87..e28decc6b82 100644
--- a/comms/snooper/Makefile
+++ b/comms/snooper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/02/26 23:10:09 itojun Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/11 07:07:54 snj Exp $
 # FreeBSD Id: Makefile,v 1.3 1998/08/13 09:20:41 itojun Exp $
 
 DISTNAME=	snooper-19991202
@@ -11,7 +11,7 @@ COMMENT=	Serial line protocol analyzer (need two serial interfaces)
 
 WRKSRC=		${WRKDIR}/snooper/build
 GNU_CONFIGURE=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 pre-build:
 	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} depend
diff --git a/converters/autoconvert/Makefile b/converters/autoconvert/Makefile
index b1e27c7c8b0..ff293ea753c 100644
--- a/converters/autoconvert/Makefile
+++ b/converters/autoconvert/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/22 07:52:43 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/11 07:09:28 snj Exp $
 
 DISTNAME=	autoconvert-0.3.13
 CATEGORIES=	converters
@@ -8,7 +8,7 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://banyan.dlut.edu.cn/~ygh/
 COMMENT=	Intelligent Chinese encoding converter
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_LIBTOOL=	yes
 USE_GNU_TOOLS+=	make
 
@@ -17,5 +17,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${WRKSRC}/shed.* \
 		${PREFIX}/share/examples/autoconvert
 
-.include "../../devel/libgetopt/buildlink2.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/base64/Makefile b/converters/base64/Makefile
index 6e3beb57ee5..4fc3ab772b5 100644
--- a/converters/base64/Makefile
+++ b/converters/base64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/11/19 02:52:46 jschauma Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/11 07:10:52 snj Exp $
 #
 
 DISTNAME=	base64-1.3
@@ -13,7 +13,7 @@ COMMENT=	Encode and decode base64 files
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	prog
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/base64 ${PREFIX}/bin
diff --git a/converters/bib2xml/Makefile b/converters/bib2xml/Makefile
index 80f5b5e87d7..8baedbaeb0b 100644
--- a/converters/bib2xml/Makefile
+++ b/converters/bib2xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:10:29 agc Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/11 07:14:38 snj Exp $
 #
 
 DISTNAME=	bib2xml-10062002
@@ -11,12 +11,12 @@ HOMEPAGE=	http://www.cs.colorado.edu/~henkel/stuff/bib2xml/
 COMMENT=	BibTeX to XML converter
 
 WRKSRC=		${WRKDIR}/bib2xml
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 BUILD_DIRS=	${WRKSRC}/progs
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_DIRS}/bib2xml ${PREFIX}/bin
 
-.include "../../textproc/btparse/buildlink2.mk"
+.include "../../textproc/btparse/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/btparse/Makefile b/textproc/btparse/Makefile
index 2d84c1ea42b..18e1c5a62e4 100644
--- a/textproc/btparse/Makefile
+++ b/textproc/btparse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:54:10 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/11 07:14:05 snj Exp $
 #
 
 DISTNAME=	btparse-0.33
@@ -10,7 +10,7 @@ HOMEPAGE=	http://starship.python.net/~gward/btOOL/
 COMMENT=	BibTeX parsing library
 
 USE_PERL5=	build
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 ALL_TARGET=	lib
 TEST_TARGET=	test
diff --git a/textproc/btparse/buildlink3.mk b/textproc/btparse/buildlink3.mk
new file mode 100644
index 00000000000..454b297201a
--- /dev/null
+++ b/textproc/btparse/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/11 07:14:05 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BTPARSE_BUILDLINK3_MK:=	${BTPARSE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	btparse
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbtparse}
+BUILDLINK_PACKAGES+=	btparse
+
+.if !empty(BTPARSE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.btparse+=	btparse>=0.33
+BUILDLINK_PKGSRCDIR.btparse?=	../../textproc/btparse
+BUILDLINK_DEPMETHOD.btparse?=	build
+.endif	# BTPARSE_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}