9 files changed, 78 insertions, 70 deletions

diff --git a/games/Makefile b/games/Makefile
index 2badfeedbae6..731d2653e925 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -966,7 +966,8 @@
     SUBDIR += traindirector
     SUBDIR += traingame
     SUBDIR += tremulous
-    SUBDIR += trigger
+    SUBDIR += trigger-data
+    SUBDIR += trigger-rally
     SUBDIR += trimines
     SUBDIR += triplane
     SUBDIR += trojka
diff --git a/games/trigger-data/Makefile b/games/trigger-data/Makefile
new file mode 100644
index 000000000000..934c49e40b31
--- /dev/null
+++ b/games/trigger-data/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+PORTNAME=	trigger-data
+PORTVERSION=	0.6.0
+CATEGORIES=	games
+MASTER_SITES=	SF/trigger-rally/trigger-rally/trigger-${PORTVERSION}
+DISTNAME=	trigger-rally-${PORTVERSION}-data
+
+MAINTAINER=	makc@FreeBSD.org
+COMMENT=	Data files for trigger-rally
+
+USES=		tar:bzip2
+
+DATADIR=	${PREFIX}/share/trigger-rally
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+do-install:
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+# Avoid conflict with trigger-rally
+	@${RM} -f ${STAGEDIR}${DATADIR}/COPYING* \
+		${STAGEDIR}${DATADIR}/README*
+
+.include <bsd.port.mk>
diff --git a/games/trigger/distinfo b/games/trigger-data/distinfo
index 9d160df64b2d..5a0d8bdf328f 100644
--- a/games/trigger/distinfo
+++ b/games/trigger-data/distinfo
@@ -1,4 +1,2 @@
-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-data/pkg-descr
index d1526b283ce1..d1526b283ce1 100644
--- a/games/trigger/pkg-descr
+++ b/games/trigger-data/pkg-descr
diff --git a/games/trigger/pkg-plist b/games/trigger-data/pkg-plist
index b6a0e10737ed..4ea225f98b33 100644
--- a/games/trigger/pkg-plist
+++ b/games/trigger-data/pkg-plist
@@ -1,4 +1,3 @@
-bin/trigger
 %%DATADIR%%/events/triggercup/bigjump/colormap.jpg
 %%DATADIR%%/events/triggercup/bigjump/foliagemap.png
 %%DATADIR%%/events/triggercup/bigjump/heightmap.png
diff --git a/games/trigger-rally/Makefile b/games/trigger-rally/Makefile
new file mode 100644
index 000000000000..49e2edeaeee9
--- /dev/null
+++ b/games/trigger-rally/Makefile
@@ -0,0 +1,42 @@
+# Created by: Jean-Yves Lefort <jylefort@brutele.be>
+# $FreeBSD$
+
+PORTNAME=	trigger-rally
+PORTVERSION=	0.6.0
+PORTREVISION=	4
+CATEGORIES=	games
+MASTER_SITES=	SF/trigger-rally/trigger-rally/trigger-${PORTVERSION}
+DISTVERSIONSUFFIX=	-src
+
+MAINTAINER=	makc@FreeBSD.org
+COMMENT=	Rally car racing game
+
+BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
+LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs
+RUN_DEPENDS=	${DATADIR}/trigger.config.defs:${PORTSDIR}/games/trigger-data
+
+USES=		openal:al,alut tar:bzip2
+USE_SDL=	sdl image
+USE_GL=		glu
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--datadir=${DATADIR} \
+		--with-libAlut=${LOCALBASE} \
+		--with-libPhysFS=${LOCALBASE}
+
+DESKTOP_ENTRIES="Trigger" "" "" \
+		"trigger" "" false
+
+PLIST_FILES=	bin/trigger
+PORTDOCS=	README-stereo.txt README.txt
+
+OPTIONS_DEFINE=	DOCS
+
+do-build:
+	@cd ${BUILD_WRKSRC} && ${LOCALBASE}/bin/jam
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/trigger ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/games/trigger-rally/distinfo b/games/trigger-rally/distinfo
new file mode 100644
index 000000000000..40d261c58c86
--- /dev/null
+++ b/games/trigger-rally/distinfo
@@ -0,0 +1,2 @@
+SHA256 (trigger-rally-0.6.0-src.tar.bz2) = dc818f359fff71a8ba5e147886f233cca6478e5b007ef0a38a2974cca855a662
+SIZE (trigger-rally-0.6.0-src.tar.bz2) = 333977
diff --git a/games/trigger-rally/pkg-descr b/games/trigger-rally/pkg-descr
new file mode 100644
index 000000000000..d1526b283ce1
--- /dev/null
+++ b/games/trigger-rally/pkg-descr
@@ -0,0 +1,7 @@
+Trigger is a free rally car racing game. Fun for all the family! You
+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://trigger-rally.sourceforge.net
diff --git a/games/trigger/Makefile b/games/trigger/Makefile
deleted file mode 100644
index 824b5b672d8d..000000000000
--- a/games/trigger/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# Created by: Jean-Yves Lefort <jylefort@brutele.be>
-# $FreeBSD$
-
-PORTNAME=	trigger
-PORTVERSION=	0.6.0
-PORTREVISION=	3
-CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}-rally/${PORTNAME}-rally/${PORTNAME}-${PORTVERSION}
-DISTFILES=	trigger-rally-${PORTVERSION}-src${EXTRACT_SUFX} \
-		trigger-rally-${DATAVERSION}-data${EXTRACT_SUFX}
-
-MAINTAINER=	makc@FreeBSD.org
-COMMENT=	Rally car racing game
-
-BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
-LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs
-
-USES=		openal:al,alut tar:bzip2
-USE_SDL=	sdl image
-USE_GL=		glu
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
-WRKSRC=		${WRKDIR}/trigger-rally-${PORTVERSION}-src
-DATASRC=	${WRKDIR}/trigger-rally-${DATAVERSION}-data
-
-DATAVERSION=	0.6.0
-
-DESKTOP_ENTRIES="Trigger" "${COMMENT}" "" \
-		"trigger" "" false
-
-PORTDOCS=	README-stereo.txt README.txt
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|SDL/||' \
-		${WRKSRC}/src/trigger/main.cpp \
-		${WRKSRC}/src/pengine/texture.cpp
-	@${REINPLACE_CMD} -e 's|\$${prefix}/share|${DATADIR}|; \
-		s|-lopenal|& -lalut|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-O3||' ${WRKSRC}/Jamrules
-
-do-build:
-	@cd ${BUILD_WRKSRC} && ${LOCALBASE}/bin/jam
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/trigger ${STAGEDIR}${PREFIX}/bin
-
-	${MKDIR} ${STAGEDIR}${DATADIR}
-.for d in events fonts maps plugins sounds textures vehicles
-	cd ${DATASRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}
-.endfor
-	${INSTALL_DATA} ${DATASRC}/trigger.config.defs ${STAGEDIR}${DATADIR}
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>