Index: head/emulators/higan/Makefile
===================================================================
--- head/emulators/higan/Makefile	(revision 495886)
+++ head/emulators/higan/Makefile	(revision 495887)
@@ -1,113 +1,99 @@
 # Created by: elbarto
 # $FreeBSD$
 
 PORTNAME=	higan
 PORTVERSION=	106
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators games
 MASTER_SITES=	http://download.byuu.org/ \
 		http://www.cyberbotx.com/higan/
 DISTNAME=	${PORTNAME}_v${PORTVERSION}-source
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Nintendo multi-system emulator
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		7z:p7zip compiler:c++14-lang gmake pkgconfig
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
+
+USES=		7z:p7zip compiler:c++14-lang gettext gmake gnome pkgconfig
+USE_GNOME=	cairo gdkpixbuf2 gtk20 gtksourceview2
 USE_XORG=	x11 xext
 USE_CSTD=	c99
 USE_CXXSTD=	c++14
 USE_GCC=	yes
 
 MAKEFILE=	GNUmakefile
-MAKE_ENV=	compiler="${CXX}"
+MAKE_ENV=	compiler="${CXX}" hiro="gtk"
 
 OPTIONS_DEFINE=		DEBUG
-OPTIONS_SINGLE=		GUI
-OPTIONS_SINGLE_GUI=	GTK2 QT4
 OPTIONS_MULTI=		VIDEO SOUND INPUT
 OPTIONS_MULTI_VIDEO=	GLX SDL XSHM XV
 OPTIONS_MULTI_SOUND=	AO OPENAL OSS PULSEAUDIO
 OPTIONS_MULTI_INPUT=	INPUT_SDL INPUT_X
-OPTIONS_DEFAULT=	GTK2 GLX XSHM XV SDL \
+OPTIONS_DEFAULT=	GLX XSHM XV SDL \
 			OSS INPUT_SDL INPUT_X
 
 XSHM_DESC=		Build XShm video driver
 XV_DESC=		Build Xv video driver
 INPUT_SDL_DESC=		Build SDL input driver
 INPUT_X_DESC=		Build X input driver
 
-GTK2_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
-			libfreetype.so:print/freetype2
-GTK2_MAKE_ENV=	hiro="gtk"
-GTK2_USE=	GNOME=cairo,gdkpixbuf2,gtk20,gtksourceview2
-GTK2_USES=	gettext
 
-QT4_MAKE_ENV=	hiro="qt"
-QT4_USES=	qt:4
-QT4_USE=	QT=corelib,gui,moc_build
-
 GLX_USE=	GL=gl
 GLX_VARS=	VIDEO_DRIVER+=video.glx
 
 SDL_USE=	XORG=xv SDL=sdl
 SDL_VARS=	VIDEO_DRIVER+=video.sdl
 
 XSHM_USE=	XORG=xext
 XSHM_VARS=	VIDEO_DRIVER+=video.xshm
 
 XV_USE=		XORG=xv
 XV_VARS=	VIDEO_DRIVER+=video.xvideo
 
 AO_LIB_DEPENDS=	libao.so:audio/libao
 AO_VARS=	AUDIO_DRIVER+=audio.ao
 
 OPENAL_USES=	openal:al
 OPENAL_VARS=	AUDIO_DRIVER+=audio.openal
 
 OSS_VARS=	AUDIO_DRIVER+=audio.oss
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	AUDIO_DRIVER+=audio.pulseaudio
 
 INPUT_SDL_USE=	SDL=sdl
 INPUT_SDL_VARS=	INPUT_DRIVER+=input.sdl
 
 INPUT_X_VARS=	INPUT_DRIVER+=input.xlib
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MQT4}
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
-.endif
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's|%%VIDEO%%|${VIDEO_DRIVER}|' \
 		-e 's|%%AUDIO%%|${AUDIO_DRIVER}|' \
 		-e 's|%%INPUT%%|${INPUT_DRIVER}|' \
 		${WRKSRC}/higan/target-tomoko/GNUmakefile
 	${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|' \
 		${WRKSRC}/nall/path.hpp
 
 post-patch-DEBUG-on:
 	${REINPLACE_CMD} -e 's|-O3|-g|g' \
 		${WRKSRC}/higan/GNUmakefile \
 		${WRKSRC}/icarus/GNUmakefile
 
 do-build:
 .for d in higan icarus
 	@${DO_MAKE_BUILD} ${ALL_TARGET} -C${WRKSRC}/${d}
 .endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/higan/out/higan ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/icarus/out/icarus ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/higan/data/higan.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 	${INSTALL_DATA} ${WRKSRC}/higan/data/higan.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	(cd ${WRKSRC}/higan/systems && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/)
 	(cd ${WRKSRC}/icarus/Database && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/icarus/Database/)
 
 .include <bsd.port.mk>