ports/156344: [patch] games/teeworlds: update to 0.6.0 version

David Demelier demelier.david at gmail.com
Tue Apr 12 08:10:12 UTC 2011 

>Number:         156344
>Category:       ports
>Synopsis:       [patch] games/teeworlds: update to 0.6.0 version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 12 08:10:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     David Demelier
>Release:        8.2-RELEASE
>Organization:
>Environment:
FreeBSD Melon.malikania.fr 8.2-RELEASE FreeBSD 8.2-RELEASE #35: Fri Mar 25 08:18:02 CET 2011     root at Melon.malikania.fr:/usr/obj/usr/src/sys/Melon  amd64

>Description:
o Update to the new version of teeworlds -> 0.6.0
o Patch fixed upstream removed
o Optional port doc added

Full changelog available here :

http://www.teeworlds.com/forum/viewtopic.php?id=7576
http://www.teeworlds.com/forum/viewtopic.php?id=7526

NOTE:

Please put a local distfile for the bam-0.4.0.tar.gz from http://files.malikania.fr/distfiles since my server is not always on 
>How-To-Repeat:

>Fix:
--- teeworlds.diff begins here ---
--- Makefile.orig	2011-04-12 08:10:41.000000000 +0200
+++ Makefile	2011-04-12 09:58:00.000000000 +0200
@@ -6,11 +6,13 @@
 #
 
 PORTNAME=	teeworlds
-PORTVERSION=	0.5.2
+PORTVERSION=	0.6.0
 PORTREVISION=	1
 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}
 
@@ -19,10 +21,11 @@
 
 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
 
 OPTIONS=	TEEWORLDS_SERVER_ONLY	"Build dedicated server only"	off
 
@@ -49,20 +52,22 @@
 		false
 .endif
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	readme.txt license.txt
+.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|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|\(settings.cc.c_compiler = \).*|\1"${CC}"|; \
 		s|\(settings.cc.cxx_compiler = \).*|\1"${CXX}"|' \
-		${BAM_WRKSRC}/src/driver_gcc.bam
+		${BAM_WRKSRC}/src/driver_gcc.lua
 	@${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
+		${BAM_WRKSRC}/src/base.lua
 
 # build bam executable - teeworlds own build system
 pre-build:
@@ -70,7 +75,7 @@
 
 # build teeworlds
 do-build:
-	cd ${WRKSRC} && ${BAM_WRKSRC}/src/bam ${_MAKE_JOBS:C/-j/-j /} -v ${BAM_TARGET}
+	cd ${WRKSRC} && ${BAM_WRKSRC}/bam ${_MAKE_JOBS:C/-j/-j /} -v ${BAM_TARGET}
 
 do-install:
 .if !defined(WITH_TEEWORLDS_SERVER_ONLY)
@@ -80,5 +85,10 @@
 	${MKDIR} ${DATADIR}
 	@cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/other/icons/Teeworlds.ico ${DATADIR}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/license.txt ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/readme.txt ${DOCSDIR}
+.endif
 
 .include <bsd.port.post.mk>
--- pkg-plist.orig	2011-04-12 08:10:56.000000000 +0200
+++ pkg-plist	2011-04-12 09:58:30.000000000 +0200
@@ -1,4 +1,4 @@
-%%CLIENT%%bin/teeworlds
+bin/teeworlds
 bin/teeworlds_srv
 %%DATADIR%%/Teeworlds.ico
 %%DATADIR%%/audio/foley_body_impact-01.wv
@@ -42,6 +42,7 @@
 %%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 @@
 %%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 @@
 %%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
@@ -234,10 +276,13 @@
 %%DATADIR%%/skins/twintri.png
 %%DATADIR%%/skins/warpaint.png
 %%DATADIR%%/skins/x_ninja.png
+
 @dirrm %%DATADIR%%/skins
 @dirrm %%DATADIR%%/maps
 @dirrm %%DATADIR%%/mapres
+ at dirrm %%DATADIR%%/languages
 @dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/editor
+ at dirrm %%DATADIR%%/countryflags
 @dirrm %%DATADIR%%/audio
 @dirrm %%DATADIR%%
--- distinfo.orig	2011-04-12 08:10:47.000000000 +0200
+++ distinfo	2011-04-12 08:25:08.000000000 +0200
@@ -1,6 +1,4 @@
-MD5 (teeworlds-0.5.2-src.tar.gz) = f605f6df9f1714dcda4cba1d281cc757
-SHA256 (teeworlds-0.5.2-src.tar.gz) = 1811a71bf9a1470c7a69308035744492f3e850aefdd12f1bc223fb85d98cf4c0
-SIZE (teeworlds-0.5.2-src.tar.gz) = 6393472
-MD5 (bam-0.2.0.tar.gz) = d4efe74591a73c1cec8b34d76ffd1049
-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
--- teeworlds.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list