Index: head/emulators/ppsspp/Makefile
===================================================================
--- head/emulators/ppsspp/Makefile	(revision 451581)
+++ head/emulators/ppsspp/Makefile	(revision 451582)
@@ -1,94 +1,98 @@
 # $FreeBSD$
 
 PORTNAME=	ppsspp
 DISTVERSIONPREFIX=	v
 DISTVERSION?=	1.4.2
 PORTREVISION?=	3
 CATEGORIES=	emulators
 # XXX Get from Debian once #697821 lands
 MASTER_SITES=	https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage
 DISTFILES=	${PORTNAME}.1:manpage
 EXTRACT_ONLY=	${DISTFILES:N*\:manpage:C/:.*//}
 
 .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX:N*-devel}
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	e33acdc5e922.patch:-p1
 .endif
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libsnappy.so:archivers/snappy \
 		libavcodec.so:multimedia/ffmpeg
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrydgard
 GH_TUPLE?=	hrydgard:glslang:b16f7e68:glslang/ext/glslang \
 		hrydgard:${PORTNAME}-lang:f32328a:lang/assets/lang \
 		KhronosGroup:SPIRV-Cross:6381b2f:SPIRV/ext/SPIRV-Cross \
 		Kingcom:armips:v0.9-26-g770365d:armips/ext/armips \
 		Kingcom:tinyformat:Release-2.0.1-7-gb7f5a22:tinyformat/ext/armips/ext/tinyformat
 
 CONFLICTS_INSTALL=	${PORTNAME}-*
 
 USES=		cmake:outsource compiler:c++11-lib localbase:ldflags pkgconfig
 EXCLUDE=	libzip zlib
 EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
 USE_GL=		gl glew glu
 USE_SDL=	sdl2 # joystick
 CMAKE_ARGS=	-DUSING_EGL=off -DUSE_SYSTEM_FFMPEG=on
 SUB_FILES=	pkg-message
 PORTDATA=	assets ${PORTNAME}
 
 DESKTOP_ENTRIES="PPSSPP" \
 		"" \
 		"${PORTNAME}" \
 		"${PORTNAME} %f" \
 		"Game;Emulator;" \
 		""
 
+.if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX:N*-devel}
 OPTIONS_DEFINE=	OLDJOY
+.endif
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=	QT5 SDL
 OPTIONS_SLAVE?=	SDL
 OPTIONS_EXCLUDE:=	${OPTIONS_SINGLE_GUI}
 
+.if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX:N*-devel}
 OLDJOY_DESC=	Old joystick support with fixed button mappings (deprecated)
 OLDJOY_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-old-joy
+.endif
 QT5_USE=	QT5=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets
 QT5_CMAKE_BOOL=	USING_QT_UI
 QT5_VARS=	EXENAME=PPSSPPQt
 SDL_BUILD_DEPENDS=	png>=1.6:graphics/png
 SDL_LIB_DEPENDS=	libpng.so:graphics/png
 SDL_VARS=	EXENAME=PPSSPPSDL
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/Linux/${OPSYS}/' \
 		${WRKSRC}/assets/gamecontrollerdb.txt
 	@${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \
 		${WRKSRC}/UI/NativeApp.cpp
 	@${REINPLACE_CMD} -e 's/"unknown"/"${GH_TAGNAME}"/' \
 		${WRKSRC}/git-version.cmake
 
 do-install:
 # cmake doesn't pack assets into the app unlike qmake
 	(cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDATA:N${PORTNAME}}" ${STAGEDIR}${DATADIR})
 # Install the app alongside assets to avoid warnings with GetExeDirectory()
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${EXENAME} \
 		${STAGEDIR}${DATADIR}/${PORTNAME}
 	${LN} -sf ../${DATADIR_REL}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 	${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1
 	(cd ${WRKSRC}/icons && ${COPYTREE_SHARE} \
 		"hicolor" ${STAGEDIR}${PREFIX}/share/icons)
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/icons/icon-512.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg
 
 .include <bsd.port.mk>
Index: head/emulators/ppsspp-devel/Makefile
===================================================================
--- head/emulators/ppsspp-devel/Makefile	(revision 451581)
+++ head/emulators/ppsspp-devel/Makefile	(revision 451582)
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
-DISTVERSION=	1.4.2-463
-DISTVERSIONSUFFIX=	-g11f8bcc8a
+DISTVERSION=	1.4.2-473
+DISTVERSIONSUFFIX=	-gbb1f65118
 PORTREVISION?=	0
 PKGNAMESUFFIX?=	-devel
 
 GH_TUPLE=	hrydgard:glslang:136b1e2d:glslang/ext/glslang \
 		hrydgard:${PORTNAME}-lang:c31a1d3:lang/assets/lang \
 		KhronosGroup:SPIRV-Cross:90966d5:SPIRV/ext/SPIRV-Cross \
 		Kingcom:armips:v0.9-26-g770365d:armips/ext/armips \
 		Kingcom:tinyformat:Release-2.0.1-7-gb7f5a22:tinyformat/ext/armips/ext/tinyformat
 
 MASTERDIR=	${.CURDIR}/../ppsspp
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 .include "${MASTERDIR}/Makefile"
Index: head/emulators/ppsspp-devel/distinfo
===================================================================
--- head/emulators/ppsspp-devel/distinfo	(revision 451581)
+++ head/emulators/ppsspp-devel/distinfo	(revision 451582)
@@ -1,15 +1,15 @@
-TIMESTAMP = 1506755177
+TIMESTAMP = 1507145200
 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b
 SIZE (ppsspp.1) = 1598
-SHA256 (hrydgard-ppsspp-v1.4.2-463-g11f8bcc8a_GH0.tar.gz) = 1cafca6b9c83d20b4adb961095de208a6e236c1e67a549d84cc91544cb6ba77b
-SIZE (hrydgard-ppsspp-v1.4.2-463-g11f8bcc8a_GH0.tar.gz) = 18994696
+SHA256 (hrydgard-ppsspp-v1.4.2-473-gbb1f65118_GH0.tar.gz) = 29d233e8bee0a89e37bb9155f5f201f40f33ba531f67f28cf0ffb0e7ecc83ab4
+SIZE (hrydgard-ppsspp-v1.4.2-473-gbb1f65118_GH0.tar.gz) = 18994046
 SHA256 (hrydgard-glslang-136b1e2d_GH0.tar.gz) = 430bd17420a0bf453c8b3f47ff19a58aadf5ae3e15cc773f2b833d60f0ecadea
 SIZE (hrydgard-glslang-136b1e2d_GH0.tar.gz) = 1767855
 SHA256 (hrydgard-ppsspp-lang-c31a1d3_GH0.tar.gz) = 6c007432d9af7ad9358710d54d13c66d80364db7b33ab018b76c87d92853c160
 SIZE (hrydgard-ppsspp-lang-c31a1d3_GH0.tar.gz) = 328423
 SHA256 (KhronosGroup-SPIRV-Cross-90966d5_GH0.tar.gz) = de8bcf01e0a0c4107871fdc8b764771487052fedbe2990a369e7908d4a95c000
 SIZE (KhronosGroup-SPIRV-Cross-90966d5_GH0.tar.gz) = 228783
 SHA256 (Kingcom-armips-v0.9-26-g770365d_GH0.tar.gz) = e6c52967082658082544f83875cc08e50227ff788d3553e0b0bc28abdb2615ed
 SIZE (Kingcom-armips-v0.9-26-g770365d_GH0.tar.gz) = 163606
 SHA256 (Kingcom-tinyformat-Release-2.0.1-7-gb7f5a22_GH0.tar.gz) = d86b5b4592047254c5118d0639e51d00869b3adc2f2c5419fdf29381ca42011e
 SIZE (Kingcom-tinyformat-Release-2.0.1-7-gb7f5a22_GH0.tar.gz) = 22286