diff options
| author | gerald <gerald@FreeBSD.org> | 2017-05-28 17:31:40 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2017-05-28 17:31:40 +0800 |
| commit | 2b244947bfc3bdd055cb8325d69de9d8e7bf7166 (patch) | |
| tree | aaf6b14cc934bae29c947d7cca5d829daf830531 /lang | |
| parent | 9a1c2bb3fcef61a1f6d9a9cbdc527e345958ecab (diff) | |
| download | freebsd-ports-gnome-2b244947bfc3bdd055cb8325d69de9d8e7bf7166.tar.gz freebsd-ports-gnome-2b244947bfc3bdd055cb8325d69de9d8e7bf7166.tar.zst freebsd-ports-gnome-2b244947bfc3bdd055cb8325d69de9d8e7bf7166.zip | |
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.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc5-devel/Makefile | 2 | ||||
| -rw-r--r-- | 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} |