Attachment 201797 Details for Bug 235515 – Proposed patch (since 487272 revision)

[patch] Proposed patch (since 487272 revision)

pioneer.diff (text/plain), 3.61 KB, created by lightside on 2019-02-06 18:29:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2019-02-06 18:29:39 UTC

Size: 3.61 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 487272)
>+++ Makefile	(working copy)
>@@ -3,13 +3,12 @@
> 
> PORTNAME=	pioneer
> DISTVERSION=	0.0.${GH_TAGNAME}
>-PORTREVISION=	2
> CATEGORIES=	games
> 
> MAINTAINER=	lightside@gmx.com
> COMMENT=	Space adventure game set in the Milky Way galaxy
> 
>-LICENSE=	APACHE20 GPLv3 MIT ZLIB CC-BY-SA-3.0 DejaVu GLEW IUP SIL
>+LICENSE=	APACHE20 GPLv3 MIT ZLIB CC-BY-SA-3.0 DejaVu IUP SIL
> LICENSE_COMB=	multi
> LICENSE_NAME_DejaVu=	Bitstream Vera and Arev fonts license
> LICENSE_NAME_GLEW=	The OpenGL Extension Wrangler Library license
>@@ -34,10 +33,10 @@
> 		libpng.so:graphics/png \
> 		libassimp.so:multimedia/assimp
> 
>-USES=		autoreconf compiler:c++11-lib gmake pkgconfig
>+USES=		autoreconf compiler:c++11-lib gl gmake pkgconfig
> USE_GITHUB=	yes
> GH_ACCOUNT=	pioneerspacesim
>-GH_TAGNAME=	20180203
>+GH_TAGNAME=	20190203
> USE_GL=		gl
> USE_SDL=	image2 sdl2
> 
>@@ -58,18 +57,25 @@
> 
> SUB_FILES=	pkg-message
> 
>-OPTIONS_DEFINE=		DOCS MODELCOMPILER NOGPUJOBS PROFILER SERVERAGENT
>-OPTIONS_DEFAULT=	MODELCOMPILER
>+OPTIONS_DEFINE=		DOCS EXTRA_WARNINGS EXTERNAL_GLEW EXTERNAL_LUA \
>+		MODELCOMPILER NOGPUJOBS PROFILER
>+OPTIONS_DEFAULT=	EXTERNAL_GLEW EXTERNAL_LUA MODELCOMPILER
> DOCS_SUB_LIST=		QUICKSTART_PATH="${DOCSDIR}"
> DOCS_SUB_LIST_OFF=	QUICKSTART_PATH="https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}"
>+EXTRA_WARNINGS_DESC=	Enable extra compiler warnings
>+EXTRA_WARNINGS_CONFIGURE_WITH=	extra-warnings
>+EXTERNAL_GLEW_DESC=	Use external libglew from graphics/glew
>+EXTERNAL_GLEW_CONFIGURE_WITH=	external-libglew
>+EXTERNAL_GLEW_VARS_OFF=	LICENSE+=GLEW
>+EXTERNAL_GLEW_USE=	GL=glew,glu
>+EXTERNAL_LUA_DESC=	Use external liblua from lang/lua52
>+EXTERNAL_LUA_CONFIGURE_WITH=	external-liblua
>+EXTERNAL_LUA_USES=	lua:52
> MODELCOMPILER_DESC=	Build/install modelcompiler tool
> MODELCOMPILER_PLIST_FILES=	bin/${PORTNAME}-modelcompiler
> NOGPUJOBS_DESC=		Disable EnableGPUJobs for config.ini by default
> PROFILER_DESC=		Build with internal profiler
> PROFILER_CONFIGURE_ON=	--enable-profiler
>-SERVERAGENT_DESC=	Build with server agent
>-SERVERAGENT_CONFIGURE_WITH=	server-agent
>-SERVERAGENT_LIB_DEPENDS=	libcurl.so:ftp/curl
> 
> .include <bsd.port.pre.mk>
> 
>@@ -79,7 +85,7 @@
> .endif
> 
> post-patch: .SILENT
>-	${REINPLACE_CMD} -e '/^OPTIMISE=/d' \
>+	${REINPLACE_CMD} -e '/^OPTIMISE=/d ; s|lua5\.2|lua-5.2|' \
> 		${WRKSRC}/configure.ac
> 
> post-patch-MODELCOMPILER-off: .SILENT
>@@ -101,6 +107,9 @@
> 	${REINPLACE_CMD} -i '.p.bak' -e '/contrib\/profiler/d' \
> 		${WRKSRC}/configure.ac
> 
>+post-configure:
>+	${CP} ${FILESDIR}/buildopts.h ${WRKSRC}/src
>+
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/application-icon/pngs/pioneer-256x256.png \
> 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
>Index: distinfo
>===================================================================
>--- distinfo	(revision 487272)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1518258401
>-SHA256 (pioneerspacesim-pioneer-0.0.20180203-20180203_GH0.tar.gz) = 19aa89e8ec0221b937b9279e0d4897b3016e0ce80858d03600d3e80cd7daa907
>-SIZE (pioneerspacesim-pioneer-0.0.20180203-20180203_GH0.tar.gz) = 212872392
>+TIMESTAMP = 1549191376
>+SHA256 (pioneerspacesim-pioneer-0.0.20190203-20190203_GH0.tar.gz) = e526f1659ae321f45b997c0245acecbf9c4cf2122b025ab8db1090f1b9804f5e
>+SIZE (pioneerspacesim-pioneer-0.0.20190203-20190203_GH0.tar.gz) = 360574063
>Index: files/buildopts.h
>===================================================================
>--- files/buildopts.h	(nonexistent)
>+++ files/buildopts.h	(working copy)
>@@ -0,0 +1,7 @@
>+#ifndef BUILDOPTS_H
>+#define BUILDOPTS_H
>+
>+#define WITH_OBJECTVIEWER 1
>+#define WITH_DEVKEYS 1
>+
>+#endif

Flags:

lightside: maintainer-approval+

Actions: View | Diff

Attachments on bug 235515: 201743 | 201795 | 201797