svn commit: r473067 - in head/games/diameter: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Jun 22 20:32:35 2018
New Revision: 473067
URL: https://svnweb.freebsd.org/changeset/ports/473067

Log:
  - Fix build with clang 6
  - Add missing dependency

Added:
  head/games/diameter/files/patch-src_res_3dsloader.cpp   (contents, props changed)
Modified:
  head/games/diameter/Makefile

Modified: head/games/diameter/Makefile
==============================================================================
--- head/games/diameter/Makefile	Fri Jun 22 20:31:45 2018	(r473066)
+++ head/games/diameter/Makefile	Fri Jun 22 20:32:35 2018	(r473067)
@@ -16,15 +16,18 @@ BROKEN_armv7=		fails to compile: res/3dsloader.cpp:77:
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libguichan.so:devel/guichan
 
-USES=		tar:bzip2 gmake pkgconfig python:2.7
+USES=		dos2unix tar:bzip2 gmake pkgconfig python:2.7
+DOS2UNIX_FILES=	src/res/3dsloader.cpp
 GNU_CONFIGURE=	yes
-USE_GL=		gl
+USE_GL=		gl glu
 USE_SDL=	sdl mixer image
 
 WRKSRC=		${WRKDIR}/gamediameter
 
 CPPFLAGS+=	`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
 LDFLAGS+=	`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib
+
+CXXFLAGS+=	-Wno-static-float-init
 
 DATADIR=	${PREFIX}/share/gamediameter
 

Added: head/games/diameter/files/patch-src_res_3dsloader.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/diameter/files/patch-src_res_3dsloader.cpp	Fri Jun 22 20:32:35 2018	(r473067)
@@ -0,0 +1,11 @@
+--- src/res/3dsloader.cpp.orig	2008-07-31 11:22:38 UTC
++++ src/res/3dsloader.cpp
+@@ -74,7 +74,7 @@ for (i=0; i<MAX_POLYGONS; i++)
+ struct stat file_status;
+ #endif
+ 
+-if (p_filename=='\0')
++if (p_filename==nullptr || *p_filename=='\0')
+ 	return(0);
+ 
+ if ((l_file=fopen (p_filename, "rb"))== NULL)