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.

4 files changed, 12 insertions, 11 deletions

diff --git a/graphics/aalib/Makefile.common b/graphics/aalib/Makefile.common
index 432c0e15f02..d5f28ddfac8 100644
--- a/graphics/aalib/Makefile.common
+++ b/graphics/aalib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2003/06/02 14:05:04 abs Exp $
+# $NetBSD: Makefile.common,v 1.5 2003/06/11 20:50:54 abs Exp $
 
 DISTNAME=	aalib-${DIST_VERS}
 WRKSRC=		${WRKDIR}/aalib-1.4.0
@@ -18,7 +18,7 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.if (${MACHINE_ARCH} == arm32)
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 .  include "../../mk/gcc.buildlink2.mk"
 .endif
 
diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index 27799d293e4..0c536482f19 100644
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/01/10 01:27:42 mjl Exp $
+# $NetBSD: Makefile,v 1.21 2003/06/11 20:50:54 abs Exp $
 
 DISTNAME=	fxtv-1.03
 PKGREVISION=	2
@@ -10,8 +10,8 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://people.freebsd.org/~rhh/fxtv/
 COMMENT=	TV display application for Brooktree 848 compatible TV cards
 
-#ONLY_FOR_PLATFORM=	NetBSD-1.[5-9]*-arm32 NetBSD-1.[5-9]*-atari \
-#			NetBSD-1.[5-9]*-i386
+#ONLY_FOR_PLATFORM=	NetBSD-1.[5-9]*-arm NetBSD-1.[5-9]*-arm32	\
+#			NetBSD-1.[5-9]*-atari NetBSD-1.[5-9]*-i386
 
 USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
diff --git a/graphics/ncview/Makefile b/graphics/ncview/Makefile
index 3c7a0f2f963..ab3cc6d5814 100644
--- a/graphics/ncview/Makefile
+++ b/graphics/ncview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/06/02 14:05:05 abs Exp $
+# $NetBSD: Makefile,v 1.11 2003/06/11 20:50:55 abs Exp $
 
 DISTNAME=		ncview-1.92c
 CATEGORIES=		graphics
@@ -17,8 +17,8 @@ CONFIGURE_ARGS+=	--with-netcdf_libdir=${BUILDLINK_PREFIX.netcdf}/lib
 CONFIGURE_ARGS+=	--with-udunits_incdir=${BUILDLINK_PREFIX.udunits}/include
 CONFIGURE_ARGS+=	--with-udunits_libdir=${BUILDLINK_PREFIX.udunits}/lib
 
-.if (${MACHINE_ARCH} == "arm32")
-. include "../../mk/gcc.buildlink2.mk"
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+.  include "../../mk/gcc.buildlink2.mk"
 .endif
 
 .include "../../devel/netcdf/buildlink2.mk"
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 9deb0670172..501a94254a8 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2003/04/28 16:27:40 tron Exp $
+# $NetBSD: Makefile,v 1.72 2003/06/11 20:50:55 abs Exp $
 
 DISTNAME=	netpbm-10.11.8
 CATEGORIES=	graphics
@@ -24,8 +24,9 @@ STAGEDIR=	${WRKDIR}/staging
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${OPSYS} == NetBSD) && (${MACHINE_ARCH} == arm32)
-CFLAGS=
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+USE_GCC3=YES
+.  include "../../mk/gcc.buildlink2.mk"
 .endif
 
 .if (${OPSYS} == SunOS)