Attachment #176892 for bug #214420

View | Details | Raw Unified | Return to bug 214420
Collapse All | Expand All





USE_GITHUB=	yes
GH_ACCOUNT=	pioneerspacesim
GH_TAGNAME=	20161110

USES=		autoreconf compiler:c++11-lib gmake pkgconfig
USE_GL=		gl
USE_SDL=	image2 sdl2

CPPFLAGS+=	-I${LOCALBASE}/include

GNU_CONFIGURE=	yes
CONFIGURE_ENV=	PIONEER_DATA_DIR="${DATADIR}/data"
CONFIGURE_ARGS=	--with-version="${GH_TAGNAME}"


.include <bsd.port.pre.mk>

.if ${COMPILER_TYPE} == gcc
# Unhide std::to_string() for GCC (ports/193528)
CXXFLAGS+=	-D_GLIBCXX_USE_C99
USES+=		compiler:c++11-lang
CPPFLAGS+=	-I${LOCALBASE}/include
.endif

post-patch: .SILENT
	${REINPLACE_CMD} -e '/^OPTIMISE=/d' \
		${WRKSRC}/configure.ac
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054
	${REINPLACE_CMD} -e 's/std::acosh/acosh/g ; s/std::copysign/copysign/g' \
		${WRKSRC}/src/Orbit.cpp
.endif
		${WRKSRC}/src/graphics/opengl/GenGasGiantColourMaterial.cpp \
		${WRKSRC}/src/graphics/opengl/RendererGL.cpp

post-patch-MODELCOMPILER-off: .SILENT
	${REINPLACE_CMD} -e 's/pioneer modelcompiler/pioneer/' \

Lines 1-3 Link Here

(-)pioneer/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1477647657	1	TIMESTAMP = 1478769845
2	SHA256 (pioneerspacesim-pioneer-0.0.20161028-20161028_GH0.tar.gz) = d8ceefc7ec22ecdbaf2408a13c80d0368675feebff558457bef2ffc7258f4b77	2	SHA256 (pioneerspacesim-pioneer-0.0.20161110-20161110_GH0.tar.gz) = 24d86095e2080fdbc6ae849dc543dcbdf214d09d34208697d915167c80775b50
3	SIZE (pioneerspacesim-pioneer-0.0.20161028-20161028_GH0.tar.gz) = 194439211	3	SIZE (pioneerspacesim-pioneer-0.0.20161110-20161110_GH0.tar.gz) = 194432857

Lines 1-10 Link Here

(-)pioneer/files/patch-contrib_PicoDDS_PicoDDS.cpp (-10 lines)
1	--- contrib/PicoDDS/PicoDDS.cpp.orig 2015-06-07 21:44:10 UTC
2	+++ contrib/PicoDDS/PicoDDS.cpp
3	@@ -48,6 +48,7 @@
4	*/
5
6	#include "PicoDDS.h"
7	+#include <stdlib.h>
8	#include <cstdio>
9	#include <cstring>
10	#include <cassert>




--- src/GameConfig.h.orig	2015-06-07 21:44:10 UTC
+++ src/GameConfig.h
@@ -8,7 +8,8 @@
 
 class GameConfig : public IniConfig {
 public:
-	GameConfig(const std::map<std::string,std::string> &override_ = std::map<std::string,std::string>());
+	typedef std::map<std::string, std::string> map_string;
+	GameConfig(const map_string &override_ = map_string());
 
 	void Load();
 	bool Save();

Return to bug 214420

Lines 36-47 Link Here

(-)pioneer/Makefile (-11 / +10 lines)
36		36
37	USE_GITHUB= yes	37	USE_GITHUB= yes
38	GH_ACCOUNT= pioneerspacesim	38	GH_ACCOUNT= pioneerspacesim
39	GH_TAGNAME= 20161028	39	GH_TAGNAME= 20161110
40		40
41	USES= autoreconf gmake pkgconfig	41	USES= autoreconf compiler:c++11-lib gmake pkgconfig
42	USE_GL= gl	42	USE_GL= gl
43	USE_SDL= image2 sdl2	43	USE_SDL= image2 sdl2
44		44
		45	CPPFLAGS+= -I${LOCALBASE}/include
		46
45	GNU_CONFIGURE= yes	47	GNU_CONFIGURE= yes
46	CONFIGURE_ENV= PIONEER_DATA_DIR="${DATADIR}/data"	48	CONFIGURE_ENV= PIONEER_DATA_DIR="${DATADIR}/data"
47	CONFIGURE_ARGS= --with-version="${GH_TAGNAME}"	49	CONFIGURE_ARGS= --with-version="${GH_TAGNAME}"
Lines 72-92 Link Here
72		74
73	.include <bsd.port.pre.mk>	75	.include <bsd.port.pre.mk>
74		76
75	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054	77	.if ${COMPILER_TYPE} == gcc
76	USE_GCC= yes	78	# Unhide std::to_string() for GCC (ports/193528)
77	.else	79	CXXFLAGS+= -D_GLIBCXX_USE_C99
78	USES+= compiler:c++11-lang
79	CPPFLAGS+= -I${LOCALBASE}/include
80	.endif	80	.endif
81		81
82	post-patch: .SILENT	82	post-patch: .SILENT
83	${REINPLACE_CMD} -e '/^OPTIMISE=/d' \	83	${REINPLACE_CMD} -e '/^OPTIMISE=/d' \
84	${WRKSRC}/configure.ac	84	${WRKSRC}/configure.ac
85	${REINPLACE_CMD} -e 's/std:://g' \	85	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054
		86	${REINPLACE_CMD} -e 's/std::acosh/acosh/g ; s/std::copysign/copysign/g' \
86	${WRKSRC}/src/Orbit.cpp	87	${WRKSRC}/src/Orbit.cpp
87	${REINPLACE_CMD} -e 's/std::to_string/to_string/g' \	88	.endif
88	${WRKSRC}/src/graphics/opengl/GenGasGiantColourMaterial.cpp \
89	${WRKSRC}/src/graphics/opengl/RendererGL.cpp
90		89
91	post-patch-MODELCOMPILER-off: .SILENT	90	post-patch-MODELCOMPILER-off: .SILENT
92	${REINPLACE_CMD} -e 's/pioneer modelcompiler/pioneer/' \	91	${REINPLACE_CMD} -e 's/pioneer modelcompiler/pioneer/' \

Lines 1-12 Link Here

(-)pioneer/files/patch-src_GameConfig.h (-12 lines)
1	--- src/GameConfig.h.orig 2015-06-07 21:44:10 UTC
2	+++ src/GameConfig.h
3	@@ -8,7 +8,8 @@
4
5	class GameConfig : public IniConfig {
6	public:
7	- GameConfig(const std::map<std::string,std::string> &override_ = std::map<std::string,std::string>());
8	+ typedef std::map<std::string, std::string> map_string;
9	+ GameConfig(const map_string &override_ = map_string());
10
11	void Load();
12	bool Save();