Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used.

69 files changed, 69 insertions, 139 deletions

diff --git a/archivers/9e/Makefile b/archivers/9e/Makefile
index 65e49995444..61b6dae8df6 100644
--- a/archivers/9e/Makefile
+++ b/archivers/9e/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/03/24 21:12:50 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:44:48 tv Exp $
 
 DISTNAME=	9e
 PKGNAME=	9e-1.0
@@ -11,7 +11,6 @@ COMMENT=	Explode Plan9 archives
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	yes
 NO_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	bin
diff --git a/archivers/advancecomp/Makefile b/archivers/advancecomp/Makefile
index b803b2c9ba0..c50a0d091d2 100644
--- a/archivers/advancecomp/Makefile
+++ b/archivers/advancecomp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/01/21 21:48:32 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:44:48 tv Exp $
 
 DISTNAME=	advancecomp-1.13
 CATEGORIES=	archivers
@@ -10,7 +10,6 @@ COMMENT=	Recompression utilities for .zip, .png, .mng and .gz files
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c++
 
diff --git a/archivers/afio/Makefile b/archivers/afio/Makefile
index 90fbc867b8b..3ef2b04a9bf 100644
--- a/archivers/afio/Makefile
+++ b/archivers/afio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/03 15:14:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:44:48 tv Exp $
 
 DISTNAME=	afio-2.5
 CATEGORIES=	archivers
@@ -11,7 +11,6 @@ COMMENT=	cpio-format archive creator with data corruption handling
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	yes
 NO_CONFIGURE=	yes
 BUILD_TARGET=	afio
 
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index 42708b5c841..b241662f62e 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/03/24 21:12:50 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2005/04/11 21:44:48 tv Exp $
 
 DISTNAME=       arc521e.pl8
 PKGNAME=        arc-5.21e
@@ -18,7 +18,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}
 
-USE_BUILDLINK3=	yes
 
 INSTALLATION_DIRS=	bin man/man1
 
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index 2505b409009..41b5652bf2a 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/03/24 21:12:50 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:48 tv Exp $
 
 DISTNAME=	arj-3.10.21
 CATEGORIES=	archivers
@@ -10,7 +10,6 @@ COMMENT=	Open-source ARJ
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	${WRKSRC}/gnu/configure
diff --git a/archivers/bicom/Makefile b/archivers/bicom/Makefile
index 84e52f68ebd..096fccc48ab 100644
--- a/archivers/bicom/Makefile
+++ b/archivers/bicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/07/31 03:48:30 xtraeme Exp $
+# $NetBSD: Makefile,v 1.20 2005/04/11 21:44:48 tv Exp $
 #
 
 DISTNAME=		bicom101
@@ -16,7 +16,6 @@ LICENSE=		no-commercial-use
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}
-USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c++
 
 INSTALLATION_DIRS=	bin
diff --git a/archivers/bunzip/Makefile b/archivers/bunzip/Makefile
index dd4f7dbb36d..96058a163ac 100644
--- a/archivers/bunzip/Makefile
+++ b/archivers/bunzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/04/22 23:24:05 minskim Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:48 tv Exp $
 
 DISTNAME=	bunzip021.c
 PKGNAME=	bunzip-0.21
@@ -13,7 +13,6 @@ COMMENT=	Decompressor for bzip .bz files
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK3=	yes
 
 INSTALLATION_DIRS=	bin
 
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile
index 3728738210b..ecfe66e6aef 100644
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/10/13 17:51:32 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/04/11 21:44:48 tv Exp $
 #
 
 DISTNAME=	bzip2-1.0.2
@@ -12,7 +12,6 @@ COMMENT=	Block-sorting file compressor
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 MAKE_ENV+=		REALCC="${CC}"
 
diff --git a/archivers/cabextract/Makefile b/archivers/cabextract/Makefile
index c60031b4140..7ca4ba02624 100644
--- a/archivers/cabextract/Makefile
+++ b/archivers/cabextract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/10/29 14:32:38 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:44:48 tv Exp $
 #
 
 DISTNAME=		cabextract-1.1
@@ -11,7 +11,6 @@ COMMENT=		Microsoft cabinet (.CAB) file extractor
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 
diff --git a/archivers/cxunzip/Makefile b/archivers/cxunzip/Makefile
index 2a74cea4a3e..a9edce5541d 100644
--- a/archivers/cxunzip/Makefile
+++ b/archivers/cxunzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/12/17 20:44:58 minskim Exp $
+# $NetBSD: Makefile,v 1.18 2005/04/11 21:44:48 tv Exp $
 
 DISTNAME=	cxunzip-0.98
 PKGREVISION=	2
@@ -11,7 +11,6 @@ COMMENT=	Cloned Xunzip is a GNOME zip-archive uncompressing program
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	yes
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GNU_TOOLS+=	make
diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile
index 3438705681d..32e98f5754b 100644
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/10/03 00:13:04 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:48 tv Exp $
 #
 
 DISTNAME=	dact-0.8.3
@@ -12,7 +12,6 @@ COMMENT=	Dynamic adaptive compression tool
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 USE_GNU_TOOLS+=	make
 
diff --git a/archivers/dar/Makefile b/archivers/dar/Makefile
index d17efed6a65..716c937ebea 100644
--- a/archivers/dar/Makefile
+++ b/archivers/dar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/01/24 16:58:06 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:48 tv Exp $
 
 DISTNAME=	dar-2.1.5
 CATEGORIES=	archivers sysutils
@@ -10,7 +10,6 @@ COMMENT=	Disk archiver
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/archivers/fastjar/Makefile b/archivers/fastjar/Makefile
index 339e0ba38bd..7ef2f3cae07 100644
--- a/archivers/fastjar/Makefile
+++ b/archivers/fastjar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/01/30 23:18:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:48 tv Exp $
 #
 
 DISTNAME=	fastjar-0.93
@@ -14,7 +14,6 @@ COMMENT=	C language version of the 'jar' archiver normally used by Java
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 
 INSTALLATION_DIRS=	man/man1
 
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 29200693f23..3ef5799526c 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/03/22 16:29:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2005/04/11 21:44:48 tv Exp $
 #
 
 DISTNAME=	file-roller-2.10.0
@@ -16,7 +16,6 @@ DEPENDS+=		unzip>=5.50nb2:../../archivers/unzip
 DEPENDS+=		zip>=2.3nb2:../../archivers/zip
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_PERL5=		build
diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile
index 05efa868740..46ee6a8c952 100644
--- a/archivers/freeze/Makefile
+++ b/archivers/freeze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/12/03 15:14:50 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:44:48 tv Exp $
 
 DISTNAME=       freeze-2.5
 PKGREVISION=	2
@@ -10,7 +10,6 @@ COMMENT=	FREEZE / MELT compression program - often used in QNX
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 BUILD_TARGET=	prog
 
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index 67fe4c464f1..65e9b9aea01 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/03/20 19:53:09 salo Exp $
+# $NetBSD: Makefile,v 1.24 2005/04/11 21:44:48 tv Exp $
 #
 
 DISTNAME=       cpio-2.5
@@ -13,7 +13,6 @@ COMMENT=	GNU copy-in/out (cpio) with remote magnetic tape (rmt) support
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 USE_MAKEINFO=	yes
 
diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index fce1ceb869c..76d54c67a3c 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 18:44:54 salo Exp $
+# $NetBSD: Makefile,v 1.27 2005/04/11 21:44:48 tv Exp $
 
 DISTNAME=	sharutils-4.2.1
 PKGNAME=	g${DISTNAME}
@@ -14,7 +14,6 @@ BUILD_USES_MSGFMT=	yes
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index 324d8696e7b..5ac3e06be2c 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/01/16 22:28:40 tv Exp $
+# $NetBSD: Makefile,v 1.42 2005/04/11 21:44:48 tv Exp $
 #
 
 DISTNAME=       tar-1.15.1
@@ -15,7 +15,6 @@ BUILD_USES_MSGFMT=	YES
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
diff --git a/archivers/gtar-info/Makefile b/archivers/gtar-info/Makefile
index 0853100c1af..8a7c1c31aa8 100644
--- a/archivers/gtar-info/Makefile
+++ b/archivers/gtar-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/01/09 22:52:14 recht Exp $
+# $NetBSD: Makefile,v 1.19 2005/04/11 21:44:48 tv Exp $
 #
 
 DISTNAME=       tar-1.15.1
@@ -15,7 +15,6 @@ INFO_FILES=	tar.info
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-NO_BUILDLINK=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 78f0a749101..6a794097e14 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/01/09 22:52:13 recht Exp $
+# $NetBSD: Makefile,v 1.28 2005/04/11 21:44:48 tv Exp $
 
 DISTNAME=	gtar-1.15.1
 CATEGORIES=	archivers
@@ -14,7 +14,6 @@ DEPENDS+=	gtar-info-1.15.1:../../archivers/gtar-info
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-NO_BUILDLINK=	yes
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/archivers/gzip-base/Makefile b/archivers/gzip-base/Makefile
index 32d04b6422a..c15e335e8fe 100644
--- a/archivers/gzip-base/Makefile
+++ b/archivers/gzip-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/10/12 18:28:28 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/04/11 21:44:48 tv Exp $
 #
 
 DISTNAME=	gzip-1.2.4a
@@ -14,7 +14,6 @@ COMMENT=	Compress or expand files
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 BUILD_TARGET=	all manlinks=so
diff --git a/archivers/gzip-info/Makefile b/archivers/gzip-info/Makefile
index 1440394f6ce..228daff9cf5 100644
--- a/archivers/gzip-info/Makefile
+++ b/archivers/gzip-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/07/02 21:06:35 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2005/04/11 21:44:48 tv Exp $
 
 DISTNAME=	gzip-1.2.4a
 PKGNAME=	gzip-info-1.2.4a
@@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 INFO_FILES=	gzip.info
 
-USE_BUILDLINK3=	yes
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile
index 218b271d2c9..643eb679005 100644
--- a/archivers/gzip/Makefile
+++ b/archivers/gzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/10/12 18:28:28 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:48 tv Exp $
 #
 
 DISTNAME=	gzip-1.2.4b
@@ -17,7 +17,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	YES
-NO_BUILDLINK=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/archivers/gzrecover/Makefile b/archivers/gzrecover/Makefile
index ae0f822a920..1e4722415ad 100644
--- a/archivers/gzrecover/Makefile
+++ b/archivers/gzrecover/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/03 15:14:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=		gzrt-0.2
@@ -14,7 +14,6 @@ COMMENT=		GZip Recovery Toolkit
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 BUILD_TARGET=		gzrecover
-USE_BUILDLINK3=		yes
 
 INSTALLATION_DIRS=	bin
 
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index ac3b6bbb1bb..4894858b794 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/03/24 21:12:50 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/04/11 21:44:49 tv Exp $
 
 DISTNAME=       ha0999
 PKGNAME=        ha-0.999b
@@ -12,7 +12,6 @@ COMMENT=	The HA archiver using the HSC compression method
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK3=	yes
 
 MAKEFILE=       makefile.nix
 BUILD_TARGET=     ha
diff --git a/archivers/hpack/Makefile b/archivers/hpack/Makefile
index 594aef94de8..8ec9749261f 100644
--- a/archivers/hpack/Makefile
+++ b/archivers/hpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/03/13 15:08:19 uebayasi Exp $
+# $NetBSD: Makefile,v 1.26 2005/04/11 21:44:49 tv Exp $
 
 DISTNAME=       hpack79src
 PKGNAME=        hpack-0.79
@@ -12,7 +12,6 @@ COMMENT=	Multi-System Archiver with open keys PGP-based security
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK3=	yes
 USE_PKGINSTALL=	yes
 
 CRYPTO=		yes
diff --git a/archivers/jamjar/Makefile b/archivers/jamjar/Makefile
index 03a86577595..7be9ead4264 100644
--- a/archivers/jamjar/Makefile
+++ b/archivers/jamjar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/11/27 07:19:49 skrll Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=	jamjar-0.7.1
@@ -14,7 +14,6 @@ BUILD_DEPENDS+=	acunia-jam>=1.0:../../devel/acunia-jam
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}/jamjar
-USE_BUILDLINK3=	YES
 
 JAM_COMMAND=	\
 	cd ${WRKSRC} &&							\
diff --git a/archivers/lbrate/Makefile b/archivers/lbrate/Makefile
index b0c921c8cc3..44346939260 100644
--- a/archivers/lbrate/Makefile
+++ b/archivers/lbrate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/24 21:12:50 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:44:49 tv Exp $
 
 DISTNAME=	lbrate-1.1
 PKGREVISION=	1
@@ -11,7 +11,6 @@ COMMENT=	Extract/decompress CP/M LBR archives
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	YES
 MAKE_FLAGS+=	PREFIX=${PREFIX}
 LBRATE_DOCSDIR=	${PREFIX}/share/doc/lbrate
 
diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index a578de0cfe7..b4f97f41c9f 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/08/01 20:00:29 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/04/11 21:44:49 tv Exp $
 
 DISTNAME=       lha-114i
 PKGNAME=	lha-114.9
@@ -13,7 +13,6 @@ COMMENT=	Archive files using LZW compression (.lzh files)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	yes
 NO_CONFIGURE=	yes
 
 MAKE_FLAGS=	MAKE="${MAKE_PROGRAM}"
diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index b0731c8b637..f32cd934442 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/03/21 22:56:24 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=	libarchive-1.02.016
@@ -9,7 +9,6 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://people.freebsd.org/~kientzle/libarchive/src/
 COMMENT=	Library to read/create different archive formats
 
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index 749478f0893..821f8914b49 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/01/19 17:35:48 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=	libcomprex-0.3.2
@@ -12,7 +12,6 @@ COMMENT=	Library to handle (de)compression of files
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
diff --git a/archivers/liblzo/Makefile b/archivers/liblzo/Makefile
index c1323962a61..e7f53896e30 100644
--- a/archivers/liblzo/Makefile
+++ b/archivers/liblzo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/12/09 18:56:53 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=	lzo-1.08
@@ -14,7 +14,6 @@ COMMENT=	Portable lossless data compression library written in ANSI C
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 
diff --git a/archivers/lzop/Makefile b/archivers/lzop/Makefile
index 0f9db74d1d0..35ceb40f20a 100644
--- a/archivers/lzop/Makefile
+++ b/archivers/lzop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:13:04 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=	lzop-1.01
@@ -12,7 +12,6 @@ COMMENT=	Fast file compressor similar to gzip, using the LZO library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 .include "../../archivers/liblzo/buildlink3.mk"
diff --git a/archivers/macutil/Makefile b/archivers/macutil/Makefile
index aa90e171a90..c9c1c59c7e7 100644
--- a/archivers/macutil/Makefile
+++ b/archivers/macutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/07/28 02:47:34 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2005/04/11 21:44:49 tv Exp $
 
 DISTNAME=		macutil2.0b3
 PKGNAME=		macutil-2.0b3
@@ -15,7 +15,6 @@ MAKEFILE=		makefile
 MAKE_ENV+=		CF="${CFLAGS}"
 
 WRKSRC=			${WRKDIR}/macutil
-USE_BUILDLINK3=		yes
 
 INSTALLATION_DIRS=	bin man/man1
 
diff --git a/archivers/mousetar/Makefile b/archivers/mousetar/Makefile
index abffbe1beb6..4094aae689b 100644
--- a/archivers/mousetar/Makefile
+++ b/archivers/mousetar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/01/21 02:33:47 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=	mousetar-20021217
@@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 NOT_FOR_PLATFORM+=	Interix-*-* # no sys/mtio.h tape support
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK3=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/archivers/mscompress/Makefile b/archivers/mscompress/Makefile
index 198481ac61f..e27094103cf 100644
--- a/archivers/mscompress/Makefile
+++ b/archivers/mscompress/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/07/28 02:47:35 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=		mscompress-0.3
@@ -12,7 +12,6 @@ COMMENT=		Microsoft "compress.exe/expand.exe" compatible (de)compressor
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 
 INSTALLATION_DIRS=	bin man/man1
diff --git a/archivers/nomarch/Makefile b/archivers/nomarch/Makefile
index eea0ed598ed..d2bb8425301 100644
--- a/archivers/nomarch/Makefile
+++ b/archivers/nomarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/07/28 02:47:35 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=	nomarch-1.3
@@ -11,7 +11,6 @@ COMMENT=	Free replacement for the arc program
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-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 129f58d9b23..fea71a2312b 100644
--- a/archivers/nulib2/Makefile
+++ b/archivers/nulib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/11/29 04:50:34 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=	nulibdist-203
@@ -13,7 +13,6 @@ COMMENT=	Handles Apple II ShrinkIt (NuFX) file/disk archives
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/dist/2/}
-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 9ef7dd5b7b8..87063221694 100644
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/12/20 11:30:55 grant Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:49 tv Exp $
 
 DISTNAME=		Archive-Tar-1.22
 PKGNAME=		p5-${DISTNAME}
@@ -17,7 +17,6 @@ DEPENDS+=		p5-IO-String-[0-9]*:../../devel/p5-IO-String
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=		# empty
-USE_BUILDLINK3=		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 a889b226af5..59cc8e1d9ed 100644
--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/12/20 11:30:55 grant Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:49 tv Exp $
 
 DISTNAME=		Archive-Zip-1.14
 PKGNAME=		p5-${DISTNAME}
@@ -16,7 +16,6 @@ DEPENDS+=		p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=		# empty
-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 9afd9f124cf..b67be9372b8 100644
--- a/archivers/p5-Compress-Bzip2/Makefile
+++ b/archivers/p5-Compress-Bzip2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/20 11:30:55 grant Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=	Compress-Bzip2-1.02
@@ -11,7 +11,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Compress-Bzip2/
 COMMENT=	Perl5 interface to bzip2 compression library
 
-USE_BUILDLINK3=		yes
 
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Compress/Bzip2/.packlist
 
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 9a3df9962ee..fe0c0e0bd25 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/02/07 14:11:26 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=		p7zip_4.14.01_src
@@ -13,7 +13,6 @@ COMMENT=		File archiver with high compression
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
 MAKEFILE=		makefile
 NO_CONFIGURE=		yes
diff --git a/archivers/par2/Makefile b/archivers/par2/Makefile
index 247d99ba9f5..a33b06fcff0 100644
--- a/archivers/par2/Makefile
+++ b/archivers/par2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/01/21 21:48:32 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=		par2cmdline-0.3
@@ -12,7 +12,6 @@ COMMENT=		Create or use PAR2 parity volumes
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c++
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile
index 31bd6d3a51b..efd20dd7437 100644
--- a/archivers/pax/Makefile
+++ b/archivers/pax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/01/06 05:35:14 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=		pax-20040802
@@ -10,7 +10,6 @@ MAINTAINER=		grant@NetBSD.org
 HOMEPAGE=		http://www.NetBSD.org/
 COMMENT=		POSIX standard archiver with many extensions
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		# defined
 
 NO_PKGTOOLS_REQD_CHECK=	# defined
diff --git a/archivers/pbzip2/Makefile b/archivers/pbzip2/Makefile
index be2911bc21e..0797ceded7c 100644
--- a/archivers/pbzip2/Makefile
+++ b/archivers/pbzip2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/03/24 14:36:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:49 tv Exp $
 #
 
 DISTNAME=		pbzip2-0.9.2
@@ -9,7 +9,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://compression.ca/pbzip2/
 COMMENT=		Parallel implementation of the bzip2 block-sorting file compressor
 
-USE_BUILDLINK3=		yes
 PTHREAD_AUTO_VARS=	yes
 
 do-install:
diff --git a/archivers/pdbar/Makefile b/archivers/pdbar/Makefile
index 3e6402abd48..fef56b27fc2 100644
--- a/archivers/pdbar/Makefile
+++ b/archivers/pdbar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/30 13:04:56 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:44:49 tv Exp $
 
 DISTNAME=	prc
 PKGNAME=	pdbar-0.5.1
@@ -13,6 +13,5 @@ COMMENT=	Palm database archiver
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 NO_CONFIGURE=	yes
-USE_BUILDLINK3=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/php-bz2/Makefile b/archivers/php-bz2/Makefile
index 58615fe1daa..f18388c9211 100644
--- a/archivers/php-bz2/Makefile
+++ b/archivers/php-bz2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:50 tv Exp $
 
 MODNAME=		bz2
 CATEGORIES+=		archivers
 PKGREVISION=		# empty
 COMMENT=		PHP extension for bzip2 compression
 
-USE_BUILDLINK3=		YES
 
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.bzip2}
 
diff --git a/archivers/php-zip/Makefile b/archivers/php-zip/Makefile
index 9bfa1073c55..af0d93995bd 100644
--- a/archivers/php-zip/Makefile
+++ b/archivers/php-zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/06 18:28:32 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:44:50 tv Exp $
 
 MODNAME=		zip
 PECL_VERSION=		1.0
@@ -6,7 +6,6 @@ CATEGORIES+=		archivers
 PKGREVISION=		# empty
 COMMENT=		PHP extension for ZIP archive handling
 
-USE_BUILDLINK3=		YES
 
 CONFIGURE_ARGS+=	--with-zip=shared,${BUILDLINK_DIR}
 
diff --git a/archivers/php-zlib/Makefile b/archivers/php-zlib/Makefile
index cb5575f5376..a34bc4e02a7 100644
--- a/archivers/php-zlib/Makefile
+++ b/archivers/php-zlib/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:50 tv Exp $
 
 MODNAME=		zlib
 CATEGORIES+=		archivers
 PKGREVISION=		# empty
 COMMENT=		PHP extension for zlib compression
 
-USE_BUILDLINK3=		YES
 
 CONFIGURE_ARGS+=	--with-${MODNAME}-dir=${BUILDLINK_DIR}
 
diff --git a/archivers/ppunpack/Makefile b/archivers/ppunpack/Makefile
index 04ee1cc9aa4..e76e7d0ae43 100644
--- a/archivers/ppunpack/Makefile
+++ b/archivers/ppunpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/12/03 15:14:51 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/04/11 21:44:50 tv Exp $
 
 DISTNAME=	ppsmall-1.0
 PKGNAME=	ppunpack-1.0
@@ -13,7 +13,6 @@ COMMENT=	Decompresses Amiga PowerPacker files
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}/PPUnpack
-USE_BUILDLINK3=	yes
 
 MAKE_FLAGS=	CC="${CC}" COPTS="${CFLAGS}"
 BUILD_TARGET=	ppunpack
diff --git a/archivers/rar-linux/Makefile b/archivers/rar-linux/Makefile
index 1d5cd1806a3..a7af0492fcb 100644
--- a/archivers/rar-linux/Makefile
+++ b/archivers/rar-linux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/11/08 13:42:17 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:44:50 tv Exp $
 #
 
 DISTNAME=		rarlinux-3.4.1
@@ -12,7 +12,6 @@ COMMENT=		RAR command line archiver (Linux binary)
 
 LICENSE=		rar-license
 
-NO_BUILDLINK=		yes
 ONLY_FOR_PLATFORM=	NetBSD-1.5Z[A-Z]-i386 NetBSD-1.6*-i386 \
 			NetBSD-[2-9]*-i386 Linux-*-i[3-6]86
 WRKSRC=			${WRKDIR}/rar
@@ -24,7 +23,6 @@ DEPENDS+=	suse_base>=6.1:../../emulators/${SUSE_DIR_PREFIX}_base
 DEPENDS+=	suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
 .endif
 
-NO_BUILDLINK=	YES
 
 NO_BUILD=	YES
 NO_CONFIGURE=	YES
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 71b394c980d..7635f561925 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/03/24 21:12:50 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2005/04/11 21:44:50 tv Exp $
 
 DISTNAME=		rarbsd
 PKGNAME=		rar-2.02
@@ -18,7 +18,6 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 
 WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${DOWNLOADED_DISTFILE} >/dev/null
-NO_BUILDLINK=		yes
 
 pre-extract:
 	@if [ -z "$$KERNEL" ]; then \
diff --git a/archivers/rzip/Makefile b/archivers/rzip/Makefile
index 50360f05630..c8fe957ec76 100644
--- a/archivers/rzip/Makefile
+++ b/archivers/rzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/03/24 21:12:50 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:44:50 tv Exp $
 
 DISTNAME=	rzip-2.0
 PKGREVISION=	1
@@ -10,7 +10,6 @@ HOMEPAGE=	http://rzip.samba.org/
 COMMENT=	Create or extract .rz files, like gzip but smaller
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 
 post-install:
 	${LN} -f ${PREFIX}/bin/rzip ${PREFIX}/bin/runzip
diff --git a/archivers/squsq/Makefile b/archivers/squsq/Makefile
index 039800d5882..1c6e9fb86f6 100644
--- a/archivers/squsq/Makefile
+++ b/archivers/squsq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/07/28 02:47:35 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:50 tv Exp $
 
 DISTNAME=	t20-squsq-3.3
 PKGNAME=	squsq-3.3
@@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 MAKEFILE=	${FILESDIR}/Makefile
 
 WRKSRC=		${WRKDIR}/t20-squsq
-USE_BUILDLINK3=	yes
 
 INSTALLATION_DIRS=	bin
 
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index 2126f3e0733..ec86f897d0c 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/03/01 14:53:41 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:50 tv Exp $
 #
 
 DISTNAME=	unace-1.2b
@@ -13,7 +13,6 @@ COMMENT=	Extract, list and test files in ACE archives
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 
 BUILD_TARGET=	clean unace
diff --git a/archivers/unalz/Makefile b/archivers/unalz/Makefile
index 75ebef0dda7..8ba1f44ec36 100644
--- a/archivers/unalz/Makefile
+++ b/archivers/unalz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/03/02 16:18:47 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:44:50 tv Exp $
 #
 
 DISTNAME=		unalz-0.31
@@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 BUILD_TARGET=		posix
 NO_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
 
 INSTALLATION_DIRS=	bin
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index 315e29f3561..4c5d180829b 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/01/21 21:13:22 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/04/11 21:44:50 tv Exp $
 
 DISTNAME=       unarj-2.65
 PKGREVISION=	1
@@ -16,7 +16,6 @@ NO_BIN_ON_CDROM=${RESTRICTED}
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 NO_CONFIGURE=	# defined
-USE_BUILDLINK3=	yes
 
 INSTALLATION_DIRS=	bin
 
diff --git a/archivers/undms/Makefile b/archivers/undms/Makefile
index 7dd3a61ae39..89b8bf06c62 100644
--- a/archivers/undms/Makefile
+++ b/archivers/undms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/07/28 02:47:35 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2005/04/11 21:44:50 tv Exp $
 
 DISTNAME=	undms-1.3.c
 PKGNAME=	undms-1.3
@@ -13,7 +13,6 @@ COMMENT=	Converts .dms Amiga disk images to uncompressed .adf images
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK3=	yes
 
 INSTALLATION_DIRS=	bin
 
diff --git a/archivers/unlzx/Makefile b/archivers/unlzx/Makefile
index d029f800d76..d344593fecc 100644
--- a/archivers/unlzx/Makefile
+++ b/archivers/unlzx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/07/28 02:47:35 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:44:50 tv Exp $
 
 DISTNAME=	unlzx.c
 PKGNAME=	unlzx-1.1
@@ -13,7 +13,6 @@ COMMENT=	Extracts .lzx archives from Amiga systems
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK3=	yes
 
 INSTALLATION_DIRS=	bin
 
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index d71e0a69ed6..6f3705de251 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/03/01 07:45:28 salo Exp $
+# $NetBSD: Makefile,v 1.54 2005/04/11 21:44:50 tv Exp $
 
 DISTNAME=	unzip552
 PKGNAME=	unzip-5.52
@@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DIST_SUBDIR=	${PKGNAME}	# Remove on next update.
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/archivers/unzoo/Makefile b/archivers/unzoo/Makefile
index 66b1e4dc748..dfeb4784f33 100644
--- a/archivers/unzoo/Makefile
+++ b/archivers/unzoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/05/29 12:04:13 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:44:50 tv Exp $
 #
 
 DISTNAME=	unzoo.c
@@ -13,7 +13,6 @@ COMMENT=	Extract zoo archives
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK3=	YES
 NO_CONFIGURE=	YES
 
 INSTALLATION_DIRS=	bin
diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index 9ebdae58f26..da4b5896b4a 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/03/02 04:35:38 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:44:50 tv Exp $
 
 DISTNAME=	upx-1.25-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -13,7 +13,6 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 USE_GNU_TOOLS+=	make
 USE_PERL5=	build
-USE_BUILDLINK3=	yes
 
 do-build:
 	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV}			\
diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile
index b3d135871a5..48ff2166960 100644
--- a/archivers/xbin/Makefile
+++ b/archivers/xbin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/01/16 16:57:55 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/04/11 21:44:50 tv Exp $
 #
 
 DISTNAME=	${PRGNAME}unix
@@ -17,7 +17,6 @@ NO_BIN_ON_CDROM=${RESTRICTED}
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK3=	yes
 
 PRGNAME=	xbin
 EXTRACT_ONLY=	# empty
diff --git a/archivers/xmill/Makefile b/archivers/xmill/Makefile
index 606d74456e1..5a2cb85302b 100644
--- a/archivers/xmill/Makefile
+++ b/archivers/xmill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/10/03 00:13:04 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:44:50 tv Exp $
 
 DISTNAME=		xmill-0.9.1
 PKGREVISION=		2
@@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_GNU_TOOLS+=		make
 MAKEFILE=		makefile
-USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
 
 RESTRICTED=		"Redistribution not permitted"
diff --git a/archivers/xpk/Makefile b/archivers/xpk/Makefile
index 09eadad39fd..34f2c73334d 100644
--- a/archivers/xpk/Makefile
+++ b/archivers/xpk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/03/24 21:12:50 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:44:50 tv Exp $
 
 DISTNAME=	xpk-0.1.4
 PKGREVISION=	1
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.jormas.com/~vesuri/xpk/
 COMMENT=	The eXternal PacKer (XPK) library system
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-USE_BUILDLINK3=		yes
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 504c1da54b8..a17ac4a914d 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/03/24 21:12:50 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2005/04/11 21:44:51 tv Exp $
 
 DISTNAME=	zip-2.3
 PKGREVISION=	3
@@ -37,7 +37,6 @@ CFLAGS=		-O
 CFLAGS+=	-DHAVE_DIRENT_H
 .endif
 
-USE_BUILDLINK3=	yes
 
 INSTALLATION_DIRS=	bin man/man1
 
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index d92ea42ab10..6ed8c349ef6 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/03/25 15:27:45 minskim Exp $
+# $NetBSD: Makefile,v 1.33 2005/04/11 21:44:51 tv Exp $
 #
 
 DISTNAME=	zip1-1.1
@@ -22,7 +22,6 @@ WRKSRC=		${WRKDIR}
 MAKEFILE=	makefile
 BUILD_TARGET=	zip zipcloak
 
-USE_BUILDLINK3=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index e6a785e1fe9..9101511ace9 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/03/24 21:12:50 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/04/11 21:44:51 tv Exp $
 
 DISTNAME=       zoo-2.10pl1
 PKGNAME=	zoo-2.10.1
@@ -13,7 +13,6 @@ LICENSE=	zoo-license
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK3=	yes
 NO_CONFIGURE=	yes
 
 BUILD_TARGET=     bsdansi
diff --git a/archivers/zziplib/Makefile b/archivers/zziplib/Makefile
index 00fd8989ad7..cd2d98f5c6d 100644
--- a/archivers/zziplib/Makefile
+++ b/archivers/zziplib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:13:04 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:44:51 tv Exp $
 #
 
 DISTNAME=	zziplib-0.10.82
@@ -13,7 +13,6 @@ COMMENT=	Library for ZIP archive handling
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-zlib=${BUILDLINK_PREFIX.zlib}