git: 96f234ff60fa - main - emulators/qemu-user-static-devel: Fix build on 12 and 13

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/ports/commit/?id=96f234ff60fa5f29a79d3dcaf14d46a77e97a99b

commit 96f234ff60fa5f29a79d3dcaf14d46a77e97a99b
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-02-04 18:55:44 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-02-04 19:28:58 +0000

    emulators/qemu-user-static-devel: Fix build on 12 and 13
    
    The last update broke the build on FreeBSD 12 and 13. This fixes that
    with the upstreamed fix. It also moves to a slightly newer upstream
    version and resolves a number of accumulated conflicts.
---
 emulators/qemu-user-static-devel/Makefile | 4 ++--
 emulators/qemu-user-static-devel/distinfo | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/emulators/qemu-user-static-devel/Makefile b/emulators/qemu-user-static-devel/Makefile
index de3918e73a96..9c02b6dc9f2c 100644
--- a/emulators/qemu-user-static-devel/Makefile
+++ b/emulators/qemu-user-static-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	qemu
 PORTVERSION=	6.2.50
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-user-static-devel
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libglib-2.0.a:devel/glib20 \
 USES=		bison compiler:c11 cpe gmake ninja:build perl5 pkgconfig python:build
 
 USE_GITHUB=	yes
-GH_TUPLE=	qemu-bsd-user:qemu-bsd-user:93dc565013e \
+GH_TUPLE=	qemu-bsd-user:qemu-bsd-user:64ff0f053df \
 		qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb
 
 HAS_CONFIGURE=	yes
diff --git a/emulators/qemu-user-static-devel/distinfo b/emulators/qemu-user-static-devel/distinfo
index c2cd566664a8..0df9b90945cb 100644
--- a/emulators/qemu-user-static-devel/distinfo
+++ b/emulators/qemu-user-static-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1643407242
-SHA256 (qemu/6.2.50/qemu-bsd-user-qemu-bsd-user-6.2.50-93dc565013e_GH0.tar.gz) = 12bf8adc994e0d1e1683b673f035816316a9ef20d75af549b33fc9203aa731a3
-SIZE (qemu/6.2.50/qemu-bsd-user-qemu-bsd-user-6.2.50-93dc565013e_GH0.tar.gz) = 32163915
+TIMESTAMP = 1643999565
+SHA256 (qemu/6.2.50/qemu-bsd-user-qemu-bsd-user-6.2.50-64ff0f053df_GH0.tar.gz) = 5671ea6e1cbf7fd81a0a256d4c93271cfb7b96805910af1f4a249802df290dcb
+SIZE (qemu/6.2.50/qemu-bsd-user-qemu-bsd-user-6.2.50-64ff0f053df_GH0.tar.gz) = 31606163
 SHA256 (qemu/6.2.50/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a
 SIZE (qemu/6.2.50/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895