Update qemu-sbruno to track my github repo.

 - Update MIPS user target to work on head after svn r286871
 - Bump UPDATING as this makes the current pkg incompatible with current
   prior to this revision.

Submitted by:	kan

4 files changed, 25 insertions, 12 deletions

diff --git a/UPDATING b/UPDATING
index 16c777a0af59..aca43671e19b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,18 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20151011:
+  AFFECTS: users of emulators/qemu-sbruno, emulators/qemu-user-static
+  AUTHOR: sbruno@FreeBSD.org
+
+  The Jemalloc update at svn r286871 introduced some TLS enhancements
+  for MIPS targets that require a bit of workaround.  Users who want 
+  to build MIPS packages should update their host systems past r286871
+  prior to upgrading their qemu-user-static/qemu-sbruno ports.
+  
+  Discussion about this can be found here:
+    https://lists.freebsd.org/pipermail/freebsd-mips/2015-October/004018.html
+
 20151006:
   AFFECTS: users of www/firefox, www/seamonkey
   AUTHOR: gecko@FreeBSD.org
diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile
index 5ec783f4986d..3e09ec29d8e7 100644
--- a/emulators/qemu-sbruno/Makefile
+++ b/emulators/qemu-sbruno/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qemu
-PORTVERSION=	2.4.50.g20150814
+PORTVERSION=	2.4.50.g20151011
 CATEGORIES=	emulators
 MASTER_SITES=	GH \
 		LOCAL/nox \
@@ -20,7 +20,7 @@ COMMENT?=	QEMU CPU Emulator - github bsd-user branch
 USE_GITHUB=	yes
 GH_ACCOUNT=	seanbruno
 GH_PROJECT=	${PORTNAME}-bsd-user
-GH_TAGNAME=	6764363
+GH_TAGNAME=	182181a
 HAS_CONFIGURE=	yes
 USES=		gmake pkgconfig bison perl5 python:2,build
 USE_PERL5=	build
diff --git a/emulators/qemu-sbruno/distinfo b/emulators/qemu-sbruno/distinfo
index 3060a1a5934c..9851eec90440 100644
--- a/emulators/qemu-sbruno/distinfo
+++ b/emulators/qemu-sbruno/distinfo
@@ -1,4 +1,4 @@
-SHA256 (qemu/2.4.50.g20150814/seanbruno-qemu-bsd-user-2.4.50.g20150814-6764363_GH0.tar.gz) = 6fef33fc642016ef762943e4327d6a88bff216121ec98157205ddcdc8c876870
-SIZE (qemu/2.4.50.g20150814/seanbruno-qemu-bsd-user-2.4.50.g20150814-6764363_GH0.tar.gz) = 11272282
-SHA256 (qemu/2.4.50.g20150814/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
-SIZE (qemu/2.4.50.g20150814/dtc-v1.4.0.tar.gz) = 131893
+SHA256 (qemu/2.4.50.g20151011/seanbruno-qemu-bsd-user-2.4.50.g20151011-182181a_GH0.tar.gz) = 815ed03da1450d4c3c12fcf4d21f1bd1ab2633ffdac60597957dc64e20a7719e
+SIZE (qemu/2.4.50.g20151011/seanbruno-qemu-bsd-user-2.4.50.g20151011-182181a_GH0.tar.gz) = 11311779
+SHA256 (qemu/2.4.50.g20151011/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
+SIZE (qemu/2.4.50.g20151011/dtc-v1.4.0.tar.gz) = 131893
diff --git a/emulators/qemu-sbruno/files/patch-Makefile b/emulators/qemu-sbruno/files/patch-Makefile
index f46724e62435..0139d8831f0e 100644
--- a/emulators/qemu-sbruno/files/patch-Makefile
+++ b/emulators/qemu-sbruno/files/patch-Makefile
@@ -1,18 +1,19 @@
---- Makefile.orig
-+++ Makefile
-@@ -83,7 +83,11 @@ LIBS+=-lz $(LIBS_TOOLS)
+--- Makefile.orig	2015-10-11 14:24:23.000000000 -0700
++++ Makefile	2015-10-11 14:52:24.499336000 -0700
+@@ -88,8 +88,12 @@
  HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
  
  ifdef BUILD_DOCS
 +ifdef NOPORTDOCS
-+DOCS=qemu.1 qemu-img.1 qemu-nbd.8
++DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
 +else
- DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qmp-commands.txt
+ DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
+ DOCS+=qmp-commands.txt
 +endif
  ifdef CONFIG_LINUX
  DOCS+=kvm_stat.1
  endif
-@@ -362,8 +366,10 @@ endif
+@@ -390,8 +394,10 @@
  
  install-doc: $(DOCS)
  	$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"