svn commit: r563186 - in head/graphics: drm-fbsd11.2-kmod drm-fbsd12.0-kmod drm-fbsd13-kmod

[Emmanuel Vadot]

Author: manu
Date: Fri Jan 29 10:01:52 2021
New Revision: 563186
URL: https://svnweb.freebsd.org/changeset/ports/563186

Log:
  drm-fbsd*-kmod: Remove CONFLICTS_INSTALL
  
  Only one port can be built on one branch so it's not needed

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

Modified: head/graphics/drm-fbsd11.2-kmod/Makefile
==============================================================================
--- head/graphics/drm-fbsd11.2-kmod/Makefile	Fri Jan 29 09:31:21 2021	(r563185)
+++ head/graphics/drm-fbsd11.2-kmod/Makefile	Fri Jan 29 10:01:52 2021	(r563186)
@@ -3,6 +3,7 @@
 
 PORTNAME=	drm-fbsd11.2-kmod
 PORTVERSION=	4.11g20200420
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	x11 at FreeBSD.org
@@ -15,12 +16,6 @@ ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
-
-CONFLICTS_INSTALL=	drm-devel-kmod \
-			drm-fbsd12.0-kmod \
-			drm-fbsd13-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	Fri Jan 29 09:31:21 2021	(r563185)
+++ head/graphics/drm-fbsd12.0-kmod/Makefile	Fri Jan 29 10:01:52 2021	(r563186)
@@ -3,6 +3,7 @@
 
 PORTNAME=	drm-fbsd12.0-kmod
 PORTVERSION=	4.16.g20201016
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	x11 at FreeBSD.org
@@ -15,12 +16,6 @@ ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64 and i386
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
-
-CONFLICTS_INSTALL=	drm-devel-kmod \
-			drm-fbsd11.2-kmod \
-			drm-fbsd13-kmod \
-			drm-current-kmod \
-			drm-legacy-kmod
 
 OPTIONS_DEFINE=	DEBUG
 

Modified: head/graphics/drm-fbsd13-kmod/Makefile
==============================================================================
--- head/graphics/drm-fbsd13-kmod/Makefile	Fri Jan 29 09:31:21 2021	(r563185)
+++ head/graphics/drm-fbsd13-kmod/Makefile	Fri Jan 29 10:01:52 2021	(r563186)
@@ -3,6 +3,7 @@
 
 PORTNAME=	drm-fbsd13-kmod
 PORTVERSION=	5.4.62.g20210122
+PORTREVISION=	1
 CATEGORIES=	graphics kld
 
 MAINTAINER=	x11 at FreeBSD.org
@@ -15,11 +16,6 @@ ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64, i386, aarch64 and powerpc64
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20200914:graphics/gpu-firmware-kmod
-
-CONFLICTS_INSTALL=	drm-current-kmod \
-			drm-devel-kmod \
-			drm-fbsd11.2-kmod \
-			drm-fbsd12.0-kmod
 
 OPTIONS_DEFINE=	DEBUG SOURCE