Index: branches/2017Q3/emulators/rpcs3/Makefile
===================================================================
--- branches/2017Q3/emulators/rpcs3/Makefile	(revision 445120)
+++ branches/2017Q3/emulators/rpcs3/Makefile	(revision 445121)
@@ -1,62 +1,61 @@
 # $FreeBSD$
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.2-391
-DISTVERSIONSUFFIX=	-g253e7a90
+DISTVERSION=	0.0.2-395
+DISTVERSIONSUFFIX=	-g37898d38
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	PS3 emulator/debugger
 
 LICENSE=	BSD3CLAUSE BSL GPLv2 MIT ZLIB
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/3rdparty/cereal/LICENSE
 LICENSE_FILE_BSL=	${WRKSRC}/Utilities/LICENSE_1_0.txt
 LICENSE_FILE_MIT=	${WRKSRC}/3rdparty/GSL/LICENSE
 LICENSE_FILE_ZLIB=	${WRKSRC}/asmjit/LICENSE.md
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libavcodec.so:multimedia/ffmpeg
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	requires int128 and SSSE3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	RPCS3
 GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-23-gc095a22:hidapi/3rdparty/hidapi \
 		RPCS3:pugixml:f205aaf:pugixml/3rdparty/pugixml \
 		RPCS3:yaml-cpp:release-0.5.3-62-g017626a:yamlcpp/Utilities/yaml-cpp \
 		kobalicek:asmjit:1370fe6:asmjit/asmjit \
 		Microsoft:GSL:fc5fce4:GSL/3rdparty/GSL \
 		USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal
 
 USES=		cmake compiler:c++14-lang iconv:wchar_t localbase:ldflags \
 		openal:soft pkgconfig
 USE_GL=		gl glew
 USE_QT5=	qmake_build buildtools_build core gui widgets
 CMAKE_ARGS+=	-DUSE_SYSTEM_LIBPNG=on -DUSE_SYSTEM_FFMPEG=on
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 # XXX ports/193528
 CXXFLAGS+=	-Wno-macro-redefined # __STDC_*_MACROS sys/cdefs.h vs. llvm-config
 LDFLAGS+=	-Wl,--as-needed # GLU
 PLIST_FILES=	bin/${PORTNAME} \
 		share/applications/${PORTNAME}.desktop \
 		share/icons/hicolor/48x48/apps/${PORTNAME}.png \
 		share/icons/hicolor/scalable/apps/${PORTNAME}.svg \
 
 OPTIONS_DEFINE=	GDB LLVM
 OPTIONS_DEFAULT=LLVM
 
 GDB_DESC=		GDB remote stub (powerpc64 target)
 GDB_CMAKE_BOOL=		WITH_GDB
 
 LLVM_DESC=		LLVM-based PPU recompiler
 LLVM_LIB_DEPENDS=	libLLVM-4.0.so:devel/llvm40
 LLVM_CMAKE_BOOL_OFF=	WITHOUT_LLVM
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/5\.8/5\.7/' ${WRKSRC}/${PORTNAME}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's/"unknown"/"${GH_TAGNAME}"/' \
 		${WRKSRC}/${PORTNAME}/git-version.cmake
 
 .include <bsd.port.mk>
Index: branches/2017Q3/emulators/rpcs3/distinfo
===================================================================
--- branches/2017Q3/emulators/rpcs3/distinfo	(revision 445120)
+++ branches/2017Q3/emulators/rpcs3/distinfo	(revision 445121)
@@ -1,15 +1,15 @@
-TIMESTAMP = 1498837240
-SHA256 (RPCS3-rpcs3-v0.0.2-391-g253e7a90_GH0.tar.gz) = 119872a72f376ae65302b9496ed74ed81c7a4da5032feb43065ce4168be4df60
-SIZE (RPCS3-rpcs3-v0.0.2-391-g253e7a90_GH0.tar.gz) = 11194982
+TIMESTAMP = 1499100699
+SHA256 (RPCS3-rpcs3-v0.0.2-395-g37898d38_GH0.tar.gz) = 56ee3728c8b648ae7e33e7a4557a712dfd552163eab8f9d1b037e5aa2aad0bb9
+SIZE (RPCS3-rpcs3-v0.0.2-395-g37898d38_GH0.tar.gz) = 11193935
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-23-gc095a22_GH0.tar.gz) = 76796e880e71864f24540f6f6edf8759e4710f9b2b0594a28066865733681de0
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-23-gc095a22_GH0.tar.gz) = 105539
 SHA256 (RPCS3-pugixml-f205aaf_GH0.tar.gz) = 3b2a7e21625d8cbeb3aa1841b8816f6cab0752e89008b9fc67a325c800f153b5
 SIZE (RPCS3-pugixml-f205aaf_GH0.tar.gz) = 76332
 SHA256 (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 1d4b32443f137c23b68d3cb183ba6fb48eb76be2b0b30016970adff5c770d841
 SIZE (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 65888
 SHA256 (kobalicek-asmjit-1370fe6_GH0.tar.gz) = cc064a8e495959ee525803bd83a4f9b2b3bf6e9aacbc7538e8ac3c20fb12e83e
 SIZE (kobalicek-asmjit-1370fe6_GH0.tar.gz) = 447958
 SHA256 (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 2df1538ff240bf4dd3ef44ba8c832451376fff8e74f7734d32fc8c337557a64d
 SIZE (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 38809
 SHA256 (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 1ccf3ed205a7a2f0d6a060415b123f1ae0d984cd4435db01af8de11a2eda49c1
 SIZE (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 299883
Index: branches/2017Q3
===================================================================
--- branches/2017Q3	(revision 445120)
+++ branches/2017Q3	(revision 445121)

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