* UPdate the *-rtems-gcc ports to include gcj (Java). Since the gcj

  depends so heavily on c++ it was getting silly to keep it seperate for
  all the mangeling of the Makefiles that was required
* Remove the *-rtems-gcj ports (MOVED) to be commited next.

9 files changed, 79 insertions, 8 deletions

diff --git a/devel/i386-rtems-gcc/Makefile b/devel/i386-rtems-gcc/Makefile
index 636aa65c2ffc..8d4b3cb0c9d1 100644
--- a/devel/i386-rtems-gcc/Makefile
+++ b/devel/i386-rtems-gcc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	3.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE} \
 		${MASTER_SITE_GNU:S/$/:gcc/}
@@ -53,7 +53,7 @@ NO_CPUCFLAGS=	yes
 
 CONFIGURE_TARGET?=	--target=${LCLTARGET}
 CONFIGURE_ARGS?=	--with-gnu-as --with-gnu-ld --with-newlib --verbose \
-			--enable-languages=c,c++ \
+			--enable-languages="c,c++,java" \
 			--with-libiconv-prefix=${LOCALBASE} \
 			--without-included-gettext
 CONFIGURE_WRKSRC?=	${WRKDIR}/build-${LCLTARGET}
@@ -62,15 +62,15 @@ CONFIGURE_SCRIPT?=	../${GCCNAME}/configure
 PATCH_WRKSRC=		${WRKDIR}
 PATCH_STRIP=		-p
 
-MAKE_FLAGS=	LANGUAGES="c c++"
+MAKE_FLAGS=	LANGUAGES="c c++ java"
 MAKE_ENV=	MACHINE_ARCH=${RTEMS_ARCH}
 
-MAN1=		${LCLTARGET}-gcc.1 ${LCLTARGET}-g++.1 \
-		cpp.1 gcov.1
+MAN1=		${LCLTARGET}-gcc.1 ${LCLTARGET}-g++.1 ${LCLTARGET}-gcj.1 \
+		cpp.1 gcov.1 gcjh.1 jv-scan.1 jcf-dump.1 gij.1 \
+		jv-convert.1 rmic.1 rmiregistry.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 INFO=		${LCLTARGET}-cpp ${LCLTARGET}-cppinternals \
-		${LCLTARGET}-gcc ${LCLTARGET}-gccint
-#INFO=		cpp cppinternals gcc gccint
+		${LCLTARGET}-gcc ${LCLTARGET}-gccint ${LCLTARGET}-gcj
 
 pre-configure:
 	@(cd ${WRKDIR} ; \
@@ -111,6 +111,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|gccint.info|${LCLTARGET}-gccint.info|g' ${WRKSRC}/gcc/Makefile.in
 	@${REINPLACE_CMD} -e 's|gccint.texi|${LCLTARGET}-gccint.texi|g' ${WRKSRC}/gcc/Makefile.in
 	@${MV} ${WRKSRC}/gcc/doc/gccint.texi ${WRKSRC}/gcc/doc/${LCLTARGET}-gccint.texi
+# Change gcj.info to ${LCLTARGET}-gcj.info
+	@${REINPLACE_CMD} -e 's|setfilename gcj.info|setfilename ${LCLTARGET}-gcj.info|g' ${WRKSRC}/gcc/java/*.texi
+	@${REINPLACE_CMD} -e 's|(gcj)|(${LCLTARGET}-gcj)|g' ${WRKSRC}/gcc/java/*.texi
+	@${REINPLACE_CMD} -e 's|@file{gcj}|@file{${LCLTARGET}-gcj}|g' ${WRKSRC}/gcc/java/*.texi
+	@${REINPLACE_CMD} -e 's|gcj.info|${LCLTARGET}-gcj.info|g' ${WRKSRC}/gcc/java/Make-lang.in
+	@${REINPLACE_CMD} -e 's|gcj.texi|${LCLTARGET}-gcj.texi|g' ${WRKSRC}/gcc/java/Make-lang.in
+	@${MV} ${WRKSRC}/gcc/java/gcj.texi ${WRKSRC}/gcc/java/${LCLTARGET}-gcj.texi
 
 do-build:
 	@(cd ${WRKDIR}/build-${LCLTARGET} ; \
diff --git a/devel/i386-rtems-gcc/pkg-plist.arm-rtems b/devel/i386-rtems-gcc/pkg-plist.arm-rtems
index 05a08f11b3bd..36f5a4f922fd 100644
--- a/devel/i386-rtems-gcc/pkg-plist.arm-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.arm-rtems
@@ -4,6 +4,12 @@ bin/arm-rtems-g++
 bin/arm-rtems-gcc
 bin/arm-rtems-gccbug
 bin/arm-rtems-cpp
+bin/grepjar
+bin/arm-rtems-gcj
+bin/arm-rtems-gcjh
+bin/arm-rtems-jv-scan
+bin/arm-rtems-jcf-dump
+bin/jar
 include/c++/%%GCCVERSION%%/bits/basic_ios.h
 include/c++/%%GCCVERSION%%/bits/basic_ios.tcc
 include/c++/%%GCCVERSION%%/bits/basic_string.h
@@ -225,6 +231,8 @@ lib/gcc-lib/arm-rtems/%%GCCVERSION%%/thumb/fpu/crtbegin.o
 lib/gcc-lib/arm-rtems/%%GCCVERSION%%/thumb/fpu/crtend.o
 lib/gcc-lib/arm-rtems/%%GCCVERSION%%/thumb/fpu/crti.o
 lib/gcc-lib/arm-rtems/%%GCCVERSION%%/thumb/fpu/crtn.o
+lib/gcc-lib/arm-rtems/%%GCCVERSION%%/jc1
+lib/gcc-lib/arm-rtems/%%GCCVERSION%%/jvgenmain
 lib/charset.alias
 share/locale/fr/LC_MESSAGES/gcc.mo
 share/locale/tr/LC_MESSAGES/gcc.mo
diff --git a/devel/i386-rtems-gcc/pkg-plist.i386-rtems b/devel/i386-rtems-gcc/pkg-plist.i386-rtems
index b4b928653f06..7a5a6da76181 100644
--- a/devel/i386-rtems-gcc/pkg-plist.i386-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.i386-rtems
@@ -4,6 +4,12 @@ bin/i386-rtems-g++
 bin/i386-rtems-gcc
 bin/i386-rtems-gccbug
 bin/i386-rtems-cpp
+bin/grepjar
+bin/i386-rtems-gcj
+bin/i386-rtems-gcjh
+bin/i386-rtems-jv-scan
+bin/i386-rtems-jcf-dump
+bin/jar
 include/c++/%%GCCVERSION%%/bits/basic_ios.h
 include/c++/%%GCCVERSION%%/bits/basic_ios.tcc
 include/c++/%%GCCVERSION%%/bits/basic_string.h
@@ -236,6 +242,8 @@ lib/gcc-lib/i386-rtems/%%GCCVERSION%%/tradcpp0
 lib/gcc-lib/i386-rtems/%%GCCVERSION%%/athlon/libgcc.a
 lib/gcc-lib/i386-rtems/%%GCCVERSION%%/athlon/crtbegin.o
 lib/gcc-lib/i386-rtems/%%GCCVERSION%%/athlon/crtend.o
+lib/gcc-lib/i386-rtems/%%GCCVERSION%%/jc1
+lib/gcc-lib/i386-rtems/%%GCCVERSION%%/jvgenmain
 lib/charset.alias
 share/locale/fr/LC_MESSAGES/gcc.mo
 share/locale/tr/LC_MESSAGES/gcc.mo
diff --git a/devel/i386-rtems-gcc/pkg-plist.i960-rtems b/devel/i386-rtems-gcc/pkg-plist.i960-rtems
index c76d6cee2096..00c71595f3c3 100644
--- a/devel/i386-rtems-gcc/pkg-plist.i960-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.i960-rtems
@@ -4,6 +4,12 @@ bin/i960-rtems-gccbug
 bin/i960-rtems-c++
 bin/i960-rtems-g++
 bin/i960-rtems-cpp
+bin/grepjar
+bin/i960-rtems-gcj
+bin/i960-rtems-gcjh
+bin/i960-rtems-jv-scan
+bin/i960-rtems-jcf-dump
+bin/jar
 include/c++/%%GCCVERSION%%/bits/basic_ios.h
 include/c++/%%GCCVERSION%%/bits/basic_ios.tcc
 include/c++/%%GCCVERSION%%/bits/basic_string.h
@@ -208,6 +214,9 @@ lib/gcc-lib/i960-rtems/%%GCCVERSION%%/soft-float/libgcc.a
 lib/gcc-lib/i960-rtems/%%GCCVERSION%%/ld64/libgcc.a
 lib/gcc-lib/i960-rtems/%%GCCVERSION%%/soft-float/ld64/libgcc.a
 lib/gcc-lib/i960-rtems/%%GCCVERSION%%/cc1plus
+lib/gcc-lib/i960-rtems/%%GCCVERSION%%/tradcpp0
+lib/gcc-lib/i960-rtems/%%GCCVERSION%%/jc1
+lib/gcc-lib/i960-rtems/%%GCCVERSION%%/jvgenmain
 i960-rtems/bin/gcc
 i960-rtems/bin/c++
 i960-rtems/bin/g++
@@ -220,7 +229,6 @@ i960-rtems/lib/soft-float/libc.a
 i960-rtems/lib/soft-float/crt0.o
 i960-rtems/lib/soft-float/libg.a
 i960-rtems/lib/libiberty.a
-lib/gcc-lib/i960-rtems/%%GCCVERSION%%/tradcpp0
 i960-rtems/lib/ld64/crt0.o
 i960-rtems/lib/ld64/libc.a
 i960-rtems/lib/ld64/libg.a
diff --git a/devel/i386-rtems-gcc/pkg-plist.m68k-rtems b/devel/i386-rtems-gcc/pkg-plist.m68k-rtems
index 45140a81af8b..041dba4d18e1 100644
--- a/devel/i386-rtems-gcc/pkg-plist.m68k-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.m68k-rtems
@@ -4,6 +4,12 @@ bin/m68k-rtems-g++
 bin/m68k-rtems-gcc
 bin/m68k-rtems-gccbug
 bin/m68k-rtems-cpp
+bin/grepjar
+bin/m68k-rtems-gcj
+bin/m68k-rtems-gcjh
+bin/m68k-rtems-jv-scan
+bin/m68k-rtems-jcf-dump
+bin/jar
 include/c++/%%GCCVERSION%%/bits/basic_ios.h
 include/c++/%%GCCVERSION%%/bits/basic_ios.tcc
 include/c++/%%GCCVERSION%%/bits/basic_string.h
@@ -251,6 +257,8 @@ lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/msoft-float/crtend.o
 lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/msoft-float/crti.o
 lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/msoft-float/crtn.o
 lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/msoft-float/libgcc.a
+lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/jc1
+lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/jvgenmain
 lib/charset.alias
 share/locale/fr/LC_MESSAGES/gcc.mo
 share/locale/tr/LC_MESSAGES/gcc.mo
diff --git a/devel/i386-rtems-gcc/pkg-plist.mips-rtems b/devel/i386-rtems-gcc/pkg-plist.mips-rtems
index b422ebce2ea3..5cdd5a22b1d3 100644
--- a/devel/i386-rtems-gcc/pkg-plist.mips-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.mips-rtems
@@ -4,6 +4,12 @@ bin/mips-rtems-cpp
 bin/mips-rtems-g++
 bin/mips-rtems-gcc
 bin/mips-rtems-gccbug
+bin/grepjar
+bin/mips-rtems-gcj
+bin/mips-rtems-gcjh
+bin/mips-rtems-jv-scan
+bin/mips-rtems-jcf-dump
+bin/jar
 include/c++/%%GCCVERSION%%/bits/basic_ios.h
 include/c++/%%GCCVERSION%%/bits/basic_ios.tcc
 include/c++/%%GCCVERSION%%/bits/basic_string.h
@@ -235,6 +241,8 @@ lib/gcc-lib/mips-rtems/%%GCCVERSION%%/crtbegin.o
 lib/gcc-lib/mips-rtems/%%GCCVERSION%%/crtend.o
 lib/gcc-lib/mips-rtems/%%GCCVERSION%%/crti.o
 lib/gcc-lib/mips-rtems/%%GCCVERSION%%/crtn.o
+lib/gcc-lib/mips-rtems/%%GCCVERSION%%/jc1
+lib/gcc-lib/mips-rtems/%%GCCVERSION%%/jvgenmain
 mips-rtems/bin/gcc
 mips-rtems/bin/c++
 mips-rtems/bin/g++
diff --git a/devel/i386-rtems-gcc/pkg-plist.powerpc-rtems b/devel/i386-rtems-gcc/pkg-plist.powerpc-rtems
index 829e0fa0714e..6be7ab64a317 100644
--- a/devel/i386-rtems-gcc/pkg-plist.powerpc-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.powerpc-rtems
@@ -4,6 +4,12 @@ bin/powerpc-rtems-cpp
 bin/powerpc-rtems-g++
 bin/powerpc-rtems-gcc
 bin/powerpc-rtems-gccbug
+bin/grepjar
+bin/powerpc-rtems-gcj
+bin/powerpc-rtems-gcjh
+bin/powerpc-rtems-jv-scan
+bin/powerpc-rtems-jcf-dump
+bin/jar
 include/c++/%%GCCVERSION%%/bits/basic_ios.h
 include/c++/%%GCCVERSION%%/bits/basic_ios.tcc
 include/c++/%%GCCVERSION%%/bits/basic_string.h
@@ -537,6 +543,8 @@ lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/ecrti.o
 lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/ecrtn.o
 lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/ncrtn.o
 lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/crtsavres.o
+lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/jc1
+lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/jvgenmain
 lib/charset.alias
 share/locale/fr/LC_MESSAGES/gcc.mo
 share/locale/tr/LC_MESSAGES/gcc.mo
diff --git a/devel/i386-rtems-gcc/pkg-plist.sh-rtems b/devel/i386-rtems-gcc/pkg-plist.sh-rtems
index 31447932d91b..8a284e06af5d 100644
--- a/devel/i386-rtems-gcc/pkg-plist.sh-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.sh-rtems
@@ -4,6 +4,12 @@ bin/sh-rtems-cpp
 bin/sh-rtems-g++
 bin/sh-rtems-gcc
 bin/sh-rtems-gccbug
+bin/grepjar
+bin/sh-rtems-gcj
+bin/sh-rtems-gcjh
+bin/sh-rtems-jv-scan
+bin/sh-rtems-jcf-dump
+bin/jar
 include/c++/%%GCCVERSION%%/bits/basic_ios.h  
 include/c++/%%GCCVERSION%%/bits/basic_ios.tcc  
 include/c++/%%GCCVERSION%%/bits/basic_string.h        
@@ -217,6 +223,8 @@ lib/gcc-lib/sh-rtems/%%GCCVERSION%%/m3e/libgcc.a
 lib/gcc-lib/sh-rtems/%%GCCVERSION%%/m4-single-only/libgcc.a
 lib/gcc-lib/sh-rtems/%%GCCVERSION%%/m4-single/libgcc.a
 lib/gcc-lib/sh-rtems/%%GCCVERSION%%/m4/libgcc.a
+lib/gcc-lib/sh-rtems/%%GCCVERSION%%/jc1
+lib/gcc-lib/sh-rtems/%%GCCVERSION%%/jvgenmain
 lib/charset.alias
 share/locale/fr/LC_MESSAGES/gcc.mo
 share/locale/tr/LC_MESSAGES/gcc.mo
diff --git a/devel/i386-rtems-gcc/pkg-plist.sparc-rtems b/devel/i386-rtems-gcc/pkg-plist.sparc-rtems
index 71670d646888..4eb28beb74d6 100644
--- a/devel/i386-rtems-gcc/pkg-plist.sparc-rtems
+++ b/devel/i386-rtems-gcc/pkg-plist.sparc-rtems
@@ -4,6 +4,12 @@ bin/sparc-rtems-cpp
 bin/sparc-rtems-g++
 bin/sparc-rtems-gcc
 bin/sparc-rtems-gccbug
+bin/grepjar
+bin/sparc-rtems-gcj
+bin/sparc-rtems-gcjh
+bin/sparc-rtems-jv-scan
+bin/sparc-rtems-jcf-dump
+bin/jar
 include/c++/%%GCCVERSION%%/bits/basic_ios.h
 include/c++/%%GCCVERSION%%/bits/basic_ios.tcc
 include/c++/%%GCCVERSION%%/bits/basic_string.h
@@ -214,6 +220,8 @@ lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/soft/v8/libgcc.a
 lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/soft/libgcc.a
 lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/libgcc.a
 lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/v8/libgcc.a
+lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/jc1
+lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/jvgenmain
 lib/charset.alias
 share/locale/fr/LC_MESSAGES/gcc.mo
 share/locale/tr/LC_MESSAGES/gcc.mo