diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 2ccfbf995ae7..58e10ba92b31 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,183 +1,181 @@
 # ex:ts=8
 # Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060617
+PORTREVISION=	20060624
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
 .endif
 
 SUFFIX=		42
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 .if defined(WITH_JAVA_AWT)
 USE_GNOME=	gtk20 libartlgpl2
 .endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
 CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint
 
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 MAN1+=		gfortran${SUFFIX}.1
 INFO+=		gcc${SUFFIX}/gfortran
 PLIST_SUB+=	FORTRAN=""
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
 .if ! defined(WITHOUT_JAVA)
 CONFLICTS=	gcc-4.1.*
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 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
 MAN1+=		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+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
 	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially"
 	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
 	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
 	-@${MKDIR} ${PREFIX}/libdata/ldconfig
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	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
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
 	  ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
 	fi
 .endfor
-	${MV} -f ${PREFIX}/include/mf-runtime.h \
-	         ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
 	${RM} -f ${TARGLIB}/*.la
 	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
 	         ${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
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
 	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
 	@-ncftpls -l ${SITE} | ${GREP} "LATEST.*${PORTVERSION:C/.[0-9]+$//}"
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 3a381f9f9fdf..df3128529f5c 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20060617.tar.bz2) = a90c32d1a765721f66ce26f676b29c94
-SHA256 (gcc-core-4.2-20060617.tar.bz2) = bf03570aaca92fda00f06bb19513a2562733a0258c61177c63ae9455d8f47cec
-SIZE (gcc-core-4.2-20060617.tar.bz2) = 15645543
-MD5 (gcc-g++-4.2-20060617.tar.bz2) = ad2d8b1a1161e26ceec6e0b9d4be430c
-SHA256 (gcc-g++-4.2-20060617.tar.bz2) = a6bfdd33a1bf15df55f80a2c8e1b8b6eb29ea29fe4658b6bca29c54bf3f65bde
-SIZE (gcc-g++-4.2-20060617.tar.bz2) = 4708570
-MD5 (gcc-objc-4.2-20060617.tar.bz2) = e0266374d32f248d160d0797d607d95f
-SHA256 (gcc-objc-4.2-20060617.tar.bz2) = 2cfa5e9a0970bcd12ec10af21e989cfdbea761de5eb904dca621533a61fb2c88
-SIZE (gcc-objc-4.2-20060617.tar.bz2) = 191837
-MD5 (gcc-testsuite-4.2-20060617.tar.bz2) = 366400c327ff4d0725446290aa1fb01a
-SHA256 (gcc-testsuite-4.2-20060617.tar.bz2) = ea7d1140e92a7961801c0d43928361711e34c9e465875d0dcd06305ce8503e12
-SIZE (gcc-testsuite-4.2-20060617.tar.bz2) = 3696071
-MD5 (gcc-fortran-4.2-20060617.tar.bz2) = ab1cc25b7dd3bbc5985583528f38db0a
-SHA256 (gcc-fortran-4.2-20060617.tar.bz2) = 20c32854cea6a06c83004089b8f96f8dcc5f5fb70dff83656a0b1f19e06bda12
-SIZE (gcc-fortran-4.2-20060617.tar.bz2) = 816259
-MD5 (gcc-java-4.2-20060617.tar.bz2) = 54dd1372463d55f39e5b32778b077fce
-SHA256 (gcc-java-4.2-20060617.tar.bz2) = ce505296b9a5e856257cc0ac3f7ffffc9a0ce029d673ace6e78de28fde12ab35
-SIZE (gcc-java-4.2-20060617.tar.bz2) = 10042905
+MD5 (gcc-core-4.2-20060624.tar.bz2) = dbedf1e638bddcbeda8f4ab6b455cdff
+SHA256 (gcc-core-4.2-20060624.tar.bz2) = bd35973430f2f01957aad0b9436d6b5d414414d2f91ab5a5da36c6114ccb5a7c
+SIZE (gcc-core-4.2-20060624.tar.bz2) = 15657378
+MD5 (gcc-g++-4.2-20060624.tar.bz2) = 00690199b8d8424707638d1e7856dee1
+SHA256 (gcc-g++-4.2-20060624.tar.bz2) = 0d56883cca9326791bc33b923c1b2ff781a0473f767fd880df23920837cf7a45
+SIZE (gcc-g++-4.2-20060624.tar.bz2) = 4711463
+MD5 (gcc-objc-4.2-20060624.tar.bz2) = 7a46e4aab12ab7f23cb3c53fd924f0f0
+SHA256 (gcc-objc-4.2-20060624.tar.bz2) = d56ed7328dda70b0c1f7c96e9a376fbbb532e5588c682d573cb0b945e2cd01f0
+SIZE (gcc-objc-4.2-20060624.tar.bz2) = 191812
+MD5 (gcc-testsuite-4.2-20060624.tar.bz2) = 0365194239244ead11094a3980cff3ec
+SHA256 (gcc-testsuite-4.2-20060624.tar.bz2) = 084a83618c9833c95998fc1300a1c8e987c24c8e5efe518891a4ee3eb31f7dfd
+SIZE (gcc-testsuite-4.2-20060624.tar.bz2) = 3703061
+MD5 (gcc-fortran-4.2-20060624.tar.bz2) = 110c405b0104dc286c7a230a5395eab1
+SHA256 (gcc-fortran-4.2-20060624.tar.bz2) = 8cfb3bcc9a2daf3d70b647a9e186374ad2d5ac9da9a843304710f9c212f3f0aa
+SIZE (gcc-fortran-4.2-20060624.tar.bz2) = 820064
+MD5 (gcc-java-4.2-20060624.tar.bz2) = df1612402c5502d1fdb41fa6b3fa8e0c
+SHA256 (gcc-java-4.2-20060624.tar.bz2) = e7090c0b7ad3fe6b4460c719bdfb95728d8f0284dd22f0c43d8257412cf3525e
+SIZE (gcc-java-4.2-20060624.tar.bz2) = 10047067
diff --git a/lang/gcc/files/java-patch-hier b/lang/gcc/files/java-patch-hier
index af4e9b0ca2ce..43a39deb09a5 100644
--- a/lang/gcc/files/java-patch-hier
+++ b/lang/gcc/files/java-patch-hier
@@ -1,16 +1,13 @@
 Index: libjava/Makefile.in
 ===================================================================
-RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
-retrieving revision 1.522
-diff -u -3 -p -r1.522 Makefile.in
---- libjava/Makefile.in	19 May 2005 21:46:39 -0000	1.522
-+++ libjava/Makefile.in	29 May 2005 16:00:44 -0000
-@@ -696,7 +696,7 @@ toolexeclib_LTLIBRARIES = libgcj.la libg
-     $(cond_gtk_ltlibrary) $(cond_gtk_gcjawt_ltlibrary) $(cond_xlib_ltlibrary)
- 
+--- libjava/Makefile.in	(revision 114994)
++++ libjava/Makefile.in	(working copy)
+@@ -667,7 +667,7 @@
+ toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2)
  toolexecmainlib_DATA = libgcj.spec
+ dbexec_LTLIBRARIES = libjvm.la
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libgcj.pc
  jardir = $(datadir)/java
  jar_DATA = libgcj-$(gcc_version).jar
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 2ccfbf995ae7..58e10ba92b31 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -1,183 +1,181 @@
 # ex:ts=8
 # Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060617
+PORTREVISION=	20060624
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
 .endif
 
 SUFFIX=		42
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 .if defined(WITH_JAVA_AWT)
 USE_GNOME=	gtk20 libartlgpl2
 .endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
 CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint
 
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 MAN1+=		gfortran${SUFFIX}.1
 INFO+=		gcc${SUFFIX}/gfortran
 PLIST_SUB+=	FORTRAN=""
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
 .if ! defined(WITHOUT_JAVA)
 CONFLICTS=	gcc-4.1.*
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 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
 MAN1+=		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+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
 	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially"
 	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
 	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
 	-@${MKDIR} ${PREFIX}/libdata/ldconfig
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	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
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
 	  ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
 	fi
 .endfor
-	${MV} -f ${PREFIX}/include/mf-runtime.h \
-	         ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
 	${RM} -f ${TARGLIB}/*.la
 	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
 	         ${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
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
 	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
 	@-ncftpls -l ${SITE} | ${GREP} "LATEST.*${PORTVERSION:C/.[0-9]+$//}"
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 3a381f9f9fdf..df3128529f5c 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20060617.tar.bz2) = a90c32d1a765721f66ce26f676b29c94
-SHA256 (gcc-core-4.2-20060617.tar.bz2) = bf03570aaca92fda00f06bb19513a2562733a0258c61177c63ae9455d8f47cec
-SIZE (gcc-core-4.2-20060617.tar.bz2) = 15645543
-MD5 (gcc-g++-4.2-20060617.tar.bz2) = ad2d8b1a1161e26ceec6e0b9d4be430c
-SHA256 (gcc-g++-4.2-20060617.tar.bz2) = a6bfdd33a1bf15df55f80a2c8e1b8b6eb29ea29fe4658b6bca29c54bf3f65bde
-SIZE (gcc-g++-4.2-20060617.tar.bz2) = 4708570
-MD5 (gcc-objc-4.2-20060617.tar.bz2) = e0266374d32f248d160d0797d607d95f
-SHA256 (gcc-objc-4.2-20060617.tar.bz2) = 2cfa5e9a0970bcd12ec10af21e989cfdbea761de5eb904dca621533a61fb2c88
-SIZE (gcc-objc-4.2-20060617.tar.bz2) = 191837
-MD5 (gcc-testsuite-4.2-20060617.tar.bz2) = 366400c327ff4d0725446290aa1fb01a
-SHA256 (gcc-testsuite-4.2-20060617.tar.bz2) = ea7d1140e92a7961801c0d43928361711e34c9e465875d0dcd06305ce8503e12
-SIZE (gcc-testsuite-4.2-20060617.tar.bz2) = 3696071
-MD5 (gcc-fortran-4.2-20060617.tar.bz2) = ab1cc25b7dd3bbc5985583528f38db0a
-SHA256 (gcc-fortran-4.2-20060617.tar.bz2) = 20c32854cea6a06c83004089b8f96f8dcc5f5fb70dff83656a0b1f19e06bda12
-SIZE (gcc-fortran-4.2-20060617.tar.bz2) = 816259
-MD5 (gcc-java-4.2-20060617.tar.bz2) = 54dd1372463d55f39e5b32778b077fce
-SHA256 (gcc-java-4.2-20060617.tar.bz2) = ce505296b9a5e856257cc0ac3f7ffffc9a0ce029d673ace6e78de28fde12ab35
-SIZE (gcc-java-4.2-20060617.tar.bz2) = 10042905
+MD5 (gcc-core-4.2-20060624.tar.bz2) = dbedf1e638bddcbeda8f4ab6b455cdff
+SHA256 (gcc-core-4.2-20060624.tar.bz2) = bd35973430f2f01957aad0b9436d6b5d414414d2f91ab5a5da36c6114ccb5a7c
+SIZE (gcc-core-4.2-20060624.tar.bz2) = 15657378
+MD5 (gcc-g++-4.2-20060624.tar.bz2) = 00690199b8d8424707638d1e7856dee1
+SHA256 (gcc-g++-4.2-20060624.tar.bz2) = 0d56883cca9326791bc33b923c1b2ff781a0473f767fd880df23920837cf7a45
+SIZE (gcc-g++-4.2-20060624.tar.bz2) = 4711463
+MD5 (gcc-objc-4.2-20060624.tar.bz2) = 7a46e4aab12ab7f23cb3c53fd924f0f0
+SHA256 (gcc-objc-4.2-20060624.tar.bz2) = d56ed7328dda70b0c1f7c96e9a376fbbb532e5588c682d573cb0b945e2cd01f0
+SIZE (gcc-objc-4.2-20060624.tar.bz2) = 191812
+MD5 (gcc-testsuite-4.2-20060624.tar.bz2) = 0365194239244ead11094a3980cff3ec
+SHA256 (gcc-testsuite-4.2-20060624.tar.bz2) = 084a83618c9833c95998fc1300a1c8e987c24c8e5efe518891a4ee3eb31f7dfd
+SIZE (gcc-testsuite-4.2-20060624.tar.bz2) = 3703061
+MD5 (gcc-fortran-4.2-20060624.tar.bz2) = 110c405b0104dc286c7a230a5395eab1
+SHA256 (gcc-fortran-4.2-20060624.tar.bz2) = 8cfb3bcc9a2daf3d70b647a9e186374ad2d5ac9da9a843304710f9c212f3f0aa
+SIZE (gcc-fortran-4.2-20060624.tar.bz2) = 820064
+MD5 (gcc-java-4.2-20060624.tar.bz2) = df1612402c5502d1fdb41fa6b3fa8e0c
+SHA256 (gcc-java-4.2-20060624.tar.bz2) = e7090c0b7ad3fe6b4460c719bdfb95728d8f0284dd22f0c43d8257412cf3525e
+SIZE (gcc-java-4.2-20060624.tar.bz2) = 10047067
diff --git a/lang/gcc42/files/java-patch-hier b/lang/gcc42/files/java-patch-hier
index af4e9b0ca2ce..43a39deb09a5 100644
--- a/lang/gcc42/files/java-patch-hier
+++ b/lang/gcc42/files/java-patch-hier
@@ -1,16 +1,13 @@
 Index: libjava/Makefile.in
 ===================================================================
-RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
-retrieving revision 1.522
-diff -u -3 -p -r1.522 Makefile.in
---- libjava/Makefile.in	19 May 2005 21:46:39 -0000	1.522
-+++ libjava/Makefile.in	29 May 2005 16:00:44 -0000
-@@ -696,7 +696,7 @@ toolexeclib_LTLIBRARIES = libgcj.la libg
-     $(cond_gtk_ltlibrary) $(cond_gtk_gcjawt_ltlibrary) $(cond_xlib_ltlibrary)
- 
+--- libjava/Makefile.in	(revision 114994)
++++ libjava/Makefile.in	(working copy)
+@@ -667,7 +667,7 @@
+ toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2)
  toolexecmainlib_DATA = libgcj.spec
+ dbexec_LTLIBRARIES = libjvm.la
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libgcj.pc
  jardir = $(datadir)/java
  jar_DATA = libgcj-$(gcc_version).jar
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 2ccfbf995ae7..58e10ba92b31 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -1,183 +1,181 @@
 # ex:ts=8
 # Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060617
+PORTREVISION=	20060624
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
 .endif
 
 SUFFIX=		42
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 .if defined(WITH_JAVA_AWT)
 USE_GNOME=	gtk20 libartlgpl2
 .endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
 CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint
 
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 MAN1+=		gfortran${SUFFIX}.1
 INFO+=		gcc${SUFFIX}/gfortran
 PLIST_SUB+=	FORTRAN=""
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
 .if ! defined(WITHOUT_JAVA)
 CONFLICTS=	gcc-4.1.*
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 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
 MAN1+=		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+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
 	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially"
 	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
 	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
 	-@${MKDIR} ${PREFIX}/libdata/ldconfig
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	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
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
 	  ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
 	fi
 .endfor
-	${MV} -f ${PREFIX}/include/mf-runtime.h \
-	         ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
 	${RM} -f ${TARGLIB}/*.la
 	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
 	         ${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
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
 	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
 	@-ncftpls -l ${SITE} | ${GREP} "LATEST.*${PORTVERSION:C/.[0-9]+$//}"
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 3a381f9f9fdf..df3128529f5c 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20060617.tar.bz2) = a90c32d1a765721f66ce26f676b29c94
-SHA256 (gcc-core-4.2-20060617.tar.bz2) = bf03570aaca92fda00f06bb19513a2562733a0258c61177c63ae9455d8f47cec
-SIZE (gcc-core-4.2-20060617.tar.bz2) = 15645543
-MD5 (gcc-g++-4.2-20060617.tar.bz2) = ad2d8b1a1161e26ceec6e0b9d4be430c
-SHA256 (gcc-g++-4.2-20060617.tar.bz2) = a6bfdd33a1bf15df55f80a2c8e1b8b6eb29ea29fe4658b6bca29c54bf3f65bde
-SIZE (gcc-g++-4.2-20060617.tar.bz2) = 4708570
-MD5 (gcc-objc-4.2-20060617.tar.bz2) = e0266374d32f248d160d0797d607d95f
-SHA256 (gcc-objc-4.2-20060617.tar.bz2) = 2cfa5e9a0970bcd12ec10af21e989cfdbea761de5eb904dca621533a61fb2c88
-SIZE (gcc-objc-4.2-20060617.tar.bz2) = 191837
-MD5 (gcc-testsuite-4.2-20060617.tar.bz2) = 366400c327ff4d0725446290aa1fb01a
-SHA256 (gcc-testsuite-4.2-20060617.tar.bz2) = ea7d1140e92a7961801c0d43928361711e34c9e465875d0dcd06305ce8503e12
-SIZE (gcc-testsuite-4.2-20060617.tar.bz2) = 3696071
-MD5 (gcc-fortran-4.2-20060617.tar.bz2) = ab1cc25b7dd3bbc5985583528f38db0a
-SHA256 (gcc-fortran-4.2-20060617.tar.bz2) = 20c32854cea6a06c83004089b8f96f8dcc5f5fb70dff83656a0b1f19e06bda12
-SIZE (gcc-fortran-4.2-20060617.tar.bz2) = 816259
-MD5 (gcc-java-4.2-20060617.tar.bz2) = 54dd1372463d55f39e5b32778b077fce
-SHA256 (gcc-java-4.2-20060617.tar.bz2) = ce505296b9a5e856257cc0ac3f7ffffc9a0ce029d673ace6e78de28fde12ab35
-SIZE (gcc-java-4.2-20060617.tar.bz2) = 10042905
+MD5 (gcc-core-4.2-20060624.tar.bz2) = dbedf1e638bddcbeda8f4ab6b455cdff
+SHA256 (gcc-core-4.2-20060624.tar.bz2) = bd35973430f2f01957aad0b9436d6b5d414414d2f91ab5a5da36c6114ccb5a7c
+SIZE (gcc-core-4.2-20060624.tar.bz2) = 15657378
+MD5 (gcc-g++-4.2-20060624.tar.bz2) = 00690199b8d8424707638d1e7856dee1
+SHA256 (gcc-g++-4.2-20060624.tar.bz2) = 0d56883cca9326791bc33b923c1b2ff781a0473f767fd880df23920837cf7a45
+SIZE (gcc-g++-4.2-20060624.tar.bz2) = 4711463
+MD5 (gcc-objc-4.2-20060624.tar.bz2) = 7a46e4aab12ab7f23cb3c53fd924f0f0
+SHA256 (gcc-objc-4.2-20060624.tar.bz2) = d56ed7328dda70b0c1f7c96e9a376fbbb532e5588c682d573cb0b945e2cd01f0
+SIZE (gcc-objc-4.2-20060624.tar.bz2) = 191812
+MD5 (gcc-testsuite-4.2-20060624.tar.bz2) = 0365194239244ead11094a3980cff3ec
+SHA256 (gcc-testsuite-4.2-20060624.tar.bz2) = 084a83618c9833c95998fc1300a1c8e987c24c8e5efe518891a4ee3eb31f7dfd
+SIZE (gcc-testsuite-4.2-20060624.tar.bz2) = 3703061
+MD5 (gcc-fortran-4.2-20060624.tar.bz2) = 110c405b0104dc286c7a230a5395eab1
+SHA256 (gcc-fortran-4.2-20060624.tar.bz2) = 8cfb3bcc9a2daf3d70b647a9e186374ad2d5ac9da9a843304710f9c212f3f0aa
+SIZE (gcc-fortran-4.2-20060624.tar.bz2) = 820064
+MD5 (gcc-java-4.2-20060624.tar.bz2) = df1612402c5502d1fdb41fa6b3fa8e0c
+SHA256 (gcc-java-4.2-20060624.tar.bz2) = e7090c0b7ad3fe6b4460c719bdfb95728d8f0284dd22f0c43d8257412cf3525e
+SIZE (gcc-java-4.2-20060624.tar.bz2) = 10047067
diff --git a/lang/gcc43/files/java-patch-hier b/lang/gcc43/files/java-patch-hier
index af4e9b0ca2ce..43a39deb09a5 100644
--- a/lang/gcc43/files/java-patch-hier
+++ b/lang/gcc43/files/java-patch-hier
@@ -1,16 +1,13 @@
 Index: libjava/Makefile.in
 ===================================================================
-RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
-retrieving revision 1.522
-diff -u -3 -p -r1.522 Makefile.in
---- libjava/Makefile.in	19 May 2005 21:46:39 -0000	1.522
-+++ libjava/Makefile.in	29 May 2005 16:00:44 -0000
-@@ -696,7 +696,7 @@ toolexeclib_LTLIBRARIES = libgcj.la libg
-     $(cond_gtk_ltlibrary) $(cond_gtk_gcjawt_ltlibrary) $(cond_xlib_ltlibrary)
- 
+--- libjava/Makefile.in	(revision 114994)
++++ libjava/Makefile.in	(working copy)
+@@ -667,7 +667,7 @@
+ toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2)
  toolexecmainlib_DATA = libgcj.spec
+ dbexec_LTLIBRARIES = libjvm.la
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libgcj.pc
  jardir = $(datadir)/java
  jar_DATA = libgcj-$(gcc_version).jar
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 2ccfbf995ae7..58e10ba92b31 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -1,183 +1,181 @@
 # ex:ts=8
 # Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060617
+PORTREVISION=	20060624
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
 .endif
 
 SUFFIX=		42
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 .if defined(WITH_JAVA_AWT)
 USE_GNOME=	gtk20 libartlgpl2
 .endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
 CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint
 
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 MAN1+=		gfortran${SUFFIX}.1
 INFO+=		gcc${SUFFIX}/gfortran
 PLIST_SUB+=	FORTRAN=""
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
 .if ! defined(WITHOUT_JAVA)
 CONFLICTS=	gcc-4.1.*
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 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
 MAN1+=		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+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
 	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially"
 	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
 	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
 	-@${MKDIR} ${PREFIX}/libdata/ldconfig
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	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
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
 	  ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
 	fi
 .endfor
-	${MV} -f ${PREFIX}/include/mf-runtime.h \
-	         ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
 	${RM} -f ${TARGLIB}/*.la
 	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
 	         ${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
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
 	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
 	@-ncftpls -l ${SITE} | ${GREP} "LATEST.*${PORTVERSION:C/.[0-9]+$//}"
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 3a381f9f9fdf..df3128529f5c 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20060617.tar.bz2) = a90c32d1a765721f66ce26f676b29c94
-SHA256 (gcc-core-4.2-20060617.tar.bz2) = bf03570aaca92fda00f06bb19513a2562733a0258c61177c63ae9455d8f47cec
-SIZE (gcc-core-4.2-20060617.tar.bz2) = 15645543
-MD5 (gcc-g++-4.2-20060617.tar.bz2) = ad2d8b1a1161e26ceec6e0b9d4be430c
-SHA256 (gcc-g++-4.2-20060617.tar.bz2) = a6bfdd33a1bf15df55f80a2c8e1b8b6eb29ea29fe4658b6bca29c54bf3f65bde
-SIZE (gcc-g++-4.2-20060617.tar.bz2) = 4708570
-MD5 (gcc-objc-4.2-20060617.tar.bz2) = e0266374d32f248d160d0797d607d95f
-SHA256 (gcc-objc-4.2-20060617.tar.bz2) = 2cfa5e9a0970bcd12ec10af21e989cfdbea761de5eb904dca621533a61fb2c88
-SIZE (gcc-objc-4.2-20060617.tar.bz2) = 191837
-MD5 (gcc-testsuite-4.2-20060617.tar.bz2) = 366400c327ff4d0725446290aa1fb01a
-SHA256 (gcc-testsuite-4.2-20060617.tar.bz2) = ea7d1140e92a7961801c0d43928361711e34c9e465875d0dcd06305ce8503e12
-SIZE (gcc-testsuite-4.2-20060617.tar.bz2) = 3696071
-MD5 (gcc-fortran-4.2-20060617.tar.bz2) = ab1cc25b7dd3bbc5985583528f38db0a
-SHA256 (gcc-fortran-4.2-20060617.tar.bz2) = 20c32854cea6a06c83004089b8f96f8dcc5f5fb70dff83656a0b1f19e06bda12
-SIZE (gcc-fortran-4.2-20060617.tar.bz2) = 816259
-MD5 (gcc-java-4.2-20060617.tar.bz2) = 54dd1372463d55f39e5b32778b077fce
-SHA256 (gcc-java-4.2-20060617.tar.bz2) = ce505296b9a5e856257cc0ac3f7ffffc9a0ce029d673ace6e78de28fde12ab35
-SIZE (gcc-java-4.2-20060617.tar.bz2) = 10042905
+MD5 (gcc-core-4.2-20060624.tar.bz2) = dbedf1e638bddcbeda8f4ab6b455cdff
+SHA256 (gcc-core-4.2-20060624.tar.bz2) = bd35973430f2f01957aad0b9436d6b5d414414d2f91ab5a5da36c6114ccb5a7c
+SIZE (gcc-core-4.2-20060624.tar.bz2) = 15657378
+MD5 (gcc-g++-4.2-20060624.tar.bz2) = 00690199b8d8424707638d1e7856dee1
+SHA256 (gcc-g++-4.2-20060624.tar.bz2) = 0d56883cca9326791bc33b923c1b2ff781a0473f767fd880df23920837cf7a45
+SIZE (gcc-g++-4.2-20060624.tar.bz2) = 4711463
+MD5 (gcc-objc-4.2-20060624.tar.bz2) = 7a46e4aab12ab7f23cb3c53fd924f0f0
+SHA256 (gcc-objc-4.2-20060624.tar.bz2) = d56ed7328dda70b0c1f7c96e9a376fbbb532e5588c682d573cb0b945e2cd01f0
+SIZE (gcc-objc-4.2-20060624.tar.bz2) = 191812
+MD5 (gcc-testsuite-4.2-20060624.tar.bz2) = 0365194239244ead11094a3980cff3ec
+SHA256 (gcc-testsuite-4.2-20060624.tar.bz2) = 084a83618c9833c95998fc1300a1c8e987c24c8e5efe518891a4ee3eb31f7dfd
+SIZE (gcc-testsuite-4.2-20060624.tar.bz2) = 3703061
+MD5 (gcc-fortran-4.2-20060624.tar.bz2) = 110c405b0104dc286c7a230a5395eab1
+SHA256 (gcc-fortran-4.2-20060624.tar.bz2) = 8cfb3bcc9a2daf3d70b647a9e186374ad2d5ac9da9a843304710f9c212f3f0aa
+SIZE (gcc-fortran-4.2-20060624.tar.bz2) = 820064
+MD5 (gcc-java-4.2-20060624.tar.bz2) = df1612402c5502d1fdb41fa6b3fa8e0c
+SHA256 (gcc-java-4.2-20060624.tar.bz2) = e7090c0b7ad3fe6b4460c719bdfb95728d8f0284dd22f0c43d8257412cf3525e
+SIZE (gcc-java-4.2-20060624.tar.bz2) = 10047067
diff --git a/lang/gcc44/files/java-patch-hier b/lang/gcc44/files/java-patch-hier
index af4e9b0ca2ce..43a39deb09a5 100644
--- a/lang/gcc44/files/java-patch-hier
+++ b/lang/gcc44/files/java-patch-hier
@@ -1,16 +1,13 @@
 Index: libjava/Makefile.in
 ===================================================================
-RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
-retrieving revision 1.522
-diff -u -3 -p -r1.522 Makefile.in
---- libjava/Makefile.in	19 May 2005 21:46:39 -0000	1.522
-+++ libjava/Makefile.in	29 May 2005 16:00:44 -0000
-@@ -696,7 +696,7 @@ toolexeclib_LTLIBRARIES = libgcj.la libg
-     $(cond_gtk_ltlibrary) $(cond_gtk_gcjawt_ltlibrary) $(cond_xlib_ltlibrary)
- 
+--- libjava/Makefile.in	(revision 114994)
++++ libjava/Makefile.in	(working copy)
+@@ -667,7 +667,7 @@
+ toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2)
  toolexecmainlib_DATA = libgcj.spec
+ dbexec_LTLIBRARIES = libjvm.la
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libgcj.pc
  jardir = $(datadir)/java
  jar_DATA = libgcj-$(gcc_version).jar
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 2ccfbf995ae7..58e10ba92b31 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -1,183 +1,181 @@
 # ex:ts=8
 # Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060617
+PORTREVISION=	20060624
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
 .endif
 
 SUFFIX=		42
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 .if defined(WITH_JAVA_AWT)
 USE_GNOME=	gtk20 libartlgpl2
 .endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
 CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint
 
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 MAN1+=		gfortran${SUFFIX}.1
 INFO+=		gcc${SUFFIX}/gfortran
 PLIST_SUB+=	FORTRAN=""
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
 .if ! defined(WITHOUT_JAVA)
 CONFLICTS=	gcc-4.1.*
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 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
 MAN1+=		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+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
 	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially"
 	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
 	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
 	-@${MKDIR} ${PREFIX}/libdata/ldconfig
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	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
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
 	  ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
 	fi
 .endfor
-	${MV} -f ${PREFIX}/include/mf-runtime.h \
-	         ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
 	${RM} -f ${TARGLIB}/*.la
 	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
 	         ${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
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
 	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
 	@-ncftpls -l ${SITE} | ${GREP} "LATEST.*${PORTVERSION:C/.[0-9]+$//}"
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 3a381f9f9fdf..df3128529f5c 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20060617.tar.bz2) = a90c32d1a765721f66ce26f676b29c94
-SHA256 (gcc-core-4.2-20060617.tar.bz2) = bf03570aaca92fda00f06bb19513a2562733a0258c61177c63ae9455d8f47cec
-SIZE (gcc-core-4.2-20060617.tar.bz2) = 15645543
-MD5 (gcc-g++-4.2-20060617.tar.bz2) = ad2d8b1a1161e26ceec6e0b9d4be430c
-SHA256 (gcc-g++-4.2-20060617.tar.bz2) = a6bfdd33a1bf15df55f80a2c8e1b8b6eb29ea29fe4658b6bca29c54bf3f65bde
-SIZE (gcc-g++-4.2-20060617.tar.bz2) = 4708570
-MD5 (gcc-objc-4.2-20060617.tar.bz2) = e0266374d32f248d160d0797d607d95f
-SHA256 (gcc-objc-4.2-20060617.tar.bz2) = 2cfa5e9a0970bcd12ec10af21e989cfdbea761de5eb904dca621533a61fb2c88
-SIZE (gcc-objc-4.2-20060617.tar.bz2) = 191837
-MD5 (gcc-testsuite-4.2-20060617.tar.bz2) = 366400c327ff4d0725446290aa1fb01a
-SHA256 (gcc-testsuite-4.2-20060617.tar.bz2) = ea7d1140e92a7961801c0d43928361711e34c9e465875d0dcd06305ce8503e12
-SIZE (gcc-testsuite-4.2-20060617.tar.bz2) = 3696071
-MD5 (gcc-fortran-4.2-20060617.tar.bz2) = ab1cc25b7dd3bbc5985583528f38db0a
-SHA256 (gcc-fortran-4.2-20060617.tar.bz2) = 20c32854cea6a06c83004089b8f96f8dcc5f5fb70dff83656a0b1f19e06bda12
-SIZE (gcc-fortran-4.2-20060617.tar.bz2) = 816259
-MD5 (gcc-java-4.2-20060617.tar.bz2) = 54dd1372463d55f39e5b32778b077fce
-SHA256 (gcc-java-4.2-20060617.tar.bz2) = ce505296b9a5e856257cc0ac3f7ffffc9a0ce029d673ace6e78de28fde12ab35
-SIZE (gcc-java-4.2-20060617.tar.bz2) = 10042905
+MD5 (gcc-core-4.2-20060624.tar.bz2) = dbedf1e638bddcbeda8f4ab6b455cdff
+SHA256 (gcc-core-4.2-20060624.tar.bz2) = bd35973430f2f01957aad0b9436d6b5d414414d2f91ab5a5da36c6114ccb5a7c
+SIZE (gcc-core-4.2-20060624.tar.bz2) = 15657378
+MD5 (gcc-g++-4.2-20060624.tar.bz2) = 00690199b8d8424707638d1e7856dee1
+SHA256 (gcc-g++-4.2-20060624.tar.bz2) = 0d56883cca9326791bc33b923c1b2ff781a0473f767fd880df23920837cf7a45
+SIZE (gcc-g++-4.2-20060624.tar.bz2) = 4711463
+MD5 (gcc-objc-4.2-20060624.tar.bz2) = 7a46e4aab12ab7f23cb3c53fd924f0f0
+SHA256 (gcc-objc-4.2-20060624.tar.bz2) = d56ed7328dda70b0c1f7c96e9a376fbbb532e5588c682d573cb0b945e2cd01f0
+SIZE (gcc-objc-4.2-20060624.tar.bz2) = 191812
+MD5 (gcc-testsuite-4.2-20060624.tar.bz2) = 0365194239244ead11094a3980cff3ec
+SHA256 (gcc-testsuite-4.2-20060624.tar.bz2) = 084a83618c9833c95998fc1300a1c8e987c24c8e5efe518891a4ee3eb31f7dfd
+SIZE (gcc-testsuite-4.2-20060624.tar.bz2) = 3703061
+MD5 (gcc-fortran-4.2-20060624.tar.bz2) = 110c405b0104dc286c7a230a5395eab1
+SHA256 (gcc-fortran-4.2-20060624.tar.bz2) = 8cfb3bcc9a2daf3d70b647a9e186374ad2d5ac9da9a843304710f9c212f3f0aa
+SIZE (gcc-fortran-4.2-20060624.tar.bz2) = 820064
+MD5 (gcc-java-4.2-20060624.tar.bz2) = df1612402c5502d1fdb41fa6b3fa8e0c
+SHA256 (gcc-java-4.2-20060624.tar.bz2) = e7090c0b7ad3fe6b4460c719bdfb95728d8f0284dd22f0c43d8257412cf3525e
+SIZE (gcc-java-4.2-20060624.tar.bz2) = 10047067
diff --git a/lang/gcc45/files/java-patch-hier b/lang/gcc45/files/java-patch-hier
index af4e9b0ca2ce..43a39deb09a5 100644
--- a/lang/gcc45/files/java-patch-hier
+++ b/lang/gcc45/files/java-patch-hier
@@ -1,16 +1,13 @@
 Index: libjava/Makefile.in
 ===================================================================
-RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
-retrieving revision 1.522
-diff -u -3 -p -r1.522 Makefile.in
---- libjava/Makefile.in	19 May 2005 21:46:39 -0000	1.522
-+++ libjava/Makefile.in	29 May 2005 16:00:44 -0000
-@@ -696,7 +696,7 @@ toolexeclib_LTLIBRARIES = libgcj.la libg
-     $(cond_gtk_ltlibrary) $(cond_gtk_gcjawt_ltlibrary) $(cond_xlib_ltlibrary)
- 
+--- libjava/Makefile.in	(revision 114994)
++++ libjava/Makefile.in	(working copy)
+@@ -667,7 +667,7 @@
+ toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2)
  toolexecmainlib_DATA = libgcj.spec
+ dbexec_LTLIBRARIES = libjvm.la
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libgcj.pc
  jardir = $(datadir)/java
  jar_DATA = libgcj-$(gcc_version).jar
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 2ccfbf995ae7..58e10ba92b31 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -1,183 +1,181 @@
 # ex:ts=8
 # Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060617
+PORTREVISION=	20060624
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
 .endif
 
 SUFFIX=		42
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 .if defined(WITH_JAVA_AWT)
 USE_GNOME=	gtk20 libartlgpl2
 .endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
 CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint
 
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 MAN1+=		gfortran${SUFFIX}.1
 INFO+=		gcc${SUFFIX}/gfortran
 PLIST_SUB+=	FORTRAN=""
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
 .if ! defined(WITHOUT_JAVA)
 CONFLICTS=	gcc-4.1.*
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 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
 MAN1+=		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+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
 	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially"
 	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
 	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
 	-@${MKDIR} ${PREFIX}/libdata/ldconfig
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	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
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
 	  ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
 	fi
 .endfor
-	${MV} -f ${PREFIX}/include/mf-runtime.h \
-	         ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
 	${RM} -f ${TARGLIB}/*.la
 	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
 	         ${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
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
 	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
 	@-ncftpls -l ${SITE} | ${GREP} "LATEST.*${PORTVERSION:C/.[0-9]+$//}"
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 3a381f9f9fdf..df3128529f5c 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20060617.tar.bz2) = a90c32d1a765721f66ce26f676b29c94
-SHA256 (gcc-core-4.2-20060617.tar.bz2) = bf03570aaca92fda00f06bb19513a2562733a0258c61177c63ae9455d8f47cec
-SIZE (gcc-core-4.2-20060617.tar.bz2) = 15645543
-MD5 (gcc-g++-4.2-20060617.tar.bz2) = ad2d8b1a1161e26ceec6e0b9d4be430c
-SHA256 (gcc-g++-4.2-20060617.tar.bz2) = a6bfdd33a1bf15df55f80a2c8e1b8b6eb29ea29fe4658b6bca29c54bf3f65bde
-SIZE (gcc-g++-4.2-20060617.tar.bz2) = 4708570
-MD5 (gcc-objc-4.2-20060617.tar.bz2) = e0266374d32f248d160d0797d607d95f
-SHA256 (gcc-objc-4.2-20060617.tar.bz2) = 2cfa5e9a0970bcd12ec10af21e989cfdbea761de5eb904dca621533a61fb2c88
-SIZE (gcc-objc-4.2-20060617.tar.bz2) = 191837
-MD5 (gcc-testsuite-4.2-20060617.tar.bz2) = 366400c327ff4d0725446290aa1fb01a
-SHA256 (gcc-testsuite-4.2-20060617.tar.bz2) = ea7d1140e92a7961801c0d43928361711e34c9e465875d0dcd06305ce8503e12
-SIZE (gcc-testsuite-4.2-20060617.tar.bz2) = 3696071
-MD5 (gcc-fortran-4.2-20060617.tar.bz2) = ab1cc25b7dd3bbc5985583528f38db0a
-SHA256 (gcc-fortran-4.2-20060617.tar.bz2) = 20c32854cea6a06c83004089b8f96f8dcc5f5fb70dff83656a0b1f19e06bda12
-SIZE (gcc-fortran-4.2-20060617.tar.bz2) = 816259
-MD5 (gcc-java-4.2-20060617.tar.bz2) = 54dd1372463d55f39e5b32778b077fce
-SHA256 (gcc-java-4.2-20060617.tar.bz2) = ce505296b9a5e856257cc0ac3f7ffffc9a0ce029d673ace6e78de28fde12ab35
-SIZE (gcc-java-4.2-20060617.tar.bz2) = 10042905
+MD5 (gcc-core-4.2-20060624.tar.bz2) = dbedf1e638bddcbeda8f4ab6b455cdff
+SHA256 (gcc-core-4.2-20060624.tar.bz2) = bd35973430f2f01957aad0b9436d6b5d414414d2f91ab5a5da36c6114ccb5a7c
+SIZE (gcc-core-4.2-20060624.tar.bz2) = 15657378
+MD5 (gcc-g++-4.2-20060624.tar.bz2) = 00690199b8d8424707638d1e7856dee1
+SHA256 (gcc-g++-4.2-20060624.tar.bz2) = 0d56883cca9326791bc33b923c1b2ff781a0473f767fd880df23920837cf7a45
+SIZE (gcc-g++-4.2-20060624.tar.bz2) = 4711463
+MD5 (gcc-objc-4.2-20060624.tar.bz2) = 7a46e4aab12ab7f23cb3c53fd924f0f0
+SHA256 (gcc-objc-4.2-20060624.tar.bz2) = d56ed7328dda70b0c1f7c96e9a376fbbb532e5588c682d573cb0b945e2cd01f0
+SIZE (gcc-objc-4.2-20060624.tar.bz2) = 191812
+MD5 (gcc-testsuite-4.2-20060624.tar.bz2) = 0365194239244ead11094a3980cff3ec
+SHA256 (gcc-testsuite-4.2-20060624.tar.bz2) = 084a83618c9833c95998fc1300a1c8e987c24c8e5efe518891a4ee3eb31f7dfd
+SIZE (gcc-testsuite-4.2-20060624.tar.bz2) = 3703061
+MD5 (gcc-fortran-4.2-20060624.tar.bz2) = 110c405b0104dc286c7a230a5395eab1
+SHA256 (gcc-fortran-4.2-20060624.tar.bz2) = 8cfb3bcc9a2daf3d70b647a9e186374ad2d5ac9da9a843304710f9c212f3f0aa
+SIZE (gcc-fortran-4.2-20060624.tar.bz2) = 820064
+MD5 (gcc-java-4.2-20060624.tar.bz2) = df1612402c5502d1fdb41fa6b3fa8e0c
+SHA256 (gcc-java-4.2-20060624.tar.bz2) = e7090c0b7ad3fe6b4460c719bdfb95728d8f0284dd22f0c43d8257412cf3525e
+SIZE (gcc-java-4.2-20060624.tar.bz2) = 10047067
diff --git a/lang/gcc46/files/java-patch-hier b/lang/gcc46/files/java-patch-hier
index af4e9b0ca2ce..43a39deb09a5 100644
--- a/lang/gcc46/files/java-patch-hier
+++ b/lang/gcc46/files/java-patch-hier
@@ -1,16 +1,13 @@
 Index: libjava/Makefile.in
 ===================================================================
-RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
-retrieving revision 1.522
-diff -u -3 -p -r1.522 Makefile.in
---- libjava/Makefile.in	19 May 2005 21:46:39 -0000	1.522
-+++ libjava/Makefile.in	29 May 2005 16:00:44 -0000
-@@ -696,7 +696,7 @@ toolexeclib_LTLIBRARIES = libgcj.la libg
-     $(cond_gtk_ltlibrary) $(cond_gtk_gcjawt_ltlibrary) $(cond_xlib_ltlibrary)
- 
+--- libjava/Makefile.in	(revision 114994)
++++ libjava/Makefile.in	(working copy)
+@@ -667,7 +667,7 @@
+ toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2)
  toolexecmainlib_DATA = libgcj.spec
+ dbexec_LTLIBRARIES = libjvm.la
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libgcj.pc
  jardir = $(datadir)/java
  jar_DATA = libgcj-$(gcc_version).jar
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 2ccfbf995ae7..58e10ba92b31 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -1,183 +1,181 @@
 # ex:ts=8
 # Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060617
+PORTREVISION=	20060624
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
 .endif
 
 SUFFIX=		42
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 .if defined(WITH_JAVA_AWT)
 USE_GNOME=	gtk20 libartlgpl2
 .endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
 CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint
 
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 MAN1+=		gfortran${SUFFIX}.1
 INFO+=		gcc${SUFFIX}/gfortran
 PLIST_SUB+=	FORTRAN=""
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
 .if ! defined(WITHOUT_JAVA)
 CONFLICTS=	gcc-4.1.*
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 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
 MAN1+=		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+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
 	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially"
 	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
 	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
 	-@${MKDIR} ${PREFIX}/libdata/ldconfig
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	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
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
 	  ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
 	fi
 .endfor
-	${MV} -f ${PREFIX}/include/mf-runtime.h \
-	         ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
 	${RM} -f ${TARGLIB}/*.la
 	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
 	         ${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
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
 	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
 	@-ncftpls -l ${SITE} | ${GREP} "LATEST.*${PORTVERSION:C/.[0-9]+$//}"
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 3a381f9f9fdf..df3128529f5c 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20060617.tar.bz2) = a90c32d1a765721f66ce26f676b29c94
-SHA256 (gcc-core-4.2-20060617.tar.bz2) = bf03570aaca92fda00f06bb19513a2562733a0258c61177c63ae9455d8f47cec
-SIZE (gcc-core-4.2-20060617.tar.bz2) = 15645543
-MD5 (gcc-g++-4.2-20060617.tar.bz2) = ad2d8b1a1161e26ceec6e0b9d4be430c
-SHA256 (gcc-g++-4.2-20060617.tar.bz2) = a6bfdd33a1bf15df55f80a2c8e1b8b6eb29ea29fe4658b6bca29c54bf3f65bde
-SIZE (gcc-g++-4.2-20060617.tar.bz2) = 4708570
-MD5 (gcc-objc-4.2-20060617.tar.bz2) = e0266374d32f248d160d0797d607d95f
-SHA256 (gcc-objc-4.2-20060617.tar.bz2) = 2cfa5e9a0970bcd12ec10af21e989cfdbea761de5eb904dca621533a61fb2c88
-SIZE (gcc-objc-4.2-20060617.tar.bz2) = 191837
-MD5 (gcc-testsuite-4.2-20060617.tar.bz2) = 366400c327ff4d0725446290aa1fb01a
-SHA256 (gcc-testsuite-4.2-20060617.tar.bz2) = ea7d1140e92a7961801c0d43928361711e34c9e465875d0dcd06305ce8503e12
-SIZE (gcc-testsuite-4.2-20060617.tar.bz2) = 3696071
-MD5 (gcc-fortran-4.2-20060617.tar.bz2) = ab1cc25b7dd3bbc5985583528f38db0a
-SHA256 (gcc-fortran-4.2-20060617.tar.bz2) = 20c32854cea6a06c83004089b8f96f8dcc5f5fb70dff83656a0b1f19e06bda12
-SIZE (gcc-fortran-4.2-20060617.tar.bz2) = 816259
-MD5 (gcc-java-4.2-20060617.tar.bz2) = 54dd1372463d55f39e5b32778b077fce
-SHA256 (gcc-java-4.2-20060617.tar.bz2) = ce505296b9a5e856257cc0ac3f7ffffc9a0ce029d673ace6e78de28fde12ab35
-SIZE (gcc-java-4.2-20060617.tar.bz2) = 10042905
+MD5 (gcc-core-4.2-20060624.tar.bz2) = dbedf1e638bddcbeda8f4ab6b455cdff
+SHA256 (gcc-core-4.2-20060624.tar.bz2) = bd35973430f2f01957aad0b9436d6b5d414414d2f91ab5a5da36c6114ccb5a7c
+SIZE (gcc-core-4.2-20060624.tar.bz2) = 15657378
+MD5 (gcc-g++-4.2-20060624.tar.bz2) = 00690199b8d8424707638d1e7856dee1
+SHA256 (gcc-g++-4.2-20060624.tar.bz2) = 0d56883cca9326791bc33b923c1b2ff781a0473f767fd880df23920837cf7a45
+SIZE (gcc-g++-4.2-20060624.tar.bz2) = 4711463
+MD5 (gcc-objc-4.2-20060624.tar.bz2) = 7a46e4aab12ab7f23cb3c53fd924f0f0
+SHA256 (gcc-objc-4.2-20060624.tar.bz2) = d56ed7328dda70b0c1f7c96e9a376fbbb532e5588c682d573cb0b945e2cd01f0
+SIZE (gcc-objc-4.2-20060624.tar.bz2) = 191812
+MD5 (gcc-testsuite-4.2-20060624.tar.bz2) = 0365194239244ead11094a3980cff3ec
+SHA256 (gcc-testsuite-4.2-20060624.tar.bz2) = 084a83618c9833c95998fc1300a1c8e987c24c8e5efe518891a4ee3eb31f7dfd
+SIZE (gcc-testsuite-4.2-20060624.tar.bz2) = 3703061
+MD5 (gcc-fortran-4.2-20060624.tar.bz2) = 110c405b0104dc286c7a230a5395eab1
+SHA256 (gcc-fortran-4.2-20060624.tar.bz2) = 8cfb3bcc9a2daf3d70b647a9e186374ad2d5ac9da9a843304710f9c212f3f0aa
+SIZE (gcc-fortran-4.2-20060624.tar.bz2) = 820064
+MD5 (gcc-java-4.2-20060624.tar.bz2) = df1612402c5502d1fdb41fa6b3fa8e0c
+SHA256 (gcc-java-4.2-20060624.tar.bz2) = e7090c0b7ad3fe6b4460c719bdfb95728d8f0284dd22f0c43d8257412cf3525e
+SIZE (gcc-java-4.2-20060624.tar.bz2) = 10047067
diff --git a/lang/gcc47/files/java-patch-hier b/lang/gcc47/files/java-patch-hier
index af4e9b0ca2ce..43a39deb09a5 100644
--- a/lang/gcc47/files/java-patch-hier
+++ b/lang/gcc47/files/java-patch-hier
@@ -1,16 +1,13 @@
 Index: libjava/Makefile.in
 ===================================================================
-RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
-retrieving revision 1.522
-diff -u -3 -p -r1.522 Makefile.in
---- libjava/Makefile.in	19 May 2005 21:46:39 -0000	1.522
-+++ libjava/Makefile.in	29 May 2005 16:00:44 -0000
-@@ -696,7 +696,7 @@ toolexeclib_LTLIBRARIES = libgcj.la libg
-     $(cond_gtk_ltlibrary) $(cond_gtk_gcjawt_ltlibrary) $(cond_xlib_ltlibrary)
- 
+--- libjava/Makefile.in	(revision 114994)
++++ libjava/Makefile.in	(working copy)
+@@ -667,7 +667,7 @@
+ toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2)
  toolexecmainlib_DATA = libgcj.spec
+ dbexec_LTLIBRARIES = libjvm.la
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libgcj.pc
  jardir = $(datadir)/java
  jar_DATA = libgcj-$(gcc_version).jar
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 2ccfbf995ae7..58e10ba92b31 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -1,183 +1,181 @@
 # ex:ts=8
 # Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060617
+PORTREVISION=	20060624
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
 .endif
 
 SUFFIX=		42
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 .if defined(WITH_JAVA_AWT)
 USE_GNOME=	gtk20 libartlgpl2
 .endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
 CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint
 
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 MAN1+=		gfortran${SUFFIX}.1
 INFO+=		gcc${SUFFIX}/gfortran
 PLIST_SUB+=	FORTRAN=""
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
 .if ! defined(WITHOUT_JAVA)
 CONFLICTS=	gcc-4.1.*
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 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
 MAN1+=		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+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
 	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially"
 	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
 	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
 	-@${MKDIR} ${PREFIX}/libdata/ldconfig
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	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
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
 	  ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
 	fi
 .endfor
-	${MV} -f ${PREFIX}/include/mf-runtime.h \
-	         ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
 	${RM} -f ${TARGLIB}/*.la
 	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
 	         ${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
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
 	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
 	@-ncftpls -l ${SITE} | ${GREP} "LATEST.*${PORTVERSION:C/.[0-9]+$//}"
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 3a381f9f9fdf..df3128529f5c 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20060617.tar.bz2) = a90c32d1a765721f66ce26f676b29c94
-SHA256 (gcc-core-4.2-20060617.tar.bz2) = bf03570aaca92fda00f06bb19513a2562733a0258c61177c63ae9455d8f47cec
-SIZE (gcc-core-4.2-20060617.tar.bz2) = 15645543
-MD5 (gcc-g++-4.2-20060617.tar.bz2) = ad2d8b1a1161e26ceec6e0b9d4be430c
-SHA256 (gcc-g++-4.2-20060617.tar.bz2) = a6bfdd33a1bf15df55f80a2c8e1b8b6eb29ea29fe4658b6bca29c54bf3f65bde
-SIZE (gcc-g++-4.2-20060617.tar.bz2) = 4708570
-MD5 (gcc-objc-4.2-20060617.tar.bz2) = e0266374d32f248d160d0797d607d95f
-SHA256 (gcc-objc-4.2-20060617.tar.bz2) = 2cfa5e9a0970bcd12ec10af21e989cfdbea761de5eb904dca621533a61fb2c88
-SIZE (gcc-objc-4.2-20060617.tar.bz2) = 191837
-MD5 (gcc-testsuite-4.2-20060617.tar.bz2) = 366400c327ff4d0725446290aa1fb01a
-SHA256 (gcc-testsuite-4.2-20060617.tar.bz2) = ea7d1140e92a7961801c0d43928361711e34c9e465875d0dcd06305ce8503e12
-SIZE (gcc-testsuite-4.2-20060617.tar.bz2) = 3696071
-MD5 (gcc-fortran-4.2-20060617.tar.bz2) = ab1cc25b7dd3bbc5985583528f38db0a
-SHA256 (gcc-fortran-4.2-20060617.tar.bz2) = 20c32854cea6a06c83004089b8f96f8dcc5f5fb70dff83656a0b1f19e06bda12
-SIZE (gcc-fortran-4.2-20060617.tar.bz2) = 816259
-MD5 (gcc-java-4.2-20060617.tar.bz2) = 54dd1372463d55f39e5b32778b077fce
-SHA256 (gcc-java-4.2-20060617.tar.bz2) = ce505296b9a5e856257cc0ac3f7ffffc9a0ce029d673ace6e78de28fde12ab35
-SIZE (gcc-java-4.2-20060617.tar.bz2) = 10042905
+MD5 (gcc-core-4.2-20060624.tar.bz2) = dbedf1e638bddcbeda8f4ab6b455cdff
+SHA256 (gcc-core-4.2-20060624.tar.bz2) = bd35973430f2f01957aad0b9436d6b5d414414d2f91ab5a5da36c6114ccb5a7c
+SIZE (gcc-core-4.2-20060624.tar.bz2) = 15657378
+MD5 (gcc-g++-4.2-20060624.tar.bz2) = 00690199b8d8424707638d1e7856dee1
+SHA256 (gcc-g++-4.2-20060624.tar.bz2) = 0d56883cca9326791bc33b923c1b2ff781a0473f767fd880df23920837cf7a45
+SIZE (gcc-g++-4.2-20060624.tar.bz2) = 4711463
+MD5 (gcc-objc-4.2-20060624.tar.bz2) = 7a46e4aab12ab7f23cb3c53fd924f0f0
+SHA256 (gcc-objc-4.2-20060624.tar.bz2) = d56ed7328dda70b0c1f7c96e9a376fbbb532e5588c682d573cb0b945e2cd01f0
+SIZE (gcc-objc-4.2-20060624.tar.bz2) = 191812
+MD5 (gcc-testsuite-4.2-20060624.tar.bz2) = 0365194239244ead11094a3980cff3ec
+SHA256 (gcc-testsuite-4.2-20060624.tar.bz2) = 084a83618c9833c95998fc1300a1c8e987c24c8e5efe518891a4ee3eb31f7dfd
+SIZE (gcc-testsuite-4.2-20060624.tar.bz2) = 3703061
+MD5 (gcc-fortran-4.2-20060624.tar.bz2) = 110c405b0104dc286c7a230a5395eab1
+SHA256 (gcc-fortran-4.2-20060624.tar.bz2) = 8cfb3bcc9a2daf3d70b647a9e186374ad2d5ac9da9a843304710f9c212f3f0aa
+SIZE (gcc-fortran-4.2-20060624.tar.bz2) = 820064
+MD5 (gcc-java-4.2-20060624.tar.bz2) = df1612402c5502d1fdb41fa6b3fa8e0c
+SHA256 (gcc-java-4.2-20060624.tar.bz2) = e7090c0b7ad3fe6b4460c719bdfb95728d8f0284dd22f0c43d8257412cf3525e
+SIZE (gcc-java-4.2-20060624.tar.bz2) = 10047067
diff --git a/lang/gcc48/files/java-patch-hier b/lang/gcc48/files/java-patch-hier
index af4e9b0ca2ce..43a39deb09a5 100644
--- a/lang/gcc48/files/java-patch-hier
+++ b/lang/gcc48/files/java-patch-hier
@@ -1,16 +1,13 @@
 Index: libjava/Makefile.in
 ===================================================================
-RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
-retrieving revision 1.522
-diff -u -3 -p -r1.522 Makefile.in
---- libjava/Makefile.in	19 May 2005 21:46:39 -0000	1.522
-+++ libjava/Makefile.in	29 May 2005 16:00:44 -0000
-@@ -696,7 +696,7 @@ toolexeclib_LTLIBRARIES = libgcj.la libg
-     $(cond_gtk_ltlibrary) $(cond_gtk_gcjawt_ltlibrary) $(cond_xlib_ltlibrary)
- 
+--- libjava/Makefile.in	(revision 114994)
++++ libjava/Makefile.in	(working copy)
+@@ -667,7 +667,7 @@
+ toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2)
  toolexecmainlib_DATA = libgcj.spec
+ dbexec_LTLIBRARIES = libjvm.la
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libgcj.pc
  jardir = $(datadir)/java
  jar_DATA = libgcj-$(gcc_version).jar