GCC3 is gone, we don't need to deal with it any longer; ok sthen@

devel/libf2c/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2012/06/21 13:56:57 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2012/06/21 16:17:40 naddy Exp $
 
 V =		3.3.5
 CONFIG = 	${MACHINE_ARCH}-unknown-openbsd${OSREV}
@@ -33,7 +33,8 @@ MAKE_FLAGS = MANDIR=${TRUEPREFIX}/man/cat \
 	USE_COLLECT2= \
 	LANGUAGES=f77 \
 	LIBDIR=${TRUEPREFIX}/lib \
-	major=${MAJOR} minor=${MINOR}
+	major=${MAJOR} minor=${MINOR} \
+	libf2c_cv_has_g77_builtin_types=yes
 
 post-install:
 	cd ${WRKBUILD}/obj && ${INSTALL_DATA} g2c.h ${PREFIX}/include
@@ -46,6 +47,3 @@ post-install:
 .endfor
 
 .include <bsd.port.mk>
-.if ${COMPILER_VERSION:L:Mgcc4*}
-MAKE_FLAGS += libf2c_cv_has_g77_builtin_types=yes
-.endif

lang/g77/Makefile

@@ -1,11 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2012/06/21 13:56:57 sthen Exp $
-
-.include <bsd.own.mk>
-.  if ${COMPILER_VERSION:L:Mgcc4*}
-SYSV=			4.2.1
-.  else
-SYSV=			3.3.5
-.  endif
+# $OpenBSD: Makefile,v 1.17 2012/06/21 16:17:40 naddy Exp $
 
 NOT_FOR_ARCHS =		${GCC2_ARCHS}
 
@@ -17,6 +10,7 @@ DISTFILES = 		g77-openbsd.tgz
 
 CONFIG = 		${MACHINE_ARCH}-unknown-openbsd${OSREV}
 SUBST_VARS += 		CONFIG V
+SYSV =			4.2.1
 
 COMMENT =		GNU fortran 77 compiler
 CATEGORIES =		lang math
@@ -28,9 +22,6 @@ PERMIT_DISTFILES_FTP =	Yes
 PERMIT_PACKAGE_FTP =	Yes
 
 WRKDIST =		${WRKDIR}/g77
-.if ${COMPILER_VERSION:L:Mgcc4*}
-PATCH_LIST=		gcc4-* patch-*
-.endif
 CONFIGURE_SCRIPT =	${WRKDIST}/gcc/configure
 
 SEPARATE_BUILD = 	Yes

lang/g77/patches/patch-gcc_gcc_c

@@ -1,4 +1,4 @@
-$OpenBSD: gcc4-gcc_gcc_c,v 1.1 2010/05/28 21:28:17 naddy Exp $
+$OpenBSD: patch-gcc_gcc_c,v 1.3 2012/06/21 16:17:40 naddy Exp $
 --- gcc/gcc.c.orig	Sun May 23 12:12:24 2010
 +++ gcc/gcc.c	Sun May 23 12:12:48 2010
 @@ -716,7 +716,6 @@ static const char *cpp_unique_options =