diff -aurN emulators/dolphin-emu.orig/Makefile emulators/dolphin-emu/Makefile
--- emulators/dolphin-emu.orig/Makefile	2013-12-04 19:48:48.000000000 +0100
+++ emulators/dolphin-emu/Makefile	2013-12-05 06:13:09.140779000 +0100
@@ -1,9 +1,9 @@
 # Created by: Ganael Laplanche <ganael.laplanche@martymac.org>
-# $FreeBSD: emulators/dolphin-emu/Makefile 335626 2013-12-04 18:48:48Z makc $
+# $FreeBSD: emulators/dolphin-emu/Makefile 335549 2013-12-03 08:34:29Z martymac $
 
 PORTNAME=	dolphin-emu
 PORTVERSION=	4.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
@@ -28,8 +28,6 @@
 WX_UNICODE=	yes
 USE_GL=	gl glew glu
 
-USE_GCC=	yes
-
 USES=		dos2unix cmake pkgconfig iconv
 DOS2UNIX_REGEX=	.*\.(h|c|cpp)
 
@@ -41,61 +39,39 @@
 		-DUSE_X11:BOOL=ON \
 		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON
 
-OPTIONS_DEFINE=	PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS UPNP
+OPTIONS_DEFINE=	PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS UPNP NLS
+OPTIONS_DEFAULT=	PORTAUDIO FRAMEDUMPS UPNP NLS
+OPTIONS_SUB=	yes
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CMAKE_ON=	-DDISABLE_PULSEAUDIO:BOOL=OFF
+PULSEAUDIO_CMAKE_OFF=	-DDISABLE_PULSEAUDIO:BOOL=ON
 PORTAUDIO_DESC=	Enable PortAudio (mic) support
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_CMAKE_ON=	-DDISABLE_PORTAUDIO:BOOL=OFF
+PORTAUDIO_CMAKE_OFF=	-DDISABLE_PORTAUDIO:BOOL=ON
+DEBUG_MAKE_ENV=	VERBOSE=yes
+DEBUG_CMAKE_ON=	-DFASTLOG:BOOL=ON
+DEBUG_CMAKE_OFF=	-DFASTLOG:BOOL=OFF
 FRAMEDUMPS_DESC=	Encode framedumps in AVI format
-OPTIONS_DEFAULT=	PORTAUDIO FRAMEDUMPS UPNP
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CMAKE_ARGS+=	-DDISABLE_NLS:BOOL=ON
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CMAKE_ARGS+=	-DFASTLOG:BOOL=ON
-MAKE_ENV+=	VERBOSE=yes
-.endif
-
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
-.else
-CMAKE_ARGS+=	-DDISABLE_PULSEAUDIO:BOOL=ON
-.endif
-
-.if ${PORT_OPTIONS:MPORTAUDIO}
-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+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
-		libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
-		libavutil.so:${PORTSDIR}/multimedia/ffmpeg
-.else
-CMAKE_ARGS+=	-DENCODE_FRAMEDUMPS:BOOL=OFF
-.endif
-
-.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
+FRAMEDUMPS_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
+			libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
+			libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
+			libavutil.so:${PORTSDIR}/multimedia/ffmpeg
+FRAMEDUMPS_CMAKE_ON=	-DENCODE_FRAMEDUMPS:BOOL=ON
+FRAMEDUMPS_CMAKE_OFF=	-DENCODE_FRAMEDUMPS:BOOL=OFF
+UPNP_LIB_DEPENDS=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
+UPNP_CMAKE_ON=	-DUSE_UPNP:BOOL=ON
+UPNP_CMAKE_OFF=	-DUSE_UPNP:BOOL=OFF
+NLS_USES=	gettext
+NLS_CMAKE_ON=	-DDISABLE_NLS:BOOL=OFF
+NLS_CMAKE_OFF=	-DDISABLE_NLS:BOOL=ON
 
 .include <bsd.port.pre.mk>
 
 .if !empty(ICONV_LIB)
-CMAKE_ARGS+=	-DUSE_ICONV:BOOL=ON
+CMAKE_ARGS+=	-DICONV_LINK:BOOL=ON
 .else
-CMAKE_ARGS+=	-DUSE_ICONV:BOOL=OFF
+CMAKE_ARGS+=	-DICONV_LINK:BOOL=OFF
 .endif
 
 .include <bsd.port.post.mk>
diff -aurN emulators/dolphin-emu.orig/files/patch-Source-Core-DolphinWX-CMakeLists.txt emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt
--- emulators/dolphin-emu.orig/files/patch-Source-Core-DolphinWX-CMakeLists.txt	2013-10-16 09:16:57.000000000 +0200
+++ emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt	2013-12-04 17:02:59.552168000 +0100
@@ -14,12 +14,12 @@
  else()
 -	set(LIBS ${LIBS} png iconv)
 +	set(LIBS ${LIBS} png)
-+	set(USE_ICONV True)
++	set(ICONV_LINK True)
 +endif()
 +
-+if(USE_ICONV)
-+	message( "-- Adding iconv")
-+	set(LIBS  ${LIBS} iconv)
++if(ICONV_LINK)
++	message( "-- Linking to libiconv")
++	set(LIBS ${LIBS} iconv)
  endif()
  
  if(LIBAV_FOUND)