16 files changed, 136 insertions, 160 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index b77324cd4827..09464a55f53e 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060318
+PORTREVISION=	20060325
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
+CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
@@ -130,9 +130,6 @@ PLIST_SUB+=	JAVA="@comment "
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
-.if ! defined(WITHOUT_JAVA)
-	@${ECHO_MSG} "(with Java)"
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index d9f8fbc17ca6..d8e4f87f92ac 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060318.tar.bz2) = b6ff3bee798af768fd0fe608137d8173
-SHA256 (gcc-core-4.2-20060318.tar.bz2) = 2389b1214175e6679a48d51f98594ec9d36d548e7e218fae607d95ad7d517911
-SIZE (gcc-core-4.2-20060318.tar.bz2) = 15764236
-MD5 (gcc-g++-4.2-20060318.tar.bz2) = 9f996adbe35e1ce62254f1e589b6ef15
-SHA256 (gcc-g++-4.2-20060318.tar.bz2) = de61faae909fca8522adbeedabbff0e595f2520b6ff0f4cff49747ee0aa9bacb
-SIZE (gcc-g++-4.2-20060318.tar.bz2) = 3916960
-MD5 (gcc-objc-4.2-20060318.tar.bz2) = f2cb5898ec05267138eff1511f73df4d
-SHA256 (gcc-objc-4.2-20060318.tar.bz2) = 9e720ffa65a27a4856ad054df838ad09609db8f4abe2cd8f29ac68308d451750
-SIZE (gcc-objc-4.2-20060318.tar.bz2) = 191548
-MD5 (gcc-testsuite-4.2-20060318.tar.bz2) = 9bbd6dd0da46ca9ab1a4165700798d87
-SHA256 (gcc-testsuite-4.2-20060318.tar.bz2) = ffc7d5c3d5621049a161aeaf6aa5b96d856b2d8466c30d7117109cb4de037b47
-SIZE (gcc-testsuite-4.2-20060318.tar.bz2) = 3619540
-MD5 (gcc-fortran-4.2-20060318.tar.bz2) = 1c38c7834e5b0ab3c99403f20c95fdbf
-SHA256 (gcc-fortran-4.2-20060318.tar.bz2) = 18b6ec3873e79975b2e2728e3d99e33dc98eaafd02e974940864411593c60c0b
-SIZE (gcc-fortran-4.2-20060318.tar.bz2) = 796389
+MD5 (gcc-core-4.2-20060325.tar.bz2) = c0a683825dedb2eba87abd07f19c55dc
+SHA256 (gcc-core-4.2-20060325.tar.bz2) = fd9cf52853345079ef43a4bc35134e6e52c0e1ed440900ff75e6f1f46ee29208
+SIZE (gcc-core-4.2-20060325.tar.bz2) = 15790705
+MD5 (gcc-g++-4.2-20060325.tar.bz2) = 863efa47c5f7c5d47239bc07850e5429
+SHA256 (gcc-g++-4.2-20060325.tar.bz2) = 1e087fe97f74c273de09f8ee8abf4e4fc3a61f9dfb001e55ff8ed931d118020f
+SIZE (gcc-g++-4.2-20060325.tar.bz2) = 3919383
+MD5 (gcc-objc-4.2-20060325.tar.bz2) = 8cd86078bf72cfd59769aa1dc166ecea
+SHA256 (gcc-objc-4.2-20060325.tar.bz2) = 6d828cb448c18f7f64adc66a370c23b972e3a8aba6e1e19bc5aae6cec42da0a6
+SIZE (gcc-objc-4.2-20060325.tar.bz2) = 191621
+MD5 (gcc-testsuite-4.2-20060325.tar.bz2) = cbf160fcc5461ffd75af2559b8193802
+SHA256 (gcc-testsuite-4.2-20060325.tar.bz2) = d651384262843c6d60dd4ae15557f31cccae95964610ea739c0793c2a3983933
+SIZE (gcc-testsuite-4.2-20060325.tar.bz2) = 3632759
+MD5 (gcc-fortran-4.2-20060325.tar.bz2) = 7d93f4fb0921f28469d81fa795a1f014
+SHA256 (gcc-fortran-4.2-20060325.tar.bz2) = 877b53ffd2dd3de8de8e4a7463f299b38097b182c5f51733555a1586f47afd98
+SIZE (gcc-fortran-4.2-20060325.tar.bz2) = 800496
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index b77324cd4827..09464a55f53e 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060318
+PORTREVISION=	20060325
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
+CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
@@ -130,9 +130,6 @@ PLIST_SUB+=	JAVA="@comment "
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
-.if ! defined(WITHOUT_JAVA)
-	@${ECHO_MSG} "(with Java)"
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index d9f8fbc17ca6..d8e4f87f92ac 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060318.tar.bz2) = b6ff3bee798af768fd0fe608137d8173
-SHA256 (gcc-core-4.2-20060318.tar.bz2) = 2389b1214175e6679a48d51f98594ec9d36d548e7e218fae607d95ad7d517911
-SIZE (gcc-core-4.2-20060318.tar.bz2) = 15764236
-MD5 (gcc-g++-4.2-20060318.tar.bz2) = 9f996adbe35e1ce62254f1e589b6ef15
-SHA256 (gcc-g++-4.2-20060318.tar.bz2) = de61faae909fca8522adbeedabbff0e595f2520b6ff0f4cff49747ee0aa9bacb
-SIZE (gcc-g++-4.2-20060318.tar.bz2) = 3916960
-MD5 (gcc-objc-4.2-20060318.tar.bz2) = f2cb5898ec05267138eff1511f73df4d
-SHA256 (gcc-objc-4.2-20060318.tar.bz2) = 9e720ffa65a27a4856ad054df838ad09609db8f4abe2cd8f29ac68308d451750
-SIZE (gcc-objc-4.2-20060318.tar.bz2) = 191548
-MD5 (gcc-testsuite-4.2-20060318.tar.bz2) = 9bbd6dd0da46ca9ab1a4165700798d87
-SHA256 (gcc-testsuite-4.2-20060318.tar.bz2) = ffc7d5c3d5621049a161aeaf6aa5b96d856b2d8466c30d7117109cb4de037b47
-SIZE (gcc-testsuite-4.2-20060318.tar.bz2) = 3619540
-MD5 (gcc-fortran-4.2-20060318.tar.bz2) = 1c38c7834e5b0ab3c99403f20c95fdbf
-SHA256 (gcc-fortran-4.2-20060318.tar.bz2) = 18b6ec3873e79975b2e2728e3d99e33dc98eaafd02e974940864411593c60c0b
-SIZE (gcc-fortran-4.2-20060318.tar.bz2) = 796389
+MD5 (gcc-core-4.2-20060325.tar.bz2) = c0a683825dedb2eba87abd07f19c55dc
+SHA256 (gcc-core-4.2-20060325.tar.bz2) = fd9cf52853345079ef43a4bc35134e6e52c0e1ed440900ff75e6f1f46ee29208
+SIZE (gcc-core-4.2-20060325.tar.bz2) = 15790705
+MD5 (gcc-g++-4.2-20060325.tar.bz2) = 863efa47c5f7c5d47239bc07850e5429
+SHA256 (gcc-g++-4.2-20060325.tar.bz2) = 1e087fe97f74c273de09f8ee8abf4e4fc3a61f9dfb001e55ff8ed931d118020f
+SIZE (gcc-g++-4.2-20060325.tar.bz2) = 3919383
+MD5 (gcc-objc-4.2-20060325.tar.bz2) = 8cd86078bf72cfd59769aa1dc166ecea
+SHA256 (gcc-objc-4.2-20060325.tar.bz2) = 6d828cb448c18f7f64adc66a370c23b972e3a8aba6e1e19bc5aae6cec42da0a6
+SIZE (gcc-objc-4.2-20060325.tar.bz2) = 191621
+MD5 (gcc-testsuite-4.2-20060325.tar.bz2) = cbf160fcc5461ffd75af2559b8193802
+SHA256 (gcc-testsuite-4.2-20060325.tar.bz2) = d651384262843c6d60dd4ae15557f31cccae95964610ea739c0793c2a3983933
+SIZE (gcc-testsuite-4.2-20060325.tar.bz2) = 3632759
+MD5 (gcc-fortran-4.2-20060325.tar.bz2) = 7d93f4fb0921f28469d81fa795a1f014
+SHA256 (gcc-fortran-4.2-20060325.tar.bz2) = 877b53ffd2dd3de8de8e4a7463f299b38097b182c5f51733555a1586f47afd98
+SIZE (gcc-fortran-4.2-20060325.tar.bz2) = 800496
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index b77324cd4827..09464a55f53e 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060318
+PORTREVISION=	20060325
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
+CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
@@ -130,9 +130,6 @@ PLIST_SUB+=	JAVA="@comment "
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
-.if ! defined(WITHOUT_JAVA)
-	@${ECHO_MSG} "(with Java)"
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index d9f8fbc17ca6..d8e4f87f92ac 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060318.tar.bz2) = b6ff3bee798af768fd0fe608137d8173
-SHA256 (gcc-core-4.2-20060318.tar.bz2) = 2389b1214175e6679a48d51f98594ec9d36d548e7e218fae607d95ad7d517911
-SIZE (gcc-core-4.2-20060318.tar.bz2) = 15764236
-MD5 (gcc-g++-4.2-20060318.tar.bz2) = 9f996adbe35e1ce62254f1e589b6ef15
-SHA256 (gcc-g++-4.2-20060318.tar.bz2) = de61faae909fca8522adbeedabbff0e595f2520b6ff0f4cff49747ee0aa9bacb
-SIZE (gcc-g++-4.2-20060318.tar.bz2) = 3916960
-MD5 (gcc-objc-4.2-20060318.tar.bz2) = f2cb5898ec05267138eff1511f73df4d
-SHA256 (gcc-objc-4.2-20060318.tar.bz2) = 9e720ffa65a27a4856ad054df838ad09609db8f4abe2cd8f29ac68308d451750
-SIZE (gcc-objc-4.2-20060318.tar.bz2) = 191548
-MD5 (gcc-testsuite-4.2-20060318.tar.bz2) = 9bbd6dd0da46ca9ab1a4165700798d87
-SHA256 (gcc-testsuite-4.2-20060318.tar.bz2) = ffc7d5c3d5621049a161aeaf6aa5b96d856b2d8466c30d7117109cb4de037b47
-SIZE (gcc-testsuite-4.2-20060318.tar.bz2) = 3619540
-MD5 (gcc-fortran-4.2-20060318.tar.bz2) = 1c38c7834e5b0ab3c99403f20c95fdbf
-SHA256 (gcc-fortran-4.2-20060318.tar.bz2) = 18b6ec3873e79975b2e2728e3d99e33dc98eaafd02e974940864411593c60c0b
-SIZE (gcc-fortran-4.2-20060318.tar.bz2) = 796389
+MD5 (gcc-core-4.2-20060325.tar.bz2) = c0a683825dedb2eba87abd07f19c55dc
+SHA256 (gcc-core-4.2-20060325.tar.bz2) = fd9cf52853345079ef43a4bc35134e6e52c0e1ed440900ff75e6f1f46ee29208
+SIZE (gcc-core-4.2-20060325.tar.bz2) = 15790705
+MD5 (gcc-g++-4.2-20060325.tar.bz2) = 863efa47c5f7c5d47239bc07850e5429
+SHA256 (gcc-g++-4.2-20060325.tar.bz2) = 1e087fe97f74c273de09f8ee8abf4e4fc3a61f9dfb001e55ff8ed931d118020f
+SIZE (gcc-g++-4.2-20060325.tar.bz2) = 3919383
+MD5 (gcc-objc-4.2-20060325.tar.bz2) = 8cd86078bf72cfd59769aa1dc166ecea
+SHA256 (gcc-objc-4.2-20060325.tar.bz2) = 6d828cb448c18f7f64adc66a370c23b972e3a8aba6e1e19bc5aae6cec42da0a6
+SIZE (gcc-objc-4.2-20060325.tar.bz2) = 191621
+MD5 (gcc-testsuite-4.2-20060325.tar.bz2) = cbf160fcc5461ffd75af2559b8193802
+SHA256 (gcc-testsuite-4.2-20060325.tar.bz2) = d651384262843c6d60dd4ae15557f31cccae95964610ea739c0793c2a3983933
+SIZE (gcc-testsuite-4.2-20060325.tar.bz2) = 3632759
+MD5 (gcc-fortran-4.2-20060325.tar.bz2) = 7d93f4fb0921f28469d81fa795a1f014
+SHA256 (gcc-fortran-4.2-20060325.tar.bz2) = 877b53ffd2dd3de8de8e4a7463f299b38097b182c5f51733555a1586f47afd98
+SIZE (gcc-fortran-4.2-20060325.tar.bz2) = 800496
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index b77324cd4827..09464a55f53e 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060318
+PORTREVISION=	20060325
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
+CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
@@ -130,9 +130,6 @@ PLIST_SUB+=	JAVA="@comment "
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
-.if ! defined(WITHOUT_JAVA)
-	@${ECHO_MSG} "(with Java)"
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index d9f8fbc17ca6..d8e4f87f92ac 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060318.tar.bz2) = b6ff3bee798af768fd0fe608137d8173
-SHA256 (gcc-core-4.2-20060318.tar.bz2) = 2389b1214175e6679a48d51f98594ec9d36d548e7e218fae607d95ad7d517911
-SIZE (gcc-core-4.2-20060318.tar.bz2) = 15764236
-MD5 (gcc-g++-4.2-20060318.tar.bz2) = 9f996adbe35e1ce62254f1e589b6ef15
-SHA256 (gcc-g++-4.2-20060318.tar.bz2) = de61faae909fca8522adbeedabbff0e595f2520b6ff0f4cff49747ee0aa9bacb
-SIZE (gcc-g++-4.2-20060318.tar.bz2) = 3916960
-MD5 (gcc-objc-4.2-20060318.tar.bz2) = f2cb5898ec05267138eff1511f73df4d
-SHA256 (gcc-objc-4.2-20060318.tar.bz2) = 9e720ffa65a27a4856ad054df838ad09609db8f4abe2cd8f29ac68308d451750
-SIZE (gcc-objc-4.2-20060318.tar.bz2) = 191548
-MD5 (gcc-testsuite-4.2-20060318.tar.bz2) = 9bbd6dd0da46ca9ab1a4165700798d87
-SHA256 (gcc-testsuite-4.2-20060318.tar.bz2) = ffc7d5c3d5621049a161aeaf6aa5b96d856b2d8466c30d7117109cb4de037b47
-SIZE (gcc-testsuite-4.2-20060318.tar.bz2) = 3619540
-MD5 (gcc-fortran-4.2-20060318.tar.bz2) = 1c38c7834e5b0ab3c99403f20c95fdbf
-SHA256 (gcc-fortran-4.2-20060318.tar.bz2) = 18b6ec3873e79975b2e2728e3d99e33dc98eaafd02e974940864411593c60c0b
-SIZE (gcc-fortran-4.2-20060318.tar.bz2) = 796389
+MD5 (gcc-core-4.2-20060325.tar.bz2) = c0a683825dedb2eba87abd07f19c55dc
+SHA256 (gcc-core-4.2-20060325.tar.bz2) = fd9cf52853345079ef43a4bc35134e6e52c0e1ed440900ff75e6f1f46ee29208
+SIZE (gcc-core-4.2-20060325.tar.bz2) = 15790705
+MD5 (gcc-g++-4.2-20060325.tar.bz2) = 863efa47c5f7c5d47239bc07850e5429
+SHA256 (gcc-g++-4.2-20060325.tar.bz2) = 1e087fe97f74c273de09f8ee8abf4e4fc3a61f9dfb001e55ff8ed931d118020f
+SIZE (gcc-g++-4.2-20060325.tar.bz2) = 3919383
+MD5 (gcc-objc-4.2-20060325.tar.bz2) = 8cd86078bf72cfd59769aa1dc166ecea
+SHA256 (gcc-objc-4.2-20060325.tar.bz2) = 6d828cb448c18f7f64adc66a370c23b972e3a8aba6e1e19bc5aae6cec42da0a6
+SIZE (gcc-objc-4.2-20060325.tar.bz2) = 191621
+MD5 (gcc-testsuite-4.2-20060325.tar.bz2) = cbf160fcc5461ffd75af2559b8193802
+SHA256 (gcc-testsuite-4.2-20060325.tar.bz2) = d651384262843c6d60dd4ae15557f31cccae95964610ea739c0793c2a3983933
+SIZE (gcc-testsuite-4.2-20060325.tar.bz2) = 3632759
+MD5 (gcc-fortran-4.2-20060325.tar.bz2) = 7d93f4fb0921f28469d81fa795a1f014
+SHA256 (gcc-fortran-4.2-20060325.tar.bz2) = 877b53ffd2dd3de8de8e4a7463f299b38097b182c5f51733555a1586f47afd98
+SIZE (gcc-fortran-4.2-20060325.tar.bz2) = 800496
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index b77324cd4827..09464a55f53e 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060318
+PORTREVISION=	20060325
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
+CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
@@ -130,9 +130,6 @@ PLIST_SUB+=	JAVA="@comment "
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
-.if ! defined(WITHOUT_JAVA)
-	@${ECHO_MSG} "(with Java)"
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index d9f8fbc17ca6..d8e4f87f92ac 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060318.tar.bz2) = b6ff3bee798af768fd0fe608137d8173
-SHA256 (gcc-core-4.2-20060318.tar.bz2) = 2389b1214175e6679a48d51f98594ec9d36d548e7e218fae607d95ad7d517911
-SIZE (gcc-core-4.2-20060318.tar.bz2) = 15764236
-MD5 (gcc-g++-4.2-20060318.tar.bz2) = 9f996adbe35e1ce62254f1e589b6ef15
-SHA256 (gcc-g++-4.2-20060318.tar.bz2) = de61faae909fca8522adbeedabbff0e595f2520b6ff0f4cff49747ee0aa9bacb
-SIZE (gcc-g++-4.2-20060318.tar.bz2) = 3916960
-MD5 (gcc-objc-4.2-20060318.tar.bz2) = f2cb5898ec05267138eff1511f73df4d
-SHA256 (gcc-objc-4.2-20060318.tar.bz2) = 9e720ffa65a27a4856ad054df838ad09609db8f4abe2cd8f29ac68308d451750
-SIZE (gcc-objc-4.2-20060318.tar.bz2) = 191548
-MD5 (gcc-testsuite-4.2-20060318.tar.bz2) = 9bbd6dd0da46ca9ab1a4165700798d87
-SHA256 (gcc-testsuite-4.2-20060318.tar.bz2) = ffc7d5c3d5621049a161aeaf6aa5b96d856b2d8466c30d7117109cb4de037b47
-SIZE (gcc-testsuite-4.2-20060318.tar.bz2) = 3619540
-MD5 (gcc-fortran-4.2-20060318.tar.bz2) = 1c38c7834e5b0ab3c99403f20c95fdbf
-SHA256 (gcc-fortran-4.2-20060318.tar.bz2) = 18b6ec3873e79975b2e2728e3d99e33dc98eaafd02e974940864411593c60c0b
-SIZE (gcc-fortran-4.2-20060318.tar.bz2) = 796389
+MD5 (gcc-core-4.2-20060325.tar.bz2) = c0a683825dedb2eba87abd07f19c55dc
+SHA256 (gcc-core-4.2-20060325.tar.bz2) = fd9cf52853345079ef43a4bc35134e6e52c0e1ed440900ff75e6f1f46ee29208
+SIZE (gcc-core-4.2-20060325.tar.bz2) = 15790705
+MD5 (gcc-g++-4.2-20060325.tar.bz2) = 863efa47c5f7c5d47239bc07850e5429
+SHA256 (gcc-g++-4.2-20060325.tar.bz2) = 1e087fe97f74c273de09f8ee8abf4e4fc3a61f9dfb001e55ff8ed931d118020f
+SIZE (gcc-g++-4.2-20060325.tar.bz2) = 3919383
+MD5 (gcc-objc-4.2-20060325.tar.bz2) = 8cd86078bf72cfd59769aa1dc166ecea
+SHA256 (gcc-objc-4.2-20060325.tar.bz2) = 6d828cb448c18f7f64adc66a370c23b972e3a8aba6e1e19bc5aae6cec42da0a6
+SIZE (gcc-objc-4.2-20060325.tar.bz2) = 191621
+MD5 (gcc-testsuite-4.2-20060325.tar.bz2) = cbf160fcc5461ffd75af2559b8193802
+SHA256 (gcc-testsuite-4.2-20060325.tar.bz2) = d651384262843c6d60dd4ae15557f31cccae95964610ea739c0793c2a3983933
+SIZE (gcc-testsuite-4.2-20060325.tar.bz2) = 3632759
+MD5 (gcc-fortran-4.2-20060325.tar.bz2) = 7d93f4fb0921f28469d81fa795a1f014
+SHA256 (gcc-fortran-4.2-20060325.tar.bz2) = 877b53ffd2dd3de8de8e4a7463f299b38097b182c5f51733555a1586f47afd98
+SIZE (gcc-fortran-4.2-20060325.tar.bz2) = 800496
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index b77324cd4827..09464a55f53e 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060318
+PORTREVISION=	20060325
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
+CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
@@ -130,9 +130,6 @@ PLIST_SUB+=	JAVA="@comment "
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
-.if ! defined(WITHOUT_JAVA)
-	@${ECHO_MSG} "(with Java)"
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index d9f8fbc17ca6..d8e4f87f92ac 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060318.tar.bz2) = b6ff3bee798af768fd0fe608137d8173
-SHA256 (gcc-core-4.2-20060318.tar.bz2) = 2389b1214175e6679a48d51f98594ec9d36d548e7e218fae607d95ad7d517911
-SIZE (gcc-core-4.2-20060318.tar.bz2) = 15764236
-MD5 (gcc-g++-4.2-20060318.tar.bz2) = 9f996adbe35e1ce62254f1e589b6ef15
-SHA256 (gcc-g++-4.2-20060318.tar.bz2) = de61faae909fca8522adbeedabbff0e595f2520b6ff0f4cff49747ee0aa9bacb
-SIZE (gcc-g++-4.2-20060318.tar.bz2) = 3916960
-MD5 (gcc-objc-4.2-20060318.tar.bz2) = f2cb5898ec05267138eff1511f73df4d
-SHA256 (gcc-objc-4.2-20060318.tar.bz2) = 9e720ffa65a27a4856ad054df838ad09609db8f4abe2cd8f29ac68308d451750
-SIZE (gcc-objc-4.2-20060318.tar.bz2) = 191548
-MD5 (gcc-testsuite-4.2-20060318.tar.bz2) = 9bbd6dd0da46ca9ab1a4165700798d87
-SHA256 (gcc-testsuite-4.2-20060318.tar.bz2) = ffc7d5c3d5621049a161aeaf6aa5b96d856b2d8466c30d7117109cb4de037b47
-SIZE (gcc-testsuite-4.2-20060318.tar.bz2) = 3619540
-MD5 (gcc-fortran-4.2-20060318.tar.bz2) = 1c38c7834e5b0ab3c99403f20c95fdbf
-SHA256 (gcc-fortran-4.2-20060318.tar.bz2) = 18b6ec3873e79975b2e2728e3d99e33dc98eaafd02e974940864411593c60c0b
-SIZE (gcc-fortran-4.2-20060318.tar.bz2) = 796389
+MD5 (gcc-core-4.2-20060325.tar.bz2) = c0a683825dedb2eba87abd07f19c55dc
+SHA256 (gcc-core-4.2-20060325.tar.bz2) = fd9cf52853345079ef43a4bc35134e6e52c0e1ed440900ff75e6f1f46ee29208
+SIZE (gcc-core-4.2-20060325.tar.bz2) = 15790705
+MD5 (gcc-g++-4.2-20060325.tar.bz2) = 863efa47c5f7c5d47239bc07850e5429
+SHA256 (gcc-g++-4.2-20060325.tar.bz2) = 1e087fe97f74c273de09f8ee8abf4e4fc3a61f9dfb001e55ff8ed931d118020f
+SIZE (gcc-g++-4.2-20060325.tar.bz2) = 3919383
+MD5 (gcc-objc-4.2-20060325.tar.bz2) = 8cd86078bf72cfd59769aa1dc166ecea
+SHA256 (gcc-objc-4.2-20060325.tar.bz2) = 6d828cb448c18f7f64adc66a370c23b972e3a8aba6e1e19bc5aae6cec42da0a6
+SIZE (gcc-objc-4.2-20060325.tar.bz2) = 191621
+MD5 (gcc-testsuite-4.2-20060325.tar.bz2) = cbf160fcc5461ffd75af2559b8193802
+SHA256 (gcc-testsuite-4.2-20060325.tar.bz2) = d651384262843c6d60dd4ae15557f31cccae95964610ea739c0793c2a3983933
+SIZE (gcc-testsuite-4.2-20060325.tar.bz2) = 3632759
+MD5 (gcc-fortran-4.2-20060325.tar.bz2) = 7d93f4fb0921f28469d81fa795a1f014
+SHA256 (gcc-fortran-4.2-20060325.tar.bz2) = 877b53ffd2dd3de8de8e4a7463f299b38097b182c5f51733555a1586f47afd98
+SIZE (gcc-fortran-4.2-20060325.tar.bz2) = 800496
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index b77324cd4827..09464a55f53e 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060318
+PORTREVISION=	20060325
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
+CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
@@ -130,9 +130,6 @@ PLIST_SUB+=	JAVA="@comment "
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
-.if ! defined(WITHOUT_JAVA)
-	@${ECHO_MSG} "(with Java)"
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index d9f8fbc17ca6..d8e4f87f92ac 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060318.tar.bz2) = b6ff3bee798af768fd0fe608137d8173
-SHA256 (gcc-core-4.2-20060318.tar.bz2) = 2389b1214175e6679a48d51f98594ec9d36d548e7e218fae607d95ad7d517911
-SIZE (gcc-core-4.2-20060318.tar.bz2) = 15764236
-MD5 (gcc-g++-4.2-20060318.tar.bz2) = 9f996adbe35e1ce62254f1e589b6ef15
-SHA256 (gcc-g++-4.2-20060318.tar.bz2) = de61faae909fca8522adbeedabbff0e595f2520b6ff0f4cff49747ee0aa9bacb
-SIZE (gcc-g++-4.2-20060318.tar.bz2) = 3916960
-MD5 (gcc-objc-4.2-20060318.tar.bz2) = f2cb5898ec05267138eff1511f73df4d
-SHA256 (gcc-objc-4.2-20060318.tar.bz2) = 9e720ffa65a27a4856ad054df838ad09609db8f4abe2cd8f29ac68308d451750
-SIZE (gcc-objc-4.2-20060318.tar.bz2) = 191548
-MD5 (gcc-testsuite-4.2-20060318.tar.bz2) = 9bbd6dd0da46ca9ab1a4165700798d87
-SHA256 (gcc-testsuite-4.2-20060318.tar.bz2) = ffc7d5c3d5621049a161aeaf6aa5b96d856b2d8466c30d7117109cb4de037b47
-SIZE (gcc-testsuite-4.2-20060318.tar.bz2) = 3619540
-MD5 (gcc-fortran-4.2-20060318.tar.bz2) = 1c38c7834e5b0ab3c99403f20c95fdbf
-SHA256 (gcc-fortran-4.2-20060318.tar.bz2) = 18b6ec3873e79975b2e2728e3d99e33dc98eaafd02e974940864411593c60c0b
-SIZE (gcc-fortran-4.2-20060318.tar.bz2) = 796389
+MD5 (gcc-core-4.2-20060325.tar.bz2) = c0a683825dedb2eba87abd07f19c55dc
+SHA256 (gcc-core-4.2-20060325.tar.bz2) = fd9cf52853345079ef43a4bc35134e6e52c0e1ed440900ff75e6f1f46ee29208
+SIZE (gcc-core-4.2-20060325.tar.bz2) = 15790705
+MD5 (gcc-g++-4.2-20060325.tar.bz2) = 863efa47c5f7c5d47239bc07850e5429
+SHA256 (gcc-g++-4.2-20060325.tar.bz2) = 1e087fe97f74c273de09f8ee8abf4e4fc3a61f9dfb001e55ff8ed931d118020f
+SIZE (gcc-g++-4.2-20060325.tar.bz2) = 3919383
+MD5 (gcc-objc-4.2-20060325.tar.bz2) = 8cd86078bf72cfd59769aa1dc166ecea
+SHA256 (gcc-objc-4.2-20060325.tar.bz2) = 6d828cb448c18f7f64adc66a370c23b972e3a8aba6e1e19bc5aae6cec42da0a6
+SIZE (gcc-objc-4.2-20060325.tar.bz2) = 191621
+MD5 (gcc-testsuite-4.2-20060325.tar.bz2) = cbf160fcc5461ffd75af2559b8193802
+SHA256 (gcc-testsuite-4.2-20060325.tar.bz2) = d651384262843c6d60dd4ae15557f31cccae95964610ea739c0793c2a3983933
+SIZE (gcc-testsuite-4.2-20060325.tar.bz2) = 3632759
+MD5 (gcc-fortran-4.2-20060325.tar.bz2) = 7d93f4fb0921f28469d81fa795a1f014
+SHA256 (gcc-fortran-4.2-20060325.tar.bz2) = 877b53ffd2dd3de8de8e4a7463f299b38097b182c5f51733555a1586f47afd98
+SIZE (gcc-fortran-4.2-20060325.tar.bz2) = 800496
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index b77324cd4827..09464a55f53e 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060318
+PORTREVISION=	20060325
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
+CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
@@ -130,9 +130,6 @@ PLIST_SUB+=	JAVA="@comment "
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
-.if ! defined(WITHOUT_JAVA)
-	@${ECHO_MSG} "(with Java)"
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index d9f8fbc17ca6..d8e4f87f92ac 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060318.tar.bz2) = b6ff3bee798af768fd0fe608137d8173
-SHA256 (gcc-core-4.2-20060318.tar.bz2) = 2389b1214175e6679a48d51f98594ec9d36d548e7e218fae607d95ad7d517911
-SIZE (gcc-core-4.2-20060318.tar.bz2) = 15764236
-MD5 (gcc-g++-4.2-20060318.tar.bz2) = 9f996adbe35e1ce62254f1e589b6ef15
-SHA256 (gcc-g++-4.2-20060318.tar.bz2) = de61faae909fca8522adbeedabbff0e595f2520b6ff0f4cff49747ee0aa9bacb
-SIZE (gcc-g++-4.2-20060318.tar.bz2) = 3916960
-MD5 (gcc-objc-4.2-20060318.tar.bz2) = f2cb5898ec05267138eff1511f73df4d
-SHA256 (gcc-objc-4.2-20060318.tar.bz2) = 9e720ffa65a27a4856ad054df838ad09609db8f4abe2cd8f29ac68308d451750
-SIZE (gcc-objc-4.2-20060318.tar.bz2) = 191548
-MD5 (gcc-testsuite-4.2-20060318.tar.bz2) = 9bbd6dd0da46ca9ab1a4165700798d87
-SHA256 (gcc-testsuite-4.2-20060318.tar.bz2) = ffc7d5c3d5621049a161aeaf6aa5b96d856b2d8466c30d7117109cb4de037b47
-SIZE (gcc-testsuite-4.2-20060318.tar.bz2) = 3619540
-MD5 (gcc-fortran-4.2-20060318.tar.bz2) = 1c38c7834e5b0ab3c99403f20c95fdbf
-SHA256 (gcc-fortran-4.2-20060318.tar.bz2) = 18b6ec3873e79975b2e2728e3d99e33dc98eaafd02e974940864411593c60c0b
-SIZE (gcc-fortran-4.2-20060318.tar.bz2) = 796389
+MD5 (gcc-core-4.2-20060325.tar.bz2) = c0a683825dedb2eba87abd07f19c55dc
+SHA256 (gcc-core-4.2-20060325.tar.bz2) = fd9cf52853345079ef43a4bc35134e6e52c0e1ed440900ff75e6f1f46ee29208
+SIZE (gcc-core-4.2-20060325.tar.bz2) = 15790705
+MD5 (gcc-g++-4.2-20060325.tar.bz2) = 863efa47c5f7c5d47239bc07850e5429
+SHA256 (gcc-g++-4.2-20060325.tar.bz2) = 1e087fe97f74c273de09f8ee8abf4e4fc3a61f9dfb001e55ff8ed931d118020f
+SIZE (gcc-g++-4.2-20060325.tar.bz2) = 3919383
+MD5 (gcc-objc-4.2-20060325.tar.bz2) = 8cd86078bf72cfd59769aa1dc166ecea
+SHA256 (gcc-objc-4.2-20060325.tar.bz2) = 6d828cb448c18f7f64adc66a370c23b972e3a8aba6e1e19bc5aae6cec42da0a6
+SIZE (gcc-objc-4.2-20060325.tar.bz2) = 191621
+MD5 (gcc-testsuite-4.2-20060325.tar.bz2) = cbf160fcc5461ffd75af2559b8193802
+SHA256 (gcc-testsuite-4.2-20060325.tar.bz2) = d651384262843c6d60dd4ae15557f31cccae95964610ea739c0793c2a3983933
+SIZE (gcc-testsuite-4.2-20060325.tar.bz2) = 3632759
+MD5 (gcc-fortran-4.2-20060325.tar.bz2) = 7d93f4fb0921f28469d81fa795a1f014
+SHA256 (gcc-fortran-4.2-20060325.tar.bz2) = 877b53ffd2dd3de8de8e4a7463f299b38097b182c5f51733555a1586f47afd98
+SIZE (gcc-fortran-4.2-20060325.tar.bz2) = 800496