Index: head/games/scourge/Makefile
===================================================================
--- head/games/scourge/Makefile	(revision 473675)
+++ head/games/scourge/Makefile	(revision 473676)
@@ -1,40 +1,41 @@
 # Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
 
 PORTNAME=	scourge
 PORTVERSION=	0.21.1
 PORTREVISION=	13
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/$/.src/}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rogue-like game
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/config/scourge.cfg:games/scourge-data
 
-USES=		autoreconf gettext gmake
+USES=		autoreconf gettext gmake localbase
+GNU_CONFIGURE=	yes
 USE_GL=		gl
 USE_SDL=	sdl image mixer net ttf
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 
+CXXFLAGS+=	-Wno-c++11-narrowing
+
 CONFIGURE_ARGS=	--with-data-dir=${DATADIR}
 
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS_DEFINE=	DEBUG
 DEBUG_CONFIGURE_ENABLE=	debug
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|GLvoid|void|g' ${WRKSRC}/src/sdlhandler.cpp ${WRKSRC}/src/sdlhandler.h
+	@${REINPLACE_CMD} -e 's|\([^a-z_]\)type(|\1squirrel_type(|g' ${WRKSRC}/src/squirrel/*.cpp ${WRKSRC}/src/squirrel/*.h
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
Index: head/games/scourge/files/patch-src_equip.cpp
===================================================================
--- head/games/scourge/files/patch-src_equip.cpp	(nonexistent)
+++ head/games/scourge/files/patch-src_equip.cpp	(revision 473676)
@@ -0,0 +1,11 @@
+--- src/equip.cpp.orig	2008-12-22 23:38:10 UTC
++++ src/equip.cpp
+@@ -595,7 +595,7 @@ void Equip::drawCapabilities() {
+ 		}
+ 	}
+ 	if ( !found ) {
+-		specialSkill = false;
++		specialSkill = NULL;
+ 		canvas->setTooltip( "" );
+ 	}
+ 	glDisable( GL_BLEND );

Property changes on: head/games/scourge/files/patch-src_equip.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/games/scourge/files/patch-src_render_map.cpp
===================================================================
--- head/games/scourge/files/patch-src_render_map.cpp	(nonexistent)
+++ head/games/scourge/files/patch-src_render_map.cpp	(revision 473676)
@@ -0,0 +1,29 @@
+--- src/render/map.cpp.orig	2008-12-22 23:38:10 UTC
++++ src/render/map.cpp
+@@ -3154,7 +3154,7 @@ Shape *Map::isWallBetween( int x1, int y
+ 			if ( shape )
+ 				return shape;
+ 		}
+-		return false;
++		return NULL;
+ 	}
+ 	if ( y1 == y2 ) {
+ 		if ( x1 > x2 ) SWAP( x1, x2 );
+@@ -3163,7 +3163,7 @@ Shape *Map::isWallBetween( int x1, int y
+ 			if ( shape )
+ 				return shape;
+ 		}
+-		return false;
++		return NULL;
+ 	}
+ 
+ 
+@@ -4599,7 +4599,7 @@ Location *MapMemoryManager::newLocation(
+ 	pos->item = NULL;
+ 	pos->creature = NULL;
+ 	pos->outlineColor = NULL;
+-	pos->texIndex = NULL;
++	pos->texIndex = 0;
+ 
+ 	return pos;
+ }

Property changes on: head/games/scourge/files/patch-src_render_map.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/games/scourge/files/patch-src_rpg_character.h
===================================================================
--- head/games/scourge/files/patch-src_rpg_character.h	(nonexistent)
+++ head/games/scourge/files/patch-src_rpg_character.h	(revision 473676)
@@ -0,0 +1,11 @@
+--- src/rpg/character.h.orig	2008-12-22 23:38:10 UTC
++++ src/rpg/character.h
+@@ -63,7 +63,7 @@ public:
+ 	static int getRootCount() {
+ 		if ( instance == NULL ) { 
+ 			std::cerr << "*** Characters::getRootCount() Characters uninitialized" << std::endl;
+-			return NULL;
++			return 0;
+ 		}
+ 		return instance->rootCharacters.size();
+ 	}

Property changes on: head/games/scourge/files/patch-src_rpg_character.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property