From 40614d0b3ca35e2c5b10e307c2c29f92feb73486 Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Wed, 17 Sep 2003 19:39:58 +0000
Subject: get rid of USE_GCC2/3 in pkg Makefiles, and set GCC_REQD or
 USE_PKGSRC_GCC as appropriate, as this is handled by compiler.mk now.

---
 x11/kdelibs2/Makefile            | 6 +++---
 x11/kdelibs3/Makefile            | 5 +++--
 x11/neXtaw/Makefile              | 4 ++--
 x11/xephem/Makefile              | 4 ++--
 x11/xfce/Makefile                | 4 ++--
 x11/xphoon/Makefile              | 4 ++--
 x11/xscreensaver/Makefile.common | 4 ++--
 7 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'x11')

diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 45e734c4d88..8ef18d5e756 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2003/09/12 20:07:31 grant Exp $
+# $NetBSD: Makefile,v 1.56 2003/09/17 19:41:20 grant Exp $
 
 DISTNAME=	kdelibs-2.2.2
 PKGREVISION=	6
@@ -96,11 +96,11 @@ post-install:
 
 # XXX See below for NetBSD/alpha issues.
 .if ${MACHINE_ARCH} == "alpha"
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=	# defined
 .endif
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=	# defined
+GCC_REQD=	3.0
 .endif
 
 .include "../../archivers/bzip2/buildlink2.mk"
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 5fd40b826c6..aea9a9b1802 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2003/09/12 20:07:32 grant Exp $
+# $NetBSD: Makefile,v 1.40 2003/09/17 19:41:21 grant Exp $
 
 DISTNAME=	kdelibs-3.1.3
 PKGREVISION=	2
@@ -109,8 +109,9 @@ post-install:
 	) > ${PLIST_SRC}
 
 .if ${MACHINE_ARCH} == "alpha"
-USE_GCC2=	 # defined
+USE_PKGSRC_GCC=		# defined
 .endif
+
 .include "../../archivers/bzip2/buildlink2.mk"
 .include "../../audio/arts/buildlink2.mk"
 .include "../../audio/libaudiofile/buildlink2.mk"
diff --git a/x11/neXtaw/Makefile b/x11/neXtaw/Makefile
index 74f1889f3e1..491c40f974d 100644
--- a/x11/neXtaw/Makefile
+++ b/x11/neXtaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/09/12 20:07:33 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/17 19:41:23 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)
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 post-install:
diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index 646c8830d8a..5b9b230ce39 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/09/12 20:07:33 grant Exp $
+# $NetBSD: Makefile,v 1.22 2003/09/17 19:41:24 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"
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=	# defined
 .endif
 
 post-install:
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index cf3514f8d5e..471fc12e98d 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/09/12 20:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.38 2003/09/17 19:41:25 grant Exp $
 
 DISTNAME=		xfce-3.8.18
 PKGREVISION=		2
@@ -22,7 +22,7 @@ USE_GMAKE=		# defined
 GNU_CONFIGURE=		# defined
 
 .if ${MACHINE_ARCH} == "alpha"
-USE_GCC2=		# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 CONFIGURE_ARGS+=	--without-included-gettext
diff --git a/x11/xphoon/Makefile b/x11/xphoon/Makefile
index 67e8e0aa1c3..646f8909779 100644
--- a/x11/xphoon/Makefile
+++ b/x11/xphoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/09/12 20:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/17 19:41:27 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"
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=	# defined
 .endif
 
 .if ${OPSYS} == "NetBSD"
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index c8a851a4e44..4bc91d4edeb 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.55 2003/09/12 20:07:35 grant Exp $
+# $NetBSD: Makefile.common,v 1.56 2003/09/17 19:41:28 grant Exp $
 #
 
 DISTNAME=		xscreensaver-4.13
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=	--without-kerberos
 .endif
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=		# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 .include "../../graphics/gle/buildlink2.mk"
-- 
cgit v1.2.3