emulators/qemu7*: Move qemu70 to qemu7

QEMU 7.X.X branch is reaching EOL as the upstream has released 8.X.X
branch. So there is no point in keeping multiple versions from 7.X.X
series. This is an interim commit to prepare to move emulators/qemu to
emulators/qemu7 so that emulators/qemu can be upgraded to latest 8.X.X
release.

16 files changed, 6 insertions, 6 deletions

diff --git a/MOVED b/MOVED
index ea3ef80f0df5..c0b4b30fb6f3 100644
--- a/MOVED
+++ b/MOVED
@@ -7532,3 +7532,4 @@ graphics/ImageMagick7-nox11|graphics/ImageMagick7|2023-04-30|Flavorized
 graphics/ImageMagick6-nox11|graphics/ImageMagick6|2023-04-30|Flavorized
 security/gpgme-qt5|security/gpgme-qt@qt5|2023-05-02|Flavorized to add Qt6 support
 x11-wm/hyprland-devel|x11-wm/hyprland|2023-05-03|Out of date: use x11-wm/hyprland for now
+emulators/qemu70|emulators/qemu7|2023-05-04|Use emulators/qemu or emulators/qemu-devel
diff --git a/emulators/Makefile b/emulators/Makefile
index a79b838c91ae..b7068f53a783 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -115,7 +115,7 @@
     SUBDIR += qemu-user-static
     SUBDIR += qemu-user-static-devel
     SUBDIR += qemu6
-    SUBDIR += qemu70
+    SUBDIR += qemu7
     SUBDIR += qmc2
     SUBDIR += quasi88
     SUBDIR += reicast
diff --git a/emulators/qemu70/Makefile b/emulators/qemu7/Makefile
index 7243ab324049..5424c5759242 100644
--- a/emulators/qemu70/Makefile
+++ b/emulators/qemu7/Makefile
@@ -1,12 +1,11 @@
 PORTNAME=	qemu
 PORTVERSION=	7.0.0
-PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 DIST_SUBDIR=	qemu/${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	QEMU CPU Emulator ${${FLAVOR}_COMMENT} - 7.0.x
+COMMENT=	QEMU CPU Emulator ${${FLAVOR}_COMMENT} - 7.X.x
 WWW=		https://www.qemu.org/
 
 LICENSE=	GPLv2
@@ -28,13 +27,13 @@ LIB_DEPENDS+=	libepoxy.so:graphics/libepoxy
 
 FLAVORS=			default nox11 tools
 FLAVOR?=			${FLAVORS:[1]}
-default_PKGNAMESUFFIX=		70
+default_PKGNAMESUFFIX=		7
 default_CONFLICTS_INSTALL=	qemu-devel qemu-nox11 qemu-tools qemu-utils \
 				qemu6*
-nox11_PKGNAMESUFFIX=		70-nox11
+nox11_PKGNAMESUFFIX=		7-nox11
 nox11_CONFLICTS_INSTALL=	qemu qemu-devel qemu6*
 nox11_COMMENT=			(without X11)
-tools_PKGNAMESUFFIX=		70-tools
+tools_PKGNAMESUFFIX=		7-tools
 tools_COMMENT=			(tools only)
 tools_CONFLICTS_INSTALL=	qemu qemu-devel qemu-nox11 qemu-utils qemu6*
 tools_DESCR=			${.CURDIR}/pkg-descr-tools
diff --git a/emulators/qemu70/distinfo b/emulators/qemu7/distinfo
index e40467f0d5ce..e40467f0d5ce 100644
--- a/emulators/qemu70/distinfo
+++ b/emulators/qemu7/distinfo
diff --git a/emulators/qemu70/files/patch-block_export_fuse.c b/emulators/qemu7/files/patch-block_export_fuse.c
index 5fbb0dd9a040..5fbb0dd9a040 100644
--- a/emulators/qemu70/files/patch-block_export_fuse.c
+++ b/emulators/qemu7/files/patch-block_export_fuse.c
diff --git a/emulators/qemu70/files/patch-bsd-user_host_i386_host-signal.h b/emulators/qemu7/files/patch-bsd-user_host_i386_host-signal.h
index 06a07c0f9425..06a07c0f9425 100644
--- a/emulators/qemu70/files/patch-bsd-user_host_i386_host-signal.h
+++ b/emulators/qemu7/files/patch-bsd-user_host_i386_host-signal.h
diff --git a/emulators/qemu70/files/patch-bsd-user_host_x86__64_host-signal.h b/emulators/qemu7/files/patch-bsd-user_host_x86__64_host-signal.h
index 1864eb788f03..1864eb788f03 100644
--- a/emulators/qemu70/files/patch-bsd-user_host_x86__64_host-signal.h
+++ b/emulators/qemu7/files/patch-bsd-user_host_x86__64_host-signal.h
diff --git a/emulators/qemu70/files/patch-meson.build b/emulators/qemu7/files/patch-meson.build
index e701a096e957..e701a096e957 100644
--- a/emulators/qemu70/files/patch-meson.build
+++ b/emulators/qemu7/files/patch-meson.build
diff --git a/emulators/qemu70/files/patch-util_meson.build b/emulators/qemu7/files/patch-util_meson.build
index 590b1f5a0592..590b1f5a0592 100644
--- a/emulators/qemu70/files/patch-util_meson.build
+++ b/emulators/qemu7/files/patch-util_meson.build
diff --git a/emulators/qemu70/files/qemu-ifdown.sample b/emulators/qemu7/files/qemu-ifdown.sample
index 89d9a9bff436..89d9a9bff436 100644
--- a/emulators/qemu70/files/qemu-ifdown.sample
+++ b/emulators/qemu7/files/qemu-ifdown.sample
diff --git a/emulators/qemu70/files/qemu-ifup.sample b/emulators/qemu7/files/qemu-ifup.sample
index 89d9a9bff436..89d9a9bff436 100644
--- a/emulators/qemu70/files/qemu-ifup.sample
+++ b/emulators/qemu7/files/qemu-ifup.sample
diff --git a/emulators/qemu70/pkg-descr b/emulators/qemu7/pkg-descr
index 592b7660dd49..592b7660dd49 100644
--- a/emulators/qemu70/pkg-descr
+++ b/emulators/qemu7/pkg-descr
diff --git a/emulators/qemu70/pkg-descr-tools b/emulators/qemu7/pkg-descr-tools
index b58edd81932b..b58edd81932b 100644
--- a/emulators/qemu70/pkg-descr-tools
+++ b/emulators/qemu7/pkg-descr-tools
diff --git a/emulators/qemu70/pkg-message b/emulators/qemu7/pkg-message
index 54a7ebc05d6d..54a7ebc05d6d 100644
--- a/emulators/qemu70/pkg-message
+++ b/emulators/qemu7/pkg-message
diff --git a/emulators/qemu70/pkg-plist b/emulators/qemu7/pkg-plist
index 00d0673675ba..00d0673675ba 100644
--- a/emulators/qemu70/pkg-plist
+++ b/emulators/qemu7/pkg-plist
diff --git a/emulators/qemu70/pkg-plist-tools b/emulators/qemu7/pkg-plist-tools
index 42b2a0ee3aeb..42b2a0ee3aeb 100644
--- a/emulators/qemu70/pkg-plist-tools
+++ b/emulators/qemu7/pkg-plist-tools