Fix build on -current

PR:		54801
Submitted by:	KATO Tsuguru <tkato@prontomail.com>
Approved by:	fjoe (mentor) (implicit)

10 files changed, 101 insertions, 0 deletions

diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index ff30840462eb..6b3e71017c38 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++ \
 
 USE_MESA=	yes
 USE_GETOPT_LONG=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -33,4 +34,9 @@ CPPFLAGS=	-I${LOCALBASE}/include/libpng -I${X11BASE}/include \
 LDFLAGS=	-L${X11BASE}/lib -L${X11BASE}/lib -lGL -lGLU -lglut \
 		${PTHREAD_LIBS}
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^CXXFLAGS/d' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		'/^AM_CXXFLAGS/d'
+
 .include <bsd.port.mk>
diff --git a/games/vamos/files/patch-body::Drivetrain.cc b/games/vamos/files/patch-body::Drivetrain.cc
new file mode 100644
index 000000000000..81c76cdd0488
--- /dev/null
+++ b/games/vamos/files/patch-body::Drivetrain.cc
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..bbdf8f45d22c
--- /dev/null
+++ b/games/vamos/files/patch-body::Suspension.cc
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..4ab3477ee931
--- /dev/null
+++ b/games/vamos/files/patch-body::Transmission.cc
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..ed01c5e3e25e
--- /dev/null
+++ b/games/vamos/files/patch-geometry::Gl_Texture_Image.cc
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..d9b8c53bd1ad
--- /dev/null
+++ b/games/vamos/files/patch-geometry::Linear_Interpolator.cc
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..8d889c0968e0
--- /dev/null
+++ b/games/vamos/files/patch-geometry::Material.cc
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..a9b254a810b5
--- /dev/null
+++ b/games/vamos/files/patch-geometry::Spline.cc
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..f9591ef6642e
--- /dev/null
+++ b/games/vamos/files/patch-track::Road_Segment.cc
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..ce46e3789e5a
--- /dev/null
+++ b/games/vamos/files/patch-track::Strip_Track.cc
@@ -0,0 +1,10 @@
+--- 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>
+