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

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

7 files changed, 15 insertions, 15 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