svn commit: r563189 - in branches/2021Q1/graphics: drm-fbsd11.2-kmod drm-fbsd12.0-kmod drm-fbsd13-kmod

[Emmanuel Vadot]

Author: manu
Date: Fri Jan 29 10:14:59 2021
New Revision: 563189
URL: https://svnweb.freebsd.org/changeset/ports/563189

Log:
  MFH: r563186 r563187
  
  drm-fbsd*-kmod: Remove CONFLICTS_INSTALL
  
  Only one port can be built on one branch so it's not needed
  
  graphics/drm-fbsd13-kmod: Update pkg-descr
  
  Update pkg-descr so it matches the version.
  While here update WWW too.
  
  Reported by:	monochrome <monochrome at twcny.rr.com>

Modified:
  branches/2021Q1/graphics/drm-fbsd11.2-kmod/Makefile
  branches/2021Q1/graphics/drm-fbsd12.0-kmod/Makefile
  branches/2021Q1/graphics/drm-fbsd13-kmod/Makefile
  branches/2021Q1/graphics/drm-fbsd13-kmod/pkg-descr
Directory Properties:
  branches/2021Q1/   (props changed)

Modified: branches/2021Q1/graphics/drm-fbsd11.2-kmod/Makefile
==============================================================================
--- branches/2021Q1/graphics/drm-fbsd11.2-kmod/Makefile	Fri Jan 29 10:11:27 2021	(r563188)
+++ branches/2021Q1/graphics/drm-fbsd11.2-kmod/Makefile	Fri Jan 29 10:14:59 2021	(r563189)
@@ -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: branches/2021Q1/graphics/drm-fbsd12.0-kmod/Makefile
==============================================================================
--- branches/2021Q1/graphics/drm-fbsd12.0-kmod/Makefile	Fri Jan 29 10:11:27 2021	(r563188)
+++ branches/2021Q1/graphics/drm-fbsd12.0-kmod/Makefile	Fri Jan 29 10:14:59 2021	(r563189)
@@ -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: branches/2021Q1/graphics/drm-fbsd13-kmod/Makefile
==============================================================================
--- branches/2021Q1/graphics/drm-fbsd13-kmod/Makefile	Fri Jan 29 10:11:27 2021	(r563188)
+++ branches/2021Q1/graphics/drm-fbsd13-kmod/Makefile	Fri Jan 29 10:14:59 2021	(r563189)
@@ -3,6 +3,7 @@
 
 PORTNAME=	drm-fbsd13-kmod
 PORTVERSION=	5.4.62.g20210122
+PORTREVISION=	2
 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
 

Modified: branches/2021Q1/graphics/drm-fbsd13-kmod/pkg-descr
==============================================================================
--- branches/2021Q1/graphics/drm-fbsd13-kmod/pkg-descr	Fri Jan 29 10:11:27 2021	(r563188)
+++ branches/2021Q1/graphics/drm-fbsd13-kmod/pkg-descr	Fri Jan 29 10:14:59 2021	(r563189)
@@ -1,6 +1,5 @@
 amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components.
-Currently corresponding to Linux 4.16 DRM.
-This version is for FreeBSD CURRENT.
-amdgpu and radeonkms are known to fail with EFI boot.
+Currently corresponding to Linux 5.4.62 DRM.
+This version is for FreeBSD 13.
 
-WWW: https://github.com/FreeBSDDesktop/kms-drm
+WWW: https://github.com/freebsd/drm-kmod/