- Update to 0.7.1

- Change maintainer email to @FreeBSD.org
- Use the new format for LIB_DEPENDS
- Add dependency for devel/boost-libs
- Add patch, fix build --> --disable-unit-tests
- Remove PORTSCOUT
- Change DOCS
- Support STAGEDIR

Approved by:	wg/pawel (mentors)

4 files changed, 58 insertions, 23 deletions

diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index 6954dbd34abb..b8022346d229 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -2,20 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	vamos
-PORTVERSION=	0.7.0
-PORTREVISION=	3
+PORTVERSION=	0.7.1
 CATEGORIES=	games
-MASTER_SITES=	SF \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/ \
 		SF/nemysisfreebsdp/:icons
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}_icons${EXTRACT_SUFX}:icons
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Automotive simulation framework
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
+		libpng15.so:${PORTSDIR}/graphics/png
 
 USES=		pkgconfig
 USE_OPENAL=	al alut
@@ -23,19 +23,23 @@ USE_XORG=	sm ice x11 xi xext xmu
 USE_GL=		glut
 USE_SDL=	sdl
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ARGS=	ac_cv_header_boost_test_unit_test_hpp=no \
-		ac_cv_lib_freeglut_glutGetModifiers=no
+CONFIGURE_ARGS=	ac_cv_lib_freeglut_glutGetModifiers=no \
+		--disable-unit-tests
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-# Wrong versioning upstream
-PORTSCOUT=	skipv:0.7.1
-
 INFO=		vamos
 
-PORTDOCS=	AUTHORS ChangeLog README TODO
+PORTDOCS=	*
+
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	AUTHORS ChangeLog README TODO
+
+DOCSRCDIR2=	${WRKSRC}/doc
+DOCSDIR2=	${DOCSDIR}/doc
+DOC_FILES2=	matrixfaq.htm
 
 INSTALLS_ICONS=	yes
 ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
@@ -45,9 +49,6 @@ DESKTOP_ENTRIES="Vamos" "${COMMENT}" ${PORTNAME} \
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-extract:
 	@${CHMOD} ${BINMODE} ${WRKSRC}/config/install-sh
 
@@ -61,15 +62,16 @@ post-patch:
 
 post-install:
 .for s in ${ICON_SIZES}
-	${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
-		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
 
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
 
 .include <bsd.port.mk>
diff --git a/games/vamos/distinfo b/games/vamos/distinfo
index 880848dc4e97..74f0fc0074e2 100644
--- a/games/vamos/distinfo
+++ b/games/vamos/distinfo
@@ -1,4 +1,4 @@
-SHA256 (vamos-0.7.0.tar.gz) = ee4d6bf92c1769ed1cf47cb000316df02815dc866f91e22450d1a008f65d6af9
-SIZE (vamos-0.7.0.tar.gz) = 1648589
+SHA256 (vamos-0.7.1.tar.gz) = c81930b5ea376431c0abf868bf23153440eb6c44c1c47e3d9a53a5a15ab35824
+SIZE (vamos-0.7.1.tar.gz) = 1681074
 SHA256 (vamos_icons.tar.gz) = 52bc6a4fea63c8a23a76b059ee942dda6738483e04d1e5afb10a8184f875f803
 SIZE (vamos_icons.tar.gz) = 15360
diff --git a/games/vamos/files/patch-geometry-Parameter.h b/games/vamos/files/patch-geometry-Parameter.h
new file mode 100644
index 000000000000..b12eb71cf723
--- /dev/null
+++ b/games/vamos/files/patch-geometry-Parameter.h
@@ -0,0 +1,10 @@
+--- geometry/Parameter.h.orig	2011-08-28 20:54:18.000000000 +0200
++++ geometry/Parameter.h	2013-09-19 23:10:49.000000000 +0200
+@@ -21,6 +21,7 @@
+ #define PARAMETER_H
+ 
+ #include <vector>
++#include <stdlib.h>
+ 
+ /// A container for numbers passed from the command line.
+ namespace Vamos_Geometry
diff --git a/games/vamos/pkg-plist b/games/vamos/pkg-plist
index 28b4d5c6eb0c..0c671649f9d7 100644
--- a/games/vamos/pkg-plist
+++ b/games/vamos/pkg-plist
@@ -49,6 +49,7 @@ include/vamos/world/Gl_World.h
 include/vamos/world/Interactive_Driver.h
 include/vamos/world/Robot_Driver.h
 include/vamos/world/Sounds.h
+include/vamos/world/Timing_Info.h
 include/vamos/world/World.h
 lib/libvamos-body.a
 lib/libvamos-body.la
@@ -82,13 +83,33 @@ share/pixmaps/vamos.png
 %%DATADIR%%/cars/F1-1967-wishbone.ac
 %%DATADIR%%/cars/F1-1967.ac
 %%DATADIR%%/cars/F1-1967.xml
+%%DATADIR%%/cars/F1-black.ac
+%%DATADIR%%/cars/F1-blue.ac
+%%DATADIR%%/cars/F1-red.ac
+%%DATADIR%%/cars/F1-silver.ac
 %%DATADIR%%/cars/F1-stator.ac
+%%DATADIR%%/cars/F1-white.ac
 %%DATADIR%%/cars/F1-wishbone.ac
 %%DATADIR%%/cars/F1.ac
 %%DATADIR%%/cars/F1.xml
+%%DATADIR%%/cars/F1/1.xml
+%%DATADIR%%/cars/F1/2.xml
+%%DATADIR%%/cars/F1/3.xml
+%%DATADIR%%/cars/F1/4.xml
+%%DATADIR%%/cars/F1/5.xml
+%%DATADIR%%/cars/GT-black.ac
+%%DATADIR%%/cars/GT-blue.ac
+%%DATADIR%%/cars/GT-green.ac
 %%DATADIR%%/cars/GT-interior.ac
+%%DATADIR%%/cars/GT-red.ac
+%%DATADIR%%/cars/GT-yellow.ac
 %%DATADIR%%/cars/GT.ac
 %%DATADIR%%/cars/GT.xml
+%%DATADIR%%/cars/GT/1.xml
+%%DATADIR%%/cars/GT/2.xml
+%%DATADIR%%/cars/GT/3.xml
+%%DATADIR%%/cars/GT/4.xml
+%%DATADIR%%/cars/GT/5.xml
 %%DATADIR%%/cars/default-car.xml
 %%DATADIR%%/cars/front-drive.xml
 %%DATADIR%%/cars/trainer.xml
@@ -203,6 +224,8 @@ share/pixmaps/vamos.png
 @dirrm %%DATADIR%%/textures
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/controls
+@dirrm %%DATADIR%%/cars/GT
+@dirrm %%DATADIR%%/cars/F1
 @dirrm %%DATADIR%%/cars
 @dirrm %%DATADIR%%
 @dirrm include/vamos/world