emulators/qemu7: Update version 7.0.0=>7.2.1

Merge the relevant port files from emulators/qemu. This is most probably
going to be the last version update untill Qemu releases version 9 and
we phase this out.

Author: 5u623l20

emulators/qemu7/Makefile

@@ -1,25 +1,25 @@
 PORTNAME=	qemu
-PORTVERSION=	7.0.0
+PORTVERSION=	7.2.1
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 DIST_SUBDIR=	qemu/${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	QEMU CPU Emulator ${${FLAVOR}_COMMENT} - 7.X.x
+COMMENT=	QEMU CPU Emulator ${${FLAVOR}_COMMENT} - 7.X.X
 WWW=		https://www.qemu.org/
 
 LICENSE=	GPLv2
 
 .if ${FLAVOR:U} != tools
-ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le
+ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 # We need to check if it build with other ARCHS
-# For i386 we have unknown type name 'vm_page_t'
 .endif
 
 BUILD_DEPENDS=	bash:shells/bash
 .if ${FLAVOR:U} != tools
 LIB_DEPENDS+=	libfdt.so:sysutils/dtc \
-		libzstd.so:archivers/zstd
+		libzstd.so:archivers/zstd \
+		libslirp.so:net/libslirp
 .endif
 .if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools)
 LIB_DEPENDS+=	libepoxy.so:graphics/libepoxy
@@ -35,7 +35,8 @@ nox11_CONFLICTS_INSTALL=	qemu qemu-devel qemu6*
 nox11_COMMENT=			(without X11)
 tools_PKGNAMESUFFIX=		7-tools
 tools_COMMENT=			(tools only)
-tools_CONFLICTS_INSTALL=	qemu qemu-devel qemu-nox11 qemu-utils qemu6*
+tools_CONFLICTS_INSTALL=	qemu qemu-devel qemu-nox11 qemu-utils qemu6* \
+				qemu-guest-agent
 tools_DESCR=			${.CURDIR}/pkg-descr-tools
 tools_PLIST=			${.CURDIR}/pkg-plist-tools
 
@@ -51,6 +52,7 @@ USE_GNOME+=	cairo
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--cc=${CC} \
+			--disable-guest-agent \
 			--disable-kvm \
 			--disable-linux-aio \
 			--disable-linux-user \
@@ -77,7 +79,6 @@ CONFIGURE_ARGS+=	--disable-attr \
 			--disable-fdt \
 			--disable-gcrypt \
 			--disable-glusterfs \
-			--disable-guest-agent \
 			--disable-libnfs \
 			--disable-libusb \
 			--disable-lzo \
@@ -139,7 +140,7 @@ USBREDIR_DESC=			usb device network redirection (experimental!)
 VDE_DESC=			vde dependency (for vde networking)
 X86_TARGETS_DESC=		Build only x86 system targets
 CAPSTONE_LIB_DEPENDS=		libcapstone.so:devel/capstone4
-CAPSTONE_CONFIGURE_ON=		--enable-capstone=system \
+CAPSTONE_CONFIGURE_ON=		--enable-capstone \
 				--extra-cflags=-I${LOCALBASE}/include/capstone
 CAPSTONE_CONFIGURE_OFF=		--disable-capstone
 CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
@@ -167,7 +168,7 @@ OPENGL_USES=			gl
 OPENGL_USE=			GL=gbm,gl
 OPENGL_CONFIGURE_OFF=		--disable-opengl
 PNG_LIB_DEPENDS=		libpng.so:graphics/png
-PNG_CONFIGURE_OFF=		--disable-vnc-png
+PNG_CONFIGURE_OFF=		--disable-png
 SAMBA_USES=			samba:run # smbd
 SAMBA_CONFIGURE_ON=		--smbd=${LOCALBASE}/sbin/smbd
 SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
@@ -236,8 +237,8 @@ post-install:
 .if ${FLAVOR:U} != tools
 	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-*
 .endif
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-*
 
 post-install-DOCS-on:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/)

emulators/qemu7/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1650583782
-SHA256 (qemu/7.0.0/qemu-7.0.0.tar.xz) = f6b375c7951f728402798b0baabb2d86478ca53d44cedbefabbe1c46bf46f839
-SIZE (qemu/7.0.0/qemu-7.0.0.tar.xz) = 125117636
+TIMESTAMP = 1681497374
+SHA256 (qemu/7.2.1/qemu-7.2.1.tar.xz) = 8c85699acf9d7a43a5fe29a64cdd56370b0c2d1ad074baf7098a824d17aad73b
+SIZE (qemu/7.2.1/qemu-7.2.1.tar.xz) = 122400592

emulators/qemu7/files/patch-bsd-user_host_i386_host-signal.h

@@ -1,12 +1,10 @@
---- bsd-user/host/i386/host-signal.h.orig	2022-09-08 16:00:45 UTC
+--- bsd-user/host/i386/host-signal.h.orig	2022-12-14 16:28:45 UTC
 +++ bsd-user/host/i386/host-signal.h
-@@ -9,6 +9,9 @@
- #ifndef I386_HOST_SIGNAL_H
- #define I386_HOST_SIGNAL_H
- 
-+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <sys/param.h>
-+#endif
+@@ -12,6 +12,7 @@
+ #include <sys/param.h>
  #include <sys/ucontext.h>
  #include <machine/trap.h>
++#include <vm/vm.h>
  #include <vm/pmap.h>
+ #include <machine/pmap.h>
+ 

emulators/qemu7/files/patch-bsd-user_host_x86__64_host-signal.h

@@ -1,6 +1,6 @@
---- meson.build.orig	2022-04-19 19:10:27 UTC
+--- meson.build.orig	2022-12-14 16:28:45 UTC
 +++ meson.build
-@@ -2505,14 +2505,10 @@ if have_system
+@@ -2719,14 +2719,10 @@ if have_system
    fdt_opt = get_option('fdt')
    if fdt_opt in ['enabled', 'auto', 'system']
      have_internal = fs.exists(meson.current_source_dir() / 'dtc/libfdt/Makefile.libfdt')

emulators/qemu7/files/patch-meson.build

@@ -1,6 +1,6 @@
---- util/meson.build.orig	2022-04-23 11:59:28 UTC
+--- util/meson.build.orig	2022-12-14 16:28:45 UTC
 +++ util/meson.build
-@@ -87,10 +87,6 @@ if have_block
+@@ -97,10 +97,6 @@ if have_block
    util_ss.add(files('readline.c'))
    util_ss.add(files('throttle.c'))
    util_ss.add(files('timed-average.c'))

emulators/qemu7/files/patch-util_meson.build

@@ -14,6 +14,7 @@ bin/qemu-storage-daemon
 %%NO_X86_TARGETS%%bin/qemu-system-cris
 %%NO_X86_TARGETS%%bin/qemu-system-hppa
 bin/qemu-system-i386
+%%NO_X86_TARGETS%%bin/qemu-system-loongarch64
 %%NO_X86_TARGETS%%bin/qemu-system-m68k
 %%NO_X86_TARGETS%%bin/qemu-system-microblaze
 %%NO_X86_TARGETS%%bin/qemu-system-microblazeel
@@ -176,4 +177,5 @@ share/applications/qemu.desktop
 %%GTK3%%share/locale/it/LC_MESSAGES/qemu.mo
 %%GTK3%%share/locale/sv/LC_MESSAGES/qemu.mo
 %%GTK3%%share/locale/tr/LC_MESSAGES/qemu.mo
+%%GTK3%%share/locale/uk/LC_MESSAGES/qemu.mo
 %%GTK3%%share/locale/zh_CN/LC_MESSAGES/qemu.mo