4 files changed, 22 insertions, 74 deletions

diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 7ac2efb228b8..93ed78b6b5e4 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -8,8 +8,8 @@
 
 PORTNAME=	gcc
 PORTVERSION=	3.3.6
-PORTREVISION=	20050330
-CATEGORIES=	lang java
+PORTREVISION=	20050427
+CATEGORIES=	lang
 VERSIONSTRING=	3.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -17,7 +17,6 @@ DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g77-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
@@ -25,7 +24,6 @@ MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
-
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -40,15 +38,11 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
-BROKEN=			"Bus errors in stage2; system compiler may be broken." 
+BROKEN=			"Bus errors in stage2; system compiler may be broken."
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
-WITHOUT_LIBJAVA=	yes
-.endif
-
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 SUFFIX=		33
@@ -58,7 +52,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls \
 		--with-system-zlib \
 		--program-suffix=${SUFFIX} \
-		--with-gxx-include-dir=${TARGLIB}/include/c++/
+		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
+		--enable-languages=c,c++,objc,f77
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+=	--enable-shared
@@ -73,30 +68,13 @@ MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		g77-${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
-		gcov${SUFFIX}.1 \
-		gcj${SUFFIX}.1 \
-		gcjh${SUFFIX}.1 \
-		gij${SUFFIX}.1 \
-		grepjar${SUFFIX}.1 \
-		jar${SUFFIX}.1 \
-		jcf-dump${SUFFIX}.1 \
-		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
-		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
+		gcov${SUFFIX}.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
-INFO=		cpp cppinternals g77 gcc gccint gcj fastjar
-
-.if defined(WITHOUT_LIBJAVA)
-CONFIGURE_ARGS+=	--disable-libgcj
-PLIST_SUB+=	LIBJAVA="@comment "
-.else
-PLIST_SUB+=	LIBJAVA=""
-.endif
+INFO=		cpp cppinternals g77 gcc gccint
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
-.if defined(WITHOUT_LIBJAVA)
-	@${ECHO_MSG} "(without libgcj)"
-.endif
+	@${ECHO_MSG} "(without Java)"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
@@ -122,7 +100,7 @@ post-install: fake-manpages
 	do \
 		${STRIP_CMD} $$prog ; \
 	done )
-.for f in c++ g77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
+.for f in c++ g77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ 
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
 	  ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \
@@ -140,12 +118,11 @@ post-install: fake-manpages
 	${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
 .endfor
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
 	# Handle target libraries and GCJ include files.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} include/gnu
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
diff --git a/lang/gcc33/distinfo b/lang/gcc33/distinfo
index f64d46cde6c3..5e31122bfc25 100644
--- a/lang/gcc33/distinfo
+++ b/lang/gcc33/distinfo
@@ -1,12 +1,10 @@
-MD5 (gcc-core-3.3-20050330.tar.bz2) = 318e780d81e070d4ff4adfd5b97bd900
-SIZE (gcc-core-3.3-20050330.tar.bz2) = 10125241
-MD5 (gcc-g++-3.3-20050330.tar.bz2) = 4bf0d7465e9b3510b53dfa109a43ad1d
-SIZE (gcc-g++-3.3-20050330.tar.bz2) = 2011992
-MD5 (gcc-g77-3.3-20050330.tar.bz2) = 4a47f89d0bf9f8df94553c735c4885e8
-SIZE (gcc-g77-3.3-20050330.tar.bz2) = 905162
-MD5 (gcc-java-3.3-20050330.tar.bz2) = fa17fde38f0305c019a79fd9a58e4414
-SIZE (gcc-java-3.3-20050330.tar.bz2) = 3446594
-MD5 (gcc-objc-3.3-20050330.tar.bz2) = 45035f9ba8bea6a6710381dd1f05a924
-SIZE (gcc-objc-3.3-20050330.tar.bz2) = 141123
-MD5 (gcc-testsuite-3.3-20050330.tar.bz2) = 2ad8fa278b182202bb8ab036ecc21d68
-SIZE (gcc-testsuite-3.3-20050330.tar.bz2) = 1085689
+MD5 (gcc-core-3.3-20050427.tar.bz2) = 595e9569314ab1907b31f34530db1fa5
+SIZE (gcc-core-3.3-20050427.tar.bz2) = 10125972
+MD5 (gcc-g++-3.3-20050427.tar.bz2) = 3830aff11dabf751beed52148f15141f
+SIZE (gcc-g++-3.3-20050427.tar.bz2) = 2011830
+MD5 (gcc-g77-3.3-20050427.tar.bz2) = 5e91f01e7fe0bfd19d7e205b8b4233d1
+SIZE (gcc-g77-3.3-20050427.tar.bz2) = 904938
+MD5 (gcc-objc-3.3-20050427.tar.bz2) = 36f0c7a031d4f028ed43af588cd85bd5
+SIZE (gcc-objc-3.3-20050427.tar.bz2) = 141220
+MD5 (gcc-testsuite-3.3-20050427.tar.bz2) = 6421517d6855448f1fa9f26e8dd7bed0
+SIZE (gcc-testsuite-3.3-20050427.tar.bz2) = 1085831
diff --git a/lang/gcc33/pkg-descr b/lang/gcc33/pkg-descr
index 7bb6ae0d57ff..80c75f1b35bb 100644
--- a/lang/gcc33/pkg-descr
+++ b/lang/gcc33/pkg-descr
@@ -1,6 +1,6 @@
-GCC, the GNU Compiler Collection includes gcc, g++, gcj, and g77.
+GCC, the GNU Compiler Collection includes gcc, g++, and g77.
 
-This port installs the various front ends as gcc33, g++33, gcj33,
+This port installs the various front ends as gcc33, g++33,
 and g77-33 into the ${PREFIX}/bin directory.
 
 WWW: http://gcc.gnu.org/
diff --git a/lang/gcc33/pkg-plist b/lang/gcc33/pkg-plist
index 07646abdcbc1..6b29af5a7310 100644
--- a/lang/gcc33/pkg-plist
+++ b/lang/gcc33/pkg-plist
@@ -9,34 +9,7 @@ bin/%%GNU_HOST%%-c++33
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc33
 bin/%%GNU_HOST%%-g++33
-bin/%%GNU_HOST%%-gcj33
 bin/gccbug33
-bin/gcj33
-bin/gcjh33
-%%LIBJAVA%%bin/gij33
-bin/jv-scan33
-bin/jcf-dump33
-%%LIBJAVA%%bin/jv-convert33
-bin/jar33
-bin/grepjar33
-%%LIBJAVA%%bin/rmic33
-%%LIBJAVA%%bin/rmiregistry33
-%%LIBJAVA%%bin/addr2name.awk33
-%%LIBJAVA%%include/fficonfig.h
-%%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/ffi_mips.h
-%%LIBJAVA%%include/jni.h
-%%LIBJAVA%%include/jvmpi.h
-%%LIBJAVA%%lib/libffi.la
-%%LIBJAVA%%lib/libffi.a
-%%LIBJAVA%%lib/security/classpath.security
-%%LIBJAVA%%lib/security/libgcj.security
-%%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%lib/lib-org-xml-sax.la
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.la
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here
 @comment -=[ begin PLIST.lib ]=-
 @comment -=[ end PLIST.lib ]=-