Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used.

author: tv <tv@pkgsrc.org> 2005-04-11 21:44:48 +0000
committer: tv <tv@pkgsrc.org> 2005-04-11 21:44:48 +0000
commit: 915c0d730df55e4ddf04b9d9e07f7603057636e4 (patch)
tree: 2d8b7b078f159a824fcd53503d6096a145f0f177 /net
parent: 7453f22416c9b37d26567190d2eaf0f2af6b40fd (diff)
download: pkgsrc-915c0d730df55e4ddf04b9d9e07f7603057636e4.tar.gz
290 files changed, 290 insertions, 580 deletions
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 810d419804d..d0a0cd26815 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/03/12 05:22:54 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:43 tv Exp $
 #
 
 DISTNAME=	GeoIP-1.3.8
@@ -12,7 +12,6 @@ COMMENT=	Find the country from any IP address
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 
diff --git a/net/IglooFTP/Makefile b/net/IglooFTP/Makefile
index 2e974e73ae3..882b81ac4bb 100644
--- a/net/IglooFTP/Makefile
+++ b/net/IglooFTP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:17:48 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:44 tv Exp $
 
 DISTNAME=	IglooFTP-0.6.1
 PKGREVISION=	4
@@ -12,7 +12,6 @@ HOMEPAGE=	http://www.littleigloo.org/iglooftp.php3
 COMMENT=	Easy to use FTP client for X Window System
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
-USE_BUILDLINK3=	yes
 USE_X11=	yes
 
 post-extract:
diff --git a/net/LaBrea/Makefile b/net/LaBrea/Makefile
index 30e15b875e6..7cbb23d31af 100644
--- a/net/LaBrea/Makefile
+++ b/net/LaBrea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/02/09 20:49:02 adrianp Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:44 tv Exp $
 #
 
 DISTNAME=	labrea-2.5-stable-1
@@ -12,7 +12,6 @@ COMMENT=	Builds tarpits/honeypots for scanners
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 USE_PKGINSTALL=	YES
 
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 0d01a9038b8..ba9691b4f3a 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2005/03/09 15:30:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.113 2005/04/11 21:46:44 tv Exp $
 
 DISTNAME=	ORBit-0.5.17
 CATEGORIES=	net
@@ -11,7 +11,6 @@ COMMENT=	High-performance CORBA ORB with support for the C language
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		YES
 
 USE_GNU_TOOLS+=		lex make yacc
 USE_LIBTOOL=		YES
diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index 2244a07e19b..027a69adc17 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/02/05 12:30:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2005/04/11 21:46:44 tv Exp $
 #
 
 DISTNAME=		ORBit2-2.12.1
@@ -16,7 +16,6 @@ CONFLICTS=		linc>=1.1
 
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
-USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/net/SDL_net/Makefile b/net/SDL_net/Makefile
index 211be7b4738..8e3ec212988 100644
--- a/net/SDL_net/Makefile
+++ b/net/SDL_net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/03/27 15:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:44 tv Exp $
 #
 
 DISTNAME=	SDL_net-1.2.5
@@ -10,7 +10,6 @@ MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://www.libsdl.org/projects/SDL_net/
 COMMENT=	Small sample cross-platform networking library for SDL
 
-USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=            YES
 
diff --git a/net/adns/Makefile b/net/adns/Makefile
index 6c1bb97e4c4..e13cd8b1be9 100644
--- a/net/adns/Makefile
+++ b/net/adns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/10/03 00:17:49 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:44 tv Exp $
 #
 
 DISTNAME=	adns-1.1
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.chiark.greenend.org.uk/~ian/adns/
 COMMENT=	Asynchronous-capable DNS client library and utilities
 
 USE_GNU_TOOLS+=		make
-USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/net/aget/Makefile b/net/aget/Makefile
index 328b08293f8..4c155105588 100644
--- a/net/aget/Makefile
+++ b/net/aget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/18 20:58:30 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:44 tv Exp $
 #
 
 DISTNAME=	aget-0.4
@@ -11,7 +11,6 @@ COMMENT=	Multithreaded HTTP download accelerator
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	yes
 NO_CONFIGURE=	yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/airport2basestationconfig/Makefile b/net/airport2basestationconfig/Makefile
index eb965107226..b321947d2bf 100644
--- a/net/airport2basestationconfig/Makefile
+++ b/net/airport2basestationconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/11/13 21:28:28 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:44 tv Exp $
 
 DISTNAME=	configurator_201
 PKGNAME=	${BINNAME}-2.0.1
@@ -22,7 +22,6 @@ LIBDIR=		${PREFIX}/lib/${BINNAME}
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_BUILDLINK3=		yes
 USE_JAVA=		run
 PKG_JVMS_ACCEPTED=	sun-jdk13 sun-jdk14 blackdown-jdk13 jdk13 jdk14
 
diff --git a/net/airportbasestationconfig/Makefile b/net/airportbasestationconfig/Makefile
index 06798127cc7..b9d6c823086 100644
--- a/net/airportbasestationconfig/Makefile
+++ b/net/airportbasestationconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/11/13 21:28:28 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/04/11 21:46:44 tv Exp $
 
 DISTNAME=	configurator_152-128
 PKGNAME=	${BINNAME}-1.5.2
@@ -20,7 +20,6 @@ DOCDIR=		${PREFIX}/share/doc/${BINNAME}
 JARNAME=	AirportConfig128Bit.jar
 LIBDIR=		${PREFIX}/lib/${BINNAME}
 
-USE_BUILDLINK3=		yes
 USE_JAVA=		run
 PKG_JVMS_ACCEPTED=	sun-jdk13 sun-jdk14 blackdown-jdk13 jdk13 jdk14
 
diff --git a/net/airportmodemutility/Makefile b/net/airportmodemutility/Makefile
index f1ee6dfa9f4..727231d0559 100644
--- a/net/airportmodemutility/Makefile
+++ b/net/airportmodemutility/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/11/13 21:28:28 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:44 tv Exp $
 
 DISTNAME=	${BINNAME}_20
 PKGNAME=	${BINNAME}-2.0
@@ -21,7 +21,6 @@ LIBDIR=		${PREFIX}/lib/${BINNAME}
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_BUILDLINK3=		yes
 USE_JAVA=		run
 PKG_JVMS_ACCEPTED=	sun-jdk13 sun-jdk14 blackdown-jdk13 jdk13 jdk14
 
diff --git a/net/amule/Makefile b/net/amule/Makefile
index 2786675079c..34535049457 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/01/03 15:59:12 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/04/11 21:46:44 tv Exp $
 #
 
 DISTNAME=		aMule-1.2.8
@@ -16,7 +16,6 @@ BUILD_USES_MSGFMT=	yes
 
 CONFLICTS=		xmule-[0-9]*
 
-USE_BUILDLINK3=		yes
 USE_DIRS+=		xdg-1.1
 USE_GNU_TOOLS+=		make
 USE_LANGUAGES=		c c++
diff --git a/net/argus/Makefile b/net/argus/Makefile
index 8d6fa65e1dc..ad903d06264 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/01/11 13:11:12 markd Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:44 tv Exp $
 #
 
 DISTNAME=	argus-3.3
@@ -18,7 +18,6 @@ BUILD_DEPENDS+=	p5-Digest-HMAC-[0-9]*:../../security/p5-Digest-HMAC
 BUILD_DEPENDS+=	p5-Crypt-DES-[0-9]*:../../security/p5-Crypt-DES
 BUILD_DEPENDS+=	p5-DBI-[0-9]*:../../databases/p5-DBI
 
-USE_BUILDLINK3=		yes
 USE_PERL5=		yes
 USE_PKGINSTALL=		yes
 HAS_CONFIGURE= 		yes
diff --git a/net/arla/Makefile b/net/arla/Makefile
index a30ab8ca4e7..467543fad38 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/03/26 16:50:59 wennmach Exp $
+# $NetBSD: Makefile,v 1.44 2005/04/11 21:46:44 tv Exp $
 
 DISTNAME=		arla-0.38
 PKGREVISION=		2
@@ -15,7 +15,6 @@ CONFLICTS+=		rx-[0-9]*
 OSVERSION_SPECIFIC=	yes
 INFO_FILES=		arla.info send-pr.info
 
-USE_BUILDLINK3=		yes
 USE_X11=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/net/arpd/Makefile b/net/arpd/Makefile
index b1b65502724..4e825215308 100644
--- a/net/arpd/Makefile
+++ b/net/arpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/02/21 20:26:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:44 tv Exp $
 #
 
 DISTNAME=	arpd
@@ -9,7 +9,6 @@ MASTER_SITES=	ftp://subzero.campus.luth.se/pub/arpd/
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	ARP daemon
 
-USE_BUILDLINK3=	yes
 
 MAKE_ENV+=	BINDIR=${PREFIX}/sbin
 
diff --git a/net/arping/Makefile b/net/arping/Makefile
index 1cf2315cd8e..1b5e6c190ba 100644
--- a/net/arping/Makefile
+++ b/net/arping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/02/01 18:24:34 adrianp Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:44 tv Exp $
 #
 
 DISTNAME=		arping-2.05
@@ -9,7 +9,6 @@ MAINTAINER=		cube@NetBSD.org
 HOMEPAGE=		http://www.habets.pp.se/synscan/programs.php?prog=arping
 COMMENT=		ARP-level ping utility
 
-USE_BUILDLINK3=		yes
 NO_CONFIGURE=		yes
 
 LIBS.SunOS+=		-lsocket -lnsl
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index a4ed29b7691..8971a09b976 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/05 05:26:16 minskim Exp $
+# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:44 tv Exp $
 #
 
 DISTNAME=	arpwatch-2.1a11
@@ -9,7 +9,6 @@ MASTER_SITES=	ftp://ftp.ee.lbl.gov/
 MAINTAINER=	bouyer@NetBSD.org
 COMMENT=	Monitor ARP activity on a network, maintaining a database
 
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 
 CFLAGS.Darwin+=	-DBIND_8_COMPAT
diff --git a/net/awhois/Makefile b/net/awhois/Makefile
index ab722a64e55..64eae55dd31 100644
--- a/net/awhois/Makefile
+++ b/net/awhois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/04/25 07:51:00 snj Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:44 tv Exp $
 #
 
 DISTNAME=		awhois.sh-v1.61
@@ -12,7 +12,6 @@ HOMEPAGE=		ftp://ftp.planix.com/pub/Planix/
 COMMENT=		All-encompassing whois client wrapper
 
 WRKSRC=			${WRKDIR}
-USE_BUILDLINK3=		yes
 
 do-extract:
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR};
diff --git a/net/bftpd/Makefile b/net/bftpd/Makefile
index e779f16e34e..c05b41b4d53 100644
--- a/net/bftpd/Makefile
+++ b/net/bftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/02/17 03:06:07 uebayasi Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:44 tv Exp $
 #
 
 DISTNAME=	bftpd-1.0.24
@@ -9,7 +9,6 @@ MAINTAINER=	virtus@wanadoo.nl
 HOMEPAGE=	http://www.bftpd.org/
 COMMENT=	Small and fast FTP server
 
-USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index a3f8460d54d..3398615f058 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/03/24 21:12:58 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2005/04/11 21:46:44 tv Exp $
 
 DISTNAME=	bind
 PKGNAME=	bind-${BIND_VERSION}
@@ -19,7 +19,6 @@ EXTRACT_ONLY=	${DISTNAME}-src.tar.gz ${DISTNAME}-doc.tar.gz
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	yes
 USE_PKGINSTALL=	yes
 RCD_SCRIPTS=	named
 
diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index c92b4ee4868..23cf4067445 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2005/03/18 01:14:32 tron Exp $
+# $NetBSD: Makefile,v 1.69 2005/04/11 21:46:44 tv Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	bind-${BIND_VERSION}pl1
@@ -22,7 +22,6 @@ DIST_SUBDIR=	bind/${BIND_VERSION}
 BUILD_DEFS+=	USE_INET6
 # No need to set USE_INET6, will auto-detect.
 
-USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 
diff --git a/net/bittornado/Makefile.common b/net/bittornado/Makefile.common
index 7f84c324578..38c52ad3bb8 100644
--- a/net/bittornado/Makefile.common
+++ b/net/bittornado/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/01/28 16:19:17 veego Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/04/11 21:46:44 tv Exp $
 #
 
 DISTNAME=		BitTornado-0.3.10
@@ -14,6 +14,5 @@ FILESDIR=		${.CURDIR}/../../net/bittornado/files
 PATCHDIR=		${.CURDIR}/../../net/bittornado/patches
 
 WRKSRC=			${WRKDIR}/BitTornado-CVS
-USE_BUILDLINK3=		yes
 
 PYTHON_VERSIONS_ACCEPTED=	24 23 22
diff --git a/net/bittorrent/Makefile.common b/net/bittorrent/Makefile.common
index 8e98fdf1ee8..f7a3e443456 100644
--- a/net/bittorrent/Makefile.common
+++ b/net/bittorrent/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2005/03/28 14:43:10 recht Exp $
+# $NetBSD: Makefile.common,v 1.11 2005/04/11 21:46:45 tv Exp $
 #
 
 DISTNAME=	BitTorrent-4.0.1
@@ -13,6 +13,5 @@ DISTINFO_FILE=	${.CURDIR}/../../net/bittorrent/distinfo
 FILESDIR=	${.CURDIR}/../../net/bittorrent/files
 PATCHDIR=	${.CURDIR}/../../net/bittorrent/patches
 
-USE_BUILDLINK3=	YES
 
 PYTHON_VERSIONS_ACCEPTED=	24 23 22
diff --git a/net/bmon/Makefile b/net/bmon/Makefile
index c4aa3f948ca..ea5ae5a0af2 100644
--- a/net/bmon/Makefile
+++ b/net/bmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/07 18:49:13 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:45 tv Exp $
 #
 
 DISTNAME=	bmon-2.0.1
@@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
-USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 USE_PKGINSTALL=	YES
 
diff --git a/net/boinc3-coreclient/Makefile b/net/boinc3-coreclient/Makefile
index 57764dd9f49..f0eacec73fc 100644
--- a/net/boinc3-coreclient/Makefile
+++ b/net/boinc3-coreclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/19 20:09:15 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:45 tv Exp $
 #
 
 #DISTNAME=		boinc-3.07
@@ -15,7 +15,6 @@ COMMENT=		Core client for Boinc V3
 
 WRKSRC=		${WRKDIR}/boinc_public
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		MYSQL_CONFIG=true
 
diff --git a/net/boinc3-libs/Makefile b/net/boinc3-libs/Makefile
index 54886883801..26ed0423d7e 100644
--- a/net/boinc3-libs/Makefile
+++ b/net/boinc3-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/19 20:11:04 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:45 tv Exp $
 #
 
 #DISTNAME=		boinc-3.07
@@ -17,7 +17,6 @@ WRKSRC=		${WRKDIR}/boinc_public
 PATCHDIR=	${.CURDIR}/../../net/boinc3-coreclient/patches
 DISTINFO_FILE=	${.CURDIR}/../../net/boinc3-coreclient/distinfo
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		MYSQL_CONFIG=true
 
diff --git a/net/boinc3-seti/Makefile b/net/boinc3-seti/Makefile
index c5181c5a912..d1e7ceb5b36 100644
--- a/net/boinc3-seti/Makefile
+++ b/net/boinc3-seti/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/29 05:59:24 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:45 tv Exp $
 #
 
 DISTNAME=		seti_boinc-client-cvs-2004-07-15
@@ -12,7 +12,6 @@ HOMEPAGE=		http://setiweb.ssl.berkeley.edu/
 COMMENT=		SETI@home client for the BOINC framework
 
 WRKSRC=		${WRKDIR}/seti_boinc
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		BOINCDIR=${BUILDLINK_DIR}/boinc3
 # XXX don't know why MySQL is needed here
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 98bcb0579f7..5844b79ec12 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/03/22 16:27:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2005/04/11 21:46:45 tv Exp $
 #
 
 DISTNAME=		bug-buddy-2.10.0
@@ -13,7 +13,6 @@ COMMENT=		Graphical GNOME2 bug reporting tool
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
diff --git a/net/cdpd/Makefile b/net/cdpd/Makefile
index d9533596fd1..a15be8b7b43 100644
--- a/net/cdpd/Makefile
+++ b/net/cdpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/02/05 16:11:47 adrianp Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:45 tv Exp $
 #
 
 DISTNAME=	cdpd-1.0.2
@@ -9,7 +9,6 @@ MASTER_SITES=	ftp://ftp.lexa.ru/pub/domestic/snar/
 MAINTAINER=	explorer@NetBSD.org
 COMMENT=	Simple daemon to send Cisco Discovery Protocol packets
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index 257d1a6d959..d85053ae7f7 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/12/28 02:47:46 reed Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:45 tv Exp $
 
 DISTNAME=	chrony-1.20
 PKGREVISION=	1
@@ -9,7 +9,6 @@ MAINTAINER=	hannken@NetBSD.org
 HOMEPAGE=	http://chrony.sunsite.dk/index.php
 COMMENT=	Daemon for maintaining the accuracy of computer clocks
 
-USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_GNU_TOOLS+=		make
 HAS_CONFIGURE=		YES
diff --git a/net/coda5_server/Makefile.common b/net/coda5_server/Makefile.common
index b5731b4b146..4125e10fbc6 100644
--- a/net/coda5_server/Makefile.common
+++ b/net/coda5_server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2004/09/10 12:19:13 drochner Exp $
+# $NetBSD: Makefile.common,v 1.7 2005/04/11 21:46:45 tv Exp $
 
 DISTNAME?=		coda-${DIST_VERS}
 DIST_VERS?=		5.3.20
@@ -17,7 +17,6 @@ HOMEPAGE?=		http://www.coda.cs.cmu.edu/
 DISTINFO_FILE?=		${.CURDIR}/../../net/coda5_server/distinfo
 PATCHDIR?=		${.CURDIR}/../../net/coda5_server/patches
 
-USE_BUILDLINK3=		yes
 USE_PERL5=		yes
 USE_GNU_TOOLS+=		make
 
diff --git a/net/ctorrent/Makefile b/net/ctorrent/Makefile
index 5d8b8f5fe13..91d6f1c71f0 100644
--- a/net/ctorrent/Makefile
+++ b/net/ctorrent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/31 02:02:14 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:45 tv Exp $
 
 DISTNAME=	ctorrent-1.3.4
 PKGREVISION=	1
@@ -11,7 +11,6 @@ HOMEPAGE=	http://ctorrent.sourceforge.net/
 COMMENT=	Bittorrent client for the console
 
 USE_LANGUAGES=		c c++
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/net/dante/Makefile b/net/dante/Makefile
index eb338bc3db8..719a585ff44 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/04 10:00:54 adam Exp $
+# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:45 tv Exp $
 
 DISTNAME=	dante-1.1.15
 CATEGORIES=	net security
@@ -10,7 +10,6 @@ COMMENT=	BSD-licensed socks 4/5 proxy suite
 
 CONFLICTS=	socks4-[0-9]*
 
-USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-socks-conf=${PKG_SYSCONFDIR}/socks.conf
diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index d5966a8bdd8..672aa81278a 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/10/03 00:17:49 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:45 tv Exp $
 #
 
 DISTNAME=	dc_gui2-0.75
@@ -14,7 +14,6 @@ COMMENT=	Graphical user interface for DCTC
 DEPENDS+=	dctc>=0.85.4:../../net/dctc
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
 CONFIGURE_ARGS+=	--enable-manual-db-detect
diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index 28a6f6b4cb7..52a563c5a06 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/11/28 12:16:02 taca Exp $
+# $NetBSD: Makefile,v 1.25 2005/04/11 21:46:45 tv Exp $
 #
 
 DISTNAME=	dctc-0.85.4
@@ -12,7 +12,6 @@ HOMEPAGE=	http://www.ac2i.tzo.com/dctc/
 COMMENT=	Direct Connect clone (Direct Connect Text Client)
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 CONFIGURE_ARGS+=	--enable-manual-db-detect
 USE_PERL5=	YES
 USE_GNU_TOOLS+=	make
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index 22bf44f1032..273f1604d91 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/02/21 20:26:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:45 tv Exp $
 
 DISTNAME=	ddclient-3.6.2
 PKGREVISION=	1
@@ -11,7 +11,6 @@ COMMENT=	Client to update dynamic DNS entries
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 USE_LANGUAGES=		# empty
 USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index 62b46b907b1..cbea87e56a3 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/03/08 01:56:53 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:45 tv Exp $
 
 DISTNAME=	dgd-1.2p4
 PKGNAME=	dgd-1.2.0.4
@@ -14,7 +14,6 @@ LICENSE=	fee-based-commercial-use
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}/dgd/src
-USE_BUILDLINK3=	yes
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	"Fixing hardcoded paths and command names."
diff --git a/net/dhid/Makefile b/net/dhid/Makefile
index 43d3c89f8ee..51c8b38d08f 100644
--- a/net/dhid/Makefile
+++ b/net/dhid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/02/21 20:26:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:45 tv Exp $
 #
 
 DISTNAME=	dhid-5.2
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.dhis.org/
 COMMENT=	Dynamic Host Information System client daemon
 
-USE_BUILDLINK3=	yes
 USE_PKGINSTALL=	yes
 RCD_SCRIPTS=	dhid
 
diff --git a/net/dhisd/Makefile b/net/dhisd/Makefile
index 7001ce641ee..90e9b6ccc36 100644
--- a/net/dhisd/Makefile
+++ b/net/dhisd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/02/21 20:26:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:45 tv Exp $
 #
 
 DISTNAME=	dhisd-5.1
@@ -9,7 +9,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.dhis.org/
 COMMENT=	DynDNS server
 
-USE_BUILDLINK3=	yes
 
 do-install:
 		${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dhisd
diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index 98d175992a9..0e7a50c0d94 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/04/09 22:39:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.46 2005/04/11 21:46:45 tv Exp $
 
 DISTNAME=		djbdns-1.05
 PKGREVISION=		7
@@ -15,7 +15,6 @@ SITES_${MANPAGES}=	http://smarden.org/pape/djb/manpages/
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 
 # We change conf-home from the default "/usr/local" and don't
 # provide compatibility symlinks. We also patch to honor PKG_SYSCONFDIR
diff --git a/net/dnstracer/Makefile b/net/dnstracer/Makefile
index 590bee6cf48..26d5e6f68b0 100644
--- a/net/dnstracer/Makefile
+++ b/net/dnstracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/04/25 08:34:20 snj Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:45 tv Exp $
 
 DISTNAME=		dnstracer-1.7
 CATEGORIES=		net
@@ -8,7 +8,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.mavetju.org/unix/general.php
 COMMENT=		Tool to trace dns queries
 
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/net/docsis/Makefile b/net/docsis/Makefile
index 3dd5f9ecd2c..80f288403fa 100644
--- a/net/docsis/Makefile
+++ b/net/docsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/11/02 19:46:19 symka Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:45 tv Exp $
 #
 
 DISTNAME=		docsis-0.9.2
@@ -12,7 +12,6 @@ COMMENT=		Utility for manipulating DOCSIS-compliant cable modems
 BUILD_DEPENDS+=		bison>=1.25:../../devel/bison
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		m4
 
 .include "../../net/net-snmp/buildlink3.mk"
diff --git a/net/driftnet/Makefile b/net/driftnet/Makefile
index e79e85aa307..9d94c518350 100644
--- a/net/driftnet/Makefile
+++ b/net/driftnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/02/21 20:26:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:45 tv Exp $
 #
 
 DISTNAME=	driftnet-0.1.6
@@ -12,7 +12,6 @@ COMMENT=	Real-time image sniffer
 
 DEPENDS=	mpg123-[0-9]*:../../audio/mpg123
 
-USE_BUILDLINK3=	YES
 
 BUILD_TARGET=	default
 MAKE_ENV+=	CAT="${CAT}" TRUE="${TRUE}"
diff --git a/net/dtcpclient/Makefile b/net/dtcpclient/Makefile
index be29445ac74..9a667d35a29 100644
--- a/net/dtcpclient/Makefile
+++ b/net/dtcpclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/02/21 14:36:52 hamajima Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:46 tv Exp $
 #
 
 DISTNAME=	dtcpclient-20040923
@@ -15,7 +15,6 @@ ONLY_FOR_PLATFORM=	FreeBSD-*-* NetBSD-*-* OpenBSD-*-* Darwin-*-*
 
 RCD_SCRIPTS=	dtcpclient
 USE_PKGINSTALL=	YES
-USE_BUILDLINK3= YES
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	"Fixing hardcoded paths."
diff --git a/net/dynipclient/Makefile b/net/dynipclient/Makefile
index ec730ed54cc..4f0ff0a7a3b 100644
--- a/net/dynipclient/Makefile
+++ b/net/dynipclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/12/28 02:47:46 reed Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:46 tv Exp $
 #
 
 DISTNAME=	dynip_3.00
@@ -11,7 +11,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.dynip.com/
 COMMENT=	Client for the dynip.com dynamic DNS service
 
-USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 
 RCD_SCRIPTS=	dynipclient
diff --git a/net/echoping/Makefile b/net/echoping/Makefile
index 0a8972a8554..2c4f56c85d9 100644
--- a/net/echoping/Makefile
+++ b/net/echoping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/10/03 00:17:50 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:46 tv Exp $
 #
 
 DISTNAME=	echoping-5.2.0
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://echoping.sourceforge.net/
 COMMENT=	Test performance of a remote TCP service
 
-USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-icp
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
diff --git a/net/ed2k-gtk-gui/Makefile b/net/ed2k-gtk-gui/Makefile
index 8c4a1bb037e..dc97d97dd72 100644
--- a/net/ed2k-gtk-gui/Makefile
+++ b/net/ed2k-gtk-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/12/18 21:46:56 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:46 tv Exp $
 
 DISTNAME=		ed2k-gtk-gui-0.6.3
 PKGREVISION=		1
@@ -9,7 +9,6 @@ MAINTAINER=		minskim@NetBSD.org
 HOMEPAGE=		http://ed2k-gtk-gui.sourceforge.net/
 COMMENT=		GUI for the eDonkey2000 and Overnet
 
-USE_BUILDLINK3=		yes
 USE_DIRS+=		xdg-1.1
 USE_X11=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/net/entropy/Makefile b/net/entropy/Makefile
index ccd27833de8..d8817a41636 100644
--- a/net/entropy/Makefile
+++ b/net/entropy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/10/29 17:38:20 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:46 tv Exp $
 #
 
 DISTNAME=		entropy-${ENTROPY_VERSION}
@@ -14,7 +14,6 @@ HOMEPAGE=		http://entropy.stop1984.com/
 COMMENT=		Anonymous peer-to-peer networking node (similar to Freenet)
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 
 ENTROPY_VERSION=	0.8.2-418
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 3bbba5e4cb1..1f26e0dbc36 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/12/20 23:43:56 dan Exp $
+# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:46 tv Exp $
 
 DISTNAME=	etherape-0.9.1
 PKGREVISION=	1
@@ -10,7 +10,6 @@ HOMEPAGE=	http://etherape.sourceforge.net/
 COMMENT=	Graphical network monitor
 
 USE_GNU_TOOLS+=		make
-USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index a5dd6bae358..e578b3ffb74 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2005/03/14 15:34:57 tron Exp $
+# $NetBSD: Makefile,v 1.106 2005/04/11 21:46:46 tv Exp $
 
 DISTNAME=		ethereal-0.10.10
 CATEGORIES=		net
@@ -21,7 +21,6 @@ MAINTAINER=		frueauf@NetBSD.org
 HOMEPAGE=		http://www.ethereal.com/
 COMMENT=		Network protocol analyzer
 
-USE_BUILDLINK3=		YES
 USE_X11=		YES
 USE_PERL5=		build
 
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index f497e7287d6..4b48061719d 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2004/12/15 17:13:17 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/04/11 21:46:46 tv Exp $
 
 DISTNAME=		ettercap-0.6.b
 PKGREVISION=		2
@@ -15,7 +15,6 @@ CONFIGURE_ARGS+=	--enable-plugins \
 			--enable-https \
 			--disable-gtk
 
-USE_BUILDLINK3=		yes
 
 USE_NCURSES=		# putwin()
 USE_OLD_DES_API=	yes
diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile
index a122d85e8a6..615358e12cd 100644
--- a/net/firewalk/Makefile
+++ b/net/firewalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/03/22 23:33:33 reed Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:46 tv Exp $
 
 DISTNAME=	firewalk-5.0
 CATEGORIES=	net security
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.packetfactory.net/Projects/firewalk/
 COMMENT=	Determines the filter rules on a packet forwarding device
 
 WRKSRC=         ${WRKDIR}/Firewalk
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CFLAGS=-I${LOCALBASE}/include
 
diff --git a/net/flan/Makefile b/net/flan/Makefile
index 0cf5df8c6fe..988231daadb 100644
--- a/net/flan/Makefile
+++ b/net/flan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/07/07 11:35:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:46 tv Exp $
 #
 
 DISTNAME=	Flan
@@ -11,7 +11,6 @@ HOMEPAGE=	http://picolibre.enst-bretagne.fr/projects/flan/index.html
 COMMENT=	Simulator for IP networks written in Java
 
 WRKSRC=			${WRKDIR}/src
-USE_BUILDLINK3=		yes
 USE_JAVA=		yes
 PKG_JVMS_ACCEPTED=	sun-jdk13 sun-jdk14 jdk13 jdk14
 USE_GNU_TOOLS+=		make
diff --git a/net/flodo/Makefile b/net/flodo/Makefile
index d222b3123a5..89ac309ca79 100644
--- a/net/flodo/Makefile
+++ b/net/flodo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/11/08 04:31:16 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:46 tv Exp $
 #
 
 DISTNAME=		flodo-v4
@@ -11,7 +11,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://arctic.org/~dean/flodo/
 COMMENT=		Simple network flow sampling tool
 
-USE_BUILDLINK3=		yes
 USE_BUILTIN.libpcap=	no
 BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.8
 
diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index 129ac89168a..c42888ba06e 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/02/18 10:08:33 seb Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:46 tv Exp $
 
 DISTNAME=	flow-tools-0.67
 PKGREVISION=	2
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.splintered.net/sw/flow-tools/
 COMMENT=	Collect and store NetFlow data
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 
 PKG_SYSCONFSUBDIR=	flow-tools
diff --git a/net/freenet-tools/Makefile b/net/freenet-tools/Makefile
index 466ea9ee089..47ac0284f53 100644
--- a/net/freenet-tools/Makefile
+++ b/net/freenet-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/07/25 15:36:31 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:46 tv Exp $
 #
 
 DISTNAME=		ft-0.2.23
@@ -12,7 +12,6 @@ MAINTAINER=		tv@duh.org
 HOMEPAGE=		http://entropy.stop1984.com/
 COMMENT=		Freenet Tools, freesite manipulation tools for Freenet and Entropy
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 
 MAKE_FLAGS+=		CC=${CC:Q} LD=${CC:Q} CFLAGS=${CFLAGS:Q} LDFLAGS=${LDFLAGS:Q}
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 71a7076eb47..3832e0967d6 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/03/02 21:50:18 adrianp Exp $
+# $NetBSD: Makefile,v 1.27 2005/04/11 21:46:46 tv Exp $
 
 DISTNAME=	freeradius-1.0.2
 PKGREVISION=	1
@@ -15,7 +15,6 @@ COMMENT=	Free RADIUS server implementation
 CONFLICTS+=		radiusd-cistron*
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3= 	YES
 USE_PKGINSTALL=		YES
 USE_PERL5=		YES
 LIBTOOLIZE_PLIST=	NO
diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index 10b5df92288..4df2aab6088 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/03/26 20:54:12 kristerw Exp $
+# $NetBSD: Makefile,v 1.18 2005/04/11 21:46:46 tv Exp $
 #
 
 DISTNAME=	freeWAIS-sf-2.2.12
@@ -13,7 +13,6 @@ COMMENT=	Enhanced Wide Area Information Server
 
 NOT_FOR_PLATFORM=	Darwin-*-*
 
-USE_BUILDLINK3=	yes
 USE_PERL5=	build
 USE_LIBTOOL=	# defined
 
diff --git a/net/ftplibpp/Makefile b/net/ftplibpp/Makefile
index 3eebcc7c4d5..bc20e4785aa 100644
--- a/net/ftplibpp/Makefile
+++ b/net/ftplibpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/09/06 16:27:03 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:46 tv Exp $
 #
 
 DISTNAME=		ftplibpp-1.0.1
@@ -9,7 +9,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://home.arcor.de/breitscheid/ftplibpp/ftplibpp.html
 COMMENT=		C++ class providing ftp client functionality
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 
 post-install:
diff --git a/net/gated/Makefile b/net/gated/Makefile
index d0fdba94345..e65acb19528 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/03/24 21:12:58 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:46 tv Exp $
 
 DISTNAME=       gated-3-5-11
 PKGNAME=        gated-3.5.11
@@ -18,7 +18,6 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 RCD_SCRIPTS=		gated
 RCD_SCRIPT_SRC.gated=	${FILESDIR}/gated
diff --git a/net/gftp/Makefile.common b/net/gftp/Makefile.common
index 8b66c225ab9..365693852b6 100644
--- a/net/gftp/Makefile.common
+++ b/net/gftp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/03/02 14:36:53 tron Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/04/11 21:46:46 tv Exp $
 
 DISTNAME=	gftp-${VERSION}
 CATEGORIES=	net
@@ -11,7 +11,6 @@ HOMEPAGE=	http://gftp.seul.org/
 
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK3=		yes
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/net/gift-fasttrack/Makefile b/net/gift-fasttrack/Makefile
index e71abc940fa..b57c83c7748 100644
--- a/net/gift-fasttrack/Makefile
+++ b/net/gift-fasttrack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/02/15 22:32:51 peter Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:47 tv Exp $
 #
 
 DISTNAME=	giFT-FastTrack-0.8.9
@@ -11,7 +11,6 @@ HOMEPAGE=	http://download.berlios.de/gift-fasttrack/
 COMMENT=	Fasttrack plugin for giFT
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/net/gift-gnutella/Makefile b/net/gift-gnutella/Makefile
index 902ce95672f..ef31d4847e9 100644
--- a/net/gift-gnutella/Makefile
+++ b/net/gift-gnutella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/15 12:14:07 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:47 tv Exp $
 #
 
 DISTNAME=		gift-gnutella-0.0.9.2
@@ -11,7 +11,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://gift..sourceforge.net/
 COMMENT=		Gnutella plugin for giFT
 
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/net/gift-openft/Makefile b/net/gift-openft/Makefile
index 7ee092592f1..983f8683e4f 100644
--- a/net/gift-openft/Makefile
+++ b/net/gift-openft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/04 23:09:07 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:47 tv Exp $
 #
 
 DISTNAME=	gift-openft-0.2.1.3
@@ -10,7 +10,6 @@ MAINTAINER=	alex@catbull.com
 HOMEPAGE=	http://gift.sourceforge.net/
 COMMENT=	OpenFT Plugin for the gift daemon
 
-USE_BUILDLINK3=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net/gift/Makefile b/net/gift/Makefile
index 61f885d51b4..a06875a9d88 100644
--- a/net/gift/Makefile
+++ b/net/gift/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/02/15 22:28:04 peter Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:46 tv Exp $
 #
 
 DISTNAME=	gift-0.11.8.1
@@ -10,7 +10,6 @@ MAINTAINER=	alex@catbull.com
 HOMEPAGE=	http://gift.sourceforge.net/
 COMMENT=	Modular daemon that abstracts filesharing protocols
 
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/net/giftcurs/Makefile b/net/giftcurs/Makefile
index 1d59f114f62..a6a05241dfb 100644
--- a/net/giftcurs/Makefile
+++ b/net/giftcurs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/15 12:14:07 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:47 tv Exp $
 #
 
 DISTNAME=	giFTcurs-0.6.2
@@ -13,7 +13,6 @@ COMMENT=	Curses frontend to the giFT daemon
 
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/net/gini/Makefile b/net/gini/Makefile
index 3dad01b03c1..94b93ac0877 100644
--- a/net/gini/Makefile
+++ b/net/gini/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:17:52 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:47 tv Exp $
 #
 
 DISTNAME=		gini-0.5.1
@@ -12,7 +12,6 @@ HOMEPAGE=		http://gini.sourceforge.net/
 COMMENT=		Free streaming media server
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 
diff --git a/net/gkrellm-multiping/Makefile b/net/gkrellm-multiping/Makefile
index 614cbba52f2..5c6fef062f2 100644
--- a/net/gkrellm-multiping/Makefile
+++ b/net/gkrellm-multiping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/04 23:09:07 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:47 tv Exp $
 #
 
 DISTNAME=	gkrellm-multiping-2.0.8
@@ -11,7 +11,6 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/index.html
 COMMENT=	Pings several machines and prints out stats
 
-USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 SPECIAL_PERMS+=	${PREFIX}/lib/gkrellm2/plugins/pinger ${SETUID_ROOT_PERMS}
 
diff --git a/net/gkrellm-ping/Makefile b/net/gkrellm-ping/Makefile
index c6a5643e3ed..d9e5880ceec 100644
--- a/net/gkrellm-ping/Makefile
+++ b/net/gkrellm-ping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:17:52 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:47 tv Exp $
 
 DISTNAME=	gkrellmPing-0.2-3
 PKGNAME=	gkrellm-ping-0.2.3
@@ -11,7 +11,6 @@ HOMEPAGE=	http://gkrellmping.dweb.ro/
 COMMENT=	gkrellm ping plugin
 
 WRKSRC=		${WRKDIR}/gkrellmPing
-USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 
 do-install:
diff --git a/net/gkrellm-snmp/Makefile b/net/gkrellm-snmp/Makefile
index f7bb9469228..b75e2974b79 100644
--- a/net/gkrellm-snmp/Makefile
+++ b/net/gkrellm-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/10/03 00:17:52 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:47 tv Exp $
 #
 
 DISTNAME=	gkrellm_snmp-0.21
@@ -11,7 +11,6 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://triq.net/gkrellm_snmp.html
 COMMENT=	GKrellM plugin to display values collected from a SNMP agent
 
-USE_BUILDLINK3=	YES
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/gkrellm-wireless/Makefile b/net/gkrellm-wireless/Makefile
index 471c3b4d936..95478f7477e 100644
--- a/net/gkrellm-wireless/Makefile
+++ b/net/gkrellm-wireless/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:17:52 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:47 tv Exp $
 
 DISTNAME=		gkrellmwireless-2.0.3
 PKGNAME=		${DISTNAME:S/gkrellm/gkrellm-/}
@@ -13,7 +13,6 @@ COMMENT=		Wavelan signal strength monitor for gkrellm
 ONLY_FOR_PLATFORM=	*BSD-*-* Linux-*-*
 
 WRKSRC=			${WRKDIR}/gkrellmwireless
-USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 
 .include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/net/gkrellm1-snmp/Makefile b/net/gkrellm1-snmp/Makefile
index a2f7f5fa311..893cd031eb4 100644
--- a/net/gkrellm1-snmp/Makefile
+++ b/net/gkrellm1-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:17:52 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:47 tv Exp $
 
 DISTNAME=		gkrellm_snmp-0.18
 PKGNAME=		gkrellm-snmp-0.18
@@ -10,7 +10,6 @@ MAINTAINER=		jasper@pointless.net
 HOMEPAGE=		http://triq.net/gkrellm.html
 COMMENT=		Simple SNMP monitor for gkrellm
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 
 do-install:
diff --git a/net/gkrellm1-wireless/Makefile b/net/gkrellm1-wireless/Makefile
index ebc54a1b8ad..38cb413eb78 100644
--- a/net/gkrellm1-wireless/Makefile
+++ b/net/gkrellm1-wireless/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/11/13 21:28:28 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:47 tv Exp $
 
 DISTNAME=		gkrellmwireless-0.2.2
 PKGNAME=		gkrellm-wireless-0.2.2
@@ -12,7 +12,6 @@ COMMENT=		Wavelan signal strength monitor for gkrellm
 
 ONLY_FOR_PLATFORM=	*BSD-*-* Linux-*-*
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 
 do-install:
diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile
index e8fcb2fdad9..afa8ab56aa1 100644
--- a/net/gnapster/Makefile
+++ b/net/gnapster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/12/28 23:18:16 reed Exp $
+# $NetBSD: Makefile,v 1.38 2005/04/11 21:46:47 tv Exp $
 
 DISTNAME=	gnapster-1.5.0
 PKGREVISION=	12
@@ -11,7 +11,6 @@ COMMENT=	Simple client for the online mp3 community
 
 BUILD_USES_MSGFMT=	YES
 
-USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index e2b3c80a6df..4dc4d48fd4e 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/03/23 22:26:44 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2005/04/11 21:46:47 tv Exp $
 #
 
 DISTNAME=		gnet-2.0.7
@@ -12,7 +12,6 @@ COMMENT=		Simple network library
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	gnet-2.0.pc.in
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 CONFIGURE_ARGS=		--enable-glib2
 TEST_TARGET=		check
 
diff --git a/net/gnet1/Makefile b/net/gnet1/Makefile
index 7a4f16d10d1..2980b8e53b9 100644
--- a/net/gnet1/Makefile
+++ b/net/gnet1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:17:53 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:47 tv Exp $
 #
 
 DISTNAME=		gnet-1.1.8
@@ -16,7 +16,6 @@ CONFLICTS=		gnet<=1.1.8
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	gnet.pc.in
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 CONFIGURE_ARGS=		--enable-glib2
 TEST_TARGET=		check
 
diff --git a/net/gnetcat/Makefile b/net/gnetcat/Makefile
index 017146d012c..2fc533dc1d0 100644
--- a/net/gnetcat/Makefile
+++ b/net/gnetcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/01/25 13:43:29 adrianp Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:47 tv Exp $
 
 DISTNAME=	netcat-0.7.1
 PKGNAME=	gnetcat-0.7.1
@@ -11,7 +11,6 @@ HOMEPAGE= 	http://netcat.sourceforge.net/
 COMMENT=	Read and write data across network connections
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 
 INFO_FILES=		netcat.info
 
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 7f0939ae1bd..639ab773b80 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/22 16:34:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:47 tv Exp $
 #
 
 DISTNAME=	gnome-netstatus-2.10.0
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Network status applet for the GNOME panel
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
diff --git a/net/gnugk/Makefile b/net/gnugk/Makefile
index 3165380431d..2d75f7d4222 100644
--- a/net/gnugk/Makefile
+++ b/net/gnugk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:46 reed Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:47 tv Exp $
 
 DISTNAME=	gnugk-2.2.0
 PKGREVISION=	1
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnugk.org/
 COMMENT=	H.323 Gatekeeper
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS=		make
 USE_PKGINSTALL=         yes
 GNU_CONFIGURE=		yes
diff --git a/net/gopher/Makefile b/net/gopher/Makefile
index 7cb6f1a14d4..97ce4b61c48 100644
--- a/net/gopher/Makefile
+++ b/net/gopher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/07/10 01:55:32 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:47 tv Exp $
 #
 
 DISTNAME=	gopher_3.0.6
@@ -12,7 +12,6 @@ COMMENT=	Distributed document delivery client and server
 
 WRKSRC=		${WRKDIR}/gopher
 GNU_CONFIGURE=	yes
-USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 CONFIGURE_ARGS+=--disable-auth
 
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 25c7eb1b018..a9fabcb3e8e 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/03/21 14:23:21 adam Exp $
+# $NetBSD: Makefile,v 1.39 2005/04/11 21:46:47 tv Exp $
 
 DISTNAME=	gtk-gnutella-0.95
 CATEGORIES=	net
@@ -9,7 +9,6 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://gtk-gnutella.sourceforge.net/
 COMMENT=	GTK-based gnutella client
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/net/gtk_wicontrol/Makefile b/net/gtk_wicontrol/Makefile
index ecbe0c9934d..11075e7424d 100644
--- a/net/gtk_wicontrol/Makefile
+++ b/net/gtk_wicontrol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/10/03 00:17:53 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:47 tv Exp $
 
 DISTNAME=	gtk_wicontrol-0.17
 PKGREVISION=	3
@@ -11,7 +11,6 @@ COMMENT=	GTK+-based Wavelan status meter
 
 ONLY_FOR_PLATFORM=	*BSD-*-*
 
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/net/gtksamba/Makefile b/net/gtksamba/Makefile
index d8c63a7967c..ac50bf0aff1 100644
--- a/net/gtksamba/Makefile
+++ b/net/gtksamba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/03/15 20:09:58 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/04/11 21:46:47 tv Exp $
 #
 
 DISTNAME=	gtksamba-0.3.2pl1
@@ -12,7 +12,6 @@ HOMEPAGE=	http://www.open-systems.com/gtksamba.html
 COMMENT=	Samba configuration tool for X Window System
 
 GNU_CONFIGURE=	yes
-USE_BUILDLINK3=	yes
 CPPFLAGS+=	-DPREFIX='"${PREFIX}"'
 
 post-install:
diff --git a/net/gtm/Makefile b/net/gtm/Makefile
index 649524e5ac2..1c5bca18467 100644
--- a/net/gtm/Makefile
+++ b/net/gtm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/11/30 18:26:40 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2005/04/11 21:46:47 tv Exp $
 #
 
 DISTNAME=	gtm-0.4.12
@@ -12,7 +12,6 @@ COMMENT=	Gnome Transfer Manager
 
 DEPENDS+=	wget-[0-9]*:../../net/wget
 
-USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
diff --git a/net/hesiod/Makefile b/net/hesiod/Makefile
index 8b7da744b18..f85230a48d6 100644
--- a/net/hesiod/Makefile
+++ b/net/hesiod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/25 00:18:39 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:48 tv Exp $
 
 DISTNAME=	hesiod-3.0.2
 CATEGORIES=	net
@@ -13,7 +13,6 @@ COMMENT=	Hesiod network database client and library
 PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution"
 .endif
 
-USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
diff --git a/net/hlfl/Makefile b/net/hlfl/Makefile
index a9a5ec7dd6d..96830f54391 100644
--- a/net/hlfl/Makefile
+++ b/net/hlfl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/06 07:49:59 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:48 tv Exp $
 #
 
 DISTNAME=		hlfl-0.60.1
@@ -11,7 +11,6 @@ MAINTAINER=		pancake@phreaker.net
 HOMEPAGE=		http://www.hlfl.org/
 COMMENT=		High Level Firewall Language
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile
index 092b139292f..41455b55c33 100644
--- a/net/hobbitmon/Makefile
+++ b/net/hobbitmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/02/20 10:51:32 manu Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:48 tv Exp $
 #
 
 DISTNAME=	hobbit-4.0-beta6
@@ -13,7 +13,6 @@ COMMENT=	Network services monitor a la Big Brother
 
 DEPENDS+=	fping>2:../../net/fping
 
-USE_BUILDLINK3=	YES
 HAS_CONFIGURE=	YES
 USE_GNU_TOOLS+=	make
 USE_PKGINSTALL=YES
diff --git a/net/howl/Makefile b/net/howl/Makefile
index 2a8d56b22a9..482430ae7de 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/22 19:55:37 nathanw Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:48 tv Exp $
 
 DISTNAME=		howl-0.9.10
 CATEGORIES=		net
@@ -8,7 +8,6 @@ MAINTAINER=		nathanw@NetBSD.org
 HOMEPAGE=		http://www.porchdogsoft.com/products/howl/
 COMMENT=		Zeroconf (Rendezvous) implementation
 
-USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
diff --git a/net/iftop/Makefile b/net/iftop/Makefile
index 8112421d7c5..2df9b3319f4 100644
--- a/net/iftop/Makefile
+++ b/net/iftop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:17:53 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:48 tv Exp $
 #
 
 DISTNAME=	iftop-0.16
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.ex-parrot.com/~pdw/iftop/download/
 COMMENT=	Display bandwidth usage on an interface
 
-USE_BUILDLINK3=		yes
 USE_NCURSES=		# mvchgat()
 GNU_CONFIGURE=		yes
 
diff --git a/net/ipa/Makefile b/net/ipa/Makefile
index 81ca6854770..46705181732 100644
--- a/net/ipa/Makefile
+++ b/net/ipa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/02/17 03:00:33 uebayasi Exp $
+# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:48 tv Exp $
 #
 
 DISTNAME=	ipa-1.3.6
@@ -20,7 +20,6 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_PACKAGE=		${RESTRICTED}
 
-USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 BUILD_TARGET=		# empty
 
diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index a05553fff37..4ab114553dd 100644
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/12/03 13:30:20 adam Exp $
+# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:48 tv Exp $
 
 DISTNAME=	iperf-2.0.1
 CATEGORIES=	net
@@ -14,7 +14,6 @@ COMMENT=	TCP and UDP bandwidth performance measurement tool
 GCC_REQD+=	3.0
 .endif
 
-USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 #CONFIGURE_DIRS=		${WRKSRC}/cfg
diff --git a/net/ipgrab/Makefile b/net/ipgrab/Makefile
index f0d1db425dc..784d6e722be 100644
--- a/net/ipgrab/Makefile
+++ b/net/ipgrab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/11/25 20:09:41 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:48 tv Exp $
 
 DISTNAME=	ipgrab-0.9.9
 CATEGORIES=	net security
@@ -10,7 +10,6 @@ COMMENT=	Verbose packet sniffer for UNIX hosts
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 USE_MAKEINFO=	yes
 INFO_FILES=	ipgrab.info
diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index 22feb8fb4fd..399d2d732ca 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/28 02:47:46 reed Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:48 tv Exp $
 #
 
 DISTNAME=	iplog-2.2.3
@@ -10,7 +10,6 @@ MAINTAINER=	gremlin@portal-to-web.de
 HOMEPAGE=	http://ojnk.sourceforge.net/
 COMMENT=	Iplog is a tool using pcap to log IP traffic
 
-USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile
index 3f6fd3ab4d5..f91aad10f9c 100644
--- a/net/ipv6calc/Makefile
+++ b/net/ipv6calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/11/23 21:34:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.27 2005/04/11 21:46:48 tv Exp $
 #
 
 DISTNAME=	ipv6calc-0.48
@@ -13,7 +13,6 @@ COMMENT=	Manipulates IPv6 addresses
 # be listed in README-IPv6.html. Leave this comment here to make it so!
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 
 MAKE_ENV+=	root=${PREFIX}
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 8531c46f4a6..36878dea888 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/12/31 23:01:33 kim Exp $
+# $NetBSD: Makefile,v 1.27 2005/04/11 21:46:48 tv Exp $
 
 DISTNAME=		irrd2.2.3
 PKGNAME=		irrd-2.2.3
@@ -15,7 +15,6 @@ COMMENT=		Internet Routing Registry Daemon
 DEPENDS+=		gnupg-[0-9]*:../../security/gnupg
 DEPENDS+=		wget-[0-9]*:../../net/wget
 
-USE_BUILDLINK3=		YES
 USE_PERL5=		# defined
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile
index 4c92257a3eb..0586fe8f2e6 100644
--- a/net/irrtoolset-nox11/Makefile
+++ b/net/irrtoolset-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:48 tv Exp $
 #
 
 DISTNAME=		IRRToolSet-4.8.2
@@ -9,7 +9,6 @@ MAINTAINER=		spz@NetBSD.org
 HOMEPAGE=		http://www.isc.org/index.pl?/sw/IRRToolSet/
 COMMENT=		The Internet Routing Registry Toolset - client to IRRd
 
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/net/ishell/Makefile b/net/ishell/Makefile
index 4182afdeccc..429404c3d8c 100644
--- a/net/ishell/Makefile
+++ b/net/ishell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/11 23:58:23 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:48 tv Exp $
 #
 
 DISTNAME=	ish-v${VERSION}
@@ -16,7 +16,6 @@ VERSION=	0.2
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_GNU_TOOLS+=	make
-USE_BUILDLINK3=	yes
 NO_CONFIGURE=	yes
 
 MAKE_ENV+=	LIBS="${LIBS}"
diff --git a/net/isic/Makefile b/net/isic/Makefile
index f23d6aad77a..d21226fbdf4 100644
--- a/net/isic/Makefile
+++ b/net/isic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/01/20 23:38:02 adrianp Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:48 tv Exp $
 #
 
 DISTNAME=	isic-0.06
@@ -10,7 +10,6 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://www.packetfactory.net/Projects/ISIC/
 COMMENT=	Ip Stack Integrity Checker (IP, TCP, UDP, ICMP et. al.)
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 post-install:
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index 1a04b1dbfd8..56b96b31369 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/02/07 11:35:45 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/04/11 21:46:48 tv Exp $
 
 .include "Makefile.common"
 
@@ -12,7 +12,6 @@ COMMENT=		Samba supporting I18N swat and L10N for Japanese
 
 CONFLICTS+=		samba-[0-9]*
 
-USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
diff --git a/net/jftpgw/Makefile b/net/jftpgw/Makefile
index 284246beb31..54afcab473d 100644
--- a/net/jftpgw/Makefile
+++ b/net/jftpgw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/29 15:42:38 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:48 tv Exp $
 
 DISTNAME=	    jftpgw-0.13.4
 PKGREVISION=	    1
@@ -9,7 +9,6 @@ MAINTAINER=	    tech-pkg@NetBSD.org
 HOMEPAGE=	    http://www.mcknight.de/jftpgw/
 COMMENT=	    FTP gateway/proxy
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_PKGINSTALL=		yes
 
diff --git a/net/jigdo/Makefile b/net/jigdo/Makefile
index b4cc510158e..5ae0fc75faf 100644
--- a/net/jigdo/Makefile
+++ b/net/jigdo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/26 01:49:55 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:48 tv Exp $
 
 DISTNAME=		jigdo-0.7.1
 CATEGORIES=		net
@@ -11,7 +11,6 @@ COMMENT=		Tool to ease downloading of large files from the Internet
 
 CONFIGURE_ARGS+=	--without-libdb
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
 
 #.include "../../databases/db3/buildlink3.mk"
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index d84b59ed465..a63d9027cc4 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/04/11 15:38:16 taca Exp $
+# $NetBSD: Makefile,v 1.51 2005/04/11 21:46:48 tv Exp $
 #
 
 DISTNAME=		jwhois-3.2.2
@@ -10,7 +10,6 @@ MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://www.gnu.org/software/jwhois/
 COMMENT=		Configurable WHOIS client
 
-USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 2ab668b671c..1df4c485bac 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/03/30 12:26:45 markd Exp $
+# $NetBSD: Makefile,v 1.40 2005/04/11 21:46:48 tv Exp $
 
 DISTNAME=	kdenetwork-${_KDE_VERSION}
 PKGREVISION=	1
@@ -9,7 +9,6 @@ CONFLICTS=	kopete-[0-9]*
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
-USE_BUILDLINK3=		yes
 USE_DIRS+=		xdg-1.1
 PTHREAD_OPTS+=		require
 
diff --git a/net/kftpgrabber/Makefile b/net/kftpgrabber/Makefile
index 13af9403549..50c9144bdc1 100644
--- a/net/kftpgrabber/Makefile
+++ b/net/kftpgrabber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/02/09 13:06:53 markd Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:48 tv Exp $
 
 DISTNAME=	kftpgrabber-0.5.0
 CATEGORIES=	net kde
@@ -10,7 +10,6 @@ HOMEPAGE=       http://kftpgrabber.sourceforge.net/
 COMMENT=	graphical FTP client for KDE
 
 BUILD_USES_MSGFMT=	yes
-USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/net/kphone/Makefile b/net/kphone/Makefile
index 0639a2b2ecd..c539a20a5f5 100644
--- a/net/kphone/Makefile
+++ b/net/kphone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/04 23:09:07 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:49 tv Exp $
 
 DISTNAME=		kphone-4.0.5
 CATEGORIES=		net comms
@@ -10,7 +10,6 @@ COMMENT=		Graphical Voice Over Internet (VoIP) phone
 
 WRKSRC=			${WRKDIR}/kphone
 
-USE_BUILDLINK3=		yes
 
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
diff --git a/net/latd/Makefile b/net/latd/Makefile
index 52574a73abd..86fd497323e 100644
--- a/net/latd/Makefile
+++ b/net/latd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/02/17 03:01:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=       latd-1.18
@@ -9,7 +9,6 @@ MAINTAINER=	fredette@theory.lcs.mit.edu
 HOMEPAGE=	http://theory.lcs.mit.edu/~fredette/latd/index.html
 COMMENT=	The linux-decnet project's LAT protocol suite
 
-USE_BUILDLINK3=	yes
 USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net/lft/Makefile b/net/lft/Makefile
index df96256f34c..3cbc7a33ca2 100644
--- a/net/lft/Makefile
+++ b/net/lft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/04/25 08:06:02 snj Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=		lft-2.2
@@ -9,7 +9,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://mainnerve.com/lft/
 COMMENT=		Layer four traceroute capable of tracing protocol paths
 
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	# defined
 GNU_CONFIGURE=		# defined
 
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 33a229a497d..8166aac0a41 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/04/08 12:45:22 salo Exp $
+# $NetBSD: Makefile,v 1.55 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=		lftp-3.1.2
@@ -17,7 +17,6 @@ COMMENT=		Powerful command line file transfer client
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile
index c425019ba0a..a30e6f849b5 100644
--- a/net/libIDL/Makefile
+++ b/net/libIDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/02/06 15:09:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.32 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=		libIDL-0.8.5
@@ -12,7 +12,6 @@ COMMENT=		CORBA Interface Definition Language parser
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		lex yacc
 CONFIGURE_ENV+=		HAVE_YACC=yes
diff --git a/net/libares/Makefile b/net/libares/Makefile
index 55e443421c5..c076103c5a0 100644
--- a/net/libares/Makefile
+++ b/net/libares/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/03/12 05:42:48 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=	ares-1.1.1
@@ -11,7 +11,6 @@ MAINTAINER=	sommerfeld@NetBSD.org
 #HOMEPAGE=	none
 COMMENT=	Asynchronous DNS resolver library
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile
index 6a4dc45a9d4..4299dce4206 100644
--- a/net/libdnet/Makefile
+++ b/net/libdnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/02/28 12:53:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=	libdnet-1.10
@@ -10,7 +10,6 @@ HOMEPAGE=	http://libdnet.sourceforge.net/
 COMMENT=	C interface to several low-level networking routines
 
 GNU_CONFIGURE=	yes
-USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 
diff --git a/net/liblive/Makefile b/net/liblive/Makefile
index 7f60be123fe..911f6cb9e7f 100644
--- a/net/liblive/Makefile
+++ b/net/liblive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:17:54 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=	live.2003.04.04
@@ -12,7 +12,6 @@ HOMEPAGE=	http://www.live.com/liveMedia/
 COMMENT=	Set of C++ libraries for multimedia streaming
 
 WRKSRC=		${WRKDIR}/live
-USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 
 do-configure:
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 02b3a4ba2af..16d73ee371e 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/05 22:13:29 adrianp Exp $
+# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=	libnids-1.20
@@ -9,7 +9,6 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://libnids.sourceforge.net/
 COMMENT=	Network monitoring library with TCP/IP reassembly
 
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 
 BUILDLINK_DEPMETHOD.libnet=	build
diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index 8266be7fa2a..ff937765902 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/03/12 05:24:50 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:49 tv Exp $
 
 DISTNAME=		libpcap-0.8.3
 SVR4_PKGNAME=		lpcap
@@ -16,7 +16,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 # tarball contains invalid dir entry libpcap-0.8.3/.; breaks "first" extract
 EXTRACT_ELEMENTS=	libpcap-0.8.3/./*
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		lex yacc m4
 
diff --git a/net/libradius/Makefile b/net/libradius/Makefile
index 02e67a08bc5..9b597bd487d 100644
--- a/net/libradius/Makefile
+++ b/net/libradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/13 08:10:52 manu Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=	libradius-linux-20040827
@@ -10,7 +10,6 @@ MASTER_SITES=	http://portal-to-web.de/tacacs/
 MAINTAINER=	manu@NetBSD.org
 COMMENT=	RADIUS client library
 
-USE_BUILDLINK3=	yes
 
 WRKSRC=		${WRKDIR}/libradius-linux
 
diff --git a/net/libsoup-devel/Makefile b/net/libsoup-devel/Makefile
index e122890cd27..c8291a8cfbc 100644
--- a/net/libsoup-devel/Makefile
+++ b/net/libsoup-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/26 16:18:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=		libsoup-2.2.3
@@ -11,7 +11,6 @@ MAINTAINER=		recht@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		HTTP library implementation in C (dev. Version)
 
-USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile
index b69a294da41..5a9565221f1 100644
--- a/net/libsoup/Makefile
+++ b/net/libsoup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/02/19 22:46:44 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=		libsoup-1.99.28
@@ -11,7 +11,6 @@ MAINTAINER=		recht@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		HTTP library implementation in C
 
-USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 848c6563fd1..04c26eb7352 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/10/03 00:17:55 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=		linc-1.1.1
@@ -13,7 +13,6 @@ COMMENT=		Network client/server library
 
 CONFLICTS=		ORBit2>=2.8
 
-USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
diff --git a/net/llnlxdir/Makefile b/net/llnlxdir/Makefile
index 02ed90c983a..cdf124b2105 100644
--- a/net/llnlxdir/Makefile
+++ b/net/llnlxdir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:17:55 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=		llnlxdir2_1_2
@@ -12,7 +12,6 @@ MAINTAINER=		tor@stormwall.org
 HOMEPAGE=		http://www.llnl.gov/ia/xdir.html
 COMMENT=		Advanced graphical FTP client
 
-USE_BUILDLINK3= 	yes
 USE_IMAKE=      	yes
 WRKSRC=         	${WRKDIR}/llnlxdir2_1_2/sources
 
diff --git a/net/llnlxftp/Makefile b/net/llnlxftp/Makefile
index 3e45db80f7a..e484230fcdb 100644
--- a/net/llnlxftp/Makefile
+++ b/net/llnlxftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:17:55 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=		llnlxftp2.1
@@ -12,7 +12,6 @@ MAINTAINER=		tor@stormwall.org
 HOMEPAGE=		http://www.llnl.gov/ia/xftp.html
 COMMENT=		Motif FTP client
 
-USE_BUILDLINK3= 	yes
 USE_IMAKE=      	yes
 WRKSRC=         	${WRKDIR}/llnlxftp2.1/sources
 
diff --git a/net/lopster/Makefile b/net/lopster/Makefile
index d3bc611b701..f4f1e84ec86 100644
--- a/net/lopster/Makefile
+++ b/net/lopster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:17:55 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=	lopster-1.2.0
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://lopster.sourceforge.net/
 COMMENT=	Yet another Gtk+ Napster clone
 
-USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	# defined
 
diff --git a/net/maradns/Makefile b/net/maradns/Makefile
index 6c2b678a1bc..6b471acfc7f 100644
--- a/net/maradns/Makefile
+++ b/net/maradns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/03/14 23:41:35 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:49 tv Exp $
 
 DISTNAME=	maradns-1.0.18
 PKGREVISION=	3
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.maradns.org/
 COMMENT=	Secure DNS server for *NIX systems
 
-USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 HAS_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
diff --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common
index c8eb69de9c5..81b0d675746 100644
--- a/net/mldonkey/Makefile.common
+++ b/net/mldonkey/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/03/24 22:06:27 tron Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/04/11 21:46:49 tv Exp $
 #
 
 DISTNAME=	mldonkey-2.5.28
@@ -14,7 +14,6 @@ DISTINFO_FILE=		${.CURDIR}/../../net/mldonkey/distinfo
 PATCHDIR=		${.CURDIR}/../../net/mldonkey/patches
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_PERL5=		build
 
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 69d36673d95..bf953f43f38 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/01/24 16:25:05 tv Exp $
+# $NetBSD: Makefile,v 1.59 2005/04/11 21:46:50 tv Exp $
 
 DISTNAME=	mrtg-2.11.1
 PKGREVISION=	1
@@ -26,7 +26,6 @@ MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html
 COMMENT=	The Multi-Router Traffic Grapher
 
-USE_BUILDLINK3=	YES
 USE_PERL5=	YES
 PERL5_REQD+=	5.6.1
 GNU_CONFIGURE=	YES
diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile
index a910bfce3de..89b55b99e22 100644
--- a/net/mtr-gtk/Makefile
+++ b/net/mtr-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/02/27 22:49:43 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:50 tv Exp $
 #
 
 DISTNAME=	mtr-0.69
@@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	yes
 USE_GNU_TOOLS+=	make
-USE_BUILDLINK3=	yes
 USE_X11=	yes
 
 INSTALLATION_DIRS=	man/man8 sbin
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 06d1e4a8352..acc0f2c488d 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/02/27 22:49:43 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2005/04/11 21:46:50 tv Exp $
 #
 
 DISTNAME=	mtr-0.69
@@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
-USE_BUILDLINK3=		YES
 CONFIGURE_ARGS+=	--without-gtk
 INSTALLATION_DIRS=	man/man8 sbin
 
diff --git a/net/nam/Makefile b/net/nam/Makefile
index a2914a5c3e9..a8b369ccb05 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/02/28 15:29:22 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:50 tv Exp $
 
 DISTNAME=	nam-src-1.11
 PKGNAME=	${DISTNAME:S/-src//}
@@ -12,7 +12,6 @@ COMMENT=	The UCB/LBNL Network Animator
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
-USE_BUILDLINK3=	yes
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	yes
 USE_X11=	yes
diff --git a/net/nap/Makefile b/net/nap/Makefile
index 885f2ed5bbe..833f96834d8 100644
--- a/net/nap/Makefile
+++ b/net/nap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/11/27 08:03:37 tron Exp $
+# $NetBSD: Makefile,v 1.21 2005/04/11 21:46:50 tv Exp $
 
 DISTNAME=	nap-1.4.4
 PKGREVISION=	2
@@ -10,7 +10,6 @@ HOMEPAGE=	http://nap.sourceforge.net/
 COMMENT=	Terminal based Napster client similar to ircII
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 
 # newterm()
 INCOMPAT_CURSES=	NetBSD-1.4*-*
diff --git a/net/napshare/Makefile b/net/napshare/Makefile
index dca0cc9a8f8..083f57f419f 100644
--- a/net/napshare/Makefile
+++ b/net/napshare/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/03/19 17:00:32 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:51 tv Exp $
 
 DISTNAME=	napshare-1.3
 CATEGORIES=	net
@@ -8,7 +8,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://napshare.sourceforge.net/
 COMMENT=	Fully featured Gnutella P2P client made to run 24/7 unattended
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 GTKCFLAGS_CMD=	${BUILDLINK_PREFIX.gtk}/bin/gtk-config --cflags
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile
index 0c3577e884e..655370c0a9d 100644
--- a/net/ncftp2/Makefile
+++ b/net/ncftp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/03/24 21:12:59 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2005/04/11 21:46:51 tv Exp $
 
 DISTNAME=		ncftp-2.4.3
 PKGREVISION=	1
@@ -9,7 +9,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.ncftp.com/ncftp/
 COMMENT=		FTP replacement with advanced user interface
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-extra-dirs
 CONFIGURE_ARGS+=	--disable-ncurses
diff --git a/net/ncftp3/Makefile b/net/ncftp3/Makefile
index 9aa20abebe5..c456843aa28 100644
--- a/net/ncftp3/Makefile
+++ b/net/ncftp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/10/03 00:17:55 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/04/11 21:46:51 tv Exp $
 
 DISTNAME=	ncftp-3.1.8-src
 PKGNAME=	ncftp3-3.1.8
@@ -12,7 +12,6 @@ COMMENT=	FTP replacement with advanced user interface
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 GNU_CONFIGURE=	yes
-USE_BUILDLINK3=	yes
 
 post-patch:
 	@${MV} ${WRKSRC}/ncftp/pref.h ${WRKSRC}/ncftp/pref.h.in
diff --git a/net/nemesis/Makefile b/net/nemesis/Makefile
index 7aeafd2c442..b5117d9890a 100644
--- a/net/nemesis/Makefile
+++ b/net/nemesis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/02/05 16:11:47 adrianp Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:51 tv Exp $
 
 DISTNAME=	nemesis-1.32
 PKGREVISION=	1
@@ -9,7 +9,6 @@ MAINTAINER=	xs@nitric.net
 HOMEPAGE=	http://jeff.wwti.com/nemesis/
 COMMENT=	Nemesis is a command-line UNIX network packet injection suite
 
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=  # defined
 
 BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index a3d2d669d05..aefbfb64662 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/03/30 12:10:58 adam Exp $
+# $NetBSD: Makefile,v 1.29 2005/04/11 21:46:51 tv Exp $
 
 DISTNAME=	net-snmp-5.2.1
 CATEGORIES=	net
@@ -20,7 +20,6 @@ NET_SNMP_SYS_LOCATION?=		defaultlocation
 NET_SNMP_PERSISTENTDIR?=	${VARBASE}/net-snmp
 NET_SNMP_MIBDIRS?=		\$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:/usr/local/share/snmp/mibs
 
-USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 
 # The self-test of Perl modules only works after installation because perl
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index bc153682f01..750a5d46dac 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/01/31 13:33:23 markd Exp $
+# $NetBSD: Makefile,v 1.40 2005/04/11 21:46:51 tv Exp $
 
 DISTNAME=	netatalk-2.0.2
 PKGREVISION=	1
@@ -11,7 +11,6 @@ HOMEPAGE=	http://netatalk.sourceforge.net/
 COMMENT=	Netatalk appletalk file and print services
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 USE_PERL5=	YES
 USE_LIBTOOL=	YES
diff --git a/net/netatalk1/Makefile b/net/netatalk1/Makefile
index fbc38725a0e..04e1c8df5a9 100644
--- a/net/netatalk1/Makefile
+++ b/net/netatalk1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/29 15:31:24 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:51 tv Exp $
 
 DISTNAME=	netatalk-1.6.2
 PKGREVISION=	2
@@ -11,7 +11,6 @@ HOMEPAGE=	http://sourceforge.net/projects/netatalk/
 COMMENT=	Netatalk appletalk file and print services
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 USE_PERL5=	YES
 USE_LIBTOOL=		YES
diff --git a/net/netcat/Makefile b/net/netcat/Makefile
index 9869bf5e402..686bbdb7e21 100644
--- a/net/netcat/Makefile
+++ b/net/netcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/03/26 23:51:06 reed Exp $
+# $NetBSD: Makefile,v 1.25 2005/04/11 21:46:52 tv Exp $
 
 DISTNAME=	nc110
 PKGNAME=	netcat-1.10
@@ -18,7 +18,6 @@ COMMENT=	Read and write data across network connections
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK3=	yes
 MAKE_ENV+=	DFLAGS="-DGAPING_SECURITY_HOLE -DTELNET"
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/netperf/Makefile b/net/netperf/Makefile
index 390cd18aef9..71b2e2ba618 100644
--- a/net/netperf/Makefile
+++ b/net/netperf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/12/18 15:55:51 grant Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:52 tv Exp $
 # KAME Id: Makefile,v 1.3 2000/01/21 12:34:29 itojun Exp
 #
 
@@ -11,7 +11,6 @@ MAINTAINER=	itojun@kame.net
 HOMEPAGE=	http://www.netperf.org/
 COMMENT=	Rick Jones' network performance benchmarking package
 
-USE_BUILDLINK3=	yes
 
 MAKEFILE=	makefile
 MAN1=		netperf.1 netserver.1
diff --git a/net/netsaint-base/Makefile b/net/netsaint-base/Makefile
index 26138bc093d..473fd7d65be 100644
--- a/net/netsaint-base/Makefile
+++ b/net/netsaint-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/10/03 00:17:56 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/04/11 21:46:52 tv Exp $
 #
 
 DISTNAME=		netsaint-0.0.7
@@ -10,7 +10,6 @@ MAINTAINER=		murray@river-styx.org
 HOMEPAGE=		http://www.netsaint.org/
 COMMENT=		Network monitor
 
-USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 
 .include "../../net/netsaint-base/Makefile.common"
diff --git a/net/netsaint-plugins/Makefile b/net/netsaint-plugins/Makefile
index 9ef4d62317d..70080f7604f 100644
--- a/net/netsaint-plugins/Makefile
+++ b/net/netsaint-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/10/03 00:17:56 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/04/11 21:46:52 tv Exp $
 #
 
 DISTNAME=		netsaint-plugins-1.2.9-4
@@ -16,7 +16,6 @@ DEPENDS+=		netsaint-base-[0-9]*:../../net/netsaint-base
 DEPENDS+=		{ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/openssh
 .endif
 
-USE_BUILDLINK3=		YES
 CONFIGURE_ARGS+=	--with-pgsql=${PGSQL_PREFIX}
 CPPFLAGS+=		-I${PGSQL_PREFIX}/include/postgresql
 
diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index 1d24e3d7a6b..5be51880a2f 100644
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/02/25 09:23:40 adam Exp $
+# $NetBSD: Makefile,v 1.22 2005/04/11 21:46:52 tv Exp $
 
 DISTNAME=	ngrep-1.43
 CATEGORIES=	net
@@ -9,7 +9,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://ngrep.sourceforge.net/
 COMMENT=	Network grep
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-pcre
 # ngrep's configure use --includedir/$includedir in a weird way!
diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile
index 1b7febdf017..407a9470270 100644
--- a/net/nicotine/Makefile
+++ b/net/nicotine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/02/21 20:26:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:52 tv Exp $
 #
 
 DISTNAME=	nicotine-1.0.8
@@ -11,7 +11,6 @@ HOMEPAGE=	http://nicotine.thegraveyard.org/
 COMMENT=	Client for soulseek, a peer-to-peer network for music
 
 PYTHON_VERSIONS_ACCEPTED=       23
-USE_BUILDLINK3=	yes
 PY_PATCHPLIST=	yes
 PYDISTUTILSPKG=	yes
 
diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 18b41c6c743..9d1cce86bc0 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/02/09 13:58:41 salo Exp $
+# $NetBSD: Makefile,v 1.44 2005/04/11 21:46:52 tv Exp $
 #
 
 DISTNAME=	nmap-3.81
@@ -12,7 +12,6 @@ COMMENT=	Network/port scanner with OS detection
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		YES
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-libpcap=${BUILDLINK_PREFIX.libpcap}
diff --git a/net/nmapfe/Makefile b/net/nmapfe/Makefile
index 88082cbbfde..2da4955191c 100644
--- a/net/nmapfe/Makefile
+++ b/net/nmapfe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/02/09 13:58:41 salo Exp $
+# $NetBSD: Makefile,v 1.31 2005/04/11 21:46:52 tv Exp $
 #
 
 DISTNAME=	nmap-3.81
@@ -14,7 +14,6 @@ COMMENT=	Graphical front end to the nmap port scanner
 
 DEPENDS+=	nmap-[23].*:../../net/nmap
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 PATCHDIR=	${.CURDIR}/../../net/nmap/patches
diff --git a/net/nprobe/Makefile b/net/nprobe/Makefile
index fee4ddba114..9f6f3a87632 100644
--- a/net/nprobe/Makefile
+++ b/net/nprobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/12/03 15:15:06 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:52 tv Exp $
 
 DISTNAME=	nProbe-source-1.3.1
 PKGREVISION=	2
@@ -13,7 +13,6 @@ COMMENT=	Monitor a network interface and generate NetFlow data
 
 WRKSRC=		${WRKDIR}/nProbe
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 BUILD_TARGET=	nprobe
 
diff --git a/net/ns/Makefile b/net/ns/Makefile
index caa1bf8b4f4..097ee923dc0 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/10/03 00:17:56 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:52 tv Exp $
 
 DISTNAME=	ns-src-2.27
 PKGNAME=	${DISTNAME:S/-src//}
@@ -13,7 +13,6 @@ COMMENT=	The UCB/LBNL Network Simulator Version 2
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
-USE_BUILDLINK3=	yes
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	yes
 USE_X11=	yes
diff --git a/net/nsca/Makefile b/net/nsca/Makefile
index b50e903725e..d786ebd89b5 100644
--- a/net/nsca/Makefile
+++ b/net/nsca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/04/25 08:32:36 snj Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:52 tv Exp $
 #
 
 DISTNAME=	nsca-1.1.0
@@ -13,7 +13,6 @@ COMMENT=	Submit passive NetSaint checks results to another server
 DEPENDS+=	netsaint-base-[0-9]*:../../net/netsaint-base
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 
 EGDIR=		${PREFIX}/share/examples/nsca
 
diff --git a/net/nsd/Makefile b/net/nsd/Makefile
index 54f8db156c9..fa07a7a82c0 100644
--- a/net/nsd/Makefile
+++ b/net/nsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/01/19 02:11:24 itojun Exp $
+# $NetBSD: Makefile,v 1.28 2005/04/11 21:46:52 tv Exp $
 
 DISTNAME=	nsd-2.2.0
 CATEGORIES=	net
@@ -13,7 +13,6 @@ BUILD_DEFS+=	USE_INET6
 .include "../../mk/bsd.prefs.mk"
 
 GNU_CONFIGURE=	yes
-USE_BUILDLINK3=	yes
 
 CONFIGURE_ARGS=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=--enable-bind8-stats
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 7916cc84969..c3f2d2216fd 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/03/21 12:42:45 adam Exp $
+# $NetBSD: Makefile,v 1.36 2005/04/11 21:46:52 tv Exp $
 
 DISTNAME=	ntop-3.1
 PKGREVISION=	3
@@ -14,7 +14,6 @@ CONFLICTS=	ntop-[0-9]*
 
 WRKSRC=		${WRKDIR}/ntop
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/net/ntop1/Makefile b/net/ntop1/Makefile
index 05ab6c98a4d..bfa2235abad 100644
--- a/net/ntop1/Makefile
+++ b/net/ntop1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/01/09 07:13:31 kim Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:52 tv Exp $
 
 DISTNAME=		ntop-1.1
 PKGREVISION=		4
@@ -10,7 +10,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.ntop.org/
 COMMENT=		Shows network usage (similar to "top" for processes)
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-threads=no
 
diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index 495954818e8..c8eae6179c5 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/03/19 03:03:56 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2005/04/11 21:46:52 tv Exp $
 #
 
 DISTNAME=	ntp-4.2.0
@@ -17,7 +17,6 @@ CONFLICTS+=	openntpd-[0-9]*
 
 GNU_CONFIGURE=	YES
 USE_PERL5=	build
-USE_BUILDLINK3= YES
 USE_PKGINSTALL=	YES
 
 CONFIGURE_ENV+=	PATH_PERL="${PERL5}" ac_cv_header_sys_soundcard_h=no
diff --git a/net/oinkmaster/Makefile b/net/oinkmaster/Makefile
index 6f5a24ac019..66f396515dd 100644
--- a/net/oinkmaster/Makefile
+++ b/net/oinkmaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/29 13:53:31 adrianp Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:52 tv Exp $
 
 DISTNAME=	oinkmaster-1.1
 CATEGORIES=	net
@@ -11,7 +11,6 @@ COMMENT=	Manage snort rule updates
 DEPENDS+=	wget>=1.00:../../net/wget
 
 USE_PKGINSTALL=	yes
-USE_BUILDLINK3=	yes
 USE_PERL5=	yes
 NO_BUILD=	yes
 
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 7235dd0c6aa..efcf65fc97c 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/12/03 15:15:06 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2005/04/11 21:46:52 tv Exp $
 
 DISTNAME=	openh323-v1_15_2-src
 PKGNAME=	openh323-1.15.2
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.openh323.org/
 COMMENT=	Open H.323 library
 
 WRKSRC=			${WRKDIR}/openh323
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 33a7155323b..24ebc5a1c86 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/01/07 09:00:51 peter Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:53 tv Exp $
 
 DISTNAME=		openntpd-3.6.1p1
 CATEGORIES=		net
@@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 CONFLICTS+=		ntp-[0-9]*
 
-USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	sysconfdir=${PKG_SYSCONFDIR}
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index cda3d1d73c3..bed0f02878a 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/03/17 22:49:12 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:53 tv Exp $
 
 DISTNAME=	openslp-1.2.0
 PKGREVISION=	1
@@ -12,7 +12,6 @@ COMMENT=	Open-source implementation of the Service Location Protocol
 # Needs pkgviews-enabled automake
 # PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		yacc lex
 USE_PKGINSTALL=		yes
 USE_LIBTOOL=		yes
diff --git a/net/openvpn-current/Makefile b/net/openvpn-current/Makefile
index fb6b78c2b11..95a3dd44c6b 100644
--- a/net/openvpn-current/Makefile
+++ b/net/openvpn-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/12/31 15:15:31 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:53 tv Exp $
 #
 
 DISTNAME=	openvpn-2.0_rc1
@@ -10,7 +10,6 @@ MAINTAINER=	ianzag@mail.ru
 HOMEPAGE=	http://openvpn.sourceforge.net/
 COMMENT=	Easy-to-use SSL VPN daemon
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index f24dfa192bf..752a0c34885 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/02/21 23:26:24 bad Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:53 tv Exp $
 
 DISTNAME=	openvpn-1.6.0
 CATEGORIES=	net security
@@ -8,7 +8,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://openvpn.sourceforge.net/
 COMMENT=	Easy-to-use, robust, and highly configurable VPN over UDP
 
-USE_BUILDLINK3=		YES
 #USE_PKGINSTALL=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/net/p5-DNS-ZoneParse/Makefile b/net/p5-DNS-ZoneParse/Makefile
index eba4a72c256..aaae116607b 100644
--- a/net/p5-DNS-ZoneParse/Makefile
+++ b/net/p5-DNS-ZoneParse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:53 tv Exp $
 #
 
 DISTNAME=	DNS-ZoneParse-0.95
@@ -12,7 +12,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/DNS-ZoneParse/
 COMMENT=	Perl5 module for parsing DNS zone files
 
-USE_BUILDLINK3=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/DNS/ZoneParse/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Geo-IP/Makefile b/net/p5-Geo-IP/Makefile
index aa178bbdf58..ab8d52fe9cf 100644
--- a/net/p5-Geo-IP/Makefile
+++ b/net/p5-Geo-IP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:53 tv Exp $
 #
 
 DISTNAME=	Geo-IP-1.23
@@ -13,7 +13,6 @@ COMMENT=	Gets country name by IP or hostname
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Geo/IP/.packlist
 
diff --git a/net/p5-INET6/Makefile b/net/p5-INET6/Makefile
index 4948c5471bc..16986283c5f 100644
--- a/net/p5-INET6/Makefile
+++ b/net/p5-INET6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/29 11:44:09 adrianp Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:53 tv Exp $
 #
 
 DISTNAME=	INET6-2.01
@@ -10,7 +10,6 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/~mondejar/INET6/
 COMMENT=	Object interface for AF_INET|AF_INET6 domain sockets
 
-USE_BUILDLINK3=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/IO/Socket/INET6/.packlist
 
 .include "../../net/p5-Socket6/buildlink3.mk"
diff --git a/net/p5-IO-Interface/Makefile b/net/p5-IO-Interface/Makefile
index bc08688db3e..92e758fe980 100644
--- a/net/p5-IO-Interface/Makefile
+++ b/net/p5-IO-Interface/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:53 tv Exp $
 #
 
 DISTNAME=		IO-Interface-0.98
@@ -12,7 +12,6 @@ MAINTAINER=		he@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/~lds/IO-Interface-0.98/
 COMMENT=		IO-Interface - get and set interface characteristics
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IO/Interface/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-IO-Socket-Multicast/Makefile b/net/p5-IO-Socket-Multicast/Makefile
index 7eb692031a6..06ca3f68b91 100644
--- a/net/p5-IO-Socket-Multicast/Makefile
+++ b/net/p5-IO-Socket-Multicast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:53 tv Exp $
 #
 
 DISTNAME=		IO-Socket-Multicast-0.25
@@ -13,7 +13,6 @@ COMMENT=		IO::Socket::Multicast - perl multicast socket IO
 
 DEPENDS+=		p5-IO-Interface>=0.94:../../net/p5-IO-Interface
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IO/Socket/Multicast/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Net-Bind/Makefile b/net/p5-Net-Bind/Makefile
index b3ce9b23b0e..c22eaa87958 100644
--- a/net/p5-Net-Bind/Makefile
+++ b/net/p5-Net-Bind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:53 tv Exp $
 
 DISTNAME=	Net-Bind-0.05
 PKGNAME=	p5-${DISTNAME}
@@ -9,7 +9,6 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl5 module to grovel DNS resolver information
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/Bind/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Net-CIDR-Lite/Makefile b/net/p5-Net-CIDR-Lite/Makefile
index 94b914d91c7..b353da4d900 100644
--- a/net/p5-Net-CIDR-Lite/Makefile
+++ b/net/p5-Net-CIDR-Lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:53 tv Exp $
 #
 
 DISTNAME=		Net-CIDR-Lite-0.15
@@ -15,7 +15,6 @@ COMMENT=		Perl extension for merging IPv4/v6 CIDR addresses
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 PERL5_PACKLIST=         ${PERL5_SITEARCH}/auto/Net/CIDR/Lite/.packlist
-USE_BUILDLINK3=		yes
 USE_LANGUAGES=		# empty
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Net-DNS/Makefile b/net/p5-Net-DNS/Makefile
index 33684832d23..c30ddcc3a9a 100644
--- a/net/p5-Net-DNS/Makefile
+++ b/net/p5-Net-DNS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/03/22 14:15:28 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2005/04/11 21:46:53 tv Exp $
 #
 
 DISTNAME=		Net-DNS-0.48
@@ -19,7 +19,6 @@ DEPENDS+=		p5-Digest-MD5>=2.12:../../security/p5-Digest-MD5
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		YES
 PERL5_REQD+=		5.6.0
 MAKE_PARAMS=		--online-tests
 
diff --git a/net/p5-Net-DNSServer/Makefile b/net/p5-Net-DNSServer/Makefile
index 590b9618737..978279f28a7 100644
--- a/net/p5-Net-DNSServer/Makefile
+++ b/net/p5-Net-DNSServer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:53 tv Exp $
 #
 
 DISTNAME=	Net-DNSServer-0.11
@@ -14,7 +14,6 @@ DEPENDS+=	p5-IPC-SharedCache-[0-9]*:../../devel/p5-IPC-SharedCache
 DEPENDS+=	p5-Net-Bind-[0-9]*:../../net/p5-Net-Bind
 DEPENDS+=	p5-Net-Server-[0-9]*:../../net/p5-Net-Server
 
-USE_BUILDLINK3=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Net/DNSServer/.packlist
 
 .include "../../databases/p5-DBI/buildlink3.mk"
diff --git a/net/p5-Net-Daemon/Makefile b/net/p5-Net-Daemon/Makefile
index 046fc7c5967..40b4be11c88 100644
--- a/net/p5-Net-Daemon/Makefile
+++ b/net/p5-Net-Daemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:53 tv Exp $
 #
 
 DISTNAME=	Net-Daemon-0.36
@@ -14,7 +14,6 @@ COMMENT=	Perl5 module for writing networking daemons
 
 DEPENDS+= 	{p5-Data-Dumper-[0-9]*,perl>=5.6.1nb2}:${PERL5_PKGSRCDIR}
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/Daemon/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Net-Dev-MIBLoadOrder/Makefile b/net/p5-Net-Dev-MIBLoadOrder/Makefile
index 29b8bd62a2f..d1bae01bbff 100644
--- a/net/p5-Net-Dev-MIBLoadOrder/Makefile
+++ b/net/p5-Net-Dev-MIBLoadOrder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/03/31 21:19:08 seb Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:54 tv Exp $
 
 DISTNAME=	Net-Dev-MIBLoadOrder-1.1.0
 PKGNAME=	p5-${DISTNAME}
@@ -9,7 +9,6 @@ MAINTAINER=	seb@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Net-Dev-MIBLoadOrder/
 COMMENT=	Perl5 module to determine MIB files load order
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/Dev/Tools/MIB/MIBLoadOrder/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Net-Gnats/Makefile b/net/p5-Net-Gnats/Makefile
index b130eec6f36..b270c98bb4e 100644
--- a/net/p5-Net-Gnats/Makefile
+++ b/net/p5-Net-Gnats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:54 tv Exp $
 #
 
 DISTNAME=	Net-Gnats-0.04
@@ -11,7 +11,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gnatsperl.sourceforge.net/
 COMMENT=	Perl interface to the gnatsd daemon
 
-USE_BUILDLINK3=		yes
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/Gnats/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Net-Google/Makefile b/net/p5-Net-Google/Makefile
index 5ef34d1f417..948fa2f0c26 100644
--- a/net/p5-Net-Google/Makefile
+++ b/net/p5-Net-Google/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:54 tv Exp $
 
 DISTNAME=		Net-Google-0.61
 PKGNAME=		p5-${DISTNAME}
@@ -9,7 +9,6 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Net/}
 MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		Perl module for accessing Google search engine
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/Google/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Net-IP/Makefile b/net/p5-Net-IP/Makefile
index 5d0eb5891a7..fcc5564d670 100644
--- a/net/p5-Net-IP/Makefile
+++ b/net/p5-Net-IP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:54 tv Exp $
 #
 
 DISTNAME=	Net-IP-1.20
@@ -15,7 +15,6 @@ DEPENDS+=	p5-Math-BigInteger-[0-9]*:../../math/p5-Math-BigInteger
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 PERL5_REQD+=		5.8.0
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/IP/.packlist
 
diff --git a/net/p5-Net-IRC/Makefile b/net/p5-Net-IRC/Makefile
index d7a06e78c24..5737c00f17e 100644
--- a/net/p5-Net-IRC/Makefile
+++ b/net/p5-Net-IRC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:54 tv Exp $
 
 DISTNAME=		Net-IRC-0.75
 PKGNAME=		p5-${DISTNAME}
@@ -11,7 +11,6 @@ MAINTAINER=		damon@brodiefamily.org
 HOMEPAGE=		http://theoryx5.uwinnipeg.ca/CPAN/data/Net-IRC/
 COMMENT=		Perl Internet Relay Chat (IRC) module
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/IRC/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Net-Pcap/Makefile b/net/p5-Net-Pcap/Makefile
index 19e6a2142b3..c653ac60118 100644
--- a/net/p5-Net-Pcap/Makefile
+++ b/net/p5-Net-Pcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:55 tv Exp $
 #
 
 DISTNAME=	Net-Pcap-0.05
@@ -11,7 +11,6 @@ MAINTAINER=	adrianp@stindustries.net
 HOMEPAGE=	http://search.cpan.org/author/KCARNUT/Net-Pcap-0.04/Pcap.pm
 COMMENT=	Perl interface to pcap(3) LBL packet capture library
 
-USE_BUILDLINK3=	yes
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Net/Pcap/.packlist
 
 USE_BUILTIN.libpcap=	no # NetBSD's libpcap is very old.
diff --git a/net/p5-Net-SNMP/Makefile b/net/p5-Net-SNMP/Makefile
index d0c9aeba700..064565f2ec9 100644
--- a/net/p5-Net-SNMP/Makefile
+++ b/net/p5-Net-SNMP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/01/14 15:25:25 jschauma Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:56 tv Exp $
 #
 
 DISTNAME=	Net-SNMP-5.0.1
@@ -16,7 +16,6 @@ DEPENDS+=	p5-Digest-MD5>=2.11:../../security/p5-Digest-MD5
 DEPENDS+=	p5-Digest-SHA1>=1.02:../../security/p5-Digest-SHA1
 DEPENDS+=	p5-Digest-HMAC>=1.00:../../security/p5-Digest-HMAC
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/SNMP/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Net-Server/Makefile b/net/p5-Net-Server/Makefile
index 7a2e9ce7b70..8f797327a9b 100644
--- a/net/p5-Net-Server/Makefile
+++ b/net/p5-Net-Server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:56 tv Exp $
 #
 
 DISTNAME=	Net-Server-0.87
@@ -12,7 +12,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://seamons.com/net_server.html
 COMMENT=	Perl5 modules for network services engine
 
-USE_BUILDLINK3=	YES
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Net/Server/.packlist
 
diff --git a/net/p5-Net-TFTP/Makefile b/net/p5-Net-TFTP/Makefile
index 07acc14cf28..7394a6c236f 100644
--- a/net/p5-Net-TFTP/Makefile
+++ b/net/p5-Net-TFTP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/03/24 21:12:59 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:56 tv Exp $
 
 DISTNAME=	Net-TFTP-0.10
 PKGNAME=	p5-Net-TFTP-0.10
@@ -11,7 +11,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl5 module for TFTP transfers
 
 WRKSRC=			${WRKDIR}/Net-TFTP-0.10
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/TFTP/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Net-Telnet-Cisco/Makefile b/net/p5-Net-Telnet-Cisco/Makefile
index c9b8661505d..1a44cddeb2a 100644
--- a/net/p5-Net-Telnet-Cisco/Makefile
+++ b/net/p5-Net-Telnet-Cisco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:56 tv Exp $
 #
 
 DISTNAME=	Net-Telnet-Cisco-1.10
@@ -10,7 +10,6 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl5 module for communicating with Cisco routers via telnet
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/Telnet/Cisco/.packlist
 
 DEPENDS+=		p5-Net-Telnet>=3.0:../../net/p5-Net-Telnet
diff --git a/net/p5-Net-Telnet/Makefile b/net/p5-Net-Telnet/Makefile
index 85c03cedd27..2d6f37dfe75 100644
--- a/net/p5-Net-Telnet/Makefile
+++ b/net/p5-Net-Telnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/12/20 11:31:06 grant Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:56 tv Exp $
 #
 
 DISTNAME=	Net-Telnet-3.03
@@ -11,7 +11,6 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl5 module to use telnet
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/Telnet/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Net-XWhois/Makefile b/net/p5-Net-XWhois/Makefile
index a83936411f2..2bd9ea9f343 100644
--- a/net/p5-Net-XWhois/Makefile
+++ b/net/p5-Net-XWhois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/20 11:31:07 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:56 tv Exp $
 
 DISTNAME=	Net-XWhois-0.90
 PKGNAME=	p5-${DISTNAME}
@@ -10,7 +10,6 @@ MAINTAINER=	he@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Net-XWhois/
 COMMENT=	Perl5 module for Whois Client Interface
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/XWhois/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Net-Z3950/Makefile b/net/p5-Net-Z3950/Makefile
index b4e474bb8a4..11b9949123b 100644
--- a/net/p5-Net-Z3950/Makefile
+++ b/net/p5-Net-Z3950/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/20 11:31:07 grant Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:56 tv Exp $
 #
 
 DISTNAME=	Net-Z3950-0.32
@@ -15,7 +15,6 @@ COMMENT=	Perl interface to the Z39.50 information retrieval protocol
 DEPENDS+=	p5-MARC>=1.15:../../databases/p5-MARC
 DEPENDS+=	p5-Event>=0.77:../../devel/p5-Event
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/Z3950/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index 46c09889b3b..8dce71b6dde 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/03/24 21:12:59 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2005/04/11 21:46:53 tv Exp $
 
 DISTNAME=	libnet-1.19
 PKGNAME=	p5-Net-1.19
@@ -13,7 +13,6 @@ COMMENT=	Perl5 modules to access and use network protocols
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-NetAddr-IP/Makefile b/net/p5-NetAddr-IP/Makefile
index f83e6f272f1..23664b30260 100644
--- a/net/p5-NetAddr-IP/Makefile
+++ b/net/p5-NetAddr-IP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/20 11:31:07 grant Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:56 tv Exp $
 #
 
 DISTNAME=	NetAddr-IP-3.21
@@ -15,7 +15,6 @@ COMMENT=	Perl5 module for managing IP addresses
 BUILD_DEPENDS+=	p5-Test-Pod-[0-9]*:../../devel/p5-Test-Pod
 
 PERL5_REQD=		5.6.0
-USE_BUILDLINK3=		YES
 USE_LANGUAGES=		# empty
 
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/NetAddr/IP/.packlist
diff --git a/net/p5-NetPacket/Makefile b/net/p5-NetPacket/Makefile
index 9dc91ce24d3..b8927e58e61 100644
--- a/net/p5-NetPacket/Makefile
+++ b/net/p5-NetPacket/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/20 11:31:07 grant Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:56 tv Exp $
 
 DISTNAME=	NetPacket-0.04
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,6 @@ COMMENT=	Modules to assemble/disassemble network packets
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/NetPacket/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-RADIUS/Makefile b/net/p5-RADIUS/Makefile
index c2ae6723e9c..bde782cf808 100644
--- a/net/p5-RADIUS/Makefile
+++ b/net/p5-RADIUS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/20 11:31:07 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:56 tv Exp $
 #
 
 DISTNAME=	RADIUS-1.0
@@ -12,7 +12,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.netmonger.net/~chris/RADIUS/
 COMMENT=	Perl5 module for RADIUS queries
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/RADIUS/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-SNMP-MIB-Compiler/Makefile b/net/p5-SNMP-MIB-Compiler/Makefile
index af480338cd6..fdc4ffe9e8d 100644
--- a/net/p5-SNMP-MIB-Compiler/Makefile
+++ b/net/p5-SNMP-MIB-Compiler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/20 11:31:07 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:56 tv Exp $
 #
 
 DISTNAME=	SNMP-MIB-Compiler-0.06
@@ -11,7 +11,6 @@ MAINTAINER=	he@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/SNMP-MIB-Compiler/
 COMMENT=	MIB Compiler supporting SMIv1 and SMIv2
 
-USE_BUILDLINK3=		yes
 
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/SNMP/Mib/Compiler/.packlist
 
diff --git a/net/p5-SNMP_Session/Makefile b/net/p5-SNMP_Session/Makefile
index 8490420da7b..59ec390bdfc 100644
--- a/net/p5-SNMP_Session/Makefile
+++ b/net/p5-SNMP_Session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/02/09 09:04:02 seb Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:56 tv Exp $
 
 DISTNAME=	SNMP_Session-1.07
 PKGNAME=	p5-SNMP_Session-1.07
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.switch.ch/misc/leinen/snmp/perl/
 COMMENT=	Perl5 module providing rudimentary access to remote SNMP agents
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/SNMP_Session/.packlist
 
 CONFLICTS+=	mrtg-[0-9]*
diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile
index 9dc9ecdf61f..748f6234e57 100644
--- a/net/p5-SOAP-Lite/Makefile
+++ b/net/p5-SOAP-Lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/20 11:31:07 grant Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:57 tv Exp $
 #
 
 DISTNAME=	SOAP-Lite-0.60a
@@ -16,7 +16,6 @@ DEPENDS+=	p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
 DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
 DEPENDS+=	p5-XML-Parser>=2.23:../../textproc/p5-XML-Parser
 
-USE_BUILDLINK3=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/SOAP/Lite/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Socket6/Makefile b/net/p5-Socket6/Makefile
index 5f935bc8280..924539de895 100644
--- a/net/p5-Socket6/Makefile
+++ b/net/p5-Socket6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/12/20 11:31:07 grant Exp $
+# $NetBSD: Makefile,v 1.18 2005/04/11 21:46:57 tv Exp $
 #
 
 DISTNAME=		Socket6-0.17
@@ -14,7 +14,6 @@ COMMENT=		Perl5 module to support getaddrinfo() and getnameinfo()
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Socket6/.packlist
 
 # supports IPv6 (actually, af independent)
diff --git a/net/p5-Wais/Makefile b/net/p5-Wais/Makefile
index 115b7d11184..7380bfd0c46 100644
--- a/net/p5-Wais/Makefile
+++ b/net/p5-Wais/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/12/20 11:31:07 grant Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:57 tv Exp $
 #
 
 DISTNAME=	Wais-2.311
@@ -13,7 +13,6 @@ COMMENT=	Perl5 module for accessing WAIS servers
 
 DEPENDS+=	p5-Curses>=1.02:../../devel/p5-Curses
 
-USE_BUILDLINK3=	YES
 PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Wais/.packlist
 
 post-patch:
diff --git a/net/p5-ispman/Makefile b/net/p5-ispman/Makefile
index 5da567b10d5..0f75b7fa768 100644
--- a/net/p5-ispman/Makefile
+++ b/net/p5-ispman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/12/20 11:31:07 grant Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:57 tv Exp $
 #
 
 DISTNAME=		ispman-0.5
@@ -20,7 +20,6 @@ DEPENDS+=		p5-Convert-ASN1>=0.07:../../textproc/p5-Convert-ASN1
 DEPENDS+=		p5-IO-stringy>=1.213:../../devel/p5-IO-stringy
 
 WRKSRC=			${WRKDIR}/ispman/Modules/ISPMan
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/ISPMan/.packlist
 PLIST_SRC=		${WRKDIR}/PLIST
 PERL5_CONFIGURE_DIRS=	${WRKSRC} ${WRKSRC}/../IO-stringy-1.212_patched
diff --git a/net/packit/Makefile b/net/packit/Makefile
index 3cb956e31e1..bc14fc68fe3 100644
--- a/net/packit/Makefile
+++ b/net/packit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/20 22:46:37 adrianp Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:57 tv Exp $
 
 DISTNAME=	packit-1.0
 CATEGORIES=	net
@@ -10,7 +10,6 @@ HOMEPAGE=	http://packit.sourceforge.net/
 COMMENT=	Network auditing tool with the ability to manipulate IP traffic
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_BUILTIN.libpcap=    YES
 
 CONFIGURE_ARGS+=	--with-libpcap-includes=${BUILDLINK_PREFIX.libpcap}/include
diff --git a/net/partysip/Makefile b/net/partysip/Makefile
index e74340d5583..9a3ddb0d8ea 100644
--- a/net/partysip/Makefile
+++ b/net/partysip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/01 19:55:02 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:57 tv Exp $
 #
 
 DISTNAME=		partysip-2.2.1
@@ -9,7 +9,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.nongnu.org/partysip/partysip.html
 COMMENT=		SIP proxy server
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-config-dir=/etc
 USE_LIBTOOL=		yes
diff --git a/net/pchar/Makefile b/net/pchar/Makefile
index e8b68c62e40..198fa02d347 100644
--- a/net/pchar/Makefile
+++ b/net/pchar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/10/03 00:17:57 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/04/11 21:46:57 tv Exp $
 
 DISTNAME=		pchar-1.4
 PKGREVISION=		4
@@ -11,7 +11,6 @@ COMMENT=		Tool for measuring Internet path characteristics
 
 GNU_CONFIGURE=		yes
 
-USE_BUILDLINK3=		yes
 BUILD_DEFS+=		USE_INET6
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/php-ftp/Makefile b/net/php-ftp/Makefile
index 734d63006e3..41c6e15f575 100644
--- a/net/php-ftp/Makefile
+++ b/net/php-ftp/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:57 tv Exp $
 
 MODNAME=		ftp
 PKGREVISION=		# empty
 CATEGORIES+=		net
 COMMENT=		PHP extension for FTP access
 
-USE_BUILDLINK3=		YES
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}
 
diff --git a/net/php-snmp/Makefile b/net/php-snmp/Makefile
index 7dbdbf131f9..acadaa5470b 100644
--- a/net/php-snmp/Makefile
+++ b/net/php-snmp/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:57 tv Exp $
 
 MODNAME=		snmp
 CATEGORIES+=		net
 PKGREVISION=		# empty
 COMMENT=		PHP extension for SNMP
 
-USE_BUILDLINK3=		YES
 
 CONFIGURE_ARGS+=	--with-${MODNAME}=${PREFIX}
 
diff --git a/net/php-sockets/Makefile b/net/php-sockets/Makefile
index ce40a0108a1..c4151d8e550 100644
--- a/net/php-sockets/Makefile
+++ b/net/php-sockets/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:57 tv Exp $
 
 MODNAME=		sockets
 CATEGORIES+=		net
 PKGREVISION=		# empty
 COMMENT=		PHP extension for sockets support
 
-USE_BUILDLINK3=		YES
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared,${BUILDLINK_DIR}
 
diff --git a/net/php-yp/Makefile b/net/php-yp/Makefile
index ee34cc42531..4d6aed4baa6 100644
--- a/net/php-yp/Makefile
+++ b/net/php-yp/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:57 tv Exp $
 
 MODNAME=		yp
 CATEGORIES+=		net
 PKGREVISION=		# empty
 COMMENT=		PHP extension for YP domain support
 
-USE_BUILDLINK3=		YES
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared,${BUILDLINK_DIR}
 
diff --git a/net/pload/Makefile b/net/pload/Makefile
index 4278d3aa292..e914c16c50b 100644
--- a/net/pload/Makefile
+++ b/net/pload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/27 13:50:16 grant Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:57 tv Exp $
 #
 
 DISTNAME=	pload-0.9.4
@@ -13,7 +13,6 @@ COMMENT=	PPP monitor for X11, monitoring totals and current in/out rates
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 HAS_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 USE_X11BASE=	YES
 INSTALL_TARGET=	install install.man
 
diff --git a/net/polsms/Makefile b/net/polsms/Makefile
index 3ae426638ff..6de911d7154 100644
--- a/net/polsms/Makefile
+++ b/net/polsms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/12/26 22:13:33 zuntum Exp $
+# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:57 tv Exp $
 #
 
 DISTNAME=	sms-2.0.2
@@ -10,7 +10,6 @@ MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://www.ceti.pl/~miki/komputery/sms.html
 COMMENT=	Send SMS to cellular phones in Poland (Plus, Idea, Era)
 
-USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 
 do-install:
diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index cb5360ac67c..e4415f87b8b 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/01/12 12:28:04 cube Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:57 tv Exp $
 #
 
 DISTNAME=	pptpd-1.2.1
@@ -11,7 +11,6 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://www.poptop.org/
 COMMENT=	PPTP server with support for Microsoft VPN clients
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 USE_GNU_TOOLS+=	make
 USE_PKGINSTALL=	YES
diff --git a/net/pppd/Makefile b/net/pppd/Makefile
index fcd332aef3f..12f86cab342 100644
--- a/net/pppd/Makefile
+++ b/net/pppd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/02 02:51:40 cube Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:58 tv Exp $
 
 DISTNAME=		ppp-${PPPD_VERSION}
 PKGNAME=		${DISTNAME:S/ppp/&d/}
@@ -9,7 +9,6 @@ MAINTAINER=		cube@NetBSD.org
 HOMEPAGE=		http://ppp.samba.org/
 COMMENT=		PPP Daemon
 
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 HAS_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
diff --git a/net/puf/Makefile b/net/puf/Makefile
index 40d6b2b8662..9e98098d603 100644
--- a/net/puf/Makefile
+++ b/net/puf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/05/07 01:14:49 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:58 tv Exp $
 #
 
 DISTNAME=	puf-0.93.2a
@@ -11,6 +11,5 @@ HOMEPAGE=	http://puf.sourceforge.net/
 COMMENT=	Parallel URL fetcher
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index 453cd0128e4..2bc7d578d8a 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/12/28 02:47:47 reed Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:58 tv Exp $
 
 DISTNAME=	pure-ftpd-1.0.20
 PKGREVISION=	1
@@ -16,7 +16,6 @@ MAINTAINER=	dawszy@arhea.net
 HOMEPAGE=	http://www.pureftpd.org/
 COMMENT=	FTP daemon with optional SQL support
 
-USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/net/pxe/Makefile b/net/pxe/Makefile
index 9b556a45d3c..203cb3bc6cb 100644
--- a/net/pxe/Makefile
+++ b/net/pxe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/12/29 15:42:38 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:58 tv Exp $
 #
 
 DISTNAME=	pxe-1.4
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.kano.org.uk/projects/pxe/
 COMMENT=	Preboot eXecution Environment (PXE) daemon
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 USE_LANGUAGES=	c c++
 
diff --git a/net/py-GeoIP/Makefile b/net/py-GeoIP/Makefile
index 5b6eb53536e..20ec0fbd15e 100644
--- a/net/py-GeoIP/Makefile
+++ b/net/py-GeoIP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:17:57 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:58 tv Exp $
 #
 
 DISTNAME=	GeoIP-Python-1.2.0
@@ -11,7 +11,6 @@ MAINTAINER=	bartosz@atom.eu.org
 HOMEPAGE=	http://www.maxmind.com/app/python
 COMMENT=	GeoIP support for Python
 
-USE_BUILDLINK3=	yes
 PYDISTUTILSPKG=	yes
 PYBINMODULE=	yes
 
diff --git a/net/py-IP/Makefile b/net/py-IP/Makefile
index da681d75f02..1639c7e3ea3 100644
--- a/net/py-IP/Makefile
+++ b/net/py-IP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/07/22 09:16:03 recht Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:58 tv Exp $
 
 DISTNAME=	IPy-0.4
 PKGNAME=	${PYPKGPREFIX}-IP-0.4
@@ -10,7 +10,6 @@ HOMEPAGE=	http://c0re.jp:80/c0de/IPy/
 COMMENT=	Python module to handle IPv4 and IPv6 address
 
 PYDISTUTILSPKG=	# defined
-USE_BUILDLINK3=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile
index f6a008028d1..c7380167402 100644
--- a/net/py-ORBit/Makefile
+++ b/net/py-ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/01/23 20:41:48 recht Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:58 tv Exp $
 #
 
 DISTNAME=	pyorbit-2.0.1
@@ -12,7 +12,6 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Python bindings for ORBit2
 
 PY_PATCHPLIST=	YES
-USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
 PKGCONFIG_OVERRIDE+=	pyorbit-2.pc.in
diff --git a/net/py-adns/Makefile b/net/py-adns/Makefile
index 79e8a7f4aa8..9bc21b39d52 100644
--- a/net/py-adns/Makefile
+++ b/net/py-adns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:17:57 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:58 tv Exp $
 #
 
 DISTNAME=       adns-python-1.0.0
@@ -12,7 +12,6 @@ HOMEPAGE=       http://dustman.net/andy/python/adns-python/
 COMMENT=        Python interface to the GNU asynchronous DNS resolver library
 
 PYDISTUTILSPKG=
-USE_BUILDLINK3= yes
 
 .include "../../net/adns/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/net/py-dns/Makefile b/net/py-dns/Makefile
index 2995aeba2eb..3ffb52e342c 100644
--- a/net/py-dns/Makefile
+++ b/net/py-dns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/09 16:50:03 gson Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:58 tv Exp $
 
 DISTNAME=	dnspython-1.3.3
 PKGNAME=	${PYPKGPREFIX}-dns-1.3.3
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.dnspython.org/
 COMMENT=	Python DNS toolkit
 
 PYDISTUTILSPKG=	yes
-USE_BUILDLINK3=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-google/Makefile b/net/py-google/Makefile
index a1ce74ec853..c85353e0263 100644
--- a/net/py-google/Makefile
+++ b/net/py-google/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/01/23 20:41:48 recht Exp $
+# $NetBSD: Makefile,v 1.22 2005/04/11 21:46:58 tv Exp $
 #
 
 DISTNAME=	pygoogle-0.6
@@ -12,7 +12,6 @@ HOMEPAGE=	http://pygoogle.sourceforge.net/
 COMMENT=	Call the Google web API from Python
 
 PYDISTUTILSPKG=	yes
-USE_BUILDLINK3=	yes
 
 PYTHON_VERSIONS_ACCEPTED=       23 22 21
 
diff --git a/net/py-kenosis/Makefile b/net/py-kenosis/Makefile
index 52aaeda4a21..1a31ed7bc12 100644
--- a/net/py-kenosis/Makefile
+++ b/net/py-kenosis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/02/04 17:24:16 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:58 tv Exp $
 #
 
 DISTNAME=		kenosis-0.941
@@ -10,7 +10,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://kenosis.sourceforge.net/
 COMMENT=		P2P RPC system
 
-USE_BUILDLINK3=		yes
 PYTHON_VERSIONS_ACCEPTED= 23 24 22 21
 PYDISTUTILSPKG=		yes
 PYSETUP=		kenosis_setup.py
diff --git a/net/py-mimelib/Makefile b/net/py-mimelib/Makefile
index 0adc307e802..d7bbd0b3136 100644
--- a/net/py-mimelib/Makefile
+++ b/net/py-mimelib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/01/23 20:41:48 recht Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:58 tv Exp $
 #
 
 DISTNAME=	email-2.5
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://mimelib.sourceforge.net/
 COMMENT=	Email package for Python
 
-USE_BUILDLINK3=	yes
 PYDISTUTILSPKG=	yes
 # This pkg (or an older version of it) comes with 2.2 and later;
 # 2.1 is the primary target (particulary for Zope).
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index 6f190a64b89..a820eebb40d 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/01/23 20:41:48 recht Exp $
+# $NetBSD: Makefile,v 1.19 2005/04/11 21:46:58 tv Exp $
 #
 
 DISTNAME=	SOAPpy-0.11.4
@@ -11,7 +11,6 @@ MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://pywebsvcs.sourceforge.net/
 COMMENT=	SOAP implementation
 
-USE_BUILDLINK3=	YES
 PYDISTUTILSPKG=	YES
 PY_PATCHPLIST=	YES
 
diff --git a/net/py-spreadmodule/Makefile b/net/py-spreadmodule/Makefile
index e405822b394..69b30a31b3d 100644
--- a/net/py-spreadmodule/Makefile
+++ b/net/py-spreadmodule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/01/23 20:41:48 recht Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:58 tv Exp $
 #
 
 DISTNAME=	SpreadModule-1.4
@@ -13,7 +13,6 @@ HOMEPAGE=	http://www.python.org/other/spread/
 COMMENT=	Python bindings for the Spread messaging service
 
 PYDISTUTILSPKG=	YES
-USE_BUILDLINK3=	YES
 
 PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
 
diff --git a/net/py-twisted/Makefile b/net/py-twisted/Makefile
index dd76826901d..a2b93eef8b1 100644
--- a/net/py-twisted/Makefile
+++ b/net/py-twisted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/01/23 20:41:48 recht Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:59 tv Exp $
 #
 
 DISTNAME=		${TWISTED_DISTNAME}
@@ -10,7 +10,6 @@ MAINTAINER=		dotz@irc.pl
 HOMEPAGE=		http://www.twistedmatrix.com/
 COMMENT=		Framework for writing networked applications
 
-USE_BUILDLINK3=		yes
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
 PLIST_SUBST+=		PYVERSSUFFIX="-${PYVERSSUFFIX}"
diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index 1f9d780faff..8da4eadfe64 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:17:57 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:59 tv Exp $
 #
 
 DISTNAME=	ZSI-1.5.0
@@ -11,7 +11,6 @@ MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://pywebsvcs.sourceforge.net/
 COMMENT=	SOAP implementation
 
-USE_BUILDLINK3=	yes
 PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index d5d4c44aa88..e9326f861d7 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/01/23 20:41:48 recht Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:59 tv Exp $
 #
 
 DISTNAME=	pygopherd_2.0.9
@@ -11,7 +11,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gopher.quux.org:70/devel/gopher/pygopherd/
 COMMENT=	Gopher server
 
-USE_BUILDLINK3=	yes
 USE_PKGINSTALL=	yes
 PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 0e5e9e51229..3f47992e278 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/03/09 21:00:08 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2005/04/11 21:46:59 tv Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
@@ -12,7 +12,6 @@ COMMENT=	Free multithreaded routing daemon software (fork of zebra)
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index b4bc620eed7..70c3143444b 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/12/28 02:47:47 reed Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:59 tv Exp $
 
 DISTNAME=	radiusd-cistron-1.6.7
 PKGREVISION=	1
@@ -12,7 +12,6 @@ COMMENT=	RADIUS-compliant remote authentication and accounting server
 
 CONFLICTS+=	freeradius-[0-9]*
 
-USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 
 MAKEFILE=	Makefile.BSD
diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index dc3d3ff5824..0d02ada4e50 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/03/23 15:24:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.22 2005/04/11 21:46:59 tv Exp $
 #
 
 DISTNAME=		rdesktop-1.4.0
@@ -9,7 +9,6 @@ MAINTAINER=		grant@NetBSD.org
 HOMEPAGE=		http://www.rdesktop.org/
 COMMENT=		Open-source Remote Desktop Protocol client
 
-USE_BUILDLINK3=		YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-x=${X11BASE}
diff --git a/net/ruby-drb/Makefile b/net/ruby-drb/Makefile
index 5c77233d28e..4f8fbda5464 100644
--- a/net/ruby-drb/Makefile
+++ b/net/ruby-drb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/24 21:12:59 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:59 tv Exp $
 
 DISTNAME=	drb-2.0.4
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www2a.biglobe.ne.jp/~seki/ruby/
 COMMENT=	Distributed Ruby
 
 RUBY_VERSION=		${RUBY16_VERSION}
-USE_BUILDLINK3=		yes
 USE_RUBY_INSTALL=	yes
 REPLACE_RUBY_DIRS=	${WRKSRC}/sample
 DOCS=			acl-ref.rd acl-ref.rd.ja acl.rd acl.rd.ja \
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 76cb24c8752..40122a561ac 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2005/01/09 06:33:28 christos Exp $
+# $NetBSD: Makefile,v 1.139 2005/04/11 21:46:59 tv Exp $
 
 DISTNAME=		samba-3.0.10
 PKGREVISION=		2
@@ -21,7 +21,6 @@ CONFLICTS+=		ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]*
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PERL="${PERL5}"
 
diff --git a/net/samba2/Makefile b/net/samba2/Makefile
index a2da6aa98ae..9f0cf254dc7 100644
--- a/net/samba2/Makefile
+++ b/net/samba2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/02/07 11:35:45 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:59 tv Exp $
 
 .include "Makefile.common"
 PKGREVISION=		# empty1
@@ -8,7 +8,6 @@ HOMEPAGE=		http://www.samba.org/
 PKGREVISION=		1
 COMMENT=		SMB/CIFS protocol server suite for UNIX
 
-USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
diff --git a/net/scdp/Makefile b/net/scdp/Makefile
index 8962eea92b6..111fa430a55 100644
--- a/net/scdp/Makefile
+++ b/net/scdp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/02/05 16:11:47 adrianp Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:59 tv Exp $
 #
 
 DISTNAME=	scdp-1.0b
@@ -11,7 +11,6 @@ MAINTAINER=	arved@arved.at
 HOMEPAGE=       http://www.sourceforge.net/projects/scdp/
 COMMENT=	Program to send Cisco Discovery Protocol packets
 
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 
 BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
diff --git a/net/scli/Makefile b/net/scli/Makefile
index f6e7e3faa94..07058d99d37 100644
--- a/net/scli/Makefile
+++ b/net/scli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:17:58 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:59 tv Exp $
 #
 
 DISTNAME=		scli-0.2.12
@@ -10,7 +10,6 @@ MAINTAINER=		seb@NetBSD.org
 HOMEPAGE=		http://www.ibr.cs.tu-bs.de/projects/scli/
 COMMENT=		SNMP command line interface
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 AUTOMAKE_POST_PATTERNS+=	*.info *.info-*
 
diff --git a/net/sdig/Makefile b/net/sdig/Makefile
index 0c3887482b5..c243ebe6b15 100644
--- a/net/sdig/Makefile
+++ b/net/sdig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:17:58 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:59 tv Exp $
 
 DISTNAME=	sdig-0.30
 PKGREVISION=	1
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.exploits.org/sdig/
 COMMENT=	Switch Digger finds port assignment for hosts on a switched Ethernet
 
-USE_BUILDLINK3=	yes
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/net/sendfile/Makefile b/net/sendfile/Makefile
index 3f16829514c..56016e71a23 100644
--- a/net/sendfile/Makefile
+++ b/net/sendfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/04/25 07:46:50 snj Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:59 tv Exp $
 #
 
 DISTNAME=	sendfile-20010216
@@ -12,7 +12,6 @@ HOMEPAGE=	http://www.belwue.de/aktivitaeten/projekte/saft/
 COMMENT=	Implementation of the Simple asynchronous file transfer protocol
 
 WRKSRC=		${WRKDIR}/sendfile-2.1a
-USE_BUILDLINK3=	yes
 USE_PKGINSTALL=	yes
 
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
diff --git a/net/slurm/Makefile b/net/slurm/Makefile
index c7e146a3636..edb911089d2 100644
--- a/net/slurm/Makefile
+++ b/net/slurm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/14 16:27:17 ben Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:59 tv Exp $
 #
 
 DISTNAME=	slurm-0.3.3
@@ -9,7 +9,6 @@ MAINTAINER=	mail@eckigesauge.de
 HOMEPAGE=	http://www.raisdorf.net/projects/slurm/
 COMMENT=	Realtime traffic statistics
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 do-install:
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index e36a6f2a826..f10cd056bc8 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/12/03 15:15:06 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/04/11 21:46:59 tv Exp $
 #
 
 DISTNAME=		sniffit.0.3.5
@@ -14,7 +14,6 @@ COMMENT=		Packet sniffer program
 NOT_FOR_PLATFORM=	*-*-alpha	# severe LP64 loss
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 BUILD_TARGET=
 
 do-install:
diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common
index e52c2e1a2d8..4fe113da173 100644
--- a/net/snort/Makefile.common
+++ b/net/snort/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2005/03/25 18:28:28 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/04/11 21:46:59 tv Exp $
 #
 
 DISTNAME=		snort-2.3.2
@@ -10,7 +10,6 @@ MASTER_SITES=		http://www.snort.org/dl/current/ \
 MAINTAINER=		adrianp@NetBSD.org
 HOMEPAGE=		http://www.snort.org/
 
-USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 
diff --git a/net/socat/Makefile b/net/socat/Makefile
index 79af97c0f98..d71ef4fd8b3 100644
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/26 11:40:29 adrianp Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:59 tv Exp $
 
 DISTNAME=	socat-1.4.2.0
 CATEGORIES=	net
@@ -10,7 +10,6 @@ COMMENT=	"netcat++" (extended design, new implementation)
 
 WRKSRC=			${WRKDIR}/socat-1.4
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_GNU_READLINE=	YES
 
 CONFIGURE_ARGS+=	--disable-libwrap
diff --git a/net/socket++/Makefile b/net/socket++/Makefile
index f2b90bb404c..009ef31a09f 100644
--- a/net/socket++/Makefile
+++ b/net/socket++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/03/27 17:45:38 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:00 tv Exp $
 #
 
 DISTNAME=		socket++-1.12.10
@@ -9,7 +9,6 @@ MAINTAINER=		mchittur@cs.nmsu.edu
 HOMEPAGE=		http://www.linuxhacker.at/socketxx/
 COMMENT=		C++ class library for UNIX Sockets with exception handling
 
-USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 AUTOMAKE_REQD=          1.4
 AUTOCONF_REQD=          2.50
diff --git a/net/socks4/Makefile b/net/socks4/Makefile
index ddb955fc5f3..04aa750c182 100644
--- a/net/socks4/Makefile
+++ b/net/socks4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/09/08 15:03:15 sketch Exp $
+# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:00 tv Exp $
 #
 
 DISTNAME=	export.socks.cstc.4.2.2
@@ -17,7 +17,6 @@ LICENSE=	no-commercial-use
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/socks.cstc.4.2
-USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 MAKE_ENV+=		OPTIMIZE="${CFLAGS}"
 
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 0b12ebc7e22..234531f7da1 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/03/24 21:12:59 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/04/11 21:47:00 tv Exp $
 
 DISTNAME=	socks5-v1_0r2
 PKGNAME=	socks5-1.0.2
@@ -28,7 +28,6 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/socks5-v1.0r2
-USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-libconffile=${PREFIX}/etc/libsocks5.conf \
diff --git a/net/soup/Makefile b/net/soup/Makefile
index 16143dbcccd..29fa167499f 100644
--- a/net/soup/Makefile
+++ b/net/soup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/11/30 18:26:40 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2005/04/11 21:47:00 tv Exp $
 
 DISTNAME=	soup-0.7.11
 PKGREVISION=	3
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Callback-based mechanism for sending and servicing SOAP requests
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	soup.pc.in
 
diff --git a/net/spegla/Makefile b/net/spegla/Makefile
index 20a1fc9230d..c3221430b19 100644
--- a/net/spegla/Makefile
+++ b/net/spegla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/09 16:01:58 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:00 tv Exp $
 
 DISTNAME=		spegla-1.1p4
 CATEGORIES=		net
@@ -9,7 +9,6 @@ COMMENT=		Mirror program for FTP sites (written in C)
 
 MANCOMPRESSED_IF_MANZ=	yes
 PLIST_SRC=		${WRKDIR}/PLIST
-USE_BUILDLINK3=		yes
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/spread/Makefile b/net/spread/Makefile
index aa3937c2e2f..23aee41d1b8 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/12/28 02:47:48 reed Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:00 tv Exp $
 #
 
 DISTNAME=	spread-src-3.17.3
@@ -13,7 +13,6 @@ COMMENT=	Group communication system providing a number of messaging services
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_PERL5=	build
-USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/spread
diff --git a/net/tcl-scotty/Makefile b/net/tcl-scotty/Makefile
index d2d3fdf2f48..7f2334389e9 100644
--- a/net/tcl-scotty/Makefile
+++ b/net/tcl-scotty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/12/18 19:24:26 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:00 tv Exp $
 #
 
 DISTNAME=	scotty-${DIST_VERS}
@@ -18,7 +18,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 DIST_VERS=	2.1.11
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS+=--with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib	\
 		--enable-multicast				\
diff --git a/net/tcpdstat/Makefile b/net/tcpdstat/Makefile
index f7a384a2ec6..1bdba4f9b04 100644
--- a/net/tcpdstat/Makefile
+++ b/net/tcpdstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/07/10 09:08:44 grant Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:00 tv Exp $
 
 DISTNAME=	tcpd-tools-0.8
 PKGNAME=	tcpdstat-0.8
@@ -10,6 +10,5 @@ COMMENT=	Analyze tcpdump output
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tcpdstat
 MAKE_ENV=	BINDIR=${PREFIX}/bin
-USE_BUILDLINK3=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index 3bef10527a8..9c521a8dcd2 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/01/25 18:55:43 reed Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:00 tv Exp $
 
 DISTNAME=		tcpdump-3.8.3
 CATEGORIES=		net
@@ -9,7 +9,6 @@ HOMEPAGE=		http://www.tcpdump.org/
 COMMENT=		Network monitoring tool
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 
 .if exists(/usr/include/netinet/ip6.h)
 CONFIGURE_ARGS+=	--enable-ipv6
diff --git a/net/tcpflow/Makefile b/net/tcpflow/Makefile
index 96cfe50e016..63ebcc221ef 100644
--- a/net/tcpflow/Makefile
+++ b/net/tcpflow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/29 11:51:39 adrianp Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:00 tv Exp $
 #
 
 DISTNAME=	tcpflow-0.21
@@ -9,7 +9,6 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE= 	http://www.circlemud.org/~jelson/software/tcpflow/
 COMMENT=	Captures data transmitted as part of TCP connections
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 .include "../../net/libpcap/buildlink3.mk"
diff --git a/net/tcpick/Makefile b/net/tcpick/Makefile
index 2aa261e8e86..9c474f8106a 100644
--- a/net/tcpick/Makefile
+++ b/net/tcpick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/23 17:53:33 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:00 tv Exp $
 
 DISTNAME= 	tcpick-0.1.19
 CATEGORIES=	net
@@ -8,7 +8,6 @@ MAINTAINER=	josediazfer@yahoo.es
 HOMEPAGE=	http://tcpick.sourceforge.net/
 COMMENT=	Simple tcp sniffer with tcpdump-style rules
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 .include "../../net/libpcap/buildlink3.mk"
diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile
index a35b16ea7e7..22104bb84e5 100644
--- a/net/tcpreplay/Makefile
+++ b/net/tcpreplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/03/26 12:07:56 adrianp Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:00 tv Exp $
 
 DISTNAME=	tcpreplay-2.3.3
 CATEGORIES=	net
@@ -10,7 +10,6 @@ COMMENT=	Replay saved tcpdump or snoop files
 
 BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.6
 
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--with-libnet=${BUILDLINK_PREFIX.libnet}
diff --git a/net/tcpslice/Makefile b/net/tcpslice/Makefile
index 114034929c2..c6e94ad6a7b 100644
--- a/net/tcpslice/Makefile
+++ b/net/tcpslice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/04/25 07:39:25 snj Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:00 tv Exp $
 
 DISTNAME=	tcpslice-1.2a1
 PKGNAME=	tcpslice-1.2.0.1
@@ -8,7 +8,6 @@ MASTER_SITES=	ftp://ftp.ee.lbl.gov/
 MAINTAINER=	seb@pbox.org
 COMMENT=	Tool for extracting portions of tcpdump's packet trace files
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 INSTALL_TARGET=	install install-man
 
diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index 6e440b37ac8..a0b1f6a67cb 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/12/03 15:15:06 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/04/11 21:47:00 tv Exp $
 #
 
 DISTNAME=	tcptrace-6.6.1
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.tcptrace.org/
 COMMENT=	TCP dump file analysis tool
 
 GNU_CONFIGURE=	yes
-USE_BUILDLINK3=	yes
 
 BUILD_TARGET=	tcptrace
 
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile
index 728a3ed1d11..8410837e8ee 100644
--- a/net/tcptraceroute/Makefile
+++ b/net/tcptraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/02/05 16:11:47 adrianp Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:00 tv Exp $
 #
 
 DISTNAME=		tcptraceroute-1.4
@@ -10,7 +10,6 @@ MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://michael.toren.net/code/tcptraceroute/
 COMMENT=		Traceroute implementation using TCP packets
 
-USE_BUILDLINK3=		YES
 
 BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
 
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 6df5848cd35..2300725ec05 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/12/03 15:15:06 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:00 tv Exp $
 #
 
 DISTNAME=		tightvnc-1.2.9
@@ -15,7 +15,6 @@ CONFLICTS=		vnc-[0-9]*
 
 WRKSRC=			${WRKDIR}/vnc_unixsrc
 CRYPTO=			yes
-USE_BUILDLINK3=		yes
 USE_IMAKE=		yes
 NO_INSTALL_MANPAGES=	yes
 USE_PERL5=		yes
diff --git a/net/tightvncviewer/Makefile b/net/tightvncviewer/Makefile
index ee0e59c6835..bba0f1fbe62 100644
--- a/net/tightvncviewer/Makefile
+++ b/net/tightvncviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/03/24 21:12:59 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/04/11 21:47:00 tv Exp $
 
 DISTNAME=		tightvnc-1.2.9
 PKGNAME=		${DISTNAME:S/tightvnc/tightvncviewer/}
@@ -15,7 +15,6 @@ CONFLICTS=		vncviewer-[0-9]*
 
 WRKSRC=			${WRKDIR}/vnc_unixsrc
 CRYPTO=			yes
-USE_BUILDLINK3=		yes
 USE_IMAKE=		yes
 
 CONFIGURE_DIRS=		${WRKSRC}/libvncauth
diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index a83665d392a..cbab497c42f 100644
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:18:00 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:00 tv Exp $
 #
 
 DISTNAME=	tinc-1.0.1
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://tinc.nl.linux.org/
 COMMENT=	Virtual Private Network (VPN) daemon
 
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 
 INFO_FILES=	tinc.info
diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index bd252f9ae21..dc5cd21b330 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/03/24 21:12:59 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:00 tv Exp $
 
 DISTNAME=	tf-40s1
 PKGNAME=	tf-4.0s1
@@ -11,7 +11,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://tf.tcp.com/~hawkeye/tf/
 COMMENT=	Popular programmable MUD client, with macro support and more
 
-USE_BUILDLINK3=	YES
 
 MAKEFILE=	${WRKSRC}/unix/Makefile
 MAKE_ENV=	TFVER="${DISTNAME:S/^tf-//}"
diff --git a/net/tkined/Makefile b/net/tkined/Makefile
index 3e8e1134120..4bb8210ff4e 100644
--- a/net/tkined/Makefile
+++ b/net/tkined/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:18:00 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:01 tv Exp $
 #
 
 DISTNAME=	scotty-2.1.11
@@ -14,7 +14,6 @@ COMMENT=	Graphical network discovery and monitoring tool based on scotty
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS+=--with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib	\
 		--with-tk-config=${BUILDLINK_PREFIX.tk}/lib	\
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index acc75838a20..92cd65ab5f3 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:18:00 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:01 tv Exp $
 #
 
 DISTNAME=	tn5250-0.12.51
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.linux-sna.org/software/5250/
 COMMENT=	Implementation of the IBM 5250 telnet protocol
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 863b29d67c7..38a8c645b7e 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/29 22:08:52 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:01 tv Exp $
 #
 
 DISTNAME=		tor-0.0.9.6
@@ -13,7 +13,6 @@ DEPENDS+=		tsocks>=1.7:../../net/tsocks
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/net/torrentutils/Makefile b/net/torrentutils/Makefile
index e28d5aa609b..c1d2e9292df 100644
--- a/net/torrentutils/Makefile
+++ b/net/torrentutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/18 14:42:47 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:01 tv Exp $
 #
 
 DISTNAME=		torrentutils-0.3.0
@@ -14,7 +14,6 @@ DEPENDS+=		bash-[0-9]*:../../shells/bash
 DEPENDS+=		p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
 DEPENDS+=		p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS=		make
 USE_PERL5=		yes
 
diff --git a/net/totd/Makefile b/net/totd/Makefile
index 59b84ef42b0..5997c2064fe 100644
--- a/net/totd/Makefile
+++ b/net/totd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/07/25 00:10:38 grant Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:01 tv Exp $
 #
 
 DISTNAME=	totd-1.4
@@ -9,7 +9,6 @@ MAINTAINER=	feico@pasta.cs.uit.no
 HOMEPAGE=	http://www.vermicelli.pasta.cs.uit.no/ipv6/software.html
 COMMENT=	DNS proxy that supports IPv6 <==> IPv4 record translation
 
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
 
diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index 9183eb62c19..19879aac949 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/12/03 15:15:06 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/04/11 21:47:01 tv Exp $
 
 DISTNAME=	trafshow-4.0
 PKGREVISION=	1
@@ -12,7 +12,6 @@ COMMENT=	Full screen visualization of the network traffic
 
 BUILD_TARGET=	trafshow
 GNU_CONFIGURE=	yes
-USE_BUILDLINK3=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/trickle/Makefile b/net/trickle/Makefile
index 874accea223..792ec1bfd27 100644
--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/28 02:47:48 reed Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:01 tv Exp $
 #
 
 DISTNAME=	trickle-1.06
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://monkey.org/~marius/trickle/
 COMMENT=	Portable lightweight userspace bandwidth shaper
 
-USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_PKGINSTALL=		yes
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index ad48e8dcdb8..402f7b70fee 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/10/03 00:18:00 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/04/11 21:47:01 tv Exp $
 #
 
 DISTNAME=		tsclient-0.132
@@ -14,7 +14,6 @@ DEPENDS+=       	rdesktop-[0-9]*:../../net/rdesktop
 DEPENDS+=       	vncviewer-[0-9]*:../../net/vncviewer
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK3=		yes
 USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile
index 76139e45ce7..f9906f173ae 100644
--- a/net/tsocks/Makefile
+++ b/net/tsocks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/04/25 08:00:46 snj Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:01 tv Exp $
 #
 
 DISTNAME=	tsocks-1.7
@@ -10,7 +10,6 @@ HOMEPAGE=	http://tsocks.sourceforge.net/
 COMMENT=	Transparent SOCKS proxying library
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 
 CONFIGURE_ARGS+=	--with-conf=${PKG_SYSCONFDIR}/tsocks.conf
diff --git a/net/ttt/Makefile b/net/ttt/Makefile
index 3bb054b9807..707fe9e43da 100644
--- a/net/ttt/Makefile
+++ b/net/ttt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/04/25 07:44:15 snj Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:01 tv Exp $
 #
 
 DISTNAME=	ttt-1.8
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.csl.sony.co.jp/person/kjc/software.html
 COMMENT=	Tele Traffic Tapper
 
 USE_X11=	yes
-USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install install-man
diff --git a/net/ucarp/Makefile b/net/ucarp/Makefile
index f42a82b614e..b6a754b2878 100644
--- a/net/ucarp/Makefile
+++ b/net/ucarp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:18:01 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:01 tv Exp $
 #
 
 DISTNAME=		ucarp-1.0
@@ -11,7 +11,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.ucarp.org/
 COMMENT=		Common Address Redundancy Protocol (CARP) for Unix
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 
 USE_BUILTIN.libpcap=	no
diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile
index 0e8c9891d41..9ee04e8c094 100644
--- a/net/ucspi-tcp/Makefile
+++ b/net/ucspi-tcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/09 22:44:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.27 2005/04/11 21:47:01 tv Exp $
 
 DISTNAME=		ucspi-tcp-0.88
 PKGREVISION=		1
@@ -17,7 +17,6 @@ DJB_RESTRICTED=		YES
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		yes
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=		3.0
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 31cbe4eb29d..edbb72ec9d0 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/02/04 22:58:09 adrianp Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:01 tv Exp $
 
 DISTNAME=	src
 PKGNAME=	unison-2.9.20
@@ -17,7 +17,6 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 
 # docs: unison-manual.pdf/html/ps/dvi
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 MAKE_FLAGS+=	CFLAGS="" UISTYLE=text
 MAKE_ENV+=	HOME=${WRKDIR}
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 798e52a8d09..9c91e24d459 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/02/04 22:54:52 adrianp Exp $
+# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:01 tv Exp $
 
 DISTNAME=	src
 PKGNAME=	unison-2.9.1
@@ -17,7 +17,6 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 
 # docs: unison-manual.pdf/html/ps/dvi
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 MAKE_FLAGS+=	CFLAGS="" UISTYLE=text
 MAKE_ENV+=	HOME=${WRKDIR}
diff --git a/net/upclient/Makefile b/net/upclient/Makefile
index d47c938c160..41b78c57fcb 100644
--- a/net/upclient/Makefile
+++ b/net/upclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/03/07 09:41:45 uebayasi Exp $
+# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:01 tv Exp $
 #
 
 DISTNAME=	upclient-4.2.1.23
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://uptimes.hostingwired.com/
 COMMENT=	Keeps track of your server uptime, and compares it to other hosts
 
-USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 
 BUILD_TARGET=	bsd
diff --git a/net/userppp/Makefile b/net/userppp/Makefile
index 94ccaa7017a..ca6eb923663 100644
--- a/net/userppp/Makefile
+++ b/net/userppp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/01/31 15:49:48 tron Exp $
+# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:01 tv Exp $
 
 DISTNAME=		ppp-001107.src
 PKGNAME=		userppp-001107
@@ -12,7 +12,6 @@ COMMENT=		User-PPP package as found in FreeBSD and OpenBSD
 
 ONLY_FOR_PLATFORM=	NetBSD-*-*
 
-USE_BUILDLINK3=		YES
 WRKSRC=			${WRKDIR}/${DISTNAME:S/.src//}
 MANCOMPRESSED_IF_MANZ=	YES
 
diff --git a/net/vcheck/Makefile b/net/vcheck/Makefile
index 199dc4d3051..e75af3e4a34 100644
--- a/net/vcheck/Makefile
+++ b/net/vcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/04/25 07:41:13 snj Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:01 tv Exp $
 #
 
 DISTNAME=		vcheck-1.2.1
@@ -12,7 +12,6 @@ COMMENT=		Latest program version checker and auto-downloader
 
 DEPENDS+=		p5-libwww>=5.69nb1:../../www/p5-libwww
 
-USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/vcheck/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/vino/Makefile b/net/vino/Makefile
index f5449daf00b..73e62bbaecd 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/03/22 16:36:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:02 tv Exp $
 #
 
 DISTNAME=	vino-2.10.0
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	VNC server for GNOME
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile
index f69fdd55127..e106a674050 100644
--- a/net/vpnc/Makefile
+++ b/net/vpnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/03 15:15:07 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:02 tv Exp $
 #
 
 DISTNAME=		vpnc-0.3.2
@@ -9,7 +9,6 @@ MAINTAINER=		hubertf@NetBSD.org
 HOMEPAGE=		http://www.unix-ag.uni-kl.de/~massar/vpnc/
 COMMENT=		Client for Cisco3000 VPN Concentrator
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 BUILD_TARGET=		vpnc
 
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 6bfe78b30b9..e4d2eb44690 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/03/07 09:41:45 uebayasi Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:02 tv Exp $
 #
 
 DISTNAME=	vsftpd-1.2.2
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://vsftpd.beasts.org/
 COMMENT=	FTP server that aims to be very secure
 
-USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 
 PKG_SYSCONFSUBDIR=	vsftpd
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 863eb1e241b..acab3d10113 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/02/22 02:13:29 cjs Exp $
+# $NetBSD: Makefile,v 1.34 2005/04/11 21:47:02 tv Exp $
 
 DISTNAME=	vtun-2.6
 PKGREVISION=	6
@@ -14,7 +14,6 @@ HOMEPAGE=	http://vtun.sourceforge.net/
 COMMENT=	Virtual Tunnels over TCP/IP networks with traffic shaping
 
 WRKSRC=			${WRKDIR}/vtun
-USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
diff --git a/net/wap-utils/Makefile b/net/wap-utils/Makefile
index ef35c227bbc..04a2969fee4 100644
--- a/net/wap-utils/Makefile
+++ b/net/wap-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/10/03 00:18:01 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:02 tv Exp $
 #
 
 DISTNAME=	ap-utils-1.3.2
@@ -13,7 +13,6 @@ HOMEPAGE=	http://ap-utils.polesye.net/
 COMMENT=	Wireless access points UNIX management tool
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 
 INCOMPAT_CURSES=	NetBSD-1.5* NetBSD-1.6[-_.]*
diff --git a/net/waste/Makefile b/net/waste/Makefile
index c372f7bdce6..5433a6b310d 100644
--- a/net/waste/Makefile
+++ b/net/waste/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/08/27 06:29:09 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:02 tv Exp $
 #
 
 DISTNAME=	waste-source
@@ -24,7 +24,6 @@ NO_BIN_ON_FTP=          ${RESTRICTED}
 NO_SRC_ON_CDROM=        ${RESTRICTED}
 NO_BIN_ON_CDROM=        ${RESTRICTED}
 
-USE_BUILDLINK3=		yes
 
 MAKE_ENV+=	LDFLAGS="-L${BUILDLINK_PREFIX.pthread}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib"
 
diff --git a/net/wget/Makefile b/net/wget/Makefile
index 588a2581069..4bd0bc5e239 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2005/02/09 17:51:47 tv Exp $
+# $NetBSD: Makefile,v 1.81 2005/04/11 21:47:02 tv Exp $
 
 DISTNAME=	wget-1.9.1
 PKGREVISION=	5
@@ -12,7 +12,6 @@ COMMENT=	Retrieve files from the 'net via HTTP and FTP
 BUILD_USES_MSGFMT=	YES
 
 USE_PERL5=		build
-USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/net/whoson/Makefile b/net/whoson/Makefile
index 3f940d7656e..9c323a16f33 100644
--- a/net/whoson/Makefile
+++ b/net/whoson/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/28 02:47:48 reed Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:02 tv Exp $
 #
 
 DISTNAME=		whoson-2.03
@@ -13,7 +13,6 @@ COMMENT=		Check if (dynamic) IP address is connected
 EXDIR=		    	${PREFIX}/share/examples/whoson
 CONF_FILES=    		${EXDIR}/whoson.conf ${PKG_SYSCONFDIR}/whoson.conf
 
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/net/wimon/Makefile b/net/wimon/Makefile
index 2b9010cbb98..ebedfb59ec7 100644
--- a/net/wimon/Makefile
+++ b/net/wimon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:18:01 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:02 tv Exp $
 #
 
 DISTNAME=	wimon-0.3
@@ -18,7 +18,6 @@ NOT_FOR_PLATFORM=	NetBSD-0* NetBSD-1.[012345]* NetBSD-1.6[-_.]*
 NOT_FOR_PLATFORM+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*
 
 WRKSRC=		${WRKDIR}/wimon
-USE_BUILDLINK3=	yes
 
 INSTALLATION_DIRS=	bin man/man8
 
diff --git a/net/wistumbler/Makefile b/net/wistumbler/Makefile
index 798cb5e32f0..a18fa44eb75 100644
--- a/net/wistumbler/Makefile
+++ b/net/wistumbler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/11/07 21:45:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:02 tv Exp $
 
 DISTNAME=	wistumbler-20020816
 PKGNAME=	wistumbler-20020816.0
@@ -11,7 +11,6 @@ HOMEPAGE=	http://gongon.com/persons/iseki/wistumbler/
 COMMENT=	Network stumbler for WaveLAN/IEEE wireless networking
 
 WRKSRC=		${WRKDIR}/wistumbler
-USE_BUILDLINK3=	YES
 USE_X11=	YES
 
 NOT_FOR_PLATFORM=	NetBSD-0.*-* NetBSD-1.[01234]*-* NetBSD-1.5-*
diff --git a/net/wistumbler2/Makefile.common b/net/wistumbler2/Makefile.common
index 89d0ce380fb..e40a40d3b77 100644
--- a/net/wistumbler2/Makefile.common
+++ b/net/wistumbler2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2004/11/07 21:44:22 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.2 2005/04/11 21:47:02 tv Exp $
 #
 
 DISTNAME=	wistumbler2.00-pre9
@@ -19,7 +19,6 @@ ONLY_FOR_PLATFORM=	NetBSD-*-* FreeBSD-*-* OpenBSD-*-*
 
 HAS_CONFIGURE=		YES
 MANCOMPRESSED=		YES
-USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 
 CONFIGURE_ENV+=		PREFIX=${PREFIX}
diff --git a/net/wminet/Makefile b/net/wminet/Makefile
index febe0ae95c7..b4818d3e268 100644
--- a/net/wminet/Makefile
+++ b/net/wminet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/04/18 07:13:16 snj Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:02 tv Exp $
 
 DISTNAME=	wmnet-1.2
 PKGNAME=	wminet-1.2
@@ -9,7 +9,6 @@ MAINTAINER=	coto@core.de
 HOMEPAGE=	http://www.enteract.com/~rneswold/
 COMMENT=	Dockable network monitor
 
-USE_BUILDLINK3=	YES
 USE_X11BASE=	YES
 
 .include "../../graphics/xpm/buildlink3.mk"
diff --git a/net/wmpload/Makefile b/net/wmpload/Makefile
index 97058f55bdc..c2d99a8a104 100644
--- a/net/wmpload/Makefile
+++ b/net/wmpload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/11/27 01:43:57 abs Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:02 tv Exp $
 #
 
 DISTNAME=	wmpload-0.9.5
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.engr.utk.edu/~mdsmith/pload/
 COMMENT=	PPP monitor for X11, totals and current in/out rates in 64x64 cube
 
 HAS_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 USE_IMAKE=	YES
 
 .include "../../graphics/xpm/buildlink3.mk"
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 51c74b66d31..a3083c9b357 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/03/04 15:43:55 uebayasi Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:02 tv Exp $
 
 DISTNAME=	wol-0.7.1
 CATEGORIES=	net
@@ -8,7 +8,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://ahh.sourceforge.net/wol/
 COMMENT=	Small Wake On Lan client
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
diff --git a/net/x2vnc/Makefile b/net/x2vnc/Makefile
index d86cd80525e..319d797b36e 100644
--- a/net/x2vnc/Makefile
+++ b/net/x2vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/04/25 07:35:03 snj Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:02 tv Exp $
 #
 
 DISTNAME=       	x2vnc-1.5.1
@@ -12,6 +12,5 @@ COMMENT=		Multi-console display using X and VNC
 
 GNU_CONFIGURE=		yes
 USE_X11=		yes
-USE_BUILDLINK3=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index 748e938ff82..cc252009a68 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/03/19 17:02:32 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:02 tv Exp $
 #
 
 DISTNAME=	xipdump-1.5.4
@@ -10,7 +10,6 @@ MAINTAINER=	sakamoto@NetBSD.org
 #HOMEPAGE=	http://www.epita.fr/~lse/xipdump/
 COMMENT=	Displays IP packets using X Window System
 
-USE_BUILDLINK3=	YES
 
 BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
 
diff --git a/net/xmftp/Makefile b/net/xmftp/Makefile
index f215ce4a1ec..d1bb016a95b 100644
--- a/net/xmftp/Makefile
+++ b/net/xmftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:18:02 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:02 tv Exp $
 #
 
 DISTNAME=	xmftp-1.0.4
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.cse.fau.edu/~valankar/old/xmftp/
 COMMENT=	X/Motif FTP client
 
 WRKSRC=		${WRKDIR}/xmftp/source
-USE_BUILDLINK3=	yes
 USE_X11BASE=	yes
 USE_GNU_TOOLS+=	make
 
diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index 83a7b236394..11550b2f3e9 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:18:02 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:02 tv Exp $
 #
 
 DISTNAME=		xorp-1.0
@@ -10,7 +10,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.xorp.org/
 COMMENT=		The eXtensible Open Router Platform
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
diff --git a/net/xrmftp/Makefile b/net/xrmftp/Makefile
index 444b71f0ba1..cedd2151abd 100644
--- a/net/xrmftp/Makefile
+++ b/net/xrmftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:18:02 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:03 tv Exp $
 
 DISTNAME=	xrmftp-1.2.4
 PKGREVISION=	3
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.mat.uni.torun.pl/~rafmet/xrmftp/
 COMMENT=	FTP client for X Window System
 
 WRKSRC=		${WRKDIR}/${DISTNAME}.src
-USE_BUILDLINK3=	yes
 USE_X11BASE=	yes
 
 do-install:
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 4013ab738c8..f90c668df4a 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/02/21 20:26:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.40 2005/04/11 21:47:03 tv Exp $
 #
 
 DISTNAME=	xtraceroute-0.8.14
@@ -16,7 +16,6 @@ BUILD_USES_MSGFMT=	yes
 
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+= --with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
diff --git a/net/yafc/Makefile b/net/yafc/Makefile
index 29793459601..eb9449880c0 100644
--- a/net/yafc/Makefile
+++ b/net/yafc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/11/27 00:32:53 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:03 tv Exp $
 
 DISTNAME=	yafc-0.7.10
 PKGREVISION=	1
@@ -12,7 +12,6 @@ COMMENT=	Yet another FTP client
 
 GNU_CONFIGURE=		yes
 USE_GNU_READLINE=	yes
-USE_BUILDLINK3=		yes
 
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 INFO_FILES=		yafc.info
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index f6200eb0462..812304f67db 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:18:02 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:03 tv Exp $
 #
 
 DISTNAME=	yaz-2.0
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://indexdata.dk/yaz
 COMMENT=	C/C++ toolkit for the development of Z39.50v3/SRW clients and servers
 
-USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/net/ywho/Makefile b/net/ywho/Makefile
index c56d36cca66..330eabc1fc1 100644
--- a/net/ywho/Makefile
+++ b/net/ywho/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/12/03 15:15:07 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:03 tv Exp $
 #
 
 DISTNAME=		ywho-1.3
@@ -8,7 +8,6 @@ MASTER_SITES=		ftp://ftp.gw.com/pub/people/kim/
 MAINTAINER=		kim@tac.nyc.ny.us
 COMMENT=		Who, users, uptime on clients in a sun-RPC network
 
-USE_BUILDLINK3=		yes
 NO_CONFIGURE=		yes
 BUILD_TARGET=		all DEST=${PREFIX}
 INSTALL_TARGET=		install install.man DEST=${PREFIX}
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 2daa363ec05..58e435e6a1f 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2004/10/03 00:18:02 tv Exp $
+# $NetBSD: Makefile,v 1.65 2005/04/11 21:47:03 tv Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
@@ -14,7 +14,6 @@ COMMENT=	Free multithreaded routing daemon software
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		# defined
 PKG_SYSCONFSUBDIR?=	zebra
 USE_PKGINSTALL=		YES
author	tv <tv@pkgsrc.org>	2005-04-11 21:44:48 +0000
committer	tv <tv@pkgsrc.org>	2005-04-11 21:44:48 +0000
commit	915c0d730df55e4ddf04b9d9e07f7603057636e4 (patch)
tree	2d8b7b078f159a824fcd53503d6096a145f0f177 /net
parent	7453f22416c9b37d26567190d2eaf0f2af6b40fd (diff)
download	pkgsrc-915c0d730df55e4ddf04b9d9e07f7603057636e4.tar.gz