3 files changed, 46 insertions, 22 deletions

diff --git a/games/toycars/Makefile b/games/toycars/Makefile
index e71adbab58b5..dd0b52fe2db1 100644
--- a/games/toycars/Makefile
+++ b/games/toycars/Makefile
@@ -6,25 +6,29 @@
 #
 
 PORTNAME=	toycars
-PORTVERSION=	0.3.3
-PORTREVISION=	4
+PORTVERSION=	0.3.10
 CATEGORIES=	games
 MASTER_SITES=	SF
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Physics-based 2D racing game
 
-USE_SDL=	mixer image sdl
-USE_OPENAL=	al alut
-USE_GL=		yes
+LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
+
+USE_SDL=	image sdl
+USE_GL=		gl glu
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 PORTDOCS=	README
 
+post-extract:
+	@${RM} ${WRKSRC}/data/.*Store
+
 .if !defined(NOPORTDOCS)
 post-install:
 	${MKDIR} ${DOCSDIR}
diff --git a/games/toycars/distinfo b/games/toycars/distinfo
index a59196c7216b..b813a070c24e 100644
--- a/games/toycars/distinfo
+++ b/games/toycars/distinfo
@@ -1,3 +1,3 @@
-MD5 (toycars-0.3.3.tar.gz) = fef0de40f5921c7b13866222a583129d
-SHA256 (toycars-0.3.3.tar.gz) = 0a62e2b48f2371fcdab17f016eb2e16a53489914d877bc106c7550e163f13c07
-SIZE (toycars-0.3.3.tar.gz) = 5336046
+MD5 (toycars-0.3.10.tar.gz) = 6b0b7506ee5623081e002c8690c5bc78
+SHA256 (toycars-0.3.10.tar.gz) = 8ead77f160128231e909e9c34dc158cbffe5917eb13effcfda4712484d609658
+SIZE (toycars-0.3.10.tar.gz) = 6390760
diff --git a/games/toycars/pkg-plist b/games/toycars/pkg-plist
index b7ec167960c2..91e3caeb4c0a 100644
--- a/games/toycars/pkg-plist
+++ b/games/toycars/pkg-plist
@@ -1,4 +1,6 @@
 bin/toycars
+bin/toycars_track_editor
+bin/toycars_vehicle_editor
 %%DATADIR%%/data/cars/carslist.xml
 %%DATADIR%%/data/cars/concept_sedan/concept_sedan.png
 %%DATADIR%%/data/cars/concept_sedan/concept_sedan.xml
@@ -10,36 +12,54 @@ bin/toycars
 %%DATADIR%%/data/cars/ferrari-f1/ferrari-f1.xml
 %%DATADIR%%/data/cars/ferrari-f1/ferrari-wheel-sprite.png
 %%DATADIR%%/data/fonts/cricket1.glf
+%%DATADIR%%/data/images/KPH.png
+%%DATADIR%%/data/images/RPM.png
 %%DATADIR%%/data/images/bombsprite.png
+%%DATADIR%%/data/images/lights/green.png
+%%DATADIR%%/data/images/lights/yellow1.png
+%%DATADIR%%/data/images/lights/yellow2.png
 %%DATADIR%%/data/images/loading.png
 %%DATADIR%%/data/images/needle.png
+%%DATADIR%%/data/images/signs.png
 %%DATADIR%%/data/images/title.png
-%%DATADIR%%/data/sounds/Motor_Car_Song.ogg
+%%DATADIR%%/data/music/Motor_Car_Song.ogg
+%%DATADIR%%/data/sounds/Explosion.ogg
 %%DATADIR%%/data/sounds/bang_6.wav
-%%DATADIR%%/data/sounds/engine.aiff
+%%DATADIR%%/data/sounds/dust_slide.wav
 %%DATADIR%%/data/sounds/engine.wav
+%%DATADIR%%/data/sounds/mud.wav
+%%DATADIR%%/data/sounds/organ-c6.aif
+%%DATADIR%%/data/sounds/organ-c7.aif
 %%DATADIR%%/data/tilesets/default/default.xml
 %%DATADIR%%/data/tilesets/default/tiles.png
-%%DATADIR%%/data/tracks/Chewed-Oval/Chewed-Oval.map
-%%DATADIR%%/data/tracks/Chewed-Oval/Chewed-Oval.xml
-%%DATADIR%%/data/tracks/Circuit/Circuit.xml
-%%DATADIR%%/data/tracks/Circuit/oval.map
+%%DATADIR%%/data/tracks/Arizona/Arizona.map
+%%DATADIR%%/data/tracks/Arizona/Arizona.xml
+%%DATADIR%%/data/tracks/Brasilia/Brasilia.map
+%%DATADIR%%/data/tracks/Brasilia/Brasilia.xml
 %%DATADIR%%/data/tracks/Corner/Corner.xml
 %%DATADIR%%/data/tracks/Corner/corner.map
-%%DATADIR%%/data/tracks/Horseshoe/Horseshoe.xml
-%%DATADIR%%/data/tracks/Horseshoe/horseshoe.map
-%%DATADIR%%/data/tracks/Rings/Rings.xml
-%%DATADIR%%/data/tracks/Rings/rings.map
+%%DATADIR%%/data/tracks/Edmonton/Edmonton.map
+%%DATADIR%%/data/tracks/Edmonton/Edmonton.xml
+%%DATADIR%%/data/tracks/Hairpin/Hairpin.map
+%%DATADIR%%/data/tracks/Hairpin/Hairpin.xml
+%%DATADIR%%/data/tracks/Oval/Oval.map
+%%DATADIR%%/data/tracks/Oval/Oval.xml
+%%DATADIR%%/data/tracks/Snake/Snake.map
+%%DATADIR%%/data/tracks/Snake/Snake.xml
 %%DATADIR%%/data/tracks/tracklist.xml
-@dirrm %%DATADIR%%/data/tracks/Rings
-@dirrm %%DATADIR%%/data/tracks/Horseshoe
+@dirrm %%DATADIR%%/data/tracks/Snake
+@dirrm %%DATADIR%%/data/tracks/Oval
+@dirrm %%DATADIR%%/data/tracks/Hairpin
+@dirrm %%DATADIR%%/data/tracks/Edmonton
 @dirrm %%DATADIR%%/data/tracks/Corner
-@dirrm %%DATADIR%%/data/tracks/Circuit
-@dirrm %%DATADIR%%/data/tracks/Chewed-Oval
+@dirrm %%DATADIR%%/data/tracks/Brasilia
+@dirrm %%DATADIR%%/data/tracks/Arizona
 @dirrm %%DATADIR%%/data/tracks
 @dirrm %%DATADIR%%/data/tilesets/default
 @dirrm %%DATADIR%%/data/tilesets
 @dirrm %%DATADIR%%/data/sounds
+@dirrm %%DATADIR%%/data/music
+@dirrm %%DATADIR%%/data/images/lights
 @dirrm %%DATADIR%%/data/images
 @dirrm %%DATADIR%%/data/fonts
 @dirrm %%DATADIR%%/data/cars/ferrari-f1