Update to GCC 2.95.3.

5 files changed, 82 insertions, 167 deletions

diff --git a/devel/arm-aout-gcc295/Makefile b/devel/arm-aout-gcc295/Makefile
index 179f31cdebac..4bafee300e7a 100644
--- a/devel/arm-aout-gcc295/Makefile
+++ b/devel/arm-aout-gcc295/Makefile
@@ -6,27 +6,37 @@
 # $FreeBSD$
 #
 
-PORTNAME=	arm-aout-gcc295
-PORTVERSION=	2.95.2
+PORTNAME=	gcc
+PORTVERSION=	2.95.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	gcc/releases/${DISTNAME}
-DISTNAME=	gcc-2.95.2
+PKGNAMEPREFIX=	arm-aout-
+PKGNAMESUFFIX=	295
+DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-g++-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	pbecke@javagear.com
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - -T ${FILESDIR}/tlist -X ${FILESDIR}/xlist
-
+GCC_REV=	${DISTNAME:S/gcc-//g}
+PLIST_SUB+=	GCC_REV=${GCC_REV}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--target=arm-aout --with-gnu-as --with-gnu-ld --with-newlib
+CONFIGURE_ARGS=	--target=arm-aout --with-gnu-as --with-gnu-ld --with-newlib \
+		--enable-languages="c,c++"
+.if defined(DEFAULT_CPU)
+CONFIGURE_ARGS+=--with-cpu="${DEFAULT_CPU}"
+.endif
 MAKE_FLAGS=	LANGUAGES="c c++"
-MAN1=		arm-aout-addr2line.1 arm-aout-ar.1 arm-aout-as.1	\
-		arm-aout-c++filt.1 arm-aout-ld.1 arm-aout-nlmconv.1	\
-		arm-aout-nm.1 arm-aout-objcopy.1 arm-aout-objdump.1	\
-		arm-aout-ranlib.1 arm-aout-size.1 arm-aout-strings.1	\
-		arm-aout-strip.1
+
+.if !defined(DEFAULT_CPU)
+pre-extract:
+	@${ECHO}
+	@${ECHO} "You can specify a default cpu target for gcc by setting DEFAULT_CPU to the"
+	@${ECHO} "appropriate target (e.g., strongarm1100)."
+	@${ECHO}
+.endif
 
 post-extract:
 	${MKDIR} ${WRKSRC}/gcc/target
@@ -44,7 +54,7 @@ do-install:
 	cd ${WRKSRC}/gcc ; ${GMAKE} install
 	${LN} -f ${PREFIX}/bin/arm-aout-g++ ${PREFIX}/arm-aout/bin/g++
 	${LN} -f ${PREFIX}/bin/arm-aout-c++filt ${PREFIX}/arm-aout/bin/c++filt
-	cd ${PREFIX}/lib ; ${MV} -f libbfd.* libiberty.* libopcodes.*  \
-		${PREFIX}/lib/gcc-lib/arm-aout/${PORTVERSION}
+	@${MV} ${PREFIX}/bin/cpp ${PREFIX}/bin/${PKGNAMEPREFIX}cpp
+	@${MV} ${PREFIX}/bin/gcov ${PREFIX}/bin/${PKGNAMEPREFIX}gcov
 
 .include <bsd.port.mk>
diff --git a/devel/arm-aout-gcc295/distinfo b/devel/arm-aout-gcc295/distinfo
index d9a40a49ef5c..9e8346c42f21 100644
--- a/devel/arm-aout-gcc295/distinfo
+++ b/devel/arm-aout-gcc295/distinfo
@@ -1 +1,3 @@
-MD5 (gcc-2.95.2.tar.bz2) = 7caa851b4a360b6ff027897f455348d5
+MD5 (gcc-core-2.95.3.tar.bz2) = 56dc4de966a54e4c511f65e525f9c0fe
+MD5 (gcc-g++-2.95.3.tar.bz2) = ce600888f39443a25ad325cc886e7d16
+MD5 (gcc-objc-2.95.3.tar.bz2) = be118925cd045d0d6d294c27ddb09647
diff --git a/devel/arm-aout-gcc295/files/tlist b/devel/arm-aout-gcc295/files/tlist
deleted file mode 100644
index 81965756282c..000000000000
--- a/devel/arm-aout-gcc295/files/tlist
+++ /dev/null
@@ -1,52 +0,0 @@
-gcc-2.95.2/config.if
-gcc-2.95.2/symlink-tree
-gcc-2.95.2/ylwrap
-gcc-2.95.2/move-if-change
-gcc-2.95.2/config.sub
-gcc-2.95.2/config-ml.in
-gcc-2.95.2/install-sh
-gcc-2.95.2/ltconfig
-gcc-2.95.2/ltmain.sh
-gcc-2.95.2/include
-gcc-2.95.2/install
-gcc-2.95.2/libiberty
-gcc-2.95.2/mkinstalldirs
-gcc-2.95.2/gcc/config/arm
-gcc-2.95.2/gcc/config/i386
-gcc-2.95.2/gcc/config/*.[ch]
-gcc-2.95.2/gcc/config/t-netbsd
-gcc-2.95.2/gcc/cp
-gcc-2.95.2/gcc/ginclude
-gcc-2.95.2/gcc/fixinc
-gcc-2.95.2/gcc/po
-gcc-2.95.2/gcc/intl
-gcc-2.95.2/gcc/*.[chy]
-gcc-2.95.2/gcc/README*
-gcc-2.95.2/gcc/*.def
-gcc-2.95.2/gcc/build-make
-gcc-2.95.2/gcc/cross-make
-gcc-2.95.2/gcc/configure
-gcc-2.95.2/gcc/dostage2
-gcc-2.95.2/gcc/dostage3
-gcc-2.95.2/gcc/exgettext
-gcc-2.95.2/gcc/fixcpp
-gcc-2.95.2/gcc/fixincludes
-gcc-2.95.2/gcc/fixproto
-gcc-2.95.2/gcc/genmultilib
-gcc-2.95.2/gcc/INSTALL
-gcc-2.95.2/gcc/listing
-gcc-2.95.2/gcc/just-fixinc
-gcc-2.95.2/gcc/mkinstalldirs
-gcc-2.95.2/gcc/move-if-change
-gcc-2.95.2/gcc/sort-protos
-gcc-2.95.2/gcc/cpp.fns
-gcc-2.95.2/gcc/configure.frag
-gcc-2.95.2/gcc/c-parse.gperf
-gcc-2.95.2/gcc/config.guess
-gcc-2.95.2/gcc/*.in
-gcc-2.95.2/gcc/configure.lang
-gcc-2.95.2/gcc/aclocal.m4
-gcc-2.95.2/gcc/*.com
-gcc-2.95.2/gcc/*.sed
-gcc-2.95.2/gcc/*.sh
-gcc-2.95.2/gcc/*.texi
diff --git a/devel/arm-aout-gcc295/files/xlist b/devel/arm-aout-gcc295/files/xlist
deleted file mode 100644
index 8aa3c1a87b60..000000000000
--- a/devel/arm-aout-gcc295/files/xlist
+++ /dev/null
@@ -1,41 +0,0 @@
-gcc-2.95.2/gcc/ch/*
-gcc-2.95.2/gcc/f/*
-gcc-2.95.2/gcc/java/*
-gcc-2.95.2/gcc/objc/*
-gcc-2.95.2/gcc/testsuite/*
-gcc-2.95.2/gcc/config/1750a/*
-gcc-2.95.2/gcc/config/a29k/*
-gcc-2.95.2/gcc/config/alpha/*
-gcc-2.95.2/gcc/config/arc/*
-gcc-2.95.2/gcc/config/c4x/*
-gcc-2.95.2/gcc/config/clipper/*
-gcc-2.95.2/gcc/config/convex/*
-gcc-2.95.2/gcc/config/dsp16xx/*
-gcc-2.95.2/gcc/config/elxsi/*
-gcc-2.95.2/gcc/config/fx80/*
-gcc-2.95.2/gcc/config/gmicro/*
-gcc-2.95.2/gcc/config/h8300/*
-gcc-2.95.2/gcc/config/i370/*
-gcc-2.95.2/gcc/config/i860/*
-gcc-2.95.2/gcc/config/i960/*
-gcc-2.95.2/gcc/config/m32r/*
-gcc-2.95.2/gcc/config/m68k/*
-gcc-2.95.2/gcc/config/m88k/*
-gcc-2.95.2/gcc/config/mips/*
-gcc-2.95.2/gcc/config/mn10200/*
-gcc-2.95.2/gcc/config/mn10300/*
-gcc-2.95.2/gcc/config/msdos/*
-gcc-2.95.2/gcc/config/ns32k/*
-gcc-2.95.2/gcc/config/pa/*
-gcc-2.95.2/gcc/config/pdp11/*
-gcc-2.95.2/gcc/config/pyr/*
-gcc-2.95.2/gcc/config/romp/*
-gcc-2.95.2/gcc/config/rs6000/*
-gcc-2.95.2/gcc/config/sh/*
-gcc-2.95.2/gcc/config/sparc/*
-gcc-2.95.2/gcc/config/spur/*
-gcc-2.95.2/gcc/config/tahoe/*
-gcc-2.95.2/gcc/config/v850/*
-gcc-2.95.2/gcc/config/vax/*
-gcc-2.95.2/gcc/config/we32k/*
-gcc-2.95.2/gcc/config/winnt/*
diff --git a/devel/arm-aout-gcc295/pkg-plist b/devel/arm-aout-gcc295/pkg-plist
index fa3decde025b..246d9588e9a8 100644
--- a/devel/arm-aout-gcc295/pkg-plist
+++ b/devel/arm-aout-gcc295/pkg-plist
@@ -7,69 +7,65 @@ bin/arm-aout-g++
 bin/arm-aout-gcc
 bin/arm-aout-protoize
 bin/arm-aout-unprotoize
-bin/gcov
+bin/arm-aout-cpp
+bin/arm-aout-gcov
 include/ansidecl.h
-include/bfd.h
-include/bfdlink.h
-lib/gcc-lib/arm-aout/2.95.2/SYSCALLS.c.X
-lib/gcc-lib/arm-aout/2.95.2/be/fpu/libgcc.a
-lib/gcc-lib/arm-aout/2.95.2/be/libgcc.a
-lib/gcc-lib/arm-aout/2.95.2/cc1
-lib/gcc-lib/arm-aout/2.95.2/cc1plus
-lib/gcc-lib/arm-aout/2.95.2/collect2
-lib/gcc-lib/arm-aout/2.95.2/cpp
-lib/gcc-lib/arm-aout/2.95.2/fpu/libgcc.a
-lib/gcc-lib/arm-aout/2.95.2/include/README
-lib/gcc-lib/arm-aout/2.95.2/include/assert.h
-lib/gcc-lib/arm-aout/2.95.2/include/exception
-lib/gcc-lib/arm-aout/2.95.2/include/fixed
-lib/gcc-lib/arm-aout/2.95.2/include/float.h
-lib/gcc-lib/arm-aout/2.95.2/include/iso646.h
-lib/gcc-lib/arm-aout/2.95.2/include/limits.h
-lib/gcc-lib/arm-aout/2.95.2/include/new
-lib/gcc-lib/arm-aout/2.95.2/include/new.h
-lib/gcc-lib/arm-aout/2.95.2/include/proto.h
-lib/gcc-lib/arm-aout/2.95.2/include/stdarg.h
-lib/gcc-lib/arm-aout/2.95.2/include/stdbool.h
-lib/gcc-lib/arm-aout/2.95.2/include/stddef.h
-lib/gcc-lib/arm-aout/2.95.2/include/syslimits.h
-lib/gcc-lib/arm-aout/2.95.2/include/typeinfo
-lib/gcc-lib/arm-aout/2.95.2/include/va-alpha.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-arc.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-c4x.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-clipper.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-h8300.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-i860.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-i960.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-m32r.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-m88k.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-mips.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-mn10200.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-mn10300.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-pa.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-ppc.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-pyr.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-sh.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-sparc.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-spur.h
-lib/gcc-lib/arm-aout/2.95.2/include/va-v850.h
-lib/gcc-lib/arm-aout/2.95.2/include/varargs.h
-lib/gcc-lib/arm-aout/2.95.2/le/fpu/libgcc.a
-lib/gcc-lib/arm-aout/2.95.2/le/libgcc.a
-lib/gcc-lib/arm-aout/2.95.2/libgcc.a
-lib/gcc-lib/arm-aout/2.95.2/specs
-lib/gcc-lib/arm-aout/2.95.2/libbfd.a
-lib/gcc-lib/arm-aout/2.95.2/libiberty.a
-lib/gcc-lib/arm-aout/2.95.2/libopcodes.a
+lib/gcc-lib/arm-aout/%%GCC_REV%%/SYSCALLS.c.X
+lib/gcc-lib/arm-aout/%%GCC_REV%%/be/fpu/libgcc.a
+lib/gcc-lib/arm-aout/%%GCC_REV%%/be/libgcc.a
+lib/gcc-lib/arm-aout/%%GCC_REV%%/cc1
+lib/gcc-lib/arm-aout/%%GCC_REV%%/cc1plus
+lib/gcc-lib/arm-aout/%%GCC_REV%%/collect2
+lib/gcc-lib/arm-aout/%%GCC_REV%%/cpp0
+lib/gcc-lib/arm-aout/%%GCC_REV%%/fpu/libgcc.a
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/README
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/assert.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/exception
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/fixed
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/float.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/iso646.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/limits.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/new
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/new.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/proto.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/stdarg.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/stdbool.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/stddef.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/syslimits.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/typeinfo
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-alpha.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-arc.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-c4x.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-clipper.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-h8300.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-i860.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-i960.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-m32r.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-m88k.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-mips.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-mn10200.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-mn10300.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-pa.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-ppc.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-pyr.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-sh.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-sparc.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-spur.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/va-v850.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/include/varargs.h
+lib/gcc-lib/arm-aout/%%GCC_REV%%/le/fpu/libgcc.a
+lib/gcc-lib/arm-aout/%%GCC_REV%%/le/libgcc.a
+lib/gcc-lib/arm-aout/%%GCC_REV%%/libgcc.a
+lib/gcc-lib/arm-aout/%%GCC_REV%%/specs
 @dirrm arm-aout/bin
 @dirrm arm-aout
-@dirrm lib/gcc-lib/arm-aout/2.95.2/include
-@dirrm lib/gcc-lib/arm-aout/2.95.2/be/fpu
-@dirrm lib/gcc-lib/arm-aout/2.95.2/be
-@dirrm lib/gcc-lib/arm-aout/2.95.2/le/fpu
-@dirrm lib/gcc-lib/arm-aout/2.95.2/le
-@dirrm lib/gcc-lib/arm-aout/2.95.2/fpu
-@dirrm lib/gcc-lib/arm-aout/2.95.2
+@dirrm lib/gcc-lib/arm-aout/%%GCC_REV%%/include
+@dirrm lib/gcc-lib/arm-aout/%%GCC_REV%%/be/fpu
+@dirrm lib/gcc-lib/arm-aout/%%GCC_REV%%/be
+@dirrm lib/gcc-lib/arm-aout/%%GCC_REV%%/le/fpu
+@dirrm lib/gcc-lib/arm-aout/%%GCC_REV%%/le
+@dirrm lib/gcc-lib/arm-aout/%%GCC_REV%%/fpu
+@dirrm lib/gcc-lib/arm-aout/%%GCC_REV%%
 @dirrm lib/gcc-lib/arm-aout
 @dirrm lib/gcc-lib
 @dirrm lib