Unbreak the port by remove the Java language from this port. Anyone using

GCC 3.1 isn't using it for the Java compiler, but for C/C++ code.  Same
for FORTRAN77.  The Java bits also don't compile on FreeBSD/sparc64.

3 files changed, 8 insertions, 42 deletions

diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index c59c69d017cc..3f887a50f0bd 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -13,22 +13,18 @@ PORTNAME=	gcc
 PORTVERSION=	3.1.1
 PORTREVISION=	1
 PORTREVISION=	${SNAPVER}
-CATEGORIES=	lang java
+CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	releases/gcc-${GCC_REV}
 DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
 		gcc-g++-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-g77-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-java-${PORTVERSION}${EXTRACT_SUFX} \
 		gcc-objc-${PORTVERSION}${EXTRACT_SUFX}
 
 PATCH_SITES=	ftp://relay.nuxi.com/obrien/
 PATCHFILES=	port_gcc31_${SNAPDATE}.diff
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GNU Compiler Collection 3.1 (inprogress version)
-
-BROKEN=		Broken pkg-plist
+COMMENT=	GNU Compiler Collection 3.1
 
 DEPRECATED=	"This port is no longer in use by anything in the ports collection and will be removed in the future.  Use a later release instead"
 
@@ -51,10 +47,6 @@ NOMANCOMPRESS=	yes	# to hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "sparc64"
-BROKEN=		"Install fails on sparc64"
-.endif
-
 .if ${PORTOBJFORMAT} == "aout"
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .else
@@ -88,9 +80,7 @@ CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
-MAN1=		cpp31.1 g++31.1 g77-31.1 gcc31.1 gcov31.1 \
-		gcj31.1 gcjh31.1 gij.1 \
-		jcf-dump31.1 jv-scan31.1 jv-convert.1
+MAN1=		cpp31.1 g++31.1 gcc31.1 gcov31.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-everything::
@@ -114,25 +104,19 @@ 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/g++filt ${PREFIX}/bin/gcov \
 		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
 		${TARGLIB}/cc1 ${TARGLIB}/cc1obj ${TARGLIB}/cc1plus \
-		${TARGLIB}/cpp0 ${TARGLIB}/collect2 ${TARGLIB}/f771 ; \
+		${TARGLIB}/cpp0 ${TARGLIB}/collect2 ; \
 	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}31
 	( ${TEST} ! -e ${PREFIX}/man/man1/${file}.1 \
 		|| ${MV} -f ${PREFIX}/man/man1/${file}.1 \
 		${PREFIX}/man/man1/${file}31.1 )
 .endfor
-.for file in g77
-	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/${file}-31
-	( ${TEST} ! -e ${PREFIX}/man/man1/${file}.1 \
-		|| ${MV} -f ${PREFIX}/man/man1/${file}.1 \
-		${PREFIX}/man/man1/${file}-31.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.
@@ -140,13 +124,11 @@ post-install:
 	${MV} -f ${PREFIX}/lib/${file}.* ${TARGLIB}
 .endfor
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	# Java
-	cd ${PREFIX}/lib ; ${MV} -f libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
 # I am sick and tired of this .info shit, makeinfo --no-split isn't working
-	@cd ${PREFIX}/info ; ${RM} -f cpp.* cppinternals.* g77.* gcc.* gccint.* gcj.*
-#.for info in cpp cppinternals g77 gcc gcj
+	@cd ${PREFIX}/info ; ${RM} -f cpp.* cppinternals.* gcc.* gccint.*
+#.for info in cpp cppinternals 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
diff --git a/lang/gcc31/distinfo b/lang/gcc31/distinfo
index 2db32fbcd514..3797101860b4 100644
--- a/lang/gcc31/distinfo
+++ b/lang/gcc31/distinfo
@@ -2,10 +2,6 @@ MD5 (gcc-core-3.1.1.tar.bz2) = b4e28adf3043a165fa06561b3a743c21
 SIZE (gcc-core-3.1.1.tar.bz2) = 10213865
 MD5 (gcc-g++-3.1.1.tar.bz2) = 67c87ca839aadb90648abb15c4639fdd
 SIZE (gcc-g++-3.1.1.tar.bz2) = 1876873
-MD5 (gcc-g77-3.1.1.tar.bz2) = 053563936e9fc4932aaad013da103086
-SIZE (gcc-g77-3.1.1.tar.bz2) = 1142751
-MD5 (gcc-java-3.1.1.tar.bz2) = 5a5cf5088095c5c4378e63c30f832be5
-SIZE (gcc-java-3.1.1.tar.bz2) = 3152104
 MD5 (gcc-objc-3.1.1.tar.bz2) = f59f7471ed5f544791251fa57bcce85c
 SIZE (gcc-objc-3.1.1.tar.bz2) = 199839
 MD5 (port_gcc31_2002-09-09.diff) = 0680f6395440c81352abf9617f384d14
diff --git a/lang/gcc31/pkg-plist b/lang/gcc31/pkg-plist
index 4373bfe9f90f..9acc973865af 100644
--- a/lang/gcc31/pkg-plist
+++ b/lang/gcc31/pkg-plist
@@ -2,33 +2,21 @@
 bin/cpp31
 bin/g++filt31
 bin/g++31
-bin/g77-31
 bin/gcc31
 bin/gcov31
 bin/%%GNU_HOST%%-gcc31
 bin/%%GNU_HOST%%-g++31
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
 @comment I AM TIRED OF THIS .INFO CRAP	@unexec install-info --delete %D/info/cppinternals.info %D/info/dir
 @comment I AM TIRED OF THIS .INFO CRAP	@unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment I AM TIRED OF THIS .INFO CRAP	@unexec install-info --delete %D/info/g77.info %D/info/dir
 @comment I AM TIRED OF THIS .INFO CRAP	info/cpp.info
 @comment I AM TIRED OF THIS .INFO CRAP	info/cppinternals.info
-@comment I AM TIRED OF THIS .INFO CRAP	info/g77.info
 @comment I AM TIRED OF THIS .INFO CRAP	info/gcc.info
-@comment I AM TIRED OF THIS .INFO CRAP	info/gcj.info
 @comment I AM TIRED OF THIS .INFO CRAP	@exec install-info %D/info/cppinternals.info %D/info/dir
-@comment I AM TIRED OF THIS .INFO CRAP	@exec install-info %D/info/g77.info %D/info/dir
 @comment I AM TIRED OF THIS .INFO CRAP	@exec install-info %D/info/gcc.info %D/info/dir
-@comment I AM TIRED OF THIS .INFO CRAP	@exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%