Update drm-next-kmod, drm-stable-kmod and gpu-firmware-kmod to latest

versions from upstream git.

This brings:
* shorter module names for the GPU firmwares
* addition to the kld category for all three ports
* fixes from FreeBSDDesktop since last update
* fixes to build on latest current, after r333263 [0]

Submitted by:	jmd, zeising [0]
Approved by:	maintainer (jmd)
Differential Revision:	https://reviews.freebsd.org/D14765 (based on)
MFH:		2018Q2

7 files changed, 23 insertions, 23 deletions

diff --git a/graphics/drm-next-kmod/Makefile b/graphics/drm-next-kmod/Makefile
index 91f0f26b84cb..5978150dc0be 100644
--- a/graphics/drm-next-kmod/Makefile
+++ b/graphics/drm-next-kmod/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	drm-next-kmod
-PORTVERSION=	4.11.g20180224
-CATEGORIES=	graphics
+PORTVERSION=	4.11.g20180505
+CATEGORIES=	graphics kld
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	DRM modules for the linuxkpi-based KMS components
@@ -14,7 +14,7 @@ LICENSE_COMB=	multi
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64
 
-RUN_DEPENDS=	gpu-firmware-kmod>=g20170403:graphics/gpu-firmware-kmod
+RUN_DEPENDS=	gpu-firmware-kmod>=g20170319:graphics/gpu-firmware-kmod
 
 CONFLICTS_INSTALL=	drm-stable-kmod
 
@@ -25,7 +25,7 @@ USES=		kmod uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeBSDDesktop
 GH_PROJECT=	kms-drm
-GH_TAGNAME=	79764d6
+GH_TAGNAME=	fd12167
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/drm-next-kmod/distinfo b/graphics/drm-next-kmod/distinfo
index 5340d8047fcc..9c7dcc01fd88 100644
--- a/graphics/drm-next-kmod/distinfo
+++ b/graphics/drm-next-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519569721
-SHA256 (FreeBSDDesktop-kms-drm-4.11.g20180224-79764d6_GH0.tar.gz) = 8a76a709a281964149993638e98210846eb5d4705668f28ac95a450b773314bb
-SIZE (FreeBSDDesktop-kms-drm-4.11.g20180224-79764d6_GH0.tar.gz) = 7358364
+TIMESTAMP = 1525546046
+SHA256 (FreeBSDDesktop-kms-drm-4.11.g20180505-fd12167_GH0.tar.gz) = d6bd9b17c50ee389a6c1c9000268640a90fb75263e6616ab5444acc0b3dc89e0
+SIZE (FreeBSDDesktop-kms-drm-4.11.g20180505-fd12167_GH0.tar.gz) = 7358510
diff --git a/graphics/drm-stable-kmod/Makefile b/graphics/drm-stable-kmod/Makefile
index 0ee31b01e364..53e758ec8575 100644
--- a/graphics/drm-stable-kmod/Makefile
+++ b/graphics/drm-stable-kmod/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	drm-stable-kmod
-PORTVERSION=	g20180117
-PORTREVISION=	3
-CATEGORIES=	graphics
+PORTVERSION=	g20180505
+PORTREVISION=	4
+CATEGORIES=	graphics kld
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	DRM modules for the linuxkpi-based KMS components
@@ -26,7 +26,7 @@ USES=		kmod uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeBSDDesktop
 GH_PROJECT=	kms-drm
-GH_TAGNAME=	cd0b05f
+GH_TAGNAME=	b35c15d
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/drm-stable-kmod/distinfo b/graphics/drm-stable-kmod/distinfo
index 2dcf56083077..67433f7536d3 100644
--- a/graphics/drm-stable-kmod/distinfo
+++ b/graphics/drm-stable-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519147749
-SHA256 (FreeBSDDesktop-kms-drm-g20180117-cd0b05f_GH0.tar.gz) = 359ce8fb2f7c624be74c8e38c04352ee3e1632e932d5762382da55ca03287a88
-SIZE (FreeBSDDesktop-kms-drm-g20180117-cd0b05f_GH0.tar.gz) = 6678925
+TIMESTAMP = 1525544813
+SHA256 (FreeBSDDesktop-kms-drm-g20180505-b35c15d_GH0.tar.gz) = 522b3136cfbab3af35f4ee70ed3cceee8ff1fd6098b1451e65c36e81ceceb6c9
+SIZE (FreeBSDDesktop-kms-drm-g20180505-b35c15d_GH0.tar.gz) = 6678724
diff --git a/graphics/gpu-firmware-kmod/Makefile b/graphics/gpu-firmware-kmod/Makefile
index 51336876f41b..e6dc9b50962b 100644
--- a/graphics/gpu-firmware-kmod/Makefile
+++ b/graphics/gpu-firmware-kmod/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	gpu-firmware-kmod
-PORTVERSION=	g20180206
+PORTVERSION=	g20180319
 PORTREVISION=	1
-CATEGORIES=	graphics
+CATEGORIES=	graphics kld
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	Firmware modules for the linuxkpi-based KMS components
@@ -26,7 +26,7 @@ USES=		kmod uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeBSDDesktop
 GH_PROJECT=	kms-firmware
-GH_TAGNAME=	dc3c90e
+GH_TAGNAME=	8b9df12
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/gpu-firmware-kmod/distinfo b/graphics/gpu-firmware-kmod/distinfo
index 54d9b9b5f1a6..b0527a47f312 100644
--- a/graphics/gpu-firmware-kmod/distinfo
+++ b/graphics/gpu-firmware-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517938176
-SHA256 (FreeBSDDesktop-kms-firmware-g20180206-dc3c90e_GH0.tar.gz) = c4a265f101c794f6627bf73dde5f5d90408d311789388b30d918332f7c42bf8c
-SIZE (FreeBSDDesktop-kms-firmware-g20180206-dc3c90e_GH0.tar.gz) = 11760976
+TIMESTAMP = 1521512128
+SHA256 (FreeBSDDesktop-kms-firmware-g20180319-8b9df12_GH0.tar.gz) = fa1261deb21bf6cb6fa74762a672e472c411db060749f32a4285a787686169fb
+SIZE (FreeBSDDesktop-kms-firmware-g20180319-8b9df12_GH0.tar.gz) = 11760702
diff --git a/graphics/gpu-firmware-kmod/pkg-plist b/graphics/gpu-firmware-kmod/pkg-plist
index 02b6adca24b4..03c3c06f183c 100644
--- a/graphics/gpu-firmware-kmod/pkg-plist
+++ b/graphics/gpu-firmware-kmod/pkg-plist
@@ -134,15 +134,15 @@
 /%%KMODDIR%%/amdgpu_vega10_vce_bin.ko
 /%%KMODDIR%%/i915_bxt_dmc_ver1_07_bin.ko
 /%%KMODDIR%%/i915_bxt_guc_ver8_7_bin.ko
-/%%KMODDIR%%/i915_bxt_huc_ver01_07_1398_bin.ko
+/%%KMODDIR%%/i915_bxt_huc_ver01_07_bin.ko
 /%%KMODDIR%%/i915_cnl_dmc_ver1_06_bin.ko
 /%%KMODDIR%%/i915_glk_dmc_ver1_04_bin.ko
 /%%KMODDIR%%/i915_kbl_dmc_ver1_01_bin.ko
 /%%KMODDIR%%/i915_kbl_guc_ver9_14_bin.ko
-/%%KMODDIR%%/i915_kbl_huc_ver02_00_1810_bin.ko
+/%%KMODDIR%%/i915_kbl_huc_ver02_00_bin.ko
 /%%KMODDIR%%/i915_skl_dmc_ver1_26_bin.ko
 /%%KMODDIR%%/i915_skl_guc_ver6_1_bin.ko
-/%%KMODDIR%%/i915_skl_huc_ver01_07_1398_bin.ko
+/%%KMODDIR%%/i915_skl_huc_ver01_07_bin.ko
 /%%KMODDIR%%/radeon_ARUBA_me_bin.ko
 /%%KMODDIR%%/radeon_ARUBA_pfp_bin.ko
 /%%KMODDIR%%/radeon_ARUBA_rlc_bin.ko