Attempt to unbreak stage (pointed out by amdmi3/junovitch)

- Add ivshmem-client/server to the pkg-plist of qemu-sbruno.
- Forceably nuke ivshmem-client/server during the build of qemu-user-static.

Bump PORTREVISION.

3 files changed, 5 insertions, 0 deletions

diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile
index 3f25e2639817..b401b26b7ade 100644
--- a/emulators/qemu-sbruno/Makefile
+++ b/emulators/qemu-sbruno/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	2.5.50.g20160215
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	GH \
 		LOCAL/nox:dtc \
diff --git a/emulators/qemu-sbruno/pkg-plist b/emulators/qemu-sbruno/pkg-plist
index 099ad99b3a04..2a6ff15661f5 100644
--- a/emulators/qemu-sbruno/pkg-plist
+++ b/emulators/qemu-sbruno/pkg-plist
@@ -2,6 +2,8 @@
 %%SOFTMMU%%bin/qemu-img
 %%SOFTMMU%%bin/qemu-io
 %%SOFTMMU%%bin/qemu-nbd
+%%SOFTMMU%%bin/ivshmem-client
+%%SOFTMMU%%bin/ivshmem-server
 %%NONX86%%bin/qemu-system-aarch64
 %%NONX86%%bin/qemu-system-alpha
 %%NONX86%%bin/qemu-system-arm
diff --git a/emulators/qemu-user-static/Makefile b/emulators/qemu-user-static/Makefile
index 26eeecda7895..0e9368bf17f3 100644
--- a/emulators/qemu-user-static/Makefile
+++ b/emulators/qemu-user-static/Makefile
@@ -18,6 +18,8 @@ post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/bin/qemu-img
 	@${RM} -r ${STAGEDIR}${PREFIX}/bin/qemu-io
 	@${RM} -r ${STAGEDIR}${PREFIX}/bin/qemu-nbd
+	@${RM} -r ${STAGEDIR}${PREFIX}/bin/ivshmem-client
+	@${RM} -r ${STAGEDIR}${PREFIX}/bin/ivshmem-server
 	@${MV} ${STAGEDIR}${PREFIX}/etc/rc.d ${WRKDIR}
 	@${RM} -r ${STAGEDIR}${PREFIX}/etc
 .if exists(/usr/sbin/binmiscctl)