- 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, 20 deletions

diff --git a/emulators/qemu-devel/files/extra-patch-bsd-user-syscall.c b/emulators/qemu-devel/files/extra-patch-bsd-user-syscall.c
deleted file mode 100644
index 1dda197e9c3d..000000000000
--- a/emulators/qemu-devel/files/extra-patch-bsd-user-syscall.c
+++ /dev/null
@@ -1,20 +0,0 @@
-From nox Mon Sep 17 00:00:00 2001
-From: Juergen Lock <nox@jelal.kn-bremen.de>
-Date: 05 Apr 2014 02:04:00 +0200
-Subject: Fix bsd-user FreeBSD fchflags() syscall (typo)
-
-Fix bsd-user FreeBSD fchflags() syscall. (typo)
-
-Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>
-
---- a/bsd-user/syscall.c
-+++ b/bsd-user/syscall.c
-@@ -627,7 +627,7 @@ abi_long do_freebsd_syscall(void *cpu_en
-         break;
- 
-     case TARGET_FREEBSD_NR_fchflags: /* fchflags(2) */
--        ret = do_bsd_fchflags(arg2, arg2);
-+        ret = do_bsd_fchflags(arg1, arg2);
-         break;
- 
-     case TARGET_FREEBSD_NR_chroot: /* chroot(2) */