Update to version 2.10 of binutils. Also changed PLIST to

prevent "extra files" with the other RTEMS ports.

PR:		20930
Submitted by:	maintainer

11 files changed, 60 insertions, 19 deletions

diff --git a/devel/i386-rtems-binutils/Makefile b/devel/i386-rtems-binutils/Makefile
index 42183197d86..8a5cef924d6 100644
--- a/devel/i386-rtems-binutils/Makefile
+++ b/devel/i386-rtems-binutils/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	binutils
-PORTVERSION=	2.9.5.0.24
+PORTVERSION=	2.10
+PORTREVISION=	2
 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/
-PATCHFILES=	${BINNAME}-rtems-20000207.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/
+MASTER_SITES=	ftp://ftp.oarcorp.com/pub/rtems/snapshots/c_tools/source/ \
+		http://rtems.thehousleys.net/
+DISTFILES=	${BINNAME}.tar.gz
+PATCHFILES=	${BINNAME}-rtems-20000726.diff.gz
+PATCH_SITES=	ftp://ftp.oarcorp.com/pub/rtems/snapshots/c_tools/source/ \
+		http://rtems.thehousleys.net/
 
 MAINTAINER=	jim@thehousleys.net
 
@@ -20,7 +22,7 @@ DIST_SUBDIR=	rtems
 
 LCLTARGET?=	i386-rtems
 
-BINNAME=	binutils-2.9.5.0.24
+BINNAME=	binutils-2.10
 MASTERDIR=	${.CURDIR}/../i386-rtems-binutils
 PLIST=		${PKGDIR}/PLIST.${LCLTARGET}
 
@@ -38,8 +40,7 @@ MAN1=		${LCLTARGET}-ar.1 ${LCLTARGET}-nm.1 ${LCLTARGET}-objdump.1 \
 		${LCLTARGET}-ranlib.1 ${LCLTARGET}-size.1 \
 		${LCLTARGET}-strings.1 ${LCLTARGET}-strip.1 \
 		${LCLTARGET}-objcopy.1 ${LCLTARGET}-addr2line.1 \
-		${LCLTARGET}-nlmconv.1 ${LCLTARGET}-c++filt.1 \
-		${LCLTARGET}-as.1 ${LCLTARGET}-ld.1
+		${LCLTARGET}-nlmconv.1 ${LCLTARGET}-as.1 ${LCLTARGET}-ld.1
 
 .if defined(PATCH_DEBUG)
 PATCH_DIST_ARGS=   -d ${WRKDIR} -E ${PATCH_DIST_STRIP}
diff --git a/devel/i386-rtems-binutils/distinfo b/devel/i386-rtems-binutils/distinfo
index d2d06d935f3..c40919012ca 100644
--- a/devel/i386-rtems-binutils/distinfo
+++ b/devel/i386-rtems-binutils/distinfo
@@ -1,2 +1,2 @@
-MD5 (rtems/binutils-2.9.5.0.24-rtems-20000207.diff.gz) = 3b6e19c6f6bf569437dafdde69d9ef3a
-MD5 (rtems/binutils-2.9.5.0.24.tar.gz) = a87ace0b5a3eee5ea8a8723db9c51b7a
+MD5 (rtems/binutils-2.10.tar.gz) = 4feaad7d856509d9f8844f21a0a9e4b7
+MD5 (rtems/binutils-2.10-rtems-20000726.diff.gz) = 3802eebcbefec5b7d8a8d2bcecb4be28
diff --git a/devel/i386-rtems-binutils/files/patch-aa b/devel/i386-rtems-binutils/files/patch-aa
new file mode 100644
index 00000000000..89937cba103
--- /dev/null
+++ b/devel/i386-rtems-binutils/files/patch-aa
@@ -0,0 +1,48 @@
+--- binutils/Makefile.in.orig	Fri Apr  7 00:39:24 2000
++++ binutils/Makefile.in	Thu Aug 24 09:33:00 2000
+@@ -152,14 +152,14 @@
+ SRCONV_PROG = srconv$(EXEEXT) sysdump$(EXEEXT) coffdump$(EXEEXT) 
+ 
+ man_MANS = ar.1 nm.1 objdump.1 ranlib.1 size.1 strings.1 strip.1 objcopy.1 \
+-	addr2line.1 nlmconv.1 $(DEMANGLER_NAME).1
++	addr2line.1 nlmconv.1
+ 
+ 
+-PROGS = $(SIZE_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRINGS_PROG) $(STRIP_PROG) $(RANLIB_PROG) $(DEMANGLER_PROG) $(OBJCOPY_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ $(ADDR2LINE_PROG) $(READELF_PROG) @BUILD_DLLWRAP@ @BUILD_MISC@
++PROGS = $(SIZE_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRINGS_PROG) $(STRIP_PROG) $(RANLIB_PROG) $(OBJCOPY_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ $(ADDR2LINE_PROG) $(READELF_PROG) @BUILD_DLLWRAP@ @BUILD_MISC@
+ 
+ bin_PROGRAMS = $(SIZE_PROG) $(OBJDUMP_PROG) $(AR_PROG) $(STRINGS_PROG) $(RANLIB_PROG) $(OBJCOPY_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ $(ADDR2LINE_PROG) $(READELF_PROG) @BUILD_DLLWRAP@ @BUILD_MISC@
+ 
+-noinst_PROGRAMS = $(NM_PROG) $(STRIP_PROG) $(DEMANGLER_PROG)
++noinst_PROGRAMS = $(NM_PROG) $(STRIP_PROG)
+ 
+ EXTRA_PROGRAMS = $(NLMCONV_PROG) srconv sysdump coffdump $(DLLTOOL_PROG) $(WINDRES_PROG) $(DLLWRAP_PROG)
+ 
+@@ -293,7 +293,7 @@
+ 
+ MAINTAINERCLEANFILES = config.texi
+ 
+-MOSTLYCLEANFILES = sysinfo $(DEMANGLER_NAME).1 binutils.log binutils.sum \
++MOSTLYCLEANFILES = sysinfo binutils.log binutils.sum \
+ 	abcdefgh*
+ 
+ 
+@@ -306,7 +306,7 @@
+ strings$(EXEEXT) ranlib$(EXEEXT) objcopy$(EXEEXT) @BUILD_NLMCONV@ \
+ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ addr2line$(EXEEXT) \
+ readelf$(EXEEXT) @BUILD_DLLWRAP@ @BUILD_MISC@
+-noinst_PROGRAMS =  nm-new$(EXEEXT) strip-new$(EXEEXT) cxxfilt$(EXEEXT)
++noinst_PROGRAMS =  nm-new$(EXEEXT) strip-new$(EXEEXT)
+ PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
+ 
+ 
+@@ -1191,9 +1191,6 @@
+ 
+ binutils.info: $(srcdir)/binutils.texi config.texi
+ 
+-$(DEMANGLER_NAME).1: cxxfilt.man Makefile
+-	sed -e 's/@PROGRAM@/$(DEMANGLER_NAME)/' < $(srcdir)/cxxfilt.man \
+-		> $(DEMANGLER_NAME).1
+ mostlyclean-local:
+ 	-rm -rf tmpdir
+ 
diff --git a/devel/i386-rtems-binutils/pkg-plist.i386-rtems b/devel/i386-rtems-binutils/pkg-plist.i386-rtems
index 04edad5396f..7c85fc693ab 100644
--- a/devel/i386-rtems-binutils/pkg-plist.i386-rtems
+++ b/devel/i386-rtems-binutils/pkg-plist.i386-rtems
@@ -8,7 +8,6 @@ bin/i386-rtems-addr2line
 bin/i386-rtems-readelf
 bin/i386-rtems-nm
 bin/i386-rtems-strip
-bin/i386-rtems-c++filt
 bin/i386-rtems-as
 bin/i386-rtems-gasp
 bin/i386-rtems-ld
diff --git a/devel/i386-rtems-binutils/pkg-plist.i960-rtems b/devel/i386-rtems-binutils/pkg-plist.i960-rtems
index 93a6aafcbb5..721fcf4e02f 100644
--- a/devel/i386-rtems-binutils/pkg-plist.i960-rtems
+++ b/devel/i386-rtems-binutils/pkg-plist.i960-rtems
@@ -8,7 +8,6 @@ bin/i960-rtems-addr2line
 bin/i960-rtems-readelf
 bin/i960-rtems-nm
 bin/i960-rtems-strip
-bin/i960-rtems-c++filt
 bin/i960-rtems-as
 bin/i960-rtems-gasp
 bin/i960-rtems-ld
diff --git a/devel/i386-rtems-binutils/pkg-plist.m68k-rtems b/devel/i386-rtems-binutils/pkg-plist.m68k-rtems
index f1af6eef386..d4621904729 100644
--- a/devel/i386-rtems-binutils/pkg-plist.m68k-rtems
+++ b/devel/i386-rtems-binutils/pkg-plist.m68k-rtems
@@ -8,7 +8,6 @@ bin/m68k-rtems-addr2line
 bin/m68k-rtems-readelf
 bin/m68k-rtems-nm
 bin/m68k-rtems-strip
-bin/m68k-rtems-c++filt
 bin/m68k-rtems-as
 bin/m68k-rtems-gasp
 bin/m68k-rtems-ld
diff --git a/devel/i386-rtems-binutils/pkg-plist.mips-rtems b/devel/i386-rtems-binutils/pkg-plist.mips-rtems
index 0161faa3ae4..3749edcee75 100644
--- a/devel/i386-rtems-binutils/pkg-plist.mips-rtems
+++ b/devel/i386-rtems-binutils/pkg-plist.mips-rtems
@@ -8,7 +8,6 @@ bin/mips64orion-rtems-addr2line
 bin/mips64orion-rtems-readelf
 bin/mips64orion-rtems-nm
 bin/mips64orion-rtems-strip
-bin/mips64orion-rtems-c++filt
 bin/mips64orion-rtems-as
 bin/mips64orion-rtems-gasp
 bin/mips64orion-rtems-ld
diff --git a/devel/i386-rtems-binutils/pkg-plist.mips64orion-rtems b/devel/i386-rtems-binutils/pkg-plist.mips64orion-rtems
index 0161faa3ae4..3749edcee75 100644
--- a/devel/i386-rtems-binutils/pkg-plist.mips64orion-rtems
+++ b/devel/i386-rtems-binutils/pkg-plist.mips64orion-rtems
@@ -8,7 +8,6 @@ bin/mips64orion-rtems-addr2line
 bin/mips64orion-rtems-readelf
 bin/mips64orion-rtems-nm
 bin/mips64orion-rtems-strip
-bin/mips64orion-rtems-c++filt
 bin/mips64orion-rtems-as
 bin/mips64orion-rtems-gasp
 bin/mips64orion-rtems-ld
diff --git a/devel/i386-rtems-binutils/pkg-plist.powerpc-rtems b/devel/i386-rtems-binutils/pkg-plist.powerpc-rtems
index 2a20029fb19..760506c291f 100644
--- a/devel/i386-rtems-binutils/pkg-plist.powerpc-rtems
+++ b/devel/i386-rtems-binutils/pkg-plist.powerpc-rtems
@@ -8,7 +8,6 @@ bin/powerpc-rtems-addr2line
 bin/powerpc-rtems-readelf
 bin/powerpc-rtems-nm
 bin/powerpc-rtems-strip
-bin/powerpc-rtems-c++filt
 bin/powerpc-rtems-as
 bin/powerpc-rtems-gasp
 bin/powerpc-rtems-ld
diff --git a/devel/i386-rtems-binutils/pkg-plist.sh-rtems b/devel/i386-rtems-binutils/pkg-plist.sh-rtems
index 9c9553aa773..169d9d321ea 100644
--- a/devel/i386-rtems-binutils/pkg-plist.sh-rtems
+++ b/devel/i386-rtems-binutils/pkg-plist.sh-rtems
@@ -8,7 +8,6 @@ bin/sh-rtems-addr2line
 bin/sh-rtems-readelf
 bin/sh-rtems-nm
 bin/sh-rtems-strip
-bin/sh-rtems-c++filt
 bin/sh-rtems-as
 bin/sh-rtems-gasp
 bin/sh-rtems-ld
diff --git a/devel/i386-rtems-binutils/pkg-plist.sparc-rtems b/devel/i386-rtems-binutils/pkg-plist.sparc-rtems
index d167b23f374..083d452d4b0 100644
--- a/devel/i386-rtems-binutils/pkg-plist.sparc-rtems
+++ b/devel/i386-rtems-binutils/pkg-plist.sparc-rtems
@@ -8,7 +8,6 @@ bin/sparc-rtems-addr2line
 bin/sparc-rtems-readelf
 bin/sparc-rtems-nm
 bin/sparc-rtems-strip
-bin/sparc-rtems-c++filt
 bin/sparc-rtems-as
 bin/sparc-rtems-gasp
 bin/sparc-rtems-ld