Convert to buildlink3.

46 files changed, 139 insertions, 143 deletions

diff --git a/textproc/dict-client/Makefile b/textproc/dict-client/Makefile
index 74fa21a65c4..8699c400ce0 100644
--- a/textproc/dict-client/Makefile
+++ b/textproc/dict-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/03/28 21:43:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/05/04 23:46:36 snj Exp $
 
 DISTNAME=       dictd-1.8.0
 PKGNAME=        dict-client-1.8.0
@@ -10,7 +10,7 @@ MAINTAINER=	mike@ethmoid.org
 HOMEPAGE=	http://www.dict.org/
 COMMENT=	Dictionary Service Protocol client
 
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	# defined
 
@@ -24,5 +24,5 @@ DISTINFO_FILE=	${.CURDIR}/../../textproc/dict-server/distinfo
 CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
 
 # XXX This is needed by libltdl.
-.include "../../devel/libtool/buildlink2.mk"
+.include "../../devel/libtool/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile
index 5dccb685860..a6e67a02d27 100644
--- a/textproc/dict-server/Makefile
+++ b/textproc/dict-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/28 21:43:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/04 23:46:36 snj Exp $
 
 DISTNAME=       dictd-1.8.0
 PKGNAME=	dict-server-1.8.0
@@ -11,7 +11,7 @@ MAINTAINER=	mike@ethmoid.org
 HOMEPAGE=	http://www.dict.org/
 COMMENT=	Dictionary Service Protocol server
 
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	# defined
@@ -41,5 +41,5 @@ post-install:
 		${WRKSRC}/dictd.conf >${EGDIR}/dictd.conf
 	${INSTALL_DATA_DIR} ${PREFIX}/share/dictd
 
-.include "../../devel/libtool/buildlink2.mk"
+.include "../../devel/libtool/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/eperl/Makefile b/textproc/eperl/Makefile
index afcf97c44b2..d9fd135996c 100644
--- a/textproc/eperl/Makefile
+++ b/textproc/eperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/02/10 02:22:50 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2004/05/04 23:46:36 snj Exp $
 
 DISTNAME=	eperl-2.2.14
 CATEGORIES=	lang perl5 textproc
@@ -8,7 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.engelschall.com/sw/eperl/
 COMMENT=	Interpreter/preprocessor for Perl embedded in text documents
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Parse/ePerl/.packlist
 
 GNU_CONFIGURE=		YES
@@ -18,6 +18,6 @@ BUILD_DIRS=		${WRKSRC} ${WRKSRC}/mod/Parse
 
 post-configure: perl5-configure
 
-.include "../../lang/libperl/buildlink2.mk"
+.include "../../lang/libperl/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/html2wml/Makefile b/textproc/html2wml/Makefile
index 61cb98b54da..04e8021dc5c 100644
--- a/textproc/html2wml/Makefile
+++ b/textproc/html2wml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/26 02:27:55 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/04 23:46:36 snj Exp $
 
 DISTNAME=	html2wml-0.4.8r2
 PKGNAME=	html2wml-0.4.8.2
@@ -15,7 +15,7 @@ DEPENDS+=	p5-XML-Parser>=2.30:../../textproc/p5-XML-Parser
 DEPENDS+=	p5-Text-Template>=1.31:../../textproc/p5-Text-Template
 DEPENDS+=	p5-XML-LibXML>=1.31:../../textproc/p5-XML-LibXML
 
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	yes
 NO_CONFIGURE=	# defined
 NO_BUILD=	# defined
 
@@ -23,5 +23,5 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/html2wml.cgi ${PREFIX}/bin/html2wml
 	${INSTALL_MAN} ${WRKSRC}/doc/html2wml.man ${PREFIX}/man/man1/html2wml.1
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile
index b6f5eeaa393..d0c8da8a342 100644
--- a/textproc/ispell-base/Makefile
+++ b/textproc/ispell-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/20 12:26:49 agc Exp $
+# $NetBSD: Makefile,v 1.19 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=	ispell-3.1.20
@@ -26,7 +26,7 @@ INFO_FILES=	ispell.info
 CFLAGS+=	-DHAVE_INTTYPES_H
 .endif
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/textproc/kakasi/Makefile b/textproc/kakasi/Makefile
index 576f2e1463c..6e4a0588ef8 100644
--- a/textproc/kakasi/Makefile
+++ b/textproc/kakasi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:53 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/04 23:46:36 snj Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/04/05 04:46:33 max Exp $
 
 DISTNAME=	kakasi-2.3.4
@@ -10,7 +10,7 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://kakasi.namazu.org/
 COMMENT=	Kanji-Kana Simple Inverter, language filter for Japanese
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
diff --git a/textproc/kakasi/buildlink2.mk b/textproc/kakasi/buildlink2.mk
deleted file mode 100644
index 7daea228a7e..00000000000
--- a/textproc/kakasi/buildlink2.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:06 jlam Exp $
-
-.if !defined(KAKASI_BUILDLINK2_MK)
-KAKASI_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		kakasi
-BUILDLINK_DEPENDS.kakasi?=	kakasi>=2.3.0
-BUILDLINK_PKGSRCDIR.kakasi?=	../../textproc/kakasi
-
-EVAL_PREFIX+=				BUILDLINK_PREFIX.kakasi=kakasi
-BUILDLINK_PREFIX.kakasi_DEFAULT=	${LOCALBASE}
-
-BUILDLINK_FILES.kakasi=		include/libkakasi.h
-BUILDLINK_FILES.kakasi+=	lib/libkakasi.*
-
-BUILDLINK_TARGETS+=	kakasi-buildlink
-
-kakasi-buildlink: _BUILDLINK_USE
-
-.endif	# KAKASI_BUILDLINK2_MK
diff --git a/textproc/kakasi/buildlink3.mk b/textproc/kakasi/buildlink3.mk
new file mode 100644
index 00000000000..f212b813181
--- /dev/null
+++ b/textproc/kakasi/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/04 23:46:36 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+KAKASI_BUILDLINK3_MK:=	${KAKASI_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	kakasi
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkakasi}
+BUILDLINK_PACKAGES+=	kakasi
+
+.if !empty(KAKASI_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.kakasi+=	kakasi>=2.3.0
+BUILDLINK_PKGSRCDIR.kakasi?=	../../textproc/kakasi
+.endif	# KAKASI_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile
index 41aadd18703..f8144e19061 100644
--- a/textproc/namazu2/Makefile
+++ b/textproc/namazu2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 22:54:31 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/05/04 23:46:36 snj Exp $
 # FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp
 
 DISTNAME=	namazu-2.0.12
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	-with-chasen
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	# defined
 USE_PERL5=		# defined
 GNU_CONFIGURE=		# defined
@@ -58,6 +58,6 @@ post-install:
 	@${TEST} -d ${LOCALBASE}/etc/namazu || ${INSTALL_DATA_DIR} ${LOCALBASE}/etc/namazu
 	@${SH} ${WRKDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile
index f40c936ec50..79f3568abc1 100644
--- a/textproc/ndtpd/Makefile
+++ b/textproc/ndtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/03/21 12:30:33 uebayasi Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=	ndtpd-3.1.5
@@ -9,7 +9,7 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://www.sra.co.jp/people/m-kasahr/ndtpd/
 COMMENT=	Server for accessing CD-ROM books with NDTP
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
@@ -39,7 +39,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ndtpd.conf.sample \
 		${EGDIR}/ndtpd.conf.default
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../textproc/eb/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../textproc/eb/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index b7a43fd84a3..ad6b3efaab2 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:20 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=	openjade-1.3.2
@@ -9,7 +9,7 @@ MAINTAINER=	kogule@mars.dti.ne.jp
 HOMEPAGE=	http://openjade.sourceforge.net/
 COMMENT=	SGML/XML parser toolkit and DSSSL engine, successor to "jade"
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 USE_PERL5=	build
 GNU_CONFIGURE=	YES
@@ -33,5 +33,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/jadedoc/*.htm ${OPENJADE_DOC_DIR}/jadedoc
 	${INSTALL_DATA} ${WRKSRC}/jadedoc/images/* ${OPENJADE_DOC_DIR}/jadedoc/images
 
-.include "../../textproc/opensp/buildlink2.mk"
+.include "../../textproc/opensp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Convert-BER/Makefile b/textproc/p5-Convert-BER/Makefile
index 32a562c8c4a..20984d25302 100644
--- a/textproc/p5-Convert-BER/Makefile
+++ b/textproc/p5-Convert-BER/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 22:54:32 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=	Convert-BER-1.31
@@ -10,7 +10,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Convert/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl class to encode/decode objects using Basic Encoding Rules
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Convert/BER/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Cz-Cstools/Makefile b/textproc/p5-Cz-Cstools/Makefile
index 869fbd1330b..16618de6626 100644
--- a/textproc/p5-Cz-Cstools/Makefile
+++ b/textproc/p5-Cz-Cstools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:54:33 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=	Cstools-3.42
@@ -15,7 +15,7 @@ COMMENT=	Tools for dealing with Czech and Slovak texts in Perl
 DEPENDS+=	p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools
 DEPENDS+=	p5-DBD-XBase>=0.232:../../databases/p5-DBD-XBase
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Cz/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Filter/Makefile b/textproc/p5-Filter/Makefile
index 888848f88a3..0ef9c0ea99c 100644
--- a/textproc/p5-Filter/Makefile
+++ b/textproc/p5-Filter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:54:33 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=	Filter-1.16
@@ -10,7 +10,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Filter/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl5 classes representing a number of source filters
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Filter/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-PDF-API2/Makefile b/textproc/p5-PDF-API2/Makefile
index 73c9b6422db..841a153750a 100644
--- a/textproc/p5-PDF-API2/Makefile
+++ b/textproc/p5-PDF-API2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:27:38 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=	PDF-API2-0.2.0.2_dev
@@ -12,7 +12,7 @@ COMMENT=	Perl5 module for next generation api for pdf
 
 DEPENDS+=	p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/PDF/API2/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-PDF-Create/Makefile b/textproc/p5-PDF-Create/Makefile
index f605ed0394c..2abfcf1a5d1 100644
--- a/textproc/p5-PDF-Create/Makefile
+++ b/textproc/p5-PDF-Create/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:27:38 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=	PDF-Create-0.01
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 #HOMEPAGE=	
 COMMENT=	Perl5 module for creating pdf documents
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/PDF/Create/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-PDF/Makefile b/textproc/p5-PDF/Makefile
index f5481869ecc..d6f227af4de 100644
--- a/textproc/p5-PDF/Makefile
+++ b/textproc/p5-PDF/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:26:50 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=	PDF-111
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.geocities.com/CapeCanaveral/Hangar/4794/
 COMMENT=	Perl5 module for pdf document manipulation
 
 WRKSRC=			${WRKDIR}/PDF
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/PDF/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Pod-POM/Makefile b/textproc/p5-Pod-POM/Makefile
index f8a8285b935..a6595feff27 100644
--- a/textproc/p5-Pod-POM/Makefile
+++ b/textproc/p5-Pod-POM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:27:39 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=       Pod-POM-0.14
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.kfs.org/~abw/
 COMMENT=	P5 module to format POD into an object format, hence POM
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Pod/POM/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-String-CRC32/Makefile b/textproc/p5-String-CRC32/Makefile
index 796294a5751..2d21e4bc321 100644
--- a/textproc/p5-String-CRC32/Makefile
+++ b/textproc/p5-String-CRC32/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:54:35 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=	String-CRC32-1.2
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/search?module=String::CRC32
 COMMENT=	Perl module to generate cksums from strings and from files
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/String/CRC32/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-String-ShellQuote/Makefile b/textproc/p5-String-ShellQuote/Makefile
index 0717b49fc97..1f5ef326aa5 100644
--- a/textproc/p5-String-ShellQuote/Makefile
+++ b/textproc/p5-String-ShellQuote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 17:27:39 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/04 23:46:36 snj Exp $
 
 DISTNAME=	String-ShellQuote-1.00
 PKGNAME=	p5-String-ShellQuote-1.00
@@ -9,7 +9,7 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/search?module=String::ShellQuote
 COMMENT=	Quote strings for passing through the shell
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/String/ShellQuote/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Text-Autoformat/Makefile b/textproc/p5-Text-Autoformat/Makefile
index 49267971a95..463c6712d9e 100644
--- a/textproc/p5-Text-Autoformat/Makefile
+++ b/textproc/p5-Text-Autoformat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:27:40 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/04 23:46:36 snj Exp $
 
 DISTNAME=       Text-Autoformat-1.04
 PKGNAME=        p5-${DISTNAME}
@@ -10,7 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.cs.monash.edu.au/~damian/
 COMMENT=	Perl module for text wrapping and reformatting
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Autoformat/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Text-BibTeX/Makefile b/textproc/p5-Text-BibTeX/Makefile
index c7a4a78adc5..b4e35a6e400 100644
--- a/textproc/p5-Text-BibTeX/Makefile
+++ b/textproc/p5-Text-BibTeX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:36 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/04 23:46:36 snj Exp $
 
 DISTNAME=	Text-BibTeX-0.33
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://starship.python.net/~gward/btOOL/
 COMMENT=	Perl library for reading, parsing, and processing BibTeX files
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/BibTeX/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Text-CSV-Hash/Makefile b/textproc/p5-Text-CSV-Hash/Makefile
index 9052fbf9d69..196cfd927d5 100644
--- a/textproc/p5-Text-CSV-Hash/Makefile
+++ b/textproc/p5-Text-CSV-Hash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/04/02 13:41:20 abs Exp $
+# $NetBSD: Makefile,v 1.19 2004/05/04 23:46:37 snj Exp $
 
 DISTNAME=		Text-CSV-Hash-0.18
 PKGNAME=		p5-${DISTNAME}
@@ -10,7 +10,7 @@ MAINTAINER=		abs@NetBSD.org
 HOMEPAGE=		http://www.mono.org/abs/tools/Text-CSV-Hash/
 COMMENT=		Perl5 module for hash based CSV usage
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/CSV/Hash/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Text-CSV_XS/Makefile b/textproc/p5-Text-CSV_XS/Makefile
index b67782c65f4..d29cbe8b4ca 100644
--- a/textproc/p5-Text-CSV_XS/Makefile
+++ b/textproc/p5-Text-CSV_XS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:54:36 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/04 23:46:37 snj Exp $
 #
 
 DISTNAME=	Text-CSV_XS-0.23
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 # HOMEPAGE=	http://
 COMMENT=	Routines for composition and decomposition of comma-separated values
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/CSV_XS/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Text-DelimMatch/Makefile b/textproc/p5-Text-DelimMatch/Makefile
index 432973d1482..d14f4d130f8 100644
--- a/textproc/p5-Text-DelimMatch/Makefile
+++ b/textproc/p5-Text-DelimMatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:26:50 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/04 23:46:37 snj Exp $
 #
 
 DISTNAME=	DelimMatch-1.06a
@@ -12,7 +12,7 @@ HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/DelimMatch/
 COMMENT=	Find regexp delimited strings with proper nesting
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S/a$//}
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/DelimMatch/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Text-Diff/Makefile b/textproc/p5-Text-Diff/Makefile
index 8d2dddfb3f8..7b586247d37 100644
--- a/textproc/p5-Text-Diff/Makefile
+++ b/textproc/p5-Text-Diff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 16:11:50 epg Exp $
+# $NetBSD: Makefile,v 1.2 2004/05/04 23:46:37 snj Exp $
 
 DISTNAME=	Text-Diff-0.35
 PKGNAME=	p5-${DISTNAME}
@@ -10,7 +10,7 @@ COMMENT=	High-level text diffing module for Perl
 
 DEPENDS+=	p5-Algorithm-Diff-1.15:../../devel/p5-Algorithm-Diff
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Diff/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Text-Format/Makefile b/textproc/p5-Text-Format/Makefile
index 5a3e4b5b013..c7f25c127f4 100644
--- a/textproc/p5-Text-Format/Makefile
+++ b/textproc/p5-Text-Format/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/04/29 14:18:58 sketch Exp $
+# $NetBSD: Makefile,v 1.3 2004/05/04 23:46:37 snj Exp $
 #
 
 DISTNAME=       Text-Format0.52
@@ -11,7 +11,7 @@ MAINTAINER=	sketch@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/search?module=Text::Format
 COMMENT=	Provide perl5 formatting functions on plain text
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Format/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Text-Kakasi/Makefile b/textproc/p5-Text-Kakasi/Makefile
index 71313d76794..a4b562745ea 100644
--- a/textproc/p5-Text-Kakasi/Makefile
+++ b/textproc/p5-Text-Kakasi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 17:27:42 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/04 23:46:37 snj Exp $
 
 DISTNAME=		Text-Kakasi-1.04
 PKGNAME=		p5-${DISTNAME}
@@ -10,9 +10,9 @@ MAINTAINER=		kei@NetBSD.org
 HOMEPAGE=		http://www.daionet.gr.jp/~knok/kakasi/
 COMMENT=		Perl5 module to use Kakasi
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Kakasi/.packlist
 
-.include "../../textproc/kakasi/buildlink2.mk"
+.include "../../textproc/kakasi/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Substitute/Makefile b/textproc/p5-Text-Substitute/Makefile
index 8d17751bfa3..8fc2ab7f306 100644
--- a/textproc/p5-Text-Substitute/Makefile
+++ b/textproc/p5-Text-Substitute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/02/21 07:40:35 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/04 23:46:37 snj Exp $
 
 DISTNAME=		Text-Substitute-0.15
 PKGNAME=		p5-${DISTNAME}
@@ -9,7 +9,7 @@ MAINTAINER=		abs@NetBSD.org
 HOMEPAGE=		http://www.mono.org/abs/tools/Text-Substitute/
 COMMENT=		Perl5 module for text substitution from hashes
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Substitute/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Text-Template/Makefile b/textproc/p5-Text-Template/Makefile
index 64796013bf0..8b5381767ac 100644
--- a/textproc/p5-Text-Template/Makefile
+++ b/textproc/p5-Text-Template/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/21 17:27:43 martti Exp $
+# $NetBSD: Makefile,v 1.13 2004/05/04 23:46:37 snj Exp $
 #
 
 DISTNAME=       Text-Template-1.43
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.plover.com/~mjd/perl/Template/
 COMMENT=	Perl5 library for generating form letters
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Template/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Text-Wrapper/Makefile b/textproc/p5-Text-Wrapper/Makefile
index 89c693a8c63..c7a3be066ff 100644
--- a/textproc/p5-Text-Wrapper/Makefile
+++ b/textproc/p5-Text-Wrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:27:44 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/04 23:46:37 snj Exp $
 #
 
 DISTNAME=       Text-Wrapper-1.000
@@ -10,7 +10,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl5 module that provides simple word wrapping
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Wrapper/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-XML-Grove/Makefile b/textproc/p5-XML-Grove/Makefile
index 7d9057ea56f..15465adeb09 100644
--- a/textproc/p5-XML-Grove/Makefile
+++ b/textproc/p5-XML-Grove/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:54:39 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/04 23:46:37 snj Exp $
 #
 
 DISTNAME=	XML-Grove-0.46alpha
@@ -13,7 +13,7 @@ COMMENT=	Perl 5 module providing simple objects for parsed XML documents
 
 DEPENDS+=	p5-libxml>=0.0.7:../../textproc/p5-libxml
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Grove/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-XML-Node/Makefile b/textproc/p5-XML-Node/Makefile
index 67f88060ca7..9ff435c7bd8 100644
--- a/textproc/p5-XML-Node/Makefile
+++ b/textproc/p5-XML-Node/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:54:40 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/04 23:46:37 snj Exp $
 #
 
 DISTNAME=	XML-Node-0.10
@@ -15,7 +15,7 @@ COMMENT=	Node-based XML parsing: an simplified interface to XML::Parser
 
 DEPENDS+=	p5-XML-Parser-2.*:../p5-XML-Parser
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Node/.packlist
 
 post-install:
diff --git a/textproc/p5-XML-RSS/Makefile b/textproc/p5-XML-RSS/Makefile
index e599de42f2d..df589bb20a9 100644
--- a/textproc/p5-XML-RSS/Makefile
+++ b/textproc/p5-XML-RSS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/03 22:14:46 kristerw Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/04 23:46:37 snj Exp $
 
 DISTNAME=	XML-RSS-0.97
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	XML-RSS helps to create and update RSS files
 
 DEPENDS+=	p5-XML-Parser>=2.29:../../textproc/p5-XML-Parser
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/RSS/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-XML-SAX-Expat/Makefile b/textproc/p5-XML-SAX-Expat/Makefile
index 30644b4ee5b..cf5c21d89b6 100644
--- a/textproc/p5-XML-SAX-Expat/Makefile
+++ b/textproc/p5-XML-SAX-Expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:54:42 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/04 23:46:37 snj Exp $
 
 DISTNAME=	XML-SAX-Expat-0.35
 PKGNAME=	p5-${DISTNAME}
@@ -13,7 +13,7 @@ DEPENDS+=	p5-XML-NamespaceSupport-[0-9]*:../../textproc/p5-XML-NamespaceSupport
 DEPENDS+=	p5-XML-SAX-[0-9]*:../../textproc/p5-XML-SAX
 DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/SAX/Expat/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-XML-Stream/Makefile b/textproc/p5-XML-Stream/Makefile
index bba69f38b57..1e5b5529108 100644
--- a/textproc/p5-XML-Stream/Makefile
+++ b/textproc/p5-XML-Stream/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/18 08:33:12 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/05/04 23:46:37 snj Exp $
 #
 
 DISTNAME=	XML-Stream-1.15
@@ -13,7 +13,7 @@ COMMENT=	XML::Stream provides you with access to XML Stream
 DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 DEPENDS+=	p5-Unicode-String-[0-9]*:../../converters/p5-Unicode-String
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Stream/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-XML-Writer-String/Makefile b/textproc/p5-XML-Writer-String/Makefile
index 17ba6a7f4e1..14445d5661b 100644
--- a/textproc/p5-XML-Writer-String/Makefile
+++ b/textproc/p5-XML-Writer-String/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:54:42 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/04 23:46:37 snj Exp $
 #
 
 DISTNAME=	XML-Writer-String-0.1
@@ -12,7 +12,7 @@ COMMENT=	Perl module for writing XML documents based on XML::Writer
 
 DEPENDS+=	p5-XML-Writer-[0-9]*:../../textproc/p5-XML-Writer
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Writer/String/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-XML-XQL/Makefile b/textproc/p5-XML-XQL/Makefile
index 056182f727b..535a2c67b8e 100644
--- a/textproc/p5-XML-XQL/Makefile
+++ b/textproc/p5-XML-XQL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:55 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/05/04 23:46:37 snj Exp $
 #
 
 DISTNAME=	XML-XQL-0.68
@@ -19,7 +19,7 @@ DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 
 CONFLICTS+=	p5-libxml-enno-[0-9]*
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/XQL/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-libxml-enno/Makefile b/textproc/p5-libxml-enno/Makefile
index 93d92d49012..dec3dae8186 100644
--- a/textproc/p5-libxml-enno/Makefile
+++ b/textproc/p5-libxml-enno/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:55 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/05/04 23:46:37 snj Exp $
 
 DISTNAME=	libxml-enno-1.05a
 PKGNAME=	p5-${DISTNAME}
@@ -21,7 +21,7 @@ CONFLICTS+=	p5-XML-DOM-[0-9]* p5-XML-XQL-[0-9]*
 CONFLICTS+=	p5-XML-Checker-[0-9]* p5-XML-RegExp-[0-9]*
 
 WRKSRC=			${WRKDIR}/libxml-enno-1.05
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/libxml-enno/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/py-SimpleParse/Makefile b/textproc/py-SimpleParse/Makefile
index 4b0e70d61f7..831acc9a923 100644
--- a/textproc/py-SimpleParse/Makefile
+++ b/textproc/py-SimpleParse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/03/26 02:27:55 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/05/04 23:46:37 snj Exp $
 #
 
 DISTNAME=		SimpleParse-2.0.0
@@ -13,9 +13,9 @@ HOMEPAGE=		http://simpleparse.sourceforge.net/
 COMMENT=		Simple parser generator for mxTextTools text-tagging engine
 
 PYDISTUTILSPKG=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 PYTHON_VERSIONS_ACCEPTED=	23pth 22pth
 
 .include "../../lang/python/extension.mk"
-.include "../../time/py-mxDateTime/buildlink2.mk"
+.include "../../time/py-mxDateTime/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-csv/Makefile b/textproc/py-csv/Makefile
index 243992717b8..f2d85244c81 100644
--- a/textproc/py-csv/Makefile
+++ b/textproc/py-csv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/09/14 18:13:49 recht Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/04 23:46:37 snj Exp $
 #
 
 DISTNAME=	csv-1.0
@@ -10,7 +10,7 @@ MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.object-craft.com.au/projects/csv/
 COMMENT=	CSV reading module for Python
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 PYDISTUTILSPKG=	yes
 PYBINMODULE=	yes
diff --git a/textproc/regexx/Makefile b/textproc/regexx/Makefile
index c22f4a75ec2..f1fe9ce43db 100644
--- a/textproc/regexx/Makefile
+++ b/textproc/regexx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:53 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/04 23:46:37 snj Exp $
 #
 
 DISTNAME=		regexx-0.98.1
@@ -9,10 +9,10 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://bazar.conectiva.com.br/~niemeyer/projects/regexx/
 COMMENT=		C++ regular expression library
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
-.include "../../devel/pcre/buildlink2.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-eruby/buildlink2.mk b/textproc/ruby-eruby/buildlink2.mk
deleted file mode 100644
index b39c9251c9a..00000000000
--- a/textproc/ruby-eruby/buildlink2.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/10/25 12:53:41 wiz Exp $
-#
-
-.if !defined(RUBY_ERUBY_BUILDLINK2_MK)
-RUBY_ERUBY_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			ruby-eruby
-BUILDLINK_DEPENDS.ruby-eruby?=		ruby-eruby>=0.9.7
-BUILDLINK_PKGSRCDIR.ruby-eruby?=	../../textproc/ruby-eruby
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.ruby-eruby=ruby-eruby
-BUILDLINK_PREFIX.ruby-eruby_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.ruby-eruby+=	include/eruby.h
-BUILDLINK_FILES.ruby-eruby+=	lib/liberuby.*
-
-BUILDLINK_TARGETS+=	ruby-eruby-buildlink
-
-ruby-eruby-buildlink: _BUILDLINK_USE
-
-.endif	# RUBY_ERUBY_BUILDLINK2_MK
diff --git a/textproc/ruby-eruby/buildlink3.mk b/textproc/ruby-eruby/buildlink3.mk
new file mode 100644
index 00000000000..1845631981d
--- /dev/null
+++ b/textproc/ruby-eruby/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/04 23:46:37 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+RUBY_ERUBY_BUILDLINK3_MK:=	${RUBY_ERUBY_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	ruby-eruby
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nruby-eruby}
+BUILDLINK_PACKAGES+=	ruby-eruby
+
+.if !empty(RUBY_ERUBY_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.ruby-eruby+=	ruby-eruby>=0.9.7
+BUILDLINK_PKGSRCDIR.ruby-eruby?=	../../textproc/ruby-eruby
+.endif	# RUBY_ERUBY_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile
index 7806acf9de0..d4a743d481d 100644
--- a/www/ap-ruby/Makefile
+++ b/www/ap-ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/03/16 02:01:11 taca Exp $
+# $NetBSD: Makefile,v 1.17 2004/05/04 23:46:37 snj Exp $
 #
 
 DISTNAME=	mod_ruby-${VERSION}
@@ -10,7 +10,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.modruby.net/
 COMMENT=	Apache module that embeds Ruby interpreter within
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 APACHE_MODULE=	YES
 DIST_SUBDIR=	ruby
@@ -59,8 +59,8 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/mod_ruby.conf  ${RUBY_EXAMPLESDIR}/mod_ruby
 
 .include "../../lang/ruby-base/Makefile.common"
-.include "../../lang/ruby-base/buildlink2.mk"
-.include "../../textproc/ruby-eruby/buildlink2.mk"
-.include "../../www/apache/buildlink2.mk"
+.include "../../lang/ruby-base/buildlink3.mk"
+.include "../../textproc/ruby-eruby/buildlink3.mk"
+.include "../../www/apache/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-ruby/Makefile b/www/ap2-ruby/Makefile
index 14ccbfd5ee0..e6b45c7bd11 100644
--- a/www/ap2-ruby/Makefile
+++ b/www/ap2-ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/03/26 02:27:56 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/04 23:46:37 snj Exp $
 
 DISTNAME=	mod_ruby-${VERSION}
 PKGNAME=	ap2-${RUBY_PKGNAMEPREFIX}${VERSION}
@@ -12,7 +12,7 @@ COMMENT=	Embedded Ruby for Apache2 (development version)
 
 CONFLICTS+=	ap-ruby
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 APACHE_MODULE=	YES
 DIST_SUBDIR=	ruby
@@ -47,9 +47,9 @@ post-install:
 		${RUBY_EXAMPLESDIR}/mod_ruby
 
 .include "../../lang/ruby-base/Makefile.common"
-.include "../../lang/ruby-base/buildlink2.mk"
-.include "../../textproc/ruby-eruby/buildlink2.mk"
-.include "../../devel/apr/buildlink2.mk"
-.include "../../www/apache2/buildlink2.mk"
+.include "../../lang/ruby-base/buildlink3.mk"
+.include "../../textproc/ruby-eruby/buildlink3.mk"
+.include "../../devel/apr/buildlink3.mk"
+.include "../../www/apache2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"