diff options
| author | gerald <gerald@FreeBSD.org> | 2016-11-21 04:34:38 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2016-11-21 04:34:38 +0800 |
| commit | 58efe710d94c826203f6ffd9c502d1738282079e (patch) | |
| tree | afb845ae95a4c7b8067795b22cf04a5eaf83653a /lang | |
| parent | 1b8fc8f76bb9c0c0d0da70dc97f603f0eb781f24 (diff) | |
| download | freebsd-ports-gnome-58efe710d94c826203f6ffd9c502d1738282079e.tar.gz freebsd-ports-gnome-58efe710d94c826203f6ffd9c502d1738282079e.tar.zst freebsd-ports-gnome-58efe710d94c826203f6ffd9c502d1738282079e.zip | |
Move the conflict with lang/gcc from lang/gcc48 to lang/gcc49 now that
we have updated lang/gcc to the GCC 4.9 series. (The direction from
lang/gcc49 to the respective port already has been addressed.)
PR: 196712
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc48/Makefile | 1 | ||||
| -rw-r--r-- | lang/gcc49/Makefile | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index 6b2baf724802..cb9841191d55 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -24,7 +24,6 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils BUILD_DEPENDS+= runtest:misc/dejagnu .endif -CONFLICTS= gcc-4.8.* CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile index 6071e48924c3..a78a18a81dd7 100644 --- a/lang/gcc49/Makefile +++ b/lang/gcc49/Makefile @@ -23,6 +23,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils BUILD_DEPENDS+= runtest:misc/dejagnu .endif +CONFLICTS= gcc-4.9.* CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} |