svn commit: r502166 - in head/graphics: drm-current-kmod drm-fbsd11.2-kmod drm-fbsd12.0-kmod drm-legacy-kmod

[Niclas Zeising]

Author: zeising
Date: Mon May 20 20:29:56 2019
New Revision: 502166
URL: https://svnweb.freebsd.org/changeset/ports/502166

Log:
  drm-kmod ports: Update conflicts
  
  Update conflicts for all drm-kmod ports to take into account the new
  drm-devel-kmod port.
  
  MFH:		2019Q2 (implicit, drm-driver blanket)
  Sponsored by:	B3 Init

Modified:
  head/graphics/drm-current-kmod/Makefile
  head/graphics/drm-fbsd11.2-kmod/Makefile
  head/graphics/drm-fbsd12.0-kmod/Makefile
  head/graphics/drm-legacy-kmod/Makefile

Modified: head/graphics/drm-current-kmod/Makefile
==============================================================================
--- head/graphics/drm-current-kmod/Makefile	Mon May 20 20:28:16 2019	(r502165)
+++ head/graphics/drm-current-kmod/Makefile	Mon May 20 20:29:56 2019	(r502166)
@@ -16,7 +16,10 @@ ONLY_FOR_ARCHS_REASON=	the new KMS components are only
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
 
-CONFLICTS_INSTALL=	drm-fbsd11.2-kmod drm-fbsd12.0-kmod drm-legacy-kmod
+CONFLICTS_INSTALL=	drm-devel-kmod \
+			drm-fbsd11.2-kmod \
+			drm-fbsd12.0-kmod \
+			drm-legacy-kmod
 
 OPTIONS_DEFINE=	DEBUG
 

Modified: head/graphics/drm-fbsd11.2-kmod/Makefile
==============================================================================
--- head/graphics/drm-fbsd11.2-kmod/Makefile	Mon May 20 20:28:16 2019	(r502165)
+++ head/graphics/drm-fbsd11.2-kmod/Makefile	Mon May 20 20:29:56 2019	(r502166)
@@ -16,7 +16,10 @@ ONLY_FOR_ARCHS_REASON=	the new KMS components are only
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
 
-CONFLICTS_INSTALL=	drm-fbsd12.0-kmod drm-current-kmod drm-legacy-kmod
+CONFLICTS_INSTALL=	drm-devel-kmod \
+			drm-fbsd12.0-kmod \
+			drm-current-kmod \
+			drm-legacy-kmod
 
 OPTIONS_DEFINE=	DEBUG
 

Modified: head/graphics/drm-fbsd12.0-kmod/Makefile
==============================================================================
--- head/graphics/drm-fbsd12.0-kmod/Makefile	Mon May 20 20:28:16 2019	(r502165)
+++ head/graphics/drm-fbsd12.0-kmod/Makefile	Mon May 20 20:29:56 2019	(r502166)
@@ -16,7 +16,10 @@ ONLY_FOR_ARCHS_REASON=	the new KMS components are only
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
 
-CONFLICTS_INSTALL=	drm-fbsd11.2-kmod drm-current-kmod drm-legacy-kmod
+CONFLICTS_INSTALL=	drm-devel-kmod \
+			drm-fbsd11.2-kmod \
+			drm-current-kmod \
+			drm-legacy-kmod
 
 OPTIONS_DEFINE=	DEBUG
 

Modified: head/graphics/drm-legacy-kmod/Makefile
==============================================================================
--- head/graphics/drm-legacy-kmod/Makefile	Mon May 20 20:28:16 2019	(r502165)
+++ head/graphics/drm-legacy-kmod/Makefile	Mon May 20 20:29:56 2019	(r502166)
@@ -19,7 +19,10 @@ USES=		kmod uidfix
 
 OPTIONS_DEFINE=	DEBUG
 
-CONFLICTS_INSTALL=	drm-fbsd11.2-kmod drm-fbsd12.0-kmod drm-current-kmod
+CONFLICTS_INSTALL=	drm-devel-kmod \
+			drm-fbsd11.2-kmod \
+			drm-fbsd12.0-kmod \
+			drm-current-kmod
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeBSDDesktop