Update to the 20070202 snapshot of GCC 4.3.0.

Adjust pkg-plist to remove some secondary programs which we no longer
provide after the import of the Eclipse Java frontend.

Properly set INFO for those cases where we actually do not build libgomp,
and thus not libgomp.info either.

Move ia64 to NOT_FOR_ARCHS from BROKEN, like we did with lang/gcc43.
Remove the cklatest target and files/patch-gengtype-yacc.y.

28 files changed, 161 insertions, 301 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index dc48f22b8c54..40f72bd9646a 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070105
+PORTREVISION=	20070202
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -91,8 +91,10 @@ INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
-		gcc${SUFFIX}/gfortran \
-		gcc${SUFFIX}/libgomp 
+		gcc${SUFFIX}/gfortran
+.if ${OSVERSION} >= 502102
+INFO+=		gcc${SUFFIX}/libgomp 
+.endif
 
 .if ! defined(WITHOUT_JAVA)
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
@@ -162,9 +164,4 @@ post-install:
 	${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 b954c15bc2fd..d56ad8e7f690 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070105.tar.bz2) = 13ec1e7c8d89a0a8b5577a7b6d3425dc
-SHA256 (gcc-core-4.3-20070105.tar.bz2) = 7eb0808594626b9819cc7d09911f95ccbb791e8da9e6155d15f3b7def9b3b288
-SIZE (gcc-core-4.3-20070105.tar.bz2) = 16253279
-MD5 (gcc-fortran-4.3-20070105.tar.bz2) = 06964fb5e2c17bb6a2617a1d3051d121
-SHA256 (gcc-fortran-4.3-20070105.tar.bz2) = 9c1a7501788d6498c07d877c40f8554f93c322f8a96f6b14b6d0ca8d56311026
-SIZE (gcc-fortran-4.3-20070105.tar.bz2) = 904596
-MD5 (gcc-g++-4.3-20070105.tar.bz2) = 30b7fcb0501b9c81d530d61f3544ae42
-SHA256 (gcc-g++-4.3-20070105.tar.bz2) = ccc18d857f1afa2832f2eef6820c18cbf620babd6537a45af9f1d2f6243ed4c9
-SIZE (gcc-g++-4.3-20070105.tar.bz2) = 4813226
-MD5 (gcc-objc-4.3-20070105.tar.bz2) = 87a0539fb6e835e555f96a1731cd123d
-SHA256 (gcc-objc-4.3-20070105.tar.bz2) = d8e0f8ea455f51e86070a5b91f64aacbd820db8a6d290e70c4e036173f7a08e8
-SIZE (gcc-objc-4.3-20070105.tar.bz2) = 192245
-MD5 (gcc-testsuite-4.3-20070105.tar.bz2) = 4ab0f64b8f3b37cc0d0363304db05272
-SHA256 (gcc-testsuite-4.3-20070105.tar.bz2) = 3eef30b1ab946c676816ef8302cde67c3f2ddf0956f341986cd531e6996826b6
-SIZE (gcc-testsuite-4.3-20070105.tar.bz2) = 3875214
-MD5 (gcc-java-4.3-20070105.tar.bz2) = b1f01666527ca190441dacc9cdc75b42
-SHA256 (gcc-java-4.3-20070105.tar.bz2) = 6874a1e2eaf85cb0cc63281e864d49e1994dcc97a439d13c2ab3ba68af56f31f
-SIZE (gcc-java-4.3-20070105.tar.bz2) = 10409086
+MD5 (gcc-core-4.3-20070202.tar.bz2) = 255f9a221c40313cd4fcec861ac94610
+SHA256 (gcc-core-4.3-20070202.tar.bz2) = e71a9c094caaa472bd7a3cfa974f4a121e25c89fe09ca6e42cb0e8a7a2036125
+SIZE (gcc-core-4.3-20070202.tar.bz2) = 16668005
+MD5 (gcc-fortran-4.3-20070202.tar.bz2) = 4b47ecbf1df0a07ed75cbcd5b2d0fb7c
+SHA256 (gcc-fortran-4.3-20070202.tar.bz2) = 60ad4f8539789501ee80d262c98e81ce182bb507cbc738aba16ba1a7b8db0fb4
+SIZE (gcc-fortran-4.3-20070202.tar.bz2) = 926394
+MD5 (gcc-g++-4.3-20070202.tar.bz2) = 449e85ed896f0c708f2740b8bb9871ff
+SHA256 (gcc-g++-4.3-20070202.tar.bz2) = 6d03f4cb2041adcf181a5f8a52118f6017e2408a24b5a4a594d9d2a3adb10820
+SIZE (gcc-g++-4.3-20070202.tar.bz2) = 4836327
+MD5 (gcc-objc-4.3-20070202.tar.bz2) = 701f0e9f95308792873f4a2be46a97c5
+SHA256 (gcc-objc-4.3-20070202.tar.bz2) = e841c95c848dc648b2a759efba4c0a767a5df4e4f3ba2551f4dde3fc36ba7a01
+SIZE (gcc-objc-4.3-20070202.tar.bz2) = 192120
+MD5 (gcc-testsuite-4.3-20070202.tar.bz2) = 4caef80e0913c7e02af31c348318e558
+SHA256 (gcc-testsuite-4.3-20070202.tar.bz2) = 2fd845f4c7aac79ff6fe889f082212153dc4c4f957d03fc2ad486a51e6f18f29
+SIZE (gcc-testsuite-4.3-20070202.tar.bz2) = 3908209
+MD5 (gcc-java-4.3-20070202.tar.bz2) = d03e658f3e67cda8f4aac620e99783f5
+SHA256 (gcc-java-4.3-20070202.tar.bz2) = 5f317c09a5ebe0db1a48ad873e66ac1ba3258d84fdbd8e13e2ba8c1a884ab7a2
+SIZE (gcc-java-4.3-20070202.tar.bz2) = 17509963
diff --git a/lang/gcc/files/patch-gengtype-yacc.y b/lang/gcc/files/patch-gengtype-yacc.y
deleted file mode 100644
index 4afaae159533..000000000000
--- a/lang/gcc/files/patch-gengtype-yacc.y
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc/gengtype-yacc.y.orig	Fri Sep 20 00:33:24 2002
-+++ gcc/gengtype-yacc.y	Tue Apr 22 09:11:27 2003
-@@ -24,6 +24,9 @@
- #include "system.h"
- #include "gengtype.h"
- #define YYERROR_VERBOSE
-+
-+#define malloc xmalloc
-+#define realloc xrealloc
- %}
- 
- %union {
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index 6f8e52750fb7..191098884b73 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -16,19 +16,14 @@ info/gcc%%SUFFIX%%/dir
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
-%%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjarsigner%%SUFFIX%%
-%%JAVA%%bin/gjnih%%SUFFIX%%
 %%JAVA%%bin/gkeytool%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
-%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
-%%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
-%%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.3.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index dc48f22b8c54..40f72bd9646a 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070105
+PORTREVISION=	20070202
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -91,8 +91,10 @@ INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
-		gcc${SUFFIX}/gfortran \
-		gcc${SUFFIX}/libgomp 
+		gcc${SUFFIX}/gfortran
+.if ${OSVERSION} >= 502102
+INFO+=		gcc${SUFFIX}/libgomp 
+.endif
 
 .if ! defined(WITHOUT_JAVA)
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
@@ -162,9 +164,4 @@ post-install:
 	${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 b954c15bc2fd..d56ad8e7f690 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070105.tar.bz2) = 13ec1e7c8d89a0a8b5577a7b6d3425dc
-SHA256 (gcc-core-4.3-20070105.tar.bz2) = 7eb0808594626b9819cc7d09911f95ccbb791e8da9e6155d15f3b7def9b3b288
-SIZE (gcc-core-4.3-20070105.tar.bz2) = 16253279
-MD5 (gcc-fortran-4.3-20070105.tar.bz2) = 06964fb5e2c17bb6a2617a1d3051d121
-SHA256 (gcc-fortran-4.3-20070105.tar.bz2) = 9c1a7501788d6498c07d877c40f8554f93c322f8a96f6b14b6d0ca8d56311026
-SIZE (gcc-fortran-4.3-20070105.tar.bz2) = 904596
-MD5 (gcc-g++-4.3-20070105.tar.bz2) = 30b7fcb0501b9c81d530d61f3544ae42
-SHA256 (gcc-g++-4.3-20070105.tar.bz2) = ccc18d857f1afa2832f2eef6820c18cbf620babd6537a45af9f1d2f6243ed4c9
-SIZE (gcc-g++-4.3-20070105.tar.bz2) = 4813226
-MD5 (gcc-objc-4.3-20070105.tar.bz2) = 87a0539fb6e835e555f96a1731cd123d
-SHA256 (gcc-objc-4.3-20070105.tar.bz2) = d8e0f8ea455f51e86070a5b91f64aacbd820db8a6d290e70c4e036173f7a08e8
-SIZE (gcc-objc-4.3-20070105.tar.bz2) = 192245
-MD5 (gcc-testsuite-4.3-20070105.tar.bz2) = 4ab0f64b8f3b37cc0d0363304db05272
-SHA256 (gcc-testsuite-4.3-20070105.tar.bz2) = 3eef30b1ab946c676816ef8302cde67c3f2ddf0956f341986cd531e6996826b6
-SIZE (gcc-testsuite-4.3-20070105.tar.bz2) = 3875214
-MD5 (gcc-java-4.3-20070105.tar.bz2) = b1f01666527ca190441dacc9cdc75b42
-SHA256 (gcc-java-4.3-20070105.tar.bz2) = 6874a1e2eaf85cb0cc63281e864d49e1994dcc97a439d13c2ab3ba68af56f31f
-SIZE (gcc-java-4.3-20070105.tar.bz2) = 10409086
+MD5 (gcc-core-4.3-20070202.tar.bz2) = 255f9a221c40313cd4fcec861ac94610
+SHA256 (gcc-core-4.3-20070202.tar.bz2) = e71a9c094caaa472bd7a3cfa974f4a121e25c89fe09ca6e42cb0e8a7a2036125
+SIZE (gcc-core-4.3-20070202.tar.bz2) = 16668005
+MD5 (gcc-fortran-4.3-20070202.tar.bz2) = 4b47ecbf1df0a07ed75cbcd5b2d0fb7c
+SHA256 (gcc-fortran-4.3-20070202.tar.bz2) = 60ad4f8539789501ee80d262c98e81ce182bb507cbc738aba16ba1a7b8db0fb4
+SIZE (gcc-fortran-4.3-20070202.tar.bz2) = 926394
+MD5 (gcc-g++-4.3-20070202.tar.bz2) = 449e85ed896f0c708f2740b8bb9871ff
+SHA256 (gcc-g++-4.3-20070202.tar.bz2) = 6d03f4cb2041adcf181a5f8a52118f6017e2408a24b5a4a594d9d2a3adb10820
+SIZE (gcc-g++-4.3-20070202.tar.bz2) = 4836327
+MD5 (gcc-objc-4.3-20070202.tar.bz2) = 701f0e9f95308792873f4a2be46a97c5
+SHA256 (gcc-objc-4.3-20070202.tar.bz2) = e841c95c848dc648b2a759efba4c0a767a5df4e4f3ba2551f4dde3fc36ba7a01
+SIZE (gcc-objc-4.3-20070202.tar.bz2) = 192120
+MD5 (gcc-testsuite-4.3-20070202.tar.bz2) = 4caef80e0913c7e02af31c348318e558
+SHA256 (gcc-testsuite-4.3-20070202.tar.bz2) = 2fd845f4c7aac79ff6fe889f082212153dc4c4f957d03fc2ad486a51e6f18f29
+SIZE (gcc-testsuite-4.3-20070202.tar.bz2) = 3908209
+MD5 (gcc-java-4.3-20070202.tar.bz2) = d03e658f3e67cda8f4aac620e99783f5
+SHA256 (gcc-java-4.3-20070202.tar.bz2) = 5f317c09a5ebe0db1a48ad873e66ac1ba3258d84fdbd8e13e2ba8c1a884ab7a2
+SIZE (gcc-java-4.3-20070202.tar.bz2) = 17509963
diff --git a/lang/gcc43/files/patch-gengtype-yacc.y b/lang/gcc43/files/patch-gengtype-yacc.y
deleted file mode 100644
index 4afaae159533..000000000000
--- a/lang/gcc43/files/patch-gengtype-yacc.y
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc/gengtype-yacc.y.orig	Fri Sep 20 00:33:24 2002
-+++ gcc/gengtype-yacc.y	Tue Apr 22 09:11:27 2003
-@@ -24,6 +24,9 @@
- #include "system.h"
- #include "gengtype.h"
- #define YYERROR_VERBOSE
-+
-+#define malloc xmalloc
-+#define realloc xrealloc
- %}
- 
- %union {
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index 6f8e52750fb7..191098884b73 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -16,19 +16,14 @@ info/gcc%%SUFFIX%%/dir
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
-%%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjarsigner%%SUFFIX%%
-%%JAVA%%bin/gjnih%%SUFFIX%%
 %%JAVA%%bin/gkeytool%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
-%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
-%%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
-%%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.3.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index dc48f22b8c54..40f72bd9646a 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070105
+PORTREVISION=	20070202
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -91,8 +91,10 @@ INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
-		gcc${SUFFIX}/gfortran \
-		gcc${SUFFIX}/libgomp 
+		gcc${SUFFIX}/gfortran
+.if ${OSVERSION} >= 502102
+INFO+=		gcc${SUFFIX}/libgomp 
+.endif
 
 .if ! defined(WITHOUT_JAVA)
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
@@ -162,9 +164,4 @@ post-install:
 	${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 b954c15bc2fd..d56ad8e7f690 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070105.tar.bz2) = 13ec1e7c8d89a0a8b5577a7b6d3425dc
-SHA256 (gcc-core-4.3-20070105.tar.bz2) = 7eb0808594626b9819cc7d09911f95ccbb791e8da9e6155d15f3b7def9b3b288
-SIZE (gcc-core-4.3-20070105.tar.bz2) = 16253279
-MD5 (gcc-fortran-4.3-20070105.tar.bz2) = 06964fb5e2c17bb6a2617a1d3051d121
-SHA256 (gcc-fortran-4.3-20070105.tar.bz2) = 9c1a7501788d6498c07d877c40f8554f93c322f8a96f6b14b6d0ca8d56311026
-SIZE (gcc-fortran-4.3-20070105.tar.bz2) = 904596
-MD5 (gcc-g++-4.3-20070105.tar.bz2) = 30b7fcb0501b9c81d530d61f3544ae42
-SHA256 (gcc-g++-4.3-20070105.tar.bz2) = ccc18d857f1afa2832f2eef6820c18cbf620babd6537a45af9f1d2f6243ed4c9
-SIZE (gcc-g++-4.3-20070105.tar.bz2) = 4813226
-MD5 (gcc-objc-4.3-20070105.tar.bz2) = 87a0539fb6e835e555f96a1731cd123d
-SHA256 (gcc-objc-4.3-20070105.tar.bz2) = d8e0f8ea455f51e86070a5b91f64aacbd820db8a6d290e70c4e036173f7a08e8
-SIZE (gcc-objc-4.3-20070105.tar.bz2) = 192245
-MD5 (gcc-testsuite-4.3-20070105.tar.bz2) = 4ab0f64b8f3b37cc0d0363304db05272
-SHA256 (gcc-testsuite-4.3-20070105.tar.bz2) = 3eef30b1ab946c676816ef8302cde67c3f2ddf0956f341986cd531e6996826b6
-SIZE (gcc-testsuite-4.3-20070105.tar.bz2) = 3875214
-MD5 (gcc-java-4.3-20070105.tar.bz2) = b1f01666527ca190441dacc9cdc75b42
-SHA256 (gcc-java-4.3-20070105.tar.bz2) = 6874a1e2eaf85cb0cc63281e864d49e1994dcc97a439d13c2ab3ba68af56f31f
-SIZE (gcc-java-4.3-20070105.tar.bz2) = 10409086
+MD5 (gcc-core-4.3-20070202.tar.bz2) = 255f9a221c40313cd4fcec861ac94610
+SHA256 (gcc-core-4.3-20070202.tar.bz2) = e71a9c094caaa472bd7a3cfa974f4a121e25c89fe09ca6e42cb0e8a7a2036125
+SIZE (gcc-core-4.3-20070202.tar.bz2) = 16668005
+MD5 (gcc-fortran-4.3-20070202.tar.bz2) = 4b47ecbf1df0a07ed75cbcd5b2d0fb7c
+SHA256 (gcc-fortran-4.3-20070202.tar.bz2) = 60ad4f8539789501ee80d262c98e81ce182bb507cbc738aba16ba1a7b8db0fb4
+SIZE (gcc-fortran-4.3-20070202.tar.bz2) = 926394
+MD5 (gcc-g++-4.3-20070202.tar.bz2) = 449e85ed896f0c708f2740b8bb9871ff
+SHA256 (gcc-g++-4.3-20070202.tar.bz2) = 6d03f4cb2041adcf181a5f8a52118f6017e2408a24b5a4a594d9d2a3adb10820
+SIZE (gcc-g++-4.3-20070202.tar.bz2) = 4836327
+MD5 (gcc-objc-4.3-20070202.tar.bz2) = 701f0e9f95308792873f4a2be46a97c5
+SHA256 (gcc-objc-4.3-20070202.tar.bz2) = e841c95c848dc648b2a759efba4c0a767a5df4e4f3ba2551f4dde3fc36ba7a01
+SIZE (gcc-objc-4.3-20070202.tar.bz2) = 192120
+MD5 (gcc-testsuite-4.3-20070202.tar.bz2) = 4caef80e0913c7e02af31c348318e558
+SHA256 (gcc-testsuite-4.3-20070202.tar.bz2) = 2fd845f4c7aac79ff6fe889f082212153dc4c4f957d03fc2ad486a51e6f18f29
+SIZE (gcc-testsuite-4.3-20070202.tar.bz2) = 3908209
+MD5 (gcc-java-4.3-20070202.tar.bz2) = d03e658f3e67cda8f4aac620e99783f5
+SHA256 (gcc-java-4.3-20070202.tar.bz2) = 5f317c09a5ebe0db1a48ad873e66ac1ba3258d84fdbd8e13e2ba8c1a884ab7a2
+SIZE (gcc-java-4.3-20070202.tar.bz2) = 17509963
diff --git a/lang/gcc44/files/patch-gengtype-yacc.y b/lang/gcc44/files/patch-gengtype-yacc.y
deleted file mode 100644
index 4afaae159533..000000000000
--- a/lang/gcc44/files/patch-gengtype-yacc.y
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc/gengtype-yacc.y.orig	Fri Sep 20 00:33:24 2002
-+++ gcc/gengtype-yacc.y	Tue Apr 22 09:11:27 2003
-@@ -24,6 +24,9 @@
- #include "system.h"
- #include "gengtype.h"
- #define YYERROR_VERBOSE
-+
-+#define malloc xmalloc
-+#define realloc xrealloc
- %}
- 
- %union {
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index 6f8e52750fb7..191098884b73 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -16,19 +16,14 @@ info/gcc%%SUFFIX%%/dir
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
-%%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjarsigner%%SUFFIX%%
-%%JAVA%%bin/gjnih%%SUFFIX%%
 %%JAVA%%bin/gkeytool%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
-%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
-%%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
-%%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.3.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index dc48f22b8c54..40f72bd9646a 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070105
+PORTREVISION=	20070202
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -91,8 +91,10 @@ INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
-		gcc${SUFFIX}/gfortran \
-		gcc${SUFFIX}/libgomp 
+		gcc${SUFFIX}/gfortran
+.if ${OSVERSION} >= 502102
+INFO+=		gcc${SUFFIX}/libgomp 
+.endif
 
 .if ! defined(WITHOUT_JAVA)
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
@@ -162,9 +164,4 @@ post-install:
 	${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 b954c15bc2fd..d56ad8e7f690 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070105.tar.bz2) = 13ec1e7c8d89a0a8b5577a7b6d3425dc
-SHA256 (gcc-core-4.3-20070105.tar.bz2) = 7eb0808594626b9819cc7d09911f95ccbb791e8da9e6155d15f3b7def9b3b288
-SIZE (gcc-core-4.3-20070105.tar.bz2) = 16253279
-MD5 (gcc-fortran-4.3-20070105.tar.bz2) = 06964fb5e2c17bb6a2617a1d3051d121
-SHA256 (gcc-fortran-4.3-20070105.tar.bz2) = 9c1a7501788d6498c07d877c40f8554f93c322f8a96f6b14b6d0ca8d56311026
-SIZE (gcc-fortran-4.3-20070105.tar.bz2) = 904596
-MD5 (gcc-g++-4.3-20070105.tar.bz2) = 30b7fcb0501b9c81d530d61f3544ae42
-SHA256 (gcc-g++-4.3-20070105.tar.bz2) = ccc18d857f1afa2832f2eef6820c18cbf620babd6537a45af9f1d2f6243ed4c9
-SIZE (gcc-g++-4.3-20070105.tar.bz2) = 4813226
-MD5 (gcc-objc-4.3-20070105.tar.bz2) = 87a0539fb6e835e555f96a1731cd123d
-SHA256 (gcc-objc-4.3-20070105.tar.bz2) = d8e0f8ea455f51e86070a5b91f64aacbd820db8a6d290e70c4e036173f7a08e8
-SIZE (gcc-objc-4.3-20070105.tar.bz2) = 192245
-MD5 (gcc-testsuite-4.3-20070105.tar.bz2) = 4ab0f64b8f3b37cc0d0363304db05272
-SHA256 (gcc-testsuite-4.3-20070105.tar.bz2) = 3eef30b1ab946c676816ef8302cde67c3f2ddf0956f341986cd531e6996826b6
-SIZE (gcc-testsuite-4.3-20070105.tar.bz2) = 3875214
-MD5 (gcc-java-4.3-20070105.tar.bz2) = b1f01666527ca190441dacc9cdc75b42
-SHA256 (gcc-java-4.3-20070105.tar.bz2) = 6874a1e2eaf85cb0cc63281e864d49e1994dcc97a439d13c2ab3ba68af56f31f
-SIZE (gcc-java-4.3-20070105.tar.bz2) = 10409086
+MD5 (gcc-core-4.3-20070202.tar.bz2) = 255f9a221c40313cd4fcec861ac94610
+SHA256 (gcc-core-4.3-20070202.tar.bz2) = e71a9c094caaa472bd7a3cfa974f4a121e25c89fe09ca6e42cb0e8a7a2036125
+SIZE (gcc-core-4.3-20070202.tar.bz2) = 16668005
+MD5 (gcc-fortran-4.3-20070202.tar.bz2) = 4b47ecbf1df0a07ed75cbcd5b2d0fb7c
+SHA256 (gcc-fortran-4.3-20070202.tar.bz2) = 60ad4f8539789501ee80d262c98e81ce182bb507cbc738aba16ba1a7b8db0fb4
+SIZE (gcc-fortran-4.3-20070202.tar.bz2) = 926394
+MD5 (gcc-g++-4.3-20070202.tar.bz2) = 449e85ed896f0c708f2740b8bb9871ff
+SHA256 (gcc-g++-4.3-20070202.tar.bz2) = 6d03f4cb2041adcf181a5f8a52118f6017e2408a24b5a4a594d9d2a3adb10820
+SIZE (gcc-g++-4.3-20070202.tar.bz2) = 4836327
+MD5 (gcc-objc-4.3-20070202.tar.bz2) = 701f0e9f95308792873f4a2be46a97c5
+SHA256 (gcc-objc-4.3-20070202.tar.bz2) = e841c95c848dc648b2a759efba4c0a767a5df4e4f3ba2551f4dde3fc36ba7a01
+SIZE (gcc-objc-4.3-20070202.tar.bz2) = 192120
+MD5 (gcc-testsuite-4.3-20070202.tar.bz2) = 4caef80e0913c7e02af31c348318e558
+SHA256 (gcc-testsuite-4.3-20070202.tar.bz2) = 2fd845f4c7aac79ff6fe889f082212153dc4c4f957d03fc2ad486a51e6f18f29
+SIZE (gcc-testsuite-4.3-20070202.tar.bz2) = 3908209
+MD5 (gcc-java-4.3-20070202.tar.bz2) = d03e658f3e67cda8f4aac620e99783f5
+SHA256 (gcc-java-4.3-20070202.tar.bz2) = 5f317c09a5ebe0db1a48ad873e66ac1ba3258d84fdbd8e13e2ba8c1a884ab7a2
+SIZE (gcc-java-4.3-20070202.tar.bz2) = 17509963
diff --git a/lang/gcc45/files/patch-gengtype-yacc.y b/lang/gcc45/files/patch-gengtype-yacc.y
deleted file mode 100644
index 4afaae159533..000000000000
--- a/lang/gcc45/files/patch-gengtype-yacc.y
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc/gengtype-yacc.y.orig	Fri Sep 20 00:33:24 2002
-+++ gcc/gengtype-yacc.y	Tue Apr 22 09:11:27 2003
-@@ -24,6 +24,9 @@
- #include "system.h"
- #include "gengtype.h"
- #define YYERROR_VERBOSE
-+
-+#define malloc xmalloc
-+#define realloc xrealloc
- %}
- 
- %union {
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index 6f8e52750fb7..191098884b73 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -16,19 +16,14 @@ info/gcc%%SUFFIX%%/dir
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
-%%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjarsigner%%SUFFIX%%
-%%JAVA%%bin/gjnih%%SUFFIX%%
 %%JAVA%%bin/gkeytool%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
-%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
-%%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
-%%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.3.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index dc48f22b8c54..40f72bd9646a 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070105
+PORTREVISION=	20070202
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -91,8 +91,10 @@ INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
-		gcc${SUFFIX}/gfortran \
-		gcc${SUFFIX}/libgomp 
+		gcc${SUFFIX}/gfortran
+.if ${OSVERSION} >= 502102
+INFO+=		gcc${SUFFIX}/libgomp 
+.endif
 
 .if ! defined(WITHOUT_JAVA)
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
@@ -162,9 +164,4 @@ post-install:
 	${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 b954c15bc2fd..d56ad8e7f690 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070105.tar.bz2) = 13ec1e7c8d89a0a8b5577a7b6d3425dc
-SHA256 (gcc-core-4.3-20070105.tar.bz2) = 7eb0808594626b9819cc7d09911f95ccbb791e8da9e6155d15f3b7def9b3b288
-SIZE (gcc-core-4.3-20070105.tar.bz2) = 16253279
-MD5 (gcc-fortran-4.3-20070105.tar.bz2) = 06964fb5e2c17bb6a2617a1d3051d121
-SHA256 (gcc-fortran-4.3-20070105.tar.bz2) = 9c1a7501788d6498c07d877c40f8554f93c322f8a96f6b14b6d0ca8d56311026
-SIZE (gcc-fortran-4.3-20070105.tar.bz2) = 904596
-MD5 (gcc-g++-4.3-20070105.tar.bz2) = 30b7fcb0501b9c81d530d61f3544ae42
-SHA256 (gcc-g++-4.3-20070105.tar.bz2) = ccc18d857f1afa2832f2eef6820c18cbf620babd6537a45af9f1d2f6243ed4c9
-SIZE (gcc-g++-4.3-20070105.tar.bz2) = 4813226
-MD5 (gcc-objc-4.3-20070105.tar.bz2) = 87a0539fb6e835e555f96a1731cd123d
-SHA256 (gcc-objc-4.3-20070105.tar.bz2) = d8e0f8ea455f51e86070a5b91f64aacbd820db8a6d290e70c4e036173f7a08e8
-SIZE (gcc-objc-4.3-20070105.tar.bz2) = 192245
-MD5 (gcc-testsuite-4.3-20070105.tar.bz2) = 4ab0f64b8f3b37cc0d0363304db05272
-SHA256 (gcc-testsuite-4.3-20070105.tar.bz2) = 3eef30b1ab946c676816ef8302cde67c3f2ddf0956f341986cd531e6996826b6
-SIZE (gcc-testsuite-4.3-20070105.tar.bz2) = 3875214
-MD5 (gcc-java-4.3-20070105.tar.bz2) = b1f01666527ca190441dacc9cdc75b42
-SHA256 (gcc-java-4.3-20070105.tar.bz2) = 6874a1e2eaf85cb0cc63281e864d49e1994dcc97a439d13c2ab3ba68af56f31f
-SIZE (gcc-java-4.3-20070105.tar.bz2) = 10409086
+MD5 (gcc-core-4.3-20070202.tar.bz2) = 255f9a221c40313cd4fcec861ac94610
+SHA256 (gcc-core-4.3-20070202.tar.bz2) = e71a9c094caaa472bd7a3cfa974f4a121e25c89fe09ca6e42cb0e8a7a2036125
+SIZE (gcc-core-4.3-20070202.tar.bz2) = 16668005
+MD5 (gcc-fortran-4.3-20070202.tar.bz2) = 4b47ecbf1df0a07ed75cbcd5b2d0fb7c
+SHA256 (gcc-fortran-4.3-20070202.tar.bz2) = 60ad4f8539789501ee80d262c98e81ce182bb507cbc738aba16ba1a7b8db0fb4
+SIZE (gcc-fortran-4.3-20070202.tar.bz2) = 926394
+MD5 (gcc-g++-4.3-20070202.tar.bz2) = 449e85ed896f0c708f2740b8bb9871ff
+SHA256 (gcc-g++-4.3-20070202.tar.bz2) = 6d03f4cb2041adcf181a5f8a52118f6017e2408a24b5a4a594d9d2a3adb10820
+SIZE (gcc-g++-4.3-20070202.tar.bz2) = 4836327
+MD5 (gcc-objc-4.3-20070202.tar.bz2) = 701f0e9f95308792873f4a2be46a97c5
+SHA256 (gcc-objc-4.3-20070202.tar.bz2) = e841c95c848dc648b2a759efba4c0a767a5df4e4f3ba2551f4dde3fc36ba7a01
+SIZE (gcc-objc-4.3-20070202.tar.bz2) = 192120
+MD5 (gcc-testsuite-4.3-20070202.tar.bz2) = 4caef80e0913c7e02af31c348318e558
+SHA256 (gcc-testsuite-4.3-20070202.tar.bz2) = 2fd845f4c7aac79ff6fe889f082212153dc4c4f957d03fc2ad486a51e6f18f29
+SIZE (gcc-testsuite-4.3-20070202.tar.bz2) = 3908209
+MD5 (gcc-java-4.3-20070202.tar.bz2) = d03e658f3e67cda8f4aac620e99783f5
+SHA256 (gcc-java-4.3-20070202.tar.bz2) = 5f317c09a5ebe0db1a48ad873e66ac1ba3258d84fdbd8e13e2ba8c1a884ab7a2
+SIZE (gcc-java-4.3-20070202.tar.bz2) = 17509963
diff --git a/lang/gcc46/files/patch-gengtype-yacc.y b/lang/gcc46/files/patch-gengtype-yacc.y
deleted file mode 100644
index 4afaae159533..000000000000
--- a/lang/gcc46/files/patch-gengtype-yacc.y
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc/gengtype-yacc.y.orig	Fri Sep 20 00:33:24 2002
-+++ gcc/gengtype-yacc.y	Tue Apr 22 09:11:27 2003
-@@ -24,6 +24,9 @@
- #include "system.h"
- #include "gengtype.h"
- #define YYERROR_VERBOSE
-+
-+#define malloc xmalloc
-+#define realloc xrealloc
- %}
- 
- %union {
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 6f8e52750fb7..191098884b73 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -16,19 +16,14 @@ info/gcc%%SUFFIX%%/dir
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
-%%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjarsigner%%SUFFIX%%
-%%JAVA%%bin/gjnih%%SUFFIX%%
 %%JAVA%%bin/gkeytool%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
-%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
-%%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
-%%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.3.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index dc48f22b8c54..40f72bd9646a 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070105
+PORTREVISION=	20070202
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -91,8 +91,10 @@ INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
-		gcc${SUFFIX}/gfortran \
-		gcc${SUFFIX}/libgomp 
+		gcc${SUFFIX}/gfortran
+.if ${OSVERSION} >= 502102
+INFO+=		gcc${SUFFIX}/libgomp 
+.endif
 
 .if ! defined(WITHOUT_JAVA)
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
@@ -162,9 +164,4 @@ post-install:
 	${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 b954c15bc2fd..d56ad8e7f690 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070105.tar.bz2) = 13ec1e7c8d89a0a8b5577a7b6d3425dc
-SHA256 (gcc-core-4.3-20070105.tar.bz2) = 7eb0808594626b9819cc7d09911f95ccbb791e8da9e6155d15f3b7def9b3b288
-SIZE (gcc-core-4.3-20070105.tar.bz2) = 16253279
-MD5 (gcc-fortran-4.3-20070105.tar.bz2) = 06964fb5e2c17bb6a2617a1d3051d121
-SHA256 (gcc-fortran-4.3-20070105.tar.bz2) = 9c1a7501788d6498c07d877c40f8554f93c322f8a96f6b14b6d0ca8d56311026
-SIZE (gcc-fortran-4.3-20070105.tar.bz2) = 904596
-MD5 (gcc-g++-4.3-20070105.tar.bz2) = 30b7fcb0501b9c81d530d61f3544ae42
-SHA256 (gcc-g++-4.3-20070105.tar.bz2) = ccc18d857f1afa2832f2eef6820c18cbf620babd6537a45af9f1d2f6243ed4c9
-SIZE (gcc-g++-4.3-20070105.tar.bz2) = 4813226
-MD5 (gcc-objc-4.3-20070105.tar.bz2) = 87a0539fb6e835e555f96a1731cd123d
-SHA256 (gcc-objc-4.3-20070105.tar.bz2) = d8e0f8ea455f51e86070a5b91f64aacbd820db8a6d290e70c4e036173f7a08e8
-SIZE (gcc-objc-4.3-20070105.tar.bz2) = 192245
-MD5 (gcc-testsuite-4.3-20070105.tar.bz2) = 4ab0f64b8f3b37cc0d0363304db05272
-SHA256 (gcc-testsuite-4.3-20070105.tar.bz2) = 3eef30b1ab946c676816ef8302cde67c3f2ddf0956f341986cd531e6996826b6
-SIZE (gcc-testsuite-4.3-20070105.tar.bz2) = 3875214
-MD5 (gcc-java-4.3-20070105.tar.bz2) = b1f01666527ca190441dacc9cdc75b42
-SHA256 (gcc-java-4.3-20070105.tar.bz2) = 6874a1e2eaf85cb0cc63281e864d49e1994dcc97a439d13c2ab3ba68af56f31f
-SIZE (gcc-java-4.3-20070105.tar.bz2) = 10409086
+MD5 (gcc-core-4.3-20070202.tar.bz2) = 255f9a221c40313cd4fcec861ac94610
+SHA256 (gcc-core-4.3-20070202.tar.bz2) = e71a9c094caaa472bd7a3cfa974f4a121e25c89fe09ca6e42cb0e8a7a2036125
+SIZE (gcc-core-4.3-20070202.tar.bz2) = 16668005
+MD5 (gcc-fortran-4.3-20070202.tar.bz2) = 4b47ecbf1df0a07ed75cbcd5b2d0fb7c
+SHA256 (gcc-fortran-4.3-20070202.tar.bz2) = 60ad4f8539789501ee80d262c98e81ce182bb507cbc738aba16ba1a7b8db0fb4
+SIZE (gcc-fortran-4.3-20070202.tar.bz2) = 926394
+MD5 (gcc-g++-4.3-20070202.tar.bz2) = 449e85ed896f0c708f2740b8bb9871ff
+SHA256 (gcc-g++-4.3-20070202.tar.bz2) = 6d03f4cb2041adcf181a5f8a52118f6017e2408a24b5a4a594d9d2a3adb10820
+SIZE (gcc-g++-4.3-20070202.tar.bz2) = 4836327
+MD5 (gcc-objc-4.3-20070202.tar.bz2) = 701f0e9f95308792873f4a2be46a97c5
+SHA256 (gcc-objc-4.3-20070202.tar.bz2) = e841c95c848dc648b2a759efba4c0a767a5df4e4f3ba2551f4dde3fc36ba7a01
+SIZE (gcc-objc-4.3-20070202.tar.bz2) = 192120
+MD5 (gcc-testsuite-4.3-20070202.tar.bz2) = 4caef80e0913c7e02af31c348318e558
+SHA256 (gcc-testsuite-4.3-20070202.tar.bz2) = 2fd845f4c7aac79ff6fe889f082212153dc4c4f957d03fc2ad486a51e6f18f29
+SIZE (gcc-testsuite-4.3-20070202.tar.bz2) = 3908209
+MD5 (gcc-java-4.3-20070202.tar.bz2) = d03e658f3e67cda8f4aac620e99783f5
+SHA256 (gcc-java-4.3-20070202.tar.bz2) = 5f317c09a5ebe0db1a48ad873e66ac1ba3258d84fdbd8e13e2ba8c1a884ab7a2
+SIZE (gcc-java-4.3-20070202.tar.bz2) = 17509963
diff --git a/lang/gcc47/files/patch-gengtype-yacc.y b/lang/gcc47/files/patch-gengtype-yacc.y
deleted file mode 100644
index 4afaae159533..000000000000
--- a/lang/gcc47/files/patch-gengtype-yacc.y
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc/gengtype-yacc.y.orig	Fri Sep 20 00:33:24 2002
-+++ gcc/gengtype-yacc.y	Tue Apr 22 09:11:27 2003
-@@ -24,6 +24,9 @@
- #include "system.h"
- #include "gengtype.h"
- #define YYERROR_VERBOSE
-+
-+#define malloc xmalloc
-+#define realloc xrealloc
- %}
- 
- %union {
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 6f8e52750fb7..191098884b73 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -16,19 +16,14 @@ info/gcc%%SUFFIX%%/dir
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
-%%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjarsigner%%SUFFIX%%
-%%JAVA%%bin/gjnih%%SUFFIX%%
 %%JAVA%%bin/gkeytool%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
-%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
-%%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
-%%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.3.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index dc48f22b8c54..40f72bd9646a 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070105
+PORTREVISION=	20070202
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -91,8 +91,10 @@ INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
-		gcc${SUFFIX}/gfortran \
-		gcc${SUFFIX}/libgomp 
+		gcc${SUFFIX}/gfortran
+.if ${OSVERSION} >= 502102
+INFO+=		gcc${SUFFIX}/libgomp 
+.endif
 
 .if ! defined(WITHOUT_JAVA)
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
@@ -162,9 +164,4 @@ post-install:
 	${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 b954c15bc2fd..d56ad8e7f690 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070105.tar.bz2) = 13ec1e7c8d89a0a8b5577a7b6d3425dc
-SHA256 (gcc-core-4.3-20070105.tar.bz2) = 7eb0808594626b9819cc7d09911f95ccbb791e8da9e6155d15f3b7def9b3b288
-SIZE (gcc-core-4.3-20070105.tar.bz2) = 16253279
-MD5 (gcc-fortran-4.3-20070105.tar.bz2) = 06964fb5e2c17bb6a2617a1d3051d121
-SHA256 (gcc-fortran-4.3-20070105.tar.bz2) = 9c1a7501788d6498c07d877c40f8554f93c322f8a96f6b14b6d0ca8d56311026
-SIZE (gcc-fortran-4.3-20070105.tar.bz2) = 904596
-MD5 (gcc-g++-4.3-20070105.tar.bz2) = 30b7fcb0501b9c81d530d61f3544ae42
-SHA256 (gcc-g++-4.3-20070105.tar.bz2) = ccc18d857f1afa2832f2eef6820c18cbf620babd6537a45af9f1d2f6243ed4c9
-SIZE (gcc-g++-4.3-20070105.tar.bz2) = 4813226
-MD5 (gcc-objc-4.3-20070105.tar.bz2) = 87a0539fb6e835e555f96a1731cd123d
-SHA256 (gcc-objc-4.3-20070105.tar.bz2) = d8e0f8ea455f51e86070a5b91f64aacbd820db8a6d290e70c4e036173f7a08e8
-SIZE (gcc-objc-4.3-20070105.tar.bz2) = 192245
-MD5 (gcc-testsuite-4.3-20070105.tar.bz2) = 4ab0f64b8f3b37cc0d0363304db05272
-SHA256 (gcc-testsuite-4.3-20070105.tar.bz2) = 3eef30b1ab946c676816ef8302cde67c3f2ddf0956f341986cd531e6996826b6
-SIZE (gcc-testsuite-4.3-20070105.tar.bz2) = 3875214
-MD5 (gcc-java-4.3-20070105.tar.bz2) = b1f01666527ca190441dacc9cdc75b42
-SHA256 (gcc-java-4.3-20070105.tar.bz2) = 6874a1e2eaf85cb0cc63281e864d49e1994dcc97a439d13c2ab3ba68af56f31f
-SIZE (gcc-java-4.3-20070105.tar.bz2) = 10409086
+MD5 (gcc-core-4.3-20070202.tar.bz2) = 255f9a221c40313cd4fcec861ac94610
+SHA256 (gcc-core-4.3-20070202.tar.bz2) = e71a9c094caaa472bd7a3cfa974f4a121e25c89fe09ca6e42cb0e8a7a2036125
+SIZE (gcc-core-4.3-20070202.tar.bz2) = 16668005
+MD5 (gcc-fortran-4.3-20070202.tar.bz2) = 4b47ecbf1df0a07ed75cbcd5b2d0fb7c
+SHA256 (gcc-fortran-4.3-20070202.tar.bz2) = 60ad4f8539789501ee80d262c98e81ce182bb507cbc738aba16ba1a7b8db0fb4
+SIZE (gcc-fortran-4.3-20070202.tar.bz2) = 926394
+MD5 (gcc-g++-4.3-20070202.tar.bz2) = 449e85ed896f0c708f2740b8bb9871ff
+SHA256 (gcc-g++-4.3-20070202.tar.bz2) = 6d03f4cb2041adcf181a5f8a52118f6017e2408a24b5a4a594d9d2a3adb10820
+SIZE (gcc-g++-4.3-20070202.tar.bz2) = 4836327
+MD5 (gcc-objc-4.3-20070202.tar.bz2) = 701f0e9f95308792873f4a2be46a97c5
+SHA256 (gcc-objc-4.3-20070202.tar.bz2) = e841c95c848dc648b2a759efba4c0a767a5df4e4f3ba2551f4dde3fc36ba7a01
+SIZE (gcc-objc-4.3-20070202.tar.bz2) = 192120
+MD5 (gcc-testsuite-4.3-20070202.tar.bz2) = 4caef80e0913c7e02af31c348318e558
+SHA256 (gcc-testsuite-4.3-20070202.tar.bz2) = 2fd845f4c7aac79ff6fe889f082212153dc4c4f957d03fc2ad486a51e6f18f29
+SIZE (gcc-testsuite-4.3-20070202.tar.bz2) = 3908209
+MD5 (gcc-java-4.3-20070202.tar.bz2) = d03e658f3e67cda8f4aac620e99783f5
+SHA256 (gcc-java-4.3-20070202.tar.bz2) = 5f317c09a5ebe0db1a48ad873e66ac1ba3258d84fdbd8e13e2ba8c1a884ab7a2
+SIZE (gcc-java-4.3-20070202.tar.bz2) = 17509963
diff --git a/lang/gcc48/files/patch-gengtype-yacc.y b/lang/gcc48/files/patch-gengtype-yacc.y
deleted file mode 100644
index 4afaae159533..000000000000
--- a/lang/gcc48/files/patch-gengtype-yacc.y
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc/gengtype-yacc.y.orig	Fri Sep 20 00:33:24 2002
-+++ gcc/gengtype-yacc.y	Tue Apr 22 09:11:27 2003
-@@ -24,6 +24,9 @@
- #include "system.h"
- #include "gengtype.h"
- #define YYERROR_VERBOSE
-+
-+#define malloc xmalloc
-+#define realloc xrealloc
- %}
- 
- %union {
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 6f8e52750fb7..191098884b73 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -16,19 +16,14 @@ info/gcc%%SUFFIX%%/dir
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
-%%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjarsigner%%SUFFIX%%
-%%JAVA%%bin/gjnih%%SUFFIX%%
 %%JAVA%%bin/gkeytool%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
-%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
-%%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
-%%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.3.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar