Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Oct 2013 07:16:57 +0000 (UTC)
From:      Ganael LAPLANCHE <martymac@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330484 - in head: . emulators emulators/dolphin-emu emulators/dolphin-emu-devel emulators/dolphin-emu/files
Message-ID:  <201310160716.r9G7GvpJ036930@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: martymac
Date: Wed Oct 16 07:16:57 2013
New Revision: 330484
URL: http://svnweb.freebsd.org/changeset/ports/330484

Log:
  - Update to 4.0.0
  - As OpenGL rendering now works, remove the -devel suffix
  - Enable staging
  - Use new LIB_DEPENDS format
  - Add new UPNP option
  - Handle -liconv removal on -CURRENT

Added:
  head/emulators/dolphin-emu/
     - copied from r330481, head/emulators/dolphin-emu-devel/
  head/emulators/dolphin-emu/files/patch-CMakeTests-FindGLEW.cmake   (contents, props changed)
  head/emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake   (contents, props changed)
  head/emulators/dolphin-emu/files/patch-Source-Core-Common-Src-Thread.cpp   (contents, props changed)
  head/emulators/dolphin-emu/files/patch-Source-Core-Core-Src-IPC_HLE-WII_IPC_HLE_Device_hid.h   (contents, props changed)
  head/emulators/dolphin-emu/files/patch-Source-Core-Core-Src-IPC_HLE-WII_IPC_HLE_Device_net.cpp   (contents, props changed)
  head/emulators/dolphin-emu/files/patch-Source-Core-Core-Src-IPC_HLE-WII_Socket.cpp   (contents, props changed)
  head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-Src-NetWindow.cpp   (contents, props changed)
Deleted:
  head/emulators/dolphin-emu-devel/
  head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-Src-LogWindow.h
  head/emulators/dolphin-emu/files/pkg-message.in
Modified:
  head/MOVED
  head/emulators/Makefile
  head/emulators/dolphin-emu/Makefile
  head/emulators/dolphin-emu/distinfo
  head/emulators/dolphin-emu/files/patch-CMakeLists.txt
  head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt   (contents, props changed)
  head/emulators/dolphin-emu/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Wed Oct 16 07:07:00 2013	(r330483)
+++ head/MOVED	Wed Oct 16 07:16:57 2013	(r330484)
@@ -5106,3 +5106,4 @@ lang/ruby-lua4||2013-10-15|Has expired: 
 dns/dnsdoctor||2013-10-15|Has expired: Does not work with Ruby 1.9
 devel/py-psyco||2013-10-15|Has expired: only bulds with lang/python26
 x11-toolkits/ruby-tk||2013-10-15|Has expired: Does not work with Ruby 1.9
+emulators/dolphin-emu-devel|emulators/dolphin-emu|2013-10-16|Has reached stable quality

Modified: head/emulators/Makefile
==============================================================================
--- head/emulators/Makefile	Wed Oct 16 07:07:00 2013	(r330483)
+++ head/emulators/Makefile	Wed Oct 16 07:16:57 2013	(r330484)
@@ -24,7 +24,7 @@
     SUBDIR += dboxfe
     SUBDIR += desmume
     SUBDIR += dgen-sdl
-    SUBDIR += dolphin-emu-devel
+    SUBDIR += dolphin-emu
     SUBDIR += dosbox
     SUBDIR += doscmd
     SUBDIR += dtcyber

Modified: head/emulators/dolphin-emu/Makefile
==============================================================================
--- head/emulators/dolphin-emu-devel/Makefile	Wed Oct 16 06:50:18 2013	(r330481)
+++ head/emulators/dolphin-emu/Makefile	Wed Oct 16 07:16:57 2013	(r330484)
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	dolphin-emu
-PORTVERSION=	3.5.r${REVDATE}
-PORTREVISION=	1
+PORTVERSION=	4.0.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
-PKGNAMESUFFIX=	-devel
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	martymac@FreeBSD.org
@@ -15,16 +13,16 @@ COMMENT=	Gamecube and Wii Emulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
-		freetype:${PORTSDIR}/print/freetype2 \
-		lzo2:${PORTSDIR}/archivers/lzo2 \
-		sfml-network:${PORTSDIR}/devel/sfml
-
-REVDATE=	20130415
+LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		liblzo2.so:${PORTSDIR}/archivers/lzo2 \
+		libSoundTouch.so:${PORTSDIR}/audio/soundtouch \
+		libsfml-network.so:${PORTSDIR}/devel/sfml \
+		libpolarssl.so:${PORTSDIR}/security/polarssl
 
 USE_SDL=	sdl
 USE_OPENAL=	yes
-USE_XORG=	ice xext x11 xrandr
+USE_XORG=	ice xext x11 xrandr xi
 USE_WX=		2.9+
 WX_UNICODE=	yes
 USE_GL=	gl glew glu
@@ -32,28 +30,23 @@ USE_GL=	gl glew glu
 USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.*\.(h|c|cpp)
 
-# XXX Has only been tested with clang and gcc
-.if ${CC} != "clang" && ${CXX} != "clang++"
-USE_GCC=	yes
-.endif
+USE_GCC=	4.6+
 
 USES=		cmake pkgconfig iconv
 CMAKE_BUILD_TYPE=	Release
-# Disable ao (seems buggy) and ALSA (emulated)
-CMAKE_ARGS+=	-DDISABLE_AO:BOOL=ON \
+# Disable ALSA (emulated) and ao (buggy)
+CMAKE_ARGS+=	-DOPENMP:BOOL=OFF \
 		-DDISABLE_ALSA:BOOL=ON \
+		-DDISABLE_AO:BOOL=ON \
 		-DDISABLE_BLUEZ:BOOL=ON \
+		-DUSE_X11:BOOL=ON \
 		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON
 
-SUB_FILES=	pkg-message
-SUB_LIST+=	MAINTAINER=${MAINTAINER}
-
-OPTIONS_DEFINE=	PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS
+OPTIONS_DEFINE=	PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS UPNP
 PORTAUDIO_DESC=	Enable PortAudio (mic) support
 FRAMEDUMPS_DESC=	Encode framedumps in AVI format
-OPTIONS_DEFAULT=	PORTAUDIO FRAMEDUMPS
+OPTIONS_DEFAULT=	PORTAUDIO FRAMEDUMPS UPNP
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -73,28 +66,40 @@ MAKE_ENV+=	VERBOSE=yes
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 .else
 CMAKE_ARGS+=	-DDISABLE_PULSEAUDIO:BOOL=ON
 .endif
 
 .if ${PORT_OPTIONS:MPORTAUDIO}
-LIB_DEPENDS+=	portaudio.2:${PORTSDIR}/audio/portaudio2
+LIB_DEPENDS+=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
 .else
 CMAKE_ARGS+=	-DDISABLE_PORTAUDIO:BOOL=ON
 .endif
 
 .if ${PORT_OPTIONS:MFRAMEDUMPS}
 CMAKE_ARGS+=	-DENCODE_FRAMEDUMPS:BOOL=ON
-LIB_DEPENDS+=	avcodec1:${PORTSDIR}/multimedia/ffmpeg1 \
-		avformat1:${PORTSDIR}/multimedia/ffmpeg1 \
-		swscale1:${PORTSDIR}/multimedia/ffmpeg1 \
-		avutil1:${PORTSDIR}/multimedia/ffmpeg1
+LIB_DEPENDS+=	libavcodec1.so:${PORTSDIR}/multimedia/ffmpeg1 \
+		libavformat1.so:${PORTSDIR}/multimedia/ffmpeg1 \
+		libswscale1.so:${PORTSDIR}/multimedia/ffmpeg1 \
+		libavutil1.so:${PORTSDIR}/multimedia/ffmpeg1
 .else
 CMAKE_ARGS+=	-DENCODE_FRAMEDUMPS:BOOL=OFF
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
+.if ${PORT_OPTIONS:MUPNP}
+CMAKE_ARGS+=	-DUSE_UPNP:BOOL=ON
+LIB_DEPENDS+=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
+.else
+CMAKE_ARGS+=	-DUSE_UPNP:BOOL=OFF
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !empty(ICONV_LIB)
+CMAKE_ARGS+=	-DUSE_ICONV:BOOL=ON
+.else
+CMAKE_ARGS+=	-DUSE_ICONV:BOOL=OFF
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/emulators/dolphin-emu/distinfo
==============================================================================
--- head/emulators/dolphin-emu-devel/distinfo	Wed Oct 16 06:50:18 2013	(r330481)
+++ head/emulators/dolphin-emu/distinfo	Wed Oct 16 07:16:57 2013	(r330484)
@@ -1,2 +1,2 @@
-SHA256 (dolphin-emu-3.5.r20130415.tgz) = 195f5a4793c4e87f81a334da2b301e2a048f7ff1339811d910362ee8c5b8cfb5
-SIZE (dolphin-emu-3.5.r20130415.tgz) = 17819718
+SHA256 (dolphin-emu-4.0.0.tgz) = b738bbad1555292efd4c517cd56ed084a5489575d6652e3f26739f9a5f95dcbe
+SIZE (dolphin-emu-4.0.0.tgz) = 20543858

Modified: head/emulators/dolphin-emu/files/patch-CMakeLists.txt
==============================================================================
--- head/emulators/dolphin-emu-devel/files/patch-CMakeLists.txt	Wed Oct 16 06:50:18 2013	(r330481)
+++ head/emulators/dolphin-emu/files/patch-CMakeLists.txt	Wed Oct 16 07:16:57 2013	(r330484)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2013-03-20 18:05:37.000000000 +0100
-+++ CMakeLists.txt	2013-03-20 18:21:02.000000000 +0100
-@@ -302,51 +302,81 @@
+--- CMakeLists.txt.orig	2013-09-16 04:58:51.000000000 +0200
++++ CMakeLists.txt	2013-09-16 05:15:59.000000000 +0200
+@@ -351,51 +351,81 @@
  		message("OpenMP parallelization disabled")
  	endif()
  
@@ -111,13 +111,12 @@
 +		message("OpenAL sound backend disabled")
 +	endif()
  
- # Note: We do not need to explicitly check for X11 as it is done in the cmake
- # FindOpenGL module on linux.
-@@ -375,22 +405,33 @@
+ 	if(UNIX AND NOT APPLE)
+ 		# Note: The convention is to check USE_X11 or USE_WAYLAND where needed.
+@@ -455,21 +485,32 @@
  		check_libav()
  	endif()
  
--	include(CheckCXXSourceRuns)
 -	set(CMAKE_REQUIRED_LIBRARIES portaudio)
 -	CHECK_CXX_SOURCE_RUNS(
 -		"#include <portaudio.h>
@@ -130,7 +129,6 @@
 -		set(PORTAUDIO_FOUND TRUE)
 +	option(DISABLE_PORTAUDIO "Disable PortAudio (mic) support" OFF)
 +	if(NOT DISABLE_PORTAUDIO)
-+		include(CheckCXXSourceRuns)
 +		include_directories(BEFORE ${CMAKE_INSTALL_PREFIX}/include/portaudio2)
 +		link_directories(${CMAKE_INSTALL_PREFIX}/lib/portaudio2)
 +		set(CMAKE_REQUIRED_INCLUDES ${CMAKE_INSTALL_PREFIX}/include/portaudio2)
@@ -160,21 +158,3 @@
  
  	if(OPROFILING)
  		check_lib(OPROFILE opagent opagent.h)
-@@ -668,10 +709,13 @@
- 	install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN)
- 	install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN)
- endif()
--include(FindGettext)
--if(GETTEXT_FOUND AND NOT DISABLE_WX)
--	file(GLOB LINGUAS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Languages/po/*.po) 
--	GETTEXT_CREATE_TRANSLATIONS(Languages/po/dolphin-emu.pot ALL ${LINGUAS})
-+option(DISABLE_NLS "Disable native language support (NLS)" OFF)
-+if(NOT DISABLE_NLS)
-+	include(FindGettext)
-+	if(GETTEXT_FOUND AND NOT DISABLE_WX)
-+		file(GLOB LINGUAS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Languages/po/*.po)
-+		GETTEXT_CREATE_TRANSLATIONS(Languages/po/dolphin-emu.pot ALL ${LINGUAS})
-+	endif()
- endif()
- if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin"))
- 	install(FILES Data/license.txt DESTINATION ${datadir})

Added: head/emulators/dolphin-emu/files/patch-CMakeTests-FindGLEW.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-CMakeTests-FindGLEW.cmake	Wed Oct 16 07:16:57 2013	(r330484)
@@ -0,0 +1,12 @@
+--- CMakeTests/FindGLEW.cmake.orig	2013-09-10 06:35:16.000000000 +0200
++++ CMakeTests/FindGLEW.cmake	2013-09-16 16:04:12.000000000 +0200
+@@ -4,7 +4,9 @@
+ # Ubuntu's version of glew is 1.8, but they have patched in most of glew 1.9.
+ # So Ubuntu's version works for dolphin.
+ macro(test_glew)
++	link_directories(${GLEW_LIBRARY_DIRS})
+ 	set(CMAKE_REQUIRED_INCLUDES ${GLEW_INCLUDE_DIRS})
++	set(CMAKE_REQUIRED_FLAGS -L${GLEW_LIBRARY_DIRS})
+ 	set(CMAKE_REQUIRED_LIBRARIES GLEW)
+ 	check_cxx_source_runs("
+ 	#include <GL/glew.h>

Added: head/emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake	Wed Oct 16 07:16:57 2013	(r330484)
@@ -0,0 +1,11 @@
+--- CMakeTests/FindLibUSB.cmake.orig	2013-09-17 08:41:32.000000000 +0200
++++ CMakeTests/FindLibUSB.cmake	2013-09-17 08:41:41.000000000 +0200
+@@ -23,7 +23,7 @@
+        /usr/local/include
+     )
+ 
+-    find_library(LIBUSB_LIBRARIES NAMES usb-1.0
++    find_library(LIBUSB_LIBRARIES NAMES usb
+        PATHS
+        ${LIBUSB_PKG_LIBRARY_DIRS}
+        /usr/lib

Added: head/emulators/dolphin-emu/files/patch-Source-Core-Common-Src-Thread.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-Common-Src-Thread.cpp	Wed Oct 16 07:16:57 2013	(r330484)
@@ -0,0 +1,37 @@
+--- Source/Core/Common/Src/Thread.cpp.orig	2013-09-17 16:24:41.000000000 +0200
++++ Source/Core/Common/Src/Thread.cpp	2013-09-17 16:41:54.000000000 +0200
+@@ -7,7 +7,7 @@
+ 
+ #ifdef __APPLE__
+ #include <mach/mach.h>
+-#elif defined BSD4_4
++#elif defined BSD4_4 || defined __FreeBSD__
+ #include <pthread_np.h>
+ #endif
+ 
+@@ -92,8 +92,12 @@
+ #ifdef __APPLE__
+ 	thread_policy_set(pthread_mach_thread_np(thread),
+ 		THREAD_AFFINITY_POLICY, (integer_t *)&mask, 1);
+-#elif (defined __linux__ || defined BSD4_4) && !(defined ANDROID)
++#elif (defined __linux__ || defined BSD4_4 || defined __FreeBSD__) && !(defined ANDROID)
++#if defined __FreeBSD__
++	cpuset_t cpu_set;
++#else
+ 	cpu_set_t cpu_set;
++#endif
+ 	CPU_ZERO(&cpu_set);
+ 
+ 	for (int i = 0; i != sizeof(mask) * 8; ++i)
+@@ -121,8 +125,10 @@
+ 
+ void SetCurrentThreadName(const char* szThreadName)
+ {
+-#ifdef __APPLE__
++#if defined __APPLE__
+ 	pthread_setname_np(szThreadName);
++#elif defined __FreeBSD__
++	pthread_set_name_np(pthread_self(), szThreadName);
+ #else
+ 	pthread_setname_np(pthread_self(), szThreadName);
+ #endif

Added: head/emulators/dolphin-emu/files/patch-Source-Core-Core-Src-IPC_HLE-WII_IPC_HLE_Device_hid.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-Core-Src-IPC_HLE-WII_IPC_HLE_Device_hid.h	Wed Oct 16 07:16:57 2013	(r330484)
@@ -0,0 +1,13 @@
+--- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h.orig	2013-09-17 16:44:46.000000000 +0200
++++ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h	2013-09-17 16:48:22.000000000 +0200
+@@ -16,6 +16,10 @@
+ 
+ #define HIDERR_NO_DEVICE_FOUND -4
+ 
++#if defined __FreeBSD__
++#define LIBUSB_CALL
++#endif
++
+ /* Connection timed out */
+ 
+ class CWII_IPC_HLE_Device_hid : public IWII_IPC_HLE_Device

Added: head/emulators/dolphin-emu/files/patch-Source-Core-Core-Src-IPC_HLE-WII_IPC_HLE_Device_net.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-Core-Src-IPC_HLE-WII_IPC_HLE_Device_net.cpp	Wed Oct 16 07:16:57 2013	(r330484)
@@ -0,0 +1,29 @@
+--- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp.orig	2013-09-18 06:59:39.000000000 +0200
++++ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp	2013-09-18 15:07:04.000000000 +0200
+@@ -23,7 +23,7 @@
+ #define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
+ #define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
+ 
+-#elif defined(__linux__) or defined(__APPLE__)
++#elif defined(__linux__) or defined(__APPLE__) or defined(__FreeBSD__)
+ #include <netdb.h>
+ #include <arpa/inet.h>
+ #include <sys/types.h>
+@@ -1004,7 +1004,7 @@
+ 				Memory::Write_U32(wii_addr, BufferOut + 4);
+ 				Memory::Write_U32(wii_addr + sizeof(u32), wii_addr);
+ 				wii_addr += sizeof(u32);
+-				Memory::Write_U32((u32)NULL, wii_addr);
++				Memory::Write_U32((u32)0, wii_addr);
+ 				wii_addr += sizeof(u32);
+ 
+ 				// hardcode to ipv4
+@@ -1025,7 +1025,7 @@
+ 					wii_addr += sizeof(u32);
+ 				}
+ 				// NULL terminated list
+-				Memory::Write_U32((u32)NULL, wii_addr);
++				Memory::Write_U32((u32)0, wii_addr);
+ 				wii_addr += sizeof(u32);
+ 				// The actual IPs
+ 				for (int i = 0; remoteHost->h_addr_list[i]; i++)

Added: head/emulators/dolphin-emu/files/patch-Source-Core-Core-Src-IPC_HLE-WII_Socket.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-Core-Src-IPC_HLE-WII_Socket.cpp	Wed Oct 16 07:16:57 2013	(r330484)
@@ -0,0 +1,16 @@
+--- Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp.orig	2013-09-17 16:50:52.000000000 +0200
++++ Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp	2013-09-17 16:51:58.000000000 +0200
+@@ -21,6 +21,13 @@
+ #define EITHER(win32, posix) posix
+ #endif
+ 
++#if defined __FreeBSD__
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#endif
++
+ char* WiiSockMan::DecodeError(s32 ErrorCode)
+ {
+ #ifdef _WIN32

Modified: head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt
==============================================================================
--- head/emulators/dolphin-emu-devel/files/patch-Source-Core-DolphinWX-CMakeLists.txt	Wed Oct 16 06:50:18 2013	(r330481)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt	Wed Oct 16 07:16:57 2013	(r330484)
@@ -1,9 +1,45 @@
---- Source/Core/DolphinWX/CMakeLists.txt.orig	2012-03-07 15:33:14.000000000 +0100
-+++ Source/Core/DolphinWX/CMakeLists.txt	2012-03-07 18:16:05.629985514 +0100
-@@ -1,4 +1,6 @@
+--- Source/Core/DolphinWX/CMakeLists.txt.orig	2013-09-17 07:16:04.000000000 +0200
++++ Source/Core/DolphinWX/CMakeLists.txt	2013-09-25 05:06:25.000000000 +0200
+@@ -3,6 +3,7 @@
+ endif()
+ 
  set(LIBS	core
 +			execinfo
-+			iconv
  			${LZO}
  			discio
  			bdisasm
+@@ -39,7 +40,13 @@
+ 		endif()
+ 	endif()
+ else()
+-	set(LIBS ${LIBS} png iconv)
++	set(LIBS ${LIBS} png)
++	set(USE_ICONV True)
++endif()
++
++if(USE_ICONV)
++	message( "-- Adding iconv")
++	set(LIBS  ${LIBS} iconv)
+ endif()
+ 
+ if(LIBAV_FOUND)
+@@ -174,11 +181,14 @@
+   set(LIBS  ${LIBS} miniupnpc)
+ endif()
+ 
+-include(FindGettext)
+-if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND wxWidgets_FOUND)
+-	file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po)
+-	add_custom_target(translations ALL)
+-	GETTEXT_CREATE_TRANSLATIONS(${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot ${LINGUAS})
++option(DISABLE_NLS "Disable native language support (NLS)" OFF)
++if(NOT DISABLE_NLS)
++	include(FindGettext)
++	if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND wxWidgets_FOUND)
++		file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po)
++		add_custom_target(translations ALL)
++		GETTEXT_CREATE_TRANSLATIONS(${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot ${LINGUAS})
++	endif()
+ endif()
+ 
+ if(ANDROID)

Added: head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-Src-NetWindow.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-Src-NetWindow.cpp	Wed Oct 16 07:16:57 2013	(r330484)
@@ -0,0 +1,15 @@
+--- Source/Core/DolphinWX/Src/NetWindow.cpp.orig	2013-09-18 15:49:16.000000000 +0200
++++ Source/Core/DolphinWX/Src/NetWindow.cpp	2013-09-18 15:52:24.000000000 +0200
+@@ -38,7 +38,11 @@
+ 		name = game.GetVolumeName(lang);
+ 
+ 	if (game.GetRevision() != 0)
+-		return name + " (" + game.GetUniqueID() + ", Revision " + std::to_string((long long)game.GetRevision()) + ")";
++	{
++		std::stringstream tmp_stream;
++		tmp_stream << game.GetRevision();
++		return name + " (" + game.GetUniqueID() + ", Revision " + tmp_stream.str() + ")";
++	}
+ 	else
+ 		return name + " (" + game.GetUniqueID() + ")";
+ }

Modified: head/emulators/dolphin-emu/pkg-plist
==============================================================================
--- head/emulators/dolphin-emu-devel/pkg-plist	Wed Oct 16 06:50:18 2013	(r330481)
+++ head/emulators/dolphin-emu/pkg-plist	Wed Oct 16 07:16:57 2013	(r330484)
@@ -20,6 +20,7 @@ bin/dolphin-emu
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/dolphin-emu.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/dolphin-emu.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/dolphin-emu.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/dolphin-emu.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/dolphin-emu.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/dolphin-emu.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/dolphin-emu.mo
@@ -29,1546 +30,1715 @@ bin/dolphin-emu
 %%DATADIR%%/sys/GC/dsp_rom.bin
 %%DATADIR%%/sys/GC/font_sjis.bin
 %%DATADIR%%/sys/GC/font_ansi.bin
-%%DATADIR%%/sys/Wii/setting-usa.txt
-%%DATADIR%%/sys/Wii/setting-jpn.txt
-%%DATADIR%%/sys/Wii/setting-eur.txt
-%%DATADIR%%/sys/Wii/setting-kor.txt
-%%DATADIR%%/user/Shaders/acidtrip2.txt
-%%DATADIR%%/user/Shaders/asciiart.txt
-%%DATADIR%%/user/Shaders/sunset.txt
-%%DATADIR%%/user/Shaders/chrismas.txt
-%%DATADIR%%/user/Shaders/nightvision2.txt
-%%DATADIR%%/user/Shaders/sketchy.txt
-%%DATADIR%%/user/Shaders/mad_world.txt
-%%DATADIR%%/user/Shaders/cool1.txt
-%%DATADIR%%/user/Shaders/fire2.txt
-%%DATADIR%%/user/Shaders/swap_RGB_BRG.txt
-%%DATADIR%%/user/Shaders/acidmetal.txt
-%%DATADIR%%/user/Shaders/grayscale.txt
-%%DATADIR%%/user/Shaders/swap_RGB_GRB.txt
-%%DATADIR%%/user/Shaders/32bit.txt
-%%DATADIR%%/user/Shaders/README.txt
-%%DATADIR%%/user/Shaders/spookey1.txt
-%%DATADIR%%/user/Shaders/acidtrip.txt
-%%DATADIR%%/user/Shaders/swap_RGB_BGR.txt
-%%DATADIR%%/user/Shaders/fire.txt
-%%DATADIR%%/user/Shaders/darkerbrighter.txt
-%%DATADIR%%/user/Shaders/nightvision2scanlines.txt
-%%DATADIR%%/user/Shaders/swap_RGB_RBG.txt
-%%DATADIR%%/user/Shaders/spookey2.txt
-%%DATADIR%%/user/Shaders/bad_bloom.txt
-%%DATADIR%%/user/Shaders/posterize.txt
-%%DATADIR%%/user/Shaders/toxic.txt
-%%DATADIR%%/user/Shaders/invertedoutline.txt
-%%DATADIR%%/user/Shaders/firewater.txt
-%%DATADIR%%/user/Shaders/swap_RGB_GBR.txt
-%%DATADIR%%/user/Shaders/grayscale2.txt
-%%DATADIR%%/user/Shaders/sepia.txt
-%%DATADIR%%/user/Shaders/primarycolors.txt
-%%DATADIR%%/user/Shaders/brighten.txt
-%%DATADIR%%/user/Shaders/16bit.txt
-%%DATADIR%%/user/Shaders/stereoscopic.txt
-%%DATADIR%%/user/Shaders/auto_toon.txt
-%%DATADIR%%/user/Shaders/nightvision.txt
-%%DATADIR%%/user/Shaders/emboss.txt
-%%DATADIR%%/user/Shaders/posterize2.txt
-%%DATADIR%%/user/Shaders/stereoscopic2.txt
-%%DATADIR%%/user/Shaders/auto_toon2.txt
-%%DATADIR%%/user/Shaders/invert_blue.txt
-%%DATADIR%%/user/Shaders/invert.txt
-%%DATADIR%%/user/Themes/Boomy/help.png
-%%DATADIR%%/user/Themes/Boomy/gcpad.png
-%%DATADIR%%/user/Themes/Boomy/refresh.png
-%%DATADIR%%/user/Themes/Boomy/graphics.png
-%%DATADIR%%/user/Themes/Boomy/fullscreen.png
-%%DATADIR%%/user/Themes/Boomy/open.png
-%%DATADIR%%/user/Themes/Boomy/wiimote.png
-%%DATADIR%%/user/Themes/Boomy/README.txt
-%%DATADIR%%/user/Themes/Boomy/dsp.png
-%%DATADIR%%/user/Themes/Boomy/config.png
-%%DATADIR%%/user/Themes/Boomy/play.png
-%%DATADIR%%/user/Themes/Boomy/stop.png
-%%DATADIR%%/user/Themes/Boomy/screenshot.png
-%%DATADIR%%/user/Themes/Boomy/browse.png
-%%DATADIR%%/user/Themes/Boomy/pause.png
-%%DATADIR%%/user/Themes/Boomy/nobanner.png
-%%DATADIR%%/user/GameConfig/GWLE6L.ini
-%%DATADIR%%/user/GameConfig/GSZP41.ini
-%%DATADIR%%/user/GameConfig/GFZJ01.ini
-%%DATADIR%%/user/GameConfig/GF8P69.ini
-%%DATADIR%%/user/GameConfig/GC3P78.ini
-%%DATADIR%%/user/GameConfig/R8LE20.ini
-%%DATADIR%%/user/GameConfig/SSRPXT.ini
-%%DATADIR%%/user/GameConfig/RZZJEL.ini
-%%DATADIR%%/user/GameConfig/G5DE78.ini
-%%DATADIR%%/user/GameConfig/SUKP01.ini
-%%DATADIR%%/user/GameConfig/RMLK52.ini
-%%DATADIR%%/user/GameConfig/GFAD69.ini
-%%DATADIR%%/user/GameConfig/RMLJH4.ini
-%%DATADIR%%/user/GameConfig/SO3EE9.ini
-%%DATADIR%%/user/GameConfig/SOJP41.ini
-%%DATADIR%%/user/GameConfig/GXOE69.ini
-%%DATADIR%%/user/GameConfig/GC3D78.ini
-%%DATADIR%%/user/GameConfig/GFAP69.ini
-%%DATADIR%%/user/GameConfig/SD2J01.ini
-%%DATADIR%%/user/GameConfig/GTFEA4.ini
-%%DATADIR%%/user/GameConfig/RLGJ52.ini
-%%DATADIR%%/user/GameConfig/GFAE69.ini
-%%DATADIR%%/user/GameConfig/GBWD64.ini
-%%DATADIR%%/user/GameConfig/GC3E78.ini
-%%DATADIR%%/user/GameConfig/GXFF69.ini
-%%DATADIR%%/user/GameConfig/SUKE01.ini
-%%DATADIR%%/user/GameConfig/G5DP78.ini
-%%DATADIR%%/user/GameConfig/SJDY41.ini
-%%DATADIR%%/user/GameConfig/GBWP64.ini
-%%DATADIR%%/user/GameConfig/SOJE41.ini
-%%DATADIR%%/user/GameConfig/GAVY78.ini
-%%DATADIR%%/user/GameConfig/G8FE8P.ini
-%%DATADIR%%/user/GameConfig/GMIP70.ini
-%%DATADIR%%/user/GameConfig/GIZE52.ini
-%%DATADIR%%/user/GameConfig/G3LE8P.ini
-%%DATADIR%%/user/GameConfig/RS8J8N.ini
-%%DATADIR%%/user/GameConfig/RZTP01.ini
-%%DATADIR%%/user/GameConfig/GP8EAF.ini
-%%DATADIR%%/user/GameConfig/R9IE01.ini
-%%DATADIR%%/user/GameConfig/RZTK01.ini
-%%DATADIR%%/user/GameConfig/REDJ41.ini
-%%DATADIR%%/user/GameConfig/WBME01.ini
-%%DATADIR%%/user/GameConfig/RZTJ01.ini
-%%DATADIR%%/user/GameConfig/RGHE52.ini
-%%DATADIR%%/user/GameConfig/GLNP69.ini
-%%DATADIR%%/user/GameConfig/GYWD41.ini
-%%DATADIR%%/user/GameConfig/RBME5G.ini
-%%DATADIR%%/user/GameConfig/STEETR.ini
-%%DATADIR%%/user/GameConfig/JAEE01.ini
-%%DATADIR%%/user/GameConfig/GYWP41.ini
-%%DATADIR%%/user/GameConfig/RFBJ01.ini
-%%DATADIR%%/user/GameConfig/R8XE52.ini
-%%DATADIR%%/user/GameConfig/SS3EWR.ini
-%%DATADIR%%/user/GameConfig/RZTW01.ini
-%%DATADIR%%/user/GameConfig/RFBE01.ini
-%%DATADIR%%/user/GameConfig/ROAP36.ini
-%%DATADIR%%/user/GameConfig/SDFE4Q.ini
-%%DATADIR%%/user/GameConfig/JBKP01.ini
-%%DATADIR%%/user/GameConfig/WPPJJF.ini
-%%DATADIR%%/user/GameConfig/ROAE36.ini
-%%DATADIR%%/user/GameConfig/RLBEWR.ini
-%%DATADIR%%/user/GameConfig/RTMP41.ini
-%%DATADIR%%/user/GameConfig/GUBP69.ini
-%%DATADIR%%/user/GameConfig/SX8E52.ini
-%%DATADIR%%/user/GameConfig/GXFE69.ini
-%%DATADIR%%/user/GameConfig/RMLPH4.ini
-%%DATADIR%%/user/GameConfig/GOAE52.ini
-%%DATADIR%%/user/GameConfig/GC3F78.ini
-%%DATADIR%%/user/GameConfig/GOSE41.ini
-%%DATADIR%%/user/GameConfig/ROLK01.ini
-%%DATADIR%%/user/GameConfig/SUKJ01.ini
-%%DATADIR%%/user/GameConfig/SJDZ41.ini
-%%DATADIR%%/user/GameConfig/GXFP69.ini
-%%DATADIR%%/user/GameConfig/GOSP41.ini
-%%DATADIR%%/user/GameConfig/GBWF64.ini
-%%DATADIR%%/user/GameConfig/RMLP7U.ini
-%%DATADIR%%/user/GameConfig/GFAS69.ini
-%%DATADIR%%/user/GameConfig/SO3J99.ini
-%%DATADIR%%/user/GameConfig/RTME41.ini
-%%DATADIR%%/user/GameConfig/ROLJ01.ini
-%%DATADIR%%/user/GameConfig/GMIE70.ini
-%%DATADIR%%/user/GameConfig/GUBE69.ini
-%%DATADIR%%/user/GameConfig/GEND69.ini
-%%DATADIR%%/user/GameConfig/SFIP01.ini
-%%DATADIR%%/user/GameConfig/GVCE08.ini
-%%DATADIR%%/user/GameConfig/RLGP64.ini
-%%DATADIR%%/user/GameConfig/R8PJ01.ini
-%%DATADIR%%/user/GameConfig/SSRE20.ini
-%%DATADIR%%/user/GameConfig/GT3P52.ini
-%%DATADIR%%/user/GameConfig/GENP69.ini
-%%DATADIR%%/user/GameConfig/R64P01.ini
-%%DATADIR%%/user/GameConfig/GAVP78.ini
-%%DATADIR%%/user/GameConfig/RHDE8P.ini
-%%DATADIR%%/user/GameConfig/SOUP01.ini
-%%DATADIR%%/user/GameConfig/R3NPH3.ini
-%%DATADIR%%/user/GameConfig/GT3D52.ini
-%%DATADIR%%/user/GameConfig/R8DJA4.ini
-%%DATADIR%%/user/GameConfig/SRQE41.ini
-%%DATADIR%%/user/GameConfig/SJDP41.ini
-%%DATADIR%%/user/GameConfig/GXOX69.ini
-%%DATADIR%%/user/GameConfig/R22J01.ini
-%%DATADIR%%/user/GameConfig/RHDP8P.ini
-%%DATADIR%%/user/GameConfig/SOUE01.ini
-%%DATADIR%%/user/GameConfig/R8PK01.ini
-%%DATADIR%%/user/GameConfig/SRQP41.ini
-%%DATADIR%%/user/GameConfig/SJDE41.ini
-%%DATADIR%%/user/GameConfig/SH6E52.ini
-%%DATADIR%%/user/GameConfig/RLGE64.ini
-%%DATADIR%%/user/GameConfig/GLCF52.ini
-%%DATADIR%%/user/GameConfig/GT3E52.ini
-%%DATADIR%%/user/GameConfig/SOUJ01.ini
-%%DATADIR%%/user/GameConfig/SQME52.ini
-%%DATADIR%%/user/GameConfig/R8LP7J.ini
-%%DATADIR%%/user/GameConfig/R22E01.ini
-%%DATADIR%%/user/GameConfig/R64J01.ini
-%%DATADIR%%/user/GameConfig/GP6J01.ini
-%%DATADIR%%/user/GameConfig/RM6EEB.ini
-%%DATADIR%%/user/GameConfig/GTYE69.ini
-%%DATADIR%%/user/GameConfig/GNWP69.ini
-%%DATADIR%%/user/GameConfig/GT3F52.ini
-%%DATADIR%%/user/GameConfig/SPDP52.ini
-%%DATADIR%%/user/GameConfig/SMFP4Q.ini
-%%DATADIR%%/user/GameConfig/SOUK01.ini
-%%DATADIR%%/user/GameConfig/GTYP69.ini
-%%DATADIR%%/user/GameConfig/SPDE52.ini
-%%DATADIR%%/user/GameConfig/R64K01.ini
-%%DATADIR%%/user/GameConfig/GOSX41.ini
-%%DATADIR%%/user/GameConfig/RHDJ8P.ini
-%%DATADIR%%/user/GameConfig/G8MJ01.ini
-%%DATADIR%%/user/GameConfig/R8DEA4.ini
-%%DATADIR%%/user/GameConfig/SQMP52.ini
-%%DATADIR%%/user/GameConfig/R22P01.ini
-%%DATADIR%%/user/GameConfig/GJZE52.ini
-%%DATADIR%%/user/GameConfig/GTSE4F.ini
-%%DATADIR%%/user/GameConfig/GJUF78.ini
-%%DATADIR%%/user/GameConfig/GF6F69.ini
-%%DATADIR%%/user/GameConfig/ROLP8P.ini
-%%DATADIR%%/user/GameConfig/GGEE41.ini
-%%DATADIR%%/user/GameConfig/GDIE7D.ini
-%%DATADIR%%/user/GameConfig/RWEPA4.ini
-%%DATADIR%%/user/GameConfig/G8ME01.ini
-%%DATADIR%%/user/GameConfig/G3XE52.ini
-%%DATADIR%%/user/GameConfig/GVSE8P.ini
-%%DATADIR%%/user/GameConfig/GFTE01.ini
-%%DATADIR%%/user/GameConfig/RMHE08.ini
-%%DATADIR%%/user/GameConfig/GE4E7D.ini
-%%DATADIR%%/user/GameConfig/RMCJ01.ini
-%%DATADIR%%/user/GameConfig/GVHE4F.ini
-%%DATADIR%%/user/GameConfig/GBVP41.ini
-%%DATADIR%%/user/GameConfig/GMNE78.ini
-%%DATADIR%%/user/GameConfig/GWRE01.ini
-%%DATADIR%%/user/GameConfig/RQOP69.ini
-%%DATADIR%%/user/GameConfig/GP4J18.ini
-%%DATADIR%%/user/GameConfig/HADE01.ini
-%%DATADIR%%/user/GameConfig/RPWZ41.ini
-%%DATADIR%%/user/GameConfig/SAKENS.ini
-%%DATADIR%%/user/GameConfig/SMNP01.ini
-%%DATADIR%%/user/GameConfig/GYQP01.ini
-%%DATADIR%%/user/GameConfig/GB3E51.ini
-%%DATADIR%%/user/GameConfig/GH6EAF.ini
-%%DATADIR%%/user/GameConfig/GSCE51.ini
-%%DATADIR%%/user/GameConfig/D43J01.ini
-%%DATADIR%%/user/GameConfig/WTKEGL.ini
-%%DATADIR%%/user/GameConfig/SVMJ01.ini
-%%DATADIR%%/user/GameConfig/GFKE69.ini
-%%DATADIR%%/user/GameConfig/GGZE52.ini
-%%DATADIR%%/user/GameConfig/RRBE41.ini
-%%DATADIR%%/user/GameConfig/GEDE01.ini
-%%DATADIR%%/user/GameConfig/RM3E01.ini
-%%DATADIR%%/user/GameConfig/GTKP51.ini
-%%DATADIR%%/user/GameConfig/RLJPKM.ini
-%%DATADIR%%/user/GameConfig/WGYEHN.ini
-%%DATADIR%%/user/GameConfig/GFDD69.ini
-%%DATADIR%%/user/GameConfig/WMBP01.ini
-%%DATADIR%%/user/GameConfig/GDLEA4.ini
-%%DATADIR%%/user/GameConfig/WGOEWG.ini
-%%DATADIR%%/user/GameConfig/GUCP69.ini
-%%DATADIR%%/user/GameConfig/GXEE8P.ini
-%%DATADIR%%/user/GameConfig/RBUE08.ini
-%%DATADIR%%/user/GameConfig/GQSPAF.ini
-%%DATADIR%%/user/GameConfig/GTUE8G.ini
-%%DATADIR%%/user/GameConfig/RHOJ8P.ini
-%%DATADIR%%/user/GameConfig/RZJE69.ini
-%%DATADIR%%/user/GameConfig/G2VE08.ini
-%%DATADIR%%/user/GameConfig/WCVENV.ini
-%%DATADIR%%/user/GameConfig/G89EAF.ini
-%%DATADIR%%/user/GameConfig/SZAP69.ini
-%%DATADIR%%/user/GameConfig/RBIJ99.ini
-%%DATADIR%%/user/GameConfig/SPVYA4.ini
-%%DATADIR%%/user/GameConfig/RRMX69.ini
-%%DATADIR%%/user/GameConfig/RONJG9.ini
-%%DATADIR%%/user/GameConfig/GF7P01.ini
-%%DATADIR%%/user/GameConfig/GBGP7D.ini
-%%DATADIR%%/user/GameConfig/GICE78.ini
-%%DATADIR%%/user/GameConfig/GBSE8P.ini
-%%DATADIR%%/user/GameConfig/RQRPAF.ini
-%%DATADIR%%/user/GameConfig/GHCE4Q.ini
-%%DATADIR%%/user/GameConfig/GZLP01.ini
-%%DATADIR%%/user/GameConfig/GBMP7F.ini
-%%DATADIR%%/user/GameConfig/GY2E01.ini
-%%DATADIR%%/user/GameConfig/SKJE78.ini
-%%DATADIR%%/user/GameConfig/WA4P01.ini
-%%DATADIR%%/user/GameConfig/R6TEA4.ini
-%%DATADIR%%/user/GameConfig/RKSPUG.ini
-%%DATADIR%%/user/GameConfig/FABP01.ini
-%%DATADIR%%/user/GameConfig/GDEE71.ini
-%%DATADIR%%/user/GameConfig/RELS01.ini
-%%DATADIR%%/user/GameConfig/SC7S52.ini
-%%DATADIR%%/user/GameConfig/G2GJB2.ini
-%%DATADIR%%/user/GameConfig/RFFEGD.ini
-%%DATADIR%%/user/GameConfig/GP6P01.ini
-%%DATADIR%%/user/GameConfig/GLMP01.ini
-%%DATADIR%%/user/GameConfig/RIPEAF.ini
-%%DATADIR%%/user/GameConfig/SN4XGT.ini
-%%DATADIR%%/user/GameConfig/G4BP08.ini
-%%DATADIR%%/user/GameConfig/SBVE78.ini
-%%DATADIR%%/user/GameConfig/RR5P70.ini
-%%DATADIR%%/user/GameConfig/GLSE64.ini
-%%DATADIR%%/user/GameConfig/PM4E01.ini
-%%DATADIR%%/user/GameConfig/GAUJ08.ini
-%%DATADIR%%/user/GameConfig/GBLPGL.ini
-%%DATADIR%%/user/GameConfig/RMGP01.ini
-%%DATADIR%%/user/GameConfig/GDGP78.ini
-%%DATADIR%%/user/GameConfig/G2FE78.ini
-%%DATADIR%%/user/GameConfig/DVDXDV.ini
-%%DATADIR%%/user/GameConfig/GAFP01.ini
-%%DATADIR%%/user/GameConfig/GJKE52.ini
-%%DATADIR%%/user/GameConfig/WIYETL.ini
-%%DATADIR%%/user/GameConfig/G8WE01.ini
-%%DATADIR%%/user/GameConfig/GCZE69.ini
-%%DATADIR%%/user/GameConfig/RBWP01.ini
-%%DATADIR%%/user/GameConfig/RZDJ01.ini
-%%DATADIR%%/user/GameConfig/SN4EDA.ini
-%%DATADIR%%/user/GameConfig/WBLPGD.ini
-%%DATADIR%%/user/GameConfig/GXXE01.ini
-%%DATADIR%%/user/GameConfig/RSFP99.ini
-%%DATADIR%%/user/GameConfig/GGSPA4.ini
-%%DATADIR%%/user/GameConfig/GC4JBN.ini
-%%DATADIR%%/user/GameConfig/GC5PNK.ini
-%%DATADIR%%/user/GameConfig/GCTE51.ini
-%%DATADIR%%/user/GameConfig/GNQE69.ini
-%%DATADIR%%/user/GameConfig/RB4E08.ini
-%%DATADIR%%/user/GameConfig/NABE01.ini
-%%DATADIR%%/user/GameConfig/SEME4Q.ini
-%%DATADIR%%/user/GameConfig/GFEJ01.ini
-%%DATADIR%%/user/GameConfig/GPDE51.ini
-%%DATADIR%%/user/GameConfig/GIBE4F.ini
-%%DATADIR%%/user/GameConfig/RKIPUG.ini
-%%DATADIR%%/user/GameConfig/GUNE5D.ini
-%%DATADIR%%/user/GameConfig/GVDE78.ini
-%%DATADIR%%/user/GameConfig/GK6JA4.ini
-%%DATADIR%%/user/GameConfig/GQNE5D.ini
-%%DATADIR%%/user/GameConfig/GEAP8P.ini
-%%DATADIR%%/user/GameConfig/GOWE69.ini
-%%DATADIR%%/user/GameConfig/SNCP8P.ini
-%%DATADIR%%/user/GameConfig/GSOE8P.ini
-%%DATADIR%%/user/GameConfig/RUCXRT.ini
-%%DATADIR%%/user/GameConfig/GA4E51.ini
-%%DATADIR%%/user/GameConfig/HAAA01.ini
-%%DATADIR%%/user/GameConfig/GBGE5G.ini
-%%DATADIR%%/user/GameConfig/GVKE52.ini
-%%DATADIR%%/user/GameConfig/GQSDAF.ini
-%%DATADIR%%/user/GameConfig/R5IP4Q.ini
-%%DATADIR%%/user/GameConfig/RO9PNK.ini
-%%DATADIR%%/user/GameConfig/GMSE01.ini
-%%DATADIR%%/user/GameConfig/GCNE7D.ini
-%%DATADIR%%/user/GameConfig/GGCE0A.ini
-%%DATADIR%%/user/GameConfig/GGRE41.ini
-%%DATADIR%%/user/GameConfig/GNHE5d.ini
-%%DATADIR%%/user/GameConfig/RBBJ18.ini
-%%DATADIR%%/user/GameConfig/RTNE41.ini
-%%DATADIR%%/user/GameConfig/RHAP01.ini
-%%DATADIR%%/user/GameConfig/GHRE78.ini
-%%DATADIR%%/user/GameConfig/WOTEM0.ini
-%%DATADIR%%/user/GameConfig/RD2X41.ini
-%%DATADIR%%/user/GameConfig/RSBJ01.ini
-%%DATADIR%%/user/GameConfig/G8SJAF.ini
-%%DATADIR%%/user/GameConfig/GMTP69.ini
-%%DATADIR%%/user/GameConfig/GW9E78.ini
-%%DATADIR%%/user/GameConfig/SBDP08.ini
-%%DATADIR%%/user/GameConfig/R3CE20.ini
-%%DATADIR%%/user/GameConfig/RSVP8P.ini
-%%DATADIR%%/user/GameConfig/RFFPGD.ini
-%%DATADIR%%/user/GameConfig/GP6E01.ini
-%%DATADIR%%/user/GameConfig/RNOP01.ini
-%%DATADIR%%/user/GameConfig/SC7F52.ini
-%%DATADIR%%/user/GameConfig/JACP01.ini
-%%DATADIR%%/user/GameConfig/RQLE64.ini
-%%DATADIR%%/user/GameConfig/WPSE01.ini
-%%DATADIR%%/user/GameConfig/S59JC8.ini
-%%DATADIR%%/user/GameConfig/RIPPAF.ini
-%%DATADIR%%/user/GameConfig/RDVE41.ini
-%%DATADIR%%/user/GameConfig/G4BE08.ini
-%%DATADIR%%/user/GameConfig/GLME01.ini
-%%DATADIR%%/user/GameConfig/GEYE69.ini
-%%DATADIR%%/user/GameConfig/G3QEA4.ini
-%%DATADIR%%/user/GameConfig/WJEEJX.ini
-%%DATADIR%%/user/GameConfig/RMGE01.ini
-%%DATADIR%%/user/GameConfig/GD6EB2.ini
-%%DATADIR%%/user/GameConfig/GPXP01.ini
-%%DATADIR%%/user/GameConfig/GAFE01.ini
-%%DATADIR%%/user/GameConfig/GS8P7D.ini
-%%DATADIR%%/user/GameConfig/GAGP70.ini
-%%DATADIR%%/user/GameConfig/GHKE7D.ini
-%%DATADIR%%/user/GameConfig/GTZE41.ini
-%%DATADIR%%/user/GameConfig/RBWE01.ini
-%%DATADIR%%/user/GameConfig/GCZP69.ini
-%%DATADIR%%/user/GameConfig/RTNJCQ.ini
-%%DATADIR%%/user/GameConfig/GSMP52.ini
-%%DATADIR%%/user/GameConfig/GANE7U.ini
-%%DATADIR%%/user/GameConfig/G8WP01.ini
-%%DATADIR%%/user/GameConfig/RKDP01.ini
-%%DATADIR%%/user/GameConfig/GCGE41.ini
-%%DATADIR%%/user/GameConfig/GOPEB2.ini
-%%DATADIR%%/user/GameConfig/WRGEHU.ini
-%%DATADIR%%/user/GameConfig/GXXP01.ini
-%%DATADIR%%/user/GameConfig/SB4J01.ini
-%%DATADIR%%/user/GameConfig/RMCK01.ini
-%%DATADIR%%/user/GameConfig/RB4P08.ini
-%%DATADIR%%/user/GameConfig/ROUJAF.ini
-%%DATADIR%%/user/GameConfig/RK2P01.ini
-%%DATADIR%%/user/GameConfig/GMHF52.ini
-%%DATADIR%%/user/GameConfig/ROWJ08.ini
-%%DATADIR%%/user/GameConfig/GCTP51.ini
-%%DATADIR%%/user/GameConfig/GGSEA4.ini
-%%DATADIR%%/user/GameConfig/GFFE5D.ini
-%%DATADIR%%/user/GameConfig/GYAE78.ini
-%%DATADIR%%/user/GameConfig/RTCP41.ini
-%%DATADIR%%/user/GameConfig/SEMP4Q.ini
-%%DATADIR%%/user/GameConfig/GDME01.ini
-%%DATADIR%%/user/GameConfig/RODP01.ini
-%%DATADIR%%/user/GameConfig/G8OJ18.ini
-%%DATADIR%%/user/GameConfig/GF2E69.ini
-%%DATADIR%%/user/GameConfig/RZJD69.ini
-%%DATADIR%%/user/GameConfig/R2GEXJ.ini
-%%DATADIR%%/user/GameConfig/SPVXA4.ini
-%%DATADIR%%/user/GameConfig/WILETL.ini
-%%DATADIR%%/user/GameConfig/HAYA01.ini
-%%DATADIR%%/user/GameConfig/GFDE69.ini
-%%DATADIR%%/user/GameConfig/GSOP8P.ini
-%%DATADIR%%/user/GameConfig/GEAE8P.ini
-%%DATADIR%%/user/GameConfig/SNCE8P.ini
-%%DATADIR%%/user/GameConfig/PRJE01.ini
-%%DATADIR%%/user/GameConfig/GQCE52.ini
-%%DATADIR%%/user/GameConfig/R5IE4Q.ini
-%%DATADIR%%/user/GameConfig/GWSEA4.ini
-%%DATADIR%%/user/GameConfig/R4BPGT.ini
-%%DATADIR%%/user/GameConfig/GCNP7D.ini
-%%DATADIR%%/user/GameConfig/GNDE69.ini
-%%DATADIR%%/user/GameConfig/GMSP01.ini
-%%DATADIR%%/user/GameConfig/GPHE52.ini
-%%DATADIR%%/user/GameConfig/RHAE01.ini
-%%DATADIR%%/user/GameConfig/RF4P6M.ini
-%%DATADIR%%/user/GameConfig/RTNP41.ini
-%%DATADIR%%/user/GameConfig/PZLJ01.ini
-%%DATADIR%%/user/GameConfig/G3FF69.ini
-%%DATADIR%%/user/GameConfig/G6FE69.ini
-%%DATADIR%%/user/GameConfig/RFBP01.ini
-%%DATADIR%%/user/GameConfig/GVCP08.ini
-%%DATADIR%%/user/GameConfig/R4EJ01.ini
-%%DATADIR%%/user/GameConfig/GBQE78.ini
-%%DATADIR%%/user/GameConfig/GIGJ8P.ini
-%%DATADIR%%/user/GameConfig/RSVE8P.ini
-%%DATADIR%%/user/GameConfig/GRLE41.ini
-%%DATADIR%%/user/GameConfig/SBDE08.ini
-%%DATADIR%%/user/GameConfig/GYKEB2.ini
-%%DATADIR%%/user/GameConfig/SXBP52.ini
-%%DATADIR%%/user/GameConfig/RPDPGN.ini
-%%DATADIR%%/user/GameConfig/GAVE78.ini
-%%DATADIR%%/user/GameConfig/RBBP99.ini
-%%DATADIR%%/user/GameConfig/GTSP4F.ini
-%%DATADIR%%/user/GameConfig/GDIP7D.ini
-%%DATADIR%%/user/GameConfig/GGEP41.ini
-%%DATADIR%%/user/GameConfig/GC7PNK.ini
-%%DATADIR%%/user/GameConfig/ROLE8P.ini
-%%DATADIR%%/user/GameConfig/G8MP01.ini
-%%DATADIR%%/user/GameConfig/RPJJ99.ini
-%%DATADIR%%/user/GameConfig/GVJJ08.ini
-%%DATADIR%%/user/GameConfig/GVSP8P.ini
-%%DATADIR%%/user/GameConfig/G3XP52.ini
-%%DATADIR%%/user/GameConfig/WZIPTW.ini
-%%DATADIR%%/user/GameConfig/GQ8E69.ini
-%%DATADIR%%/user/GameConfig/GUTE52.ini
-%%DATADIR%%/user/GameConfig/GBVE41.ini
-%%DATADIR%%/user/GameConfig/R6BX78.ini
-%%DATADIR%%/user/GameConfig/RMHP08.ini
-%%DATADIR%%/user/GameConfig/GRKP7G.ini
-%%DATADIR%%/user/GameConfig/GFTP01.ini
-%%DATADIR%%/user/GameConfig/GHQE7D.ini
-%%DATADIR%%/user/GameConfig/SAKPNS.ini
-%%DATADIR%%/user/GameConfig/SMNE01.ini
-%%DATADIR%%/user/GameConfig/GWRP01.ini
-%%DATADIR%%/user/GameConfig/RZDK01.ini
-%%DATADIR%%/user/GameConfig/R5WJA4.ini
-%%DATADIR%%/user/GameConfig/GR2E52.ini
-%%DATADIR%%/user/GameConfig/JAAE01.ini
-%%DATADIR%%/user/GameConfig/GKGE01.ini
-%%DATADIR%%/user/GameConfig/GTKE51.ini
-%%DATADIR%%/user/GameConfig/RM3P01.ini
-%%DATADIR%%/user/GameConfig/GEDP01.ini
-%%DATADIR%%/user/GameConfig/G3JEAF.ini
-%%DATADIR%%/user/GameConfig/WMMEAF.ini
-%%DATADIR%%/user/GameConfig/RGVP52.ini
-%%DATADIR%%/user/GameConfig/R3OJ01.ini
-%%DATADIR%%/user/GameConfig/RYBE69.ini
-%%DATADIR%%/user/GameConfig/RBUP08.ini
-%%DATADIR%%/user/GameConfig/SE2P69.ini
-%%DATADIR%%/user/GameConfig/GQSEAF.ini
-%%DATADIR%%/user/GameConfig/GXEP8P.ini
-%%DATADIR%%/user/GameConfig/WGOPWG.ini
-%%DATADIR%%/user/GameConfig/G4CE54.ini
-%%DATADIR%%/user/GameConfig/SZAE69.ini
-%%DATADIR%%/user/GameConfig/GINE69.ini
-%%DATADIR%%/user/GameConfig/G2VP08.ini
-%%DATADIR%%/user/GameConfig/R7EJ8P.ini
-%%DATADIR%%/user/GameConfig/GRAE5Z.ini
-%%DATADIR%%/user/GameConfig/RZJP69.ini
-%%DATADIR%%/user/GameConfig/RZJJ13.ini
-%%DATADIR%%/user/GameConfig/RGAE8P.ini
-%%DATADIR%%/user/GameConfig/GF7E01.ini
-%%DATADIR%%/user/GameConfig/HACA01.ini
-%%DATADIR%%/user/GameConfig/GZLE01.ini
-%%DATADIR%%/user/GameConfig/GBME7F.ini
-%%DATADIR%%/user/GameConfig/GBSP8P.ini
-%%DATADIR%%/user/GameConfig/R8AP01.ini
-%%DATADIR%%/user/GameConfig/R7FJGD.ini
-%%DATADIR%%/user/GameConfig/GCOE52.ini
-%%DATADIR%%/user/GameConfig/GRFE78.ini
-%%DATADIR%%/user/GameConfig/GGAJB2.ini
-%%DATADIR%%/user/GameConfig/GC9P6S.ini
-%%DATADIR%%/user/GameConfig/GENE69.ini
-%%DATADIR%%/user/GameConfig/R64E01.ini
-%%DATADIR%%/user/GameConfig/GHGEEB.ini
-%%DATADIR%%/user/GameConfig/GLYE69.ini
-%%DATADIR%%/user/GameConfig/RT9E52.ini
-%%DATADIR%%/user/GameConfig/RH8P4F.ini
-%%DATADIR%%/user/GameConfig/GJWE78.ini
-%%DATADIR%%/user/GameConfig/GEWE41.ini
-%%DATADIR%%/user/GameConfig/GMHE52.ini
-%%DATADIR%%/user/GameConfig/GFEP01.ini
-%%DATADIR%%/user/GameConfig/GABEAF.ini
-%%DATADIR%%/user/GameConfig/G9BEE9.ini
-%%DATADIR%%/user/GameConfig/GLWE51.ini
-%%DATADIR%%/user/GameConfig/GP2EAF.ini
-%%DATADIR%%/user/GameConfig/SC4E64.ini
-%%DATADIR%%/user/GameConfig/SDNE41.ini
-%%DATADIR%%/user/GameConfig/G3EE51.ini
-%%DATADIR%%/user/GameConfig/GE5EA4.ini
-%%DATADIR%%/user/GameConfig/SNCJ8P.ini
-%%DATADIR%%/user/GameConfig/RQBENR.ini
-%%DATADIR%%/user/GameConfig/GKOE70.ini
-%%DATADIR%%/user/GameConfig/GM6EE9.ini
-%%DATADIR%%/user/GameConfig/SK3EEB.ini
-%%DATADIR%%/user/GameConfig/RJAP52.ini
-%%DATADIR%%/user/GameConfig/RHAJ01.ini
-%%DATADIR%%/user/GameConfig/PZLE01.ini
-%%DATADIR%%/user/GameConfig/GREP08.ini
-%%DATADIR%%/user/GameConfig/GJUD78.ini
-%%DATADIR%%/user/GameConfig/RSVJ8P.ini
-%%DATADIR%%/user/GameConfig/RYOEA4.ini
-%%DATADIR%%/user/GameConfig/SBDJ08.ini
-%%DATADIR%%/user/GameConfig/GUFE4Z.ini
-%%DATADIR%%/user/GameConfig/GKSE52.ini
-%%DATADIR%%/user/GameConfig/GLCE52.ini
-%%DATADIR%%/user/GameConfig/GLLE78.ini
-%%DATADIR%%/user/GameConfig/GZ3PB2.ini
-%%DATADIR%%/user/GameConfig/GH5E52.ini
-%%DATADIR%%/user/GameConfig/WDMP01.ini
-%%DATADIR%%/user/GameConfig/RSBP01.ini
-%%DATADIR%%/user/GameConfig/G63E41.ini
-%%DATADIR%%/user/GameConfig/SC7E52.ini
-%%DATADIR%%/user/GameConfig/GUZE41.ini
-%%DATADIR%%/user/GameConfig/RPPE41.ini
-%%DATADIR%%/user/GameConfig/GCAE5H.ini
-%%DATADIR%%/user/GameConfig/R4EE01.ini
-%%DATADIR%%/user/GameConfig/R8PP01.ini
-%%DATADIR%%/user/GameConfig/HAXXHB.ini
-%%DATADIR%%/user/GameConfig/SC7I52.ini
-%%DATADIR%%/user/GameConfig/G4QP01.ini
-%%DATADIR%%/user/GameConfig/RMAE01.ini
-%%DATADIR%%/user/GameConfig/GGPJB2.ini
-%%DATADIR%%/user/GameConfig/RWSK01.ini
-%%DATADIR%%/user/GameConfig/GAFJ01.ini
-%%DATADIR%%/user/GameConfig/RBQPUG.ini
-%%DATADIR%%/user/GameConfig/WPYPPY.ini
-%%DATADIR%%/user/GameConfig/RDSE70.ini
-%%DATADIR%%/user/GameConfig/G3FE69.ini
-%%DATADIR%%/user/GameConfig/GLQE41.ini
-%%DATADIR%%/user/GameConfig/SWAE52.ini
-%%DATADIR%%/user/GameConfig/GKFEGG.ini
-%%DATADIR%%/user/GameConfig/RMGJ01.ini
-%%DATADIR%%/user/GameConfig/R3GXUG.ini
-%%DATADIR%%/user/GameConfig/GW2P78.ini
-%%DATADIR%%/user/GameConfig/GOPJB2.ini
-%%DATADIR%%/user/GameConfig/RZDP01.ini
-%%DATADIR%%/user/GameConfig/RWUX52.ini
-%%DATADIR%%/user/GameConfig/RO3EXJ.ini
-%%DATADIR%%/user/GameConfig/GDTE69.ini
-%%DATADIR%%/user/GameConfig/WC6EUP.ini
-%%DATADIR%%/user/GameConfig/RBWJ01.ini
-%%DATADIR%%/user/GameConfig/R3RE8P.ini
-%%DATADIR%%/user/GameConfig/RSUP41.ini
-%%DATADIR%%/user/GameConfig/GCCP01.ini
-%%DATADIR%%/user/GameConfig/SMOX41.ini
-%%DATADIR%%/user/GameConfig/G2XE8P.ini
-%%DATADIR%%/user/GameConfig/WAYETJ.ini
-%%DATADIR%%/user/GameConfig/SB4E01.ini

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310160716.r9G7GvpJ036930>