diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 8b409004c74f..627e14b4d35e 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050515
+PORTREVISION=	20050522
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -54,8 +54,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make this port build at all.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -104,14 +102,15 @@ INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
 CONFIGURE_ARGS+=	--disable-libgcj
 PLIST_SUB+=	LIBJAVA="@comment "
 .else
-EXTRA_LIBS+=	libffi libgcj libgij
 PLIST_SUB+=	LIBJAVA=""
+EXTRA_LIBS+=	libffi libgcj libgij
 .endif
 
 .if defined(WITH_FORTRAN)
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
+EXTRA_LIBS+=	libgfortran libgfortranbegin
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
@@ -139,7 +138,12 @@ post-build:
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
-post-install: fake-manpages
+post-install:
+	# man pages can only be generated if Perl >= 5.6 is installed;
+	# fake them otherwise.
+	for mp in ${_MANPAGES}; do \
+	  ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
+	done
 .for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
@@ -179,10 +183,3 @@ cklatest:
 .endfor
 
 .include <bsd.port.post.mk>
-
-fake-manpages:
-	# man pages can only be generated if Perl >= 5.6 is installed, so
-	# fake them on 4.x systems.
-.for mp in ${_MANPAGES}
-	( ${TEST} -e ${mp} || ${TOUCH} ${TOUCH_FLAGS} ${mp} )
-.endfor
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 08c3b1ada53f..d5590b849d38 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c
-SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648
-MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335
-SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927
-MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba
-SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003
-MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b
-SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869
-MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778
-SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128
-MD5 (gcc-fortran-4.1-20050515.tar.bz2) = c996383615c6953e83187b32da503154
-SIZE (gcc-fortran-4.1-20050515.tar.bz2) = 581030
+MD5 (gcc-core-4.1-20050522.tar.bz2) = 3c3e0aeb92ab4eb9c92e8f84edc8bc7c
+SIZE (gcc-core-4.1-20050522.tar.bz2) = 13679890
+MD5 (gcc-g++-4.1-20050522.tar.bz2) = 968a6ac49ce6d8fd68b7ac1bf01f22ea
+SIZE (gcc-g++-4.1-20050522.tar.bz2) = 2712258
+MD5 (gcc-java-4.1-20050522.tar.bz2) = 7a330e745d97f1f21f7751c5345affff
+SIZE (gcc-java-4.1-20050522.tar.bz2) = 6006413
+MD5 (gcc-objc-4.1-20050522.tar.bz2) = 3e38998401ad56354e91128780c906dd
+SIZE (gcc-objc-4.1-20050522.tar.bz2) = 183996
+MD5 (gcc-testsuite-4.1-20050522.tar.bz2) = 7392c41c8e1e50bbed78986ac2c6c0e7
+SIZE (gcc-testsuite-4.1-20050522.tar.bz2) = 3093321
+MD5 (gcc-fortran-4.1-20050522.tar.bz2) = dba6fd407588ff974af406fe9d4a9d42
+SIZE (gcc-fortran-4.1-20050522.tar.bz2) = 581680
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index b4b20b8f79ed..aacb48a27cda 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -20,10 +20,6 @@ bin/jv-scan41
 bin/jcf-dump41
 include/mf-runtime.h
 %%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
 %%LIBJAVA%%bin/addr2name.awk41
 %%LIBJAVA%%bin/gcj-dbtool41
 %%LIBJAVA%%bin/gij41
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 8b409004c74f..627e14b4d35e 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050515
+PORTREVISION=	20050522
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -54,8 +54,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make this port build at all.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -104,14 +102,15 @@ INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
 CONFIGURE_ARGS+=	--disable-libgcj
 PLIST_SUB+=	LIBJAVA="@comment "
 .else
-EXTRA_LIBS+=	libffi libgcj libgij
 PLIST_SUB+=	LIBJAVA=""
+EXTRA_LIBS+=	libffi libgcj libgij
 .endif
 
 .if defined(WITH_FORTRAN)
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
+EXTRA_LIBS+=	libgfortran libgfortranbegin
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
@@ -139,7 +138,12 @@ post-build:
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
-post-install: fake-manpages
+post-install:
+	# man pages can only be generated if Perl >= 5.6 is installed;
+	# fake them otherwise.
+	for mp in ${_MANPAGES}; do \
+	  ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
+	done
 .for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
@@ -179,10 +183,3 @@ cklatest:
 .endfor
 
 .include <bsd.port.post.mk>
-
-fake-manpages:
-	# man pages can only be generated if Perl >= 5.6 is installed, so
-	# fake them on 4.x systems.
-.for mp in ${_MANPAGES}
-	( ${TEST} -e ${mp} || ${TOUCH} ${TOUCH_FLAGS} ${mp} )
-.endfor
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index 08c3b1ada53f..d5590b849d38 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c
-SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648
-MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335
-SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927
-MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba
-SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003
-MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b
-SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869
-MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778
-SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128
-MD5 (gcc-fortran-4.1-20050515.tar.bz2) = c996383615c6953e83187b32da503154
-SIZE (gcc-fortran-4.1-20050515.tar.bz2) = 581030
+MD5 (gcc-core-4.1-20050522.tar.bz2) = 3c3e0aeb92ab4eb9c92e8f84edc8bc7c
+SIZE (gcc-core-4.1-20050522.tar.bz2) = 13679890
+MD5 (gcc-g++-4.1-20050522.tar.bz2) = 968a6ac49ce6d8fd68b7ac1bf01f22ea
+SIZE (gcc-g++-4.1-20050522.tar.bz2) = 2712258
+MD5 (gcc-java-4.1-20050522.tar.bz2) = 7a330e745d97f1f21f7751c5345affff
+SIZE (gcc-java-4.1-20050522.tar.bz2) = 6006413
+MD5 (gcc-objc-4.1-20050522.tar.bz2) = 3e38998401ad56354e91128780c906dd
+SIZE (gcc-objc-4.1-20050522.tar.bz2) = 183996
+MD5 (gcc-testsuite-4.1-20050522.tar.bz2) = 7392c41c8e1e50bbed78986ac2c6c0e7
+SIZE (gcc-testsuite-4.1-20050522.tar.bz2) = 3093321
+MD5 (gcc-fortran-4.1-20050522.tar.bz2) = dba6fd407588ff974af406fe9d4a9d42
+SIZE (gcc-fortran-4.1-20050522.tar.bz2) = 581680
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index b4b20b8f79ed..aacb48a27cda 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -20,10 +20,6 @@ bin/jv-scan41
 bin/jcf-dump41
 include/mf-runtime.h
 %%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
 %%LIBJAVA%%bin/addr2name.awk41
 %%LIBJAVA%%bin/gcj-dbtool41
 %%LIBJAVA%%bin/gij41
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 8b409004c74f..627e14b4d35e 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050515
+PORTREVISION=	20050522
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -54,8 +54,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make this port build at all.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -104,14 +102,15 @@ INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
 CONFIGURE_ARGS+=	--disable-libgcj
 PLIST_SUB+=	LIBJAVA="@comment "
 .else
-EXTRA_LIBS+=	libffi libgcj libgij
 PLIST_SUB+=	LIBJAVA=""
+EXTRA_LIBS+=	libffi libgcj libgij
 .endif
 
 .if defined(WITH_FORTRAN)
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
+EXTRA_LIBS+=	libgfortran libgfortranbegin
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
@@ -139,7 +138,12 @@ post-build:
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
-post-install: fake-manpages
+post-install:
+	# man pages can only be generated if Perl >= 5.6 is installed;
+	# fake them otherwise.
+	for mp in ${_MANPAGES}; do \
+	  ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
+	done
 .for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
@@ -179,10 +183,3 @@ cklatest:
 .endfor
 
 .include <bsd.port.post.mk>
-
-fake-manpages:
-	# man pages can only be generated if Perl >= 5.6 is installed, so
-	# fake them on 4.x systems.
-.for mp in ${_MANPAGES}
-	( ${TEST} -e ${mp} || ${TOUCH} ${TOUCH_FLAGS} ${mp} )
-.endfor
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 08c3b1ada53f..d5590b849d38 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c
-SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648
-MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335
-SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927
-MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba
-SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003
-MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b
-SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869
-MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778
-SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128
-MD5 (gcc-fortran-4.1-20050515.tar.bz2) = c996383615c6953e83187b32da503154
-SIZE (gcc-fortran-4.1-20050515.tar.bz2) = 581030
+MD5 (gcc-core-4.1-20050522.tar.bz2) = 3c3e0aeb92ab4eb9c92e8f84edc8bc7c
+SIZE (gcc-core-4.1-20050522.tar.bz2) = 13679890
+MD5 (gcc-g++-4.1-20050522.tar.bz2) = 968a6ac49ce6d8fd68b7ac1bf01f22ea
+SIZE (gcc-g++-4.1-20050522.tar.bz2) = 2712258
+MD5 (gcc-java-4.1-20050522.tar.bz2) = 7a330e745d97f1f21f7751c5345affff
+SIZE (gcc-java-4.1-20050522.tar.bz2) = 6006413
+MD5 (gcc-objc-4.1-20050522.tar.bz2) = 3e38998401ad56354e91128780c906dd
+SIZE (gcc-objc-4.1-20050522.tar.bz2) = 183996
+MD5 (gcc-testsuite-4.1-20050522.tar.bz2) = 7392c41c8e1e50bbed78986ac2c6c0e7
+SIZE (gcc-testsuite-4.1-20050522.tar.bz2) = 3093321
+MD5 (gcc-fortran-4.1-20050522.tar.bz2) = dba6fd407588ff974af406fe9d4a9d42
+SIZE (gcc-fortran-4.1-20050522.tar.bz2) = 581680
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index b4b20b8f79ed..aacb48a27cda 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -20,10 +20,6 @@ bin/jv-scan41
 bin/jcf-dump41
 include/mf-runtime.h
 %%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
 %%LIBJAVA%%bin/addr2name.awk41
 %%LIBJAVA%%bin/gcj-dbtool41
 %%LIBJAVA%%bin/gij41
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 8b409004c74f..627e14b4d35e 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050515
+PORTREVISION=	20050522
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -54,8 +54,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make this port build at all.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -104,14 +102,15 @@ INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
 CONFIGURE_ARGS+=	--disable-libgcj
 PLIST_SUB+=	LIBJAVA="@comment "
 .else
-EXTRA_LIBS+=	libffi libgcj libgij
 PLIST_SUB+=	LIBJAVA=""
+EXTRA_LIBS+=	libffi libgcj libgij
 .endif
 
 .if defined(WITH_FORTRAN)
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
+EXTRA_LIBS+=	libgfortran libgfortranbegin
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
@@ -139,7 +138,12 @@ post-build:
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
-post-install: fake-manpages
+post-install:
+	# man pages can only be generated if Perl >= 5.6 is installed;
+	# fake them otherwise.
+	for mp in ${_MANPAGES}; do \
+	  ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
+	done
 .for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
@@ -179,10 +183,3 @@ cklatest:
 .endfor
 
 .include <bsd.port.post.mk>
-
-fake-manpages:
-	# man pages can only be generated if Perl >= 5.6 is installed, so
-	# fake them on 4.x systems.
-.for mp in ${_MANPAGES}
-	( ${TEST} -e ${mp} || ${TOUCH} ${TOUCH_FLAGS} ${mp} )
-.endfor
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 08c3b1ada53f..d5590b849d38 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c
-SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648
-MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335
-SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927
-MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba
-SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003
-MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b
-SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869
-MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778
-SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128
-MD5 (gcc-fortran-4.1-20050515.tar.bz2) = c996383615c6953e83187b32da503154
-SIZE (gcc-fortran-4.1-20050515.tar.bz2) = 581030
+MD5 (gcc-core-4.1-20050522.tar.bz2) = 3c3e0aeb92ab4eb9c92e8f84edc8bc7c
+SIZE (gcc-core-4.1-20050522.tar.bz2) = 13679890
+MD5 (gcc-g++-4.1-20050522.tar.bz2) = 968a6ac49ce6d8fd68b7ac1bf01f22ea
+SIZE (gcc-g++-4.1-20050522.tar.bz2) = 2712258
+MD5 (gcc-java-4.1-20050522.tar.bz2) = 7a330e745d97f1f21f7751c5345affff
+SIZE (gcc-java-4.1-20050522.tar.bz2) = 6006413
+MD5 (gcc-objc-4.1-20050522.tar.bz2) = 3e38998401ad56354e91128780c906dd
+SIZE (gcc-objc-4.1-20050522.tar.bz2) = 183996
+MD5 (gcc-testsuite-4.1-20050522.tar.bz2) = 7392c41c8e1e50bbed78986ac2c6c0e7
+SIZE (gcc-testsuite-4.1-20050522.tar.bz2) = 3093321
+MD5 (gcc-fortran-4.1-20050522.tar.bz2) = dba6fd407588ff974af406fe9d4a9d42
+SIZE (gcc-fortran-4.1-20050522.tar.bz2) = 581680
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index b4b20b8f79ed..aacb48a27cda 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -20,10 +20,6 @@ bin/jv-scan41
 bin/jcf-dump41
 include/mf-runtime.h
 %%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
 %%LIBJAVA%%bin/addr2name.awk41
 %%LIBJAVA%%bin/gcj-dbtool41
 %%LIBJAVA%%bin/gij41
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 8b409004c74f..627e14b4d35e 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050515
+PORTREVISION=	20050522
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -54,8 +54,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make this port build at all.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -104,14 +102,15 @@ INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
 CONFIGURE_ARGS+=	--disable-libgcj
 PLIST_SUB+=	LIBJAVA="@comment "
 .else
-EXTRA_LIBS+=	libffi libgcj libgij
 PLIST_SUB+=	LIBJAVA=""
+EXTRA_LIBS+=	libffi libgcj libgij
 .endif
 
 .if defined(WITH_FORTRAN)
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
+EXTRA_LIBS+=	libgfortran libgfortranbegin
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
@@ -139,7 +138,12 @@ post-build:
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
-post-install: fake-manpages
+post-install:
+	# man pages can only be generated if Perl >= 5.6 is installed;
+	# fake them otherwise.
+	for mp in ${_MANPAGES}; do \
+	  ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
+	done
 .for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
@@ -179,10 +183,3 @@ cklatest:
 .endfor
 
 .include <bsd.port.post.mk>
-
-fake-manpages:
-	# man pages can only be generated if Perl >= 5.6 is installed, so
-	# fake them on 4.x systems.
-.for mp in ${_MANPAGES}
-	( ${TEST} -e ${mp} || ${TOUCH} ${TOUCH_FLAGS} ${mp} )
-.endfor
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 08c3b1ada53f..d5590b849d38 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c
-SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648
-MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335
-SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927
-MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba
-SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003
-MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b
-SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869
-MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778
-SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128
-MD5 (gcc-fortran-4.1-20050515.tar.bz2) = c996383615c6953e83187b32da503154
-SIZE (gcc-fortran-4.1-20050515.tar.bz2) = 581030
+MD5 (gcc-core-4.1-20050522.tar.bz2) = 3c3e0aeb92ab4eb9c92e8f84edc8bc7c
+SIZE (gcc-core-4.1-20050522.tar.bz2) = 13679890
+MD5 (gcc-g++-4.1-20050522.tar.bz2) = 968a6ac49ce6d8fd68b7ac1bf01f22ea
+SIZE (gcc-g++-4.1-20050522.tar.bz2) = 2712258
+MD5 (gcc-java-4.1-20050522.tar.bz2) = 7a330e745d97f1f21f7751c5345affff
+SIZE (gcc-java-4.1-20050522.tar.bz2) = 6006413
+MD5 (gcc-objc-4.1-20050522.tar.bz2) = 3e38998401ad56354e91128780c906dd
+SIZE (gcc-objc-4.1-20050522.tar.bz2) = 183996
+MD5 (gcc-testsuite-4.1-20050522.tar.bz2) = 7392c41c8e1e50bbed78986ac2c6c0e7
+SIZE (gcc-testsuite-4.1-20050522.tar.bz2) = 3093321
+MD5 (gcc-fortran-4.1-20050522.tar.bz2) = dba6fd407588ff974af406fe9d4a9d42
+SIZE (gcc-fortran-4.1-20050522.tar.bz2) = 581680
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index b4b20b8f79ed..aacb48a27cda 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -20,10 +20,6 @@ bin/jv-scan41
 bin/jcf-dump41
 include/mf-runtime.h
 %%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
 %%LIBJAVA%%bin/addr2name.awk41
 %%LIBJAVA%%bin/gcj-dbtool41
 %%LIBJAVA%%bin/gij41
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 8b409004c74f..627e14b4d35e 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050515
+PORTREVISION=	20050522
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -54,8 +54,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make this port build at all.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -104,14 +102,15 @@ INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
 CONFIGURE_ARGS+=	--disable-libgcj
 PLIST_SUB+=	LIBJAVA="@comment "
 .else
-EXTRA_LIBS+=	libffi libgcj libgij
 PLIST_SUB+=	LIBJAVA=""
+EXTRA_LIBS+=	libffi libgcj libgij
 .endif
 
 .if defined(WITH_FORTRAN)
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
+EXTRA_LIBS+=	libgfortran libgfortranbegin
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
@@ -139,7 +138,12 @@ post-build:
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
-post-install: fake-manpages
+post-install:
+	# man pages can only be generated if Perl >= 5.6 is installed;
+	# fake them otherwise.
+	for mp in ${_MANPAGES}; do \
+	  ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
+	done
 .for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
@@ -179,10 +183,3 @@ cklatest:
 .endfor
 
 .include <bsd.port.post.mk>
-
-fake-manpages:
-	# man pages can only be generated if Perl >= 5.6 is installed, so
-	# fake them on 4.x systems.
-.for mp in ${_MANPAGES}
-	( ${TEST} -e ${mp} || ${TOUCH} ${TOUCH_FLAGS} ${mp} )
-.endfor
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 08c3b1ada53f..d5590b849d38 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c
-SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648
-MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335
-SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927
-MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba
-SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003
-MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b
-SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869
-MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778
-SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128
-MD5 (gcc-fortran-4.1-20050515.tar.bz2) = c996383615c6953e83187b32da503154
-SIZE (gcc-fortran-4.1-20050515.tar.bz2) = 581030
+MD5 (gcc-core-4.1-20050522.tar.bz2) = 3c3e0aeb92ab4eb9c92e8f84edc8bc7c
+SIZE (gcc-core-4.1-20050522.tar.bz2) = 13679890
+MD5 (gcc-g++-4.1-20050522.tar.bz2) = 968a6ac49ce6d8fd68b7ac1bf01f22ea
+SIZE (gcc-g++-4.1-20050522.tar.bz2) = 2712258
+MD5 (gcc-java-4.1-20050522.tar.bz2) = 7a330e745d97f1f21f7751c5345affff
+SIZE (gcc-java-4.1-20050522.tar.bz2) = 6006413
+MD5 (gcc-objc-4.1-20050522.tar.bz2) = 3e38998401ad56354e91128780c906dd
+SIZE (gcc-objc-4.1-20050522.tar.bz2) = 183996
+MD5 (gcc-testsuite-4.1-20050522.tar.bz2) = 7392c41c8e1e50bbed78986ac2c6c0e7
+SIZE (gcc-testsuite-4.1-20050522.tar.bz2) = 3093321
+MD5 (gcc-fortran-4.1-20050522.tar.bz2) = dba6fd407588ff974af406fe9d4a9d42
+SIZE (gcc-fortran-4.1-20050522.tar.bz2) = 581680
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index b4b20b8f79ed..aacb48a27cda 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -20,10 +20,6 @@ bin/jv-scan41
 bin/jcf-dump41
 include/mf-runtime.h
 %%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
 %%LIBJAVA%%bin/addr2name.awk41
 %%LIBJAVA%%bin/gcj-dbtool41
 %%LIBJAVA%%bin/gij41
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 8b409004c74f..627e14b4d35e 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050515
+PORTREVISION=	20050522
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -54,8 +54,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make this port build at all.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -104,14 +102,15 @@ INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
 CONFIGURE_ARGS+=	--disable-libgcj
 PLIST_SUB+=	LIBJAVA="@comment "
 .else
-EXTRA_LIBS+=	libffi libgcj libgij
 PLIST_SUB+=	LIBJAVA=""
+EXTRA_LIBS+=	libffi libgcj libgij
 .endif
 
 .if defined(WITH_FORTRAN)
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
+EXTRA_LIBS+=	libgfortran libgfortranbegin
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
@@ -139,7 +138,12 @@ post-build:
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
-post-install: fake-manpages
+post-install:
+	# man pages can only be generated if Perl >= 5.6 is installed;
+	# fake them otherwise.
+	for mp in ${_MANPAGES}; do \
+	  ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
+	done
 .for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
@@ -179,10 +183,3 @@ cklatest:
 .endfor
 
 .include <bsd.port.post.mk>
-
-fake-manpages:
-	# man pages can only be generated if Perl >= 5.6 is installed, so
-	# fake them on 4.x systems.
-.for mp in ${_MANPAGES}
-	( ${TEST} -e ${mp} || ${TOUCH} ${TOUCH_FLAGS} ${mp} )
-.endfor
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 08c3b1ada53f..d5590b849d38 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c
-SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648
-MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335
-SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927
-MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba
-SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003
-MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b
-SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869
-MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778
-SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128
-MD5 (gcc-fortran-4.1-20050515.tar.bz2) = c996383615c6953e83187b32da503154
-SIZE (gcc-fortran-4.1-20050515.tar.bz2) = 581030
+MD5 (gcc-core-4.1-20050522.tar.bz2) = 3c3e0aeb92ab4eb9c92e8f84edc8bc7c
+SIZE (gcc-core-4.1-20050522.tar.bz2) = 13679890
+MD5 (gcc-g++-4.1-20050522.tar.bz2) = 968a6ac49ce6d8fd68b7ac1bf01f22ea
+SIZE (gcc-g++-4.1-20050522.tar.bz2) = 2712258
+MD5 (gcc-java-4.1-20050522.tar.bz2) = 7a330e745d97f1f21f7751c5345affff
+SIZE (gcc-java-4.1-20050522.tar.bz2) = 6006413
+MD5 (gcc-objc-4.1-20050522.tar.bz2) = 3e38998401ad56354e91128780c906dd
+SIZE (gcc-objc-4.1-20050522.tar.bz2) = 183996
+MD5 (gcc-testsuite-4.1-20050522.tar.bz2) = 7392c41c8e1e50bbed78986ac2c6c0e7
+SIZE (gcc-testsuite-4.1-20050522.tar.bz2) = 3093321
+MD5 (gcc-fortran-4.1-20050522.tar.bz2) = dba6fd407588ff974af406fe9d4a9d42
+SIZE (gcc-fortran-4.1-20050522.tar.bz2) = 581680
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index b4b20b8f79ed..aacb48a27cda 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -20,10 +20,6 @@ bin/jv-scan41
 bin/jcf-dump41
 include/mf-runtime.h
 %%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
 %%LIBJAVA%%bin/addr2name.awk41
 %%LIBJAVA%%bin/gcj-dbtool41
 %%LIBJAVA%%bin/gij41
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 8b409004c74f..627e14b4d35e 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050515
+PORTREVISION=	20050522
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -54,8 +54,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make this port build at all.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -104,14 +102,15 @@ INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
 CONFIGURE_ARGS+=	--disable-libgcj
 PLIST_SUB+=	LIBJAVA="@comment "
 .else
-EXTRA_LIBS+=	libffi libgcj libgij
 PLIST_SUB+=	LIBJAVA=""
+EXTRA_LIBS+=	libffi libgcj libgij
 .endif
 
 .if defined(WITH_FORTRAN)
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
+EXTRA_LIBS+=	libgfortran libgfortranbegin
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
@@ -139,7 +138,12 @@ post-build:
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
-post-install: fake-manpages
+post-install:
+	# man pages can only be generated if Perl >= 5.6 is installed;
+	# fake them otherwise.
+	for mp in ${_MANPAGES}; do \
+	  ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
+	done
 .for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
@@ -179,10 +183,3 @@ cklatest:
 .endfor
 
 .include <bsd.port.post.mk>
-
-fake-manpages:
-	# man pages can only be generated if Perl >= 5.6 is installed, so
-	# fake them on 4.x systems.
-.for mp in ${_MANPAGES}
-	( ${TEST} -e ${mp} || ${TOUCH} ${TOUCH_FLAGS} ${mp} )
-.endfor
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 08c3b1ada53f..d5590b849d38 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c
-SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648
-MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335
-SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927
-MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba
-SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003
-MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b
-SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869
-MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778
-SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128
-MD5 (gcc-fortran-4.1-20050515.tar.bz2) = c996383615c6953e83187b32da503154
-SIZE (gcc-fortran-4.1-20050515.tar.bz2) = 581030
+MD5 (gcc-core-4.1-20050522.tar.bz2) = 3c3e0aeb92ab4eb9c92e8f84edc8bc7c
+SIZE (gcc-core-4.1-20050522.tar.bz2) = 13679890
+MD5 (gcc-g++-4.1-20050522.tar.bz2) = 968a6ac49ce6d8fd68b7ac1bf01f22ea
+SIZE (gcc-g++-4.1-20050522.tar.bz2) = 2712258
+MD5 (gcc-java-4.1-20050522.tar.bz2) = 7a330e745d97f1f21f7751c5345affff
+SIZE (gcc-java-4.1-20050522.tar.bz2) = 6006413
+MD5 (gcc-objc-4.1-20050522.tar.bz2) = 3e38998401ad56354e91128780c906dd
+SIZE (gcc-objc-4.1-20050522.tar.bz2) = 183996
+MD5 (gcc-testsuite-4.1-20050522.tar.bz2) = 7392c41c8e1e50bbed78986ac2c6c0e7
+SIZE (gcc-testsuite-4.1-20050522.tar.bz2) = 3093321
+MD5 (gcc-fortran-4.1-20050522.tar.bz2) = dba6fd407588ff974af406fe9d4a9d42
+SIZE (gcc-fortran-4.1-20050522.tar.bz2) = 581680
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index b4b20b8f79ed..aacb48a27cda 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -20,10 +20,6 @@ bin/jv-scan41
 bin/jcf-dump41
 include/mf-runtime.h
 %%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
 %%LIBJAVA%%bin/addr2name.awk41
 %%LIBJAVA%%bin/gcj-dbtool41
 %%LIBJAVA%%bin/gij41
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 8b409004c74f..627e14b4d35e 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050515
+PORTREVISION=	20050522
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -54,8 +54,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
-# FIXME: needed to make this port build at all.
-WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -104,14 +102,15 @@ INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
 CONFIGURE_ARGS+=	--disable-libgcj
 PLIST_SUB+=	LIBJAVA="@comment "
 .else
-EXTRA_LIBS+=	libffi libgcj libgij
 PLIST_SUB+=	LIBJAVA=""
+EXTRA_LIBS+=	libffi libgcj libgij
 .endif
 
 .if defined(WITH_FORTRAN)
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
+EXTRA_LIBS+=	libgfortran libgfortranbegin
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
@@ -139,7 +138,12 @@ post-build:
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
-post-install: fake-manpages
+post-install:
+	# man pages can only be generated if Perl >= 5.6 is installed;
+	# fake them otherwise.
+	for mp in ${_MANPAGES}; do \
+	  ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
+	done
 .for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
@@ -179,10 +183,3 @@ cklatest:
 .endfor
 
 .include <bsd.port.post.mk>
-
-fake-manpages:
-	# man pages can only be generated if Perl >= 5.6 is installed, so
-	# fake them on 4.x systems.
-.for mp in ${_MANPAGES}
-	( ${TEST} -e ${mp} || ${TOUCH} ${TOUCH_FLAGS} ${mp} )
-.endfor
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 08c3b1ada53f..d5590b849d38 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c
-SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648
-MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335
-SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927
-MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba
-SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003
-MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b
-SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869
-MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778
-SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128
-MD5 (gcc-fortran-4.1-20050515.tar.bz2) = c996383615c6953e83187b32da503154
-SIZE (gcc-fortran-4.1-20050515.tar.bz2) = 581030
+MD5 (gcc-core-4.1-20050522.tar.bz2) = 3c3e0aeb92ab4eb9c92e8f84edc8bc7c
+SIZE (gcc-core-4.1-20050522.tar.bz2) = 13679890
+MD5 (gcc-g++-4.1-20050522.tar.bz2) = 968a6ac49ce6d8fd68b7ac1bf01f22ea
+SIZE (gcc-g++-4.1-20050522.tar.bz2) = 2712258
+MD5 (gcc-java-4.1-20050522.tar.bz2) = 7a330e745d97f1f21f7751c5345affff
+SIZE (gcc-java-4.1-20050522.tar.bz2) = 6006413
+MD5 (gcc-objc-4.1-20050522.tar.bz2) = 3e38998401ad56354e91128780c906dd
+SIZE (gcc-objc-4.1-20050522.tar.bz2) = 183996
+MD5 (gcc-testsuite-4.1-20050522.tar.bz2) = 7392c41c8e1e50bbed78986ac2c6c0e7
+SIZE (gcc-testsuite-4.1-20050522.tar.bz2) = 3093321
+MD5 (gcc-fortran-4.1-20050522.tar.bz2) = dba6fd407588ff974af406fe9d4a9d42
+SIZE (gcc-fortran-4.1-20050522.tar.bz2) = 581680
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index b4b20b8f79ed..aacb48a27cda 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -20,10 +20,6 @@ bin/jv-scan41
 bin/jcf-dump41
 include/mf-runtime.h
 %%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
 %%LIBJAVA%%bin/addr2name.awk41
 %%LIBJAVA%%bin/gcj-dbtool41
 %%LIBJAVA%%bin/gij41