diff -urN gnat-gcc42.old/Makefile gnat-gcc42/Makefile
--- gnat-gcc42.old/Makefile	Mon Jul 23 11:36:05 2007
+++ gnat-gcc42/Makefile	Thu Aug 30 06:23:02 2007
@@ -1,17 +1,18 @@
 # ex:ts=8
 #
-# Ports collection makefile for:   gnat-gcc
-# Date created:         9 Jul 2006
-# Whom:                 Karel Miklav <karel@lovetemple.net>
+# Ports collection makefile for: gnat-gcc
+# Date created:		9 Jul 2006
+# Whom:			Karel Miklav <karel@lovetemple.net>
 #
 # $FreeBSD: ports/lang/gnat-gcc42/Makefile,v 1.10 2007/07/23 09:36:05 rafan Exp $
 #
 
 PORTNAME=		gnat-gcc
-PORTVERSION=		4.2.0
+PORTVERSION=		4.2.2
 CATEGORIES=		lang
 MASTER_SITES=		GCC/snapshots/${versionstring} \
-			CENKES:boot http://lovetemple.net/data/:boot
+			CENKES:boot \
+			http://lovetemple.net/data/:boot
 DISTFILES=		gcc-core-${versionstring}${EXTRACT_SUFX} \
 			gcc-ada-${versionstring}${EXTRACT_SUFX} \
 			gcc-testsuite-${versionstring}${EXTRACT_SUFX} \
@@ -50,7 +51,11 @@
 
 .include <bsd.port.pre.mk>
 
-gcc_snapshot=		20070307
+.if ${OSVERSION} >= 700042
+BROKEN=			Broken with gcc 4.2
+.endif
+
+gcc_snapshot=		20070822
 versionstring=		${PORTVERSION:C/\.[0-9]*$//}-${gcc_snapshot}
 srcdir=			${WRKDIR}/gcc-${versionstring}
 gcc_suffix=		42
@@ -59,6 +64,7 @@
 targlib=		${PREFIX}/lib/gcc-${PORTVERSION}
 gcc_link=		${PREFIX}/bin/gcc${gcc_suffix}/gcc
 boot_stamp=		${ARCH}-freebsd-${OSREL:C/\.[0-9.]*//}
+check_target=		check # XXX
 
 PATCH_WRKSRC=		${srcdir}
 
diff -urN gnat-gcc42.old/distinfo gnat-gcc42/distinfo
--- gnat-gcc42.old/distinfo	Thu May  3 20:11:29 2007
+++ gnat-gcc42/distinfo	Thu Aug 30 06:24:04 2007
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.2-20070307.tar.bz2) = a142c5c2b46d2d6cdff8a06df4a31c63
-SHA256 (gcc-core-4.2-20070307.tar.bz2) = 0fb6dca2ab41cc9b41984f3c6d81d6241e93126f9f96c26ce13f9db4cd423bc8
-SIZE (gcc-core-4.2-20070307.tar.bz2) = 15957365
-MD5 (gcc-ada-4.2-20070307.tar.bz2) = 0d543d218d6d6cf13d8dfb0ca125bb1d
-SHA256 (gcc-ada-4.2-20070307.tar.bz2) = 19331f2614d251fe902f636385d86f4e4170ff8c72a1229c896d4e444ad5c67e
-SIZE (gcc-ada-4.2-20070307.tar.bz2) = 4748161
-MD5 (gcc-testsuite-4.2-20070307.tar.bz2) = 11d7aca1995fe9e8c5277ed6a50483ec
-SHA256 (gcc-testsuite-4.2-20070307.tar.bz2) = 8dee29d5143442582a37be771f07033f6a7448bb303f0c594ea8484a09f522ed
-SIZE (gcc-testsuite-4.2-20070307.tar.bz2) = 3836944
+MD5 (gcc-core-4.2-20070822.tar.bz2) = f60f35a7c60f3853da315e0135376a11
+SHA256 (gcc-core-4.2-20070822.tar.bz2) = 1d09a5fd64ec339b8bc016ef9bf4eb7e1cdcd91e6c0821fa6e4cac6fdcbc81ce
+SIZE (gcc-core-4.2-20070822.tar.bz2) = 16401201
+MD5 (gcc-ada-4.2-20070822.tar.bz2) = 99f802aad36ffde6707eb3653431713b
+SHA256 (gcc-ada-4.2-20070822.tar.bz2) = 99bfe203a02e8999beb2401ce7ac5c086b0f952769b8059742e8025dd03b68f0
+SIZE (gcc-ada-4.2-20070822.tar.bz2) = 4748087
+MD5 (gcc-testsuite-4.2-20070822.tar.bz2) = 7d158cd501039eedb20ada0a3e0c4879
+SHA256 (gcc-testsuite-4.2-20070822.tar.bz2) = 85fbaf62303b3566c3bb8b0fac44d4cd1638cae891ec06221bafa350312f7ebe
+SIZE (gcc-testsuite-4.2-20070822.tar.bz2) = 3871944
 MD5 (gnat-gcc41-boot-i386-freebsd-4.tbz) = a9848cbeb6a0dca57cbe312e1546b79e
 SIZE (gnat-gcc41-boot-i386-freebsd-4.tbz) = 11508394
 MD5 (gnat-gcc41-boot-i386-freebsd-5.tbz) = e439eaefcafdf6056896a16a89671a9e