svn commit: r478755 - in head/games/etracer: . files

[Tobias Kortkamp]

Author: tobik
Date: Sun Sep  2 05:49:09 2018
New Revision: 478755
URL: https://svnweb.freebsd.org/changeset/ports/478755

Log:
  games/etracer builds fine with Clang with a couple of extra patches
  
  While here
  
  - Take maintainership
  - Improve pkg-descr
  
  PR:		230744
  Submitted by:	tobik
  Approved by:	peter_dunning at dsl.pipex.com (maintainer timeout, 2 weeks)

Added:
  head/games/etracer/files/
  head/games/etracer/files/patch-quadtree.cpp   (contents, props changed)
  head/games/etracer/files/patch-spx.h   (contents, props changed)
Modified:
  head/games/etracer/Makefile
  head/games/etracer/pkg-descr

Modified: head/games/etracer/Makefile
==============================================================================
--- head/games/etracer/Makefile	Sun Sep  2 05:20:31 2018	(r478754)
+++ head/games/etracer/Makefile	Sun Sep  2 05:49:09 2018	(r478755)
@@ -3,24 +3,26 @@
 
 PORTNAME=	etracer
 PORTVERSION=	0.6.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/extremetuxracer/releases/${PORTVERSION}
 DISTNAME=	etr-${PORTVERSION}
 
-MAINTAINER=	peter_dunning at dsl.pipex.com
-COMMENT=	Latest and greatest fork of the classic Tux Racer
+MAINTAINER=	tobik at FreeBSD.org
+COMMENT=	Extreme Tux Racer
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfreetype.so:print/freetype2
 
+USES=		compiler gmake localbase pkgconfig tar:xz tcl
 USE_SDL=	mixer sdl image
-USE_GCC=	yes
 USE_GL=		gl glu
-USES=		gmake pkgconfig tar:xz tcl
-CPPFLAGS+=	-I${LOCALBASE}/include
+
 GNU_CONFIGURE=	yes
+
+CXXFLAGS+=      ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang= -Wno-c++11-narrowing
 
 .include <bsd.port.mk>

Added: head/games/etracer/files/patch-quadtree.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/etracer/files/patch-quadtree.cpp	Sun Sep  2 05:49:09 2018	(r478755)
@@ -0,0 +1,16 @@
+quadtree.cpp:860:29: error: ordered comparison between pointer and zero
+      ('TTexture *' and 'int')
+                                if (TerrList[j].texture > 0) {
+                                    ~~~~~~~~~~~~~~~~~~~ ^ ~
+
+--- quadtree.cpp.orig	2018-08-19 09:03:02 UTC
++++ quadtree.cpp
+@@ -857,7 +857,7 @@ void quadsquare::Render (const quadcornerdata& cd, GLu
+ 			}
+ 
+ 			for (size_t j=0; j<numTerrains; j++) {
+-				if (TerrList[j].texture > 0) {
++				if (TerrList[j].texture != 0) {
+ 					Course.TerrList[j].texture->Bind();
+ 
+ 					for (GLuint i=0; i<VertexArrayCounter; i++) {

Added: head/games/etracer/files/patch-spx.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/etracer/files/patch-spx.h	Sun Sep  2 05:49:09 2018	(r478755)
@@ -0,0 +1,10 @@
+--- spx.h.orig	2018-08-19 09:01:47 UTC
++++ spx.h
+@@ -21,6 +21,7 @@ GNU General Public License for more details.
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <ios>
+ 
+ using namespace std;
+ 

Modified: head/games/etracer/pkg-descr
==============================================================================
--- head/games/etracer/pkg-descr	Sun Sep  2 05:20:31 2018	(r478754)
+++ head/games/etracer/pkg-descr	Sun Sep  2 05:49:09 2018	(r478755)
@@ -1,5 +1,5 @@
-This is a port for Extreme Tux Racer, the latest fork of the classic Tux Racer,
-which involves racing downhill as tux.
-Extreme Tux Racer contains many new courses, cups and other features.
+Extreme Tux Racer, the latest fork of the classic Tux Racer, involves
+racing downhill as Tux.  Extreme Tux Racer contains many new courses,
+cups and other features.
 
 WWW: https://sourceforge.net/projects/extremetuxracer/