bl3ify

40 files changed, 88 insertions, 88 deletions

diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index 657ec408f18..05dc50a1f70 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/20 12:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/11 18:03:49 xtraeme Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:09 fenner Exp
 #
 
@@ -17,7 +17,7 @@ NO_BIN_ON_CDROM=${RESTRICTED}
 
 WRKSRC=		${WRKDIR}
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/arc ${PREFIX}/bin/
diff --git a/archivers/bicom/Makefile b/archivers/bicom/Makefile
index 8740f74da80..09fe67ac06b 100644
--- a/archivers/bicom/Makefile
+++ b/archivers/bicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/02/08 04:03:14 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/11 18:03:49 xtraeme Exp $
 #
 
 DISTNAME=		bicom101
@@ -14,7 +14,7 @@ COMMENT=		Data compressor in the PPM family
 LICENSE=		no-commercial-use
 
 WRKSRC=			${WRKDIR}
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		# defined
 USE_GCC_SHLIB=		yes
 
 do-build:
diff --git a/archivers/bunzip/Makefile b/archivers/bunzip/Makefile
index 13930715d01..57c1a37ee83 100644
--- a/archivers/bunzip/Makefile
+++ b/archivers/bunzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/02/08 04:03:15 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/11 18:03:49 xtraeme Exp $
 
 DISTNAME=	bunzip021.c
 PKGNAME=	bunzip-0.21
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.muraroa.demon.co.uk/
 COMMENT=	Decompressor for bzip .bz files
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} -o bunzip ${DISTNAME}
diff --git a/archivers/cabextract/Makefile b/archivers/cabextract/Makefile
index 1c4c99a9621..2345e9ac75d 100644
--- a/archivers/cabextract/Makefile
+++ b/archivers/cabextract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/10 23:05:43 ben Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/11 18:03:49 xtraeme Exp $
 #
 
 DISTNAME=		cabextract-1.0
@@ -9,7 +9,7 @@ MAINTAINER=		ben@NetBSD.org
 HOMEPAGE=		http://www.kyz.uklinux.net/cabextract.php3
 COMMENT=		Microsoft cabinet (.CAB) file extractor
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 
diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile
index 76b9c320d9c..3a21260c62b 100644
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/22 07:18:43 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/11 18:03:49 xtraeme Exp $
 #
 
 DISTNAME=	dact-0.8.3
@@ -10,7 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.rkeene.org/devel/dact/
 COMMENT=	Dynamic adaptive compression tool
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 USE_GNU_TOOLS+=	make
 
@@ -19,6 +19,6 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dact
 
-.include "../../archivers/bzip2/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/fastjar/Makefile b/archivers/fastjar/Makefile
index 91e83bceb4a..466f737ef7e 100644
--- a/archivers/fastjar/Makefile
+++ b/archivers/fastjar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:21:10 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/11 18:03:49 xtraeme Exp $
 #
 
 DISTNAME=	fastjar-0.93
@@ -11,11 +11,11 @@ HOMEPAGE=	http://fastjar.sourceforge.net/
 COMMENT=	C language version of the 'jar' archiver normally used by Java
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/fastjar.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/grepjar.1 ${PREFIX}/man/man1
 
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile
index a7280db3624..d6d111c39a7 100644
--- a/archivers/freeze/Makefile
+++ b/archivers/freeze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/10/06 07:23:55 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/03/11 18:03:49 xtraeme Exp $
 
 DISTNAME=       freeze-2.5
 PKGREVISION=	1
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cdrom.com/pub/unixfreeware/archive/
 MAINTAINER=     tech-pkg@NetBSD.org
 COMMENT=	FREEZE / MELT compression program - often used in QNX
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 ALL_TARGET=	prog
 
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index 7d4b5affc0e..be24bd82564 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/08/09 10:27:40 seb Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/11 18:03:49 xtraeme Exp $
 #
 
 DISTNAME=       cpio-2.4.2
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/cpio/cpio.html
 COMMENT=	GNU copy-in/out (cpio) with remote magnetic tape (rmt) support
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 LIBS+=		-lgnumalloc
 
diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index 1b86e37c238..a043fed12f3 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/10/20 09:37:24 agc Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/11 18:03:49 xtraeme Exp $
 
 DISTNAME=	sharutils-4.2.1
 PKGNAME=	g${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Allow packing and unpacking of shell archives
 
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
@@ -33,5 +33,5 @@ BUILD_DEFS+=		GNU_PROGRAM_PREFIX
 post-patch:
 	@${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/po/sharutils.pot
 
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index fee43569582..6dc29870afd 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2003/07/17 21:21:15 grant Exp $
+# $NetBSD: Makefile,v 1.33 2004/03/11 18:03:49 xtraeme Exp $
 #
 
 DISTNAME=       tar-1.13.25
@@ -16,7 +16,7 @@ COMMENT=	The GNU tape archiver with remote magnetic tape support
 
 BUILD_USES_MSGFMT=	YES
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
diff --git a/archivers/gtar-info/Makefile b/archivers/gtar-info/Makefile
index 063a9937848..2d0ad1123a1 100644
--- a/archivers/gtar-info/Makefile
+++ b/archivers/gtar-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/08/09 10:27:41 seb Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/11 18:03:49 xtraeme Exp $
 #
 
 DISTNAME=       tar-1.13.25
@@ -15,7 +15,7 @@ COMMENT=	Info format documentation for the GNU tape archiver
 
 INFO_FILES=	tar.info
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 087495dd79d..4dde80e0cac 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/07/17 21:21:14 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/03/11 18:03:49 xtraeme Exp $
 
 DISTNAME=	gtar-1.13.25
 PKGREVISION=	1
@@ -13,7 +13,7 @@ COMMENT=	The "meta-package" for the GNU tape archiver (tar)
 DEPENDS+=	gtar-base-1.13.25nb1:../../archivers/gtar-base
 DEPENDS+=	gtar-info-1.13.25:../../archivers/gtar-info
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/archivers/gzip-base/Makefile b/archivers/gzip-base/Makefile
index 4b3fe52589c..9bf16904bc9 100644
--- a/archivers/gzip-base/Makefile
+++ b/archivers/gzip-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:21:17 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/11 18:03:50 xtraeme Exp $
 #
 
 DISTNAME=	gzip-1.2.4a
@@ -13,7 +13,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/gzip/gzip.html
 COMMENT=	Compress or expand files
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 BUILD_TARGET=	all manlinks=so
diff --git a/archivers/gzip-info/Makefile b/archivers/gzip-info/Makefile
index 3acbe7ff6df..e1075d22ab3 100644
--- a/archivers/gzip-info/Makefile
+++ b/archivers/gzip-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/08/09 10:27:42 seb Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/11 18:03:50 xtraeme Exp $
 
 DISTNAME=	gzip-1.2.4a
 PKGNAME=	gzip-info-1.2.4a
@@ -13,7 +13,7 @@ COMMENT=	Info format documentation for the GZIP utility
 
 INFO_FILES=	gzip.info
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile
index b61217ba505..053f643c11e 100644
--- a/archivers/gzip/Makefile
+++ b/archivers/gzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:21:17 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/11 18:03:50 xtraeme Exp $
 #
 
 DISTNAME=	gzip-1.2.4a
@@ -14,7 +14,7 @@ COMMENT=	The "meta-package" for the GZIP compression utility
 DEPENDS+=	gzip-base-1.2.4anb1:../../archivers/gzip-base
 DEPENDS+=	gzip-info-1.2.4a:../../archivers/gzip-info
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	YES
diff --git a/archivers/hpack/Makefile b/archivers/hpack/Makefile
index 62950161811..941a921cdb4 100644
--- a/archivers/hpack/Makefile
+++ b/archivers/hpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/20 12:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/11 18:03:50 xtraeme Exp $
 
 DISTNAME=       hpack79src
 PKGNAME=        hpack-0.79
@@ -9,7 +9,7 @@ MAINTAINER=     tech-pkg@NetBSD.org
 COMMENT=	Multi-System Archiver with open keys PGP-based security
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 CRYPTO=		yes
 
diff --git a/archivers/jamjar/Makefile b/archivers/jamjar/Makefile
index b3b189a6e39..ad3a68edfed 100644
--- a/archivers/jamjar/Makefile
+++ b/archivers/jamjar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/11 18:03:50 xtraeme Exp $
 #
 
 DISTNAME=	jamjar-0.6
@@ -12,7 +12,7 @@ COMMENT=	Acunia version of the jar archiver
 BUILD_DEPENDS+=	acunia-jam>=1.0:../../devel/acunia-jam
 
 WRKSRC=		${WRKDIR}/jamjar
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 JAM_COMMAND=	\
 	cd ${WRKSRC} &&							\
@@ -27,5 +27,5 @@ do-build:
 do-install:
 	${JAM_COMMAND} install
 
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/lbrate/Makefile b/archivers/lbrate/Makefile
index b73d91979ac..cce9f0cce41 100644
--- a/archivers/lbrate/Makefile
+++ b/archivers/lbrate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:21:22 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/03/11 18:03:50 xtraeme Exp $
 # FreeBSD Id: ports/archivers/lbrate/Makefile,v 1.4 2002/06/19 08:18:05 sobomax Exp
 
 DISTNAME=	lbrate-1.1
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://rus.members.beeb.net/lbrate.html
 COMMENT=	Extract/decompress CP/M LBR archives
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 MAKE_FLAGS+=	PREFIX=${PREFIX}
 LBRATE_DOCSDIR=	${PREFIX}/share/doc/lbrate
 
diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 5599b38e9c5..b63a2cbf4c8 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 21:21:23 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/03/11 18:03:50 xtraeme Exp $
 
 DISTNAME=       lha-114i
 PKGNAME=	lha-114.9
@@ -10,7 +10,7 @@ MASTER_SITES=   http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \
 MAINTAINER=     tech-pkg@NetBSD.org
 COMMENT=	Archive files using LZW compression (.lzh files)
 
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 
 MAKE_FLAGS=	MAKE="${MAKE_PROGRAM}"
 
diff --git a/archivers/lzop/Makefile b/archivers/lzop/Makefile
index cb66917c5e6..81bfd13d65a 100644
--- a/archivers/lzop/Makefile
+++ b/archivers/lzop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/05 10:20:27 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/11 18:03:50 xtraeme Exp $
 #
 
 DISTNAME=	lzop-1.01
@@ -9,8 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.oberhumer.com/opensource/lzop/
 COMMENT=	Fast file compressor similar to gzip, using the LZO library
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
-.include "../../archivers/liblzo/buildlink2.mk"
+.include "../../archivers/liblzo/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/macutil/Makefile b/archivers/macutil/Makefile
index 6637edf9deb..7ad3602e9f4 100644
--- a/archivers/macutil/Makefile
+++ b/archivers/macutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/20 12:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/11 18:03:50 xtraeme Exp $
 
 DISTNAME=		macutil2.0b3
 PKGNAME=		macutil-2.0b3
@@ -13,7 +13,7 @@ MAKEFILE=		makefile
 MAKE_ENV+=		CF="${CFLAGS}"
 
 WRKSRC=			${WRKDIR}/macutil
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		# defined
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/macunpack/macunpack \
diff --git a/archivers/mscompress/Makefile b/archivers/mscompress/Makefile
index 1df9c098a9e..df762fb57fd 100644
--- a/archivers/mscompress/Makefile
+++ b/archivers/mscompress/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/24 09:53:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/11 18:03:50 xtraeme Exp $
 #
 
 DISTNAME=		mscompress-0.3
@@ -10,7 +10,7 @@ MAINTAINER=		ben@NetBSD.org
 HOMEPAGE=		ftp://ftp.penguin.cz/pub/users/mhi/mscompress/
 COMMENT=		Microsoft "compress.exe/expand.exe" compatible (de)compressor
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 
 do-install:
diff --git a/archivers/nomarch/Makefile b/archivers/nomarch/Makefile
index 07e4ad1b0af..b6f9c697d54 100644
--- a/archivers/nomarch/Makefile
+++ b/archivers/nomarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/29 13:00:57 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/11 18:03:50 xtraeme Exp $
 #
 
 DISTNAME=	nomarch-1.3
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://rus.members.beeb.net/nomarch.html
 COMMENT=	Free replacement for the arc program
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 MAKE_FLAGS+=	PREFIX=${PREFIX}
 MAKE_FLAGS+=	CC="${CC}"
 MAKE_FLAGS+=	CFLAGS="${CFLAGS}"
diff --git a/archivers/nulib2/Makefile b/archivers/nulib2/Makefile
index 5ab8c50b9bb..ac56519e1af 100644
--- a/archivers/nulib2/Makefile
+++ b/archivers/nulib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/11 18:03:50 xtraeme Exp $
 #
 
 DISTNAME=	nulibdist
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.nulib.com/
 COMMENT=	Handles Apple II ShrinkIt (NuFX) file/disk archives
 
 WRKSRC=		${WRKDIR}/nulib2-200
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--cache-file=${WRKDIR}/config.cache
 
diff --git a/archivers/p5-Archive-Tar/Makefile b/archivers/p5-Archive-Tar/Makefile
index a091c4f31f9..77e7e29c4b8 100644
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 16:24:40 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/11 18:03:50 xtraeme Exp $
 
 DISTNAME=		Archive-Tar-1.02
 PKGNAME=		p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=		Perl5 module interface to manipulate tar files
 
 DEPENDS+=		p5-IO-Zlib-[0-9]*:../../devel/p5-IO-Zlib
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK5=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Archive/Tar/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/archivers/p5-Archive-Zip/Makefile b/archivers/p5-Archive-Zip/Makefile
index b7d9f9e31ae..4378b8bf964 100644
--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 16:24:40 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/11 18:03:50 xtraeme Exp $
 
 DISTNAME=		Archive-Zip-0.11
 PKGNAME=		p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=		Perl5 module interface to manipulate zip files
 
 DEPENDS+=		p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Archive/Zip/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/archivers/p5-Compress-Bzip2/Makefile b/archivers/p5-Compress-Bzip2/Makefile
index 4147a54b49a..dab6b0ae4d1 100644
--- a/archivers/p5-Compress-Bzip2/Makefile
+++ b/archivers/p5-Compress-Bzip2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/04 13:35:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/11 18:03:50 xtraeme Exp $
 #
 
 DISTNAME=	Compress-Bzip2-1.01
@@ -10,10 +10,10 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Compress-Bzip2/
 COMMENT=	Perl5 interface to bzip2 compression library
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Compress/Bzip2/.packlist
 
-.include "../../archivers/bzip2/buildlink2.mk"
+.include "../../archivers/bzip2/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile
index e2a494a62a9..a1f74cde3b7 100644
--- a/archivers/pax/Makefile
+++ b/archivers/pax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/12/20 04:47:38 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/11 18:03:50 xtraeme Exp $
 #
 
 DISTNAME=		pax-20031220
@@ -10,7 +10,7 @@ MAINTAINER=		grant@NetBSD.org
 HOMEPAGE=		http://www.NetBSD.org/
 COMMENT=		POSIX standard archiver with many extensions
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		# defined
 GNU_CONFIGURE=		# defined
 
 NO_PKGTOOLS_REQD_CHECK=	# defined
@@ -23,5 +23,5 @@ PKG_PRESERVE=           # defined
 do-extract:
 	@${CP} -Rp ${FILESDIR} ${WRKSRC}
 
-.include "../../pkgtools/libnbcompat/buildlink2.mk"
+.include "../../pkgtools/libnbcompat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/ppunpack/Makefile b/archivers/ppunpack/Makefile
index 01404dafd63..75470668e2e 100644
--- a/archivers/ppunpack/Makefile
+++ b/archivers/ppunpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/02/08 04:03:15 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/11 18:03:50 xtraeme Exp $
 
 DISTNAME=	ppsmall-1.0
 PKGNAME=	ppunpack-1.0
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Decompresses Amiga PowerPacker files
 
 WRKSRC=		${WRKDIR}/PPUnpack
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 
 MAKE_FLAGS=	CC="${CC}" COPTS="${CFLAGS}"
 ALL_TARGET=	ppunpack
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index da6307b0c1d..41265bb3eda 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2004/01/20 12:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.36 2004/03/11 18:03:50 xtraeme Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:27 fenner Exp
 #
 
@@ -21,7 +21,7 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 
 WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${DOWNLOADED_DISTFILE} >/dev/null
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		# defined
 
 pre-extract:
 	@if [ -z "$$KERNEL" ]; then \
diff --git a/archivers/squsq/Makefile b/archivers/squsq/Makefile
index f71d13b32d8..eccd38a22a3 100644
--- a/archivers/squsq/Makefile
+++ b/archivers/squsq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/11 18:03:50 xtraeme Exp $
 
 DISTNAME=	t20-squsq-3.3
 PKGNAME=	squsq-3.3
@@ -11,7 +11,7 @@ COMMENT=	Compressor/decompressor for CP/M Squeeze compressed files
 MAKEFILE=	${FILESDIR}/Makefile
 
 WRKSRC=		${WRKDIR}/t20-squsq
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sq ${WRKSRC}/usq ${PREFIX}/bin/
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index cfe22e7a7b1..6ec5fae7fdf 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/22 07:18:44 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/11 18:03:50 xtraeme Exp $
 #
 
 DISTNAME=	unace-1.2b
@@ -10,7 +10,7 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.winace.com/
 COMMENT=	Extract, list and test files in ACE archives
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 
 ALL_TARGET=	clean unace
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index 17aab05333e..53c732fc4ed 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 21:21:41 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/11 18:03:50 xtraeme Exp $
 
 DISTNAME=       unarj-2.43
 CATEGORIES=	archivers
@@ -14,7 +14,7 @@ RESTRICTED=	"Do not charge a fee for use, copying, or distribution"
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unarj
diff --git a/archivers/undms/Makefile b/archivers/undms/Makefile
index 1a1a58a90be..a1cb5f52a57 100644
--- a/archivers/undms/Makefile
+++ b/archivers/undms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/08 04:03:15 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/03/11 18:03:50 xtraeme Exp $
 
 DISTNAME=	undms-1.3.c
 PKGNAME=	undms-1.3
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Converts .dms Amiga disk images to uncompressed .adf images
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} -o undms undms-1.3.c
diff --git a/archivers/unlzx/Makefile b/archivers/unlzx/Makefile
index 41ec47d540d..49c7cebf0b6 100644
--- a/archivers/unlzx/Makefile
+++ b/archivers/unlzx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/02/08 04:03:15 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/11 18:03:50 xtraeme Exp $
 
 DISTNAME=	unlzx.c
 PKGNAME=	unlzx-1.1
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Extracts .lzx archives from Amiga systems
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} -o unlzx unlzx.c
diff --git a/archivers/unzoo/Makefile b/archivers/unzoo/Makefile
index c3f796811ef..bc891976521 100644
--- a/archivers/unzoo/Makefile
+++ b/archivers/unzoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:07:07 agc Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/11 18:03:50 xtraeme Exp $
 #
 
 DISTNAME=	unzoo.c
@@ -11,7 +11,7 @@ MAINTAINER=	cjep@NetBSD.org
 COMMENT=	Extract zoo archives
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 do-extract:
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}
diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile
index fa5ae58baa6..3458f4bdfc0 100644
--- a/archivers/xbin/Makefile
+++ b/archivers/xbin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/02/08 04:03:15 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/11 18:03:50 xtraeme Exp $
 #
 
 DISTNAME=	${PRGNAME}unix
@@ -15,7 +15,7 @@ NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 
 PRGNAME=	xbin
 EXTRACT_ONLY=	# empty
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 9d65bafd8c8..2b315d3c38c 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/07/17 21:21:49 grant Exp $
+# $NetBSD: Makefile,v 1.35 2004/03/11 18:03:50 xtraeme Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/04/27 16:06:15 ache Exp
 #
 
@@ -35,7 +35,7 @@ ALL_TARGET=	generic
 CFLAGS+=	-DHAVE_DIRENT_H
 .endif
 
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 
 post-extract:
 	@cd ${WRKSRC} && ${LOCALBASE}/bin/unzip -qo ${DISTDIR}/zcrypt29.zip
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index 829962c3ca9..394eeb3169a 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/20 12:07:07 agc Exp $
+# $NetBSD: Makefile,v 1.24 2004/03/11 18:03:50 xtraeme Exp $
 #
 
 DISTNAME=	zip1-1.1
@@ -20,7 +20,7 @@ MAKEFILE=	makefile
 MAKE_FLAGS=	CFLAGS="${CFLAGS} -DDIRENT" LFLAGS2="-lcompat"
 ALL_TARGET=	zip
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 PLIST_SRC=	${WRKSRC}/PLIST
 
 BUILD_DEFS+=	ZIP_ENCRYPTION
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index 451a487af0b..96c10632e43 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/20 12:07:07 agc Exp $
+# $NetBSD: Makefile,v 1.19 2004/03/11 18:03:50 xtraeme Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/08/10 22:31:36 fenner Exp
 #
 
@@ -13,7 +13,7 @@ COMMENT=	Manipulate archives of files in compressed form
 LICENSE=	zoo-license
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 ALL_TARGET=     bsdansi
 MAKEFILE=       makefile