4 files changed, 7 insertions, 96 deletions

diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index 8e7d0b41807a..df03d8f45cc3 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	vamos
-PORTVERSION=	0.5.4
+PORTVERSION=	0.5.5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -50,7 +50,9 @@ post-extract:
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|^AM_CXXFLAGS|#AM_CXXFLAGS|g ; \
+		's|-pedantic -O1 -g -gstabs+||g ; \
 		 s|-ldl||g'
+	@${REINPLACE_CMD} -e 's|freeglut|glut|g ; \
+		 s|FREEGLUT|GLUT|g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/games/vamos/distinfo b/games/vamos/distinfo
index 6fbae1c3a8f3..f8bfdfd4bc70 100644
--- a/games/vamos/distinfo
+++ b/games/vamos/distinfo
@@ -1,2 +1,2 @@
-MD5 (vamos-0.5.4.tar.gz) = c6247a0b70583d021b6dbec10609c67d
-SIZE (vamos-0.5.4.tar.gz) = 1465833
+MD5 (vamos-0.5.5.tar.gz) = f490e7b45d345b9a0b22b29cb042a77e
+SIZE (vamos-0.5.5.tar.gz) = 1474804
diff --git a/games/vamos/files/patch-configure b/games/vamos/files/patch-configure
deleted file mode 100644
index 74d34a466807..000000000000
--- a/games/vamos/files/patch-configure
+++ /dev/null
@@ -1,92 +0,0 @@
---- configure.orig	Thu Jun 30 10:58:52 2005
-+++ configure	Sat Jul  2 13:59:13 2005
-@@ -11364,81 +11364,6 @@
-     opengl_LIBS="$LIBS $x_suffix"
- 
- 
--echo "$as_me:$LINENO: checking for glutGetModifiers in -lfreeglut" >&5
--echo $ECHO_N "checking for glutGetModifiers in -lfreeglut... $ECHO_C" >&6
--if test "${ac_cv_lib_freeglut_glutGetModifiers+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lfreeglut $opengl_LIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char glutGetModifiers ();
--int
--main ()
--{
--glutGetModifiers ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_freeglut_glutGetModifiers=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_freeglut_glutGetModifiers=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_freeglut_glutGetModifiers" >&5
--echo "${ECHO_T}$ac_cv_lib_freeglut_glutGetModifiers" >&6
--if test $ac_cv_lib_freeglut_glutGetModifiers = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBFREEGLUT 1
--_ACEOF
--
--  LIBS="-lfreeglut $LIBS"
--
--fi
--
--    if test "x$ac_cv_lib_freeglut_glutGetModifiers" = "xno" ; then
--
- echo "$as_me:$LINENO: checking for glutGetModifiers in -lglut" >&5
- echo $ECHO_N "checking for glutGetModifiers in -lglut... $ECHO_C" >&6
- if test "${ac_cv_lib_glut_glutGetModifiers+set}" = set; then
-@@ -11512,7 +11437,6 @@
- 
- fi
- 
--    fi
- else
- 
- 
diff --git a/games/vamos/pkg-plist b/games/vamos/pkg-plist
index fd51fc4b109a..1da28c42fd05 100644
--- a/games/vamos/pkg-plist
+++ b/games/vamos/pkg-plist
@@ -24,6 +24,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/Rectangle.h
 include/vamos/geometry/Spline.h
 include/vamos/geometry/Three_Matrix.h
 include/vamos/geometry/Three_Vector.h