2 files changed, 8 insertions, 67 deletions

diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 90ae927a2b9e..f06abdc8e671 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -8,8 +8,8 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.5.20090325
-PORTREVISION=	4
-CATEGORIES=	lang java
+PORTREVISION=	5
+CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -38,10 +38,6 @@ CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != i386 && ${ARCH} != amd64
-WITHOUT_JAVA=	yes
-.endif
-
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
@@ -80,45 +76,10 @@ INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/libgomp
 
-.if ! defined(WITHOUT_JAVA)
-ECJ_JAR=	ecj-4.3.jar
-MASTER_SITES+=	${MASTER_SITE_SOURCEWARE:S|$|:ecj|}
-MASTER_SITE_SUBDIR+=	java/:ecj
-DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
-		${ECJ_JAR}:ecj
-EXTRACT_ONLY=  ${DISTFILES:S|${ECJ_JAR}:ecj||}
-BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
-EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
-# FIXME: we are currently getting weird build failures with libjava on
-# some 4.x and 5.x systems, which the following works around. PR 81788.
-CONFIGURE_ARGS+=--disable-rpath --enable-libgcj
-MAKE_ENV+=	JAR=no
-MAN1+=		gcj${SUFFIX}.1 \
-		gcj-dbtool${SUFFIX}.1 \
-		gcjh${SUFFIX}.1 \
-		gij${SUFFIX}.1 \
-		gjnih${SUFFIX}.1 \
-		grmic${SUFFIX}.1 \
-		grmiregistry${SUFFIX}.1 \
-		jcf-dump${SUFFIX}.1 \
-		jv-scan${SUFFIX}.1 \
-		jv-convert${SUFFIX}.1
-INFO+=		gcc${SUFFIX}/gcj
-PLIST_SUB+=	JAVA=""
-
-# Preps the source tree for the gcj build
-post-patch::
-	@${CP} ${DISTDIR}/${ECJ_JAR} ${SRCDIR}/ecj.jar
-
-.else
-CONFIGURE_ARGS+=--disable-libgcj
-PLIST_SUB+=	JAVA="@comment "
-.endif
-
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 
-post-patch::
+post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
 
@@ -133,7 +94,7 @@ post-install:
 	${RM} -f ${TARGLIB}/*.la
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
 	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/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index 0550586fa444..04d43ba5b8b3 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -1,33 +1,13 @@
 @comment $FreeBSD$
+bin/%%GNU_HOST%%-c++%%SUFFIX%%
+bin/%%GNU_HOST%%-g++%%SUFFIX%%
+bin/%%GNU_HOST%%-gcc%%SUFFIX%%
+bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/c++%%SUFFIX%%
 bin/cpp%%SUFFIX%%
 bin/g++%%SUFFIX%%
 bin/gcc%%SUFFIX%%
 bin/gccbug%%SUFFIX%%
 bin/gcov%%SUFFIX%%
-bin/%%GNU_HOST%%-c++%%SUFFIX%%
-bin/%%GNU_HOST%%-g++%%SUFFIX%%
-bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
-bin/%%GNU_HOST%%-gcc%%SUFFIX%%
 info/gcc%%SUFFIX%%/dir
-%%JAVA%%bin/addr2name.awk%%SUFFIX%%
-%%JAVA%%bin/gappletviewer%%SUFFIX%%
-%%JAVA%%bin/gcj%%SUFFIX%%
-%%JAVA%%bin/gcj-dbtool%%SUFFIX%%
-%%JAVA%%bin/gcjh%%SUFFIX%%
-%%JAVA%%bin/gij%%SUFFIX%%
-%%JAVA%%bin/gjarsigner%%SUFFIX%%
-%%JAVA%%bin/gjnih%%SUFFIX%%
-%%JAVA%%bin/gkeytool%%SUFFIX%%
-%%JAVA%%bin/grmic%%SUFFIX%%
-%%JAVA%%bin/grmiregistry%%SUFFIX%%
-%%JAVA%%bin/jar%%SUFFIX%%
-%%JAVA%%bin/jv-convert%%SUFFIX%%
-%%JAVA%%bin/jv-scan%%SUFFIX%%
-%%JAVA%%bin/jcf-dump%%SUFFIX%%
-%%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
-%%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
-%%JAVA%%libdata/pkgconfig/libgcj-4.2.pc
-%%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
-%%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here