svn commit: r426624 - in head/lang: gcc48 gcc49

[Gerald Pfeifer]

Author: gerald
Date: Sun Nov 20 20:34:38 2016
New Revision: 426624
URL: https://svnweb.freebsd.org/changeset/ports/426624

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

Modified:
  head/lang/gcc48/Makefile
  head/lang/gcc49/Makefile

Modified: head/lang/gcc48/Makefile
==============================================================================
--- head/lang/gcc48/Makefile	Sun Nov 20 20:25:00 2016	(r426623)
+++ head/lang/gcc48/Makefile	Sun Nov 20 20:34:38 2016	(r426624)
@@ -24,7 +24,6 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
-CONFLICTS=	gcc-4.8.*
 CPE_VENDOR=	gnu
 CPE_VERSION=	${GCC_VERSION}
 

Modified: head/lang/gcc49/Makefile
==============================================================================
--- head/lang/gcc49/Makefile	Sun Nov 20 20:25:00 2016	(r426623)
+++ head/lang/gcc49/Makefile	Sun Nov 20 20:34:38 2016	(r426624)
@@ -23,6 +23,7 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
+CONFLICTS=	gcc-4.9.*
 CPE_VENDOR=	gnu
 CPE_VERSION=	${GCC_VERSION}