Upgrade to version 3.2.1

12 files changed, 93 insertions, 69 deletions

diff --git a/devel/i386-rtems-gcj/Makefile b/devel/i386-rtems-gcj/Makefile
index 48891ccf1a38..8130312f7f69 100644
--- a/devel/i386-rtems-gcj/Makefile
+++ b/devel/i386-rtems-gcj/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcj
-PORTVERSION=	2.95.3
+PORTVERSION=	3.2.1
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE} \
@@ -15,8 +15,8 @@ MASTER_SITE_SUBDIR=	newlib \
 			gcc/releases/${JAVANAME}/:gcc
 DISTFILES=		${NEWLIBNAME}.tar.gz \
 			${JAVANAME}.tar.gz:gcc
-PATCHFILES=	${JAVANAME}-rtems-20010622a.diff \
-		${NEWLIBNAME}-rtems-20010622.diff
+PATCHFILES=	${JAVANAME}-rtems-20021209.diff \
+		${NEWLIBNAME}-rtems-20030120.diff
 PATCH_SITES=	ftp://ftp.oarcorp.com/pub/rtems/snapshots/c_tools/source/ \
 		http://rtems.thehousleys.net/
 
@@ -24,8 +24,8 @@ MAINTAINER=	jeh@FreeBSD.org
 
 LCLTARGET?=	i386-rtems
 
-JAVANAME=	gcc-2.95.3
-NEWLIBNAME=	newlib-1.9.0
+JAVANAME=	gcc-3.2.1
+NEWLIBNAME=	newlib-1.11.0
 MASTERDIR=	${.CURDIR}/../i386-rtems-gcj
 PLIST=		${PKGDIR}/pkg-plist.${LCLTARGET}
 
diff --git a/devel/i386-rtems-gcj/distinfo b/devel/i386-rtems-gcj/distinfo
index eb939cbca442..4c10cd3387a1 100644
--- a/devel/i386-rtems-gcj/distinfo
+++ b/devel/i386-rtems-gcj/distinfo
@@ -1,4 +1,4 @@
-MD5 (gcc-2.95.3.tar.gz) = f3ad4f32c2296fad758ed051b5ac8e28
-MD5 (newlib-1.9.0.tar.gz) = ca85717ef6e9ec57b895e286f8c1d905
-MD5 (gcc-2.95.3-rtems-20010622a.diff) = 67a27e618ad38879fb5d58a609c26744
-MD5 (newlib-1.9.0-rtems-20010622.diff) = 18e88710e89a6801a9a32ea547e2afbb
+MD5 (newlib-1.11.0.tar.gz) = 74de7de0c9624cd757df63f2ed17a9b4
+MD5 (gcc-3.2.1.tar.gz) = 82c26f362a6df7d2ba5b967606bd7d9a
+MD5 (gcc-3.2.1-rtems-20021209.diff) = 70d1c95af96ec4901261810909faeffa
+MD5 (newlib-1.11.0-rtems-20030120.diff) = bd3f5e9216a5ea4c66b397908d1e683c
diff --git a/devel/i386-rtems-gcj/files/patch-aa b/devel/i386-rtems-gcj/files/patch-aa
index 7fb815a8ae18..c74086e2f845 100644
--- a/devel/i386-rtems-gcj/files/patch-aa
+++ b/devel/i386-rtems-gcj/files/patch-aa
@@ -1,6 +1,6 @@
---- gcc-2.95.3/Makefile.in.orig	Fri Sep  1 21:07:00 2000
-+++ gcc-2.95.3/Makefile.in	Fri Sep  1 21:16:11 2000
-@@ -656,9 +656,7 @@
+--- gcc-3.2.1/Makefile.in.orig	Mon Oct  7 16:47:05 2002
++++ gcc-3.2.1/Makefile.in	Sun Feb  2 20:20:51 2003
+@@ -678,9 +678,7 @@
  	install-autoconf \
  	install-automake \
  	install-bash \
@@ -10,7 +10,7 @@
  	install-binutils \
  	install-bison \
  	install-byacc \
-@@ -689,11 +687,9 @@
+@@ -714,11 +712,9 @@
  	install-itcl \
  	install-ld \
  	install-libgui \
@@ -22,14 +22,22 @@
  	install-patch \
  	install-perl \
  	install-prms \
-@@ -823,13 +819,11 @@
- 	install-target-libio \
- 	install-target-libstdc++ \
- 	install-target-libg++ \
+@@ -814,7 +810,6 @@
+ 	configure-target-libtermcap \
+ 	configure-target-winsup \
+ 	configure-target-libgloss \
+-	configure-target-libiberty \
+ 	configure-target-gperf \
+ 	configure-target-examples \
+ 	configure-target-libstub \
+@@ -846,13 +841,11 @@
+ # compiled using $(TARGET_FLAGS_TO_PASS).
+ INSTALL_TARGET_MODULES = \
+ 	install-target-libstdc++-v3 \
 -	install-target-newlib \
  	install-target-libf2c \
- 	install-target-libchill \
  	install-target-libobjc \
+ 	install-target-libtermcap \
  	install-target-winsup \
  	install-target-libgloss \
 -	install-target-libiberty \
diff --git a/devel/i386-rtems-gcj/files/patch-ab b/devel/i386-rtems-gcj/files/patch-ab
index d64b5eb54233..bced888e2972 100644
--- a/devel/i386-rtems-gcj/files/patch-ab
+++ b/devel/i386-rtems-gcj/files/patch-ab
@@ -1,15 +1,15 @@
---- gcc-2.95.3/gcc/Makefile.in.orig	Thu Jan 25 09:02:58 2001
-+++ gcc-2.95.3/gcc/Makefile.in	Thu Sep 13 07:11:36 2001
-@@ -401,7 +401,7 @@
- MAYBE_USE_COLLECT2 = @maybe_use_collect2@
+--- gcc-3.2.1/gcc/Makefile.in.orig	Mon Oct 14 17:04:16 2002
++++ gcc-3.2.1/gcc/Makefile.in	Sun Feb  2 22:07:09 2003
+@@ -405,7 +405,7 @@
+ 
  # It is convenient for configure to add the assignment at the beginning,
  # so don't override it here.
 -USE_COLLECT2 = collect2$(exeext)
 +USE_COLLECT2 = 
  
- # List of extra C and assembler files to add to libgcc1.a.
+ # List of extra C and assembler files to add to static and shared libgcc2.
  # Assembler files should have names ending in `.asm'.
-@@ -438,7 +438,7 @@
+@@ -445,7 +445,7 @@
  
  # A list of all the language-specific executables.
  # This is overridden by configure.
@@ -18,19 +18,19 @@
  
  # List of things which should already be built whenever we try to use xgcc
  # to compile anything (without linking).
-@@ -2433,9 +2433,8 @@
+@@ -2530,9 +2530,8 @@
  # Copy the compiler files into directories where they will be run.
  # Install the driver last so that the window when things are
  # broken is small.
--install-normal: install-common $(INSTALL_HEADERS) $(INSTALL_LIBGCC) \
--    $(INSTALL_CPP) install-man install-info intl.install lang.install-normal \
--    install-driver
-+install-normal: install-common \
+-install: install-common $(INSTALL_HEADERS) $(INSTALL_LIBGCC) \
+-    $(INSTALL_CPP) install-man install-info intl.install install-@POSUB@ \
+-    lang.install-normal install-driver
++install: install-common \
 +    intl.install lang.install-normal
  
- # Do nothing while making gcc with a cross-compiler. The person who
- # makes gcc for the target machine has to know how to put a complete
-@@ -2508,51 +2507,6 @@
+ # Handle cpp installation.
+ install-cpp: cpp$(exeext)
+@@ -2593,53 +2592,6 @@
  	  else true; \
  	  fi; \
  	done
@@ -73,12 +73,14 @@
 -	fi
 -	-rm -f $(libsubdir)/cpp0$(exeext)
 -	$(INSTALL_PROGRAM) cpp0$(exeext) $(libsubdir)/cpp0$(exeext)
+-	-rm -f $(libsubdir)/tradcpp0$(exeext)
+-	$(INSTALL_PROGRAM) tradcpp0$(exeext) $(libsubdir)/tradcpp0$(exeext)
 -# Install gcov if it was compiled.
 -	-if [ -f gcov$(exeext) ]; \
 -	then \
 -	    rm -f $(bindir)/gcov$(exeext); \
 -	    $(INSTALL_PROGRAM) gcov$(exeext) $(bindir)/$(GCOV_INSTALL_NAME)$(exeext); \
 -	fi
+ 	$(INSTALL_SCRIPT) gccbug $(bindir)/$(GCCBUG_INSTALL_NAME)
  
  # Install the driver program as $(target_alias)-gcc
- # and also as either gcc (if native) or $(gcc_tooldir)/bin/gcc.
diff --git a/devel/i386-rtems-gcj/pkg-comment b/devel/i386-rtems-gcj/pkg-comment
index d87890bdb2b4..e9d9627817da 100644
--- a/devel/i386-rtems-gcj/pkg-comment
+++ b/devel/i386-rtems-gcj/pkg-comment
@@ -1 +1 @@
-FSF JAVA-gcc-2.95.2 base-port for RTEMS development
+FSF JAVA-gcc-3.2.1 base-port for RTEMS development
diff --git a/devel/i386-rtems-gcj/pkg-plist.arm-rtems b/devel/i386-rtems-gcj/pkg-plist.arm-rtems
index 1776bfefd457..81bb015af5eb 100644
--- a/devel/i386-rtems-gcj/pkg-plist.arm-rtems
+++ b/devel/i386-rtems-gcj/pkg-plist.arm-rtems
@@ -1,6 +1,8 @@
 bin/arm-rtems-gcj
-bin/gcjh
-bin/jv-scan
-bin/jcf-dump
-lib/gcc-lib/arm-rtems/2.95.3/jc1
-lib/gcc-lib/arm-rtems/2.95.3/jvgenmain
+bin/arm-rtems-gcjh
+bin/arm-rtems-jv-scan
+bin/arm-rtems-jcf-dump
+bin/grepjar
+bin/jar
+lib/gcc-lib/arm-rtems/3.2.1/jc1
+lib/gcc-lib/arm-rtems/3.2.1/jvgenmain
diff --git a/devel/i386-rtems-gcj/pkg-plist.i386-rtems b/devel/i386-rtems-gcj/pkg-plist.i386-rtems
index 9ef4e8915420..9a46666687d4 100644
--- a/devel/i386-rtems-gcj/pkg-plist.i386-rtems
+++ b/devel/i386-rtems-gcj/pkg-plist.i386-rtems
@@ -1,6 +1,8 @@
+bin/grepjar
 bin/i386-rtems-gcj
-bin/gcjh
-bin/jv-scan
-bin/jcf-dump
-lib/gcc-lib/i386-rtems/2.95.3/jc1
-lib/gcc-lib/i386-rtems/2.95.3/jvgenmain
+bin/i386-rtems-gcjh
+bin/i386-rtems-jv-scan
+bin/i386-rtems-jcf-dump
+bin/jar
+lib/gcc-lib/i386-rtems/3.2.1/jc1
+lib/gcc-lib/i386-rtems/3.2.1/jvgenmain
diff --git a/devel/i386-rtems-gcj/pkg-plist.m68k-rtems b/devel/i386-rtems-gcj/pkg-plist.m68k-rtems
index 18ccd7950add..4529d960115e 100644
--- a/devel/i386-rtems-gcj/pkg-plist.m68k-rtems
+++ b/devel/i386-rtems-gcj/pkg-plist.m68k-rtems
@@ -1,6 +1,8 @@
+bin/grepjar
+bin/jar
 bin/m68k-rtems-gcj
-bin/gcjh
-bin/jv-scan
-bin/jcf-dump
-lib/gcc-lib/m68k-rtems/2.95.3/jc1
-lib/gcc-lib/m68k-rtems/2.95.3/jvgenmain
+bin/m68k-rtems-gcjh
+bin/m68k-rtems-jv-scan
+bin/m68k-rtems-jcf-dump
+lib/gcc-lib/m68k-rtems/3.2.1/jc1
+lib/gcc-lib/m68k-rtems/3.2.1/jvgenmain
diff --git a/devel/i386-rtems-gcj/pkg-plist.mips-rtems b/devel/i386-rtems-gcj/pkg-plist.mips-rtems
index c5d707f0fbcd..02bf784723d3 100644
--- a/devel/i386-rtems-gcj/pkg-plist.mips-rtems
+++ b/devel/i386-rtems-gcj/pkg-plist.mips-rtems
@@ -1,6 +1,8 @@
+bin/grepjar
+bin/jar
 bin/mips-rtems-gcj
-bin/gcjh
-bin/jv-scan
-bin/jcf-dump
-lib/gcc-lib/mips-rtems/2.95.3/jc1
-lib/gcc-lib/mips-rtems/2.95.3/jvgenmain
+bin/mips-rtems-gcjh
+bin/mips-rtems-jv-scan
+bin/mips-rtems-jcf-dump
+lib/gcc-lib/mips-rtems/3.2.1/jc1
+lib/gcc-lib/mips-rtems/3.2.1/jvgenmain
diff --git a/devel/i386-rtems-gcj/pkg-plist.powerpc-rtems b/devel/i386-rtems-gcj/pkg-plist.powerpc-rtems
index 9b199e9b00cb..652e09ad8ce2 100644
--- a/devel/i386-rtems-gcj/pkg-plist.powerpc-rtems
+++ b/devel/i386-rtems-gcj/pkg-plist.powerpc-rtems
@@ -1,6 +1,8 @@
+bin/grepjar
+bin/jar
 bin/powerpc-rtems-gcj
-bin/gcjh
-bin/jv-scan
-bin/jcf-dump
-lib/gcc-lib/powerpc-rtems/2.95.3/jc1
-lib/gcc-lib/powerpc-rtems/2.95.3/jvgenmain
+bin/powerpc-rtems-gcjh
+bin/powerpc-rtems-jv-scan
+bin/powerpc-rtems-jcf-dump
+lib/gcc-lib/powerpc-rtems/3.2.1/jc1
+lib/gcc-lib/powerpc-rtems/3.2.1/jvgenmain
diff --git a/devel/i386-rtems-gcj/pkg-plist.sh-rtems b/devel/i386-rtems-gcj/pkg-plist.sh-rtems
index 81b5fe595026..0d7795bf75fe 100644
--- a/devel/i386-rtems-gcj/pkg-plist.sh-rtems
+++ b/devel/i386-rtems-gcj/pkg-plist.sh-rtems
@@ -1,6 +1,8 @@
+bin/grepjar
+bin/jar
 bin/sh-rtems-gcj
-bin/gcjh
-bin/jv-scan
-bin/jcf-dump
-lib/gcc-lib/sh-rtems/2.95.3/jc1
-lib/gcc-lib/sh-rtems/2.95.3/jvgenmain
+bin/sh-rtems-gcjh
+bin/sh-rtems-jv-scan
+bin/sh-rtems-jcf-dump
+lib/gcc-lib/sh-rtems/3.2.1/jc1
+lib/gcc-lib/sh-rtems/3.2.1/jvgenmain
diff --git a/devel/i386-rtems-gcj/pkg-plist.sparc-rtems b/devel/i386-rtems-gcj/pkg-plist.sparc-rtems
index 52456184787f..382e2142b93a 100644
--- a/devel/i386-rtems-gcj/pkg-plist.sparc-rtems
+++ b/devel/i386-rtems-gcj/pkg-plist.sparc-rtems
@@ -1,6 +1,8 @@
+bin/grepjar
+bin/jar
 bin/sparc-rtems-gcj
-bin/gcjh
-bin/jv-scan
-bin/jcf-dump
-lib/gcc-lib/sparc-rtems/2.95.3/jc1
-lib/gcc-lib/sparc-rtems/2.95.3/jvgenmain
+bin/sparc-rtems-gcjh
+bin/sparc-rtems-jv-scan
+bin/sparc-rtems-jcf-dump
+lib/gcc-lib/sparc-rtems/3.2.1/jc1
+lib/gcc-lib/sparc-rtems/3.2.1/jvgenmain