Remove support for Java, not the least because libjava only builds on i386,

Java in GCC 4.x is so much better, and this reduces build time and download
bandwidth required for this "legacy" port whose main purpose is to support
package building on FreeBSD 4.x quite a bit.

Submitted by:	obrien

3 files changed, 5 insertions, 64 deletions

diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index dd2307f39660..7f6dfe79294b 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	gcc
 PORTVERSION=	3.4.5
 PORTREVISION=	20050607
-CATEGORIES=	lang java
+CATEGORIES=	lang
 VERSIONSTRING=	3.4-${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}
 
@@ -44,10 +43,6 @@ CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
-WITHOUT_LIBJAVA=	yes
-.endif
-
 .if ${ARCH} == alpha
 USE_GCC=	3.3+
 .endif
@@ -80,30 +75,11 @@ 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
-INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
-
-.if defined(WITHOUT_LIBJAVA)
-CONFIGURE_ARGS+=	--disable-libgcj
-PLIST_SUB+=	LIBJAVA="@comment "
-.else
-EXTRA_LIBS+=	lib-org-xml-sax lib-org-w3c-dom libffi libgcj
-PLIST_SUB+=	LIBJAVA=""
-.endif
+		gcov${SUFFIX}.1
+INFO=		cpp cppinternals g77 gcc gccinstall 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
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
@@ -128,7 +104,7 @@ post-install:
 	for mp in ${_MANPAGES}; do \
 	  ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
 	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}; \
@@ -150,7 +126,7 @@ post-install:
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	# Add target libraries and include files to packaging list.
 	${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}\///}
 	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/gcc34/files/patch-libjava::Makefile.in b/lang/gcc34/files/patch-libjava::Makefile.in
deleted file mode 100644
index 561b2632eb42..000000000000
--- a/lang/gcc34/files/patch-libjava::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libjava/Makefile.in.orig	Tue Aug 31 09:39:04 2004
-+++ libjava/Makefile.in	Tue Aug 31 09:39:46 2004
-@@ -180,7 +180,7 @@
- 
- toolexecmainlib_DATA = libgcj.spec
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libgcj.pc
- 
- jardir = $(datadir)/java
diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist
index ab102ac51884..fb5fc06542f2 100644
--- a/lang/gcc34/pkg-plist
+++ b/lang/gcc34/pkg-plist
@@ -9,33 +9,10 @@ bin/%%GNU_HOST%%-c++34
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc34
 bin/%%GNU_HOST%%-g++34
-bin/%%GNU_HOST%%-gcj34
-bin/%%GNU_HOST%%-gcjh34
 bin/gccbug34
-bin/gcj34
-bin/gcjh34
-%%LIBJAVA%%bin/gij34
-bin/jv-scan34
-bin/jcf-dump34
-%%LIBJAVA%%bin/jv-convert34
-bin/jar34
-bin/grepjar34
-%%LIBJAVA%%bin/rmic34
-%%LIBJAVA%%bin/rmiregistry34
-%%LIBJAVA%%bin/addr2name.awk34
-%%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/jni.h
-%%LIBJAVA%%include/jvmpi.h
-%%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/security/classpath.security
-%%LIBJAVA%%lib/security/libgcj.security
-%%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jvgenmain
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1obj
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh
@@ -45,5 +22,4 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
 @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%
 @unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true
 @unexec rmdir %D/libexec/gcc 2>/dev/null || true
-%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here