- Update to 0.6.0

PR:		156344
Submitted by:	David Demelier <demelier.david@gmail.com>

7 files changed, 138 insertions, 111 deletions

diff --git a/games/teeworlds/Makefile b/games/teeworlds/Makefile
index a5b23f22fb32..9088b6bfe8b8 100644
--- a/games/teeworlds/Makefile
+++ b/games/teeworlds/Makefile
@@ -6,23 +6,29 @@
 #
 
 PORTNAME=	teeworlds
-PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTVERSION=	0.6.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.teeworlds.com/files/ \
-		http://mirror.amdmi3.ru/distfiles/
+		http://mirror.amdmi3.ru/distfiles/ \
+		http://github.com/downloads/matricks/bam/ \
+		http://files.malikania.fr/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} bam-${BAM_VERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Platform game featuring buggers equipped with weapons
 
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+
 USE_PYTHON_BUILD=	yes
 
-BAM_VERSION=	0.2.0
+BAM_VERSION=	0.4.0
 BAM_WRKSRC=	${WRKDIR}/bam-${BAM_VERSION}
 BAM_TARGET=	release
 MAKE_JOBS_SAFE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-source
+
+PORTDOCS=	readme.txt license.txt
 
 OPTIONS=	TEEWORLDS_SERVER_ONLY	"Build dedicated server only"	off
 
@@ -50,19 +56,13 @@ DESKTOP_ENTRIES="Teeworlds" \
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O.||; s|-lpthread|${PTHREAD_LIBS}|; s|^gcc|${CC} ${CFLAGS}|' \
+	@${REINPLACE_CMD} -e 's|-O.||; s|-lpthread|${PTHREAD_LIBS}|; s|^gcc|${CC} ${CFLAGS}|; s|-ldl||g' \
 		${BAM_WRKSRC}/make_unix.sh
-	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/other/sdl/sdl.bam
-	@${REINPLACE_CMD} -e '/sdirs\[\]/,/}/ s|"/.*"|"${DATADIR}"|' \
-		${WRKSRC}/src/engine/e_engine.c
-
-	@${REINPLACE_CMD} -e 's|\(settings.cc.c_compiler = \).*|\1"${CC}"|; \
-		s|\(settings.cc.cxx_compiler = \).*|\1"${CXX}"|' \
-		${BAM_WRKSRC}/src/driver_gcc.bam
-	@${REINPLACE_CMD} -e 's|\(settings.*linker = \).*|\1"${CXX}"|' \
-		${BAM_WRKSRC}/src/base.bam
-	@${REINPLACE_CMD} -e '/settings.cc.flags:Add/ s|-fno-exceptions|& ${CFLAGS}|' \
-		${WRKSRC}/default.bam
+	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/other/sdl/sdl.lua
+	@${REINPLACE_CMD} -e '/aDirs\[\]/,/}/ s|"/.*"|"${DATADIR}"|' \
+		${WRKSRC}/src/engine/shared/storage.cpp
+	@${REINPLACE_CMD} -e 's|gcc|${CC}|; s|g++|${CXX}|' \
+		${BAM_WRKSRC}/src/driver_gcc.lua
 
 # build bam executable - teeworlds own build system
 pre-build:
@@ -70,7 +70,8 @@ pre-build:
 
 # build teeworlds
 do-build:
-	cd ${WRKSRC} && ${BAM_WRKSRC}/src/bam ${_MAKE_JOBS:C/-j/-j /} -v ${BAM_TARGET}
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${BAM_WRKSRC}/bam -n -a -v ${_MAKE_JOBS:C/-j/-j /} ${BAM_TARGET}
 
 do-install:
 .if !defined(WITH_TEEWORLDS_SERVER_ONLY)
@@ -80,5 +81,10 @@ do-install:
 	${MKDIR} ${DATADIR}
 	@cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/other/icons/Teeworlds.ico ${DATADIR}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}/
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/games/teeworlds/distinfo b/games/teeworlds/distinfo
index 5321adc1b2e5..05d380713955 100644
--- a/games/teeworlds/distinfo
+++ b/games/teeworlds/distinfo
@@ -1,4 +1,4 @@
-SHA256 (teeworlds-0.5.2-src.tar.gz) = 1811a71bf9a1470c7a69308035744492f3e850aefdd12f1bc223fb85d98cf4c0
-SIZE (teeworlds-0.5.2-src.tar.gz) = 6393472
-SHA256 (bam-0.2.0.tar.gz) = ef6cddc1df47b0d8106265033ef4e55e61decabf2279a2acd7fdf016633c0758
-SIZE (bam-0.2.0.tar.gz) = 162342
+SHA256 (teeworlds-0.6.0-src.tar.gz) = 7540ecf10624b7e4e530c44402dc2d162ff40a3fe10bf30e0bb542d3d0a6a721
+SIZE (teeworlds-0.6.0-src.tar.gz) = 7417661
+SHA256 (bam-0.4.0.tar.gz) = 5e4e4920b4d265da582f66774e9b1ec8ddfbe75ddc028fba86c12f686ea18db3
+SIZE (bam-0.4.0.tar.gz) = 206780
diff --git a/games/teeworlds/files/patch-bam.lua b/games/teeworlds/files/patch-bam.lua
new file mode 100644
index 000000000000..bf8b4634e508
--- /dev/null
+++ b/games/teeworlds/files/patch-bam.lua
@@ -0,0 +1,23 @@
+--- bam.lua.orig	2011-04-09 23:15:25.000000000 +0400
++++ bam.lua	2011-08-04 01:03:26.000000000 +0400
+@@ -154,7 +154,7 @@
+ 			settings.link.frameworks:Add("Carbon")
+ 			settings.link.frameworks:Add("AppKit")
+ 		else
+-			settings.link.libs:Add("pthread")
++			settings.link.flags:Add("-pthread")
+ 		end
+ 	elseif family == "windows" then
+ 		settings.link.libs:Add("gdi32")
+@@ -281,8 +281,10 @@
+ release_settings.config_name = "release"
+ release_settings.config_ext = ""
+ release_settings.debug = 0
+-release_settings.optimize = 1
++release_settings.optimize = 0
+ release_settings.cc.defines:Add("CONF_RELEASE")
++release_settings.cc.flags_c:Add(os.getenv("CFLAGS"))
++release_settings.cc.flags_cxx:Add(os.getenv("CXXFLAGS"))
+ 
+ if platform == "macosx"  and arch == "ia32" then
+ 	debug_settings_ppc = debug_settings:Copy()
diff --git a/games/teeworlds/files/patch-default.bam b/games/teeworlds/files/patch-default.bam
deleted file mode 100644
index 3e2a59554b1b..000000000000
--- a/games/teeworlds/files/patch-default.bam
+++ /dev/null
@@ -1,11 +0,0 @@
---- default.bam.orig	2009-01-25 13:50:33.000000000 +0000
-+++ default.bam	2009-01-26 18:11:46.000000000 +0000
-@@ -128,7 +128,7 @@
- 			settings.link.frameworks:Add("Carbon")
- 			settings.link.frameworks:Add("AppKit")
- 		else
--			settings.link.libs:Add("pthread")
-+			settings.link.flags:Add("-pthread")
- 		end
- 	elseif family == "windows" then
- 		settings.link.libs:Add("gdi32")
diff --git a/games/teeworlds/files/patch-e_network.c b/games/teeworlds/files/patch-e_network.c
deleted file mode 100644
index d1f419d2e6dc..000000000000
--- a/games/teeworlds/files/patch-e_network.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/engine/e_network.c.orig	2010-06-23 09:39:36.000000000 +0200
-+++ src/engine/e_network.c	2010-06-23 09:41:29.000000000 +0200
-@@ -224,6 +224,12 @@
- 
- 	if(packet->flags&NET_PACKETFLAG_CONNLESS)
- 	{
-+		/* check the size of connless packet */
-+		if(size < 6)
-+		{
-+			dbg_msg("", "connless packet too small, %d", size);
-+			return -1;
-+		}
- 		packet->flags = NET_PACKETFLAG_CONNLESS;
- 		packet->ack = 0;
- 		packet->num_chunks = 0;
diff --git a/games/teeworlds/files/patch-es_server.c b/games/teeworlds/files/patch-es_server.c
deleted file mode 100644
index 4af057af3cca..000000000000
--- a/games/teeworlds/files/patch-es_server.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/engine/server/es_server.c.orig	2010-06-23 09:41:50.000000000 +0200
-+++ src/engine/server/es_server.c	2010-06-23 09:42:21.000000000 +0200
-@@ -303,7 +303,7 @@
- 
- void server_kick(int client_id, const char *reason)
- {
--	if(client_id < 0 || client_id > MAX_CLIENTS)
-+	if(client_id < 0 || client_id >= MAX_CLIENTS)
- 		return;
- 		
- 	if(clients[client_id].state != SRVCLIENT_STATE_EMPTY)
-@@ -1244,7 +1244,7 @@
- 		NETADDR addr;
- 		int cid = atoi(str);
- 
--		if(cid < 0 || cid > MAX_CLIENTS || clients[cid].state == SRVCLIENT_STATE_EMPTY)
-+		if(cid < 0 || cid >= MAX_CLIENTS || clients[cid].state == SRVCLIENT_STATE_EMPTY)
- 		{
- 			dbg_msg("server", "invalid client id");
- 			return;
diff --git a/games/teeworlds/pkg-plist b/games/teeworlds/pkg-plist
index 4cb5f1a19236..51aef704996f 100644
--- a/games/teeworlds/pkg-plist
+++ b/games/teeworlds/pkg-plist
@@ -42,6 +42,7 @@ bin/teeworlds_srv
 %%DATADIR%%/audio/sfx_hit_weak-02.wv
 %%DATADIR%%/audio/sfx_hit_weak-03.wv
 %%DATADIR%%/audio/sfx_msg-client.wv
+%%DATADIR%%/audio/sfx_msg-highlight.wv
 %%DATADIR%%/audio/sfx_msg-server.wv
 %%DATADIR%%/audio/sfx_pickup_arm-01.wv
 %%DATADIR%%/audio/sfx_pickup_arm-02.wv
@@ -134,70 +135,106 @@ bin/teeworlds_srv
 %%DATADIR%%/browse_icons.png
 %%DATADIR%%/console.png
 %%DATADIR%%/console_bar.png
+%%DATADIR%%/countryflags/AR.png
+%%DATADIR%%/countryflags/AT.png
+%%DATADIR%%/countryflags/AU.png
+%%DATADIR%%/countryflags/BE.png
+%%DATADIR%%/countryflags/BG.png
+%%DATADIR%%/countryflags/BR.png
+%%DATADIR%%/countryflags/BY.png
+%%DATADIR%%/countryflags/CA.png
+%%DATADIR%%/countryflags/CH.png
+%%DATADIR%%/countryflags/CL.png
+%%DATADIR%%/countryflags/CN.png
+%%DATADIR%%/countryflags/CO.png
+%%DATADIR%%/countryflags/CZ.png
+%%DATADIR%%/countryflags/DE.png
+%%DATADIR%%/countryflags/DK.png
+%%DATADIR%%/countryflags/EE.png
+%%DATADIR%%/countryflags/EG.png
+%%DATADIR%%/countryflags/ES.png
+%%DATADIR%%/countryflags/FI.png
+%%DATADIR%%/countryflags/FR.png
+%%DATADIR%%/countryflags/GB.png
+%%DATADIR%%/countryflags/GR.png
+%%DATADIR%%/countryflags/HR.png
+%%DATADIR%%/countryflags/HU.png
+%%DATADIR%%/countryflags/ID.png
+%%DATADIR%%/countryflags/IL.png
+%%DATADIR%%/countryflags/IN.png
+%%DATADIR%%/countryflags/IR.png
+%%DATADIR%%/countryflags/IT.png
+%%DATADIR%%/countryflags/KZ.png
+%%DATADIR%%/countryflags/LT.png
+%%DATADIR%%/countryflags/LU.png
+%%DATADIR%%/countryflags/LV.png
+%%DATADIR%%/countryflags/MX.png
+%%DATADIR%%/countryflags/NL.png
+%%DATADIR%%/countryflags/NO.png
+%%DATADIR%%/countryflags/PH.png
+%%DATADIR%%/countryflags/PK.png
+%%DATADIR%%/countryflags/PL.png
+%%DATADIR%%/countryflags/PT.png
+%%DATADIR%%/countryflags/RO.png
+%%DATADIR%%/countryflags/RS.png
+%%DATADIR%%/countryflags/RU.png
+%%DATADIR%%/countryflags/SA.png
+%%DATADIR%%/countryflags/SE.png
+%%DATADIR%%/countryflags/SK.png
+%%DATADIR%%/countryflags/SV.png
+%%DATADIR%%/countryflags/TR.png
+%%DATADIR%%/countryflags/UA.png
+%%DATADIR%%/countryflags/US.png
+%%DATADIR%%/countryflags/XEN.png
+%%DATADIR%%/countryflags/XNI.png
+%%DATADIR%%/countryflags/XSC.png
+%%DATADIR%%/countryflags/XWA.png
+%%DATADIR%%/countryflags/ZA.png
+%%DATADIR%%/countryflags/default.png
+%%DATADIR%%/countryflags/index.txt
 %%DATADIR%%/debug_font.png
+%%DATADIR%%/demo_buttons.png
 %%DATADIR%%/editor/background.png
 %%DATADIR%%/editor/checker.png
 %%DATADIR%%/editor/cursor.png
 %%DATADIR%%/editor/entities.png
 %%DATADIR%%/emoticons.png
-%%DATADIR%%/fonts/default_font10.png
-%%DATADIR%%/fonts/default_font10.tfnt
-%%DATADIR%%/fonts/default_font10_b.png
-%%DATADIR%%/fonts/default_font11.png
-%%DATADIR%%/fonts/default_font11.tfnt
-%%DATADIR%%/fonts/default_font11_b.png
-%%DATADIR%%/fonts/default_font12.png
-%%DATADIR%%/fonts/default_font12.tfnt
-%%DATADIR%%/fonts/default_font12_b.png
-%%DATADIR%%/fonts/default_font13.png
-%%DATADIR%%/fonts/default_font13.tfnt
-%%DATADIR%%/fonts/default_font13_b.png
-%%DATADIR%%/fonts/default_font14.png
-%%DATADIR%%/fonts/default_font14.tfnt
-%%DATADIR%%/fonts/default_font14_b.png
-%%DATADIR%%/fonts/default_font15.png
-%%DATADIR%%/fonts/default_font15.tfnt
-%%DATADIR%%/fonts/default_font15_b.png
-%%DATADIR%%/fonts/default_font16.png
-%%DATADIR%%/fonts/default_font16.tfnt
-%%DATADIR%%/fonts/default_font16_b.png
-%%DATADIR%%/fonts/default_font17.png
-%%DATADIR%%/fonts/default_font17.tfnt
-%%DATADIR%%/fonts/default_font17_b.png
-%%DATADIR%%/fonts/default_font18.png
-%%DATADIR%%/fonts/default_font18.tfnt
-%%DATADIR%%/fonts/default_font18_b.png
-%%DATADIR%%/fonts/default_font19.png
-%%DATADIR%%/fonts/default_font19.tfnt
-%%DATADIR%%/fonts/default_font19_b.png
-%%DATADIR%%/fonts/default_font20.png
-%%DATADIR%%/fonts/default_font20.tfnt
-%%DATADIR%%/fonts/default_font20_b.png
-%%DATADIR%%/fonts/default_font36.png
-%%DATADIR%%/fonts/default_font36.tfnt
-%%DATADIR%%/fonts/default_font36_b.png
-%%DATADIR%%/fonts/default_font8.png
-%%DATADIR%%/fonts/default_font8.tfnt
-%%DATADIR%%/fonts/default_font8_b.png
-%%DATADIR%%/fonts/default_font9.png
-%%DATADIR%%/fonts/default_font9.tfnt
-%%DATADIR%%/fonts/default_font9_b.png
+%%DATADIR%%/file_icons.png
+%%DATADIR%%/fonts/DejaVuSans.ttf
+%%DATADIR%%/fonts/LICENSE
 %%DATADIR%%/game.png
+%%DATADIR%%/gui_buttons.png
 %%DATADIR%%/gui_cursor.png
+%%DATADIR%%/gui_icons.png
 %%DATADIR%%/gui_logo.png
+%%DATADIR%%/languages/bulgarian.txt
+%%DATADIR%%/languages/czech.txt
+%%DATADIR%%/languages/dutch.txt
+%%DATADIR%%/languages/finnish.txt
+%%DATADIR%%/languages/french.txt
+%%DATADIR%%/languages/german.txt
+%%DATADIR%%/languages/index.txt
+%%DATADIR%%/languages/slovak.txt
+%%DATADIR%%/languages/spanish.txt
+%%DATADIR%%/languages/swedish.txt
 %%DATADIR%%/mapres/bg_cloud1.png
 %%DATADIR%%/mapres/bg_cloud2.png
 %%DATADIR%%/mapres/bg_cloud3.png
+%%DATADIR%%/mapres/desert_doodads.png
 %%DATADIR%%/mapres/desert_main.png
 %%DATADIR%%/mapres/desert_mountains.png
+%%DATADIR%%/mapres/desert_mountains2.png
 %%DATADIR%%/mapres/desert_sun.png
+%%DATADIR%%/mapres/generic_deathtiles.png
 %%DATADIR%%/mapres/generic_unhookable.png
 %%DATADIR%%/mapres/grass_doodads.png
 %%DATADIR%%/mapres/grass_main.png
+%%DATADIR%%/mapres/jungle_background.png
+%%DATADIR%%/mapres/jungle_deathtiles.png
 %%DATADIR%%/mapres/jungle_doodads.png
 %%DATADIR%%/mapres/jungle_main.png
-%%DATADIR%%/mapres/jungle_night.png
-%%DATADIR%%/mapres/jungle_night2.png
+%%DATADIR%%/mapres/jungle_midground.png
+%%DATADIR%%/mapres/jungle_unhookables.png
 %%DATADIR%%/mapres/moon.png
 %%DATADIR%%/mapres/mountains.png
 %%DATADIR%%/mapres/snow.png
@@ -205,11 +242,16 @@ bin/teeworlds_srv
 %%DATADIR%%/mapres/sun.png
 %%DATADIR%%/mapres/winter_doodads.png
 %%DATADIR%%/mapres/winter_main.png
+%%DATADIR%%/mapres/winter_mountains.png
+%%DATADIR%%/mapres/winter_mountains2.png
+%%DATADIR%%/mapres/winter_mountains3.png
 %%DATADIR%%/maps/ctf1.map
 %%DATADIR%%/maps/ctf2.map
 %%DATADIR%%/maps/ctf3.map
 %%DATADIR%%/maps/ctf4.map
 %%DATADIR%%/maps/ctf5.map
+%%DATADIR%%/maps/ctf6.map
+%%DATADIR%%/maps/ctf7.map
 %%DATADIR%%/maps/dm1.map
 %%DATADIR%%/maps/dm2.map
 %%DATADIR%%/maps/dm6.map
@@ -237,7 +279,9 @@ bin/teeworlds_srv
 @dirrm %%DATADIR%%/skins
 @dirrm %%DATADIR%%/maps
 @dirrm %%DATADIR%%/mapres
+@dirrm %%DATADIR%%/languages
 @dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/editor
+@dirrm %%DATADIR%%/countryflags
 @dirrm %%DATADIR%%/audio
 @dirrm %%DATADIR%%