Update for the fact that 'arm' ports have been called NetBSD-*-arm for a while

now and not NetBSD-*-arm32. Changes include one or more of:
    - Change MACHINE_ARCH == arm32 to also match arm
    - Where ONLY_FOR_PLATFORM includes NetBSD-*-arm32, add NetBSD-*-arm
    - Where BROKEN or worked around for arm gcc bugs, set USE_GCC3
The last may shake out a few more broken packages the next bulk build.

7 files changed, 24 insertions, 20 deletions

diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 4c182ea137d..918567360f2 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2003/05/02 11:54:27 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2003/06/11 20:50:51 abs Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
@@ -37,9 +37,9 @@ PTHREAD_OPTS+=		require
 CONFIGURE_ENV+=		glib_cv_rtldglobal_broken=no
 .endif
 
-# XXX egcs is still broken on arm32.
-.if ${MACHINE_ARCH} == "arm32"
-CFLAGS=		-O0
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+USE_GCC3=YES
+.  include "../../mk/gcc.buildlink2.mk"
 .endif
 
 GLIB_VERSION=		${DISTNAME:S/glib-//}
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 87e94bfa72b..5908e38d888 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2003/05/02 11:54:36 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2003/06/11 20:50:52 abs Exp $
 
 DISTNAME=		libgtop-1.0.13
 PKGREVISION=		2
@@ -18,7 +18,8 @@ OSVERSION_SPECIFIC=	yes
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == NetBSD
-. if (${MACHINE_ARCH} != alpha) && (${MACHINE_ARCH} != arm32) && \
+. if (${MACHINE_ARCH} != alpha) && \
+     (${MACHINE_ARCH} != arm) && (${MACHINE_ARCH} != arm32) && \
      (${MACHINE_ARCH} != i386) && (${MACHINE_ARCH} != m68k) && \
      (${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \
      (${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64)
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 80ce6c1bc5d..c6869df3c64 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/06/02 01:20:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/06/11 20:50:52 abs Exp $
 
 DISTNAME=		libgtop-2.0.0
 PKGNAME=		${DISTNAME:S/-/2-/}
@@ -18,7 +18,8 @@ OSVERSION_SPECIFIC=	YES
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == NetBSD
-. if (${MACHINE_ARCH} != alpha) && (${MACHINE_ARCH} != arm32) && \
+. if (${MACHINE_ARCH} != alpha) && \
+     (${MACHINE_ARCH} != arm) && (${MACHINE_ARCH} != arm32) && \
      (${MACHINE_ARCH} != i386) && (${MACHINE_ARCH} != m68k) && \
      (${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \
      (${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64)
diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile
index 99c455fddaf..a4eed8e1c11 100644
--- a/devel/lwp/Makefile
+++ b/devel/lwp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/08/25 18:38:36 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2003/06/11 20:50:52 abs Exp $
 #
 
 DISTNAME=	lwp-1.9
@@ -14,7 +14,7 @@ COMMENT=	Light Weight Process style threads
 # each arch. Mips has it, but it evidently needs more work.
 #
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-sparc* \
-			NetBSD-*-arm32
+			NetBSD-*-arm NetBSD-*-arm32
 
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
diff --git a/devel/mit-pthreads/Makefile b/devel/mit-pthreads/Makefile
index a4161d3bca2..0592465c0bf 100644
--- a/devel/mit-pthreads/Makefile
+++ b/devel/mit-pthreads/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2002/07/18 09:08:27 agc Exp $
+# $NetBSD: Makefile,v 1.37 2003/06/11 20:50:52 abs Exp $
 #
 
 DISTNAME=		pthreads-1_60_beta6
@@ -10,8 +10,9 @@ MAINTAINER=		agc@netbsd.org
 HOMEPAGE=		http://www.mit.edu:8001/people/proven/pthreads.html
 COMMENT=		Chris Provenzano's (MIT) POSIX threads library
 
-ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \
-			NetBSD-*-sparc NetBSD-*-m68k NetBSD-*-powerpc
+ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm NetBSD-*-arm32 \
+			NetBSD-*-i386 NetBSD-*-sparc NetBSD-*-m68k \
+			NetBSD-*-powerpc
 CONFLICTS+=             unproven-pthreads-[0-9]*
 
 GNU_CONFIGURE=		yes
diff --git a/devel/prcs/Makefile b/devel/prcs/Makefile
index eefb4cc0589..2c0bc7554ad 100644
--- a/devel/prcs/Makefile
+++ b/devel/prcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/06/02 01:20:18 jschauma Exp $
+# $NetBSD: Makefile,v 1.24 2003/06/11 20:50:52 abs Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/10/13 05:11:40 jmacd Exp
 #
 
@@ -11,9 +11,9 @@ MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://prcs.sourceforge.net
 COMMENT=		Project Revision Control System
 
-ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 	\
-			NetBSD-*-mips* NetBSD-*-pc532 NetBSD-*-powerpc	\
-			NetBSD-*-sparc NetBSD-*-vax NetBSD-*-arm 	\
+ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm NetBSD-*-arm32	\
+			NetBSD-*-i386 NetBSD-*-mips* NetBSD-*-pc532	\
+			NetBSD-*-powerpc NetBSD-*-sparc NetBSD-*-vax 	\
 			SunOS-*-*
 
 GNU_CONFIGURE=		yes
diff --git a/devel/unproven-pthreads/Makefile b/devel/unproven-pthreads/Makefile
index ac7360d0df4..24d25ccb103 100644
--- a/devel/unproven-pthreads/Makefile
+++ b/devel/unproven-pthreads/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2003/02/15 00:06:02 salo Exp $
+# $NetBSD: Makefile,v 1.37 2003/06/11 20:50:53 abs Exp $
 #
 
 DISTNAME=		unproven-pthreads-0.17
@@ -9,8 +9,9 @@ MASTER_SITES=		ftp://ftp.flame.org/pub/netbsd/
 MAINTAINER=		explorer@netbsd.org
 COMMENT=		(MIT) POSIX threads library, hacked by Michael Graff
 
-ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \
-			NetBSD-*-m68k NetBSD-*-powerpc NetBSD-*-sparc
+ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm NetBSD-*-arm32 \
+			NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-powerpc \
+			NetBSD-*-sparc
 CONFLICTS+=		mit-pthreads-[0-9]*
 
 USE_BUILDLINK2=		yes