svn commit: r519943 - in head/emulators: qemu-sbruno qemu-user-static-devel

[Kyle Evans]

Author: kevans (src committer)
Date: Thu Dec 12 18:47:31 2019
New Revision: 519943
URL: https://svnweb.freebsd.org/changeset/ports/519943

Log:
  emulators/qemu-user-static{,-devel}: unbreak after base r355641
  
  r355641 added sigorset to base, which collides with sigorset in
  qemu-user-static. This is effectively a patch (applied in the qemu-bsd-user
  repo) that makes the qemu version private and uses that for now, until
  sigorset in FreeBSD stabilizes across older branches.
  
  Approved by:	0mp (ports)

Modified:
  head/emulators/qemu-sbruno/Makefile
  head/emulators/qemu-sbruno/distinfo
  head/emulators/qemu-user-static-devel/Makefile
  head/emulators/qemu-user-static-devel/distinfo

Modified: head/emulators/qemu-sbruno/Makefile
==============================================================================
--- head/emulators/qemu-sbruno/Makefile	Thu Dec 12 17:23:30 2019	(r519942)
+++ head/emulators/qemu-sbruno/Makefile	Thu Dec 12 18:47:31 2019	(r519943)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qemu
-PORTVERSION=	2.11.50.g20191112
+PORTVERSION=	2.11.50.g20191211
 CATEGORIES=	emulators
 PKGNAMESUFFIX?=	-sbruno
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -12,7 +12,7 @@ COMMENT?=	QEMU CPU Emulator - github bsd-user branch
 
 LICENSE=	GPLv2
 USE_GITHUB=	yes
-GH_TUPLE=	seanbruno:qemu-bsd-user:b581800	\
+GH_TUPLE=	seanbruno:qemu-bsd-user:d587db6	\
 		qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb
 HAS_CONFIGURE=	yes
 USES=		bison compiler:c11 gmake perl5 pkgconfig python:2.7,build

Modified: head/emulators/qemu-sbruno/distinfo
==============================================================================
--- head/emulators/qemu-sbruno/distinfo	Thu Dec 12 17:23:30 2019	(r519942)
+++ head/emulators/qemu-sbruno/distinfo	Thu Dec 12 18:47:31 2019	(r519943)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1573592353
-SHA256 (qemu/2.11.50.g20191112/seanbruno-qemu-bsd-user-2.11.50.g20191112-b581800_GH0.tar.gz) = d4dd9ab5fcc7c72f63f1068ff443bb9b0b14c87334e7aa18d147596f139ffa0d
-SIZE (qemu/2.11.50.g20191112/seanbruno-qemu-bsd-user-2.11.50.g20191112-b581800_GH0.tar.gz) = 15511875
-SHA256 (qemu/2.11.50.g20191112/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a
-SIZE (qemu/2.11.50.g20191112/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895
+TIMESTAMP = 1576119749
+SHA256 (qemu/2.11.50.g20191211/seanbruno-qemu-bsd-user-2.11.50.g20191211-d587db6_GH0.tar.gz) = f7810f4b8754b2e051ac498fd784b5a55e1b3496cdb9df9371c785355d017739
+SIZE (qemu/2.11.50.g20191211/seanbruno-qemu-bsd-user-2.11.50.g20191211-d587db6_GH0.tar.gz) = 15512736
+SHA256 (qemu/2.11.50.g20191211/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a
+SIZE (qemu/2.11.50.g20191211/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895

Modified: head/emulators/qemu-user-static-devel/Makefile
==============================================================================
--- head/emulators/qemu-user-static-devel/Makefile	Thu Dec 12 17:23:30 2019	(r519942)
+++ head/emulators/qemu-user-static-devel/Makefile	Thu Dec 12 18:47:31 2019	(r519943)
@@ -2,6 +2,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-user-static-devel
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -17,7 +18,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:0337421f238	\
+GH_TUPLE=	seanbruno:qemu-bsd-user:e21442a	\
 		qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb
 HAS_CONFIGURE=	yes
 USE_PERL5=	build

Modified: head/emulators/qemu-user-static-devel/distinfo
==============================================================================
--- head/emulators/qemu-user-static-devel/distinfo	Thu Dec 12 17:23:30 2019	(r519942)
+++ head/emulators/qemu-user-static-devel/distinfo	Thu Dec 12 18:47:31 2019	(r519943)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1574823953
-SHA256 (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-0337421f238_GH0.tar.gz) = 7ae7340a2b99e24e0d85b8d632ecef41ddd3ef76382af4dbe6dab082d3c4d16a
-SIZE (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-0337421f238_GH0.tar.gz) = 16903184
+TIMESTAMP = 1576119784
+SHA256 (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-e21442a_GH0.tar.gz) = 8396a53fbf6f46f89327bc0b747aca928dc21916f67952f938f6c527ccab8cfd
+SIZE (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-e21442a_GH0.tar.gz) = 16902208
 SHA256 (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a
 SIZE (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895