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

Mon Dec 10 03:02:45 UTC 2018

Author: jmd
Date: Mon Dec 10 03:02:11 2018
New Revision: 487117
URL: https://svnweb.freebsd.org/changeset/ports/487117

Log:
  LinuxKPI-based DRM ports: move to new ports nomenclature.
  
  After some discussions within the x11 team, it was decided to move to a new
  nomenclature for the LinuxKPI-based DRM ports that correctly reflects the
  FreeBSD version the ports are for. This will also allow us to move to dedicated
  branches per FreeBSD release and eases porting work.
  
  Functionally, this commit is a no-op as we are not moving to new snapshots.
  
  Reflect the move in UPDATING and MOVED. Users using the graphics/drm-kmod meta
  port should not be affected. Direct consumers of the DRM ports shall move, as
  in MOVED, as follows:
  
  drm-stable-kmod is drm-fbsd11.2-kmod
  drm-next-kmod is drm-fbsd12.0-kmod
  drm-devel-kmod is drm-current-kmod
  
  Reviewed by:	zeising (x11)
  Approved by:	zeising (x11)
  Differential Revision:	https://reviews.freebsd.org/D18328

Added:
  head/graphics/drm-current-kmod/
     - copied from r487116, head/graphics/drm-devel-kmod/
  head/graphics/drm-fbsd11.2-kmod/
     - copied from r487116, head/graphics/drm-stable-kmod/
  head/graphics/drm-fbsd12.0-kmod/
     - copied from r487116, head/graphics/drm-next-kmod/
Deleted:
  head/graphics/drm-devel-kmod/
  head/graphics/drm-next-kmod/
  head/graphics/drm-stable-kmod/
Modified:
  head/MOVED
  head/UPDATING
  head/graphics/Makefile
  head/graphics/drm-current-kmod/Makefile
  head/graphics/drm-fbsd11.2-kmod/Makefile
  head/graphics/drm-fbsd12.0-kmod/Makefile
  head/graphics/drm-kmod/Makefile
  head/graphics/drm-legacy-kmod/Makefile

Modified: head/MOVED
==============================================================================

--- head/MOVED	Mon Dec 10 01:06:34 2018	(r487116)
+++ head/MOVED	Mon Dec 10 03:02:11 2018	(r487117)
@@ -10716,3 +10716,6 @@ math/php70-gmp|math/php72-gmp|2018-12-05|Has expired: 
 lang/php70|lang/php72|2018-12-05|Has expired: Security Support ends on 3 Dec 2018
 math/vtk5-data||2018-12-05|Removed
 devel/py-interface|devel/py-py_interface|2018-12-05|Rename to match upstream naming
+graphics/drm-stable-kmod|graphics/drm-fbsd11.2-kmod|2018-12-09|Cleaning up DRM ports nomenclature
+graphics/drm-next-kmod|graphics/drm-fbsd12.0-kmod|2018-12-09|Cleaning up DRM ports nomenclature
+graphics/drm-devel-kmod|graphics/drm-current-kmod|2018-12-09|Cleaning up DRM ports nomenclature

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Dec 10 01:06:34 2018	(r487116)
+++ head/UPDATING	Mon Dec 10 03:02:11 2018	(r487117)
@@ -5,6 +5,19 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20181209:
+  AFFECTS: users of DRM ports other than graphics/drm-kmod
+  AUTHOR: jmd at FreeBSD.org
+
+  In order to facilitate future porting efforts and help in supporting multiple
+  FreeBSD versions, the DRM ports other than drm-kmod (graphics/drm-stable-kmod,
+  graphics/drm-next-kmod, graphics/drm-devel-kmod) have been renamed to
+  include the FreeBSD version they are designed for.
+
+  drm-stable-kmod is drm-fbsd11.2-kmod
+  drm-next-kmod is drm-fbsd12.0-kmod
+  drm-devel-kmod is drm-current-kmod
+
 20181209
   AFFECTS: users of devel/geany and devel/geany-plugins
   AUTHOR: madpilot at FreeBSD.org

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Mon Dec 10 01:06:34 2018	(r487116)
+++ head/graphics/Makefile	Mon Dec 10 03:02:11 2018	(r487117)
@@ -152,11 +152,11 @@
     SUBDIR += dmtx-utils
     SUBDIR += drawpile
     SUBDIR += driconf
-    SUBDIR += drm-devel-kmod
+    SUBDIR += drm-current-kmod
+    SUBDIR += drm-fbsd11.2-kmod
+    SUBDIR += drm-fbsd12.0-kmod
     SUBDIR += drm-kmod
     SUBDIR += drm-legacy-kmod
-    SUBDIR += drm-next-kmod
-    SUBDIR += drm-stable-kmod
     SUBDIR += dspdfviewer
     SUBDIR += duhdraw
     SUBDIR += dynamechs

Modified: head/graphics/drm-current-kmod/Makefile
==============================================================================
--- head/graphics/drm-devel-kmod/Makefile	Mon Dec 10 01:06:34 2018	(r487116)
+++ head/graphics/drm-current-kmod/Makefile	Mon Dec 10 03:02:11 2018	(r487117)
@@ -1,7 +1,7 @@
 # Created by: Johannes Dieterich <jmd at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	drm-devel-kmod
+PORTNAME=	drm-current-kmod
 PORTVERSION=	4.16.g20181121
 CATEGORIES=	graphics kld
 
@@ -16,7 +16,7 @@ ONLY_FOR_ARCHS_REASON=	the new KMS components are only
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
 
-CONFLICTS_INSTALL=	drm-next-kmod drm-stable-kmod drm-legacy-kmod
+CONFLICTS_INSTALL=	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-stable-kmod/Makefile	Mon Dec 10 01:06:34 2018	(r487116)
+++ head/graphics/drm-fbsd11.2-kmod/Makefile	Mon Dec 10 03:02:11 2018	(r487117)
@@ -1,7 +1,7 @@
 # Created by: Johannes Dieterich <jmd at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	drm-stable-kmod
+PORTNAME=	drm-fbsd11.2-kmod
 PORTVERSION=	g20180822
 PORTREVISION=	1
 CATEGORIES=	graphics
@@ -17,7 +17,7 @@ ONLY_FOR_ARCHS_REASON=	the new KMS components are only
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
 
-CONFLICTS_INSTALL=	drm-devel-kmod drm-next-kmod drm-legacy-kmod
+CONFLICTS_INSTALL=	drm-fbsd12.0-kmod drm-current-kmod drm-legacy-kmod
 
 OPTIONS_DEFINE=	DEBUG
 

Modified: head/graphics/drm-fbsd12.0-kmod/Makefile
==============================================================================
--- head/graphics/drm-next-kmod/Makefile	Mon Dec 10 01:06:34 2018	(r487116)
+++ head/graphics/drm-fbsd12.0-kmod/Makefile	Mon Dec 10 03:02:11 2018	(r487117)
@@ -1,7 +1,7 @@
 # Created by: Johannes Dieterich <jmd at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	drm-next-kmod
+PORTNAME=	drm-fbsd12.0-kmod
 PORTVERSION=	4.11.g20181027
 PORTREVISION=	1
 CATEGORIES=	graphics
@@ -17,7 +17,7 @@ ONLY_FOR_ARCHS_REASON=	the new KMS components are only
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
 
-CONFLICTS_INSTALL=	drm-devel-kmod drm-stable-kmod drm-legacy-kmod
+CONFLICTS_INSTALL=	drm-fbsd11.2-kmod drm-current-kmod drm-legacy-kmod
 
 OPTIONS_DEFINE=	DEBUG
 

Modified: head/graphics/drm-kmod/Makefile
==============================================================================
--- head/graphics/drm-kmod/Makefile	Mon Dec 10 01:06:34 2018	(r487116)
+++ head/graphics/drm-kmod/Makefile	Mon Dec 10 03:02:11 2018	(r487117)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	drm-kmod
-PORTVERSION=	g20180930
+PORTVERSION=	g20181126
 CATEGORIES=	graphics
 
 MAINTAINER=	jmd at FreeBSD.org
@@ -23,15 +23,15 @@ IGNORE=		legacy kmod not required on less than 12.0
 .endif
 .else
 .if ${OSVERSION} >= 1101510 && ${OSVERSION} < 1200000
-RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-stable-kmod
+RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod
 .elif ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200045
 IGNORE=		not supported on older 12, no kernel support
 .elif ${OSVERSION} >= 1200045 && ${OSVERSION} < 1200058
-RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-stable-kmod
+RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod
 .elif ${OSVERSION} >= 1200058 && ${OSVERSION} < 1300000
-RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-next-kmod
+RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod
 .elif ${OSVERSION} >= 1300000
-RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-devel-kmod
+RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-current-kmod
 .else
 IGNORE=		not supported for this configuration
 .endif

Modified: head/graphics/drm-legacy-kmod/Makefile
==============================================================================
--- head/graphics/drm-legacy-kmod/Makefile	Mon Dec 10 01:06:34 2018	(r487116)
+++ head/graphics/drm-legacy-kmod/Makefile	Mon Dec 10 03:02:11 2018	(r487117)
@@ -18,7 +18,7 @@ USES=		kmod uidfix
 
 OPTIONS_DEFINE=	DEBUG
 
-CONFLICTS_INSTALL=	drm-devel-kmod drm-stable-kmod drm-next-kmod
+CONFLICTS_INSTALL=	drm-fbsd11.2-kmod drm-fbsd12.0-kmod drm-current-kmod
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeBSDDesktop
