svn commit: r490680 - in head/devel: llvm38 llvm40 llvm50 llvm60 llvm70

[Brooks Davis]

Author: brooks
Date: Fri Jan 18 22:57:33 2019
New Revision: 490680
URL: https://svnweb.freebsd.org/changeset/ports/490680

Log:
  Remove obsolete conflicts entries referencing clang-devel.

Modified:
  head/devel/llvm38/Makefile
  head/devel/llvm40/Makefile
  head/devel/llvm50/Makefile
  head/devel/llvm60/Makefile
  head/devel/llvm70/Makefile

Modified: head/devel/llvm38/Makefile
==============================================================================
--- head/devel/llvm38/Makefile	Fri Jan 18 22:56:17 2019	(r490679)
+++ head/devel/llvm38/Makefile	Fri Jan 18 22:57:33 2019	(r490680)
@@ -61,7 +61,6 @@ CLANG_EXTRA_PATCHES= \
 	${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt \
 	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format.py \
 	${PATCHDIR}/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer
-CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
 CLANG_DISTFILES=	cfe-${DISTVERSION}.src${EXTRACT_SUFX}
 CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
 CLANG_PORTDOCS=		clang

Modified: head/devel/llvm40/Makefile
==============================================================================
--- head/devel/llvm40/Makefile	Fri Jan 18 22:56:17 2019	(r490679)
+++ head/devel/llvm40/Makefile	Fri Jan 18 22:57:33 2019	(r490680)
@@ -67,7 +67,6 @@ CLANG_EXTRA_PATCHES= \
 	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py \
 	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_git-clang-format \
 	${PATCHDIR}/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer
-CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
 CLANG_DISTFILES=	cfe-${DISTVERSION}.src${EXTRACT_SUFX}
 CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
 CLANG_PORTDOCS=		clang

Modified: head/devel/llvm50/Makefile
==============================================================================
--- head/devel/llvm50/Makefile	Fri Jan 18 22:56:17 2019	(r490679)
+++ head/devel/llvm50/Makefile	Fri Jan 18 22:57:33 2019	(r490680)
@@ -70,7 +70,6 @@ CLANG_EXTRA_PATCHES= \
 	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py \
 	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_git-clang-format \
 	${PATCHDIR}/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer
-CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
 CLANG_DISTFILES=	cfe-${DISTVERSION}.src${EXTRACT_SUFX}
 CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
 CLANG_PORTDOCS=		clang

Modified: head/devel/llvm60/Makefile
==============================================================================
--- head/devel/llvm60/Makefile	Fri Jan 18 22:56:17 2019	(r490679)
+++ head/devel/llvm60/Makefile	Fri Jan 18 22:57:33 2019	(r490680)
@@ -60,7 +60,6 @@ OPTIONS_SUB=	yes
 
 CLANG_DESC=	Build clang
 CLANG_EXTRA_PATCHES=	${PATCHDIR}/clang
-CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
 CLANG_DISTFILES=	cfe-${DISTVERSION}.src${EXTRACT_SUFX}
 CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
 CLANG_PORTDOCS=		clang

Modified: head/devel/llvm70/Makefile
==============================================================================
--- head/devel/llvm70/Makefile	Fri Jan 18 22:56:17 2019	(r490679)
+++ head/devel/llvm70/Makefile	Fri Jan 18 22:57:33 2019	(r490680)
@@ -61,7 +61,6 @@ OPTIONS_SUB=	yes
 
 CLANG_DESC=	Build clang
 CLANG_EXTRA_PATCHES=	${PATCHDIR}/clang
-CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
 CLANG_DISTFILES=	cfe-${DISTVERSION}.src${EXTRACT_SUFX}
 CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
 CLANG_PORTDOCS=		clang