diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 4b5b300dae00..31d6e33bd6c2 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.5.0.20090604
+PORTVERSION=	4.5.0.20090618
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -59,6 +59,7 @@ WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
+CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
@@ -78,6 +79,9 @@ MAN1=		cpp${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1 \
 		gfortran${SUFFIX}.1
+MAN3=		ffi${SUFFIX}.3 \
+		ffi_call${SUFFIX}.3 \
+		ffi_prep_cif${SUFFIX}.3
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 92b02942b742..c915f246a7a7 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.5-20090604.tar.bz2) = 231033318bd0a6cf9dead5ae82adc1b5
-SHA256 (gcc-core-4.5-20090604.tar.bz2) = 967364ab9995571f8ffdfdb0f7f72797f2ff145b2ca20a265d0e8cabb80b2e56
-SIZE (gcc-core-4.5-20090604.tar.bz2) = 22523557
-MD5 (gcc-fortran-4.5-20090604.tar.bz2) = d2aa1e38ccfb85507bcd1ce8496a4c02
-SHA256 (gcc-fortran-4.5-20090604.tar.bz2) = e6a9ba7a0dd93e624148ea394ded87a737466cad53e900c8e52e5ec012a1f2f9
-SIZE (gcc-fortran-4.5-20090604.tar.bz2) = 1347677
-MD5 (gcc-g++-4.5-20090604.tar.bz2) = ffd468b1ca461b75c59fdcd02e00a3f0
-SHA256 (gcc-g++-4.5-20090604.tar.bz2) = 9f06e2869a841746b1252e1ad93b6d7a5ba92aec81f77d9068b82e62867f0ae1
-SIZE (gcc-g++-4.5-20090604.tar.bz2) = 6001404
-MD5 (gcc-objc-4.5-20090604.tar.bz2) = 3d7de541a019cb566c9f84173edeb278
-SHA256 (gcc-objc-4.5-20090604.tar.bz2) = af293b05f2034fb37fc160805869a63a45684bea7c98e173406b807beca7e923
-SIZE (gcc-objc-4.5-20090604.tar.bz2) = 240433
-MD5 (gcc-testsuite-4.5-20090604.tar.bz2) = 5e637b51664760629da3de8719b9df72
-SHA256 (gcc-testsuite-4.5-20090604.tar.bz2) = 96d2333b3066712c76b6e7bd88cfcdd8b1761edf0438e73e3db41deada306624
-SIZE (gcc-testsuite-4.5-20090604.tar.bz2) = 5148691
-MD5 (gcc-java-4.5-20090604.tar.bz2) = 1394762e37f93d6a7f552a3fbd72918a
-SHA256 (gcc-java-4.5-20090604.tar.bz2) = 83384a532bc2a7d8ef536f5fb73ee32f68f0348aca7f99cc65c61290d23db2b2
-SIZE (gcc-java-4.5-20090604.tar.bz2) = 19018851
+MD5 (gcc-core-4.5-20090618.tar.bz2) = ff656cbb7acfbf6660576862143fad1d
+SHA256 (gcc-core-4.5-20090618.tar.bz2) = 5605391e7a36bda4b02db2bffc22ec30f62b3c6eaff6b41ed82d8dceff9ea867
+SIZE (gcc-core-4.5-20090618.tar.bz2) = 22552367
+MD5 (gcc-fortran-4.5-20090618.tar.bz2) = 60a6017ec1063bfa705216c8a8569f1e
+SHA256 (gcc-fortran-4.5-20090618.tar.bz2) = 0aad5791e5902b3653453b058818def34a03e8244470d6700acdefc07962b070
+SIZE (gcc-fortran-4.5-20090618.tar.bz2) = 1351357
+MD5 (gcc-g++-4.5-20090618.tar.bz2) = 1de6f5743a0b2a37cc345da790312e6f
+SHA256 (gcc-g++-4.5-20090618.tar.bz2) = 53c3c007bb05d9450b1fd730b737ce571a62417a917a89e7874eee1e65232c2b
+SIZE (gcc-g++-4.5-20090618.tar.bz2) = 5998780
+MD5 (gcc-objc-4.5-20090618.tar.bz2) = 5bb1e3e62276dcb87ed71313c12bf382
+SHA256 (gcc-objc-4.5-20090618.tar.bz2) = 2c2a3d7d22d75086fdf3901503db5187d09ef58a9b16dd2a1a1ccc4aa63661c9
+SIZE (gcc-objc-4.5-20090618.tar.bz2) = 241312
+MD5 (gcc-testsuite-4.5-20090618.tar.bz2) = 84015b96526edfc1a6640e6e7d9ef980
+SHA256 (gcc-testsuite-4.5-20090618.tar.bz2) = 57a0cdf8702eb953fb149e0c31c530999fc06e8797b838e91f80195c9c297bf7
+SIZE (gcc-testsuite-4.5-20090618.tar.bz2) = 5167913
+MD5 (gcc-java-4.5-20090618.tar.bz2) = d3a12d86f44bbdd3652c66b570da5ec3
+SHA256 (gcc-java-4.5-20090618.tar.bz2) = 8cdbb0a1ad048d3ef7b988299513eda73483015248b5271c0f3735104af188f9
+SIZE (gcc-java-4.5-20090618.tar.bz2) = 19041712
diff --git a/lang/gcc/pkg-descr b/lang/gcc/pkg-descr
index 4fff0c14b894..eb55b6842190 100644
--- a/lang/gcc/pkg-descr
+++ b/lang/gcc/pkg-descr
@@ -8,3 +8,5 @@ consume more than 512MB of main memory.  Set WITHOUT_JAVA=yes in
 the environment when building this port to avoid that.)
 
 WWW: http://gcc.gnu.org/
+
+Gerald Pfeifer <gerald@FreeBSD.org>
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index d902b6ab2d2b..07244bff199e 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -12,13 +12,13 @@ bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
 bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 info/gcc%%SUFFIX%%/dir
-share/libstdc++/python/libstdcxx/__init__.py
-share/libstdc++/python/libstdcxx/v6/__init__.py
-share/libstdc++/python/libstdcxx/v6/printers.py
-@dirrm share/libstdc++/python/libstdcxx/v6
-@dirrm share/libstdc++/python/libstdcxx
-@dirrm share/libstdc++/python
-@dirrm share/libstdc++
+share/gcc-%%GCC_VER%%/python/libstdcxx/__init__.py
+share/gcc-%%GCC_VER%%/python/libstdcxx/v6/__init__.py
+share/gcc-%%GCC_VER%%/python/libstdcxx/v6/printers.py
+@dirrm share/gcc-%%GCC_VER%%/python/libstdcxx/v6
+@dirrm share/gcc-%%GCC_VER%%/python/libstdcxx
+@dirrm share/gcc-%%GCC_VER%%/python
+@dirrm share/gcc-%%GCC_VER%%
 %%JAVA%%bin/aot-compile%%SUFFIX%%
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
 %%JAVA%%bin/gc-analyze%%SUFFIX%%
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 4b5b300dae00..31d6e33bd6c2 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.5.0.20090604
+PORTVERSION=	4.5.0.20090618
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -59,6 +59,7 @@ WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
+CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
@@ -78,6 +79,9 @@ MAN1=		cpp${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1 \
 		gfortran${SUFFIX}.1
+MAN3=		ffi${SUFFIX}.3 \
+		ffi_call${SUFFIX}.3 \
+		ffi_prep_cif${SUFFIX}.3
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 92b02942b742..c915f246a7a7 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.5-20090604.tar.bz2) = 231033318bd0a6cf9dead5ae82adc1b5
-SHA256 (gcc-core-4.5-20090604.tar.bz2) = 967364ab9995571f8ffdfdb0f7f72797f2ff145b2ca20a265d0e8cabb80b2e56
-SIZE (gcc-core-4.5-20090604.tar.bz2) = 22523557
-MD5 (gcc-fortran-4.5-20090604.tar.bz2) = d2aa1e38ccfb85507bcd1ce8496a4c02
-SHA256 (gcc-fortran-4.5-20090604.tar.bz2) = e6a9ba7a0dd93e624148ea394ded87a737466cad53e900c8e52e5ec012a1f2f9
-SIZE (gcc-fortran-4.5-20090604.tar.bz2) = 1347677
-MD5 (gcc-g++-4.5-20090604.tar.bz2) = ffd468b1ca461b75c59fdcd02e00a3f0
-SHA256 (gcc-g++-4.5-20090604.tar.bz2) = 9f06e2869a841746b1252e1ad93b6d7a5ba92aec81f77d9068b82e62867f0ae1
-SIZE (gcc-g++-4.5-20090604.tar.bz2) = 6001404
-MD5 (gcc-objc-4.5-20090604.tar.bz2) = 3d7de541a019cb566c9f84173edeb278
-SHA256 (gcc-objc-4.5-20090604.tar.bz2) = af293b05f2034fb37fc160805869a63a45684bea7c98e173406b807beca7e923
-SIZE (gcc-objc-4.5-20090604.tar.bz2) = 240433
-MD5 (gcc-testsuite-4.5-20090604.tar.bz2) = 5e637b51664760629da3de8719b9df72
-SHA256 (gcc-testsuite-4.5-20090604.tar.bz2) = 96d2333b3066712c76b6e7bd88cfcdd8b1761edf0438e73e3db41deada306624
-SIZE (gcc-testsuite-4.5-20090604.tar.bz2) = 5148691
-MD5 (gcc-java-4.5-20090604.tar.bz2) = 1394762e37f93d6a7f552a3fbd72918a
-SHA256 (gcc-java-4.5-20090604.tar.bz2) = 83384a532bc2a7d8ef536f5fb73ee32f68f0348aca7f99cc65c61290d23db2b2
-SIZE (gcc-java-4.5-20090604.tar.bz2) = 19018851
+MD5 (gcc-core-4.5-20090618.tar.bz2) = ff656cbb7acfbf6660576862143fad1d
+SHA256 (gcc-core-4.5-20090618.tar.bz2) = 5605391e7a36bda4b02db2bffc22ec30f62b3c6eaff6b41ed82d8dceff9ea867
+SIZE (gcc-core-4.5-20090618.tar.bz2) = 22552367
+MD5 (gcc-fortran-4.5-20090618.tar.bz2) = 60a6017ec1063bfa705216c8a8569f1e
+SHA256 (gcc-fortran-4.5-20090618.tar.bz2) = 0aad5791e5902b3653453b058818def34a03e8244470d6700acdefc07962b070
+SIZE (gcc-fortran-4.5-20090618.tar.bz2) = 1351357
+MD5 (gcc-g++-4.5-20090618.tar.bz2) = 1de6f5743a0b2a37cc345da790312e6f
+SHA256 (gcc-g++-4.5-20090618.tar.bz2) = 53c3c007bb05d9450b1fd730b737ce571a62417a917a89e7874eee1e65232c2b
+SIZE (gcc-g++-4.5-20090618.tar.bz2) = 5998780
+MD5 (gcc-objc-4.5-20090618.tar.bz2) = 5bb1e3e62276dcb87ed71313c12bf382
+SHA256 (gcc-objc-4.5-20090618.tar.bz2) = 2c2a3d7d22d75086fdf3901503db5187d09ef58a9b16dd2a1a1ccc4aa63661c9
+SIZE (gcc-objc-4.5-20090618.tar.bz2) = 241312
+MD5 (gcc-testsuite-4.5-20090618.tar.bz2) = 84015b96526edfc1a6640e6e7d9ef980
+SHA256 (gcc-testsuite-4.5-20090618.tar.bz2) = 57a0cdf8702eb953fb149e0c31c530999fc06e8797b838e91f80195c9c297bf7
+SIZE (gcc-testsuite-4.5-20090618.tar.bz2) = 5167913
+MD5 (gcc-java-4.5-20090618.tar.bz2) = d3a12d86f44bbdd3652c66b570da5ec3
+SHA256 (gcc-java-4.5-20090618.tar.bz2) = 8cdbb0a1ad048d3ef7b988299513eda73483015248b5271c0f3735104af188f9
+SIZE (gcc-java-4.5-20090618.tar.bz2) = 19041712
diff --git a/lang/gcc45/pkg-descr b/lang/gcc45/pkg-descr
index 4fff0c14b894..eb55b6842190 100644
--- a/lang/gcc45/pkg-descr
+++ b/lang/gcc45/pkg-descr
@@ -8,3 +8,5 @@ consume more than 512MB of main memory.  Set WITHOUT_JAVA=yes in
 the environment when building this port to avoid that.)
 
 WWW: http://gcc.gnu.org/
+
+Gerald Pfeifer <gerald@FreeBSD.org>
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index d902b6ab2d2b..07244bff199e 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -12,13 +12,13 @@ bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
 bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 info/gcc%%SUFFIX%%/dir
-share/libstdc++/python/libstdcxx/__init__.py
-share/libstdc++/python/libstdcxx/v6/__init__.py
-share/libstdc++/python/libstdcxx/v6/printers.py
-@dirrm share/libstdc++/python/libstdcxx/v6
-@dirrm share/libstdc++/python/libstdcxx
-@dirrm share/libstdc++/python
-@dirrm share/libstdc++
+share/gcc-%%GCC_VER%%/python/libstdcxx/__init__.py
+share/gcc-%%GCC_VER%%/python/libstdcxx/v6/__init__.py
+share/gcc-%%GCC_VER%%/python/libstdcxx/v6/printers.py
+@dirrm share/gcc-%%GCC_VER%%/python/libstdcxx/v6
+@dirrm share/gcc-%%GCC_VER%%/python/libstdcxx
+@dirrm share/gcc-%%GCC_VER%%/python
+@dirrm share/gcc-%%GCC_VER%%
 %%JAVA%%bin/aot-compile%%SUFFIX%%
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
 %%JAVA%%bin/gc-analyze%%SUFFIX%%
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 4b5b300dae00..31d6e33bd6c2 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.5.0.20090604
+PORTVERSION=	4.5.0.20090618
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -59,6 +59,7 @@ WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
+CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
@@ -78,6 +79,9 @@ MAN1=		cpp${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1 \
 		gfortran${SUFFIX}.1
+MAN3=		ffi${SUFFIX}.3 \
+		ffi_call${SUFFIX}.3 \
+		ffi_prep_cif${SUFFIX}.3
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 92b02942b742..c915f246a7a7 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.5-20090604.tar.bz2) = 231033318bd0a6cf9dead5ae82adc1b5
-SHA256 (gcc-core-4.5-20090604.tar.bz2) = 967364ab9995571f8ffdfdb0f7f72797f2ff145b2ca20a265d0e8cabb80b2e56
-SIZE (gcc-core-4.5-20090604.tar.bz2) = 22523557
-MD5 (gcc-fortran-4.5-20090604.tar.bz2) = d2aa1e38ccfb85507bcd1ce8496a4c02
-SHA256 (gcc-fortran-4.5-20090604.tar.bz2) = e6a9ba7a0dd93e624148ea394ded87a737466cad53e900c8e52e5ec012a1f2f9
-SIZE (gcc-fortran-4.5-20090604.tar.bz2) = 1347677
-MD5 (gcc-g++-4.5-20090604.tar.bz2) = ffd468b1ca461b75c59fdcd02e00a3f0
-SHA256 (gcc-g++-4.5-20090604.tar.bz2) = 9f06e2869a841746b1252e1ad93b6d7a5ba92aec81f77d9068b82e62867f0ae1
-SIZE (gcc-g++-4.5-20090604.tar.bz2) = 6001404
-MD5 (gcc-objc-4.5-20090604.tar.bz2) = 3d7de541a019cb566c9f84173edeb278
-SHA256 (gcc-objc-4.5-20090604.tar.bz2) = af293b05f2034fb37fc160805869a63a45684bea7c98e173406b807beca7e923
-SIZE (gcc-objc-4.5-20090604.tar.bz2) = 240433
-MD5 (gcc-testsuite-4.5-20090604.tar.bz2) = 5e637b51664760629da3de8719b9df72
-SHA256 (gcc-testsuite-4.5-20090604.tar.bz2) = 96d2333b3066712c76b6e7bd88cfcdd8b1761edf0438e73e3db41deada306624
-SIZE (gcc-testsuite-4.5-20090604.tar.bz2) = 5148691
-MD5 (gcc-java-4.5-20090604.tar.bz2) = 1394762e37f93d6a7f552a3fbd72918a
-SHA256 (gcc-java-4.5-20090604.tar.bz2) = 83384a532bc2a7d8ef536f5fb73ee32f68f0348aca7f99cc65c61290d23db2b2
-SIZE (gcc-java-4.5-20090604.tar.bz2) = 19018851
+MD5 (gcc-core-4.5-20090618.tar.bz2) = ff656cbb7acfbf6660576862143fad1d
+SHA256 (gcc-core-4.5-20090618.tar.bz2) = 5605391e7a36bda4b02db2bffc22ec30f62b3c6eaff6b41ed82d8dceff9ea867
+SIZE (gcc-core-4.5-20090618.tar.bz2) = 22552367
+MD5 (gcc-fortran-4.5-20090618.tar.bz2) = 60a6017ec1063bfa705216c8a8569f1e
+SHA256 (gcc-fortran-4.5-20090618.tar.bz2) = 0aad5791e5902b3653453b058818def34a03e8244470d6700acdefc07962b070
+SIZE (gcc-fortran-4.5-20090618.tar.bz2) = 1351357
+MD5 (gcc-g++-4.5-20090618.tar.bz2) = 1de6f5743a0b2a37cc345da790312e6f
+SHA256 (gcc-g++-4.5-20090618.tar.bz2) = 53c3c007bb05d9450b1fd730b737ce571a62417a917a89e7874eee1e65232c2b
+SIZE (gcc-g++-4.5-20090618.tar.bz2) = 5998780
+MD5 (gcc-objc-4.5-20090618.tar.bz2) = 5bb1e3e62276dcb87ed71313c12bf382
+SHA256 (gcc-objc-4.5-20090618.tar.bz2) = 2c2a3d7d22d75086fdf3901503db5187d09ef58a9b16dd2a1a1ccc4aa63661c9
+SIZE (gcc-objc-4.5-20090618.tar.bz2) = 241312
+MD5 (gcc-testsuite-4.5-20090618.tar.bz2) = 84015b96526edfc1a6640e6e7d9ef980
+SHA256 (gcc-testsuite-4.5-20090618.tar.bz2) = 57a0cdf8702eb953fb149e0c31c530999fc06e8797b838e91f80195c9c297bf7
+SIZE (gcc-testsuite-4.5-20090618.tar.bz2) = 5167913
+MD5 (gcc-java-4.5-20090618.tar.bz2) = d3a12d86f44bbdd3652c66b570da5ec3
+SHA256 (gcc-java-4.5-20090618.tar.bz2) = 8cdbb0a1ad048d3ef7b988299513eda73483015248b5271c0f3735104af188f9
+SIZE (gcc-java-4.5-20090618.tar.bz2) = 19041712
diff --git a/lang/gcc46/pkg-descr b/lang/gcc46/pkg-descr
index 4fff0c14b894..eb55b6842190 100644
--- a/lang/gcc46/pkg-descr
+++ b/lang/gcc46/pkg-descr
@@ -8,3 +8,5 @@ consume more than 512MB of main memory.  Set WITHOUT_JAVA=yes in
 the environment when building this port to avoid that.)
 
 WWW: http://gcc.gnu.org/
+
+Gerald Pfeifer <gerald@FreeBSD.org>
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index d902b6ab2d2b..07244bff199e 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -12,13 +12,13 @@ bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
 bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 info/gcc%%SUFFIX%%/dir
-share/libstdc++/python/libstdcxx/__init__.py
-share/libstdc++/python/libstdcxx/v6/__init__.py
-share/libstdc++/python/libstdcxx/v6/printers.py
-@dirrm share/libstdc++/python/libstdcxx/v6
-@dirrm share/libstdc++/python/libstdcxx
-@dirrm share/libstdc++/python
-@dirrm share/libstdc++
+share/gcc-%%GCC_VER%%/python/libstdcxx/__init__.py
+share/gcc-%%GCC_VER%%/python/libstdcxx/v6/__init__.py
+share/gcc-%%GCC_VER%%/python/libstdcxx/v6/printers.py
+@dirrm share/gcc-%%GCC_VER%%/python/libstdcxx/v6
+@dirrm share/gcc-%%GCC_VER%%/python/libstdcxx
+@dirrm share/gcc-%%GCC_VER%%/python
+@dirrm share/gcc-%%GCC_VER%%
 %%JAVA%%bin/aot-compile%%SUFFIX%%
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
 %%JAVA%%bin/gc-analyze%%SUFFIX%%
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 4b5b300dae00..31d6e33bd6c2 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.5.0.20090604
+PORTVERSION=	4.5.0.20090618
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -59,6 +59,7 @@ WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
+CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
@@ -78,6 +79,9 @@ MAN1=		cpp${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1 \
 		gfortran${SUFFIX}.1
+MAN3=		ffi${SUFFIX}.3 \
+		ffi_call${SUFFIX}.3 \
+		ffi_prep_cif${SUFFIX}.3
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 92b02942b742..c915f246a7a7 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.5-20090604.tar.bz2) = 231033318bd0a6cf9dead5ae82adc1b5
-SHA256 (gcc-core-4.5-20090604.tar.bz2) = 967364ab9995571f8ffdfdb0f7f72797f2ff145b2ca20a265d0e8cabb80b2e56
-SIZE (gcc-core-4.5-20090604.tar.bz2) = 22523557
-MD5 (gcc-fortran-4.5-20090604.tar.bz2) = d2aa1e38ccfb85507bcd1ce8496a4c02
-SHA256 (gcc-fortran-4.5-20090604.tar.bz2) = e6a9ba7a0dd93e624148ea394ded87a737466cad53e900c8e52e5ec012a1f2f9
-SIZE (gcc-fortran-4.5-20090604.tar.bz2) = 1347677
-MD5 (gcc-g++-4.5-20090604.tar.bz2) = ffd468b1ca461b75c59fdcd02e00a3f0
-SHA256 (gcc-g++-4.5-20090604.tar.bz2) = 9f06e2869a841746b1252e1ad93b6d7a5ba92aec81f77d9068b82e62867f0ae1
-SIZE (gcc-g++-4.5-20090604.tar.bz2) = 6001404
-MD5 (gcc-objc-4.5-20090604.tar.bz2) = 3d7de541a019cb566c9f84173edeb278
-SHA256 (gcc-objc-4.5-20090604.tar.bz2) = af293b05f2034fb37fc160805869a63a45684bea7c98e173406b807beca7e923
-SIZE (gcc-objc-4.5-20090604.tar.bz2) = 240433
-MD5 (gcc-testsuite-4.5-20090604.tar.bz2) = 5e637b51664760629da3de8719b9df72
-SHA256 (gcc-testsuite-4.5-20090604.tar.bz2) = 96d2333b3066712c76b6e7bd88cfcdd8b1761edf0438e73e3db41deada306624
-SIZE (gcc-testsuite-4.5-20090604.tar.bz2) = 5148691
-MD5 (gcc-java-4.5-20090604.tar.bz2) = 1394762e37f93d6a7f552a3fbd72918a
-SHA256 (gcc-java-4.5-20090604.tar.bz2) = 83384a532bc2a7d8ef536f5fb73ee32f68f0348aca7f99cc65c61290d23db2b2
-SIZE (gcc-java-4.5-20090604.tar.bz2) = 19018851
+MD5 (gcc-core-4.5-20090618.tar.bz2) = ff656cbb7acfbf6660576862143fad1d
+SHA256 (gcc-core-4.5-20090618.tar.bz2) = 5605391e7a36bda4b02db2bffc22ec30f62b3c6eaff6b41ed82d8dceff9ea867
+SIZE (gcc-core-4.5-20090618.tar.bz2) = 22552367
+MD5 (gcc-fortran-4.5-20090618.tar.bz2) = 60a6017ec1063bfa705216c8a8569f1e
+SHA256 (gcc-fortran-4.5-20090618.tar.bz2) = 0aad5791e5902b3653453b058818def34a03e8244470d6700acdefc07962b070
+SIZE (gcc-fortran-4.5-20090618.tar.bz2) = 1351357
+MD5 (gcc-g++-4.5-20090618.tar.bz2) = 1de6f5743a0b2a37cc345da790312e6f
+SHA256 (gcc-g++-4.5-20090618.tar.bz2) = 53c3c007bb05d9450b1fd730b737ce571a62417a917a89e7874eee1e65232c2b
+SIZE (gcc-g++-4.5-20090618.tar.bz2) = 5998780
+MD5 (gcc-objc-4.5-20090618.tar.bz2) = 5bb1e3e62276dcb87ed71313c12bf382
+SHA256 (gcc-objc-4.5-20090618.tar.bz2) = 2c2a3d7d22d75086fdf3901503db5187d09ef58a9b16dd2a1a1ccc4aa63661c9
+SIZE (gcc-objc-4.5-20090618.tar.bz2) = 241312
+MD5 (gcc-testsuite-4.5-20090618.tar.bz2) = 84015b96526edfc1a6640e6e7d9ef980
+SHA256 (gcc-testsuite-4.5-20090618.tar.bz2) = 57a0cdf8702eb953fb149e0c31c530999fc06e8797b838e91f80195c9c297bf7
+SIZE (gcc-testsuite-4.5-20090618.tar.bz2) = 5167913
+MD5 (gcc-java-4.5-20090618.tar.bz2) = d3a12d86f44bbdd3652c66b570da5ec3
+SHA256 (gcc-java-4.5-20090618.tar.bz2) = 8cdbb0a1ad048d3ef7b988299513eda73483015248b5271c0f3735104af188f9
+SIZE (gcc-java-4.5-20090618.tar.bz2) = 19041712
diff --git a/lang/gcc47/pkg-descr b/lang/gcc47/pkg-descr
index 4fff0c14b894..eb55b6842190 100644
--- a/lang/gcc47/pkg-descr
+++ b/lang/gcc47/pkg-descr
@@ -8,3 +8,5 @@ consume more than 512MB of main memory.  Set WITHOUT_JAVA=yes in
 the environment when building this port to avoid that.)
 
 WWW: http://gcc.gnu.org/
+
+Gerald Pfeifer <gerald@FreeBSD.org>
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index d902b6ab2d2b..07244bff199e 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -12,13 +12,13 @@ bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
 bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 info/gcc%%SUFFIX%%/dir
-share/libstdc++/python/libstdcxx/__init__.py
-share/libstdc++/python/libstdcxx/v6/__init__.py
-share/libstdc++/python/libstdcxx/v6/printers.py
-@dirrm share/libstdc++/python/libstdcxx/v6
-@dirrm share/libstdc++/python/libstdcxx
-@dirrm share/libstdc++/python
-@dirrm share/libstdc++
+share/gcc-%%GCC_VER%%/python/libstdcxx/__init__.py
+share/gcc-%%GCC_VER%%/python/libstdcxx/v6/__init__.py
+share/gcc-%%GCC_VER%%/python/libstdcxx/v6/printers.py
+@dirrm share/gcc-%%GCC_VER%%/python/libstdcxx/v6
+@dirrm share/gcc-%%GCC_VER%%/python/libstdcxx
+@dirrm share/gcc-%%GCC_VER%%/python
+@dirrm share/gcc-%%GCC_VER%%
 %%JAVA%%bin/aot-compile%%SUFFIX%%
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
 %%JAVA%%bin/gc-analyze%%SUFFIX%%
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 4b5b300dae00..31d6e33bd6c2 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.5.0.20090604
+PORTVERSION=	4.5.0.20090618
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -59,6 +59,7 @@ WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
+CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
@@ -78,6 +79,9 @@ MAN1=		cpp${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1 \
 		gfortran${SUFFIX}.1
+MAN3=		ffi${SUFFIX}.3 \
+		ffi_call${SUFFIX}.3 \
+		ffi_prep_cif${SUFFIX}.3
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 92b02942b742..c915f246a7a7 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.5-20090604.tar.bz2) = 231033318bd0a6cf9dead5ae82adc1b5
-SHA256 (gcc-core-4.5-20090604.tar.bz2) = 967364ab9995571f8ffdfdb0f7f72797f2ff145b2ca20a265d0e8cabb80b2e56
-SIZE (gcc-core-4.5-20090604.tar.bz2) = 22523557
-MD5 (gcc-fortran-4.5-20090604.tar.bz2) = d2aa1e38ccfb85507bcd1ce8496a4c02
-SHA256 (gcc-fortran-4.5-20090604.tar.bz2) = e6a9ba7a0dd93e624148ea394ded87a737466cad53e900c8e52e5ec012a1f2f9
-SIZE (gcc-fortran-4.5-20090604.tar.bz2) = 1347677
-MD5 (gcc-g++-4.5-20090604.tar.bz2) = ffd468b1ca461b75c59fdcd02e00a3f0
-SHA256 (gcc-g++-4.5-20090604.tar.bz2) = 9f06e2869a841746b1252e1ad93b6d7a5ba92aec81f77d9068b82e62867f0ae1
-SIZE (gcc-g++-4.5-20090604.tar.bz2) = 6001404
-MD5 (gcc-objc-4.5-20090604.tar.bz2) = 3d7de541a019cb566c9f84173edeb278
-SHA256 (gcc-objc-4.5-20090604.tar.bz2) = af293b05f2034fb37fc160805869a63a45684bea7c98e173406b807beca7e923
-SIZE (gcc-objc-4.5-20090604.tar.bz2) = 240433
-MD5 (gcc-testsuite-4.5-20090604.tar.bz2) = 5e637b51664760629da3de8719b9df72
-SHA256 (gcc-testsuite-4.5-20090604.tar.bz2) = 96d2333b3066712c76b6e7bd88cfcdd8b1761edf0438e73e3db41deada306624
-SIZE (gcc-testsuite-4.5-20090604.tar.bz2) = 5148691
-MD5 (gcc-java-4.5-20090604.tar.bz2) = 1394762e37f93d6a7f552a3fbd72918a
-SHA256 (gcc-java-4.5-20090604.tar.bz2) = 83384a532bc2a7d8ef536f5fb73ee32f68f0348aca7f99cc65c61290d23db2b2
-SIZE (gcc-java-4.5-20090604.tar.bz2) = 19018851
+MD5 (gcc-core-4.5-20090618.tar.bz2) = ff656cbb7acfbf6660576862143fad1d
+SHA256 (gcc-core-4.5-20090618.tar.bz2) = 5605391e7a36bda4b02db2bffc22ec30f62b3c6eaff6b41ed82d8dceff9ea867
+SIZE (gcc-core-4.5-20090618.tar.bz2) = 22552367
+MD5 (gcc-fortran-4.5-20090618.tar.bz2) = 60a6017ec1063bfa705216c8a8569f1e
+SHA256 (gcc-fortran-4.5-20090618.tar.bz2) = 0aad5791e5902b3653453b058818def34a03e8244470d6700acdefc07962b070
+SIZE (gcc-fortran-4.5-20090618.tar.bz2) = 1351357
+MD5 (gcc-g++-4.5-20090618.tar.bz2) = 1de6f5743a0b2a37cc345da790312e6f
+SHA256 (gcc-g++-4.5-20090618.tar.bz2) = 53c3c007bb05d9450b1fd730b737ce571a62417a917a89e7874eee1e65232c2b
+SIZE (gcc-g++-4.5-20090618.tar.bz2) = 5998780
+MD5 (gcc-objc-4.5-20090618.tar.bz2) = 5bb1e3e62276dcb87ed71313c12bf382
+SHA256 (gcc-objc-4.5-20090618.tar.bz2) = 2c2a3d7d22d75086fdf3901503db5187d09ef58a9b16dd2a1a1ccc4aa63661c9
+SIZE (gcc-objc-4.5-20090618.tar.bz2) = 241312
+MD5 (gcc-testsuite-4.5-20090618.tar.bz2) = 84015b96526edfc1a6640e6e7d9ef980
+SHA256 (gcc-testsuite-4.5-20090618.tar.bz2) = 57a0cdf8702eb953fb149e0c31c530999fc06e8797b838e91f80195c9c297bf7
+SIZE (gcc-testsuite-4.5-20090618.tar.bz2) = 5167913
+MD5 (gcc-java-4.5-20090618.tar.bz2) = d3a12d86f44bbdd3652c66b570da5ec3
+SHA256 (gcc-java-4.5-20090618.tar.bz2) = 8cdbb0a1ad048d3ef7b988299513eda73483015248b5271c0f3735104af188f9
+SIZE (gcc-java-4.5-20090618.tar.bz2) = 19041712
diff --git a/lang/gcc48/pkg-descr b/lang/gcc48/pkg-descr
index 4fff0c14b894..eb55b6842190 100644
--- a/lang/gcc48/pkg-descr
+++ b/lang/gcc48/pkg-descr
@@ -8,3 +8,5 @@ consume more than 512MB of main memory.  Set WITHOUT_JAVA=yes in
 the environment when building this port to avoid that.)
 
 WWW: http://gcc.gnu.org/
+
+Gerald Pfeifer <gerald@FreeBSD.org>
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index d902b6ab2d2b..07244bff199e 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -12,13 +12,13 @@ bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
 bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 info/gcc%%SUFFIX%%/dir
-share/libstdc++/python/libstdcxx/__init__.py
-share/libstdc++/python/libstdcxx/v6/__init__.py
-share/libstdc++/python/libstdcxx/v6/printers.py
-@dirrm share/libstdc++/python/libstdcxx/v6
-@dirrm share/libstdc++/python/libstdcxx
-@dirrm share/libstdc++/python
-@dirrm share/libstdc++
+share/gcc-%%GCC_VER%%/python/libstdcxx/__init__.py
+share/gcc-%%GCC_VER%%/python/libstdcxx/v6/__init__.py
+share/gcc-%%GCC_VER%%/python/libstdcxx/v6/printers.py
+@dirrm share/gcc-%%GCC_VER%%/python/libstdcxx/v6
+@dirrm share/gcc-%%GCC_VER%%/python/libstdcxx
+@dirrm share/gcc-%%GCC_VER%%/python
+@dirrm share/gcc-%%GCC_VER%%
 %%JAVA%%bin/aot-compile%%SUFFIX%%
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
 %%JAVA%%bin/gc-analyze%%SUFFIX%%