* 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.
svn path=/head/; revision=94248
2025-07-18 17:59:20 -04:00 · 2003-11-18 11:07:15 +00:00 · 2003-11-18 11:07:15 +00:00 · 33e26f5e83 · 2021-03-31 03:12:20 +00:00
commit 33e26f5e83
parent a2be31939f
29 changed files with 79 additions and 373 deletions
--- a/devel/Makefile
+++ b/devel/Makefile
@ -36,7 +36,6 @@
    SUBDIR += arm-rtems-binutils
    SUBDIR += arm-rtems-g77
    SUBDIR += arm-rtems-gcc
-    SUBDIR += arm-rtems-gcj
    SUBDIR += arm-rtems-gdb
    SUBDIR += arm-rtems-objc
    SUBDIR += as80
@ -289,7 +288,6 @@
    SUBDIR += i386-rtems-binutils
    SUBDIR += i386-rtems-g77
    SUBDIR += i386-rtems-gcc
-    SUBDIR += i386-rtems-gcj
    SUBDIR += i386-rtems-gdb
    SUBDIR += i386-rtems-objc
    SUBDIR += i960-rtems-binutils
@ -427,7 +425,6 @@
    SUBDIR += m68k-rtems-binutils
    SUBDIR += m68k-rtems-g77
    SUBDIR += m68k-rtems-gcc
-    SUBDIR += m68k-rtems-gcj
    SUBDIR += m68k-rtems-gdb
    SUBDIR += m68k-rtems-objc
    SUBDIR += make++
@ -450,7 +447,6 @@
    SUBDIR += mips-rtems-binutils
    SUBDIR += mips-rtems-g77
    SUBDIR += mips-rtems-gcc
-    SUBDIR += mips-rtems-gcj
    SUBDIR += mips-rtems-gdb
    SUBDIR += mips-rtems-objc
    SUBDIR += mipsel-linux-binutils
@ -900,7 +896,6 @@
    SUBDIR += powerpc-rtems-binutils
    SUBDIR += powerpc-rtems-g77
    SUBDIR += powerpc-rtems-gcc
-    SUBDIR += powerpc-rtems-gcj
    SUBDIR += powerpc-rtems-gdb
    SUBDIR += powerpc-rtems-objc
    SUBDIR += ppl
@ -1044,7 +1039,6 @@
    SUBDIR += sh-rtems-binutils
    SUBDIR += sh-rtems-g77
    SUBDIR += sh-rtems-gcc
-    SUBDIR += sh-rtems-gcj
    SUBDIR += sh-rtems-gdb
    SUBDIR += sh-rtems-objc
    SUBDIR += shapelib
@ -1061,7 +1055,6 @@
    SUBDIR += sparc-rtems-binutils
    SUBDIR += sparc-rtems-g77
    SUBDIR += sparc-rtems-gcc
-    SUBDIR += sparc-rtems-gcj
    SUBDIR += sparc-rtems-gdb
    SUBDIR += sparc-rtems-objc
    SUBDIR += spin
--- a/devel/arm-rtems-gcj/Makefile
+++ b/devel/arm-rtems-gcj/Makefile
@ -1,13 +0,0 @@
-# New ports collection makefile for:	arm-rtems-gcj
-# Date created:		12 April 2001
-# Whom:			James Housley <jim@thehousleys.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gcj
-
-MAINTAINER=	jeh@FreeBSD.org
-
-LCLTARGET=	arm-rtems
-.include "${.CURDIR}/../i386-rtems-gcj/Makefile"
--- 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} ; \
--- 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
--- 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
--- 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
--- 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
--- 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++
--- 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
--- 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
--- 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
--- a/devel/i386-rtems-gcj/Makefile
+++ b/devel/i386-rtems-gcj/Makefile
@ -1,77 +0,0 @@
-# New ports collection makefile for:	i386-rtems-gcj
-# Date created:		9 June 2000
-# Whom:			James Housley <jim@thehousleys.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gcj
-PORTVERSION=	3.2.1
-PORTREVISION=	0
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE} \
-		${MASTER_SITE_GNU:S/$/:gcc/}
-MASTER_SITE_SUBDIR=	newlib \
-			gcc/${GCCNAME}/:gcc
-DISTFILES=		${NEWLIBNAME}.tar.gz \
-			${JAVANAME}.tar.gz:gcc
-PATCHFILES=	${JAVANAME}-rtems-20030507a.diff \
-		${NEWLIBNAME}-rtems-20030605.diff
-PATCH_SITES=	ftp://ftp.rtems.com/pub/rtems/snapshots/c_tools/source/ \
-		http://rtems.thehousleys.net/
-
-MAINTAINER=	jeh@FreeBSD.org
-COMMENT=	FSF JAVA-gcc-3.2.1 base-port for RTEMS development
-
-.include <bsd.port.pre.mk>
-
-LCLTARGET?=	i386-rtems
-
-GCCVERSION=	3.2.3
-JAVANAME=	gcc-${GCCVERSION}
-PLIST_SUB+=	"GCCVERSION=${GCCVERSION}"
-NEWLIBNAME=	newlib-1.11.0
-MASTERDIR=	${.CURDIR}/../i386-rtems-gcj
-PLIST=		${PKGDIR}/pkg-plist.${LCLTARGET}
-
-# autoheader is used by the port but autoconf is not, setting USE_AUTOCONF
-# will break the port.  Since USE_AUTOHEADER sets USE_AUTOCONF, this is
-# likely to break the port also.
-BUILD_DEPENDS=	autoheader:${PORTSDIR}/devel/autoconf \
-		${LCLTARGET}-gcc:${PORTSDIR}/devel/${LCLTARGET}-gcc
-RUN_DEPENDS=	${LCLTARGET}-gcc:${PORTSDIR}/devel/${LCLTARGET}-gcc
-
-PKGNAMEPREFIX=	${LCLTARGET}-
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-ALL_TARGET=	all info
-NO_CPUCFLAGS=	yes
-
-CONFIGURE_TARGET?=	--target=${LCLTARGET}
-CONFIGURE_ARGS?=	--with-gnu-as --with-gnu-ld --with-newlib --verbose \
-			--enable-languages="java" \
-			--with-libiconv-prefix=${LOCALBASE} \
-			--without-included-gettext
-CONFIGURE_WRKSRC?=	${WRKDIR}/build-${LCLTARGET}
-CONFIGURE_SCRIPT?=	../${JAVANAME}/configure
-
-PATCH_WRKSRC=		${WRKDIR}
-PATCH_STRIP=		-p
-
-MAKE_FLAGS=	LANGUAGES="java"
-
-pre-configure:
-	@(cd ${WRKDIR} ; \
-	cd ${JAVANAME} ; ${LN} -fs ../${NEWLIBNAME}/newlib . ; \
-	cd .. ; \
-	${MKDIR} build-${LCLTARGET})
-
-do-build:
-	@(cd ${WRKDIR}/build-${LCLTARGET} ; \
-	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-
-do-install:
-	@(cd ${WRKDIR}/build-${LCLTARGET} && \
-	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-
-.include <bsd.port.post.mk>
--- a/devel/i386-rtems-gcj/distinfo
+++ b/devel/i386-rtems-gcj/distinfo
@ -1,4 +0,0 @@
-MD5 (newlib-1.11.0.tar.gz) = 74de7de0c9624cd757df63f2ed17a9b4
-MD5 (gcc-3.2.3.tar.gz) = e951123b2dfd2288c3e9337024dc9e4c
-MD5 (gcc-3.2.3-rtems-20030507a.diff) = d4adda8ccba7ad57ee36b7720eadf19c
-MD5 (newlib-1.11.0-rtems-20030605.diff) = b1dfdabd92e241d835964c6ef86aa3c9
--- a/devel/i386-rtems-gcj/files/patch-aa
+++ b/devel/i386-rtems-gcj/files/patch-aa
@ -1,46 +0,0 @@
--- gcc-3.2.3/Makefile.in.orig	Mon Oct  7 16:47:05 2002
-+++ gcc-3.2.3/Makefile.in	Sun Feb  2 20:20:51 2003
-@@ -678,9 +678,7 @@
- 	install-autoconf \
- 	install-automake \
- 	install-bash \
-	install-bfd \
- 	install-bzip2 \
-	install-opcodes \
- 	install-binutils \
- 	install-bison \
- 	install-byacc \
-@@ -714,11 +712,9 @@
- 	install-itcl \
- 	install-ld \
- 	install-libgui \
-	install-libiberty \
- 	install-libtool \
- 	install-m4 \
- 	install-make \
-	install-mmalloc \
- 	install-patch \
- 	install-perl \
- 	install-prms \
-@@ -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-libobjc \
- 	install-target-libtermcap \
- 	install-target-winsup \
- 	install-target-libgloss \
-	install-target-libiberty \
- 	install-target-bsp \
- 	install-target-libjava \
- 	install-target-zlib \
--- a/devel/i386-rtems-gcj/files/patch-ab
+++ b/devel/i386-rtems-gcj/files/patch-ab
@ -1,86 +0,0 @@
--- gcc-3.2.3/gcc/Makefile.in.orig	Tue Jan 28 16:54:07 2003
-+++ gcc-3.2.3/gcc/Makefile.in	Sat Sep  6 19:45:51 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 static and shared libgcc2.
- # Assembler files should have names ending in `.asm'.
-@@ -445,7 +445,7 @@
- 
- # A list of all the language-specific executables.
- # This is overridden by configure.
-COMPILERS = cc1$(exeext) @all_compilers@
-+COMPILERS = @all_compilers@
- 
- # List of things which should already be built whenever we try to use xgcc
- # to compile anything (without linking).
-@@ -2531,9 +2531,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: 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
- 
- # Handle cpp installation.
- install-cpp: cpp$(exeext)
-@@ -2581,53 +2580,6 @@
- 	  else true; \
- 	  fi; \
- 	done
-	for file in $(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_COLLECT2) ..; do \
-	  if [ x"$$file" != x.. ]; then \
-	    rm -f $(DESTDIR)$(libsubdir)/$$file; \
-	    $(INSTALL_PROGRAM) $$file $(DESTDIR)$(libsubdir)/$$file; \
-	  else true; fi; \
-	done
-	for file in $(EXTRA_PARTS) ..; do \
-	  if [ x"$$file" != x.. ]; then \
-	    rm -f $(DESTDIR)$(libsubdir)/$$file; \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(libsubdir)/$$file; \
-	    chmod a-x $(DESTDIR)$(libsubdir)/$$file; \
-	  else true; fi; \
-	done
-# Don't mess with specs if it doesn't exist yet.
-	-if [ -f specs ] ; then \
-	  rm -f $(DESTDIR)$(libsubdir)/specs; \
-	  $(INSTALL_DATA) specs $(DESTDIR)$(libsubdir)/specs; \
-	  chmod a-x $(DESTDIR)$(libsubdir)/specs; \
-	fi
-# Install protoize if it was compiled.
-	-if [ -f protoize$(exeext) ]; \
-	then \
-	    if [ -f gcc-cross$(exeext) ] ; then \
-		rm -f $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \
-		$(INSTALL_PROGRAM) protoize$(exeext) $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \
-		rm -f $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \
-		$(INSTALL_PROGRAM) unprotoize$(exeext) $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \
-	    else \
-		rm -f $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \
-		$(INSTALL_PROGRAM) protoize$(exeext) $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \
-		rm -f $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \
-		$(INSTALL_PROGRAM) unprotoize$(exeext) $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \
-	    fi ; \
-	    rm -f $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
-	    $(INSTALL_DATA) SYSCALLS.c.X $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
-	    chmod a-x $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
-	fi
-	-rm -f $(DESTDIR)$(libsubdir)/cpp0$(exeext)
-	$(INSTALL_PROGRAM) cpp0$(exeext) $(DESTDIR)$(libsubdir)/cpp0$(exeext)
-	-rm -f $(DESTDIR)$(libsubdir)/tradcpp0$(exeext)
-	$(INSTALL_PROGRAM) tradcpp0$(exeext) $(DESTDIR)$(libsubdir)/tradcpp0$(exeext)
-# Install gcov if it was compiled.
-	-if [ -f gcov$(exeext) ]; \
-	then \
-	    rm -f $(DESTDIR)$(bindir)/gcov$(exeext); \
-	    $(INSTALL_PROGRAM) gcov$(exeext) $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext); \
-	fi
- 	$(INSTALL_SCRIPT) gccbug $(DESTDIR)$(bindir)/$(GCCBUG_INSTALL_NAME)
- 
- # Install the driver program as $(target_alias)-gcc
--- a/devel/i386-rtems-gcj/pkg-descr
+++ b/devel/i386-rtems-gcj/pkg-descr
@ -1,10 +0,0 @@
-The base port for all the RTEMS JAVA-gcc ports.   RTEMS is a 
-Real-Time Operating System of Embedded Software development.
-It has its origins in the US Military, but is now open-source
-and supported by a wide varity of GNU tool languages.  It 
-a large number of processors and systems.
-
-WWW: http://www.rtems.com/
-
- Jim
-jim@thehousleys.net
--- a/devel/i386-rtems-gcj/pkg-plist
+++ b/devel/i386-rtems-gcj/pkg-plist
@ -1 +0,0 @@
-@comment this plist intentionally left empty
--- a/devel/i386-rtems-gcj/pkg-plist.arm-rtems
+++ b/devel/i386-rtems-gcj/pkg-plist.arm-rtems
@ -1,8 +0,0 @@
-bin/arm-rtems-gcj
-bin/arm-rtems-gcjh
-bin/arm-rtems-jv-scan
-bin/arm-rtems-jcf-dump
-bin/grepjar
-bin/jar
-lib/gcc-lib/arm-rtems/%%GCCVERSION%%/jc1
-lib/gcc-lib/arm-rtems/%%GCCVERSION%%/jvgenmain
--- a/devel/i386-rtems-gcj/pkg-plist.i386-rtems
+++ b/devel/i386-rtems-gcj/pkg-plist.i386-rtems
@ -1,8 +0,0 @@
-bin/grepjar
-bin/i386-rtems-gcj
-bin/i386-rtems-gcjh
-bin/i386-rtems-jv-scan
-bin/i386-rtems-jcf-dump
-bin/jar
-lib/gcc-lib/i386-rtems/%%GCCVERSION%%/jc1
-lib/gcc-lib/i386-rtems/%%GCCVERSION%%/jvgenmain
--- a/devel/i386-rtems-gcj/pkg-plist.m68k-rtems
+++ b/devel/i386-rtems-gcj/pkg-plist.m68k-rtems
@ -1,8 +0,0 @@
-bin/grepjar
-bin/jar
-bin/m68k-rtems-gcj
-bin/m68k-rtems-gcjh
-bin/m68k-rtems-jv-scan
-bin/m68k-rtems-jcf-dump
-lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/jc1
-lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/jvgenmain
--- a/devel/i386-rtems-gcj/pkg-plist.mips-rtems
+++ b/devel/i386-rtems-gcj/pkg-plist.mips-rtems
@ -1,8 +0,0 @@
-bin/grepjar
-bin/jar
-bin/mips-rtems-gcj
-bin/mips-rtems-gcjh
-bin/mips-rtems-jv-scan
-bin/mips-rtems-jcf-dump
-lib/gcc-lib/mips-rtems/%%GCCVERSION%%/jc1
-lib/gcc-lib/mips-rtems/%%GCCVERSION%%/jvgenmain
--- a/devel/i386-rtems-gcj/pkg-plist.powerpc-rtems
+++ b/devel/i386-rtems-gcj/pkg-plist.powerpc-rtems
@ -1,8 +0,0 @@
-bin/grepjar
-bin/jar
-bin/powerpc-rtems-gcj
-bin/powerpc-rtems-gcjh
-bin/powerpc-rtems-jv-scan
-bin/powerpc-rtems-jcf-dump
-lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/jc1
-lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/jvgenmain
--- a/devel/i386-rtems-gcj/pkg-plist.sh-rtems
+++ b/devel/i386-rtems-gcj/pkg-plist.sh-rtems
@ -1,8 +0,0 @@
-bin/grepjar
-bin/jar
-bin/sh-rtems-gcj
-bin/sh-rtems-gcjh
-bin/sh-rtems-jv-scan
-bin/sh-rtems-jcf-dump
-lib/gcc-lib/sh-rtems/%%GCCVERSION%%/jc1
-lib/gcc-lib/sh-rtems/%%GCCVERSION%%/jvgenmain
--- a/devel/i386-rtems-gcj/pkg-plist.sparc-rtems
+++ b/devel/i386-rtems-gcj/pkg-plist.sparc-rtems
@ -1,8 +0,0 @@
-bin/grepjar
-bin/jar
-bin/sparc-rtems-gcj
-bin/sparc-rtems-gcjh
-bin/sparc-rtems-jv-scan
-bin/sparc-rtems-jcf-dump
-lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/jc1
-lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/jvgenmain
--- a/devel/m68k-rtems-gcj/Makefile
+++ b/devel/m68k-rtems-gcj/Makefile
@ -1,13 +0,0 @@
-# New ports collection makefile for:	m68k-rtems-gcj
-# Date created:		9 June 2000
-# Whom:			James Housley <jim@thehousleys.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gcj
-
-MAINTAINER=	jeh@FreeBSD.org
-
-LCLTARGET=	m68k-rtems
-.include "${.CURDIR}/../i386-rtems-gcj/Makefile"
--- a/devel/mips-rtems-gcj/Makefile
+++ b/devel/mips-rtems-gcj/Makefile
@ -1,13 +0,0 @@
-# New ports collection makefile for:	mips-rtems-gcj
-# Date created:		9 June 2000
-# Whom:			James Housley <jim@thehousleys.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gcj
-
-MAINTAINER=	jeh@FreeBSD.org
-
-LCLTARGET=	mips-rtems
-.include "${.CURDIR}/../i386-rtems-gcj/Makefile"
--- a/devel/powerpc-rtems-gcj/Makefile
+++ b/devel/powerpc-rtems-gcj/Makefile
@ -1,13 +0,0 @@
-# New ports collection makefile for:	powerpc-rtems-gcj
-# Date created:		9 June 2000
-# Whom:			James Housley <jim@thehousleys.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gcj
-
-MAINTAINER=	jeh@FreeBSD.org
-
-LCLTARGET=	powerpc-rtems
-.include "${.CURDIR}/../i386-rtems-gcj/Makefile"
--- a/devel/sh-rtems-gcj/Makefile
+++ b/devel/sh-rtems-gcj/Makefile
@ -1,13 +0,0 @@
-# New ports collection makefile for:	sh-rtems-gcj
-# Date created:		9 June 2000
-# Whom:			James Housley <jim@thehousleys.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gcj
-
-MAINTAINER=	jeh@FreeBSD.org
-
-LCLTARGET=	sh-rtems
-.include "${.CURDIR}/../i386-rtems-gcj/Makefile"
--- a/devel/sparc-rtems-gcj/Makefile
+++ b/devel/sparc-rtems-gcj/Makefile
@ -1,13 +0,0 @@
-# New ports collection makefile for:	sparc-rtems-gcj
-# Date created:		9 June 2000
-# Whom:			James Housley <jim@thehousleys.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gcj
-
-MAINTAINER=	jeh@FreeBSD.org
-
-LCLTARGET=	sparc-rtems
-.include "${.CURDIR}/../i386-rtems-gcj/Makefile"
				`@ -1 +0,0 @@`
				`@comment this plist intentionally left empty`