Index: branches/2018Q3/emulators/rpcs3/Makefile
===================================================================
--- branches/2018Q3/emulators/rpcs3/Makefile	(revision 474049)
+++ branches/2018Q3/emulators/rpcs3/Makefile	(revision 474050)
@@ -1,81 +1,81 @@
 # $FreeBSD$
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.5-562
-DISTVERSIONSUFFIX=	-g3d8223fcc
+DISTVERSION=	0.0.5-609
+DISTVERSIONSUFFIX=	-gd856dc89a
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	PS3 emulator/debugger
 
 LICENSE=	BSD3CLAUSE BSL GPLv2 MIT ZLIB
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC_cereal}/LICENSE
 LICENSE_FILE_BSL=	${WRKSRC_Optional}/LICENSE
 LICENSE_FILE_MIT=	${WRKSRC_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 SSE2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	RPCS3
 GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-25-gca39ce8:hidapi/3rdparty/hidapi \
-		RPCS3:llvm:4952addb0c00:llvm/llvm \
+		RPCS3:llvm:60611c0f232c:llvm/llvm \
 		akrzemi1:Optional:f27e790:Optional/3rdparty/Optional \
 		Cyan4973:xxHash:v0.6.5:xxHash/3rdparty/xxHash \
 		jbeder:yaml-cpp:yaml-cpp-0.6.2-4-g4fb1c4b:yamlcpp/3rdparty/yaml-cpp \
 		kobalicek:asmjit:673dcef:asmjit/asmjit \
 		KhronosGroup:glslang:5.1-184-gc99304c5:glslang/Vulkan/glslang \
 		Microsoft:GSL:fc5fce4:GSL/3rdparty/GSL \
 		USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal \
 		zeux:pugixml:v1.9:pugixml/3rdparty/pugixml
 
 USES=		cmake:outsource compiler:c++14-lang iconv:wchar_t localbase:ldflags \
 		openal:soft pkgconfig qt:5
 USE_GL=		gl glew
 USE_QT=		qmake_build buildtools_build core dbus gui network widgets qml
 USE_XORG=	x11
 CMAKE_ON=	CMAKE_SKIP_RPATH USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG
 CMAKE_OFF=	USE_NATIVE_INSTRUCTIONS
 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
 
 OPTIONS_DEFINE=	ALSA EVDEV GDB LLVM PULSEAUDIO VULKAN
 OPTIONS_DEFAULT=ALSA LLVM VULKAN
 .if !exists(${.CURDIR:H:H}/graphics/vulkan-sdk)
 OPTIONS_EXCLUDE=VULKAN # XXX ports/222175
 .endif
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_CMAKE_BOOL=	USE_ALSA
 
 EVDEV_DESC=		libevdev-based joystick support
 EVDEV_CMAKE_BOOL=	USE_LIBEVDEV
 EVDEV_LIB_DEPENDS=	libevdev.so:devel/libevdev
 
 GDB_DESC=		GDB remote stub (powerpc64 target)
 GDB_CMAKE_BOOL=		WITH_GDB
 
 LLVM_DESC=		LLVM-based PPU recompiler
 LLVM_CMAKE_BOOL_OFF=	WITHOUT_LLVM
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	USE_PULSE
 
 VULKAN_DESC=		Vulkan renderer
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-sdk
 VULKAN_CMAKE_BOOL=	USE_VULKAN
 
 post-patch:
 	@${REINPLACE_CMD} -e '/GIT_BRANCH/s/unknown/master/' \
 		-e '/GIT_VERSION/s/unknown/${GH_TAGNAME:C/[^-]*-//}/' \
 		${WRKSRC}/${PORTNAME}/git-version.cmake
 
 .include <bsd.port.mk>
Index: branches/2018Q3/emulators/rpcs3/distinfo
===================================================================
--- branches/2018Q3/emulators/rpcs3/distinfo	(revision 474049)
+++ branches/2018Q3/emulators/rpcs3/distinfo	(revision 474050)
@@ -1,23 +1,23 @@
-TIMESTAMP = 1530530390
-SHA256 (RPCS3-rpcs3-v0.0.5-562-g3d8223fcc_GH0.tar.gz) = 418b4aef80c7c080113c88c29a9460734998cf8c9438f68e58a828323ffa5b16
-SIZE (RPCS3-rpcs3-v0.0.5-562-g3d8223fcc_GH0.tar.gz) = 4979160
+TIMESTAMP = 1530833178
+SHA256 (RPCS3-rpcs3-v0.0.5-609-gd856dc89a_GH0.tar.gz) = d5f545c3ae17a85bfb0fb22e48b972af7f87cb32f0b03f843774d65170258d61
+SIZE (RPCS3-rpcs3-v0.0.5-609-gd856dc89a_GH0.tar.gz) = 4946118
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623
-SHA256 (RPCS3-llvm-4952addb0c00_GH0.tar.gz) = b7f32518c4d40291bd908fe51c041fe867e6895c60b8038bfbba6492a23b5b82
-SIZE (RPCS3-llvm-4952addb0c00_GH0.tar.gz) = 37835913
+SHA256 (RPCS3-llvm-60611c0f232c_GH0.tar.gz) = 52229d88de430293a6dbd4a9473be65dd92898f5e477aa65349aae2983de013d
+SIZE (RPCS3-llvm-60611c0f232c_GH0.tar.gz) = 41810844
 SHA256 (akrzemi1-Optional-f27e790_GH0.tar.gz) = d9f81fa3699b724812994897180365b7ee2fdef1549239d5086722bd4552baf1
 SIZE (akrzemi1-Optional-f27e790_GH0.tar.gz) = 16055
 SHA256 (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 19030315f4fc1b4b2cdb9d7a317069a109f90e39d1fe4c9159b7aaa39030eb95
 SIZE (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 37521
 SHA256 (jbeder-yaml-cpp-yaml-cpp-0.6.2-4-g4fb1c4b_GH0.tar.gz) = abe67a50a1486f986dd2daf90a7ee7400af94a2712e94f271850810cc51944c8
 SIZE (jbeder-yaml-cpp-yaml-cpp-0.6.2-4-g4fb1c4b_GH0.tar.gz) = 1396702
 SHA256 (kobalicek-asmjit-673dcef_GH0.tar.gz) = 228dd2f422740a1c9e713f1c86934e95d75fc1a8731a88ea006a2cebb033ca8c
 SIZE (kobalicek-asmjit-673dcef_GH0.tar.gz) = 448118
 SHA256 (KhronosGroup-glslang-5.1-184-gc99304c5_GH0.tar.gz) = b6a3b853a31b6aace0826bdeafce2d1f26c00ba349664e87fb35d189b99c0b58
 SIZE (KhronosGroup-glslang-5.1-184-gc99304c5_GH0.tar.gz) = 2329404
 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
 SHA256 (zeux-pugixml-v1.9_GH0.tar.gz) = 7ac060048bf00da4b3902cf411f0ba9f048cdc5580eed1f5a27ff51be4a38243
 SIZE (zeux-pugixml-v1.9_GH0.tar.gz) = 555480
Index: branches/2018Q3
===================================================================
--- branches/2018Q3	(revision 474049)
+++ branches/2018Q3	(revision 474050)

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