- Update to version 0.4.0

PR:		56320
Submitted by:	Ports Fury

12 files changed, 36 insertions, 106 deletions

diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index 6b3e71017c38..45286faf7aa5 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	vamos
-PORTVERSION=	0.3.3
+PORTVERSION=	0.4.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,14 +26,20 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+		MAKEINFO="makeinfo --no-split"
 INSTALLS_SHLIB=	yes
 
+INFO=		vamos
+
 CPPFLAGS=	-I${LOCALBASE}/include/libpng -I${X11BASE}/include \
 		${PTHREAD_CFLAGS}
-LDFLAGS=	-L${X11BASE}/lib -L${X11BASE}/lib -lGL -lGLU -lglut \
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lGLU -lglut \
 		${PTHREAD_LIBS}
 
+post-extract:
+	@${RM} -f ${WRKSRC}/doc/*.info*
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^CXXFLAGS/d' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/games/vamos/distinfo b/games/vamos/distinfo
index 3ff109f14333..1ad5aaf5b81b 100644
--- a/games/vamos/distinfo
+++ b/games/vamos/distinfo
@@ -1 +1 @@
-MD5 (vamos-0.3.3.tar.gz) = 120672e9e4bfde7affb1c63395fe2619
+MD5 (vamos-0.4.0.tar.gz) = 771934c27dc97dc81bf4ce2ddf9a2c0c
diff --git a/games/vamos/files/patch-body::Drivetrain.cc b/games/vamos/files/patch-body::Drivetrain.cc
deleted file mode 100644
index 81c76cdd0488..000000000000
--- a/games/vamos/files/patch-body::Drivetrain.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- body/Drivetrain.cc.orig	Fri Jan 24 08:44:48 2003
-+++ body/Drivetrain.cc	Thu Jul 24 01:31:46 2003
-@@ -20,6 +20,8 @@
- 
- #include <vamos/body/Drivetrain.h>
- 
-+#include <cassert>
-+
- //* Class Drivetrain
- 
- //** Constructor
diff --git a/games/vamos/files/patch-body::Suspension.cc b/games/vamos/files/patch-body::Suspension.cc
deleted file mode 100644
index bbdf8f45d22c..000000000000
--- a/games/vamos/files/patch-body::Suspension.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- body/Suspension.cc.orig	Fri Jan 24 08:44:47 2003
-+++ body/Suspension.cc	Thu Jul 24 01:32:35 2003
-@@ -20,6 +20,8 @@
- 
- #include <vamos/geometry/Conversions.h>
- #include <vamos/body/Suspension.h>
-+
-+#include <cassert>
- #include <cmath>
- 
- using Vamos_Geometry::Three_Vector;
diff --git a/games/vamos/files/patch-body::Transmission.cc b/games/vamos/files/patch-body::Transmission.cc
deleted file mode 100644
index 4ab3477ee931..000000000000
--- a/games/vamos/files/patch-body::Transmission.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- body/Transmission.cc.orig	Tue Jan  7 10:56:29 2003
-+++ body/Transmission.cc	Thu Jul 24 01:33:03 2003
-@@ -19,6 +19,8 @@
- //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- #include <vamos/body/Transmission.h>
-+
-+#include <cassert>
- #include <iostream>
- 
- //* Constructors
diff --git a/games/vamos/files/patch-geometry::Gl_Texture_Image.cc b/games/vamos/files/patch-geometry::Gl_Texture_Image.cc
deleted file mode 100644
index ed01c5e3e25e..000000000000
--- a/games/vamos/files/patch-geometry::Gl_Texture_Image.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- geometry/Gl_Texture_Image.cc.orig	Thu May 29 07:28:16 2003
-+++ geometry/Gl_Texture_Image.cc	Thu Jul 24 01:29:49 2003
-@@ -18,6 +18,8 @@
- //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- #include <vamos/geometry/Gl_Texture_Image.h>
-+
-+#include <cassert>
- #include <iostream>
- 
- Vamos_Geometry::
diff --git a/games/vamos/files/patch-geometry::Linear_Interpolator.cc b/games/vamos/files/patch-geometry::Linear_Interpolator.cc
deleted file mode 100644
index d9b8c53bd1ad..000000000000
--- a/games/vamos/files/patch-geometry::Linear_Interpolator.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- geometry/Linear_Interpolator.cc.orig	Fri May 30 12:08:56 2003
-+++ geometry/Linear_Interpolator.cc	Thu Jul 24 01:30:16 2003
-@@ -19,6 +19,7 @@
- 
- #include <vamos/geometry/Linear_Interpolator.h>
- 
-+#include <cassert>
- #include <cmath>
- 
- Vamos_Geometry::
diff --git a/games/vamos/files/patch-geometry::Material.cc b/games/vamos/files/patch-geometry::Material.cc
deleted file mode 100644
index 8d889c0968e0..000000000000
--- a/games/vamos/files/patch-geometry::Material.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- geometry/Material.cc.orig	Mon May 12 04:50:28 2003
-+++ geometry/Material.cc	Thu Jul 24 01:30:44 2003
-@@ -17,6 +17,8 @@
- 
- #include <vamos/geometry/Material.h>
- #include <vamos/geometry/Conversions.h>
-+
-+#include <cassert>
- #include <iostream>
- 
- Vamos_Geometry::Material::
diff --git a/games/vamos/files/patch-geometry::Spline.cc b/games/vamos/files/patch-geometry::Spline.cc
deleted file mode 100644
index a9b254a810b5..000000000000
--- a/games/vamos/files/patch-geometry::Spline.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- geometry/Spline.cc.orig	Fri May 30 13:34:43 2003
-+++ geometry/Spline.cc	Thu Jul 24 01:31:07 2003
-@@ -19,6 +19,7 @@
- 
- #include <vamos/geometry/Spline.h>
- 
-+#include <cassert>
- #include <cmath>
- 
- // Construct an empty curve.
diff --git a/games/vamos/files/patch-track::Road_Segment.cc b/games/vamos/files/patch-track::Road_Segment.cc
deleted file mode 100644
index f9591ef6642e..000000000000
--- a/games/vamos/files/patch-track::Road_Segment.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- track/Road_Segment.cc.orig	Thu Jun 12 11:06:40 2003
-+++ track/Road_Segment.cc	Thu Jul 24 01:28:58 2003
-@@ -20,6 +20,7 @@
- 
- #include <GL/glut.h>
- 
-+#include <cassert>
- #include <cmath>
- 
- using namespace Vamos_Geometry;
diff --git a/games/vamos/files/patch-track::Strip_Track.cc b/games/vamos/files/patch-track::Strip_Track.cc
deleted file mode 100644
index ce46e3789e5a..000000000000
--- a/games/vamos/files/patch-track::Strip_Track.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- track/Strip_Track.cc.orig	Thu Jun 12 11:06:34 2003
-+++ track/Strip_Track.cc	Thu Jul 24 01:29:20 2003
-@@ -23,6 +23,7 @@
- 
- #include <GL/glu.h>
- 
-+#include <cassert>
- #include <cmath>
- #include <sstream>
- 
diff --git a/games/vamos/pkg-plist b/games/vamos/pkg-plist
index 32fb833fa13c..a111907d8dfb 100644
--- a/games/vamos/pkg-plist
+++ b/games/vamos/pkg-plist
@@ -25,6 +25,7 @@ include/vamos/geometry/Inertia_Tensor.h
 include/vamos/geometry/Interpolator.h
 include/vamos/geometry/Linear_Interpolator.h
 include/vamos/geometry/Material.h
+include/vamos/geometry/Sample.h
 include/vamos/geometry/Spline.h
 include/vamos/geometry/Texture_Image.h
 include/vamos/geometry/Three_Matrix.h
@@ -35,11 +36,10 @@ include/vamos/track/Strip_Track.h
 include/vamos/track/Track.h
 include/vamos/world/Atmosphere.h
 include/vamos/world/Car_World.h
+include/vamos/world/Controls.h
 include/vamos/world/Gl_Car_World.h
+include/vamos/world/Sounds.h
 include/vamos/world/World.h
-@unexec install-info --delete %D/info/vamos.info %D/info/dir
-info/vamos.info
-@exec install-info %D/info/vamos.info %D/info/dir
 lib/libvamos-body.a
 lib/libvamos-body.so
 lib/libvamos-body.so.0
@@ -58,32 +58,46 @@ share/vamos/cars/GT.xml
 share/vamos/cars/default-car.xml
 share/vamos/cars/front-drive.xml
 share/vamos/cars/trainer.xml
+share/vamos/controls/clutch-wheel.xml
+share/vamos/controls/default-controls.xml
+share/vamos/controls/stick.xml
+share/vamos/controls/throttle-wheel.xml
 share/vamos/sounds/crash.wav
+share/vamos/sounds/default-sounds.xml
 share/vamos/sounds/engine.wav
+share/vamos/sounds/f1-engine.wav
 share/vamos/sounds/rumble.wav
 share/vamos/sounds/tire_squeal.wav
 share/vamos/sounds/wind.wav
+share/vamos/textures/100.png
+share/vamos/textures/150.png
+share/vamos/textures/200.png
+share/vamos/textures/300.png
+share/vamos/textures/400.png
+share/vamos/textures/50.png
+share/vamos/textures/blue-green-tires.png
+share/vamos/textures/blue-kerb.png
+share/vamos/textures/blue-tires.png
 share/vamos/textures/grass.png
 share/vamos/textures/gravel.png
 share/vamos/textures/gravel2.png
 share/vamos/textures/gravel3.png
 share/vamos/textures/kerb.png
-share/vamos/textures/blue-kerb.png
-share/vamos/textures/red-kerb.png
 share/vamos/textures/rail.png
+share/vamos/textures/red-kerb.png
+share/vamos/textures/red-tires.png
 share/vamos/textures/sky.png
 share/vamos/textures/sky_bottom.png
 share/vamos/textures/sky_sides.png
 share/vamos/textures/sky_top.png
 share/vamos/textures/tires.png
-share/vamos/textures/blue-tires.png
-share/vamos/textures/red-tires.png
 share/vamos/textures/track.png
 share/vamos/textures/track2.png
 share/vamos/textures/wall.png
 share/vamos/tracks/Albert_Park.xml
 share/vamos/tracks/Indianapolis.xml
 share/vamos/tracks/Magny-Cours.xml
+share/vamos/tracks/Monza.xml
 share/vamos/tracks/Mosport.xml
 share/vamos/tracks/Nurburgring.xml
 share/vamos/tracks/Peanut.xml
@@ -94,9 +108,14 @@ share/vamos/tracks/default-track.xml
 share/vamos/tracks/drag.xml
 share/vamos/tracks/jump.xml
 share/vamos/tracks/skid_pad.xml
+share/vamos/worlds/default-world.xml
+share/vamos/worlds/earth.xml
+share/vamos/worlds/moon.xml
+@dirrm share/vamos/worlds
 @dirrm share/vamos/tracks
 @dirrm share/vamos/textures
 @dirrm share/vamos/sounds
+@dirrm share/vamos/controls
 @dirrm share/vamos/cars
 @dirrm share/vamos
 @dirrm include/vamos/world