diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index a2c8ab1c816f..95f1f71092e2 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -8,12 +8,13 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20061226
+PORTREVISION=	20070102
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
+		gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
@@ -21,10 +22,8 @@ DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.2
 
-.if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
-.endif
 .if defined(WITH_JAVA_AWT)
 LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
 .endif
@@ -72,6 +71,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
+		--with-gmp=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
@@ -88,22 +88,14 @@ PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
-		gcov${SUFFIX}.1
+		gcov${SUFFIX}.1 \
+		gfortran${SUFFIX}.1
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
-		gcc${SUFFIX}/gccint
-
-.if defined(WITH_FORTRAN)
-DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
-CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
-MAN1+=		gfortran${SUFFIX}.1
-INFO+=		gcc${SUFFIX}/gfortran
-PLIST_SUB+=	FORTRAN=""
-.else
-PLIST_SUB+=	FORTRAN="@comment "
-.endif
+		gcc${SUFFIX}/gccint \
+		gcc${SUFFIX}/gfortran
 
 .if ! defined(WITHOUT_JAVA)
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 1c8e4f376b66..48ed1526ccad 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20061226.tar.bz2) = f7df0506a0a3e7bafc9c451c59dd6348
-SHA256 (gcc-core-4.2-20061226.tar.bz2) = b13bbd8061f0c32c677ba116d1f707110c66a7a25c8f2981e7dcc1e48397a57b
-SIZE (gcc-core-4.2-20061226.tar.bz2) = 15929310
-MD5 (gcc-g++-4.2-20061226.tar.bz2) = eb19f261c9b6f4eb6e885583d01aa9e8
-SHA256 (gcc-g++-4.2-20061226.tar.bz2) = fe0c5b8725b84fa02fce6fb1cff7abdd2bdd68b877ed4f2c744c020814a03b4f
-SIZE (gcc-g++-4.2-20061226.tar.bz2) = 4814823
-MD5 (gcc-objc-4.2-20061226.tar.bz2) = 642bc17e69f73fb94385bbb370966c09
-SHA256 (gcc-objc-4.2-20061226.tar.bz2) = a60cd306b38c8eed44257571f2b8c53adf9ebb971476a31878370864106357b7
-SIZE (gcc-objc-4.2-20061226.tar.bz2) = 191802
-MD5 (gcc-testsuite-4.2-20061226.tar.bz2) = 16588401727e3e908bd57bfdff3fe0bc
-SHA256 (gcc-testsuite-4.2-20061226.tar.bz2) = 82af68301a1e1583cf08383f9c3ab177bf98683944e7ea15f2f38f3af95d901b
-SIZE (gcc-testsuite-4.2-20061226.tar.bz2) = 3788311
-MD5 (gcc-fortran-4.2-20061226.tar.bz2) = 8f6b48a5d3cd76e9e120006c23edf2e5
-SHA256 (gcc-fortran-4.2-20061226.tar.bz2) = 640d7131929db3169962ff4f8d4b77fc3c373df132081e005110bd15199c76e3
-SIZE (gcc-fortran-4.2-20061226.tar.bz2) = 877732
-MD5 (gcc-java-4.2-20061226.tar.bz2) = eddc04cf0eb163c1a837a8c44d0ca3c8
-SHA256 (gcc-java-4.2-20061226.tar.bz2) = 1176a3323290c6137d415721917a878e8ef2244f5f3ee2eda23b82b66c03fa28
-SIZE (gcc-java-4.2-20061226.tar.bz2) = 10471909
+MD5 (gcc-core-4.2-20070102.tar.bz2) = 1dffdfd760d0945437ac8de854d23635
+SHA256 (gcc-core-4.2-20070102.tar.bz2) = 95c84bb4abfdc4d0ed197ddb7a86d187125a1775cd8df8092bc38938ff9ab4b5
+SIZE (gcc-core-4.2-20070102.tar.bz2) = 15925271
+MD5 (gcc-g++-4.2-20070102.tar.bz2) = d4b3e49eb933454c9749e84c89cfe376
+SHA256 (gcc-g++-4.2-20070102.tar.bz2) = 25c5bf95b8ec3b2fe96c304d316f1adb752d2a396712cc2468c64dd77353f73a
+SIZE (gcc-g++-4.2-20070102.tar.bz2) = 4814298
+MD5 (gcc-objc-4.2-20070102.tar.bz2) = d61c23c475cdca868c436908a776e41f
+SHA256 (gcc-objc-4.2-20070102.tar.bz2) = 20c545f169fca5da95a9627a02a433f75972797d05224044ff253c228f91f4d1
+SIZE (gcc-objc-4.2-20070102.tar.bz2) = 191815
+MD5 (gcc-testsuite-4.2-20070102.tar.bz2) = 0a091113e30b8ce877f9d54dbc6bcf5c
+SHA256 (gcc-testsuite-4.2-20070102.tar.bz2) = c3527eec718447c1e8cbf04bebc0ba473bebbcd79cec5c64476b7b56df93d276
+SIZE (gcc-testsuite-4.2-20070102.tar.bz2) = 3794191
+MD5 (gcc-fortran-4.2-20070102.tar.bz2) = ef15ffa51eac002e7e0d9ecb60000a98
+SHA256 (gcc-fortran-4.2-20070102.tar.bz2) = 83bf529804580960f0a1d2675079c2f30241446e56dacd5ded8b72b3b82da51b
+SIZE (gcc-fortran-4.2-20070102.tar.bz2) = 878904
+MD5 (gcc-java-4.2-20070102.tar.bz2) = 67ca65092fe6edf294ff989d794fd09c
+SHA256 (gcc-java-4.2-20070102.tar.bz2) = cdfbd4e5facb347707f034d5cae8d559a561bec6446a85623cda2a45d09f247d
+SIZE (gcc-java-4.2-20070102.tar.bz2) = 10472580
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index f4209b2a688a..0b77986a4312 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -5,13 +5,13 @@ bin/g++%%SUFFIX%%
 bin/gcc%%SUFFIX%%
 bin/gccbug%%SUFFIX%%
 bin/gcov%%SUFFIX%%
+bin/gfortran%%SUFFIX%%
 bin/%%GNU_HOST%%-c++%%SUFFIX%%
 bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
+bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 info/gcc%%SUFFIX%%/dir
-%%FORTRAN%%bin/gfortran%%SUFFIX%%
-%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%