11 files changed, 41 insertions, 8 deletions

diff --git a/devel/i386-rtems-gcc/Makefile b/devel/i386-rtems-gcc/Makefile
index e86d50666675..0bdfad4348e9 100644
--- a/devel/i386-rtems-gcc/Makefile
+++ b/devel/i386-rtems-gcc/Makefile
@@ -7,14 +7,15 @@
 
 PORTNAME=	gcc
 PORTVERSION=	2.95.2
+PORTREVISION=	9
 CATEGORIES=	devel
-MASTER_SITES=   ftp://ftp.oarcorp.com/pub/rtems/betas/rtems-4.5.0-beta/c_tools/source/ \
-		http://www.thehousleys.net/rtems-4.5.0b3/
+MASTER_SITES=   ftp://ftp.oarcorp.com/pub/rtems/snapshots/c_tools/source/ \
+		http://rtems.thehousleys.net/
 DISTFILES=	${GCCNAME}.tar.gz ${NEWLIBNAME}.tar.gz
-PATCHFILES=	${GCCNAME}-rtems-20000531.diff.gz \
-		${NEWLIBNAME}-rtems-20000606.diff.gz
-PATCH_SITES=	ftp://ftp.oarcorp.com/pub/rtems/betas/rtems-4.5.0-beta/c_tools/source/ \
-		http://www.thehousleys.net/rtems-4.5.0b3/
+PATCHFILES=	${GCCNAME}-rtems-20000724.diff.gz \
+		${NEWLIBNAME}-rtems-20000828.diff
+PATCH_SITES=	ftp://ftp.oarcorp.com/pub/rtems/snapshots/c_tools/source/ \
+		http://rtems.thehousleys.net/
 
 MAINTAINER=	jim@thehousleys.net
 
diff --git a/devel/i386-rtems-gcc/distinfo b/devel/i386-rtems-gcc/distinfo
index 1812cfe4a2fd..4ae74ef6e820 100644
--- a/devel/i386-rtems-gcc/distinfo
+++ b/devel/i386-rtems-gcc/distinfo
@@ -1,4 +1,4 @@
-MD5 (rtems/gcc-2.95.2-rtems-20000531.diff.gz) = e62392e923fcfb4b472b5440903c618e
 MD5 (rtems/gcc-2.95.2.tar.gz) = 1bf15194e6b99d088133b1d28176d949
-MD5 (rtems/newlib-1.8.2-rtems-20000606.diff.gz) = ab84b0f07d4c07756ac37861679e4f5d
 MD5 (rtems/newlib-1.8.2.tar.gz) = b4df8090127da174e42852dd200a42db
+MD5 (rtems/gcc-2.95.2-rtems-20000724.diff.gz) = 124dd38318d144559a68bd85a3825f8b
+MD5 (rtems/newlib-1.8.2-rtems-20000828.diff) = 50cb8cd7b913573537265007b4869eff
diff --git a/devel/i386-rtems-gcc/files/patch-aa b/devel/i386-rtems-gcc/files/patch-aa
new file mode 100644
index 000000000000..65fab12ee974
--- /dev/null
+++ b/devel/i386-rtems-gcc/files/patch-aa
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	Tue Jun 22 18:44:42 1999
++++ Makefile.in	Tue Aug 29 17:54:58 2000
+@@ -689,7 +689,6 @@
+ 	install-itcl \
+ 	install-ld \
+ 	install-libgui \
+-	install-libiberty \
+ 	install-libtool \
+ 	install-m4 \
+ 	install-make \
diff --git a/devel/i386-rtems-gcc/pkg-plist.i386-rtems b/devel/i386-rtems-gcc/pkg-plist.i386-rtems
index ef263e93febe..df1510511248 100644
--- a/devel/i386-rtems-gcc/pkg-plist.i386-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.i386-rtems
@@ -1,3 +1,4 @@
+bin/i386-rtems-c++filt
 bin/i386-rtems-c++
 bin/i386-rtems-g++
 bin/cpp
@@ -233,6 +234,10 @@ lib/gcc-lib/i386-rtems/2.95.2/specs
 lib/gcc-lib/i386-rtems/2.95.2/cpp
 lib/gcc-lib/i386-rtems/2.95.2/libgcc.a
 lib/gcc-lib/i386-rtems/2.95.2/cc1plus
+lib/gcc-lib/i386-rtems/2.95.2/soft-float/libstdc++.a
+lib/gcc-lib/i386-rtems/2.95.2/soft-float/libgcc.a
+lib/gcc-lib/i386-rtems/2.95.2/soft-float/crtbegin.o
+lib/gcc-lib/i386-rtems/2.95.2/soft-float/crtend.o
 i386-rtems/bin/gcc
 i386-rtems/lib/libm.a
 i386-rtems/lib/libc.a
@@ -240,6 +245,12 @@ i386-rtems/lib/crt0.o
 i386-rtems/lib/libg.a
 i386-rtems/lib/libiberty.a
 i386-rtems/lib/libstdc++.a.2.10.0
+i386-rtems/lib/soft-float/libm.a
+i386-rtems/lib/soft-float/libstdc++.a.2.10.0
+i386-rtems/lib/soft-float/libc.a
+i386-rtems/lib/soft-float/crt0.o
+i386-rtems/lib/soft-float/libg.a
+i386-rtems/lib/soft-float/libiberty.a
 i386-rtems/include/_ansi.h
 i386-rtems/include/_syslist.h
 i386-rtems/include/ar.h
@@ -302,11 +313,13 @@ i386-rtems/include/sys/siginfo.h
 i386-rtems/include/pthread.h
 i386-rtems/include/_G_config.h
 @dirrm lib/gcc-lib/i386-rtems/2.95.2/include
+@dirrm lib/gcc-lib/i386-rtems/2.95.2/soft-float
 @dirrm lib/gcc-lib/i386-rtems/2.95.2
 @dirrm lib/gcc-lib/i386-rtems
 @dirrm lib/gcc-lib
 @dirrm i386-rtems/include/machine
 @dirrm i386-rtems/include/sys
 @dirrm i386-rtems/include
+@dirrm i386-rtems/lib/soft-float
 @dirrm include/g++-3/std
 @dirrm include/g++-3
diff --git a/devel/i386-rtems-gcc/pkg-plist.i960-rtems b/devel/i386-rtems-gcc/pkg-plist.i960-rtems
index 6ee0864ea0ba..f678487d26a7 100644
--- a/devel/i386-rtems-gcc/pkg-plist.i960-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.i960-rtems
@@ -1,3 +1,4 @@
+bin/i960-rtems-c++filt
 bin/cpp
 bin/i960-rtems-gcc
 bin/i960-rtems-c++
diff --git a/devel/i386-rtems-gcc/pkg-plist.m68k-rtems b/devel/i386-rtems-gcc/pkg-plist.m68k-rtems
index 022aabe3bec9..cc000f1faa6b 100644
--- a/devel/i386-rtems-gcc/pkg-plist.m68k-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.m68k-rtems
@@ -1,3 +1,4 @@
+bin/m68k-rtems-c++filt
 bin/m68k-rtems-c++
 bin/m68k-rtems-g++
 bin/cpp
diff --git a/devel/i386-rtems-gcc/pkg-plist.mips-rtems b/devel/i386-rtems-gcc/pkg-plist.mips-rtems
index 4d6cb90e7bf8..3a802d7e7ab1 100644
--- a/devel/i386-rtems-gcc/pkg-plist.mips-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.mips-rtems
@@ -1,3 +1,4 @@
+bin/mips64orion-rtems-c++filt
 bin/cpp
 bin/mips64orion-rtems-gcc
 bin/mips64orion-rtems-g++
diff --git a/devel/i386-rtems-gcc/pkg-plist.mips64orion-rtems b/devel/i386-rtems-gcc/pkg-plist.mips64orion-rtems
index 4d6cb90e7bf8..3a802d7e7ab1 100644
--- a/devel/i386-rtems-gcc/pkg-plist.mips64orion-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.mips64orion-rtems
@@ -1,3 +1,4 @@
+bin/mips64orion-rtems-c++filt
 bin/cpp
 bin/mips64orion-rtems-gcc
 bin/mips64orion-rtems-g++
diff --git a/devel/i386-rtems-gcc/pkg-plist.powerpc-rtems b/devel/i386-rtems-gcc/pkg-plist.powerpc-rtems
index ddb5f0253787..8c5ba2ace150 100644
--- a/devel/i386-rtems-gcc/pkg-plist.powerpc-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.powerpc-rtems
@@ -1,3 +1,4 @@
+bin/powerpc-rtems-c++filt
 bin/cpp
 bin/powerpc-rtems-gcc
 bin/powerpc-rtems-g++
diff --git a/devel/i386-rtems-gcc/pkg-plist.sh-rtems b/devel/i386-rtems-gcc/pkg-plist.sh-rtems
index 291f3a081567..920a5c3902b9 100644
--- a/devel/i386-rtems-gcc/pkg-plist.sh-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.sh-rtems
@@ -1,3 +1,4 @@
+bin/sh-rtems-c++filt
 bin/cpp
 bin/sh-rtems-gcc
 bin/sh-rtems-c++
diff --git a/devel/i386-rtems-gcc/pkg-plist.sparc-rtems b/devel/i386-rtems-gcc/pkg-plist.sparc-rtems
index 236234423529..a05c692a71a6 100644
--- a/devel/i386-rtems-gcc/pkg-plist.sparc-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.sparc-rtems
@@ -1,3 +1,4 @@
+bin/sparc-rtems-c++filt
 bin/cpp
 bin/sparc-rtems-gcc
 bin/sparc-rtems-c++
@@ -232,6 +233,8 @@ lib/gcc-lib/sparc-rtems/2.95.2/specs
 lib/gcc-lib/sparc-rtems/2.95.2/cpp
 lib/gcc-lib/sparc-rtems/2.95.2/libgcc.a
 lib/gcc-lib/sparc-rtems/2.95.2/soft/libgcc.a
+lib/gcc-lib/sparc-rtems/2.95.2/soft/crtbegin.o
+lib/gcc-lib/sparc-rtems/2.95.2/soft/crtend.o
 lib/gcc-lib/sparc-rtems/2.95.2/cc1plus
 lib/gcc-lib/sparc-rtems/2.95.2/soft/libstdc++.a
 lib/gcc-lib/sparc-rtems/2.95.2/libstdc++.a