6 files changed, 205 insertions, 27 deletions

diff --git a/games/torcs/Makefile b/games/torcs/Makefile
index f7589c10f766..86acf6b88112 100644
--- a/games/torcs/Makefile
+++ b/games/torcs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		torcs
-DISTVERSION=		1.2.4
-PORTREVISION=		2
+DISTVERSION=		1.3.0
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -48,7 +47,7 @@ BASH2FIX=	src/linux/torcs.in src/tools/accc/accc.in src/tools/nfsperf/nfsperf.in
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=	"Does not compile on FreeBSD-4."
+BROKEN=		Does not compile on FreeBSD-4.
 .endif
 
 .if ${OSVERSION} < 500041
diff --git a/games/torcs/distinfo b/games/torcs/distinfo
index 96318b4bf2d7..1b5767fc00cc 100644
--- a/games/torcs/distinfo
+++ b/games/torcs/distinfo
@@ -1,3 +1,3 @@
-MD5 (torcs-1.2.4.tar.bz2) = f8727358323bd92537f10167bda4ee5f
-SHA256 (torcs-1.2.4.tar.bz2) = 2b836a6f99947fa1a4a32ebd9b85f62ca109cde0e58b2326a3f94ef619f66249
-SIZE (torcs-1.2.4.tar.bz2) = 112020278
+MD5 (torcs-1.3.0.tar.bz2) = b1f8f3293e408a33c89791ac1f12b179
+SHA256 (torcs-1.3.0.tar.bz2) = 354b1e34475b6579f493f8a1344788659973add3e7c2e7d087870909067625d7
+SIZE (torcs-1.3.0.tar.bz2) = 153890028
diff --git a/games/torcs/files/patch-Makefile b/games/torcs/files/patch-Makefile
index 99370ccb70c0..1aaf3bed0c9a 100644
--- a/games/torcs/files/patch-Makefile
+++ b/games/torcs/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig	Thu May 19 17:39:25 2005
-+++ Makefile	Thu Aug 25 23:08:36 2005
+--- Makefile.orig	Sat Aug 19 17:07:30 2006
++++ Makefile	Mon Oct  9 22:08:30 2006
 @@ -78,7 +78,7 @@
  
  DATADIR 	= .
  
--DATA    	= CHANGELOG.html COPYING Ticon.png Ticon.ico tux.png logo-skinner.png
-+DATA    	= CHANGELOG.html Ticon.png Ticon.ico tux.png logo-skinner.png
+-DATA    	= COPYING Ticon.png Ticon.ico tux.png logo-skinner.png
++DATA    	= Ticon.png Ticon.ico tux.png logo-skinner.png
  
  SHIPEXECDIR	= .
  
diff --git a/games/torcs/files/patch-configure b/games/torcs/files/patch-configure
index 8a6de3d1e110..6a6c5020d19e 100644
--- a/games/torcs/files/patch-configure
+++ b/games/torcs/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Fri Feb  4 23:30:08 2005
-+++ configure	Mon Feb 14 23:05:09 2005
-@@ -4930,13 +4930,13 @@
+--- configure.orig	Sat Oct  7 23:02:55 2006
++++ configure	Mon Oct  9 22:24:36 2006
+@@ -4931,13 +4931,13 @@
  fi
  
  #CFLAGS="-ansi -Wall -Wstrict-prototypes -W"
--ADDCFLAGS="-Wall -fPIC"
-+ADDCFLAGS="$CFLAGS -Wall -fPIC"
+-ADDCFLAGS="-Wall -fPIC -fno-strict-aliasing"
++ADDCFLAGS="$CFLAGS -Wall -fPIC -fno-strict-aliasing"
  # Check whether --enable-debug or --disable-debug was given.
  if test "${enable_debug+set}" = set; then
    enableval="$enable_debug"
diff --git a/games/torcs/files/patch-src_modules_graphic_ssggraph_Makefile b/games/torcs/files/patch-src_modules_graphic_ssggraph_Makefile
new file mode 100644
index 000000000000..79854a2c3c4a
--- /dev/null
+++ b/games/torcs/files/patch-src_modules_graphic_ssggraph_Makefile
@@ -0,0 +1,11 @@
+--- src/modules/graphic/ssggraph/Makefile.orig	Wed Jul 20 03:52:30 2005
++++ src/modules/graphic/ssggraph/Makefile	Mon Oct  9 23:37:51 2006
+@@ -24,7 +24,7 @@
+ 
+ MODULEDIR = modules/graphic
+ 
+-LIBS      = -lplibsl -lplibsm -lplibsg -lplibssg -lplibul -lplibssgaux -lopenal
++LIBS      = -lplibsl -lplibsm -lplibsg -lplibssg -lplibul -lplibssgaux -lopenal -lalut
+ 
+ SHIPDIR   = config
+ 
diff --git a/games/torcs/pkg-plist b/games/torcs/pkg-plist
index a8f88fc87399..bd33ae8e8b6f 100644
--- a/games/torcs/pkg-plist
+++ b/games/torcs/pkg-plist
@@ -39,7 +39,6 @@ lib/torcs/setup_linux.sh
 lib/torcs/texmapper-bin
 lib/torcs/torcs-bin
 lib/torcs/trackgen-bin
-%%TORCSDIR%%/CHANGELOG.html
 %%TORCSDIR%%/Ticon.ico
 %%TORCSDIR%%/Ticon.png
 %%TORCSDIR%%/cars/155-DTM/155-DTM-lod1.acc
@@ -52,7 +51,6 @@ lib/torcs/trackgen-bin
 %%TORCSDIR%%/cars/155-DTM/tex-wheel.rgb
 %%TORCSDIR%%/cars/360-modena/360-modena-lod1.acc
 %%TORCSDIR%%/cars/360-modena/360-modena-lod2.acc
-%%TORCSDIR%%/cars/360-modena/360-modena-lod3.acc
 %%TORCSDIR%%/cars/360-modena/360-modena.acc
 %%TORCSDIR%%/cars/360-modena/360-modena.rgb
 %%TORCSDIR%%/cars/360-modena/360-modena.xml
@@ -82,6 +80,12 @@ lib/torcs/trackgen-bin
 %%TORCSDIR%%/cars/buggy/buggy.xml
 %%TORCSDIR%%/cars/buggy/shadow.rgb
 %%TORCSDIR%%/cars/buggy/tex-wheel.rgb
+%%TORCSDIR%%/cars/car1-trb1/car1-trb1.acc
+%%TORCSDIR%%/cars/car1-trb1/car1-trb1.rgb
+%%TORCSDIR%%/cars/car1-trb1/car1-trb1.xml
+%%TORCSDIR%%/cars/car1-trb1/readme.txt
+%%TORCSDIR%%/cars/car1-trb1/shadow.rgb
+%%TORCSDIR%%/cars/car1-trb1/tex-wheel.rgb
 %%TORCSDIR%%/cars/cg-nascar-rwd/cg-nascar-rwd-lod1.acc
 %%TORCSDIR%%/cars/cg-nascar-rwd/cg-nascar-rwd-lod2.acc
 %%TORCSDIR%%/cars/cg-nascar-rwd/cg-nascar-rwd.acc
@@ -429,8 +433,6 @@ lib/torcs/trackgen-bin
 %%TORCSDIR%%/cars/kc-p4/readme.txt
 %%TORCSDIR%%/cars/kc-p4/shadow.rgb
 %%TORCSDIR%%/cars/kc-p4/tex-wheel.rgb
-%%TORCSDIR%%/cars/lotus-gt1/lotus-gt1-lod1.acc
-%%TORCSDIR%%/cars/lotus-gt1/lotus-gt1-lod2.acc
 %%TORCSDIR%%/cars/lotus-gt1/lotus-gt1.acc
 %%TORCSDIR%%/cars/lotus-gt1/lotus-gt1.rgb
 %%TORCSDIR%%/cars/lotus-gt1/lotus-gt1.xml
@@ -544,8 +546,6 @@ lib/torcs/trackgen-bin
 %%TORCSDIR%%/cars/viper-gts-r/readme.txt
 %%TORCSDIR%%/cars/viper-gts-r/shadow.rgb
 %%TORCSDIR%%/cars/viper-gts-r/tex-wheel.rgb
-%%TORCSDIR%%/cars/viper-gts-r/viper-gts-r-lod1.acc
-%%TORCSDIR%%/cars/viper-gts-r/viper-gts-r-lod2.acc
 %%TORCSDIR%%/cars/viper-gts-r/viper-gts-r.acc
 %%TORCSDIR%%/cars/viper-gts-r/viper-gts-r.rgb
 %%TORCSDIR%%/cars/viper-gts-r/viper-gts-r.xml
@@ -1025,6 +1025,7 @@ lib/torcs/trackgen-bin
 %%TORCSDIR%%/drivers/berniw/4/michigan.xml
 %%TORCSDIR%%/drivers/berniw/4/mixed-1.xml
 %%TORCSDIR%%/drivers/berniw/4/mixed-2.xml
+%%TORCSDIR%%/drivers/berniw/4/ole-road-1.xml
 %%TORCSDIR%%/drivers/berniw/4/spring.xml
 %%TORCSDIR%%/drivers/berniw/4/viper-gts-r.rgb
 %%TORCSDIR%%/drivers/berniw/4/wheel-1.xml
@@ -1556,7 +1557,6 @@ lib/torcs/trackgen-bin
 %%TORCSDIR%%/drivers/human/tracks/e-track-2/car-torcs.xml
 %%TORCSDIR%%/drivers/human/tracks/e-track-3/car-porsche-gt1.xml
 %%TORCSDIR%%/drivers/human/tracks/e-track-3/car-torcs.xml
-%%TORCSDIR%%/drivers/human/tracks/e-track-4/car-360-modena.xml
 %%TORCSDIR%%/drivers/human/tracks/e-track-4/car-mclaren-f1.xml
 %%TORCSDIR%%/drivers/human/tracks/e-track-4/car-porsche-gt1.xml
 %%TORCSDIR%%/drivers/human/tracks/e-track-4/car-porsche-gt3rs.xml
@@ -1566,7 +1566,6 @@ lib/torcs/trackgen-bin
 %%TORCSDIR%%/drivers/human/tracks/e-track-6/car-mclaren-f1.xml
 %%TORCSDIR%%/drivers/human/tracks/e-track-6/car-porsche-gt1.xml
 %%TORCSDIR%%/drivers/human/tracks/e-track-6/car-torcs.xml
-%%TORCSDIR%%/drivers/human/tracks/g-track-2/car-360-modena.xml
 %%TORCSDIR%%/drivers/human/tracks/g-track-2/car-mclaren-f1.xml
 %%TORCSDIR%%/drivers/human/tracks/g-track-2/car-porsche-gt1.xml
 %%TORCSDIR%%/drivers/human/tracks/g-track-2/car-porsche-gt3rs.xml
@@ -1650,7 +1649,6 @@ lib/torcs/trackgen-bin
 %%TORCSDIR%%/drivers/inferno/10/tracksdata/wheel-1.xml
 %%TORCSDIR%%/drivers/inferno/10/vm-x4.rgb
 %%TORCSDIR%%/drivers/inferno/2/360-modena.rgb
-%%TORCSDIR%%/drivers/inferno/2/360-modena.xcf
 %%TORCSDIR%%/drivers/inferno/2/Makefile
 %%TORCSDIR%%/drivers/inferno/2/default.xml
 %%TORCSDIR%%/drivers/inferno/2/defaultcar.xml
@@ -2214,12 +2212,38 @@ lib/torcs/trackgen-bin
 %%TORCSDIR%%/tracks/dirt/dirt-2/dirt-2.png
 %%TORCSDIR%%/tracks/dirt/dirt-2/dirt-2.xml
 %%TORCSDIR%%/tracks/dirt/dirt-2/readme.txt
+%%TORCSDIR%%/tracks/dirt/dirt-3/ambush-inn.png
 %%TORCSDIR%%/tracks/dirt/dirt-3/background.png
-%%TORCSDIR%%/tracks/dirt/dirt-3/background2.png
-%%TORCSDIR%%/tracks/dirt/dirt-3/dirt-3.ac
+%%TORCSDIR%%/tracks/dirt/dirt-3/barrier-fence_n.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/barrier-rusty.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/barrier-wooden_n.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/black.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/bridgeplanks.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/cabin.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/dirt-3.acc
 %%TORCSDIR%%/tracks/dirt/dirt-3/dirt-3.png
 %%TORCSDIR%%/tracks/dirt/dirt-3/dirt-3.xml
+%%TORCSDIR%%/tracks/dirt/dirt-3/dirt-grass.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/dirt-pits.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/dirt-side.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/grass-clump-arbor_n.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/hat.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/newdirt.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/newdirt2.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/newgrass.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/pit-walls.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/poutre2_arbor_n.rgb
+%%TORCSDIR%%/tracks/dirt/dirt-3/poutre3_arbor_n.rgb
 %%TORCSDIR%%/tracks/dirt/dirt-3/readme.txt
+%%TORCSDIR%%/tracks/dirt/dirt-3/shadow2.rgb
+%%TORCSDIR%%/tracks/dirt/dirt-3/sign-left_n.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/sign-pit_n.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/stone1.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/tank.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/tr-house-arbor_n.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/tree_bush2_arbor_n.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/tree_gum2_arbor_n.png
+%%TORCSDIR%%/tracks/dirt/dirt-3/tree_gum_arbor_n.png
 %%TORCSDIR%%/tracks/dirt/dirt-4/background.png
 %%TORCSDIR%%/tracks/dirt/dirt-4/dirt-4.ac
 %%TORCSDIR%%/tracks/dirt/dirt-4/dirt-4.png
@@ -2299,11 +2323,48 @@ lib/torcs/trackgen-bin
 %%TORCSDIR%%/tracks/oval/g-speedway/g-speedway.png
 %%TORCSDIR%%/tracks/oval/g-speedway/g-speedway.xml
 %%TORCSDIR%%/tracks/oval/g-speedway/readme.txt
+%%TORCSDIR%%/tracks/oval/michigan/allborg-trees_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/arbor_frame_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/asphalt-bw-m1-1_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/asphalt-bw-m1-pit-1_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/asphalt-bw-m1-pitentry-1_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/asphalt-bw-m1-pitentry-leftside-1_n.rgb
 %%TORCSDIR%%/tracks/oval/michigan/background.png
-%%TORCSDIR%%/tracks/oval/michigan/michigan.ac
+%%TORCSDIR%%/tracks/oval/michigan/block1.rgb
+%%TORCSDIR%%/tracks/oval/michigan/block2.rgb
+%%TORCSDIR%%/tracks/oval/michigan/border-dirt.rgb
+%%TORCSDIR%%/tracks/oval/michigan/facade4-512.rgb
+%%TORCSDIR%%/tracks/oval/michigan/forest1-tree-m1_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/grass-m1-2.rgb
+%%TORCSDIR%%/tracks/oval/michigan/grass-m1.rgb
+%%TORCSDIR%%/tracks/oval/michigan/grass-m3-arbor_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/michigan-arbor_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/michigan.acc
 %%TORCSDIR%%/tracks/oval/michigan/michigan.png
 %%TORCSDIR%%/tracks/oval/michigan/michigan.xml
+%%TORCSDIR%%/tracks/oval/michigan/poutre3_arbor_n.rgb
 %%TORCSDIR%%/tracks/oval/michigan/readme.txt
+%%TORCSDIR%%/tracks/oval/michigan/roof3.rgb
+%%TORCSDIR%%/tracks/oval/michigan/roof5.rgb
+%%TORCSDIR%%/tracks/oval/michigan/shadow2.rgb
+%%TORCSDIR%%/tracks/oval/michigan/std.rgb
+%%TORCSDIR%%/tracks/oval/michigan/tarmac-wall-2-g2.rgb
+%%TORCSDIR%%/tracks/oval/michigan/tent.rgb
+%%TORCSDIR%%/tracks/oval/michigan/torcs-url-yellow-red.rgb
+%%TORCSDIR%%/tracks/oval/michigan/torcs0_arbor_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/torcs1.rgb
+%%TORCSDIR%%/tracks/oval/michigan/truck_arbor_berniw_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/truck_arbor_bt_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/truck_arbor_ctd_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/truck_arbor_cylos_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/truck_arbor_inferno_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/truck_arbor_speedy_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/truck_arbor_tanhoj_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/truck_arbor_tita_n.rgb
+%%TORCSDIR%%/tracks/oval/michigan/wall-m1-2.rgb
+%%TORCSDIR%%/tracks/oval/michigan/wall-m1.rgb
+%%TORCSDIR%%/tracks/oval/michigan/wall-torcs.rgb
+%%TORCSDIR%%/tracks/oval/michigan/wall4.rgb
 %%TORCSDIR%%/tracks/road/aalborg/aalborg.acc
 %%TORCSDIR%%/tracks/road/aalborg/aalborg.png
 %%TORCSDIR%%/tracks/road/aalborg/aalborg.xml
@@ -2538,19 +2599,125 @@ lib/torcs/trackgen-bin
 %%TORCSDIR%%/tracks/road/ole-road-1/readme.txt
 %%TORCSDIR%%/tracks/road/ole-road-1/shadow2.rgb
 %%TORCSDIR%%/tracks/road/ole-road-1/tr-asphalt-l_nmm.rgb
+%%TORCSDIR%%/tracks/road/ruudskogen/arb01_n.png
+%%TORCSDIR%%/tracks/road/ruudskogen/arb02_n.png
+%%TORCSDIR%%/tracks/road/ruudskogen/background.png
+%%TORCSDIR%%/tracks/road/ruudskogen/dekk01.png
+%%TORCSDIR%%/tracks/road/ruudskogen/env.png
+%%TORCSDIR%%/tracks/road/ruudskogen/grass01.png
+%%TORCSDIR%%/tracks/road/ruudskogen/grass02.png
+%%TORCSDIR%%/tracks/road/ruudskogen/hus02.png
+%%TORCSDIR%%/tracks/road/ruudskogen/hytte01.png
+%%TORCSDIR%%/tracks/road/ruudskogen/lave01.png
+%%TORCSDIR%%/tracks/road/ruudskogen/lave02.png
+%%TORCSDIR%%/tracks/road/ruudskogen/readme.txt
+%%TORCSDIR%%/tracks/road/ruudskogen/rk_tree_1_n.png
+%%TORCSDIR%%/tracks/road/ruudskogen/rk_tree_2_n.png
+%%TORCSDIR%%/tracks/road/ruudskogen/rk_tree_3_n.png
+%%TORCSDIR%%/tracks/road/ruudskogen/road-edge.png
+%%TORCSDIR%%/tracks/road/ruudskogen/road01-dashlines.png
+%%TORCSDIR%%/tracks/road/ruudskogen/road01-pitentry.png
+%%TORCSDIR%%/tracks/road/ruudskogen/road01-pits_n.png
+%%TORCSDIR%%/tracks/road/ruudskogen/road01.png
+%%TORCSDIR%%/tracks/road/ruudskogen/road02.png
+%%TORCSDIR%%/tracks/road/ruudskogen/road03.png
+%%TORCSDIR%%/tracks/road/ruudskogen/ruudskog_arbor.png
+%%TORCSDIR%%/tracks/road/ruudskogen/ruudskogen.acc
+%%TORCSDIR%%/tracks/road/ruudskogen/ruudskogen.png
+%%TORCSDIR%%/tracks/road/ruudskogen/ruudskogen.xml
+%%TORCSDIR%%/tracks/road/ruudskogen/sand01.png
+%%TORCSDIR%%/tracks/road/ruudskogen/shadow2.rgb
 %%TORCSDIR%%/tracks/road/spring/readme.txt
 %%TORCSDIR%%/tracks/road/spring/spring.ac
 %%TORCSDIR%%/tracks/road/spring/spring.png
 %%TORCSDIR%%/tracks/road/spring/spring.xml
+%%TORCSDIR%%/tracks/road/street-1/background.png
+%%TORCSDIR%%/tracks/road/street-1/barr1.rgb
+%%TORCSDIR%%/tracks/road/street-1/concdal.rgb
+%%TORCSDIR%%/tracks/road/street-1/grass-aa.rgb
+%%TORCSDIR%%/tracks/road/street-1/house.rgb
+%%TORCSDIR%%/tracks/road/street-1/poutre3_arbor_n.rgb
+%%TORCSDIR%%/tracks/road/street-1/readme.txt
+%%TORCSDIR%%/tracks/road/street-1/roof1.rgb
+%%TORCSDIR%%/tracks/road/street-1/shadow2.rgb
+%%TORCSDIR%%/tracks/road/street-1/std.rgb
+%%TORCSDIR%%/tracks/road/street-1/street-1.acc
+%%TORCSDIR%%/tracks/road/street-1/street-1.png
+%%TORCSDIR%%/tracks/road/street-1/street-1.xml
+%%TORCSDIR%%/tracks/road/street-1/texte1.png
+%%TORCSDIR%%/tracks/road/street-1/torcs1.rgb
+%%TORCSDIR%%/tracks/road/street-1/town-border-arbor.png
+%%TORCSDIR%%/tracks/road/street-1/tr-asphalt-2-aa-r_n.png
+%%TORCSDIR%%/tracks/road/street-1/tr-asphalt-aa-bw1_n.rgb
+%%TORCSDIR%%/tracks/road/street-1/tr-building1.rgb
+%%TORCSDIR%%/tracks/road/street-1/tr-building2.rgb
+%%TORCSDIR%%/tracks/road/street-1/tr-building3.rgb
+%%TORCSDIR%%/tracks/road/street-1/tr-building5.rgb
+%%TORCSDIR%%/tracks/road/street-1/tr-building6.rgb
+%%TORCSDIR%%/tracks/road/street-1/tr-building7.rgb
+%%TORCSDIR%%/tracks/road/street-1/tr-building8.rgb
+%%TORCSDIR%%/tracks/road/street-1/tr-building9.rgb
+%%TORCSDIR%%/tracks/road/street-1/tr-curb-bw-aa-r.rgb
+%%TORCSDIR%%/tracks/road/street-1/tr-house-arbor2_n.png
+%%TORCSDIR%%/tracks/road/street-1/tr-house-arbor_n.png
+%%TORCSDIR%%/tracks/road/street-1/tr-road1-pit_n.rgb
+%%TORCSDIR%%/tracks/road/street-1/tr-road1_n.rgb
+%%TORCSDIR%%/tracks/road/street-1/tr-spec.png
+%%TORCSDIR%%/tracks/road/street-1/tree-border_n.rgb
+%%TORCSDIR%%/tracks/road/street-1/tree-new_n.rgb
+%%TORCSDIR%%/tracks/road/street-1/tree-poplar_n.rgb
+%%TORCSDIR%%/tracks/road/street-1/treeg10_n.rgb
+%%TORCSDIR%%/tracks/road/street-1/truck0.rgb
+%%TORCSDIR%%/tracks/road/street-1/truck_arbor_ctd_n.rgb
+%%TORCSDIR%%/tracks/road/street-1/walls.rgb
+%%TORCSDIR%%/tracks/road/street-1/walls2.rgb
 %%TORCSDIR%%/tracks/road/wheel-1/background.png
 %%TORCSDIR%%/tracks/road/wheel-1/env.rgb
 %%TORCSDIR%%/tracks/road/wheel-1/readme.txt
 %%TORCSDIR%%/tracks/road/wheel-1/wheel-1.ac
 %%TORCSDIR%%/tracks/road/wheel-1/wheel-1.png
 %%TORCSDIR%%/tracks/road/wheel-1/wheel-1.xml
+%%TORCSDIR%%/tracks/road/wheel-2/asphalt-pit-arbor_n.png
+%%TORCSDIR%%/tracks/road/wheel-2/asphalt-sidel_n.png
+%%TORCSDIR%%/tracks/road/wheel-2/asphalt_mr-pitentry_n.png
+%%TORCSDIR%%/tracks/road/wheel-2/asphalt_n.png
+%%TORCSDIR%%/tracks/road/wheel-2/background.png
+%%TORCSDIR%%/tracks/road/wheel-2/barr1_n.rgb
+%%TORCSDIR%%/tracks/road/wheel-2/building1.png
+%%TORCSDIR%%/tracks/road/wheel-2/building2.png
+%%TORCSDIR%%/tracks/road/wheel-2/clkdtm.rgb
+%%TORCSDIR%%/tracks/road/wheel-2/concdal.rgb
+%%TORCSDIR%%/tracks/road/wheel-2/ggrass3.png
+%%TORCSDIR%%/tracks/road/wheel-2/poutre3_arbor_n.rgb
+%%TORCSDIR%%/tracks/road/wheel-2/readme.txt
+%%TORCSDIR%%/tracks/road/wheel-2/sbridge2.png
+%%TORCSDIR%%/tracks/road/wheel-2/shadow2.rgb
+%%TORCSDIR%%/tracks/road/wheel-2/sign1.png
+%%TORCSDIR%%/tracks/road/wheel-2/sign2.png
+%%TORCSDIR%%/tracks/road/wheel-2/sign3.png
+%%TORCSDIR%%/tracks/road/wheel-2/swall2.png
+%%TORCSDIR%%/tracks/road/wheel-2/texwheel.rgb
+%%TORCSDIR%%/tracks/road/wheel-2/tirewall.rgb
+%%TORCSDIR%%/tracks/road/wheel-2/torcs1.rgb
+%%TORCSDIR%%/tracks/road/wheel-2/tr-barrier-arbor-fence_n.png
+%%TORCSDIR%%/tracks/road/wheel-2/tr-curb-bw-aa-r_n.rgb
+%%TORCSDIR%%/tracks/road/wheel-2/tr-spec.png
+%%TORCSDIR%%/tracks/road/wheel-2/tree-border_n.rgb
+%%TORCSDIR%%/tracks/road/wheel-2/treeg10.rgb
+%%TORCSDIR%%/tracks/road/wheel-2/treeg11.png
+%%TORCSDIR%%/tracks/road/wheel-2/truck0.rgb
+%%TORCSDIR%%/tracks/road/wheel-2/truck_arbor_ctd_n.rgb
+%%TORCSDIR%%/tracks/road/wheel-2/water_green2.png
+%%TORCSDIR%%/tracks/road/wheel-2/wheel-2.acc
+%%TORCSDIR%%/tracks/road/wheel-2/wheel-2.png
+%%TORCSDIR%%/tracks/road/wheel-2/wheel-2.xml
+%%TORCSDIR%%/tracks/road/wheel-2/wheel.png
 %%TORCSDIR%%/tux.png
+@dirrm %%TORCSDIR%%/tracks/road/wheel-2
 @dirrm %%TORCSDIR%%/tracks/road/wheel-1
+@dirrm %%TORCSDIR%%/tracks/road/street-1
 @dirrm %%TORCSDIR%%/tracks/road/spring
+@dirrm %%TORCSDIR%%/tracks/road/ruudskogen
 @dirrm %%TORCSDIR%%/tracks/road/ole-road-1
 @dirrm %%TORCSDIR%%/tracks/road/g-track-3
 @dirrm %%TORCSDIR%%/tracks/road/g-track-2
@@ -2803,6 +2970,7 @@ lib/torcs/trackgen-bin
 @dirrm %%TORCSDIR%%/cars/gt40
 @dirrm %%TORCSDIR%%/cars/clkdtm
 @dirrm %%TORCSDIR%%/cars/cg-nascar-rwd
+@dirrm %%TORCSDIR%%/cars/car1-trb1
 @dirrm %%TORCSDIR%%/cars/buggy
 @dirrm %%TORCSDIR%%/cars/baja-bug
 @dirrm %%TORCSDIR%%/cars/acura-nsx-sz