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, 13 insertions, 12 deletions

diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 503330b36bc..0eaa7969bc9 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2003/06/02 14:05:08 abs Exp $
+# $NetBSD: Makefile,v 1.52 2003/06/11 20:50:59 abs Exp $
 
 DISTNAME=	kdelibs-2.2.2
 PKGREVISION=	5
@@ -16,10 +16,6 @@ USE_OPENSSL_VERSION=	${OPENSSL_VERSION_096}
 CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
 CONFIGURE_ENV+=		PKG_CONFIG=${WRKDIR}/must-not-exist
 
-.if (${MACHINE_ARCH} == "arm32")
-BROKEN=		Compilation causes arm32 machines to hang
-.endif
-
 .include "../../mk/bsd.prefs.mk"
 
 .if (${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "NetBSD")
@@ -100,7 +96,12 @@ post-install:
 	) > ${PLIST_SRC}
 
 # XXX See below for NetBSD/alpha issues.
-.if (${MACHINE_ARCH} == "alpha")
+.if ${MACHINE_ARCH} == "alpha"
+.  include "../../mk/gcc.buildlink2.mk"
+.endif
+
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+USE_GCC3=YES
 .  include "../../mk/gcc.buildlink2.mk"
 .endif
 
diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index 62101bf66a7..02ab6bb270d 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/06/02 14:05:09 abs Exp $
+# $NetBSD: Makefile,v 1.19 2003/06/11 20:51:00 abs Exp $
 
 DISTNAME=	xephem-3.5.2
 PKGREVISION=	1
@@ -23,7 +23,7 @@ ALL_TARGET=	# empty
 BUILD_DIRS=	${LIBSRC1} ${LIBSRC2} ${WRKSRC}
 INSTALL_DIRS=	${WRKSRC}
 
-.if (${MACHINE_ARCH} == "arm32")
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 .  include "../../mk/gcc.buildlink2.mk"
 .endif
 
diff --git a/x11/xphoon/Makefile b/x11/xphoon/Makefile
index 873d4d44c16..a3d87bb62e3 100644
--- a/x11/xphoon/Makefile
+++ b/x11/xphoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/06/02 14:05:09 abs Exp $
+# $NetBSD: Makefile,v 1.8 2003/06/11 20:51:00 abs Exp $
 #
 
 DISTNAME=	xphoon.tar
@@ -21,7 +21,7 @@ MAKE_FLAGS+=	EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == arm32
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 .  include "../../mk/gcc.buildlink2.mk"
 .endif
 
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 87225b1a31d..9e9753f672a 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.48 2003/06/02 14:05:09 abs Exp $
+# $NetBSD: Makefile.common,v 1.49 2003/06/11 20:51:00 abs Exp $
 #
 
 DISTNAME=		xscreensaver-4.10
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+=	--without-kerberos
 .  endif
 .endif
 
-.if (${MACHINE_ARCH} == "arm32")
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 .  include "../../mk/gcc.buildlink2.mk"
 .endif