svn commit: r433222 - in head/games/bloboats: . files

[Emanuel Haupt]

Author: ehaupt
Date: Fri Feb  3 12:35:51 2017
New Revision: 433222
URL: https://svnweb.freebsd.org/changeset/ports/433222

Log:
  Fix build with clang 4.0
  
  PR:		216630 (based on)
  Notified by:	jbeich

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

Modified: head/games/bloboats/Makefile
==============================================================================
--- head/games/bloboats/Makefile	Fri Feb  3 11:31:26 2017	(r433221)
+++ head/games/bloboats/Makefile	Fri Feb  3 12:35:51 2017	(r433222)
@@ -15,7 +15,7 @@ COMMENT=	Boat racing game in the spirit 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/copying.txt
 
-USES=		gmake
+USES=		dos2unix gmake
 USE_SDL=	mixer image net sdl
 USE_GL=		gl glu
 
@@ -23,4 +23,6 @@ MAKE_ENV+=	DATADIR="${DATADIR}" STAGEDIR
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+DOS2UNIX_FILES=	src/*.cpp
+
 .include <bsd.port.mk>

Modified: head/games/bloboats/files/patch-Makefile
==============================================================================
--- head/games/bloboats/files/patch-Makefile	Fri Feb  3 11:31:26 2017	(r433221)
+++ head/games/bloboats/files/patch-Makefile	Fri Feb  3 12:35:51 2017	(r433222)
@@ -1,4 +1,4 @@
---- Makefile.orig	2010-11-23 19:27:16 UTC
+--- Makefile.orig	2017-02-03 12:18:46 UTC
 +++ Makefile
 @@ -7,16 +7,13 @@
  ### Installation directory (Installation prefix)

Added: head/games/bloboats/files/patch-src_menu.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/bloboats/files/patch-src_menu.cpp	Fri Feb  3 12:35:51 2017	(r433222)
@@ -0,0 +1,12 @@
+--- src/menu.cpp.orig	2017-02-03 12:18:46 UTC
++++ src/menu.cpp
+@@ -1567,7 +1567,8 @@ void menu::resolution() {
+ 	// Get resolutions
+ 	vector<Resolution> resolutions;
+ 	SDL_Rect** modes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE|SDL_OPENGL);
+-	if(modes > 0) {
++	// if(modes > 0) {
++	if(modes != '\0') {
+ 		Uint32 bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
+ 		for(int i=0; modes[i] && i < 10; ++i) {
+ 			Resolution resolution;