diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 9b0b2106274d..52e2b9b523e8 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20061230
+PORTREVISION=	20070105
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 5441073aa169..0e83bcaa0244 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,18 +1,15 @@
-MD5 (gcc-core-4.3-20061230.tar.bz2) = e3a15fc9affdb7c641380b9f00578a88
-SHA256 (gcc-core-4.3-20061230.tar.bz2) = 01b8fef61a3981dc739d58205a283c0cb7cd3ade978f5bf811d0dfa876acecd1
-SIZE (gcc-core-4.3-20061230.tar.bz2) = 16236765
-MD5 (gcc-fortran-4.3-20061230.tar.bz2) = 41adbc52d9911cf484f5873ecf66a0a4
-SHA256 (gcc-fortran-4.3-20061230.tar.bz2) = c6635328091bf3f70b3af2536be29819e30c5edd634956d201b6004212f95f3b
-SIZE (gcc-fortran-4.3-20061230.tar.bz2) = 893853
-MD5 (gcc-g++-4.3-20061230.tar.bz2) = d3ce8ec6b13c3dd55b0f291b1e3b11e0
-SHA256 (gcc-g++-4.3-20061230.tar.bz2) = 9eb39effe0ba39b712653826044602973f6db77073ec38d85e57c1c48bc5d6f8
-SIZE (gcc-g++-4.3-20061230.tar.bz2) = 4812086
-MD5 (gcc-objc-4.3-20061230.tar.bz2) = 230d7eed6775b00a80e3a04583f3b5ce
-SHA256 (gcc-objc-4.3-20061230.tar.bz2) = 9280328c05ef89efde7e1339bdbe03332c04596080484875cc0b99c85b832fe2
-SIZE (gcc-objc-4.3-20061230.tar.bz2) = 191857
-MD5 (gcc-testsuite-4.3-20061230.tar.bz2) = e437b60c85183c4d0d50a611cd4d908e
-SHA256 (gcc-testsuite-4.3-20061230.tar.bz2) = f8dd6f10b92dbf9bb139ee30b9859126dc79465ce5ab0785d30d484e834afda8
-SIZE (gcc-testsuite-4.3-20061230.tar.bz2) = 3868864
-MD5 (gcc-java-4.3-20061230.tar.bz2) = d59e8ccab5fc393b2f86b20aecd1bb83
-SHA256 (gcc-java-4.3-20061230.tar.bz2) = c9fcd0f764a09cddd2a05bbf8fbf86b3bde042e534770e44ccf64f92528437c4
-SIZE (gcc-java-4.3-20061230.tar.bz2) = 10407867
+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
diff --git a/lang/gcc/files/patch-gcc-gimplify.c b/lang/gcc/files/patch-gcc-gimplify.c
deleted file mode 100644
index 1623f6010d93..000000000000
--- a/lang/gcc/files/patch-gcc-gimplify.c
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gcc/gimplify.c
-===================================================================
---- gcc/gimplify.c	(revision 120301)
-+++ gcc/gimplify.c	(working copy)
-@@ -1013,8 +1013,9 @@
- 	  /* The wrapper is on the RHS of an assignment that we're pushing
- 	     down.  */
- 	  gcc_assert (TREE_CODE (temp) == INIT_EXPR
--		      || TREE_CODE (temp) == MODIFY_EXPR);
--	  TREE_OPERAND (temp, 1) = *p;
-+	              || TREE_CODE (temp) == MODIFY_EXPR
-+	              || TREE_CODE (temp) == GIMPLE_MODIFY_STMT);
-+	  GENERIC_TREE_OPERAND (temp, 1) = *p;
- 	  *p = temp;
- 	}
-       else
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 9b0b2106274d..52e2b9b523e8 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20061230
+PORTREVISION=	20070105
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 5441073aa169..0e83bcaa0244 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,18 +1,15 @@
-MD5 (gcc-core-4.3-20061230.tar.bz2) = e3a15fc9affdb7c641380b9f00578a88
-SHA256 (gcc-core-4.3-20061230.tar.bz2) = 01b8fef61a3981dc739d58205a283c0cb7cd3ade978f5bf811d0dfa876acecd1
-SIZE (gcc-core-4.3-20061230.tar.bz2) = 16236765
-MD5 (gcc-fortran-4.3-20061230.tar.bz2) = 41adbc52d9911cf484f5873ecf66a0a4
-SHA256 (gcc-fortran-4.3-20061230.tar.bz2) = c6635328091bf3f70b3af2536be29819e30c5edd634956d201b6004212f95f3b
-SIZE (gcc-fortran-4.3-20061230.tar.bz2) = 893853
-MD5 (gcc-g++-4.3-20061230.tar.bz2) = d3ce8ec6b13c3dd55b0f291b1e3b11e0
-SHA256 (gcc-g++-4.3-20061230.tar.bz2) = 9eb39effe0ba39b712653826044602973f6db77073ec38d85e57c1c48bc5d6f8
-SIZE (gcc-g++-4.3-20061230.tar.bz2) = 4812086
-MD5 (gcc-objc-4.3-20061230.tar.bz2) = 230d7eed6775b00a80e3a04583f3b5ce
-SHA256 (gcc-objc-4.3-20061230.tar.bz2) = 9280328c05ef89efde7e1339bdbe03332c04596080484875cc0b99c85b832fe2
-SIZE (gcc-objc-4.3-20061230.tar.bz2) = 191857
-MD5 (gcc-testsuite-4.3-20061230.tar.bz2) = e437b60c85183c4d0d50a611cd4d908e
-SHA256 (gcc-testsuite-4.3-20061230.tar.bz2) = f8dd6f10b92dbf9bb139ee30b9859126dc79465ce5ab0785d30d484e834afda8
-SIZE (gcc-testsuite-4.3-20061230.tar.bz2) = 3868864
-MD5 (gcc-java-4.3-20061230.tar.bz2) = d59e8ccab5fc393b2f86b20aecd1bb83
-SHA256 (gcc-java-4.3-20061230.tar.bz2) = c9fcd0f764a09cddd2a05bbf8fbf86b3bde042e534770e44ccf64f92528437c4
-SIZE (gcc-java-4.3-20061230.tar.bz2) = 10407867
+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
diff --git a/lang/gcc43/files/patch-gcc-gimplify.c b/lang/gcc43/files/patch-gcc-gimplify.c
deleted file mode 100644
index 1623f6010d93..000000000000
--- a/lang/gcc43/files/patch-gcc-gimplify.c
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gcc/gimplify.c
-===================================================================
---- gcc/gimplify.c	(revision 120301)
-+++ gcc/gimplify.c	(working copy)
-@@ -1013,8 +1013,9 @@
- 	  /* The wrapper is on the RHS of an assignment that we're pushing
- 	     down.  */
- 	  gcc_assert (TREE_CODE (temp) == INIT_EXPR
--		      || TREE_CODE (temp) == MODIFY_EXPR);
--	  TREE_OPERAND (temp, 1) = *p;
-+	              || TREE_CODE (temp) == MODIFY_EXPR
-+	              || TREE_CODE (temp) == GIMPLE_MODIFY_STMT);
-+	  GENERIC_TREE_OPERAND (temp, 1) = *p;
- 	  *p = temp;
- 	}
-       else
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 9b0b2106274d..52e2b9b523e8 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20061230
+PORTREVISION=	20070105
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 5441073aa169..0e83bcaa0244 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,18 +1,15 @@
-MD5 (gcc-core-4.3-20061230.tar.bz2) = e3a15fc9affdb7c641380b9f00578a88
-SHA256 (gcc-core-4.3-20061230.tar.bz2) = 01b8fef61a3981dc739d58205a283c0cb7cd3ade978f5bf811d0dfa876acecd1
-SIZE (gcc-core-4.3-20061230.tar.bz2) = 16236765
-MD5 (gcc-fortran-4.3-20061230.tar.bz2) = 41adbc52d9911cf484f5873ecf66a0a4
-SHA256 (gcc-fortran-4.3-20061230.tar.bz2) = c6635328091bf3f70b3af2536be29819e30c5edd634956d201b6004212f95f3b
-SIZE (gcc-fortran-4.3-20061230.tar.bz2) = 893853
-MD5 (gcc-g++-4.3-20061230.tar.bz2) = d3ce8ec6b13c3dd55b0f291b1e3b11e0
-SHA256 (gcc-g++-4.3-20061230.tar.bz2) = 9eb39effe0ba39b712653826044602973f6db77073ec38d85e57c1c48bc5d6f8
-SIZE (gcc-g++-4.3-20061230.tar.bz2) = 4812086
-MD5 (gcc-objc-4.3-20061230.tar.bz2) = 230d7eed6775b00a80e3a04583f3b5ce
-SHA256 (gcc-objc-4.3-20061230.tar.bz2) = 9280328c05ef89efde7e1339bdbe03332c04596080484875cc0b99c85b832fe2
-SIZE (gcc-objc-4.3-20061230.tar.bz2) = 191857
-MD5 (gcc-testsuite-4.3-20061230.tar.bz2) = e437b60c85183c4d0d50a611cd4d908e
-SHA256 (gcc-testsuite-4.3-20061230.tar.bz2) = f8dd6f10b92dbf9bb139ee30b9859126dc79465ce5ab0785d30d484e834afda8
-SIZE (gcc-testsuite-4.3-20061230.tar.bz2) = 3868864
-MD5 (gcc-java-4.3-20061230.tar.bz2) = d59e8ccab5fc393b2f86b20aecd1bb83
-SHA256 (gcc-java-4.3-20061230.tar.bz2) = c9fcd0f764a09cddd2a05bbf8fbf86b3bde042e534770e44ccf64f92528437c4
-SIZE (gcc-java-4.3-20061230.tar.bz2) = 10407867
+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
diff --git a/lang/gcc44/files/patch-gcc-gimplify.c b/lang/gcc44/files/patch-gcc-gimplify.c
deleted file mode 100644
index 1623f6010d93..000000000000
--- a/lang/gcc44/files/patch-gcc-gimplify.c
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gcc/gimplify.c
-===================================================================
---- gcc/gimplify.c	(revision 120301)
-+++ gcc/gimplify.c	(working copy)
-@@ -1013,8 +1013,9 @@
- 	  /* The wrapper is on the RHS of an assignment that we're pushing
- 	     down.  */
- 	  gcc_assert (TREE_CODE (temp) == INIT_EXPR
--		      || TREE_CODE (temp) == MODIFY_EXPR);
--	  TREE_OPERAND (temp, 1) = *p;
-+	              || TREE_CODE (temp) == MODIFY_EXPR
-+	              || TREE_CODE (temp) == GIMPLE_MODIFY_STMT);
-+	  GENERIC_TREE_OPERAND (temp, 1) = *p;
- 	  *p = temp;
- 	}
-       else
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 9b0b2106274d..52e2b9b523e8 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20061230
+PORTREVISION=	20070105
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 5441073aa169..0e83bcaa0244 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,18 +1,15 @@
-MD5 (gcc-core-4.3-20061230.tar.bz2) = e3a15fc9affdb7c641380b9f00578a88
-SHA256 (gcc-core-4.3-20061230.tar.bz2) = 01b8fef61a3981dc739d58205a283c0cb7cd3ade978f5bf811d0dfa876acecd1
-SIZE (gcc-core-4.3-20061230.tar.bz2) = 16236765
-MD5 (gcc-fortran-4.3-20061230.tar.bz2) = 41adbc52d9911cf484f5873ecf66a0a4
-SHA256 (gcc-fortran-4.3-20061230.tar.bz2) = c6635328091bf3f70b3af2536be29819e30c5edd634956d201b6004212f95f3b
-SIZE (gcc-fortran-4.3-20061230.tar.bz2) = 893853
-MD5 (gcc-g++-4.3-20061230.tar.bz2) = d3ce8ec6b13c3dd55b0f291b1e3b11e0
-SHA256 (gcc-g++-4.3-20061230.tar.bz2) = 9eb39effe0ba39b712653826044602973f6db77073ec38d85e57c1c48bc5d6f8
-SIZE (gcc-g++-4.3-20061230.tar.bz2) = 4812086
-MD5 (gcc-objc-4.3-20061230.tar.bz2) = 230d7eed6775b00a80e3a04583f3b5ce
-SHA256 (gcc-objc-4.3-20061230.tar.bz2) = 9280328c05ef89efde7e1339bdbe03332c04596080484875cc0b99c85b832fe2
-SIZE (gcc-objc-4.3-20061230.tar.bz2) = 191857
-MD5 (gcc-testsuite-4.3-20061230.tar.bz2) = e437b60c85183c4d0d50a611cd4d908e
-SHA256 (gcc-testsuite-4.3-20061230.tar.bz2) = f8dd6f10b92dbf9bb139ee30b9859126dc79465ce5ab0785d30d484e834afda8
-SIZE (gcc-testsuite-4.3-20061230.tar.bz2) = 3868864
-MD5 (gcc-java-4.3-20061230.tar.bz2) = d59e8ccab5fc393b2f86b20aecd1bb83
-SHA256 (gcc-java-4.3-20061230.tar.bz2) = c9fcd0f764a09cddd2a05bbf8fbf86b3bde042e534770e44ccf64f92528437c4
-SIZE (gcc-java-4.3-20061230.tar.bz2) = 10407867
+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
diff --git a/lang/gcc45/files/patch-gcc-gimplify.c b/lang/gcc45/files/patch-gcc-gimplify.c
deleted file mode 100644
index 1623f6010d93..000000000000
--- a/lang/gcc45/files/patch-gcc-gimplify.c
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gcc/gimplify.c
-===================================================================
---- gcc/gimplify.c	(revision 120301)
-+++ gcc/gimplify.c	(working copy)
-@@ -1013,8 +1013,9 @@
- 	  /* The wrapper is on the RHS of an assignment that we're pushing
- 	     down.  */
- 	  gcc_assert (TREE_CODE (temp) == INIT_EXPR
--		      || TREE_CODE (temp) == MODIFY_EXPR);
--	  TREE_OPERAND (temp, 1) = *p;
-+	              || TREE_CODE (temp) == MODIFY_EXPR
-+	              || TREE_CODE (temp) == GIMPLE_MODIFY_STMT);
-+	  GENERIC_TREE_OPERAND (temp, 1) = *p;
- 	  *p = temp;
- 	}
-       else
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 9b0b2106274d..52e2b9b523e8 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20061230
+PORTREVISION=	20070105
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 5441073aa169..0e83bcaa0244 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,18 +1,15 @@
-MD5 (gcc-core-4.3-20061230.tar.bz2) = e3a15fc9affdb7c641380b9f00578a88
-SHA256 (gcc-core-4.3-20061230.tar.bz2) = 01b8fef61a3981dc739d58205a283c0cb7cd3ade978f5bf811d0dfa876acecd1
-SIZE (gcc-core-4.3-20061230.tar.bz2) = 16236765
-MD5 (gcc-fortran-4.3-20061230.tar.bz2) = 41adbc52d9911cf484f5873ecf66a0a4
-SHA256 (gcc-fortran-4.3-20061230.tar.bz2) = c6635328091bf3f70b3af2536be29819e30c5edd634956d201b6004212f95f3b
-SIZE (gcc-fortran-4.3-20061230.tar.bz2) = 893853
-MD5 (gcc-g++-4.3-20061230.tar.bz2) = d3ce8ec6b13c3dd55b0f291b1e3b11e0
-SHA256 (gcc-g++-4.3-20061230.tar.bz2) = 9eb39effe0ba39b712653826044602973f6db77073ec38d85e57c1c48bc5d6f8
-SIZE (gcc-g++-4.3-20061230.tar.bz2) = 4812086
-MD5 (gcc-objc-4.3-20061230.tar.bz2) = 230d7eed6775b00a80e3a04583f3b5ce
-SHA256 (gcc-objc-4.3-20061230.tar.bz2) = 9280328c05ef89efde7e1339bdbe03332c04596080484875cc0b99c85b832fe2
-SIZE (gcc-objc-4.3-20061230.tar.bz2) = 191857
-MD5 (gcc-testsuite-4.3-20061230.tar.bz2) = e437b60c85183c4d0d50a611cd4d908e
-SHA256 (gcc-testsuite-4.3-20061230.tar.bz2) = f8dd6f10b92dbf9bb139ee30b9859126dc79465ce5ab0785d30d484e834afda8
-SIZE (gcc-testsuite-4.3-20061230.tar.bz2) = 3868864
-MD5 (gcc-java-4.3-20061230.tar.bz2) = d59e8ccab5fc393b2f86b20aecd1bb83
-SHA256 (gcc-java-4.3-20061230.tar.bz2) = c9fcd0f764a09cddd2a05bbf8fbf86b3bde042e534770e44ccf64f92528437c4
-SIZE (gcc-java-4.3-20061230.tar.bz2) = 10407867
+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
diff --git a/lang/gcc46/files/patch-gcc-gimplify.c b/lang/gcc46/files/patch-gcc-gimplify.c
deleted file mode 100644
index 1623f6010d93..000000000000
--- a/lang/gcc46/files/patch-gcc-gimplify.c
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gcc/gimplify.c
-===================================================================
---- gcc/gimplify.c	(revision 120301)
-+++ gcc/gimplify.c	(working copy)
-@@ -1013,8 +1013,9 @@
- 	  /* The wrapper is on the RHS of an assignment that we're pushing
- 	     down.  */
- 	  gcc_assert (TREE_CODE (temp) == INIT_EXPR
--		      || TREE_CODE (temp) == MODIFY_EXPR);
--	  TREE_OPERAND (temp, 1) = *p;
-+	              || TREE_CODE (temp) == MODIFY_EXPR
-+	              || TREE_CODE (temp) == GIMPLE_MODIFY_STMT);
-+	  GENERIC_TREE_OPERAND (temp, 1) = *p;
- 	  *p = temp;
- 	}
-       else
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 9b0b2106274d..52e2b9b523e8 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20061230
+PORTREVISION=	20070105
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 5441073aa169..0e83bcaa0244 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,18 +1,15 @@
-MD5 (gcc-core-4.3-20061230.tar.bz2) = e3a15fc9affdb7c641380b9f00578a88
-SHA256 (gcc-core-4.3-20061230.tar.bz2) = 01b8fef61a3981dc739d58205a283c0cb7cd3ade978f5bf811d0dfa876acecd1
-SIZE (gcc-core-4.3-20061230.tar.bz2) = 16236765
-MD5 (gcc-fortran-4.3-20061230.tar.bz2) = 41adbc52d9911cf484f5873ecf66a0a4
-SHA256 (gcc-fortran-4.3-20061230.tar.bz2) = c6635328091bf3f70b3af2536be29819e30c5edd634956d201b6004212f95f3b
-SIZE (gcc-fortran-4.3-20061230.tar.bz2) = 893853
-MD5 (gcc-g++-4.3-20061230.tar.bz2) = d3ce8ec6b13c3dd55b0f291b1e3b11e0
-SHA256 (gcc-g++-4.3-20061230.tar.bz2) = 9eb39effe0ba39b712653826044602973f6db77073ec38d85e57c1c48bc5d6f8
-SIZE (gcc-g++-4.3-20061230.tar.bz2) = 4812086
-MD5 (gcc-objc-4.3-20061230.tar.bz2) = 230d7eed6775b00a80e3a04583f3b5ce
-SHA256 (gcc-objc-4.3-20061230.tar.bz2) = 9280328c05ef89efde7e1339bdbe03332c04596080484875cc0b99c85b832fe2
-SIZE (gcc-objc-4.3-20061230.tar.bz2) = 191857
-MD5 (gcc-testsuite-4.3-20061230.tar.bz2) = e437b60c85183c4d0d50a611cd4d908e
-SHA256 (gcc-testsuite-4.3-20061230.tar.bz2) = f8dd6f10b92dbf9bb139ee30b9859126dc79465ce5ab0785d30d484e834afda8
-SIZE (gcc-testsuite-4.3-20061230.tar.bz2) = 3868864
-MD5 (gcc-java-4.3-20061230.tar.bz2) = d59e8ccab5fc393b2f86b20aecd1bb83
-SHA256 (gcc-java-4.3-20061230.tar.bz2) = c9fcd0f764a09cddd2a05bbf8fbf86b3bde042e534770e44ccf64f92528437c4
-SIZE (gcc-java-4.3-20061230.tar.bz2) = 10407867
+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
diff --git a/lang/gcc47/files/patch-gcc-gimplify.c b/lang/gcc47/files/patch-gcc-gimplify.c
deleted file mode 100644
index 1623f6010d93..000000000000
--- a/lang/gcc47/files/patch-gcc-gimplify.c
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gcc/gimplify.c
-===================================================================
---- gcc/gimplify.c	(revision 120301)
-+++ gcc/gimplify.c	(working copy)
-@@ -1013,8 +1013,9 @@
- 	  /* The wrapper is on the RHS of an assignment that we're pushing
- 	     down.  */
- 	  gcc_assert (TREE_CODE (temp) == INIT_EXPR
--		      || TREE_CODE (temp) == MODIFY_EXPR);
--	  TREE_OPERAND (temp, 1) = *p;
-+	              || TREE_CODE (temp) == MODIFY_EXPR
-+	              || TREE_CODE (temp) == GIMPLE_MODIFY_STMT);
-+	  GENERIC_TREE_OPERAND (temp, 1) = *p;
- 	  *p = temp;
- 	}
-       else
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 9b0b2106274d..52e2b9b523e8 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20061230
+PORTREVISION=	20070105
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 5441073aa169..0e83bcaa0244 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,18 +1,15 @@
-MD5 (gcc-core-4.3-20061230.tar.bz2) = e3a15fc9affdb7c641380b9f00578a88
-SHA256 (gcc-core-4.3-20061230.tar.bz2) = 01b8fef61a3981dc739d58205a283c0cb7cd3ade978f5bf811d0dfa876acecd1
-SIZE (gcc-core-4.3-20061230.tar.bz2) = 16236765
-MD5 (gcc-fortran-4.3-20061230.tar.bz2) = 41adbc52d9911cf484f5873ecf66a0a4
-SHA256 (gcc-fortran-4.3-20061230.tar.bz2) = c6635328091bf3f70b3af2536be29819e30c5edd634956d201b6004212f95f3b
-SIZE (gcc-fortran-4.3-20061230.tar.bz2) = 893853
-MD5 (gcc-g++-4.3-20061230.tar.bz2) = d3ce8ec6b13c3dd55b0f291b1e3b11e0
-SHA256 (gcc-g++-4.3-20061230.tar.bz2) = 9eb39effe0ba39b712653826044602973f6db77073ec38d85e57c1c48bc5d6f8
-SIZE (gcc-g++-4.3-20061230.tar.bz2) = 4812086
-MD5 (gcc-objc-4.3-20061230.tar.bz2) = 230d7eed6775b00a80e3a04583f3b5ce
-SHA256 (gcc-objc-4.3-20061230.tar.bz2) = 9280328c05ef89efde7e1339bdbe03332c04596080484875cc0b99c85b832fe2
-SIZE (gcc-objc-4.3-20061230.tar.bz2) = 191857
-MD5 (gcc-testsuite-4.3-20061230.tar.bz2) = e437b60c85183c4d0d50a611cd4d908e
-SHA256 (gcc-testsuite-4.3-20061230.tar.bz2) = f8dd6f10b92dbf9bb139ee30b9859126dc79465ce5ab0785d30d484e834afda8
-SIZE (gcc-testsuite-4.3-20061230.tar.bz2) = 3868864
-MD5 (gcc-java-4.3-20061230.tar.bz2) = d59e8ccab5fc393b2f86b20aecd1bb83
-SHA256 (gcc-java-4.3-20061230.tar.bz2) = c9fcd0f764a09cddd2a05bbf8fbf86b3bde042e534770e44ccf64f92528437c4
-SIZE (gcc-java-4.3-20061230.tar.bz2) = 10407867
+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
diff --git a/lang/gcc48/files/patch-gcc-gimplify.c b/lang/gcc48/files/patch-gcc-gimplify.c
deleted file mode 100644
index 1623f6010d93..000000000000
--- a/lang/gcc48/files/patch-gcc-gimplify.c
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gcc/gimplify.c
-===================================================================
---- gcc/gimplify.c	(revision 120301)
-+++ gcc/gimplify.c	(working copy)
-@@ -1013,8 +1013,9 @@
- 	  /* The wrapper is on the RHS of an assignment that we're pushing
- 	     down.  */
- 	  gcc_assert (TREE_CODE (temp) == INIT_EXPR
--		      || TREE_CODE (temp) == MODIFY_EXPR);
--	  TREE_OPERAND (temp, 1) = *p;
-+	              || TREE_CODE (temp) == MODIFY_EXPR
-+	              || TREE_CODE (temp) == GIMPLE_MODIFY_STMT);
-+	  GENERIC_TREE_OPERAND (temp, 1) = *p;
- 	  *p = temp;
- 	}
-       else