From 3deaebaf5688bc591f4da3f746979eec70a4c96b Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@netgate.com>
Date: Tue, 16 Dec 2025 16:01:29 +0000
Subject: [PATCH] Switch to graphics/drm-61-kmod

---
 security/pfSense-ce/Makefile                   |  2 +-
 sysutils/pfSense-upgrade/Makefile              |  2 +-
 sysutils/pfSense-upgrade/files/pfSense-upgrade | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/security/pfSense-ce/Makefile b/security/pfSense-ce/Makefile
index d8b8d950d4b0..744a10a3e978 100644
--- a/security/pfSense-ce/Makefile
+++ b/security/pfSense-ce/Makefile
@@ -8,7 +8,7 @@ WWW=		https://www.pfsense.org/
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	drm-515-kmod>0:graphics/drm-515-kmod
+RUN_DEPENDS=	drm-61-kmod>0:graphics/drm-61-kmod
 
 USES=		metaport
 
diff --git a/sysutils/pfSense-upgrade/Makefile b/sysutils/pfSense-upgrade/Makefile
index e22f05f54b55..4dac35062fbe 100644
--- a/sysutils/pfSense-upgrade/Makefile
+++ b/sysutils/pfSense-upgrade/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pfSense-upgrade
-PORTVERSION=	1.3.15
+PORTVERSION=	1.3.16
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/sysutils/pfSense-upgrade/files/pfSense-upgrade b/sysutils/pfSense-upgrade/files/pfSense-upgrade
index f21f6ca94def..38a5c0a7b869 100755
--- a/sysutils/pfSense-upgrade/files/pfSense-upgrade
+++ b/sysutils/pfSense-upgrade/files/pfSense-upgrade
@@ -1585,10 +1585,13 @@ pkg_upgrade() {
 			delete_annotation=""
 
 			# Upgrade drm if it is in use
-			if pkg-static info -e drm-510-kmod; then
-				_exec "pkg-static install -r ${product} -y ${desired_drm_package}" \
-				    "Upgrading drm to ${desired_drm_package}"
-			elif kldstat -qm i915kms; then
+			for _p in ${legacy_drm_packages}; do
+				if pkg-static info -e drm-510-kmod; then
+					_exec "pkg-static install -r ${product} -y ${desired_drm_package}" \
+					    "Upgrading drm to ${desired_drm_package}"
+				fi
+			done
+			if kldstat -qm i915kms; then
 				_exec "pkg-static upgrade -r ${product} -f drm-\*" \
 				    "Upgrading drm"
 			fi
@@ -2160,7 +2163,8 @@ pid_file="/var/run/$(basename $0).pid"
 logfile="/cf/conf/upgrade_log.txt"
 upgrade_logfile="/cf/conf/upgrade_log.latest.txt"
 stdout='/dev/null'
-desired_drm_package='drm-515-kmod'
+desired_drm_package='drm-61-kmod'
+legacy_drm_packages='drm-510-kmod drm-515-kmod'
 
 # Export necessary PATH
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin