git: 928b73b50bf1 - main - emulators/qemu: Update version 6.1.0=>6.2.0

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Wed, 15 Dec 2021 18:48:51 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=928b73b50bf1411e915563801d82b1ed38235c3d

commit 928b73b50bf1411e915563801d82b1ed38235c3d
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2021-12-15 18:47:32 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2021-12-15 18:48:37 +0000

    emulators/qemu: Update version 6.1.0=>6.2.0
    
    Relnotes: https://wiki.qemu.org/ChangeLog/6.2
---
 emulators/qemu/Makefile              |  5 ++---
 emulators/qemu/distinfo              | 10 +++-------
 emulators/qemu/files/patch-configure | 21 ---------------------
 emulators/qemu/pkg-plist             |  1 +
 4 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 01a98f31421e..91af05ec4496 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,8 +1,7 @@
 # Created by: Juergen Lock <nox@jelal.kn-bremen.de>
 
 PORTNAME=	qemu
-PORTVERSION=	6.1.0
-PORTREVISION=	3
+PORTVERSION=	6.2.0
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -135,7 +134,7 @@ CONFIGURE_ARGS+=--localstatedir=/var --extra-ldflags=-L/usr/lib \
 		--extra-ldflags=-L${LOCALBASE}/lib \
 		--prefix=${PREFIX} --cc=${CC} --disable-kvm \
 		--disable-linux-user --disable-linux-aio --disable-xen \
-		--python=${PYTHON_CMD} \
+		--python=${PYTHON_CMD} --mandir=${PREFIX}/man \
 		--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"
 
 .if ${FLAVOR:U} != tools
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index c2e256758269..be4bf5295273 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1638663814
-SHA256 (qemu/6.1.0/qemu-6.1.0.tar.xz) = eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96
-SIZE (qemu/6.1.0/qemu-6.1.0.tar.xz) = 111258808
-SHA256 (qemu/6.1.0/55765822804f.patch) = 10c2cc93ad01b02d854e26a9e445ba22bb5434dda1ef25baeb979be6292fa8ef
-SIZE (qemu/6.1.0/55765822804f.patch) = 2271
-SHA256 (qemu/6.1.0/aa4d30f6618d.patch) = eeddc5f5e08a460d2c133b4193d115fa1f00f206e0833f33ec66379981473efe
-SIZE (qemu/6.1.0/aa4d30f6618d.patch) = 2211
+TIMESTAMP = 1639582833
+SHA256 (qemu/6.2.0/qemu-6.2.0.tar.xz) = 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45
+SIZE (qemu/6.2.0/qemu-6.2.0.tar.xz) = 115667324
diff --git a/emulators/qemu/files/patch-configure b/emulators/qemu/files/patch-configure
deleted file mode 100644
index 4e00150cb80e..000000000000
--- a/emulators/qemu/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig	2021-08-24 17:35:40 UTC
-+++ configure
-@@ -1640,7 +1640,7 @@ if test "$mingw32" = "yes" ; then
- else
-     bindir="${bindir:-$prefix/bin}"
- fi
--mandir="${mandir:-$prefix/share/man}"
-+mandir="${mandir:-$prefix/man}"
- datadir="${datadir:-$prefix/share}"
- docdir="${docdir:-$prefix/share/doc}"
- sysconfdir="${sysconfdir:-$prefix/etc}"
-@@ -4612,6 +4612,9 @@ echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $confi
- # if this macro is set.
- if test "$have_fsxattr" = "yes" ; then
-     echo "HAVE_FSXATTR=y" >> $config_host_mak
-+fi
-+if test "$have_ifaddrs_h" = "yes" ; then
-+    echo "HAVE_IFADDRS_H=y" >> $config_host_mak
- fi
- if test "$xen" = "enabled" ; then
-   echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak
diff --git a/emulators/qemu/pkg-plist b/emulators/qemu/pkg-plist
index d1492cc97c8a..badf1fd8c7d4 100644
--- a/emulators/qemu/pkg-plist
+++ b/emulators/qemu/pkg-plist
@@ -119,6 +119,7 @@ include/qemu-plugin.h
 %%DATADIR%%/linuxboot.bin
 %%LINUXBOOT_DMA%%%%DATADIR%%/linuxboot_dma.bin
 %%DATADIR%%/multiboot.bin
+%%DATADIR%%/multiboot_dma.bin
 %%DATADIR%%/npcm7xx_bootrom.bin
 %%DATADIR%%/openbios-ppc
 %%DATADIR%%/openbios-sparc32