- Update emulators/qemu-sbruno to latest github snapshot, fixing

  the bsd-user targets on 8 and 9.
- Switch emulators/qemu-user-static to be slave of emulators/qemu-sbruno.
- Update emulators/qemu-devel to latest upstream release 2.2.0, now
  w/o bsd-user patches and knob again.  (Or at least until the
  patches are merged upstream...) [1]
- Add appropriate CONFLICTS to emulators/qemu too and bump its
  PORTREVISION.

Suggested by:	andrew [1] (for the benefit of testing aarch64 guests)

1 files changed, 0 insertions, 22 deletions

diff --git a/emulators/qemu-devel/files/extra-patch-bsd-user-trapsig b/emulators/qemu-devel/files/extra-patch-bsd-user-trapsig
deleted file mode 100644
index d19de61578e3..000000000000
--- a/emulators/qemu-devel/files/extra-patch-bsd-user-trapsig
+++ /dev/null
@@ -1,22 +0,0 @@
-From nox Mon Sep 17 00:00:00 2001
-From: Juergen Lock <nox@jelal.kn-bremen.de>
-Date: 06 Jul 2014 16:37:00 +0200
-Subject: bsd-user: writing to readonly page can cause trap 0xc on FreeBSD too
-
-Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>
-
---- a/user-exec.c
-+++ b/user-exec.c
-@@ -230,7 +230,12 @@ int cpu_signal_handler(int host_signum, 
- 
-     pc = PC_sig(uc);
-     return handle_cpu_signal(pc, (unsigned long)info->si_addr,
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-+                             (TRAP_sig(uc) == 0xe ||
-+                              TRAP_sig(uc) == 0xc) ?
-+#else
-                              TRAP_sig(uc) == 0xe ?
-+#endif
-                              (ERROR_sig(uc) >> 1) & 1 : 0,
-                              &MASK_sig(uc), puc);
- }