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

20 files changed, 31 insertions, 15 deletions

diff --git a/MOVED b/MOVED
index 52f637b4523a..cbdb0141b7ae 100644
--- a/MOVED
+++ b/MOVED
@@ -10716,3 +10716,6 @@ math/php70-gmp|math/php72-gmp|2018-12-05|Has expired: Security Support ends on 3
 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
diff --git a/UPDATING b/UPDATING
index d9212fb47c4b..a56dc692808e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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@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@FreeBSD.org
diff --git a/graphics/Makefile b/graphics/Makefile
index acc5eaa32748..93e4ead8bf68 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -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
diff --git a/graphics/drm-devel-kmod/Makefile b/graphics/drm-current-kmod/Makefile
index 66c862d0a219..d02b7dd3b885 100644
--- a/graphics/drm-devel-kmod/Makefile
+++ b/graphics/drm-current-kmod/Makefile
@@ -1,7 +1,7 @@
 # Created by: Johannes Dieterich <jmd@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 supported on amd64 and i3
 
 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
 
diff --git a/graphics/drm-devel-kmod/distinfo b/graphics/drm-current-kmod/distinfo
index 7c227b56fb3f..7c227b56fb3f 100644
--- a/graphics/drm-devel-kmod/distinfo
+++ b/graphics/drm-current-kmod/distinfo
diff --git a/graphics/drm-devel-kmod/pkg-descr b/graphics/drm-current-kmod/pkg-descr
index b233dab0d8cb..b233dab0d8cb 100644
--- a/graphics/drm-devel-kmod/pkg-descr
+++ b/graphics/drm-current-kmod/pkg-descr
diff --git a/graphics/drm-devel-kmod/pkg-message b/graphics/drm-current-kmod/pkg-message
index 7bca65c4acb6..7bca65c4acb6 100644
--- a/graphics/drm-devel-kmod/pkg-message
+++ b/graphics/drm-current-kmod/pkg-message
diff --git a/graphics/drm-devel-kmod/pkg-plist b/graphics/drm-current-kmod/pkg-plist
index 3cfaf81a608e..3cfaf81a608e 100644
--- a/graphics/drm-devel-kmod/pkg-plist
+++ b/graphics/drm-current-kmod/pkg-plist
diff --git a/graphics/drm-stable-kmod/Makefile b/graphics/drm-fbsd11.2-kmod/Makefile
index fb7241b92864..c8ea76b1de23 100644
--- a/graphics/drm-stable-kmod/Makefile
+++ b/graphics/drm-fbsd11.2-kmod/Makefile
@@ -1,7 +1,7 @@
 # Created by: Johannes Dieterich <jmd@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 supported on amd64
 
 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
 
diff --git a/graphics/drm-stable-kmod/distinfo b/graphics/drm-fbsd11.2-kmod/distinfo
index 41f0ac178785..41f0ac178785 100644
--- a/graphics/drm-stable-kmod/distinfo
+++ b/graphics/drm-fbsd11.2-kmod/distinfo
diff --git a/graphics/drm-stable-kmod/pkg-descr b/graphics/drm-fbsd11.2-kmod/pkg-descr
index a0debdffcbb3..a0debdffcbb3 100644
--- a/graphics/drm-stable-kmod/pkg-descr
+++ b/graphics/drm-fbsd11.2-kmod/pkg-descr
diff --git a/graphics/drm-stable-kmod/pkg-message b/graphics/drm-fbsd11.2-kmod/pkg-message
index f406d554fe2d..f406d554fe2d 100644
--- a/graphics/drm-stable-kmod/pkg-message
+++ b/graphics/drm-fbsd11.2-kmod/pkg-message
diff --git a/graphics/drm-next-kmod/pkg-plist b/graphics/drm-fbsd11.2-kmod/pkg-plist
index 8930f98d203a..8930f98d203a 100644
--- a/graphics/drm-next-kmod/pkg-plist
+++ b/graphics/drm-fbsd11.2-kmod/pkg-plist
diff --git a/graphics/drm-next-kmod/Makefile b/graphics/drm-fbsd12.0-kmod/Makefile
index 9310b173f13a..17a53353eb64 100644
--- a/graphics/drm-next-kmod/Makefile
+++ b/graphics/drm-fbsd12.0-kmod/Makefile
@@ -1,7 +1,7 @@
 # Created by: Johannes Dieterich <jmd@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 supported on amd64
 
 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
 
diff --git a/graphics/drm-next-kmod/distinfo b/graphics/drm-fbsd12.0-kmod/distinfo
index dfaa1eb79624..dfaa1eb79624 100644
--- a/graphics/drm-next-kmod/distinfo
+++ b/graphics/drm-fbsd12.0-kmod/distinfo
diff --git a/graphics/drm-next-kmod/pkg-descr b/graphics/drm-fbsd12.0-kmod/pkg-descr
index ae133e3e2cc2..ae133e3e2cc2 100644
--- a/graphics/drm-next-kmod/pkg-descr
+++ b/graphics/drm-fbsd12.0-kmod/pkg-descr
diff --git a/graphics/drm-next-kmod/pkg-message b/graphics/drm-fbsd12.0-kmod/pkg-message
index 6cab67843a2b..6cab67843a2b 100644
--- a/graphics/drm-next-kmod/pkg-message
+++ b/graphics/drm-fbsd12.0-kmod/pkg-message
diff --git a/graphics/drm-stable-kmod/pkg-plist b/graphics/drm-fbsd12.0-kmod/pkg-plist
index 8930f98d203a..8930f98d203a 100644
--- a/graphics/drm-stable-kmod/pkg-plist
+++ b/graphics/drm-fbsd12.0-kmod/pkg-plist
diff --git a/graphics/drm-kmod/Makefile b/graphics/drm-kmod/Makefile
index aec438abb4c3..b66341c6fb7e 100644
--- a/graphics/drm-kmod/Makefile
+++ b/graphics/drm-kmod/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	drm-kmod
-PORTVERSION=	g20180930
+PORTVERSION=	g20181126
 CATEGORIES=	graphics
 
 MAINTAINER=	jmd@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
diff --git a/graphics/drm-legacy-kmod/Makefile b/graphics/drm-legacy-kmod/Makefile
index 5ef244c1baf0..235243fa7a96 100644
--- a/graphics/drm-legacy-kmod/Makefile
+++ b/graphics/drm-legacy-kmod/Makefile
@@ -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