diff options
43 files changed, 138 insertions, 128 deletions
diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile index 716fa88c27f..a741ffa3539 100644 --- a/biology/rasmol/Makefile +++ b/biology/rasmol/Makefile @@ -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 diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile index 2129336666f..8a7d11ddece 100644 --- a/cad/fastcap/Makefile +++ b/cad/fastcap/Makefile @@ -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 diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile index 6b2b96e5bd5..8462ec06dcb 100644 --- a/cad/fasthenry/Makefile +++ b/cad/fasthenry/Makefile @@ -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 diff --git a/databases/cdb/Makefile b/databases/cdb/Makefile index 24097ec236b..c4cd1945cde 100644 --- a/databases/cdb/Makefile +++ b/databases/cdb/Makefile @@ -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: diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile index 298c98923a9..99f3daed0ba 100644 --- a/databases/mysql-server/Makefile +++ b/databases/mysql-server/Makefile @@ -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 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 diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile index c97205d2cbb..5dcf5a4bdf0 100644 --- a/editors/xemacs-current/Makefile +++ b/editors/xemacs-current/Makefile @@ -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 diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile index 956a19ee132..98b5decd3c3 100644 --- a/emulators/compat13/Makefile +++ b/emulators/compat13/Makefile @@ -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 diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile index 6d2afe0226d..9f3d0102d23 100644 --- a/emulators/stella/Makefile +++ b/emulators/stella/Makefile @@ -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" diff --git a/games/angband-tty/Makefile b/games/angband-tty/Makefile index 2559365d1d6..544991b16f6 100644 --- a/games/angband-tty/Makefile +++ b/games/angband-tty/Makefile @@ -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: diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile index 80ded1c6e89..27c9d05dd9d 100644 --- a/games/angband-x11/Makefile +++ b/games/angband-x11/Makefile @@ -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 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) diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile index 8cf0f4194e4..5fae8d0572f 100644 --- a/lang/kaffe/Makefile +++ b/lang/kaffe/Makefile @@ -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 diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile index f2f97111c95..2a21d5e583b 100644 --- a/lang/pgcc/Makefile +++ b/lang/pgcc/Makefile @@ -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 diff --git a/lang/wonka/Makefile b/lang/wonka/Makefile index 5564a801d03..c2474a78a1a 100644 --- a/lang/wonka/Makefile +++ b/lang/wonka/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/05/06 17:41:42 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2003/06/11 20:50:56 abs Exp $ # DISTNAME= wonka-src-0.9.5-release @@ -12,7 +12,7 @@ HOMEPAGE= http://wonka.acunia.com/download.html COMMENT= BSD-licenced java virtual machine # This has only been ported to arm and x86 so far. -ONLY_FOR_PLATFORM= *-*-i386 *-*-arm32 +ONLY_FOR_PLATFORM= *-*-i386 *-*-arm *-*-arm32 BUILD_DEPENDS+= acunia-jam>=1.0nb1:../../devel/acunia-jam BUILD_DEPENDS+= jamjar-[0-9]*:../../archivers/jamjar diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile index 2b90f28a940..cd397693cf0 100644 --- a/mail/xfmail/Makefile +++ b/mail/xfmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2003/05/05 16:39:18 jmmv Exp $ +# $NetBSD: Makefile,v 1.30 2003/06/11 20:50:56 abs Exp $ DISTNAME= xfmail-1.4.7 PKGREVISION= 4 @@ -10,8 +10,9 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://xfmail.slappy.org/ COMMENT= Xforms based mail application for Unix operating systems -ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k \ - NetBSD-*-mipsel NetBSD-*-ns32k NetBSD-*-sparc NetBSD-*-powerpc +ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm NetBSD-*-arm32 \ + NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-mipsel \ + NetBSD-*-ns32k NetBSD-*-sparc NetBSD-*-powerpc RESTRICTED= "Selling this software requires permission of the authors." NO_SRC_ON_CDROM= ${RESTRICTED} diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile index d9a01a41a8f..00871984a97 100644 --- a/math/octave-current/Makefile +++ b/math/octave-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2003/06/02 01:18:29 jschauma Exp $ +# $NetBSD: Makefile,v 1.16 2003/06/11 20:50:56 abs Exp $ DISTNAME= octave-2.1.33 PKGNAME= octave-2.1.34 @@ -22,8 +22,9 @@ BUILD_DEPENDS+= teTeX>=1.0.7:../../print/teTeX DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot DEPENDS+= readline>=4.0:../../devel/readline -.if (${MACHINE_ARCH} == "arm32") -BROKEN= Internal compiler error occurs on arm32 (even with gcc-2.95.3) +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" +USE_GCC3=YES +. include "../../mk/gcc.buildlink2.mk" .endif USE_X11= yes diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 2fe5feb5bc7..e2828f5f4d6 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2003/06/02 14:05:06 abs Exp $ +# $NetBSD: Makefile,v 1.38 2003/06/11 20:50:56 abs Exp $ # DISTNAME= ${SCIBASE}.src @@ -62,8 +62,8 @@ post-install: ${RM} -f ${PREFIX}/lib/${PKGNAME}/config/Makeso.incl.in.orig ${RM} -f ${PREFIX}/lib/${PKGNAME}/macros/util/scipad.sci.orig -.if ${MACHINE_ARCH} == "arm32" -.include "../../mk/gcc.buildlink2.mk" +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" +. include "../../mk/gcc.buildlink2.mk" .endif # the "SCI=0 && unset SCI" is done because some of the tests really will diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile index fe90075bdc2..c26997a8f77 100644 --- a/math/xldlas/Makefile +++ b/math/xldlas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2003/06/02 01:18:20 jschauma Exp $ +# $NetBSD: Makefile,v 1.17 2003/06/11 20:50:57 abs Exp $ # FreeBSD Id: Makefile,v 1.5 1998/09/26 23:18:07 steve Exp # @@ -14,8 +14,9 @@ MAINTAINER= tech-pkg@netbsd.org HOMEPAGE= http://sunsite.math.klte.hu/mirrors/xldlas/ COMMENT= XForms-based statistics package -ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k \ - NetBSD-*-mipsel NetBSD-*-ns32k NetBSD-*-sparc NetBSD-*-powerpc +ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm NetBSD-*-arm32 \ + NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-mipsel \ + NetBSD-*-ns32k NetBSD-*-sparc NetBSD-*-powerpc USE_BUILDLINK2= yes USE_X11BASE= yes diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile index 97bb9c165cc..255c534d38b 100644 --- a/misc/dnetc/Makefile +++ b/misc/dnetc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/06/02 01:18:16 jschauma Exp $ +# $NetBSD: Makefile,v 1.5 2003/06/11 20:50:57 abs Exp $ DISTNAME= ${DISTNAME_${OPSYS}_${MACHINE_ARCH}} PKGNAME= dnetc-2.8015.469 @@ -10,15 +10,16 @@ MAINTAINER= tech-pkg@netbsd.org HOMEPAGE= http://www.distributed.net/ COMMENT= official distributed.net client -ONLY_FOR_PLATFORM= Darwin-*-powerpc NetBSD-*-alpha NetBSD-*-arm32 \ - NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-sparc \ - SunOS-*-sparc +ONLY_FOR_PLATFORM= Darwin-*-powerpc NetBSD-*-alpha NetBSD-*-arm \ + NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k \ + NetBSD-*-sparc SunOS-*-sparc NO_BUILD= YES USE_PKGINSTALL= YES DISTNAME_Darwin_powerpc= dnetc-darwin-ppc DISTNAME_NetBSD_m68k= dnetc-netbsd-68k DISTNAME_NetBSD_alpha= dnetc-netbsd-alpha +DISTNAME_NetBSD_arm= dnetc-netbsd-arm32 DISTNAME_NetBSD_arm32= dnetc-netbsd-arm32 DISTNAME_NetBSD_i386= dnetc-netbsd-i386-elf DISTNAME_NetBSD_sparc= dnetc-netbsd-sparc-elf diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile index 85d60cf2f99..0255f5f030d 100644 --- a/net/djbdns/Makefile +++ b/net/djbdns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2003/03/29 21:55:19 salo Exp $ +# $NetBSD: Makefile,v 1.23 2003/06/11 20:50:57 abs Exp $ # FreeBSD Id: ports/net/djbdns/Makefile,v 1.4 2000/09/28 18:18:41 nbm Exp # @@ -37,10 +37,9 @@ INSTALL_TARGET= setup check MANVERSION= 20021211 -.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 post-extract: diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile index 8daa78ce86a..e8cd1fa29c1 100644 --- a/net/ucspi-tcp/Makefile +++ b/net/ucspi-tcp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/12/16 12:42:58 cjep Exp $ +# $NetBSD: Makefile,v 1.13 2003/06/11 20:50:57 abs Exp $ # FreeBSD Id: ports/sysutils/ucspi-tcp/Makefile,v 1.12 2000/07/10 01:41:24 steve Exp DISTNAME= ucspi-tcp-0.88 @@ -20,10 +20,9 @@ NO_BIN_ON_FTP= ${RESTRICTED} 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 post-configure: diff --git a/news/inn/Makefile b/news/inn/Makefile index 96ea44db2b8..1ffcb8d238d 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2003/06/02 14:05:07 abs Exp $ +# $NetBSD: Makefile,v 1.44 2003/06/11 20:50:57 abs Exp $ DISTNAME= inn-${INN_VERSION} CATEGORIES= news @@ -84,7 +84,7 @@ CONFIGURE_ARGS+= --with-sendmail=/usr/lib/sendmail CONFIGURE_ARGS+= --with-sendmail=/usr/sbin/sendmail .endif -.if (${MACHINE_ARCH} == arm32) +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" . include "../../mk/gcc.buildlink2.mk" .endif diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common index 78ce49f8e46..aa2cd65a117 100644 --- a/print/ghostscript-esp/Makefile.common +++ b/print/ghostscript-esp/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2003/05/28 03:28:05 jlam Exp $ +# $NetBSD: Makefile.common,v 1.6 2003/06/11 20:50:58 abs Exp $ DISTNAME= espgs-${GS_VERS}-source BASEGS_VERS= 7.05 @@ -92,6 +92,7 @@ post-install: .include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" -.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32" -CFLAGS+= -O0 +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" +USE_GCC3=YES +. include "../../mk/gcc.buildlink2.mk" .endif diff --git a/print/ghostscript-gnu/Makefile.common b/print/ghostscript-gnu/Makefile.common index b60b3e18ec7..fc3005dcf22 100644 --- a/print/ghostscript-gnu/Makefile.common +++ b/print/ghostscript-gnu/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2003/03/14 19:37:54 jlam Exp $ +# $NetBSD: Makefile.common,v 1.7 2003/06/11 20:50:58 abs Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 7.05 @@ -82,6 +82,7 @@ post-install: .include "../../graphics/png/buildlink2.mk" .include "../../mk/bsd.pkg.mk" -.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32" -CFLAGS+= -O0 +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" +USE_GCC3=YES +. include "../../mk/gcc.buildlink2.mk" .endif diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common index 89e1e405656..c1df704bf16 100644 --- a/print/ghostscript-nox11/Makefile.common +++ b/print/ghostscript-nox11/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.45 2003/06/02 14:05:07 abs Exp $ +# $NetBSD: Makefile.common,v 1.46 2003/06/11 20:50:58 abs Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 6.01 @@ -300,7 +300,7 @@ post-install: .include "../../print/ja-vflib-lib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" -# arm32 compiler has an optimizer problem -.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32" -CFLAGS+= -O0 +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" +USE_GCC3=YES +. include "../../mk/gcc.buildlink2.mk" .endif diff --git a/security/rc5des/Makefile b/security/rc5des/Makefile index 079c779e489..3f3af2b0a89 100644 --- a/security/rc5des/Makefile +++ b/security/rc5des/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/06/02 01:17:05 jschauma Exp $ +# $NetBSD: Makefile,v 1.14 2003/06/11 20:50:58 abs Exp $ # DISTNAME= rc5-mlg-004 @@ -26,7 +26,8 @@ DEPENDS+= compat12-[0-9]*:../../emulators/compat12 .endif .endif -ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 +ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm NetBSD-*-arm32 \ + NetBSD-*-i386 CRYPTO= yes NO_CONFIGURE= yes diff --git a/sysutils/fix4SA110rev2/Makefile b/sysutils/fix4SA110rev2/Makefile index 3d91af42d90..da09dfcf34e 100644 --- a/sysutils/fix4SA110rev2/Makefile +++ b/sysutils/fix4SA110rev2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:28 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2003/06/11 20:50:59 abs Exp $ # DISTNAME= fix4SA110rev2-1.0 @@ -11,7 +11,7 @@ MAINTAINER= abs@netbsd.org HOMEPAGE= ftp://ftp.netbsd.org/pub/NetBSD/arch/arm32/misc/fix4SA110rev2.README COMMENT= Modify arm32 binaries to work around SA rev2 problems -ONLY_FOR_PLATFORM= NetBSD-*-arm32 +ONLY_FOR_PLATFORM= NetBSD-*-arm NetBSD-*-arm32 EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC} do-build: diff --git a/sysutils/vidc-tools/Makefile b/sysutils/vidc-tools/Makefile index a488e386f18..49e66bba9c7 100644 --- a/sysutils/vidc-tools/Makefile +++ b/sysutils/vidc-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:33 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2003/06/11 20:50:59 abs Exp $ # DISTNAME= misc-src-riscpc @@ -10,6 +10,6 @@ MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/arch/arm32/misc/ MAINTAINER= abs@netbsd.org COMMENT= Tools for the VIDC console used by NetBSD/arm32 on RiscPC -ONLY_FOR_PLATFORM= NetBSD-*-arm32 +ONLY_FOR_PLATFORM= NetBSD-*-arm NetBSD-*-arm32 .include "../../mk/bsd.pkg.mk" diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index d39ca24366d..87817431a6f 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2003/04/27 12:41:38 cjep Exp $ +# $NetBSD: Makefile,v 1.35 2003/06/11 20:50:59 abs Exp $ DISTNAME= WindowMaker-0.80.2 PKGNAME= windowmaker-0.80.2 @@ -93,7 +93,7 @@ post-install: .include "../../mk/bsd.pkg.mk" -# "egcs" has an optimizer problem on "arm32". -.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32" -CFLAGS:= -O0 +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" +USE_GCC3=YES +. include "../../mk/gcc.buildlink2.mk" .endif 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 |