We no longer need to explicitly call ${BUILDLINK_*} for CC, CXX, LIBTOOL,

etc. because the bare variables will point to the correct executables.

18 files changed, 42 insertions, 42 deletions

diff --git a/archivers/bicom/Makefile b/archivers/bicom/Makefile
index ac4eeb3e8fc..8740f74da80 100644
--- a/archivers/bicom/Makefile
+++ b/archivers/bicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/08 04:03:14 jlam Exp $
 #
 
 DISTNAME=		bicom101
@@ -21,12 +21,12 @@ do-build:
 	for i in bialib bicom; do					\
 		cd ${WRKSRC}/$$i &&					\
 		for file in *.cpp; do					\
-			${BUILDLINK_CXX} ${CXXFLAGS} -I./ -I../bialib	\
+			${CXX} ${CXXFLAGS} -I./ -I../bialib		\
 				-c $$file;				\
 		done;							\
 	done
 	cd ${WRKSRC}/bicom &&						\
-		${BUILDLINK_CXX} ${CXXFLAGS} ${LDFLAGS}			\
+		${CXX} ${CXXFLAGS} ${LDFLAGS}				\
 			-o bicom *.o ../bialib/*.o
 
 do-install:
diff --git a/archivers/bunzip/Makefile b/archivers/bunzip/Makefile
index 0e4174da5a3..13930715d01 100644
--- a/archivers/bunzip/Makefile
+++ b/archivers/bunzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=	bunzip021.c
 PKGNAME=	bunzip-0.21
@@ -14,7 +14,7 @@ WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	# defined
 
 do-build:
-	cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o bunzip ${DISTNAME}
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -o bunzip ${DISTNAME}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bunzip ${PREFIX}/bin/bunzip
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile
index 0329b2bb3f9..5f98acebcb3 100644
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/02/08 03:00:29 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2004/02/08 04:03:15 jlam Exp $
 #
 
 DISTNAME=	bzip2-1.0.2
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
-MAKE_ENV+=		REALCC="${BUILDLINK_CC}"
+MAKE_ENV+=		REALCC="${CC}"
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/archivers/ppunpack/Makefile b/archivers/ppunpack/Makefile
index 864d77dfd0b..01404dafd63 100644
--- a/archivers/ppunpack/Makefile
+++ b/archivers/ppunpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=	ppsmall-1.0
 PKGNAME=	ppunpack-1.0
@@ -13,7 +13,7 @@ COMMENT=	Decompresses Amiga PowerPacker files
 WRKSRC=		${WRKDIR}/PPUnpack
 USE_BUILDLINK2=	# defined
 
-MAKE_FLAGS=	CC="${BUILDLINK_CC}" COPTS="${CFLAGS}"
+MAKE_FLAGS=	CC="${CC}" COPTS="${CFLAGS}"
 ALL_TARGET=	ppunpack
 LICENSE=	no-commercial-use
 
diff --git a/archivers/undms/Makefile b/archivers/undms/Makefile
index 29c7069ba85..1a1a58a90be 100644
--- a/archivers/undms/Makefile
+++ b/archivers/undms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:07:07 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=	undms-1.3.c
 PKGNAME=	undms-1.3
@@ -14,7 +14,7 @@ WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	# defined
 
 do-build:
-	cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o undms undms-1.3.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -o undms undms-1.3.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/undms ${PREFIX}/bin/
diff --git a/archivers/unlzx/Makefile b/archivers/unlzx/Makefile
index 0bbf2f08446..41ec47d540d 100644
--- a/archivers/unlzx/Makefile
+++ b/archivers/unlzx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:07:07 agc Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=	unlzx.c
 PKGNAME=	unlzx-1.1
@@ -14,7 +14,7 @@ WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	# defined
 
 do-build:
-	cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o unlzx unlzx.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -o unlzx unlzx.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unlzx ${PREFIX}/bin
diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile
index f5c46edd5aa..fa5ae58baa6 100644
--- a/archivers/xbin/Makefile
+++ b/archivers/xbin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:07:07 agc Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/08 04:03:15 jlam Exp $
 #
 
 DISTNAME=	${PRGNAME}unix
@@ -27,7 +27,7 @@ post-extract:
 
 do-build:
 	cd ${WRKSRC} && \
-	${BUILDLINK_CC} ${CFLAGS} -DBSD -o ${PRGNAME} ${DISTNAME}.c -lcompat
+	${CC} ${CFLAGS} -DBSD -o ${PRGNAME} ${DISTNAME}.c -lcompat
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PRGNAME} ${PREFIX}/bin
diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index bb52b11228f..b9a11187788 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2004/02/08 03:00:29 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=	pine4.58
 PKGNAME=	pico-4.6
@@ -33,7 +33,7 @@ MAKE_ENV+=	_STRIPFLAG_INSTALL=	# debug...
 do-build:
 	cd ${WRKSRC} && \
 	${SETENV} ${MAKE_ENV} ./build ${BUILDNAME} \
-	  CC="${LIBTOOL} ${BUILDLINK_CC}" \
+	  CC="${LIBTOOL} ${CC}" \
 	  PREFIX=${PREFIX} OPTIMIZE="${CFLAGS}"
 
 do-install:
diff --git a/games/bridge-hands/Makefile b/games/bridge-hands/Makefile
index 05316b24995..cff66f3bb8b 100644
--- a/games/bridge-hands/Makefile
+++ b/games/bridge-hands/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:39 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=	hands-2.0.bsd386
 PKGNAME=	bridge-hands-2.0
@@ -15,7 +15,7 @@ WRKSRC=			${WRKDIR}/hands/source
 USE_BUILDLINK2=		# defined
 
 do-build:
-	cd ${WRKSRC}; ${BUILDLINK_CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}	\
+	cd ${WRKSRC}; ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}		\
 		-o hands hands.c ${LIBS}
 
 do-install:
diff --git a/graphics/gimp-base/Makefile b/graphics/gimp-base/Makefile
index 52f7f4f1b62..9e02f47061b 100644
--- a/graphics/gimp-base/Makefile
+++ b/graphics/gimp-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/08 04:03:15 jlam Exp $
 #
 
 DISTNAME=		gimp-1.2.5
@@ -64,7 +64,7 @@ CONF_FILES+=		${EGDIR}/unitrc ${PKG_SYSCONFDIR}/unitrc
 
 pre-build:
 	cd ${WRKSRC} &&							\
-	${BUILDLINK_CC} -o ${WRKSRC}/docs/pdb_self_doc			\
+	${CC} -o ${WRKSRC}/docs/pdb_self_doc				\
 		${FILESDIR}/pdb_self_doc.c
 
 post-install:
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index c89bb78f8b1..612659c5d19 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2004/01/15 21:07:42 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2004/02/08 04:03:15 jlam Exp $
 
 # On update, don't forget to increase shared library major/minor's in
 # accordance with changes (patch-aa).
@@ -27,7 +27,7 @@ LIBPNG_SO_MAJOR=	3
 LIBPNG_SO_MINOR=	1
 
 MAKEFILE=	scripts/makefile.std
-MAKE_ENV+=	REALCC="${BUILDLINK_CC}"
+MAKE_ENV+=	REALCC="${CC}"
 MAKE_ENV+=	LIBPNG_SO_MAJOR=${LIBPNG_SO_MAJOR}
 MAKE_ENV+=	LIBPNG_SO_MINOR=${LIBPNG_SO_MINOR}
 PLIST_SUBST+=	LIBPNG_SO_MAJOR=${LIBPNG_SO_MAJOR}
diff --git a/lang/f2c/buildlink2.mk b/lang/f2c/buildlink2.mk
index eb906254334..71033b684a8 100644
--- a/lang/f2c/buildlink2.mk
+++ b/lang/f2c/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/08/27 17:31:58 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/08 04:03:15 jlam Exp $
 
 .if !defined(F2C_BUILDLINK2_MK)
 F2C_BUILDLINK2_MK=	# defined
@@ -27,10 +27,10 @@ PKG_FC=			${BUILDLINK_PREFIX.f2c}/bin/f2c-f77
 # The f2c-f77 script takes some environment variables to override hardcoded
 # values for the compiler and C preprocessor.
 #
-CONFIGURE_ENV+=		CC_f2c="${BUILDLINK_CC}"
-CONFIGURE_ENV+=		CPP="${BUILDLINK_CPP}"
-MAKE_ENV+=		CC_f2c="${BUILDLINK_CC}"
-MAKE_ENV+=		CPP="${BUILDLINK_CPP}"
+CONFIGURE_ENV+=		CC_f2c="${CC}"
+CONFIGURE_ENV+=		CPP="${CPP}"
+MAKE_ENV+=		CC_f2c="${CC}"
+MAKE_ENV+=		CPP="${CPP}"
 
 f2c-buildlink: _BUILDLINK_USE
 
diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile
index 0fcbaea1317..5b9ab68ee48 100644
--- a/lang/nawk/Makefile
+++ b/lang/nawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/20 12:19:17 agc Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/08 04:03:15 jlam Exp $
 #
 
 DISTNAME=       awk
@@ -17,7 +17,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=	yes
 MAKEFILE=	makefile
-MAKE_FLAGS+=	CC=${BUILDLINK_CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=	CC=${CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:Q}
 ALL_TARGET=	a.out
 
 INSTALLATION_DIRS=	bin man/man1
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 7937a95a64e..dab99103996 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/07/17 21:45:54 grant Exp $
+# $NetBSD: Makefile,v 1.29 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=		elm2.5.5
 PKGREVISION=		2
@@ -26,7 +26,7 @@ pre-configure:
 		${WRKSRC}/config.sh.orig > ${WRKSRC}/config.sh.tmp
 	${SED} -e 's:LOCALBASE:'${LOCALBASE}':g' \
 		${WRKSRC}/config.sh.tmp > ${WRKSRC}/config.sh.tmp2
-	${SED} -e 's:@CC@:'${BUILDLINK_CC}':g' \
+	${SED} -e 's:@CC@:'${CC}':g' \
 		${WRKSRC}/config.sh.tmp2 > ${WRKSRC}/config.sh
 	${MV} ${WRKSRC}/nls/LANGS ${WRKSRC}/nls/LANGS.tmpl
 	${SED} -e 's:__PREFIX:'${PREFIX}':g' < ${WRKSRC}/nls/LANGS.tmpl > ${WRKSRC}/nls/LANGS
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index b809bd83e55..6051bc4058e 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2004/01/20 10:16:38 hubertf Exp $
+# $NetBSD: Makefile,v 1.83 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=       pine4.58
 PKGNAME=        pine-4.58
@@ -60,7 +60,7 @@ do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build ${BUILDNAME}	\
 		${LDAPCFLAGS} ${LDAPLIBS}				\
 		PREFIX=${PREFIX}					\
-		CC="${BUILDLINK_CC} ${CFLAGS} ${LDFLAGS}"
+		CC="${CC} ${CFLAGS} ${LDFLAGS}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile
index 01ba4074702..b9c3731cdf4 100644
--- a/pkgtools/rpm2pkg/Makefile
+++ b/pkgtools/rpm2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/20 12:23:58 agc Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=	rpm2pkg-1.3
 PKGREVISION=			1
@@ -20,7 +20,7 @@ CFLAGS+=	${BUILDLINK_CPPFLAGS.rpm}
 LIBS=		-lrpm -lintl -lz
 
 do-build:
-	${BUILDLINK_CC} ${CFLAGS} ${LDFLAGS} -o ${WRKSRC}/rpm2pkg \
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${WRKSRC}/rpm2pkg \
 		${FILESDIR}/rpm2pkg.c ${LIBS}
 
 do-install:
diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile
index 413df386cae..d6194f3d88d 100644
--- a/wm/wm2/Makefile
+++ b/wm/wm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/11/10 16:13:28 gavan Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=	wm2-4
 PKGNAME=	wm2-4.0
@@ -14,7 +14,7 @@ ALL_TARGET=	depend wm2
 USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
 USE_GCC_SHLIB=	YES
-MAKE_ENV+=	CCC="${BUILDLINK_CXX}"
+MAKE_ENV+=	CCC="${CXX}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wm2 ${PREFIX}/bin
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 3e6629567f1..76b32a012cc 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2004/02/02 13:02:50 jlam Exp $
+# $NetBSD: Makefile.common,v 1.28 2004/02/08 04:03:15 jlam Exp $
 #
 DISTNAME=		qt-x11-free-${QTVERSION}
 CATEGORIES=		x11
@@ -75,9 +75,9 @@ post-patch:
 		-e 's:@LOCALBASE@:${LOCALBASE}:g' \
 		-e 's:@X11BASE@:${X11BASE}:g' \
 		-e 's:@X11PREFIX@:${X11PREFIX}:g' \
-		-e 's:@LIBTOOL@:${BUILDLINK_LIBTOOL:T}:g' \
-		-e 's:@CC@:${BUILDLINK_CC:T}:g' \
-		-e 's:@CXX@:${BUILDLINK_CXX:T}:g' \
+		-e 's:@LIBTOOL@:${LIBTOOL}:g' \
+		-e 's:@CC@:${CC}:g' \
+		-e 's:@CXX@:${CXX}:g' \
 		-e 's:@LDFLAGS@:${LDFLAGS}:g' \
 		-e 's:@CFLAGS@:${CFLAGS}:g' \
 		-e 's:@CXXFLAGS@:${CXXFLAGS}:g' \