Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Feb 2019 13:29:46 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r492367 - in head/games/pioneer: . files
Message-ID:  <201902071329.x17DTknq024701@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Thu Feb  7 13:29:46 2019
New Revision: 492367
URL: https://svnweb.freebsd.org/changeset/ports/492367

Log:
  games/pioneer: Update to 20190203
  
  - While here move option descriptions before options helpers as
    recommended by the Porter's Handbook section 15.10.
  
  Changes:	https://github.com/pioneerspacesim/pioneer/compare/20180203...20190203
  Changes:	https://github.com/pioneerspacesim/pioneer/blob/20190203/Changelog.txt
  PR:		235515
  Submitted by:	lightside@gmx.com (maintainer)

Added:
  head/games/pioneer/files/buildopts.h   (contents, props changed)
Modified:
  head/games/pioneer/Makefile
  head/games/pioneer/distinfo

Modified: head/games/pioneer/Makefile
==============================================================================
--- head/games/pioneer/Makefile	Thu Feb  7 13:28:59 2019	(r492366)
+++ head/games/pioneer/Makefile	Thu Feb  7 13:29:46 2019	(r492367)
@@ -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 @@ LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20 \
 		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,27 @@ DESKTOP_ENTRIES="Pioneer" "${COMMENT}" \
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		DOCS MODELCOMPILER NOGPUJOBS PROFILER SERVERAGENT
-OPTIONS_DEFAULT=	MODELCOMPILER
-DOCS_SUB_LIST=		QUICKSTART_PATH="${DOCSDIR}"
-DOCS_SUB_LIST_OFF=	QUICKSTART_PATH="https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}"
+OPTIONS_DEFINE=		DOCS EXTRA_WARNINGS EXTERNAL_GLEW EXTERNAL_LUA \
+		MODELCOMPILER NOGPUJOBS PROFILER
+OPTIONS_DEFAULT=	EXTERNAL_GLEW EXTERNAL_LUA MODELCOMPILER
+
+EXTERNAL_GLEW_DESC=	Use external libglew from graphics/glew
+EXTERNAL_LUA_DESC=	Use external liblua from lang/lua52
+EXTRA_WARNINGS_DESC=	Enable extra compiler warnings
 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
+
+DOCS_SUB_LIST=		QUICKSTART_PATH="${DOCSDIR}"
+DOCS_SUB_LIST_OFF=	QUICKSTART_PATH="https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}"
+EXTERNAL_GLEW_CONFIGURE_WITH=	external-libglew
+EXTERNAL_GLEW_VARS_OFF=	LICENSE+=GLEW
+EXTERNAL_GLEW_USE=	GL=glew,glu
+EXTERNAL_LUA_CONFIGURE_WITH=	external-liblua
+EXTERNAL_LUA_USES=	lua:52
+EXTRA_WARNINGS_CONFIGURE_WITH=	extra-warnings
+MODELCOMPILER_PLIST_FILES=	bin/${PORTNAME}-modelcompiler
 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 +87,7 @@ CXXFLAGS+=	-D_GLIBCXX_USE_C99
 .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
@@ -100,6 +108,9 @@ post-patch-PROFILER-off: .SILENT
 		${WRKSRC}/src/Makefile.am
 	${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 \

Modified: head/games/pioneer/distinfo
==============================================================================
--- head/games/pioneer/distinfo	Thu Feb  7 13:28:59 2019	(r492366)
+++ head/games/pioneer/distinfo	Thu Feb  7 13:29:46 2019	(r492367)
@@ -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

Added: head/games/pioneer/files/buildopts.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/pioneer/files/buildopts.h	Thu Feb  7 13:29:46 2019	(r492367)
@@ -0,0 +1,7 @@
+#ifndef BUILDOPTS_H
+#define BUILDOPTS_H
+
+#define WITH_OBJECTVIEWER 1
+#define WITH_DEVKEYS 1
+
+#endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902071329.x17DTknq024701>