Update to the 20060624 snapshot of GCC 4.2.0.

mf-runtime.h no longer pollutes public filename space, so we can
remove our workaround.  Refresh files/java-patch-hier.

3 files changed, 24 insertions, 29 deletions

diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 2ccfbf995ae7..58e10ba92b31 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060617
+PORTREVISION=	20060624
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -155,8 +155,6 @@ post-install:
 	           ${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
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,14 +1,11 @@
 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