Convert to buildlink3.

18 files changed, 52 insertions, 56 deletions

diff --git a/audio/icecast1/Makefile b/audio/icecast1/Makefile
index 89a75ff2f66..fa36a8f6e6c 100644
--- a/audio/icecast1/Makefile
+++ b/audio/icecast1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/04/11 05:48:34 kim Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/11 06:03:15 snj Exp $
 #
 
 DISTNAME=	icecast-1.3.12
@@ -10,7 +10,7 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.icecast.org/
 COMMENT=	Internet broadcasting system using Mpeg Layer III streaming
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		# defined
 GNU_CONFIGURE=		# defined
 USE_PKGINSTALL=		yes
 
@@ -52,18 +52,13 @@ pre-configure:
 		-e 's/@CHUNKLEN@/${ICECAST_CHUNKLEN}/' \
 		${WRKSRC}/src/icetypes.h.bak > ${WRKSRC}/src/icetypes.h
 
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../security/tcp_wrappers/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
-
-.include "../../devel/readline/buildlink2.mk"
-.include "../../lang/python/application.mk"
-.include "../../security/tcp_wrappers/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
-.  include "../../devel/unproven-pthreads/buildlink2.mk"
+.  include "../../devel/unproven-pthreads/buildlink3.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/micq/Makefile b/chat/micq/Makefile
index dc733c1bb3d..11e6ce2c149 100644
--- a/chat/micq/Makefile
+++ b/chat/micq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/22 07:49:20 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/04/11 05:59:14 snj Exp $
 
 DISTNAME=	micq-0.4.10.3
 PKGREVISION=	1
@@ -11,9 +11,9 @@ MAINTAINER=	shell@NetBSD.org
 HOMEPAGE=	http://www.micq.org/
 COMMENT=	Text-mode ICQ client
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/sirc/Makefile b/chat/sirc/Makefile
index cde27351ac3..ecac5000ff5 100644
--- a/chat/sirc/Makefile
+++ b/chat/sirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:26:18 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/11 06:05:04 snj Exp $
 
 DISTNAME=	sirc-2.211
 PKGREVISION=	1
@@ -39,7 +39,7 @@ SIRC_SCRIPTS= \
 		www.pl				\
 		yiff.pl
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 DIST_SUBDIR=	sirc
@@ -75,5 +75,5 @@ do-install:
 		${ECHO} installing $$i ; \
 		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$i ${PREFIX}/lib/sirc/scripts/$$i ; done
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/tirc/Makefile b/chat/tirc/Makefile
index c7a7915608f..1b7976010e2 100644
--- a/chat/tirc/Makefile
+++ b/chat/tirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/02 09:30:15 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/11 06:07:52 snj Exp $
 #
 
 DISTNAME=	tirc-1.2
@@ -7,9 +7,10 @@ CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.mayn.de/pub/unix/network/irc/tirc/
 
 MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://home.mayn.de/jean-luc/alt/tirc/
 COMMENT=	Token's 'Internet Relay Chat' Client
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+="--with-ansi-colours"
@@ -32,5 +33,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/tirc
 	${INSTALL_DATA} ${WRKSRC}/dot.tircrc ${PREFIX}/share/tirc/tircrc
 
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/binkd/Makefile b/comms/binkd/Makefile
index 68db3fdc9a1..9d74141312a 100644
--- a/comms/binkd/Makefile
+++ b/comms/binkd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/20 12:10:01 agc Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/11 06:12:40 snj Exp $
 #
 
 DISTNAME=		binkd094
@@ -14,7 +14,7 @@ HOMEPAGE=		http://www.corbina.net/~maloff/binkd/
 COMMENT=		FidoNet-over-IP transport program utilizing BINKP protocol
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		# defined
 GNU_CONFIGURE=		# defined
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/comms/dl-ezkit/Makefile b/comms/dl-ezkit/Makefile
index 5d1d67cfe31..ca73b86a16e 100644
--- a/comms/dl-ezkit/Makefile
+++ b/comms/dl-ezkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:10:01 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/11 06:13:20 snj Exp $
 
 DISTNAME=	dl-ezkit-0.8.1-bsd
 PKGNAME=        dl-ezkit-0.8.1
@@ -12,7 +12,7 @@ COMMENT=	Coff file downloader for the EZ-KIT Lite using the RS232
 MAKEFILE=	Makefile.bsd
 
 WRKSRC=		${WRKDIR}/dl-ezkit
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dl ${PREFIX}/bin/
diff --git a/comms/efax/Makefile b/comms/efax/Makefile
index 68473e15820..49f0b862a2a 100644
--- a/comms/efax/Makefile
+++ b/comms/efax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/08/30 22:51:13 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/11 06:14:32 snj Exp $
 
 DISTNAME=	efax-0.9
 CATEGORIES=	comms
@@ -10,7 +10,7 @@ COMMENT=	Collection of small programs for sending and receiving faxes
 
 CONFLICTS=	kdeutils<3.1
 
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 
 USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
diff --git a/comms/estic/Makefile b/comms/estic/Makefile
index 4db7facf0d2..a62f56b2b1f 100644
--- a/comms/estic/Makefile
+++ b/comms/estic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:10:01 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/11 06:17:39 snj Exp $
 
 DISTNAME=	estic-1.61
 CATEGORIES=	comms
@@ -17,7 +17,7 @@ NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 USE_X11=	# defined
 
 ALL_TARGET=	depend all
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index ab447c620e6..5eaf7092e62 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/01/27 00:53:12 heinz Exp $
+# $NetBSD: Makefile,v 1.31 2004/04/11 06:19:05 snj Exp $
 #
 
 DISTNAME=	fidogate-4.4.5
@@ -9,7 +9,7 @@ MAINTAINER=	tv@pobox.com
 HOMEPAGE=	http://www.fidogate.org/
 COMMENT=	FidoNet (FTN) <-> Internet mail and news gateway
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 USE_GNU_TOOLS+=		make
 MAKE_ENV=		DEBUG="${CFLAGS} -Werror"
@@ -65,5 +65,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/fidogate.txt ${PREFIX}/share/doc/fidogate
 	${INSTALL_DATA} ${WRKSRC}/fidogate.conf ${EGDIR}
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/gscmxx/Makefile b/comms/gscmxx/Makefile
index 022f8617854..67c49d74ee1 100644
--- a/comms/gscmxx/Makefile
+++ b/comms/gscmxx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/01 16:38:46 salo Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/11 06:21:29 snj Exp $
 #
 
 DISTNAME=	gscmxx-0.4.1
@@ -14,7 +14,7 @@ DEPENDS+=	p5-gtk>=0.7008:../../x11/p5-gtk
 DEPENDS+=	p5-Image-Size>=2.92:../../graphics/p5-Image-Size
 DEPENDS+=	scmxx>=0.6:../../comms/scmxx
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/gscmxx/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/comms/linuxsms/Makefile b/comms/linuxsms/Makefile
index 3ff76bee208..64e12c8ad28 100644
--- a/comms/linuxsms/Makefile
+++ b/comms/linuxsms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/09/02 12:48:33 seb Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/11 06:25:18 snj Exp $
 #
 
 DISTNAME=	linuxsms-0.65
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://linuxsms.sourceforge.net/
 COMMENT=	Perl script to send short messages to GSM phones
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_PERL5=	yes
 NO_BUILD=	yes
 
@@ -24,5 +24,5 @@ do-install:
 .endfor
 .undef f
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 4cf893211a4..1a22ab8441e 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/01/20 12:10:01 agc Exp $
+# $NetBSD: Makefile,v 1.40 2004/04/11 06:43:27 snj Exp $
 # FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp
 #
 
@@ -18,7 +18,7 @@ BUILD_DEPENDS+=	texi2roff-[0-9]*:../../textproc/texi2roff
 CONFLICTS=	hylafax-[0-9]*
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 
 USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
@@ -61,5 +61,5 @@ do-configure:
 	&& cd ${.CURDIR}					\
 	&& ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
-.include "../../graphics/netpbm/buildlink2.mk"
+.include "../../graphics/netpbm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/modemd/Makefile b/comms/modemd/Makefile
index 633674e1140..f26ad0e2fc2 100644
--- a/comms/modemd/Makefile
+++ b/comms/modemd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:26:53 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/11 06:51:20 snj Exp $
 
 DISTNAME=	modemd-970221
 PKGNAME=	modemd-19970221
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.vix.com/pub/modemd/
 MAINTAINER=	tsarna@NetBSD.org
 COMMENT=	Replacement getty for dialup ttys and a modem server
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		# defined
 MANCOMPRESSED_IF_MANZ=	# defined
 
 pre-install:
diff --git a/comms/p5-Device-Gsm/Makefile b/comms/p5-Device-Gsm/Makefile
index 7149f395829..fae3f2c69f5 100644
--- a/comms/p5-Device-Gsm/Makefile
+++ b/comms/p5-Device-Gsm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:26:54 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/11 06:53:05 snj Exp $
 #
 
 DISTNAME=	Device-Gsm-1.16
@@ -12,7 +12,7 @@ COMMENT=	Perl module to interface GSM cellular / modems
 
 DEPENDS+=	p5-Device-Modem-[0-9]*:../p5-Device-Modem
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Device/Gsm/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/comms/p5-Device-Modem/Makefile b/comms/p5-Device-Modem/Makefile
index b6a4658efcf..67ff5dbeedb 100644
--- a/comms/p5-Device-Modem/Makefile
+++ b/comms/p5-Device-Modem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:26:55 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/11 06:55:52 snj Exp $
 #
 
 DISTNAME=	Device-Modem-1.24
@@ -12,7 +12,7 @@ COMMENT=	Perl module to talk to modem devices connected via serial port
 
 DEPENDS+=	p5-Device-SerialPort-[0-9]*:../p5-Device-SerialPort
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Device/Modem/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile
index ebf3a198f90..2ea63ec36ea 100644
--- a/comms/pilotmgr/Makefile
+++ b/comms/pilotmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/03/26 22:40:01 rh Exp $
+# $NetBSD: Makefile,v 1.27 2004/04/11 06:50:19 snj Exp $
 
 DISTNAME=	pilotmgr-1.107p2
 PKGNAME=	pilotmgr-1.107.2
@@ -17,7 +17,7 @@ DEPENDS+=	p5-pilot-link-[0-9]*:../p5-pilot-link
 DEPENDS+=	{p5-Data-Dumper-[0-9]*,perl>=5.6.1nb2}:${PERL5_PKGSRCDIR}
 
 WRKSRC=			${WRKDIR}/${DISTNAME:C/-.*$//}
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_X11=		YES
 HAS_CONFIGURE=		YES
 NO_BUILD=		YES
@@ -55,5 +55,5 @@ do-install:
 	done
 	${LN} -fs ${PM_DOC_DIR} ${PM_PERL_DIR}/docs
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aview-x11/Makefile b/graphics/aview-x11/Makefile
index 123cfaa6422..81e69f17126 100644
--- a/graphics/aview-x11/Makefile
+++ b/graphics/aview-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:18:15 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/11 06:48:01 snj Exp $
 #
 
 DISTNAME=	aview-1.3.0rc1
@@ -18,7 +18,7 @@ PLIST_SRC=	${WRKDIR}/PLIST
 WRKSRC=		${WRKDIR}/aview-1.3.0
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_PKGINSTALL=	yes
 USE_X11=	yes
 
@@ -48,7 +48,7 @@ post-install:
 	@${ECHO} bin/aaflip >>${PLIST_SRC}
 .endif
 
-.include "../../graphics/aalib-x11/buildlink2.mk"
-.include "../../graphics/netpbm/buildlink2.mk"
+.include "../../graphics/aalib-x11/buildlink3.mk"
+.include "../../graphics/netpbm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index d6606324dfb..cc7152f38f6 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:18:15 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/11 06:46:12 snj Exp $
 #
 
 DISTNAME=	aview-1.3.0rc1
@@ -18,7 +18,7 @@ PLIST_SRC=	${WRKDIR}/PLIST
 WRKSRC=		${WRKDIR}/aview-1.3.0
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_PKGINSTALL=	yes
 
 .include "../../mk/bsd.prefs.mk"
@@ -47,7 +47,7 @@ post-install:
 	@${ECHO} bin/aaflip >>${PLIST_SRC}
 .endif
 
-.include "../../graphics/aalib/buildlink2.mk"
-.include "../../graphics/netpbm/buildlink2.mk"
+.include "../../graphics/aalib/buildlink3.mk"
+.include "../../graphics/netpbm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"