Permalink
Browse files

Update for the fact that 'arm' ports have been called NetBSD-*-arm fo…

…r 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.
  • Loading branch information...
1 parent b9c7da5 commit ed06be893778e4a32faf471cdedfab040d2fcfd4 abs committed Jun 11, 2003
Showing with 138 additions and 128 deletions.
  1. +2 −2 biology/rasmol/Makefile
  2. +2 −2 cad/fastcap/Makefile
  3. +2 −2 cad/fasthenry/Makefile
  4. +4 −5 databases/cdb/Makefile
  5. +4 −3 databases/mysql-server/Makefile
  6. +4 −4 devel/glib/Makefile
  7. +3 −2 devel/libgtop/Makefile
  8. +3 −2 devel/libgtop2/Makefile
  9. +2 −2 devel/lwp/Makefile
  10. +4 −3 devel/mit-pthreads/Makefile
  11. +4 −4 devel/prcs/Makefile
  12. +4 −3 devel/unproven-pthreads/Makefile
  13. +2 −2 editors/xemacs-current/Makefile
  14. +4 −4 emulators/compat13/Makefile
  15. +3 −5 emulators/stella/Makefile
  16. +3 −3 games/angband-tty/Makefile
  17. +2 −2 games/angband-x11/Makefile
  18. +2 −2 graphics/aalib/Makefile.common
  19. +3 −3 graphics/fxtv/Makefile
  20. +3 −3 graphics/ncview/Makefile
  21. +4 −3 graphics/netpbm/Makefile
  22. +3 −2 lang/kaffe/Makefile
  23. +3 −3 lang/pgcc/Makefile
  24. +2 −2 lang/wonka/Makefile
  25. +4 −3 mail/xfmail/Makefile
  26. +4 −3 math/octave-current/Makefile
  27. +3 −3 math/scilab/Makefile
  28. +4 −3 math/xldlas/Makefile
  29. +5 −4 misc/dnetc/Makefile
  30. +4 −5 net/djbdns/Makefile
  31. +4 −5 net/ucspi-tcp/Makefile
  32. +2 −2 news/inn/Makefile
  33. +4 −3 print/ghostscript-esp/Makefile.common
  34. +4 −3 print/ghostscript-gnu/Makefile.common
  35. +4 −4 print/ghostscript-nox11/Makefile.common
  36. +3 −2 security/rc5des/Makefile
  37. +2 −2 sysutils/fix4SA110rev2/Makefile
  38. +2 −2 sysutils/vidc-tools/Makefile
  39. +4 −4 wm/windowmaker/Makefile
  40. +7 −6 x11/kdelibs2/Makefile
  41. +2 −2 x11/xephem/Makefile
  42. +2 −2 x11/xphoon/Makefile
  43. +2 −2 x11/xscreensaver/Makefile.common
View
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/06/02 14:05:02 abs Exp $
+# $NetBSD: Makefile,v 1.11 2003/06/11 20:50:50 abs Exp $
DISTNAME= RasMol_2.7.1
PKGNAME= rasmol-2.7.1
@@ -18,7 +18,7 @@ MAKE_ENV+= DEPTHDEF="${DEPTHDEF}"
.include "../../mk/bsd.prefs.mk"
-.if (${MACHINE_ARCH} == arm32)
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
. include "../../mk/gcc.buildlink2.mk"
.endif
View
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/06/02 14:05:02 abs Exp $
+# $NetBSD: Makefile,v 1.11 2003/06/11 20:50:51 abs Exp $
#
DISTNAME= fastcap-2.0-15Jul92
@@ -24,7 +24,7 @@ HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./config
CONFIGURE_ARGS= 4
-.if (${MACHINE_ARCH} == arm32)
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
. include "../../mk/gcc.buildlink2.mk"
.endif
View
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/06/02 14:05:02 abs Exp $
+# $NetBSD: Makefile,v 1.14 2003/06/11 20:50:51 abs Exp $
#
DISTNAME= fasthenry-3.0-12Nov96
@@ -39,7 +39,7 @@ LIBS= -lm
MAKE_ENV+= LIBS="${LIBS}"
.endif
-.if (${MACHINE_ARCH} == "arm32")
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
. include "../../mk/gcc.buildlink2.mk"
.endif
View
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/07/22 00:13:13 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2003/06/11 20:50:51 abs Exp $
DISTNAME= cdb-0.75
CATEGORIES= databases
@@ -11,10 +11,9 @@ COMMENT= creates and reads constant databases
ALL_TARGET= it
INSTALL_TARGET= setup check
-.if (${MACHINE_ARCH} == "arm32" || ${MACHINE_ARCH} == "arm")
-.if (${CFLAGS:M-O2} == "-O2")
-CFLAGS:= ${CFLAGS:S/-O2/-O0/}
-.endif
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+USE_GCC3=YES
+. include "../../mk/gcc.buildlink2.mk"
.endif
pre-build:
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/03/24 03:06:34 grant Exp $
+# $NetBSD: Makefile,v 1.38 2003/06/11 20:50:51 abs Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
PKGREVISION= 3
@@ -28,8 +28,9 @@ ONLY_FOR_PLATFORM+= NetBSD-*-*
CONFIGURE_ARGS+= --with-mit-threads
# platforms on which included mit-pthreads is usable
-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
. endif
.endif
View
@@ -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-//}
View
@@ -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)
View
@@ -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)
View
@@ -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
@@ -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
View
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/06/04 16:37:25 magick Exp $
+# $NetBSD: Makefile,v 1.25 2003/06/11 20:50:53 abs Exp $
DISTNAME= xemacs-21.5.14
CATEGORIES= editors
@@ -14,7 +14,7 @@ USE_X11= YES
PLIST_SUBST+= EMACSVER=xemacs-21.5-b14
MESSAGE_SUBST+= EMACSVER=xemacs-21.5-b14
-.if (${MACHINE_ARCH} == "arm32")
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
. include "../../mk/gcc.buildlink2.mk"
.endif
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/06/02 01:20:00 jschauma Exp $
+# $NetBSD: Makefile,v 1.14 2003/06/11 20:50:53 abs Exp $
#
DISTNAME= compat13-${MACHINE_ARCH}${PKGMINOR}
@@ -10,9 +10,9 @@ MAINTAINER= tech-pkg@netbsd.org
HOMEPAGE= http://www.netbsd.org/Releases/formal-1.3/index.html
COMMENT= Shared libraries for NetBSD 1.3 (and earlier) compatibility
-ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \
- NetBSD-*-m68k NetBSD-*-mipsel NetBSD-*-ns32k \
- NetBSD-*-sparc
+ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm NetBSD-*-arm32 \
+ NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-mipsel \
+ NetBSD-*-ns32k NetBSD-*-sparc
NOT_FOR_PLATFORM= NetBSD-1.3*-*
NO_MTREE= # defined
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/06/02 01:19:55 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/06/11 20:50:53 abs Exp $
DISTNAME= stella-1.1-src
PKGNAME= stella-1.1
@@ -15,10 +15,8 @@ USE_X11= yes
MAKEFILE= makefile
ALL_TARGET= unix-x
-.if (${MACHINE_ARCH} == arm32 || ${MACHINE_ARCH} == arm)
-.if (${CXXFLAGS:M-O2} == "-O2")
-CXXFLAGS:= ${CXXFLAGS:S/-O2/-O0/}
-.endif
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+. include "../../mk/gcc.buildlink2.mk"
.endif
MAKE_ENV= CXXFLAGS="${CXXFLAGS} -fno-rtti"
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/06/02 14:05:03 abs Exp $
+# $NetBSD: Makefile,v 1.16 2003/06/11 20:50:53 abs Exp $
#
DISTNAME= angband-283
@@ -22,8 +22,8 @@ ALL_TARGET= angband
SPOILERFILE= angband-spoilers.tar.gz
-.if (${MACHINE_ARCH} == arm32)
-. include "../../mk/gcc.buildlink2.mk"
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+. include "../../mk/gcc.buildlink2.mk"
.endif
do-install:
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/06/02 14:05:03 abs Exp $
+# $NetBSD: Makefile,v 1.21 2003/06/11 20:50:54 abs Exp $
#
DISTNAME= angband-3.0.1
@@ -24,7 +24,7 @@ SPOILERFILE= angband-spoilers.tar.gz
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-setgid=games --prefix=${PREFIX}
-.if ${MACHINE_ARCH} == "arm32"
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
. include "../../mk/gcc.buildlink2.mk"
.endif
@@ -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
View
@@ -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
View
@@ -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"
View
@@ -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)
View
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2003/06/02 01:19:00 jschauma Exp $
+# $NetBSD: Makefile,v 1.46 2003/06/11 20:50:55 abs Exp $
#
DISTNAME= kaffe-1.0.7
@@ -17,7 +17,8 @@ USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
TEST_TARGET= check
-ONLY_FOR_PLATFORM= *-*-arm32 *-*-i386 *-*-m68k *-*-mips* *-*-sparc *-*-powerpc
+ONLY_FOR_PLATFORM= *-*-arm *-*-arm32 *-*-i386 *-*-m68k *-*-mips* \
+ *-*-sparc *-*-powerpc
GNU_CONFIGURE= yes
CPPFLAGS+= -Dunix
View
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/03/29 12:41:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2003/06/11 20:50:55 abs Exp $
DISTNAME= gcc-2.95.2
PKGNAME= pgcc-2.95.2.1
@@ -18,8 +18,8 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
# 'Pentium GCC' is optimized for the Intel Pentium processor, but should
# work on all platforms on which GCC works.
-ONLY_FOR_PLATFORM= NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k \
- NetBSD-*-sparc SunOS-*-*
+ONLY_FOR_PLATFORM= NetBSD-*-arm NetBSD-*-arm32 NetBSD-*-i386 \
+ NetBSD-*-m68k NetBSD-*-sparc SunOS-*-*
USE_GMAKE= YES
HAS_CONFIGURE= YES
Oops, something went wrong.

0 comments on commit ed06be8

Please sign in to comment.