4 files changed, 23 insertions, 16 deletions

diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index d857bde30b8c..329a4f4069a1 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	vamos
-PORTVERSION=	0.4.4
-PORTREVISION=	1
+PORTVERSION=	0.5.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +18,6 @@ COMMENT=	An automotive simulation framework
 BUILD_DEPENDS=	${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear \
 		${X11BASE}/lib/libplibul.a:${PORTSDIR}/x11-toolkits/plib
 LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
-		sigc.1:${PORTSDIR}/devel/libsigc++ \
 		glut.3:${PORTSDIR}/graphics/libglut \
 		png.5:${PORTSDIR}/graphics/png
 
@@ -36,7 +34,7 @@ INFO=		vamos
 
 CPPFLAGS=	-I${LOCALBASE}/include/libpng -I${X11BASE}/include \
 		${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lGLU -lglut \
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lusbhid -lGL -lGLU -lglut \
 		${PTHREAD_LIBS}
 
 post-extract:
diff --git a/games/vamos/distinfo b/games/vamos/distinfo
index 3a1338fbc452..72d9fc0d4b3f 100644
--- a/games/vamos/distinfo
+++ b/games/vamos/distinfo
@@ -1,2 +1,2 @@
-MD5 (vamos-0.4.4.tar.gz) = 21db546b7c5081f463f4270fdb59d30c
-SIZE (vamos-0.4.4.tar.gz) = 1420272
+MD5 (vamos-0.5.0.tar.gz) = 410c3384a9daf28421086f6d36d1c500
+SIZE (vamos-0.5.0.tar.gz) = 1446002
diff --git a/games/vamos/files/patch-geometry::Ac3d.cc b/games/vamos/files/patch-geometry::Ac3d.cc
index 9a651177ba6a..96a12e66bf0b 100644
--- a/games/vamos/files/patch-geometry::Ac3d.cc
+++ b/games/vamos/files/patch-geometry::Ac3d.cc
@@ -1,6 +1,6 @@
---- geometry/Ac3d.cc.orig	Mon Sep 29 11:30:40 2003
-+++ geometry/Ac3d.cc	Fri Oct  3 18:35:35 2003
-@@ -26,6 +26,8 @@
+--- geometry/Ac3d.cc.orig	Fri Jun 25 01:10:29 2004
++++ geometry/Ac3d.cc	Fri Jun 25 01:11:59 2004
+@@ -27,6 +27,8 @@
  #include <cassert>
  #include <iostream>
  #include <cstdlib>
@@ -9,15 +9,15 @@
  
  using namespace Vamos_Geometry;
  
-@@ -256,7 +258,11 @@
-   m_normal [2] = 1.0;
+@@ -188,7 +190,11 @@
+ 	m_normal [2] = 1.0;
  
-   std::istringstream is (type_code);
+ 	std::istringstream is (figure_type_code);
 +#if defined(__GNUC__) && __GNUC__ < 3
-+  is.setf (std::ios::hex, std::ios::basefield);
++	is.setf (std::ios::hex, std::ios::basefield);
 +#else
-   is.setf (std::ios_base::hex, std::ios_base::basefield);
+ 	is.setf (std::ios_base::hex, std::ios_base::basefield);
 +#endif
-   int code;
-   is >> code;
+ 	int code;
+ 	is >> code;
  
diff --git a/games/vamos/pkg-plist b/games/vamos/pkg-plist
index c593c1a94c11..bb5c21ff202c 100644
--- a/games/vamos/pkg-plist
+++ b/games/vamos/pkg-plist
@@ -33,6 +33,7 @@ include/vamos/geometry/Texture_Image.h
 include/vamos/geometry/Three_Matrix.h
 include/vamos/geometry/Three_Vector.h
 include/vamos/geometry/Two_Point.h
+include/vamos/geometry/XML_Parser.h
 include/vamos/track/Road_Segment.h
 include/vamos/track/Strip_Track.h
 include/vamos/track/Track.h
@@ -53,9 +54,14 @@ lib/libvamos-track.so.0
 lib/libvamos-world.a
 lib/libvamos-world.so
 lib/libvamos-world.so.0
+%%DATADIR%%/cars/F1-1967-arm.ac
 %%DATADIR%%/cars/F1-1967-interior.ac
+%%DATADIR%%/cars/F1-1967-stator.ac
+%%DATADIR%%/cars/F1-1967-wishbone.ac
 %%DATADIR%%/cars/F1-1967.ac
 %%DATADIR%%/cars/F1-1967.xml
+%%DATADIR%%/cars/F1-stator.ac
+%%DATADIR%%/cars/F1-wishbone.ac
 %%DATADIR%%/cars/F1.ac
 %%DATADIR%%/cars/F1.xml
 %%DATADIR%%/cars/GT-interior.ac
@@ -68,6 +74,8 @@ lib/libvamos-world.so.0
 %%DATADIR%%/cars/wheel.ac
 %%DATADIR%%/controls/clutch-wheel.xml
 %%DATADIR%%/controls/default-controls.xml
+%%DATADIR%%/controls/keyboard.xml
+%%DATADIR%%/controls/mouse.xml
 %%DATADIR%%/controls/stick.xml
 %%DATADIR%%/controls/throttle-wheel.xml
 %%DATADIR%%/sounds/crash.wav
@@ -112,6 +120,7 @@ lib/libvamos-world.so.0
 %%DATADIR%%/textures/sky_top.png
 %%DATADIR%%/textures/speedometer-face.png
 %%DATADIR%%/textures/square-mask.png
+%%DATADIR%%/textures/square-mirror-frame.png
 %%DATADIR%%/textures/steering-wheel.png
 %%DATADIR%%/textures/tachometer-face.png
 %%DATADIR%%/textures/tachometer-leds.png