Update to upstream version 0.6.5; new maintainer

PR:		217513
Submitted by:	alfix86@gmail.com (new maintainer)
Reviewed by:	riggs

5 files changed, 80 insertions, 24 deletions

diff --git a/games/trigger-rally/Makefile b/games/trigger-rally/Makefile
index d5fb0e099136..1b4210c801d0 100644
--- a/games/trigger-rally/Makefile
+++ b/games/trigger-rally/Makefile
@@ -2,40 +2,47 @@
 # $FreeBSD$
 
 PORTNAME=	trigger-rally
-PORTVERSION=	0.6.1
-DISTVERSIONSUFFIX=	-src
+PORTVERSION=	0.6.5
 CATEGORIES=	games
 MASTER_SITES=	SF/trigger-rally/trigger-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alfix86@gmail.com
 COMMENT=	Rally car racing game
 
-BUILD_DEPENDS=	jam:devel/jam
-LIB_DEPENDS=	libphysfs.so:devel/physfs
-RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/trigger.config.defs:games/trigger-data
+LICENSE=	GPLv2
 
-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}
+LIB_DEPENDS=	libphysfs.so:devel/physfs
+LIB_DEPENDS+=	libalut.so:audio/freealut
 
-DESKTOP_ENTRIES="Trigger" "" "trigger" \
-		"trigger" "" false
+WRKSRC_SUBDIR=	src
+USES=		gmake openal:al,alut
+USE_SDL=	sdl2 image2
+USE_GL=		glu gl glew
+MAKEFILE=	GNUmakefile
+ALL_TARGET=	build
 
-PLIST_FILES=	bin/trigger
-PORTDOCS=	README-stereo.txt README.txt
+WORKINGSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+DATADIR=	${PREFIX}/share/games/trigger-rally
 
-OPTIONS_DEFINE=	DOCS
+DESKTOP_ENTRIES="Trigger" "" "trigger" \
+		"trigger-rally" "" false
 
-do-build:
-	@cd ${BUILD_WRKSRC} && ${LOCALBASE}/bin/jam
+PORTDOCS=	README-stereo.txt README.txt DATA_AUTHORS.txt
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/trigger ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WORKINGSRC}/bin/trigger-rally ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	cd ${WORKINGSRC}/bin && ${CP} trigger-rally.config.defs ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	cd ${WORKINGSRC}/doc && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	cd ${WORKINGSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+.for i in 16 22 24 32 36 48 64 72 96 128 192 256
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/ && \
+	${MV} ${STAGEDIR}${DATADIR}/icon/trigger-${i}.png \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/trigger.png
+.endfor
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ && \
+	${MV} ${STAGEDIR}${DATADIR}/icon/trigger-rally-icons.svg \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/trigger-rally-icons.svg
 
 .include <bsd.port.mk>
diff --git a/games/trigger-rally/distinfo b/games/trigger-rally/distinfo
index 9db77a0d510e..0237709aee7b 100644
--- a/games/trigger-rally/distinfo
+++ b/games/trigger-rally/distinfo
@@ -1,2 +1,3 @@
-SHA256 (trigger-rally-0.6.1-src.tar.bz2) = 5ac2d2cbaa5aa472abd99e76aefa2cec3389accbfe79e441af94f15568336bbb
-SIZE (trigger-rally-0.6.1-src.tar.bz2) = 368032
+TIMESTAMP = 1488474378
+SHA256 (trigger-rally-0.6.5.tar.gz) = f2db8784d8c0dd51c7a2812a9d294db05bb2e9df992038b3a232060dba26ba24
+SIZE (trigger-rally-0.6.5.tar.gz) = 82290843
diff --git a/games/trigger-rally/files/patch-GNUmakefile b/games/trigger-rally/files/patch-GNUmakefile
new file mode 100644
index 000000000000..db931b65efca
--- /dev/null
+++ b/games/trigger-rally/files/patch-GNUmakefile
@@ -0,0 +1,17 @@
+--- GNUmakefile.orig	2016-11-05 17:27:10 UTC
++++ GNUmakefile
+@@ -125,7 +125,7 @@ $(TR_EXEFILE): $(OBJFILES)
+ 		printf "\t%s\n" $$file; \
+ 		done;
+ 	@printf "\t-> %s\n" $@
+-	@$(CXX) -o $@ $(OBJFILES) $(LDFLAGS)
++	@$(CXX) `sdl2-config --libs`  -o $@ $(OBJFILES) $(LDFLAGS)
+ 	@printf "strip\t%s\n" $@
+ 	@strip $@
+ 
+@@ -155,4 +155,4 @@ clean:
+ #
+ %.o: %.cpp GNUmakefile
+ 	@printf "%s\t%s -> %s\n" $(CXX) $< $@
+-	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MMD -MP -c $< -o $@
++	@$(CXX) `sdl2-config --cflags` $(CXXFLAGS) $(CPPFLAGS) -MMD -MP -c $< -o $@
diff --git a/games/trigger-rally/files/patch-Trigger_main.cpp b/games/trigger-rally/files/patch-Trigger_main.cpp
new file mode 100644
index 000000000000..704f7fc8b437
--- /dev/null
+++ b/games/trigger-rally/files/patch-Trigger_main.cpp
@@ -0,0 +1,11 @@
+--- Trigger/main.cpp.orig	2017-03-02 19:21:27 UTC
++++ Trigger/main.cpp
+@@ -469,7 +469,7 @@ void MainApp::loadConfig()
+   if (!PHYSFS_exists(cfgfilename.c_str())) {
+ #ifdef UNIX
+     const std::vector<std::string> cfghidingplaces {
+-        "/usr/share/games/trigger-rally/"
++        "/usr/local/share/games/trigger-rally/"
+     };
+ 
+     for (const std::string &cfgpath: cfghidingplaces)
diff --git a/games/trigger-rally/pkg-plist b/games/trigger-rally/pkg-plist
new file mode 100644
index 000000000000..fb42059018e5
--- /dev/null
+++ b/games/trigger-rally/pkg-plist
@@ -0,0 +1,20 @@
+bin/trigger-rally
+%%DATADIR%%/data.md5
+%%DATADIR%%/data.zip
+%%DATADIR%%/icon/trigger-rally-win.ico
+%%DATADIR%%/trigger-rally.config.defs
+share/icons/hicolor/128x128/apps/trigger.png
+share/icons/hicolor/16x16/apps/trigger.png
+share/icons/hicolor/192x192/apps/trigger.png
+share/icons/hicolor/22x22/apps/trigger.png
+share/icons/hicolor/24x24/apps/trigger.png
+share/icons/hicolor/256x256/apps/trigger.png
+share/icons/hicolor/32x32/apps/trigger.png
+share/icons/hicolor/36x36/apps/trigger.png
+share/icons/hicolor/48x48/apps/trigger.png
+share/icons/hicolor/64x64/apps/trigger.png
+share/icons/hicolor/72x72/apps/trigger.png
+share/icons/hicolor/96x96/apps/trigger.png
+share/icons/hicolor/scalable/apps/trigger-rally-icons.svg
+@dir %%DATADIR%%/defplayers
+@dir %%DATADIR%%/plugins