A couple of portlint nits for tabs/spaces and a proper WWW note in a

URL in the pkg-descr.

Install stripped enabled for ivshmem* and the palcode-clipper utility.

Drop patch for procctl() and commit it upstream.

4 files changed, 12 insertions, 28 deletions

diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile
index 25c5fd6de713..3f25e2639817 100644
--- a/emulators/qemu-sbruno/Makefile
+++ b/emulators/qemu-sbruno/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qemu
-PORTVERSION=	2.5.50.g20160213
+PORTVERSION=	2.5.50.g20160215
 CATEGORIES=	emulators
 MASTER_SITES=	GH \
 		LOCAL/nox:dtc \
@@ -18,7 +18,7 @@ COMMENT?=	QEMU CPU Emulator - github bsd-user branch
 USE_GITHUB=	yes
 GH_ACCOUNT=	seanbruno
 GH_PROJECT=	${PORTNAME}-bsd-user
-GH_TAGNAME=	9522a30
+GH_TAGNAME=	cada59f
 HAS_CONFIGURE=	yes
 USES=		gmake pkgconfig bison perl5 python:2,build
 USE_PERL5=	build
@@ -118,10 +118,6 @@ PLIST_SUB+=	SOFTMMU=""
 PLIST_SUB+=	STATIC=""
 .endif
 
-#.if ${PORT_OPTIONS:MGNS3}
-#EXTRA_PATCHES+=	${FILESDIR}/hw_e1000_c.patch
-#.endif
-
 WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc=${CC} --enable-docs \
@@ -197,7 +193,7 @@ CONFIGURE_ARGS+=	--disable-pcap
 
 .if ${PORT_OPTIONS:MSTATIC_LINK}
 .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MX11}
-IGNORE=		X11 ui cannot be built static
+IGNORE=		the X11 ui cannot be built static
 .endif
 CONFIGURE_ARGS+=	--static
 .endif
@@ -230,10 +226,10 @@ MAKE_ARGS+=	ARCH=ppc64
 .endif
 
 .if ${ARCH} == "sparc64"
-CONFIGURE_ARGS+= --sparc_cpu=v9
+CONFIGURE_ARGS+=	--sparc_cpu=v9
 .endif
 
-CONFIGURE_ARGS+= --python=${PYTHON_CMD}
+CONFIGURE_ARGS+=	--python=${PYTHON_CMD}
 
 # -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC)
 # but it shouldn't matter much
@@ -278,6 +274,8 @@ post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ivshmem-*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/qemu/palcode-clipper
 .endif
 
 .include <bsd.port.mk>
diff --git a/emulators/qemu-sbruno/distinfo b/emulators/qemu-sbruno/distinfo
index 7f88fb6e8439..ddcacf9d06ae 100644
--- a/emulators/qemu-sbruno/distinfo
+++ b/emulators/qemu-sbruno/distinfo
@@ -1,4 +1,4 @@
-SHA256 (qemu/2.5.50.g20160213/seanbruno-qemu-bsd-user-2.5.50.g20160213-9522a30_GH0.tar.gz) = 99b85c461cf12e7098ace4d7a964b579a80dd90d3036f75788f8d81d674f9d6c
-SIZE (qemu/2.5.50.g20160213/seanbruno-qemu-bsd-user-2.5.50.g20160213-9522a30_GH0.tar.gz) = 11850660
-SHA256 (qemu/2.5.50.g20160213/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
-SIZE (qemu/2.5.50.g20160213/dtc-v1.4.0.tar.gz) = 131893
+SHA256 (qemu/2.5.50.g20160215/seanbruno-qemu-bsd-user-2.5.50.g20160215-cada59f_GH0.tar.gz) = b685dda3b52eaa2041a88635de1c7d165f430f8ebd978dc2f4708e088bc86537
+SIZE (qemu/2.5.50.g20160215/seanbruno-qemu-bsd-user-2.5.50.g20160215-cada59f_GH0.tar.gz) = 11849937
+SHA256 (qemu/2.5.50.g20160215/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
+SIZE (qemu/2.5.50.g20160215/dtc-v1.4.0.tar.gz) = 131893
diff --git a/emulators/qemu-sbruno/files/patch-bsd-user-freebsd-os-proc.c b/emulators/qemu-sbruno/files/patch-bsd-user-freebsd-os-proc.c
deleted file mode 100644
index 3da008cb4ec6..000000000000
--- a/emulators/qemu-sbruno/files/patch-bsd-user-freebsd-os-proc.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/bsd-user/freebsd/os-proc.c
-+++ b/bsd-user/freebsd/os-proc.c
-@@ -365,8 +365,10 @@ execve_end:
- #endif
- 
- #if defined(__FreeBSD_version) && __FreeBSD_version >= 1001510
--
- #include <sys/procctl.h>
-+#endif
-+
-+#if defined(__FreeBSD_version) && __FreeBSD_version >= 1001510 && defined(PROC_REAP_ACQUIRE)
- 
- static abi_long
- t2h_procctl_cmd(int target_cmd, int *host_cmd)
diff --git a/emulators/qemu-sbruno/pkg-descr b/emulators/qemu-sbruno/pkg-descr
index ff08c4afa0dc..7f0ff5c6413c 100644
--- a/emulators/qemu-sbruno/pkg-descr
+++ b/emulators/qemu-sbruno/pkg-descr
@@ -13,7 +13,7 @@ cross-debugging.
 
 As QEMU requires no host kernel patches to run, it is very safe and easy to use.
 
-http://wiki.qemu.org/Main_Page
+WWW: http://wiki.qemu.org/Main_Page
 
 This is building sbruno's bsd-user github branch: