svn commit: r562492 - in branches/2021Q1/graphics: drm-current-kmod drm-devel-kmod drm-fbsd11.2-kmod drm-fbsd12.0-kmod drm-kmod

[Rene Ladan]

Author: rene
Date: Sun Jan 24 17:18:24 2021
New Revision: 562492
URL: https://svnweb.freebsd.org/changeset/ports/562492

Log:
  MFH: r562491
  
  Hook drm-fbsd13-kmod to the maser drm-kmod port and bump its PORTREVISION.
  
  Add new drm-fbsd13-kmod to the conflict lists of the other ports.
  Be pedantic about version boundaries.
  
  Approved by:	manu (on ports-committers)

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

Modified: branches/2021Q1/graphics/drm-current-kmod/Makefile
==============================================================================
--- branches/2021Q1/graphics/drm-current-kmod/Makefile	Sun Jan 24 17:16:15 2021	(r562491)
+++ branches/2021Q1/graphics/drm-current-kmod/Makefile	Sun Jan 24 17:18:24 2021	(r562492)
@@ -20,6 +20,7 @@ RUN_DEPENDS=	gpu-firmware-kmod>=g20200914:graphics/gpu
 CONFLICTS_INSTALL=	drm-devel-kmod \
 			drm-fbsd11.2-kmod \
 			drm-fbsd12.0-kmod \
+			drm-fbsd13-kmod \
 			drm-legacy-kmod
 
 OPTIONS_DEFINE=	DEBUG SOURCE

Modified: branches/2021Q1/graphics/drm-devel-kmod/Makefile
==============================================================================
--- branches/2021Q1/graphics/drm-devel-kmod/Makefile	Sun Jan 24 17:16:15 2021	(r562491)
+++ branches/2021Q1/graphics/drm-devel-kmod/Makefile	Sun Jan 24 17:18:24 2021	(r562492)
@@ -19,6 +19,7 @@ RUN_DEPENDS=	gpu-firmware-kmod>=g20200914:graphics/gpu
 CONFLICTS_INSTALL=	drm-current-kmod \
 			drm-fbsd11.2-kmod \
 			drm-fbsd12.0-kmod \
+			drm-fbsd13-kmod \
 			drm-legacy-kmod
 
 OPTIONS_DEFINE=	DEBUG

Modified: branches/2021Q1/graphics/drm-fbsd11.2-kmod/Makefile
==============================================================================
--- branches/2021Q1/graphics/drm-fbsd11.2-kmod/Makefile	Sun Jan 24 17:16:15 2021	(r562491)
+++ branches/2021Q1/graphics/drm-fbsd11.2-kmod/Makefile	Sun Jan 24 17:18:24 2021	(r562492)
@@ -18,6 +18,7 @@ RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu
 
 CONFLICTS_INSTALL=	drm-devel-kmod \
 			drm-fbsd12.0-kmod \
+			drm-fbsd13-kmod \
 			drm-current-kmod \
 			drm-legacy-kmod
 
@@ -32,7 +33,7 @@ GH_TAGNAME=	d7d433d
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200000
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000
 IGNORE=		only supported on FreeBSD 11.
 .endif
 

Modified: branches/2021Q1/graphics/drm-fbsd12.0-kmod/Makefile
==============================================================================
--- branches/2021Q1/graphics/drm-fbsd12.0-kmod/Makefile	Sun Jan 24 17:16:15 2021	(r562491)
+++ branches/2021Q1/graphics/drm-fbsd12.0-kmod/Makefile	Sun Jan 24 17:18:24 2021	(r562492)
@@ -18,6 +18,7 @@ RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu
 
 CONFLICTS_INSTALL=	drm-devel-kmod \
 			drm-fbsd11.2-kmod \
+			drm-fbsd13-kmod \
 			drm-current-kmod \
 			drm-legacy-kmod
 
@@ -32,7 +33,7 @@ GH_TAGNAME=	fa1387d
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200058 || ${OSVERSION} > 1300000)
+.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200058 || ${OSVERSION} >= 1300000)
 IGNORE=		only supported on FreeBSD 12.
 .endif
 .if ${OPSYS} != FreeBSD

Modified: branches/2021Q1/graphics/drm-kmod/Makefile
==============================================================================
--- branches/2021Q1/graphics/drm-kmod/Makefile	Sun Jan 24 17:16:15 2021	(r562491)
+++ branches/2021Q1/graphics/drm-kmod/Makefile	Sun Jan 24 17:18:24 2021	(r562492)
@@ -3,6 +3,7 @@
 
 PORTNAME=	drm-kmod
 PORTVERSION=	g20190710
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	x11 at FreeBSD.org
@@ -22,7 +23,9 @@ RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-k
 RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod
 .elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300108
 IGNORE=		not supported on older 13, no kernel support
-.elif ${OSVERSION} >= 1300108
+.elif ${OSVERSION} >= 1300108 && ${OSVERSION} < 1400000
+RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-fbsd13-kmod
+.elif ${OSVERSION} >= 1400000
 RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-current-kmod
 .else
 IGNORE=		not supported for this configuration