git: f2b487a6e9c7 - main - emulators/qemu-user-static{, -devel}: fix build on recent FreeBSD

[Kyle Evans]

The branch main has been updated by kevans:

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

commit f2b487a6e9c74a44c1a68595a442f65951d4007c
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2021-05-12 00:44:58 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-05-12 00:44:58 +0000

    emulators/qemu-user-static{,-devel}: fix build on recent FreeBSD
    
    This updates both to 6ffee39fe2e4, which pulls in some patches to fix
    the build after a recent commit to main that was MFC'd to stable/13.
    
    While we're here, update qemu-user-static-devel to point to the current
    upstream. qemu-user-static-devel will likely be updated in the near
    future to point to imp's 6.0 rebase branch for Q/A.
    
    MFH:    2021Q2
---
 emulators/qemu-user-static-devel/Makefile | 4 ++--
 emulators/qemu-user-static-devel/distinfo | 6 +++---
 emulators/qemu-user-static/Makefile       | 4 ++--
 emulators/qemu-user-static/distinfo       | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/emulators/qemu-user-static-devel/Makefile b/emulators/qemu-user-static-devel/Makefile
index 65d5b27c1654..10f2a54073f8 100644
--- a/emulators/qemu-user-static-devel/Makefile
+++ b/emulators/qemu-user-static-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	qemu
 PORTVERSION=	3.1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-user-static-devel
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -16,7 +16,7 @@ CONFLICTS_INSTALL=	qemu-user-static-[0-9]*
 
 USES=		bison compiler:c11 gmake perl5 pkgconfig python:build
 USE_GITHUB=	yes
-GH_TUPLE=	seanbruno:qemu-bsd-user:74de8c0708	\
+GH_TUPLE=	qemu-bsd-user:qemu-bsd-user:6ffee39fe2e49944	\
 		qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb
 HAS_CONFIGURE=	yes
 USE_PERL5=	build
diff --git a/emulators/qemu-user-static-devel/distinfo b/emulators/qemu-user-static-devel/distinfo
index e3ab93d2b6a4..709a97937296 100644
--- a/emulators/qemu-user-static-devel/distinfo
+++ b/emulators/qemu-user-static-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1607041204
-SHA256 (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-74de8c0708_GH0.tar.gz) = d987e290523f3ff96c7c2a0b691e2074d22cef85178adbeffb702d65a6a080ba
-SIZE (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-74de8c0708_GH0.tar.gz) = 16904437
+TIMESTAMP = 1620780258
+SHA256 (qemu/3.1.0/qemu-bsd-user-qemu-bsd-user-3.1.0-6ffee39fe2e49944_GH0.tar.gz) = 82231d6e7a0fbf44861e51a3fd472ca316c704c287aa5f85ed4366e7701fa0bf
+SIZE (qemu/3.1.0/qemu-bsd-user-qemu-bsd-user-3.1.0-6ffee39fe2e49944_GH0.tar.gz) = 16909652
 SHA256 (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a
 SIZE (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895
diff --git a/emulators/qemu-user-static/Makefile b/emulators/qemu-user-static/Makefile
index 4dea0115e01e..b991e1a7d954 100644
--- a/emulators/qemu-user-static/Makefile
+++ b/emulators/qemu-user-static/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	qemu
 PORTVERSION=	3.1.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-user-static
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -16,7 +16,7 @@ CONFLICTS_INSTALL=	qemu-user-static-devel-[0-9]*
 
 USES=		bison compiler:c11 gmake perl5 pkgconfig python:build
 USE_GITHUB=	yes
-GH_TUPLE=	qemu-bsd-user:qemu-bsd-user:bbf9ac7959ec	\
+GH_TUPLE=	qemu-bsd-user:qemu-bsd-user:6ffee39fe2e4	\
 		qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb
 HAS_CONFIGURE=	yes
 USE_PERL5=	build
diff --git a/emulators/qemu-user-static/distinfo b/emulators/qemu-user-static/distinfo
index ceb9e92608c7..cc50fc1d6398 100644
--- a/emulators/qemu-user-static/distinfo
+++ b/emulators/qemu-user-static/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1615557532
-SHA256 (qemu/3.1.0/qemu-bsd-user-qemu-bsd-user-3.1.0-bbf9ac7959ec_GH0.tar.gz) = 2d13303594e7b05858c7a7d2dfc6955812c5c644a670d0803bb0db38b57f7e9c
-SIZE (qemu/3.1.0/qemu-bsd-user-qemu-bsd-user-3.1.0-bbf9ac7959ec_GH0.tar.gz) = 16909061
+TIMESTAMP = 1620780144
+SHA256 (qemu/3.1.0/qemu-bsd-user-qemu-bsd-user-3.1.0-6ffee39fe2e4_GH0.tar.gz) = 8fa9f6b6641e8e9b926c1078f8e7e3442eea4f9600d65f803dfe4ed891dab4ec
+SIZE (qemu/3.1.0/qemu-bsd-user-qemu-bsd-user-3.1.0-6ffee39fe2e4_GH0.tar.gz) = 16907391
 SHA256 (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a
 SIZE (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895