From ba08e90baf832e385a67581bf47cc2ceac7dcc16 Mon Sep 17 00:00:00 2001
From: gerald <gerald@FreeBSD.org>
Date: Sun, 14 Jan 2007 11:52:45 +0000
Subject: Move lang/gfortran from using lang/gcc41 to lang/gcc42 as its master
 port. The next step will be to abandon this port in favor of lang/gcc42.

---
 lang/gcc41/Makefile    | 2 --
 lang/gcc42/Makefile    | 2 ++
 lang/gfortran/Makefile | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lang')

diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index c5a8c81..86aa257 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -29,8 +29,6 @@ LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
 .endif
 
-CONFLICTS?=	gcc-withfortran-4.1.*
-
 SUFFIX=		41
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 651e8ee..af32b4c 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -28,6 +28,8 @@ LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
 .endif
 
+CONFLICTS?=	gcc-withfortran-4.2.*
+
 SUFFIX=		42
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
diff --git a/lang/gfortran/Makefile b/lang/gfortran/Makefile
index 93b342f..c813660 100644
--- a/lang/gfortran/Makefile
+++ b/lang/gfortran/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-MASTERDIR=	${.CURDIR}/../gcc41
+MASTERDIR=	${.CURDIR}/../gcc42
 WITH_FORTRAN=	yes
 PKGNAMESUFFIX=	-withfortran
 
@@ -15,6 +15,6 @@ MAINTAINER=	gerald@FreeBSD.org
 DESCR=	${.CURDIR}/pkg-descr
 PKGMESSAGE=	${.CURDIR}/pkg-message
 
-CONFLICTS=	gcc-4.1.*
+CONFLICTS=	gcc-4.2.*
 
 .include "${MASTERDIR}/Makefile"
-- 
cgit v1.1