From df84a690e2260f9f6601e95049b52be2746fc4fe Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Sun, 28 May 2017 09:31:40 +0000 Subject: [PATCH] Remove CONFLICT with lang/gcc (which now pulls in lang/gcc5 by default). Instead add mutual CONFLICTS between lang/gcc5 and lang/gcc5-devel which we actually missed. --- lang/gcc5-devel/Makefile | 2 +- lang/gcc5/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/gcc5-devel/Makefile b/lang/gcc5-devel/Makefile index 1d2f5896fe00..8d6aa44521c9 100644 --- a/lang/gcc5-devel/Makefile +++ b/lang/gcc5-devel/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils BUILD_DEPENDS+= runtest:misc/dejagnu .endif -CONFLICTS= gcc-5.* +CONFLICTS= gcc5-5.* CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile index 522ab90ee099..f41eae83ca62 100644 --- a/lang/gcc5/Makefile +++ b/lang/gcc5/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils BUILD_DEPENDS+= runtest:misc/dejagnu .endif -CONFLICTS= gcc-5.* +CONFLICTS= gcc5-devel-5.* CPE_VENDOR= gnu GCC_VERSION= ${PORTVERSION}