Index: head/games/pioneer/Makefile
===================================================================
--- head/games/pioneer/Makefile	(revision 398982)
+++ head/games/pioneer/Makefile	(revision 398983)
@@ -1,105 +1,105 @@
 # Created by: lightside <lightside@gmx.com>
 # $FreeBSD$
 
 PORTNAME=	pioneer
 PORTVERSION=	0.0.${GH_TAGNAME}
 CATEGORIES=	games
 
 MAINTAINER=	lightside@gmx.com
 COMMENT=	Space adventure game set in the Milky Way galaxy
 
 LICENSE=	APACHE20 GPLv3 MIT ZLIB CCBYSAv3 DejaVu GLEW IUP SIL
 LICENSE_COMB=	multi
 LICENSE_NAME_CCBYSAv3=	Creative Commons Attribution-ShareAlike 3.0 Unported license
 LICENSE_NAME_DejaVu=	Bitstream Vera and Arev fonts license
 LICENSE_NAME_GLEW=	The OpenGL Extension Wrangler Library license
 LICENSE_NAME_IUP=	Galaxy colour image use policy
 LICENSE_NAME_SIL=	SIL open font license version 1.1
 LICENSE_FILE_APACHE20=	${WRKSRC}/licenses/Apache-2.0.txt
 LICENSE_FILE_CCBYSAv3=	${WRKSRC}/licenses/CC-BY-SA-3.0.txt
 LICENSE_FILE_DejaVu=	${WRKSRC}/licenses/DejaVu-license.txt
 LICENSE_FILE_GLEW=	${WRKSRC}/licenses/GLEW.txt
 LICENSE_FILE_GPLv3=	${WRKSRC}/licenses/GPL-3.txt
 LICENSE_FILE_IUP=	${WRKSRC}/licenses/Image\ Use\ Policy\ -\ NASA\ Spitzer\ Space\ Telescope.html
 LICENSE_FILE_SIL=	${WRKSRC}/licenses/SIL-1.1.txt
 LICENSE_PERMS_CCBYSAv3=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_DejaVu=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_GLEW=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_IUP=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_SIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${LOCALBASE}/include/GL/glu.h:${PORTSDIR}/graphics/libGLU
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libassimp.so:${PORTSDIR}/multimedia/assimp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pioneerspacesim
-GH_TAGNAME=	20150614
+GH_TAGNAME=	20151004
 
 USES=		autoreconf gmake pkgconfig
 USE_GL=		gl
 USE_SDL=	image2 sdl2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PIONEER_DATA_DIR="${DATADIR}/data"
 CONFIGURE_ARGS=	--with-version="${GH_TAGNAME}"
 EXTRACT_AFTER_ARGS=	--exclude .gitignore
 
 PORTDATA=	data
 PORTDOCS=	AUTHORS.txt Changelog.txt Modelviewer.txt Quickstart.txt README.md
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/${PORTNAME}.png
 
 DESKTOP_ENTRIES="Pioneer" "${COMMENT}" \
 		"${PORTNAME}" "${PORTNAME}" \
 		"Game;Simulation;" false
 
 SUB_FILES=	pkg-message
 SUB_LIST=	QUICKSTART_PATH="${QUICKSTART_PATH}"
 
 OPTIONS_DEFINE=		DOCS MODELCOMPILER
 OPTIONS_DEFAULT=	MODELCOMPILER
 MODELCOMPILER_DESC=	Build/install modelcompiler tool
 MODELCOMPILER_PLIST_FILES=	bin/${PORTNAME}-modelcompiler
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054
 USE_GCC=	yes
 .else
 USES+=		compiler:c++11-lang
 CPPFLAGS+=	-I${LOCALBASE}/include
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 QUICKSTART_PATH=	${DOCSDIR}
 .else
 QUICKSTART_PATH=	\
 	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}
 .endif
 
 post-patch: .SILENT
 	${REINPLACE_CMD} -e '/^OPTIMISE=/d' \
 		${WRKSRC}/configure.ac
-	${REINPLACE_CMD} -e 's/modelviewer/${PORTNAME} -modelviewer/' \
-		${WRKSRC}/Modelviewer.txt
-.if !${PORT_OPTIONS:MMODELCOMPILER}
+	${REINPLACE_CMD} -e 's/std:://g' \
+		${WRKSRC}/src/Orbit.cpp
+
+post-patch-MODELCOMPILER-off: .SILENT
 	${REINPLACE_CMD} -e 's/pioneer modelcompiler/pioneer/' \
 		${WRKSRC}/src/Makefile.am
-.endif
 
 post-install:
-.if ${PORT_OPTIONS:MMODELCOMPILER}
-	@${MV} ${STAGEDIR}${PREFIX}/bin/modelcompiler \
-		${STAGEDIR}${PREFIX}/bin/${PORTNAME}-modelcompiler
-.endif
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${WRKSRC}/application-icon/pngs/pioneer-256x256.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+
+post-install-MODELCOMPILER-on:
+	${MV} ${STAGEDIR}${PREFIX}/bin/modelcompiler \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}-modelcompiler
 
 .include <bsd.port.mk>
Index: head/games/pioneer/distinfo
===================================================================
--- head/games/pioneer/distinfo	(revision 398982)
+++ head/games/pioneer/distinfo	(revision 398983)
@@ -1,2 +1,2 @@
-SHA256 (pioneerspacesim-pioneer-0.0.20150614-20150614_GH0.tar.gz) = 47cfeda3268214b800fb12f0180ffa739616dd13dcfca3382e1200ae7d472dc0
-SIZE (pioneerspacesim-pioneer-0.0.20150614-20150614_GH0.tar.gz) = 180503182
+SHA256 (pioneerspacesim-pioneer-0.0.20151004-20151004_GH0.tar.gz) = f22f5a339bdffdad5cf03f744619db3a0c99324c4b3d2ded11c29f1233a72e36
+SIZE (pioneerspacesim-pioneer-0.0.20151004-20151004_GH0.tar.gz) = 186317545