kill all references to gcc.buildlink2.mk and compiler.mk, and define

USE_GCC2 or USE_GCC3 where appropriate.

the functionality of the old gcc.buildlink2.mk has been rolled into
compiler.mk now, which is automatically used.

more changes to come later...

7 files changed, 15 insertions, 16 deletions

diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 89dd3b3c392..45e734c4d88 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2003/09/11 04:13:04 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2003/09/12 20:07:31 grant Exp $
 
 DISTNAME=	kdelibs-2.2.2
 PKGREVISION=	6
@@ -96,12 +96,11 @@ post-install:
 
 # XXX See below for NetBSD/alpha issues.
 .if ${MACHINE_ARCH} == "alpha"
-.  include "../../mk/gcc.buildlink2.mk"
+USE_GCC2=	# defined
 .endif
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=YES
-.  include "../../mk/gcc.buildlink2.mk"
+USE_GCC3=	# defined
 .endif
 
 .include "../../archivers/bzip2/buildlink2.mk"
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 361354b7a9c..5fd40b826c6 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2003/09/11 04:13:05 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2003/09/12 20:07:32 grant Exp $
 
 DISTNAME=	kdelibs-3.1.3
 PKGREVISION=	2
@@ -109,7 +109,7 @@ post-install:
 	) > ${PLIST_SRC}
 
 .if ${MACHINE_ARCH} == "alpha"
-.  include "../../mk/gcc.buildlink2.mk"
+USE_GCC2=	 # defined
 .endif
 .include "../../archivers/bzip2/buildlink2.mk"
 .include "../../audio/arts/buildlink2.mk"
diff --git a/x11/neXtaw/Makefile b/x11/neXtaw/Makefile
index 803f657be65..74f1889f3e1 100644
--- a/x11/neXtaw/Makefile
+++ b/x11/neXtaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/08/31 12:01:16 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/09/12 20:07:33 grant Exp $
 
 DISTNAME=	neXtaw-0.14.1
 CATEGORIES=	x11
@@ -21,7 +21,7 @@ EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-alpha)
-.  include "../../mk/gcc.buildlink2.mk"
+USE_GCC2=	# defined
 .endif
 
 post-install:
diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index adb32521fd8..646c8830d8a 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/07/17 22:56:55 grant Exp $
+# $NetBSD: Makefile,v 1.21 2003/09/12 20:07:33 grant Exp $
 
 DISTNAME=	xephem-3.5.2
 PKGREVISION=	1
@@ -24,7 +24,7 @@ BUILD_DIRS=	${LIBSRC1} ${LIBSRC2} ${WRKSRC}
 INSTALL_DIRS=	${WRKSRC}
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-.  include "../../mk/gcc.buildlink2.mk"
+USE_GCC2=	# defined
 .endif
 
 post-install:
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index 22b3e6d4ac9..cf3514f8d5e 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2003/07/17 22:56:55 grant Exp $
+# $NetBSD: Makefile,v 1.37 2003/09/12 20:07:34 grant Exp $
 
 DISTNAME=		xfce-3.8.18
 PKGREVISION=		2
@@ -22,7 +22,7 @@ USE_GMAKE=		# defined
 GNU_CONFIGURE=		# defined
 
 .if ${MACHINE_ARCH} == "alpha"
-.  include "../../mk/gcc.buildlink2.mk"
+USE_GCC2=		# defined
 .endif
 
 CONFIGURE_ARGS+=	--without-included-gettext
diff --git a/x11/xphoon/Makefile b/x11/xphoon/Makefile
index a3d87bb62e3..67e8e0aa1c3 100644
--- a/x11/xphoon/Makefile
+++ b/x11/xphoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/06/11 20:51:00 abs Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/12 20:07:35 grant Exp $
 #
 
 DISTNAME=	xphoon.tar
@@ -22,7 +22,7 @@ MAKE_FLAGS+=	EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS}
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-.  include "../../mk/gcc.buildlink2.mk"
+USE_GCC2=	# defined
 .endif
 
 .if ${OPSYS} == "NetBSD"
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 4e1678fafbc..c8a851a4e44 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2003/09/08 12:15:41 wiz Exp $
+# $NetBSD: Makefile.common,v 1.55 2003/09/12 20:07:35 grant Exp $
 #
 
 DISTNAME=		xscreensaver-4.13
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=	--without-kerberos
 .endif
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-.  include "../../mk/gcc.buildlink2.mk"
+USE_GCC2=		# defined
 .endif
 
 .include "../../graphics/gle/buildlink2.mk"