Update to the 20050730 snapshot of GCC 4.1.0.

Replace the WITHOUT_LIBJAVA knob by WITHOUT_JAVA which also disables
building the compiler and tools proper and avoids fetching the entire
Java frontend and library tarball.

Remove bogus ${PREFIX}/share/classpath/api directory that libjava adds
these days.

Make the (optional) handling of the Fortran and Java frontends easier
to understand.

4 files changed, 66 insertions, 75 deletions

diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index a9967166f5ea..b4ce8472da24 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,20 +8,15 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050723
+PORTREVISION=	20050730
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-DISTFILES=	\
-		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
+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)
-DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.1
@@ -29,10 +24,6 @@ COMMENT=	GNU Compiler Collection 4.1
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 .endif
-.if defined(WITH_JAVA_AWT)
-LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
-#LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
-.endif
 
 CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.*
 LATEST_LINK?=	gcc41${PKGNAMESUFFIX}
@@ -53,19 +44,16 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
+WITHOUT_JAVA=	yes
+.endif
+
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
-WITHOUT_LIBJAVA=	yes
-.endif
-# FIXME: we are currently getting weird build failures with libjava on
-# some 4.x and 5.x systems, which the following seems to work around. PR 81788.
-CONFIGURE_ARGS+=	--disable-rpath
-
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 SUFFIX=		41
@@ -77,12 +65,9 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
-.if defined(WITH_FORTRAN)
-CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
-.endif
 .if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=      --enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
-WANT_SHAREDLIBS=yes #We need this atm
+CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
+WANT_SHAREDLIBS=yes	# We need this at the moment.
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
@@ -95,10 +80,28 @@ 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 \
+		gcov${SUFFIX}.1
+INFO=		cpp cppinternals gcc gccinstall gccint
+
+.if defined(WITH_FORTRAN)
+DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
+CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
+MAN1+=		gfortran${SUFFIX}.1
+INFO+=		gfortran
+PLIST_SUB+=	FORTRAN=""
+.else
+PLIST_SUB+=	FORTRAN="@comment "
+.endif
+
+.if ! defined(WITHOUT_JAVA)
+DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
+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
+MAN1+=		fastjar${SUFFIX}.1 \
 		gcj${SUFFIX}.1 \
 		gcj-dbtool${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
@@ -111,28 +114,17 @@ MAN1=		cpp${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 \
-		hacking vmintegration
-
-.if defined(WITHOUT_LIBJAVA)
-CONFIGURE_ARGS+=	--disable-libgcj
-PLIST_SUB+=	LIBJAVA="@comment "
+INFO+=		gcj fastjar hacking vmintegration
+PLIST_SUB+=	JAVA=""
 .else
-PLIST_SUB+=	LIBJAVA=""
-.endif
-
-.if defined(WITH_FORTRAN)
-MAN1+=	gfortran${SUFFIX}.1
-INFO+=	gfortran
-PLIST_SUB+=	FORTRAN=""
-.else
-PLIST_SUB+=	FORTRAN="@comment "
+CONFIGURE_ARGS+=--disable-libgcj
+PLIST_SUB+=	JAVA="@comment "
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
-.if defined(WITHOUT_LIBJAVA)
-	@${ECHO_MSG} "(without libgcj)"
+.if ! defined(WITHOUT_JAVA)
+	@${ECHO_MSG} "(with Java)"
 .endif
 
 post-patch:
@@ -153,6 +145,8 @@ check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
+	# FIXME: As of July 2005 libjava installs these bogus directories.
+	-${RMDIR} -p ${PREFIX}/share/classpath/api
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	for mp in ${_MANPAGES}; do \
@@ -160,9 +154,6 @@ post-install:
 	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
 	# 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}; \
-	fi
 	if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
 	  ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index e764a40dc222..4674d9f80e63 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050723.tar.bz2) = 95725040fbf0fa458bc22098b0507a56
-SIZE (gcc-core-4.1-20050723.tar.bz2) = 13959990
-MD5 (gcc-g++-4.1-20050723.tar.bz2) = 687ebc829ffdf6bbf27063e0d7011d00
-SIZE (gcc-g++-4.1-20050723.tar.bz2) = 3682715
-MD5 (gcc-java-4.1-20050723.tar.bz2) = cd32883317c101946d53ae3d0d41bcbb
-SIZE (gcc-java-4.1-20050723.tar.bz2) = 8459058
-MD5 (gcc-objc-4.1-20050723.tar.bz2) = 51e58669f7f5e8c6a9552260047aea9b
-SIZE (gcc-objc-4.1-20050723.tar.bz2) = 187782
-MD5 (gcc-testsuite-4.1-20050723.tar.bz2) = adaa30b27780f7a30f22899ba4f5ad47
-SIZE (gcc-testsuite-4.1-20050723.tar.bz2) = 3196527
-MD5 (gcc-fortran-4.1-20050723.tar.bz2) = 514801247aeb0f6a2dbf72f8d32b2650
-SIZE (gcc-fortran-4.1-20050723.tar.bz2) = 599383
+MD5 (gcc-core-4.1-20050730.tar.bz2) = 2ef982c65d277f6909cd4702bda79267
+SIZE (gcc-core-4.1-20050730.tar.bz2) = 13976333
+MD5 (gcc-g++-4.1-20050730.tar.bz2) = 6ec581388a9261bc234311880f154049
+SIZE (gcc-g++-4.1-20050730.tar.bz2) = 3684810
+MD5 (gcc-java-4.1-20050730.tar.bz2) = d8a7b901407414af6c554e8f86a8ca50
+SIZE (gcc-java-4.1-20050730.tar.bz2) = 8071010
+MD5 (gcc-objc-4.1-20050730.tar.bz2) = 96aed5a4e0c85bc6210ed9300dd30683
+SIZE (gcc-objc-4.1-20050730.tar.bz2) = 187910
+MD5 (gcc-testsuite-4.1-20050730.tar.bz2) = b71e56201964744307ce1c8d5d58f2e5
+SIZE (gcc-testsuite-4.1-20050730.tar.bz2) = 3208328
+MD5 (gcc-fortran-4.1-20050730.tar.bz2) = 640936bef958f6cebbd660d40dc1b819
+SIZE (gcc-fortran-4.1-20050730.tar.bz2) = 600012
diff --git a/lang/gcc46/files/patch-hier b/lang/gcc46/files/java-patch-hier
index af4e9b0ca2ce..af4e9b0ca2ce 100644
--- a/lang/gcc46/files/patch-hier
+++ b/lang/gcc46/files/java-patch-hier
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index f78bd33f253d..6dfb78cdcba7 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -1,7 +1,6 @@
 @comment $FreeBSD$
 bin/c++41
 bin/cpp41
-bin/fastjar41
 bin/g++41
 bin/gcc41
 bin/gcov41
@@ -9,15 +8,7 @@ bin/%%GNU_HOST%%-c++41
 bin/%%GNU_HOST%%-g++41
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc41
-bin/%%GNU_HOST%%-gcj41
-bin/%%GNU_HOST%%-gcjh41
 bin/gccbug41
-bin/gcj41
-bin/gcjh41
-bin/gjnih41
-bin/grepjar41
-bin/jv-scan41
-bin/jcf-dump41
 include/mf-runtime.h
 include/ssp/ssp.h
 include/ssp/string.h
@@ -25,13 +16,22 @@ include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
 %%FORTRAN%%bin/gfortran41
-%%LIBJAVA%%bin/addr2name.awk41
-%%LIBJAVA%%bin/gcj-dbtool41
-%%LIBJAVA%%bin/gij41
-%%LIBJAVA%%bin/grmic41
-%%LIBJAVA%%bin/grmiregistry41
-%%LIBJAVA%%bin/jv-convert41
-%%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
-%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
+%%JAVA%%bin/addr2name.awk41
+%%JAVA%%bin/fastjar41
+%%JAVA%%bin/gcj41
+%%JAVA%%bin/gcj-dbtool41
+%%JAVA%%bin/gcjh41
+%%JAVA%%bin/gij41
+%%JAVA%%bin/gjnih41
+%%JAVA%%bin/grepjar41
+%%JAVA%%bin/grmic41
+%%JAVA%%bin/grmiregistry41
+%%JAVA%%bin/jv-convert41
+%%JAVA%%bin/jv-scan41
+%%JAVA%%bin/jcf-dump41
+%%JAVA%%bin/%%GNU_HOST%%-gcj41
+%%JAVA%%bin/%%GNU_HOST%%-gcjh41
+%%JAVA%%include/ffi.h
+%%JAVA%%libdata/pkgconfig/libgcj.pc
+%%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here