Index: head/lang/gcc32/pkg-plist.libgcj
===================================================================
--- head/lang/gcc32/pkg-plist.libgcj	(revision 123825)
+++ head/lang/gcc32/pkg-plist.libgcj	(nonexistent)
@@ -1,9 +0,0 @@
-bin/addr2name.awk
-bin/gij
-bin/jv-convert
-bin/rmic
-bin/rmiregistry
-lib/security/classpath.security
-lib/security/libgcj.security
-share/java/libgcj-3.2.3.jar
-@dirrm lib/security

Property changes on: head/lang/gcc32/pkg-plist.libgcj
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/lang/gcc32/Makefile
===================================================================
--- head/lang/gcc32/Makefile	(revision 123825)
+++ head/lang/gcc32/Makefile	(revision 123826)
@@ -1,176 +1,157 @@
 # ex:ts=8
 # Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
 PORTVERSION=	3.2.3
 PORTREVISION=	2
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${PORTVERSION}
 DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
 		gcc-testsuite-${PORTVERSION}${EXTRACT_SUFX} \
 		gcc-g++-${PORTVERSION}${EXTRACT_SUFX} \
 		gcc-g77-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-java-${PORTVERSION}${EXTRACT_SUFX} \
 		gcc-objc-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.2.3
 
 LATEST_LINK?=	gcc32${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 # Do not require GCC 3.2 to compile -- or we have an infinite loop on RELENG_4.
 USE_GCC=	X
 NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 502101
-EXTRA_PATCHES=	${FILESDIR}/extrapatch-gcc__config__freebsd-spec.h \
-		${FILESDIR}/extrapatch-libjava__configure
+EXTRA_PATCHES=	${FILESDIR}/extrapatch-gcc__config__freebsd-spec.h
 .endif
 
-.if ${ARCH} == "sparc64" || ${ARCH} == "ia64" || ${ARCH} == "amd64"
-# libgcj is built on all platforms except sparc64 and ia64 and amd64
-WITHOUT_LIBJAVA=yes
-.endif
-.if ${ARCH} == "ia64"
-BROKEN=	gcj does not build.
-.endif
 .if ${ARCH} == "amd64"
 BROKEN=	linker: unrecognised emulation mode: elf_x86_64
 .endif
 
 .if ${PORTOBJFORMAT} == "aout"
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .else
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 .endif
 
 GCC_REV=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${GCC_REV}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}
 PLIST_SUB=	GCC_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}  \
 		PORTVERSION=${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-gxx-include-dir=${TARGLIB}/include/g++-v3
 #CONFIGURE_ARGS+=	--program-suffix=32
 CONFIGURE_ARGS+=	--with-system-zlib --includedir=${TARGLIB}/include/Java
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+=	--enable-shared
 INSTALLS_SHLIB=		yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib ${TARGLIB}
 EXTRA_SHLIB=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
 CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
 CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
-.if defined(WITHOUT_LIBJAVA)
-CONFIGURE_ARGS+=	--disable-libgcj
-.endif
 
 ALL_TARGET=	bootstrap
-MAN1=		cpp32.1 g++32.1 g77-32.1 gcc32.1 gcov32.1 \
-		gcj32.1 gcjh32.1 gij.1 rmic.1 rmiregistry.1 \
-		jcf-dump32.1 jv-scan32.1 jv-convert.1
+MAN1=		cpp32.1 g++32.1 g77-32.1 gcc32.1 gcov32.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
 	@echo "Consider running 'make check' before 'make install',"
 	@echo "especially if you have not built port on -STABLE or -CURRENT."
 	@echo "This suggestion assumes that you have dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
 	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
 		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
 		${TARGLIB}/cpp0 ${TARGLIB}/collect2 ${TARGLIB}/f771 ; \
 	do \
 		${STRIP_CMD} $$prog ; \
 	done )
-.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh jv-scan jcf-dump jar grepjar
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
 	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/${file}32
 	( ${TEST} ! -e ${PREFIX}/man/man1/${file}.1 \
 		|| ${MV} -f ${PREFIX}/man/man1/${file}.1 \
 		${PREFIX}/man/man1/${file}32.1 )
 .endfor
 .for file in g77
 	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/${file}-32
 	( ${TEST} ! -e ${PREFIX}/man/man1/${file}.1 \
 		|| ${MV} -f ${PREFIX}/man/man1/${file}.1 \
 		${PREFIX}/man/man1/${file}-32.1 )
 .endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for file in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
 	${MV} -f ${PREFIX}/lib/${file}.* ${TARGLIB}
 .endfor
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	# Java
-	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-.for info in cpp cppinternals g77 gcc gcj
+.for info in cpp cppinternals g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 # I am sick and tired of the anonyance that man pages can only be generated if
 # perl 5.6 is installed.  This is becoming a royal PITA on non-5-CURRENT systems
 .for mp in ${_MANPAGES}
 	( ${TEST} -e ${mp} && ${TOUCH} ${TOUCH_FLAGS} ${mp} )
 .endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \
 		>>${WRKDIR}/PLIST.gcc-lib
 	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
-.if !defined(WITHOUT_LIBJAVA)
-	${CAT} ${MASTERDIR}/pkg-plist.libgcj >> ${TMPPLIST}
-.endif
 
 .include <bsd.port.post.mk>

Property changes on: head/lang/gcc32/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.174
\ No newline at end of property
+1.175
\ No newline at end of property
Index: head/lang/gcc32/files/patch-ub
===================================================================
--- head/lang/gcc32/files/patch-ub	(revision 123825)
+++ head/lang/gcc32/files/patch-ub	(nonexistent)
@@ -1,32 +0,0 @@
---- gcc/java/gjavah.c.orig	Wed Feb  5 20:39:02 2003
-+++ gcc/java/gjavah.c	Wed Feb  5 20:43:53 2003
-@@ -750,10 +750,14 @@
- 		jfloat fnum = JPOOL_FLOAT (jcf, current_field_value);
- 		fputs ("const jfloat ", out);
- 		print_field_name (out, jcf, name_index, 0);
-+#ifdef __alpha__
-+                  fputs (";\n", out);
-+#else
- 		if (! java_float_finite (fnum))
- 		  fputs (";\n", out);
- 		else
- 		  fprintf (out, " = %.10g;\n",  fnum);
-+#endif
- 	      }
- 	      break;
- 	    case CONSTANT_Double:
-@@ -761,10 +765,14 @@
- 		jdouble dnum = JPOOL_DOUBLE (jcf, current_field_value);
- 		fputs ("const jdouble ", out);
- 		print_field_name (out, jcf, name_index, 0);
-+#ifdef __alpha__
-+                  fputs (";\n", out);
-+#else
- 		if (! java_double_finite (dnum))
- 		  fputs (";\n", out);
- 		else
- 		  fprintf (out, " = %.17g;\n",  dnum);
-+#endif
- 	      }
- 	      break;
- 	    default:

Property changes on: head/lang/gcc32/files/patch-ub
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/lang/gcc32/files/extrapatch-libjava__configure
===================================================================
--- head/lang/gcc32/files/extrapatch-libjava__configure	(revision 123825)
+++ head/lang/gcc32/files/extrapatch-libjava__configure	(nonexistent)
@@ -1,16 +0,0 @@
---- libjava/configure.orig	Sun Nov  7 17:50:53 2004
-+++ libjava/configure	Sun Nov  7 17:51:38 2004
-@@ -3221,13 +3221,6 @@
- 	# support for weak references to pthread_* functions ala gthr.h API.
- 	THREADSPEC='%{!pthread: %eUnder this configuration, the user must provide -pthread when linking.}'
- 	;;
--     *-*-freebsd*)
--	# FreeBSD 5 implements a model much closer to other modern UNIX
--	# which support threads.  However, it still does not support
--	# -lpthread.
--	THREADLDFLAGS=-pthread
--	THREADSPEC=-lc_r
--	;;
-      *)
- 	THREADLIBS=-lpthread
- 	THREADSPEC=-lpthread

Property changes on: head/lang/gcc32/files/extrapatch-libjava__configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/lang/gcc32/pkg-plist
===================================================================
--- head/lang/gcc32/pkg-plist	(revision 123825)
+++ head/lang/gcc32/pkg-plist	(revision 123826)
@@ -1,37 +1,28 @@
 @comment $FreeBSD$
 bin/cpp32
 bin/g++filt32
 bin/g++32
 bin/g77-32
 bin/gcc32
 bin/gcov32
 bin/%%GNU_HOST%%-gcc32
 bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%PORTVERSION%%
-bin/gcj32
-bin/gcjh32
-bin/jv-scan32
-bin/jcf-dump32
-bin/jar32
-bin/grepjar32
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
 @unexec install-info --delete %D/info/cppinternals.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/gccint.info %D/info/dir
-@unexec install-info --delete %D/info/gcj.info %D/info/dir
 info/cpp.info
 info/cppinternals.info
 info/g77.info
 info/gcc.info
 info/gccint.info
-info/gcj.info
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/cppinternals.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 @exec install-info %D/info/gccint.info %D/info/dir
-@exec install-info %D/info/gcj.info %D/info/dir

Property changes on: head/lang/gcc32/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.47
\ No newline at end of property
+1.48
\ No newline at end of property