Index: lang/gcc42/Makefile
===================================================================
--- lang/gcc42/Makefile	(revision 326283)
+++ lang/gcc42/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.5.20090325
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -23,11 +23,10 @@ VERSIONSTRING=	${PORTVERSION:C/([0-9]+\.
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	arm powerpc
-USES=		bison iconv
+USES=		bison gmake iconv perl5
 USE_BZIP2=	yes
-USE_GCC=	any
-USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
+USE_CSTD=	gnu89
+USE_PERL5=	build
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
Index: lang/gcc44/Makefile
===================================================================
--- lang/gcc44/Makefile	(revision 326283)
+++ lang/gcc44/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.4.7
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -22,11 +23,9 @@ SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 ONLY_FOR_ARCHS=	amd64 i386 sparc64
 USE_BINUTILS=	yes
-USES=		bison iconv
+USES=		bison gmake iconv perl5
 USE_BZIP2=	yes
-USE_GCC=	any
-USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
@@ -44,7 +43,7 @@ WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
-CFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include -fgnu89-inline
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--disable-bootstrap \
 		--disable-nls \