git: c825940466e0 - main - graphics/drm-66-kmod: Fix conflict

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c825940466e0acfb351ee586dbfa3395891bad40

commit c825940466e0acfb351ee586dbfa3395891bad40
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2025-02-18 08:14:24 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2025-02-18 08:15:45 +0000

    graphics/drm-66-kmod: Fix conflict
    
    WHile here add the conflict in all drm kmod ports for drm-66-kmod.
    
    Reported by:    Alonso Cárdenas Márquez <acm@FreeBSD.org>
    Fixes:          00508c01e276 ("graphics/drm-66-kmod: Add new port")
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
---
 graphics/drm-510-kmod/Makefile | 5 +++--
 graphics/drm-515-kmod/Makefile | 5 +++--
 graphics/drm-61-kmod/Makefile  | 4 +++-
 graphics/drm-66-kmod/Makefile  | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/graphics/drm-510-kmod/Makefile b/graphics/drm-510-kmod/Makefile
index 048c913ab40b..97f72b15becd 100644
--- a/graphics/drm-510-kmod/Makefile
+++ b/graphics/drm-510-kmod/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	drm-510-kmod
 PORTVERSION=	${DRM_KMOD_DISTVERSION}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics kld
 
 .include "Makefile.version"
@@ -16,7 +16,8 @@ ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64, i386, aarch64, and powerpc64
 
 CONFLICTS_INSTALL=	drm-515-kmod \
-			drm-61-kmod
+			drm-61-kmod \
+			drm-66-kmod
 
 USES=		kmod uidfix compiler:c++11-lang
 
diff --git a/graphics/drm-515-kmod/Makefile b/graphics/drm-515-kmod/Makefile
index b1a986717b12..2c23997facb2 100644
--- a/graphics/drm-515-kmod/Makefile
+++ b/graphics/drm-515-kmod/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	drm-515-kmod
 PORTVERSION=	${DRM_KMOD_DISTVERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kld
 
 .include "Makefile.version"
@@ -16,7 +16,8 @@ ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64 and powerpc64
 
 CONFLICTS_INSTALL=	drm-510-kmod \
-			drm-61-kmod
+			drm-61-kmod \
+			drm-66-kmod
 
 USES=		kmod uidfix compiler:c++11-lang
 
diff --git a/graphics/drm-61-kmod/Makefile b/graphics/drm-61-kmod/Makefile
index 64ecc8c6a896..fd7a7afd5adb 100644
--- a/graphics/drm-61-kmod/Makefile
+++ b/graphics/drm-61-kmod/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	drm-61-kmod
 PORTVERSION=	${DRM_KMOD_DISTVERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kld
 
 .include "Makefile.version"
@@ -15,7 +16,8 @@ ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64 and powerpc64
 
 CONFLICTS_INSTALL=	drm-510-kmod \
-			drm-515-kmod
+			drm-515-kmod \
+			drm-66-kmod
 
 USES=		kmod uidfix compiler:c++11-lang
 
diff --git a/graphics/drm-66-kmod/Makefile b/graphics/drm-66-kmod/Makefile
index 1aa037f4900b..db17c0b723b4 100644
--- a/graphics/drm-66-kmod/Makefile
+++ b/graphics/drm-66-kmod/Makefile
@@ -16,7 +16,7 @@ ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64
 
 CONFLICTS_INSTALL=	drm-510-kmod \
 			drm-515-kmod \
-			drm-66-kmod
+			drm-61-kmod
 
 USES=		kmod uidfix compiler:c++11-lang