Index: branches/2017Q3/emulators/rpcs3/Makefile
===================================================================
--- branches/2017Q3/emulators/rpcs3/Makefile	(revision 445552)
+++ branches/2017Q3/emulators/rpcs3/Makefile	(revision 445553)
@@ -1,61 +1,62 @@
 # $FreeBSD$
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.2-423
 DISTVERSIONSUFFIX=	-g34709eb3
+PORTREVISION=	1
 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/"unknown"/"${GH_TAGNAME}"/' \
 		${WRKSRC}/${PORTNAME}/git-version.cmake
 
 .include <bsd.port.mk>
Index: branches/2017Q3/emulators/rpcs3/files/patch-Utilities_JIT.cpp
===================================================================
--- branches/2017Q3/emulators/rpcs3/files/patch-Utilities_JIT.cpp	(nonexistent)
+++ branches/2017Q3/emulators/rpcs3/files/patch-Utilities_JIT.cpp	(revision 445553)
@@ -0,0 +1,35 @@
+--- Utilities/JIT.cpp.orig	2017-07-10 15:42:02 UTC
++++ Utilities/JIT.cpp
+@@ -31,6 +31,10 @@
+ #include <Windows.h>
+ #endif
+ 
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#include <sys/resource.h>
++#endif
++
+ #include "JIT.h"
+ 
+ // Memory manager mutex
+@@ -45,6 +49,21 @@ static void* const s_memory = []() -> void*
+ 	llvm::InitializeNativeTarget();
+ 	llvm::InitializeNativeTargetAsmPrinter();
+ 	LLVMLinkInMCJIT();
++
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++	// XXX Fix maximum data segment size (data + BSS + heap) to 256 MB.
++	// This allows avoiding calling mmap(2) with MAP_FIXED.
++	// On FreeBSD, without lowering this limit, calling mmap(2)
++	// without MAP_FIXED will result in getting an address just
++	// beyond maximum data segment size which will be far beyond
++	// the desired 2 GB.
++	struct rlimit limit;
++	limit.rlim_cur = 0x10000000; // 256 MB
++	limit.rlim_max = 0x10000000;
++	if(setrlimit(RLIMIT_DATA, &limit) != 0) {
++		LOG_ERROR(GENERAL, "LLVM: Failed to lower maximum data segment size");
++	}
++#endif
+ 
+ 	for (u64 addr = 0x10000000; addr <= 0x80000000 - s_memory_size; addr += 0x1000000)
+ 	{

Property changes on: branches/2017Q3/emulators/rpcs3/files/patch-Utilities_JIT.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q3
===================================================================
--- branches/2017Q3	(revision 445552)
+++ branches/2017Q3	(revision 445553)

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