git: 4ea3e2f0555a - main - sysutils/devcpu-data: Temporarily return to the tree

The branch main has been updated by jrm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4ea3e2f0555a0e2996dcd6b8ff4f6ee465f842ae

commit 4ea3e2f0555a0e2996dcd6b8ff4f6ee465f842ae
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2023-09-04 14:16:14 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2023-09-04 18:25:56 +0000

    sysutils/devcpu-data: Temporarily return to the tree
    
    Re-add the port to give users time to adjust to the reorganization of
    the CPU microcode ports in bc7829212d153aeff69b439d08e2e3001ef88ba3.
    
    Reported by:    dch
    Reviewed by:    manu
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D41718
---
 MOVED                          |  1 -
 sysutils/Makefile              |  1 +
 sysutils/devcpu-data/Makefile  | 20 ++++++++++++++++++++
 sysutils/devcpu-data/pkg-descr |  3 +++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/MOVED b/MOVED
index ed0bbd3b1c91..9cd15fef2ee6 100644
--- a/MOVED
+++ b/MOVED
@@ -7781,7 +7781,6 @@ x11-toolkits/wlinfo||2023-08-10|Redundant with wayland-info from graphics/waylan
 www/bareos18-webui|www/bareos19-webui|2023-08-16|Has expired
 sysutils/devcpu-data-amd|sysutils/cpu-microcode-amd|2023-08-16|Reorganize CPU microcode ports
 sysutils/devcpu-data-intel|sysutils/cpu-microcode-intel|2023-08-16|Reorganize CPU microcode ports
-sysutils/devcpu-data|sysutils/cpu-microcode-rc|2023-08-16|Reorganize CPU microcode ports
 devel/py-python-Levenshtein|devel/py-Levenshtein|2023-08-17|Rename to match upstream
 devel/py-jaraco||2023-08-21|Remove obsoleted port
 security/rubygem-openssl2|security/rubygem-openssl|2023-08-21|Remove obsoleted port. Use security/rubygem-openssl instead
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 50941c47c8d2..f35e9476f9c4 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -283,6 +283,7 @@
     SUBDIR += deltup
     SUBDIR += desktop-installer
     SUBDIR += detox
+    SUBDIR += devcpu-data
     SUBDIR += devctl-jail-kmod
     SUBDIR += devd-mount
     SUBDIR += devedeng
diff --git a/sysutils/devcpu-data/Makefile b/sysutils/devcpu-data/Makefile
new file mode 100644
index 000000000000..490aac1906b6
--- /dev/null
+++ b/sysutils/devcpu-data/Makefile
@@ -0,0 +1,20 @@
+PORTNAME=	data
+PORTVERSION=	20230617
+PORTREVISION=	1
+CATEGORIES=	sysutils
+PKGNAMEPREFIX=	devcpu-
+
+MAINTAINER=	jrm@FreeBSD.org
+COMMENT=	CPUs microcode updates (DEPRECATED)
+
+DEPRECATED=	Use sysutils/cpu-microcode
+EXPIRATION_DATE=	2023-12-31
+
+ONLY_FOR_ARCHS=	amd64 i386
+
+RUN_DEPENDS=	${LOCALBASE}/share/cpucontrol/microcode_amd.bin:sysutils/cpu-microcode-amd \
+		/boot/firmware/intel-ucode.bin:sysutils/cpu-microcode-intel
+
+USES=		metaport
+
+.include <bsd.port.mk>
diff --git a/sysutils/devcpu-data/pkg-descr b/sysutils/devcpu-data/pkg-descr
new file mode 100644
index 000000000000..0803acfe7e7f
--- /dev/null
+++ b/sysutils/devcpu-data/pkg-descr
@@ -0,0 +1,3 @@
+This port is deprecated.  It will temporarily stay in the tree to pull
+in the new CPU microcode ports.  It is to be replaced by
+sysutils/cpu-microcode.