summaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authorgerald <gerald@FreeBSD.org>2007-01-14 11:52:45 +0000
committergerald <gerald@FreeBSD.org>2007-01-14 11:52:45 +0000
commitba08e90baf832e385a67581bf47cc2ceac7dcc16 (patch)
treea559d907cd5a74763706c3e00ba9a809e15861f5 /lang
parent06019034373f130f5cd556482fa4041761ef4602 (diff)
downloadFreeBSD-ports-ba08e90baf832e385a67581bf47cc2ceac7dcc16.zip
FreeBSD-ports-ba08e90baf832e385a67581bf47cc2ceac7dcc16.tar.gz
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.
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc41/Makefile2
-rw-r--r--lang/gcc42/Makefile2
-rw-r--r--lang/gfortran/Makefile4
3 files changed, 4 insertions, 4 deletions
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"
OpenPOWER on IntegriCloud