diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index d61d300ac13c..c04be0da83d6 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.6.0.20110129
+PORTVERSION=	4.6.0.20110205
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -106,9 +106,6 @@ INFO=		gcc${SUFFIX}/cpp \
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
-# FIXME: we are getting weird build failures with libjava on some systems,
-# which the following works around. PR 81788, http://gcc.gnu.org/PR21206.
-CONFIGURE_ARGS+=--disable-rpath
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 4dc89c8829c0..4607aac03697 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,10 +1,10 @@
-SHA256 (gcc-core-4.6-20110129.tar.bz2) = 75bde50a74c42f37c28f08d2919ae1e10156bd9fecc82c814739666ad37739e3
-SIZE (gcc-core-4.6-20110129.tar.bz2) = 26231786
-SHA256 (gcc-fortran-4.6-20110129.tar.bz2) = f0f6c5d025ed9df827da45eaea0654919f8771ef19bfba70166e87ba3bcec64d
-SIZE (gcc-fortran-4.6-20110129.tar.bz2) = 1538337
-SHA256 (gcc-g++-4.6-20110129.tar.bz2) = 9ba9256e39a8b09598dac78243bdb0311c93caed883e842f8279f5041ffd594e
-SIZE (gcc-g++-4.6-20110129.tar.bz2) = 6709830
-SHA256 (gcc-testsuite-4.6-20110129.tar.bz2) = e4b7d971f3525bee70371646ef245a29c7098454a14dac5c50e1f4a5b27d8cad
-SIZE (gcc-testsuite-4.6-20110129.tar.bz2) = 6215216
-SHA256 (gcc-java-4.6-20110129.tar.bz2) = 89d4c6fff76a3f57f9a117dcfe418a7f516f15970bf6219a62f33702b629d402
-SIZE (gcc-java-4.6-20110129.tar.bz2) = 18534799
+SHA256 (gcc-core-4.6-20110205.tar.bz2) = 3fad18877190254ff8c59ebd55da04a4eb447a16ad16c64e3f65d697747ce04b
+SIZE (gcc-core-4.6-20110205.tar.bz2) = 26233237
+SHA256 (gcc-fortran-4.6-20110205.tar.bz2) = 30d847bfbd3eadd039da81233d1320644d3edda7f7b9e441b1ed1711b1138d91
+SIZE (gcc-fortran-4.6-20110205.tar.bz2) = 1537888
+SHA256 (gcc-g++-4.6-20110205.tar.bz2) = 04ebd5df4dcc366f165eb1c1608bc7649e01f6d65093a204842701c72ef90622
+SIZE (gcc-g++-4.6-20110205.tar.bz2) = 6867996
+SHA256 (gcc-testsuite-4.6-20110205.tar.bz2) = bff148f1e75c6efc7cd49b4e56b369b09c55491b8eb534016926456cdec8768a
+SIZE (gcc-testsuite-4.6-20110205.tar.bz2) = 6229882
+SHA256 (gcc-java-4.6-20110205.tar.bz2) = fbe006de8dc3fed8a0c22c5fc669e5285abb9168f3079a5cfea5d1b3cddc6d8d
+SIZE (gcc-java-4.6-20110205.tar.bz2) = 18536248
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index d61d300ac13c..c04be0da83d6 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.6.0.20110129
+PORTVERSION=	4.6.0.20110205
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -106,9 +106,6 @@ INFO=		gcc${SUFFIX}/cpp \
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
-# FIXME: we are getting weird build failures with libjava on some systems,
-# which the following works around. PR 81788, http://gcc.gnu.org/PR21206.
-CONFIGURE_ARGS+=--disable-rpath
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 4dc89c8829c0..4607aac03697 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,10 +1,10 @@
-SHA256 (gcc-core-4.6-20110129.tar.bz2) = 75bde50a74c42f37c28f08d2919ae1e10156bd9fecc82c814739666ad37739e3
-SIZE (gcc-core-4.6-20110129.tar.bz2) = 26231786
-SHA256 (gcc-fortran-4.6-20110129.tar.bz2) = f0f6c5d025ed9df827da45eaea0654919f8771ef19bfba70166e87ba3bcec64d
-SIZE (gcc-fortran-4.6-20110129.tar.bz2) = 1538337
-SHA256 (gcc-g++-4.6-20110129.tar.bz2) = 9ba9256e39a8b09598dac78243bdb0311c93caed883e842f8279f5041ffd594e
-SIZE (gcc-g++-4.6-20110129.tar.bz2) = 6709830
-SHA256 (gcc-testsuite-4.6-20110129.tar.bz2) = e4b7d971f3525bee70371646ef245a29c7098454a14dac5c50e1f4a5b27d8cad
-SIZE (gcc-testsuite-4.6-20110129.tar.bz2) = 6215216
-SHA256 (gcc-java-4.6-20110129.tar.bz2) = 89d4c6fff76a3f57f9a117dcfe418a7f516f15970bf6219a62f33702b629d402
-SIZE (gcc-java-4.6-20110129.tar.bz2) = 18534799
+SHA256 (gcc-core-4.6-20110205.tar.bz2) = 3fad18877190254ff8c59ebd55da04a4eb447a16ad16c64e3f65d697747ce04b
+SIZE (gcc-core-4.6-20110205.tar.bz2) = 26233237
+SHA256 (gcc-fortran-4.6-20110205.tar.bz2) = 30d847bfbd3eadd039da81233d1320644d3edda7f7b9e441b1ed1711b1138d91
+SIZE (gcc-fortran-4.6-20110205.tar.bz2) = 1537888
+SHA256 (gcc-g++-4.6-20110205.tar.bz2) = 04ebd5df4dcc366f165eb1c1608bc7649e01f6d65093a204842701c72ef90622
+SIZE (gcc-g++-4.6-20110205.tar.bz2) = 6867996
+SHA256 (gcc-testsuite-4.6-20110205.tar.bz2) = bff148f1e75c6efc7cd49b4e56b369b09c55491b8eb534016926456cdec8768a
+SIZE (gcc-testsuite-4.6-20110205.tar.bz2) = 6229882
+SHA256 (gcc-java-4.6-20110205.tar.bz2) = fbe006de8dc3fed8a0c22c5fc669e5285abb9168f3079a5cfea5d1b3cddc6d8d
+SIZE (gcc-java-4.6-20110205.tar.bz2) = 18536248
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index d61d300ac13c..c04be0da83d6 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.6.0.20110129
+PORTVERSION=	4.6.0.20110205
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -106,9 +106,6 @@ INFO=		gcc${SUFFIX}/cpp \
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
-# FIXME: we are getting weird build failures with libjava on some systems,
-# which the following works around. PR 81788, http://gcc.gnu.org/PR21206.
-CONFIGURE_ARGS+=--disable-rpath
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 4dc89c8829c0..4607aac03697 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,10 +1,10 @@
-SHA256 (gcc-core-4.6-20110129.tar.bz2) = 75bde50a74c42f37c28f08d2919ae1e10156bd9fecc82c814739666ad37739e3
-SIZE (gcc-core-4.6-20110129.tar.bz2) = 26231786
-SHA256 (gcc-fortran-4.6-20110129.tar.bz2) = f0f6c5d025ed9df827da45eaea0654919f8771ef19bfba70166e87ba3bcec64d
-SIZE (gcc-fortran-4.6-20110129.tar.bz2) = 1538337
-SHA256 (gcc-g++-4.6-20110129.tar.bz2) = 9ba9256e39a8b09598dac78243bdb0311c93caed883e842f8279f5041ffd594e
-SIZE (gcc-g++-4.6-20110129.tar.bz2) = 6709830
-SHA256 (gcc-testsuite-4.6-20110129.tar.bz2) = e4b7d971f3525bee70371646ef245a29c7098454a14dac5c50e1f4a5b27d8cad
-SIZE (gcc-testsuite-4.6-20110129.tar.bz2) = 6215216
-SHA256 (gcc-java-4.6-20110129.tar.bz2) = 89d4c6fff76a3f57f9a117dcfe418a7f516f15970bf6219a62f33702b629d402
-SIZE (gcc-java-4.6-20110129.tar.bz2) = 18534799
+SHA256 (gcc-core-4.6-20110205.tar.bz2) = 3fad18877190254ff8c59ebd55da04a4eb447a16ad16c64e3f65d697747ce04b
+SIZE (gcc-core-4.6-20110205.tar.bz2) = 26233237
+SHA256 (gcc-fortran-4.6-20110205.tar.bz2) = 30d847bfbd3eadd039da81233d1320644d3edda7f7b9e441b1ed1711b1138d91
+SIZE (gcc-fortran-4.6-20110205.tar.bz2) = 1537888
+SHA256 (gcc-g++-4.6-20110205.tar.bz2) = 04ebd5df4dcc366f165eb1c1608bc7649e01f6d65093a204842701c72ef90622
+SIZE (gcc-g++-4.6-20110205.tar.bz2) = 6867996
+SHA256 (gcc-testsuite-4.6-20110205.tar.bz2) = bff148f1e75c6efc7cd49b4e56b369b09c55491b8eb534016926456cdec8768a
+SIZE (gcc-testsuite-4.6-20110205.tar.bz2) = 6229882
+SHA256 (gcc-java-4.6-20110205.tar.bz2) = fbe006de8dc3fed8a0c22c5fc669e5285abb9168f3079a5cfea5d1b3cddc6d8d
+SIZE (gcc-java-4.6-20110205.tar.bz2) = 18536248
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index d61d300ac13c..c04be0da83d6 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.6.0.20110129
+PORTVERSION=	4.6.0.20110205
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -106,9 +106,6 @@ INFO=		gcc${SUFFIX}/cpp \
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
-# FIXME: we are getting weird build failures with libjava on some systems,
-# which the following works around. PR 81788, http://gcc.gnu.org/PR21206.
-CONFIGURE_ARGS+=--disable-rpath
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 4dc89c8829c0..4607aac03697 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,10 +1,10 @@
-SHA256 (gcc-core-4.6-20110129.tar.bz2) = 75bde50a74c42f37c28f08d2919ae1e10156bd9fecc82c814739666ad37739e3
-SIZE (gcc-core-4.6-20110129.tar.bz2) = 26231786
-SHA256 (gcc-fortran-4.6-20110129.tar.bz2) = f0f6c5d025ed9df827da45eaea0654919f8771ef19bfba70166e87ba3bcec64d
-SIZE (gcc-fortran-4.6-20110129.tar.bz2) = 1538337
-SHA256 (gcc-g++-4.6-20110129.tar.bz2) = 9ba9256e39a8b09598dac78243bdb0311c93caed883e842f8279f5041ffd594e
-SIZE (gcc-g++-4.6-20110129.tar.bz2) = 6709830
-SHA256 (gcc-testsuite-4.6-20110129.tar.bz2) = e4b7d971f3525bee70371646ef245a29c7098454a14dac5c50e1f4a5b27d8cad
-SIZE (gcc-testsuite-4.6-20110129.tar.bz2) = 6215216
-SHA256 (gcc-java-4.6-20110129.tar.bz2) = 89d4c6fff76a3f57f9a117dcfe418a7f516f15970bf6219a62f33702b629d402
-SIZE (gcc-java-4.6-20110129.tar.bz2) = 18534799
+SHA256 (gcc-core-4.6-20110205.tar.bz2) = 3fad18877190254ff8c59ebd55da04a4eb447a16ad16c64e3f65d697747ce04b
+SIZE (gcc-core-4.6-20110205.tar.bz2) = 26233237
+SHA256 (gcc-fortran-4.6-20110205.tar.bz2) = 30d847bfbd3eadd039da81233d1320644d3edda7f7b9e441b1ed1711b1138d91
+SIZE (gcc-fortran-4.6-20110205.tar.bz2) = 1537888
+SHA256 (gcc-g++-4.6-20110205.tar.bz2) = 04ebd5df4dcc366f165eb1c1608bc7649e01f6d65093a204842701c72ef90622
+SIZE (gcc-g++-4.6-20110205.tar.bz2) = 6867996
+SHA256 (gcc-testsuite-4.6-20110205.tar.bz2) = bff148f1e75c6efc7cd49b4e56b369b09c55491b8eb534016926456cdec8768a
+SIZE (gcc-testsuite-4.6-20110205.tar.bz2) = 6229882
+SHA256 (gcc-java-4.6-20110205.tar.bz2) = fbe006de8dc3fed8a0c22c5fc669e5285abb9168f3079a5cfea5d1b3cddc6d8d
+SIZE (gcc-java-4.6-20110205.tar.bz2) = 18536248