diff -ruN pioneer.orig/Makefile pioneer/Makefile
--- pioneer.orig/Makefile	2014-09-12 18:23:16.470369138 +0400
+++ pioneer/Makefile	2014-09-12 19:38:00.819622542 +0400
@@ -4,15 +4,13 @@
 PORTNAME=	pioneer
 PORTVERSION=	20140910
 CATEGORIES=	games
-MASTER_SITES=	http://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAME}.tar.gz?dummy=/
 
 MAINTAINER=	lightside@gmx.com
 COMMENT=	Space adventure game set in the Milky Way galaxy
 
 LICENSE=	APACHE20 GPLv3 MIT ZLIB CCBYSAv3 DejaVu GLEW SIL
 LICENSE_COMB=	multi
-LICENSE_NAME_CCBYSAv3=	Creative Commons Attribution-ShareAlike 3.0\
-Unported license
+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_SIL=	SIL open font license version 1.1
@@ -25,21 +23,20 @@
 LICENSE_PERMS_GLEW=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_SIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+USE_GITHUB=	yes
 GH_ACCOUNT=	pioneerspacesim
-GH_PROJECT=	${PORTNAME}
-GH_TAGNAME=	${PORTVERSION}
+GH_COMMIT=	86db984
 
-BUILD_DEPENDS+=	${LOCALBASE}/include/GL/glu.h:${PORTSDIR}/graphics/libGLU
-
-LIB_DEPENDS+=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-				libfreetype.so:${PORTSDIR}/print/freetype2 \
-				libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-				libpng15.so:${PORTSDIR}/graphics/png \
-				libassimp.so:${PORTSDIR}/multimedia/assimp
-
-USES=	compiler:c++11-lang gmake pkgconfig
-USE_AUTOTOOLS=	aclocal:env autoconf:env autoheader:env automake:env
-USE_GL=	gl
+LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libassimp.so:${PORTSDIR}/multimedia/assimp
+
+USES=		compiler:c++11-lang gmake pkgconfig
+USE_AUTOTOOLS=	aclocal autoconf autoheader automake
+AUTOMAKE_ARGS=	--add-missing
+USE_GL=		gl glu
 USE_SDL=	image2 sdl2
 
 GNU_CONFIGURE=	yes
@@ -53,11 +50,11 @@
 PORTDOCS=	AUTHORS.txt Changelog.txt Modelviewer.txt Quickstart.txt README.txt
 
 PLIST_FILES=	bin/${PORTNAME} \
-				share/pixmaps/${PORTNAME}.png
+		share/pixmaps/${PORTNAME}.png
 
 DESKTOP_ENTRIES="Pioneer" "${COMMENT}" \
-	"${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}" \
-	"Game;Simulation;" false
+		"${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}" \
+		"Game;Simulation;" false
 
 SUB_FILES=	pkg-message
 SUB_LIST=	QUICKSTART_PATH="${QUICKSTART_PATH}"
@@ -65,6 +62,7 @@
 OPTIONS_DEFINE=		DOCS MODELCOMPILER
 OPTIONS_DEFAULT=	MODELCOMPILER
 MODELCOMPILER_DESC=	Build/install modelcompiler tool
+MODELCOMPILER_PLIST_FILES=bin/${PORTNAME}-modelcompiler
 
 .include <bsd.port.options.mk>
 
@@ -75,10 +73,6 @@
 	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}
 .endif
 
-.if ${PORT_OPTIONS:MMODELCOMPILER}
-PLIST_FILES+=	bin/${PORTNAME}-modelcompiler
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/^OPTIMISE=/d' \
 		${WRKSRC}/configure.ac
@@ -89,20 +83,10 @@
 		${WRKSRC}/src/Makefile.am
 .endif
 
-pre-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${AUTORECONF} -fi
-
-pre-install:
-	@cd ${WRKSRC}/data && ${RM} -f Makefile*
+post-install:
 .if ${PORT_OPTIONS:MMODELCOMPILER}
-	@cd ${WRKSRC}/src && ${CP} -f modelcompiler ${PORTNAME}-modelcompiler
+	@${MV} ${STAGEDIR}${PREFIX}/bin/modelcompiler ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-modelcompiler
 .endif
-
-do-install:
-.for b in ${PLIST_FILES:Mbin/*:T}
-	${INSTALL_PROGRAM} ${WRKSRC}/src/${b} ${STAGEDIR}${PREFIX}/bin/${b}
-.endfor
-	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/application-icon/pngs/pioneer-256x256.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
diff -ruN pioneer.orig/distinfo pioneer/distinfo
--- pioneer.orig/distinfo	2014-09-12 18:23:16.470369138 +0400
+++ pioneer/distinfo	2014-09-12 18:48:32.443264141 +0400
@@ -1,2 +1,2 @@
-SHA256 (pioneer-20140910.tar.gz) = a9a745370772d50b936446dc31f9755f2922f36b80876fe8bfc9e8cc4bca9318
-SIZE (pioneer-20140910.tar.gz) = 172864845
+SHA256 (pioneer-20140910.tar.gz) = 5fc58db49dc30abf8591c4794ae87071fa97f2d0e8beac042eaf6aa44b225d7c
+SIZE (pioneer-20140910.tar.gz) = 172878039