4 files changed, 65 insertions, 36 deletions

diff --git a/games/trigger/Makefile b/games/trigger/Makefile
index 82328b96c58e..7baa75526478 100644
--- a/games/trigger/Makefile
+++ b/games/trigger/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	trigger
-PORTVERSION=	0.5.2.1
-PORTREVISION=	11
+PORTVERSION=	0.6.0
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}-rally/${PORTNAME}-rally/${PORTNAME}-${PORTVERSION}
-DISTFILES=	trigger-${PORTVERSION}-src${EXTRACT_SUFX} \
-		trigger-${DATAVERSION}-data${EXTRACT_SUFX}
+DISTFILES=	trigger-rally-${PORTVERSION}-src${EXTRACT_SUFX} \
+		trigger-rally-${DATAVERSION}-data${EXTRACT_SUFX}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	A rally car racing game
@@ -21,20 +20,22 @@ LIB_DEPENDS=	physfs.1:${PORTSDIR}/devel/physfs
 
 USE_OPENAL=	al alut
 USE_SDL=	sdl image
-USE_GL=		yes
+USE_GL=		glu
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-WRKSRC=		${WRKDIR}/trigger-${PORTVERSION}-src
-DATASRC=	${WRKDIR}/trigger-${DATAVERSION}-data
+WRKSRC=		${WRKDIR}/trigger-rally-${PORTVERSION}-src
+DATASRC=	${WRKDIR}/trigger-rally-${DATAVERSION}-data
 
-DATAVERSION=	0.5.2
+DATAVERSION=	0.6.0
 
 DESKTOP_ENTRIES="Trigger" "Car racing game" "" \
 		"trigger" "" false
 
+PORTDOCS=	README-stereo.txt README.txt
+
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -54,20 +55,14 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/trigger ${PREFIX}/bin
 
 	${MKDIR} ${DATADIR}
-.for d in events maps plugins sounds textures vehicles
-	${CP} -R ${DATASRC}/${d} ${DATADIR}
+.for d in events fonts maps plugins sounds textures vehicles
+	cd ${DATASRC} && ${COPYTREE_SHARE} ${d} ${DATADIR}
 .endfor
 	${INSTALL_DATA} ${DATASRC}/trigger.config.defs ${DATADIR}
 
-	-${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/*
-	${FIND} ${DATADIR}/* -type f -exec ${CHMOD} 444 {} \;
-	${FIND} ${DATADIR}/* -type d -exec ${CHMOD} 555 {} \;
-
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-.for f in README-stereo.txt README.txt
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
-.endfor
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/trigger/distinfo b/games/trigger/distinfo
index 8133d7bc76e5..9d160df64b2d 100644
--- a/games/trigger/distinfo
+++ b/games/trigger/distinfo
@@ -1,4 +1,4 @@
-SHA256 (trigger-0.5.2.1-src.tar.bz2) = 0f727f6b02f852018869f21235b208451f0c979a74a3e50e015c982fa4e14b9f
-SIZE (trigger-0.5.2.1-src.tar.bz2) = 333592
-SHA256 (trigger-0.5.2-data.tar.bz2) = c97f339fb5760054eb573eac1576e6b6cec05c5de548636a0bfb7dbc85bdae6b
-SIZE (trigger-0.5.2-data.tar.bz2) = 6188960
+SHA256 (trigger-rally-0.6.0-src.tar.bz2) = dc818f359fff71a8ba5e147886f233cca6478e5b007ef0a38a2974cca855a662
+SIZE (trigger-rally-0.6.0-src.tar.bz2) = 333977
+SHA256 (trigger-rally-0.6.0-data.tar.bz2) = 9ec81472051c890eb2c69e3036299059c7ae82fe445fd4c210c25764f6733598
+SIZE (trigger-rally-0.6.0-data.tar.bz2) = 21204146
diff --git a/games/trigger/pkg-descr b/games/trigger/pkg-descr
index e5bd7a253a50..d1526b283ce1 100644
--- a/games/trigger/pkg-descr
+++ b/games/trigger/pkg-descr
@@ -4,4 +4,4 @@ race a sequence of 6 courses, with increasing levels of difficulty.
 Trigger is highly customisable, and it's easy to add new levels and
 vehicles.
 
-WWW: http://sourceforge.net/projects/trigger-rally/
+WWW: http://trigger-rally.sourceforge.net
diff --git a/games/trigger/pkg-plist b/games/trigger/pkg-plist
index 695b592ace7b..a6d437272bdf 100644
--- a/games/trigger/pkg-plist
+++ b/games/trigger/pkg-plist
@@ -3,6 +3,14 @@ bin/trigger
 %%DATADIR%%/events/triggercup/bigjump/foliagemap.png
 %%DATADIR%%/events/triggercup/bigjump/heightmap.png
 %%DATADIR%%/events/triggercup/bigjump/jump.level
+%%DATADIR%%/events/triggercup/desertstorm/colormap.jpg
+%%DATADIR%%/events/triggercup/desertstorm/foliagemap.png
+%%DATADIR%%/events/triggercup/desertstorm/heightmap.png
+%%DATADIR%%/events/triggercup/desertstorm/storm.level
+%%DATADIR%%/events/triggercup/lunar/colormap.jpg
+%%DATADIR%%/events/triggercup/lunar/foliagemap.png
+%%DATADIR%%/events/triggercup/lunar/heightmap.png
+%%DATADIR%%/events/triggercup/lunar/lunar.level
 %%DATADIR%%/events/triggercup/monkeybusiness/colormap.jpg
 %%DATADIR%%/events/triggercup/monkeybusiness/foliagemap.png
 %%DATADIR%%/events/triggercup/monkeybusiness/heightmap.png
@@ -16,19 +24,41 @@ bin/trigger
 %%DATADIR%%/events/triggercup/warmup/foliagemap.png
 %%DATADIR%%/events/triggercup/warmup/heightmap.png
 %%DATADIR%%/events/triggercup/warmup/warmup.level
-%%DATADIR%%/maps/desertstorm/colormap.jpg
-%%DATADIR%%/maps/desertstorm/foliagemap.png
-%%DATADIR%%/maps/desertstorm/heightmap.png
-%%DATADIR%%/maps/desertstorm/storm.level
-%%DATADIR%%/maps/lunar/colormap.jpg
-%%DATADIR%%/maps/lunar/foliagemap.png
-%%DATADIR%%/maps/lunar/heightmap.png
-%%DATADIR%%/maps/lunar/lunar.level
+%%DATADIR%%/fonts/crillee.pfb
+%%DATADIR%%/maps/greengrounds/colormap.jpg
+%%DATADIR%%/maps/greengrounds/foliagemap.png
+%%DATADIR%%/maps/greengrounds/greengrounds.level
+%%DATADIR%%/maps/greengrounds/heightmap.png
+%%DATADIR%%/maps/mountainpass/colormap.jpg
+%%DATADIR%%/maps/mountainpass/foliagemap.png
+%%DATADIR%%/maps/mountainpass/heightmap.png
+%%DATADIR%%/maps/mountainpass/mountainpass.level
+%%DATADIR%%/maps/roundhouse/roundhouse-c.jpg
+%%DATADIR%%/maps/roundhouse/roundhouse-f.jpg
+%%DATADIR%%/maps/roundhouse/roundhouse-h.jpg
+%%DATADIR%%/maps/roundhouse/roundhouse.level
 %%DATADIR%%/maps/saharatea/level7-c.jpg
 %%DATADIR%%/maps/saharatea/level7-f.png
 %%DATADIR%%/maps/saharatea/level7-h.png
 %%DATADIR%%/maps/saharatea/level7.level
+%%DATADIR%%/plugins/banana_island.zip
+%%DATADIR%%/plugins/cross_mountain.zip
+%%DATADIR%%/plugins/crosspulp.zip
+%%DATADIR%%/plugins/delta.zip
+%%DATADIR%%/plugins/desert_rush.zip
+%%DATADIR%%/plugins/ghats.zip
+%%DATADIR%%/plugins/helicoil.zip
+%%DATADIR%%/plugins/icypeak.zip
+%%DATADIR%%/plugins/illa.zip
+%%DATADIR%%/plugins/monza.zip
+%%DATADIR%%/plugins/muntaya.zip
+%%DATADIR%%/plugins/rscup.zip
+%%DATADIR%%/plugins/santa.zip
+%%DATADIR%%/plugins/serpentine.zip
 %%DATADIR%%/plugins/snowlevel.zip
+%%DATADIR%%/plugins/snowyhills.zip
+%%DATADIR%%/plugins/tobago.zip
+%%DATADIR%%/plugins/westernchallenge.zip
 %%DATADIR%%/sounds/engine1.wav
 %%DATADIR%%/sounds/evo_sound/clank1.wav
 %%DATADIR%%/sounds/evo_sound/clank3.wav
@@ -40,7 +70,10 @@ bin/trigger
 %%DATADIR%%/textures/detail.jpg
 %%DATADIR%%/textures/dial_gear.png
 %%DATADIR%%/textures/dial_rev.png
-%%DATADIR%%/textures/dial_speed.png
+%%DATADIR%%/textures/dial_speed_hybrid_kph.png
+%%DATADIR%%/textures/dial_speed_hybrid_mph.png
+%%DATADIR%%/textures/dial_speed_kph.png
+%%DATADIR%%/textures/dial_speed_mph.png
 %%DATADIR%%/textures/dust.png
 %%DATADIR%%/textures/gunflare.jpg
 %%DATADIR%%/textures/life_helmet.png
@@ -73,8 +106,6 @@ bin/trigger
 %%DATADIR%%/vehicles/seat/seat_complete.fx
 %%DATADIR%%/vehicles/seat/seat_complete.jpg
 %%DATADIR%%/vehicles/seat/seat_wheel.ase
-%%PORTDOCS%%%%DOCSDIR%%/README-stereo.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
 @dirrm %%DATADIR%%/vehicles/seat
 @dirrm %%DATADIR%%/vehicles/focus
 @dirrm %%DATADIR%%/vehicles/evo
@@ -87,14 +118,17 @@ bin/trigger
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/maps/saharatea
-@dirrm %%DATADIR%%/maps/lunar
-@dirrm %%DATADIR%%/maps/desertstorm
+@dirrm %%DATADIR%%/maps/roundhouse
+@dirrm %%DATADIR%%/maps/mountainpass
+@dirrm %%DATADIR%%/maps/greengrounds
 @dirrm %%DATADIR%%/maps
+@dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/events/triggercup/warmup
 @dirrm %%DATADIR%%/events/triggercup/oldmacdonald
 @dirrm %%DATADIR%%/events/triggercup/monkeybusiness
+@dirrm %%DATADIR%%/events/triggercup/lunar
+@dirrm %%DATADIR%%/events/triggercup/desertstorm
 @dirrm %%DATADIR%%/events/triggercup/bigjump
 @dirrm %%DATADIR%%/events/triggercup
 @dirrm %%DATADIR%%/events
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%