svn commit: r441905 - in head/lang: gcc5 gcc5-devel

[Gerald Pfeifer]

Author: gerald
Date: Sun May 28 09:31:40 2017
New Revision: 441905
URL: https://svnweb.freebsd.org/changeset/ports/441905

Log:
  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.

Modified:
  head/lang/gcc5-devel/Makefile
  head/lang/gcc5/Makefile

Modified: head/lang/gcc5-devel/Makefile
==============================================================================
--- head/lang/gcc5-devel/Makefile	Sun May 28 09:15:53 2017	(r441904)
+++ head/lang/gcc5-devel/Makefile	Sun May 28 09:31:40 2017	(r441905)
@@ -24,7 +24,7 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
-CONFLICTS=	gcc-5.*
+CONFLICTS=	gcc5-5.*
 CPE_VENDOR=	gnu
 CPE_VERSION=	${GCC_VERSION}
 

Modified: head/lang/gcc5/Makefile
==============================================================================
--- head/lang/gcc5/Makefile	Sun May 28 09:15:53 2017	(r441904)
+++ head/lang/gcc5/Makefile	Sun May 28 09:31:40 2017	(r441905)
@@ -24,7 +24,7 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
-CONFLICTS=	gcc-5.*
+CONFLICTS=	gcc5-devel-5.*
 CPE_VENDOR=	gnu
 
 GCC_VERSION=	${PORTVERSION}