Index: branches/2018Q1/emulators/citra/Makefile
===================================================================
--- branches/2018Q1/emulators/citra/Makefile	(revision 458185)
+++ branches/2018Q1/emulators/citra/Makefile	(revision 458186)
@@ -1,77 +1,77 @@
 # $FreeBSD$
 
 PORTNAME=	citra
-PORTVERSION=	s20171231
+PORTVERSION=	s20180104
 PORTREVISION?=	0
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Nintendo 3DS emulator/debugger
 
 LICENSE=	BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ LGPL21+ MIT UNLICENSE
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/externals/fmt/LICENSE.rst
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt
 LICENSE_FILE_BSL=	${WRKSRC}/externals/catch/LICENSE.txt
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/license.txt
 LICENSE_FILE_MIT=	${WRKSRC}/externals/enet/LICENSE
 LICENSE_FILE_LGPL21+ =	${_LICENSE_STORE}/LGPL21 # soundtouch
 
 BUILD_DEPENDS=	boost-libs>=1.63: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_ACCOUNT=	citra-emu
-GH_TAGNAME=	e203c10c
+GH_TAGNAME=	a66e4585
 GH_TUPLE=	citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \
 		MerryMage:dynarmic:4110494:dynarmic/externals/dynarmic \
 		benhoyt:inih:r40:inih/externals/inih/inih \
 		catchorg:Catch2:v2.0.1:catch/externals/catch \
 		fmtlib:fmt:4.0.0:fmt/externals/fmt \
 		herumi:xbyak:v5.53-1-gc5da377:xbyak/externals/xbyak \
 		lsalzman:enet:a84c120:enet/externals/enet \
 		neobrain:nihstro:7e24743:nihstro/externals/nihstro \
 		weidai11:cryptopp:CRYPTOPP_5_6_5-610-g24bc2b8:cryptopp/externals/cryptopp/cryptopp
 
 USES=		cmake:outsource compiler:c++14-lang iconv localbase:ldflags
 USE_SDL=	sdl2
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
 		-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
 
 OPTIONS_DEFINE=	CURL
 OPTIONS_DEFAULT=CURL
 OPTIONS_MULTI=	GUI
 OPTIONS_MULTI_GUI=	QT5 SDL
 OPTIONS_SLAVE?=	SDL
 OPTIONS_EXCLUDE:=	${OPTIONS_MULTI_GUI}
 
 CURL_GH_TUPLE=	whoshuu:cpr:1.3.0-12-gb5758fb:cpr/externals/cpr
 CURL_LIB_DEPENDS=libcurl.so:ftp/curl
 CURL_CMAKE_BOOL=ENABLE_WEB_SERVICE USE_SYSTEM_CURL
 
 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,concurrent_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/icons/hicolor/scalable/apps/${PORTNAME}.svg \
 		share/mime/packages/${PORTNAME}.xml
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,share/man,man,' \
 		-e '/check_submodules_present()/d' \
 		${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/2018Q1/emulators/citra/distinfo
===================================================================
--- branches/2018Q1/emulators/citra/distinfo	(revision 458185)
+++ branches/2018Q1/emulators/citra/distinfo	(revision 458186)
@@ -1,23 +1,23 @@
-TIMESTAMP = 1514755045
-SHA256 (citra-emu-citra-s20171231-e203c10c_GH0.tar.gz) = 53c73f38292ef7523d3c1f53ffbbcdc94798cdf8aca8a1c820981a629f131b25
-SIZE (citra-emu-citra-s20171231-e203c10c_GH0.tar.gz) = 1649895
+TIMESTAMP = 1515056697
+SHA256 (citra-emu-citra-s20180104-a66e4585_GH0.tar.gz) = 6b2fed7b33cc39ad26d587ed06580c51840ec943cdf0bc79ba0d92cfc5f3a8ee
+SIZE (citra-emu-citra-s20180104-a66e4585_GH0.tar.gz) = 1650645
 SHA256 (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = f48c211bbabe7ad79e1c504af1082756c74241be6bab4aca13140803f4b694e7
 SIZE (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = 59366
 SHA256 (MerryMage-dynarmic-4110494_GH0.tar.gz) = 97703cefc1bc325634b2b2c9abdbaffd6e2d1caaa751f8e38c74ee882af85cbe
 SIZE (MerryMage-dynarmic-4110494_GH0.tar.gz) = 1246775
 SHA256 (benhoyt-inih-r40_GH0.tar.gz) = 0a7d8600c523ccd2d01a5bec2ef3a6482ada49794e67cf694d2bec796cb2c340
 SIZE (benhoyt-inih-r40_GH0.tar.gz) = 11436
 SHA256 (catchorg-Catch2-v2.0.1_GH0.tar.gz) = 5f31b93712e65d363f257ad0f0c02cfbed7a3988979d5f320ad7771e513d4cc8
 SIZE (catchorg-Catch2-v2.0.1_GH0.tar.gz) = 397154
 SHA256 (fmtlib-fmt-4.0.0_GH0.tar.gz) = 35300a0d356529447a79ed5ccf419239d8b34f916e5d4625f046fd37afa3650a
 SIZE (fmtlib-fmt-4.0.0_GH0.tar.gz) = 617818
 SHA256 (herumi-xbyak-v5.53-1-gc5da377_GH0.tar.gz) = 51129bc945fe2650f5fcd41f3b0166555b17589f03bda5d2216927234ef6446a
 SIZE (herumi-xbyak-v5.53-1-gc5da377_GH0.tar.gz) = 206888
 SHA256 (lsalzman-enet-a84c120_GH0.tar.gz) = 409d458f2da9d8bba49191ab6abaeb6bcf89193cd5eff07382c1d7b5f3fb06f0
 SIZE (lsalzman-enet-a84c120_GH0.tar.gz) = 79369
 SHA256 (neobrain-nihstro-7e24743_GH0.tar.gz) = 063728b01f7de99ca91693c46bd5c5a0fb03c0058baf4452d539f630b10f3650
 SIZE (neobrain-nihstro-7e24743_GH0.tar.gz) = 110273
 SHA256 (weidai11-cryptopp-CRYPTOPP_5_6_5-610-g24bc2b8_GH0.tar.gz) = 9f3f59538ba0515307e142ab404d65270da709aa3ac906770ec658e47a277ec2
 SIZE (weidai11-cryptopp-CRYPTOPP_5_6_5-610-g24bc2b8_GH0.tar.gz) = 7008104
 SHA256 (whoshuu-cpr-1.3.0-12-gb5758fb_GH0.tar.gz) = 84ea509dc08766d7182b867b78ba6dd16f3352d85b18b0654661079b8617dae4
 SIZE (whoshuu-cpr-1.3.0-12-gb5758fb_GH0.tar.gz) = 34100
Index: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 458185)
+++ branches/2018Q1	(revision 458186)

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