Index: branches/2017Q1/emulators/citra/Makefile
===================================================================
--- branches/2017Q1/emulators/citra/Makefile	(revision 431879)
+++ branches/2017Q1/emulators/citra/Makefile	(revision 431880)
@@ -1,72 +1,72 @@
 # $FreeBSD$
 
 PORTNAME=	citra
-PORTVERSION=	s20161230
-PORTREVISION?=	1
+PORTVERSION=	s20170119
+PORTREVISION?=	0
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Nintendo 3DS emulator/debugger
 
 LICENSE=	BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ LGPL21+ UNLICENSE
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/externals/dynarmic/externals/fmt/LICENSE.rst
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt
 LICENSE_FILE_BSL=	${WRKSRC}/externals/catch/LICENSE_1_0.txt
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/license.txt
 LICENSE_FILE_LGPL21+ =	${WRKSRC}/externals/qhexedit/license.txt
 LICENSE_NAME_UNLICENSE=	The Unlicense
 LICENSE_TEXT_UNLICENSE=	See http://unlicense.org/
 LICENSE_PERMS_UNLICENSE=	${_LICENSE_PERMS_PD}
 LICENSE_GROUPS_UNLICENSE=	${_LICENSE_GROUPS_PD}
 
 BUILD_DEPENDS=	boost-libs>=1.57:devel/boost-libs
 LIB_DEPENDS=	libpng.so:graphics/png
 
 # backend_x64/hostloc.h:93:8: fatal error: no type named 'Reg64' in namespace 'Xbyak'
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	https://github.com/MerryMage/dynarmic/issues/35
 
 USE_GITHUB=	yes
-GH_TUPLE=	citra-emu:${PORTNAME}:f7dd8d5e \
+GH_TUPLE=	citra-emu:${PORTNAME}:ebe01506 \
 		citra-emu:ext-soundtouch:5274ec4:soundtouch/externals/soundtouch \
-		MerryMage:dynarmic:70f4235:dynarmic/externals/dynarmic \
+		MerryMage:dynarmic:3608208:dynarmic/externals/dynarmic \
 		fmtlib:fmt:3.0.0-146-g796beaa:fmt/externals/dynarmic/externals/fmt \
 		herumi:xbyak:v5.40:xbyak/externals/xbyak \
 		neobrain:nihstro:26a0a04:nihstro/externals/nihstro \
 		philsquared:Catch:v1.4.0:catch/externals/catch \
 		svn2github:inih:603729d:inih/externals/inih/inih
 
 USES=		cmake:outsource compiler:c++14-lang iconv localbase:ldflags
 FAVORITE_COMPILER=	${COMPILER_TYPE} # c++14-lib
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
 		-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
 LDFLAGS+=	-Wl,--as-needed # GL
 
 OPTIONS_MULTI=	GUI
 OPTIONS_MULTI_GUI=	QT5 SDL
 OPTIONS_SLAVE?=	SDL
 OPTIONS_EXCLUDE:=	${OPTIONS_MULTI_GUI}
 
 SDL_USE=	SDL=sdl2
 SDL_CMAKE_BOOL=	ENABLE_SDL2
 SDL_PLIST_FILES=bin/${PORTNAME} \
 		man/man6/${PORTNAME}.6.gz
 
 QT5_USES=	desktop-file-utils shared-mime-info
 QT5_USE=	QT5=qmake_build,buildtools_build,core,gui,opengl,widgets
 QT5_CMAKE_BOOL=	ENABLE_QT
 QT5_PLIST_FILES=bin/${PORTNAME}-qt \
 		man/man6/${PORTNAME}-qt.6.gz \
 		share/applications/${PORTNAME}.desktop \
 		share/mime/packages/${PORTNAME}.xml \
 		share/pixmaps/${PORTNAME}.svg
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,share/man,man,' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \
 		-e 's/@GIT_DESC@/${GH_TAGNAME}/' \
 		${WRKSRC}/src/common/scm_rev.cpp.in
 
 .include <bsd.port.mk>
Index: branches/2017Q1/emulators/citra/distinfo
===================================================================
--- branches/2017Q1/emulators/citra/distinfo	(revision 431879)
+++ branches/2017Q1/emulators/citra/distinfo	(revision 431880)
@@ -1,17 +1,17 @@
-TIMESTAMP = 1483109516
-SHA256 (citra-emu-citra-s20161230-f7dd8d5e_GH0.tar.gz) = 48945e446e13a8c28a634b41f6002acb7d5ce6b25897e8fa185ae103e2948664
-SIZE (citra-emu-citra-s20161230-f7dd8d5e_GH0.tar.gz) = 2236739
+TIMESTAMP = 1484800259
+SHA256 (citra-emu-citra-s20170119-ebe01506_GH0.tar.gz) = c244491e17669342f960162905f74699a985384afdb51986c44ba8ac4133d440
+SIZE (citra-emu-citra-s20170119-ebe01506_GH0.tar.gz) = 2240677
 SHA256 (citra-emu-ext-soundtouch-5274ec4_GH0.tar.gz) = de5e101818ba38b5ea30d8cde0b2b788b53bc7c0f5d77b380b8968569872c2cb
 SIZE (citra-emu-ext-soundtouch-5274ec4_GH0.tar.gz) = 34535
-SHA256 (MerryMage-dynarmic-70f4235_GH0.tar.gz) = 19a6df51bd703e1710c961745c09cc582365d72eef8be1b46a30e761c37a003b
-SIZE (MerryMage-dynarmic-70f4235_GH0.tar.gz) = 317153
+SHA256 (MerryMage-dynarmic-3608208_GH0.tar.gz) = 1376b8d6f91808f42a4d4a0be85f88c0b99200a704ed64b62814cb1836cb40d1
+SIZE (MerryMage-dynarmic-3608208_GH0.tar.gz) = 315933
 SHA256 (fmtlib-fmt-3.0.0-146-g796beaa_GH0.tar.gz) = e5b0b3055082d9dc2b56509d8a11032fdeb3ab846feb5369591ccf58593446f9
 SIZE (fmtlib-fmt-3.0.0-146-g796beaa_GH0.tar.gz) = 612701
 SHA256 (herumi-xbyak-v5.40_GH0.tar.gz) = 106bbe15dc7e5d025ff98d1b5dd62a3f0a26d2569debe77fcde14852d50a66e1
 SIZE (herumi-xbyak-v5.40_GH0.tar.gz) = 203521
 SHA256 (neobrain-nihstro-26a0a04_GH0.tar.gz) = 8d94e57f5a9aebf976e4df3c7a0c69d4a0c4a6f2c3d0e4d464a7f09a826b345f
 SIZE (neobrain-nihstro-26a0a04_GH0.tar.gz) = 110136
 SHA256 (philsquared-Catch-v1.4.0_GH0.tar.gz) = b225e9828291636745db75e42cd604b8d755dcad0c5235fc90d7c725c4b49fb1
 SIZE (philsquared-Catch-v1.4.0_GH0.tar.gz) = 311263
 SHA256 (svn2github-inih-603729d_GH0.tar.gz) = b4faa364c3e33261707d4b669e1c669ca3818d7b9515c15fe0befd9df3f1f00a
 SIZE (svn2github-inih-603729d_GH0.tar.gz) = 8342
Index: branches/2017Q1/emulators/citra-qt5/Makefile
===================================================================
--- branches/2017Q1/emulators/citra-qt5/Makefile	(revision 431879)
+++ branches/2017Q1/emulators/citra-qt5/Makefile	(revision 431880)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-qt5
 
 MASTERDIR=	${.CURDIR}/../citra
 
 OPTIONS_SLAVE=	QT5
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 431879)
+++ branches/2017Q1	(revision 431880)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r431870