From 2bdb519544088dcb7e82fc7909d5b9557231fda0 Mon Sep 17 00:00:00 2001
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Sat, 12 Nov 2016 10:06:49 +0000
Subject: - Update to 20161110 - Convert to USES=localbase - Removed upstreamed
 patches

PR:		214420
Submitted by:	lightside@gmx.com (maintainer)
---
 games/pioneer/Makefile                                | 19 ++++++++-----------
 games/pioneer/distinfo                                |  6 +++---
 games/pioneer/files/patch-contrib_PicoDDS_PicoDDS.cpp | 10 ----------
 games/pioneer/files/patch-src_GameConfig.h            | 12 ------------
 4 files changed, 11 insertions(+), 36 deletions(-)
 delete mode 100644 games/pioneer/files/patch-contrib_PicoDDS_PicoDDS.cpp
 delete mode 100644 games/pioneer/files/patch-src_GameConfig.h

(limited to 'games/pioneer')

diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile
index 4243112ff65d..1298fc055909 100644
--- a/games/pioneer/Makefile
+++ b/games/pioneer/Makefile
@@ -36,9 +36,9 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pioneerspacesim
-GH_TAGNAME=	20161028
+GH_TAGNAME=	20161110
 
-USES=		autoreconf gmake pkgconfig
+USES=		autoreconf compiler:c++11-lib gmake localbase pkgconfig
 USE_GL=		gl
 USE_SDL=	image2 sdl2
 
@@ -72,21 +72,18 @@ PROFILER_CONFIGURE_ON=	--enable-profiler
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054
-USE_GCC=	yes
-.else
-USES+=		compiler:c++11-lang
-CPPFLAGS+=	-I${LOCALBASE}/include
+.if ${COMPILER_TYPE} == gcc
+# Unhide std::to_string() for GCC (ports/193528)
+CXXFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
 
 post-patch: .SILENT
 	${REINPLACE_CMD} -e '/^OPTIMISE=/d' \
 		${WRKSRC}/configure.ac
-	${REINPLACE_CMD} -e 's/std:://g' \
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054
+	${REINPLACE_CMD} -e 's/std::acosh/acosh/g ; s/std::copysign/copysign/g' \
 		${WRKSRC}/src/Orbit.cpp
-	${REINPLACE_CMD} -e 's/std::to_string/to_string/g' \
-		${WRKSRC}/src/graphics/opengl/GenGasGiantColourMaterial.cpp \
-		${WRKSRC}/src/graphics/opengl/RendererGL.cpp
+.endif
 
 post-patch-MODELCOMPILER-off: .SILENT
 	${REINPLACE_CMD} -e 's/pioneer modelcompiler/pioneer/' \
diff --git a/games/pioneer/distinfo b/games/pioneer/distinfo
index 76ddc19ba9e1..c4982b36404d 100644
--- a/games/pioneer/distinfo
+++ b/games/pioneer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477647657
-SHA256 (pioneerspacesim-pioneer-0.0.20161028-20161028_GH0.tar.gz) = d8ceefc7ec22ecdbaf2408a13c80d0368675feebff558457bef2ffc7258f4b77
-SIZE (pioneerspacesim-pioneer-0.0.20161028-20161028_GH0.tar.gz) = 194439211
+TIMESTAMP = 1478769845
+SHA256 (pioneerspacesim-pioneer-0.0.20161110-20161110_GH0.tar.gz) = 24d86095e2080fdbc6ae849dc543dcbdf214d09d34208697d915167c80775b50
+SIZE (pioneerspacesim-pioneer-0.0.20161110-20161110_GH0.tar.gz) = 194432857
diff --git a/games/pioneer/files/patch-contrib_PicoDDS_PicoDDS.cpp b/games/pioneer/files/patch-contrib_PicoDDS_PicoDDS.cpp
deleted file mode 100644
index ee88f5119f96..000000000000
--- a/games/pioneer/files/patch-contrib_PicoDDS_PicoDDS.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- contrib/PicoDDS/PicoDDS.cpp.orig	2015-06-07 21:44:10 UTC
-+++ contrib/PicoDDS/PicoDDS.cpp
-@@ -48,6 +48,7 @@
- */
- 
- #include "PicoDDS.h"
-+#include <stdlib.h>
- #include <cstdio>
- #include <cstring>
- #include <cassert>
diff --git a/games/pioneer/files/patch-src_GameConfig.h b/games/pioneer/files/patch-src_GameConfig.h
deleted file mode 100644
index 168fb45a2eb1..000000000000
--- a/games/pioneer/files/patch-src_GameConfig.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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();
-- 
cgit