Update to the 20050728 snapshot of GCC 4.0.2.

Remove support for Java, not the least because libjava only builds on i386
and still does not really work there.

4 files changed, 18 insertions, 72 deletions

diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 39a4638b034a..c43992fb48e2 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -8,15 +8,14 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.2
-PORTREVISION=	20050721
-CATEGORIES=	lang java
+PORTREVISION=	20050728
+CATEGORIES=	lang
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 .if defined(WITH_FORTRAN)
@@ -50,12 +49,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
-# FIXME: needed to make this port build at all.
-WITHOUT_LIBJAVA=	yes
-
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 SUFFIX=		40
@@ -81,30 +74,10 @@ CONFIGURE_ARGS+=	--disable-shared
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
-		fastjar${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
-		gcov${SUFFIX}.1 \
-		gcj${SUFFIX}.1 \
-		gcj-dbtool${SUFFIX}.1 \
-		gcjh${SUFFIX}.1 \
-		gij${SUFFIX}.1 \
-		gjnih${SUFFIX}.1 \
-		grmic${SUFFIX}.1 \
-		grmiregistry${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 gcc gccinstall gccint gcj fastjar
-
-.if defined(WITHOUT_LIBJAVA)
-CONFIGURE_ARGS+=	--disable-libgcj
-PLIST_SUB+=	LIBJAVA="@comment "
-.else
-PLIST_SUB+=	LIBJAVA=""
-.endif
+		gcov${SUFFIX}.1
+INFO=		cpp cppinternals gcc gccinstall gccint
 
 .if defined(WITH_FORTRAN)
 MAN1+=	gfortran${SUFFIX}.1
@@ -116,9 +89,6 @@ PLIST_SUB+=	FORTRAN="@comment "
 
 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]";|' \
@@ -143,7 +113,7 @@ post-install:
 	for mp in ${_MANPAGES}; do \
 	  ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
 	done
-.for f in c++ 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++ 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}; \
@@ -158,7 +128,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}\///} ${TARGLIB:S/^${PREFIX}\///:S/lib/libexec/} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/^${PREFIX}\///:S/lib/libexec/}
 	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/gcc40/distinfo b/lang/gcc40/distinfo
index c98a9db55967..61f79ca1f04e 100644
--- a/lang/gcc40/distinfo
+++ b/lang/gcc40/distinfo
@@ -1,12 +1,10 @@
-MD5 (gcc-core-4.0-20050721.tar.bz2) = 49580f2e8804bc7a015ac0744ddf1cbb
-SIZE (gcc-core-4.0-20050721.tar.bz2) = 13384432
-MD5 (gcc-g++-4.0-20050721.tar.bz2) = 566284581534302b1ddf6535e8cff7aa
-SIZE (gcc-g++-4.0-20050721.tar.bz2) = 2651589
-MD5 (gcc-java-4.0-20050721.tar.bz2) = a4ac317575ecff792e40b4fe122a8971
-SIZE (gcc-java-4.0-20050721.tar.bz2) = 5937700
-MD5 (gcc-objc-4.0-20050721.tar.bz2) = 967621e088d1987960dfff9730d412a1
-SIZE (gcc-objc-4.0-20050721.tar.bz2) = 177794
-MD5 (gcc-testsuite-4.0-20050721.tar.bz2) = 4e3e1cf33ad24d6e151c939f333da268
-SIZE (gcc-testsuite-4.0-20050721.tar.bz2) = 3076019
-MD5 (gcc-fortran-4.0-20050721.tar.bz2) = dad58dbc24ad084332f3dc780b134e12
-SIZE (gcc-fortran-4.0-20050721.tar.bz2) = 588832
+MD5 (gcc-core-4.0-20050728.tar.bz2) = c0bca9525963c363922ba71dc0058564
+SIZE (gcc-core-4.0-20050728.tar.bz2) = 13383597
+MD5 (gcc-g++-4.0-20050728.tar.bz2) = 839722ce5f2e188888e8482fd1ef4b43
+SIZE (gcc-g++-4.0-20050728.tar.bz2) = 2651515
+MD5 (gcc-objc-4.0-20050728.tar.bz2) = d723cbd2ae33f35b20d791bd3e8afe66
+SIZE (gcc-objc-4.0-20050728.tar.bz2) = 177798
+MD5 (gcc-testsuite-4.0-20050728.tar.bz2) = 78534b238652f9ca392d51beb241907e
+SIZE (gcc-testsuite-4.0-20050728.tar.bz2) = 3077575
+MD5 (gcc-fortran-4.0-20050728.tar.bz2) = f11cb8762987c37c15812867f74011a7
+SIZE (gcc-fortran-4.0-20050728.tar.bz2) = 589312
diff --git a/lang/gcc40/pkg-descr b/lang/gcc40/pkg-descr
index ae9a47f9db75..773220bcf716 100644
--- a/lang/gcc40/pkg-descr
+++ b/lang/gcc40/pkg-descr
@@ -1,6 +1,6 @@
-GCC, the GNU Compiler Collection includes C, C++, Java and Fortran.
+GCC, the GNU Compiler Collection includes C, C++, and Fortran.
 
-This port installs the various front ends as gcc40, g++40, gcj40, and
+This port installs the various front ends as gcc40, g++40, and
 so forth into the ${PREFIX}/bin directory.
 
 WWW: http://gcc.gnu.org/
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index 53328e385c3d..906a47326078 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -1,36 +1,14 @@
 @comment $FreeBSD$
 bin/c++40
 bin/cpp40
-bin/fastjar40
 bin/g++40
 bin/gcc40
 bin/gcov40
 bin/gccbug40
-bin/gcj40
-bin/gcjh40
-bin/gjnih40
-bin/grepjar40
-bin/jv-scan40
-bin/jcf-dump40
 bin/%%GNU_HOST%%-c++40
 bin/%%GNU_HOST%%-g++40
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc40
-bin/%%GNU_HOST%%-gcj40
-bin/%%GNU_HOST%%-gcjh40
 include/mf-runtime.h
 %%FORTRAN%%bin/gfortran40
-%%LIBJAVA%%bin/addr2name.awk40
-%%LIBJAVA%%bin/gcj-dbtool40
-%%LIBJAVA%%bin/gij40
-%%LIBJAVA%%bin/grmic40
-%%LIBJAVA%%bin/grmiregistry40
-%%LIBJAVA%%bin/jv-convert40
-%%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/security/classpath.security
-%%LIBJAVA%%lib/security/libgcj.security
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
-%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
-%%LIBJAVA%%@dirrm lib/security
 @comment Insert PLIST.lib here