buildlink1 -> buildlink2

10 files changed, 31 insertions, 32 deletions

diff --git a/converters/base64/Makefile b/converters/base64/Makefile
index 15715f8f532..971a00444ce 100644
--- a/converters/base64/Makefile
+++ b/converters/base64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/09/27 23:17:50 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/11/14 23:39:09 jlam Exp $
 #
 
 DISTNAME=	base64-1.3
@@ -13,7 +13,7 @@ COMMENT=	encode and decode base64 files
 CONFLICTS=	openssl-[0-9]*
 GNU_CONFIGURE=	yes
 ALL_TARGET=	prog
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/base64 ${PREFIX}/bin
diff --git a/converters/cbmconvert/Makefile b/converters/cbmconvert/Makefile
index 83c8b26166a..f5bfacfef1a 100644
--- a/converters/cbmconvert/Makefile
+++ b/converters/cbmconvert/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/08/20 04:08:11 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/11/14 23:39:24 jlam Exp $
 
 DISTNAME=		cbmconvert-2.0.5
 CATEGORIES=		converters archivers
@@ -7,9 +7,9 @@ MASTER_SITES=		ftp://ftp.funet.fi/pub/cbm/crossplatform/converters/unix/
 MAINTAINER=		packages@netbsd.org
 COMMENT=		Converts files to and from various C64/C128/CBM formats
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
 ALL_TARGET=		unix
-MAKE_FLAGS=		CC="${CC}" CFLAGS="${CFLAGS}"
+MAKE_FLAGS=		CFLAGS="${CFLAGS}"
 
 do-install:
 .for f in cbmconvert disk2zip zip2disk
diff --git a/converters/dvi2tty/Makefile b/converters/dvi2tty/Makefile
index cbf3009969b..2d7994b5425 100644
--- a/converters/dvi2tty/Makefile
+++ b/converters/dvi2tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/08/20 02:46:43 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/11/14 23:40:46 jlam Exp $
 #
 
 DISTNAME=	dvi2tty
@@ -11,8 +11,8 @@ MAINTAINER=	fredb@netbsd.org
 COMMENT=	Program for previewing DVI files
 
 LICENSE=	no-commercial-use
-USE_BUILDLINK_ONLY=	# defined
-MAKE_FLAGS+=	CC="${CC}"
+
+USE_BUILDLINK2=	# defined
 MAKE_FLAGS+=	CFLAGS="${CFLAGS}"
 
 pre-patch:
diff --git a/converters/ish/Makefile b/converters/ish/Makefile
index 284d2fddfd0..cb9ecb1a212 100644
--- a/converters/ish/Makefile
+++ b/converters/ish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/08/20 02:50:56 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/11/14 23:41:39 jlam Exp $
 
 DISTNAME=	ish-1.11
 CATEGORIES=	converters
@@ -9,6 +9,6 @@ COMMENT=	Binary-to-text file-encoder
 
 MAKEFILE=	makefile
 ALL_TARGET=	ish
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=	# defined
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/latex2rtf/Makefile b/converters/latex2rtf/Makefile
index 80c6d23c6ed..66621f6784d 100644
--- a/converters/latex2rtf/Makefile
+++ b/converters/latex2rtf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:04 seb Exp $
+# $NetBSD: Makefile,v 1.5 2002/11/14 23:42:26 jlam Exp $
 #
 
 DISTNAME=	latex2rtf-1.8aa
@@ -10,9 +10,8 @@ MAINTAINER=	brook@nmsu.edu
 HOMEPAGE=	http://www.kfa-juelich.de/isr/1/texconv/latex2rtf.html
 COMMENT=	LaTeX to RTF converter
 
-USE_BUILDLINK_ONLY=	# defined
-MAKE_FLAGS+=		CC="${CC}"
-MAKE_FLAGS+=		XCFLAGS="${CFLAGS}"
+USE_BUILDLINK2=	# defined
+MAKE_FLAGS+=	XCFLAGS="${CFLAGS}"
 
 INFO_FILES=	latex2rtf.info
 
diff --git a/converters/macfork/Makefile b/converters/macfork/Makefile
index daf88b5fe8f..c54f6ada72c 100644
--- a/converters/macfork/Makefile
+++ b/converters/macfork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/04/01 00:07:56 cjep Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/14 23:42:51 jlam Exp $
 
 DISTNAME=	macfork-1.0
 WRKSRC=		${WRKDIR}/macfork
@@ -9,8 +9,9 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.cs.cmu.edu/afs/cs/user/ajw/www/software/
 COMMENT=	Tool for extracting data from Macintosh resource forks
 
-USE_BUILDLINK_ONLY=	YES
-USE_GMAKE=		YES
+USE_BUILDLINK2=	# defined
+USE_CXX=	# defined
+USE_GMAKE=	# defined
 
 DOCDIR=		${PREFIX}/share/doc/macfork
 
diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile
index 692281e9a7f..985d993f059 100644
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/08/20 02:15:36 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/11/14 23:43:48 jlam Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/04/26 23:55:23 asami Exp
 #
 
@@ -12,6 +12,6 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	packages@netbsd.org
 COMMENT=	External MIME packer/unpacker
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=	# defined
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/rtf2html/Makefile b/converters/rtf2html/Makefile
index c51d9162782..5b83eb019c2 100644
--- a/converters/rtf2html/Makefile
+++ b/converters/rtf2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/02 18:16:46 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/11/14 23:43:56 jlam Exp $
 #
 
 DISTNAME=	rtf2html
@@ -10,10 +10,9 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.ice.ru/~vitus/catdoc/
 COMMENT=	Rich Text to HTML file converter
 
-USE_BUILDLINK_ONLY=	# defined
-ALL_TARGET=		rtf2html
-MAKE_FLAGS+=		CC="${CC}"
-MAKE_FLAGS+=		CFLAGS="${CFLAGS}"
+USE_BUILDLINK2=	# defined
+ALL_TARGET=	rtf2html
+MAKE_FLAGS+=	CFLAGS="${CFLAGS}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rtf2html ${PREFIX}/bin
diff --git a/converters/txt2html/Makefile b/converters/txt2html/Makefile
index 7e353895b88..c32810d7428 100644
--- a/converters/txt2html/Makefile
+++ b/converters/txt2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/28 05:20:43 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/11/14 23:44:42 jlam Exp $
 
 DISTNAME=	txt2html-1.28
 CATEGORIES=	converters www
@@ -8,9 +8,9 @@ MAINTAINER=	wennmach@netbsd.org
 HOMEPAGE=	http://www.aigeek.com/txt2html/
 COMMENT=	Text to HTML converter
 
-USE_BUILDLINK_ONLY=	YES
-NO_BUILD=		YES
-REPLACE_PERL=		txt2html.pl
+USE_BUILDLINK2=	YES
+NO_BUILD=	YES
+REPLACE_PERL=	txt2html.pl
 
 do-configure:
 	${SED} -e "s:@PREFIX@:${PREFIX}:g" \
@@ -24,5 +24,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/sample.html ${PREFIX}/share/txt2html
 	${INSTALL_DATA} ${WRKSRC}/sample.txt ${PREFIX}/share/txt2html
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/unix2dos/Makefile b/converters/unix2dos/Makefile
index 1cd2568a8c9..af41bff24e9 100644
--- a/converters/unix2dos/Makefile
+++ b/converters/unix2dos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:17 agc Exp $
+# $NetBSD: Makefile,v 1.9 2002/11/14 23:48:10 jlam Exp $
 # FreeBSD Id: ports/converters/unix2dos/Makefile,v 1.5 2000/07/04 10:31:42 sobomax Exp
 
 DISTNAME=	unix2dos-1.2
@@ -9,8 +9,8 @@ MASTER_SITES=	http://www.fisicc-ufm.edu/~obonilla/files/		\
 MAINTAINER=	zuntum@netbsd.org
 COMMENT=	Translate ASCII files to/from DOS (cr/lf) and UNIX (lf)
 
-USE_BUILDLINK_ONLY=	# defined
-WRKSRC=			${WRKDIR}
+USE_BUILDLINK2=	# defined
+WRKSRC=		${WRKDIR}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unix2dos ${PREFIX}/bin/unix2dos