games/openfodder: update to 1.6.0

Changes:	https://github.com/OpenFodder/openfodder/releases/tag/1.6.0
Reported by:	GitHub (watch releases)

3 files changed, 20 insertions, 26 deletions

diff --git a/games/openfodder/Makefile b/games/openfodder/Makefile
index fecebb8245a6..0740c103b3f8 100644
--- a/games/openfodder/Makefile
+++ b/games/openfodder/Makefile
@@ -1,19 +1,25 @@
 # $FreeBSD$
 
 PORTNAME=	OpenFodder
-DISTVERSION=	1.5.3
+DISTVERSION=	1.6.0
 CATEGORIES=	games
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Open source port of Cannon Fodder
 
-LICENSE=	GPLv3+
-LICENSE_FILE=	${WRKSRC}/gpl-3.0.txt
+LICENSE=	BSD3CLAUSE GPLv3+ LGPL21+ MIT ZLIB
+LICENSE_COMB=	multi
+LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/COPYING.BSD.txt
+LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL21+ =	${WRKSRC}/COPYING.LGPLv2.1.txt
+LICENSE_FILE_MIT=	${WRKSRC}/COPYING.MIT.txt
+LICENSE_FILE_ZLIB=	${WRKSRC}/COPYING.ZLIB.txt
 
 USES=		compiler:c++14-lang sdl
 USE_GITHUB=	yes
 USE_SDL=	mixer2
-GH_TUPLE=	${PORTNAME}:data:1.6.0:data
+GH_TUPLE=	${PORTNAME}:data:1.7.0:data/Run \
+		${PORTNAME}:scripts:c6f3076:scripts/Run/Scripts
 GH_PROJECT=	${PORTNAME:tl}
 PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
@@ -39,7 +45,7 @@ post-patch:
 		-e 's,%%h,${DISTVERSIONFULL},' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's,/usr/local,${PREFIX},' \
-		${WRKSRC}/Source/stdafx.cpp
+		${WRKSRC}/Source/ResourceMan.cpp
 
 post-build-ICONS-on:
 	@for size in 16x16 24x24 32x32 48x48 57x57; do \
@@ -56,8 +62,8 @@ do-test:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Run/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
-	(cd ${WRKSRC_data} && ${COPYTREE_SHARE} "${PORTDATA}" \
-		${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC}/Run && ${COPYTREE_SHARE} "${PORTDATA}" \
+		 ${STAGEDIR}${DATADIR} "! -name ${PORTNAME} -type f")
 
 do-install-DOCS-on:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" \
diff --git a/games/openfodder/distinfo b/games/openfodder/distinfo
index b2484b426f7f..3dcae4d08071 100644
--- a/games/openfodder/distinfo
+++ b/games/openfodder/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1544863677
-SHA256 (OpenFodder-openfodder-1.5.3_GH0.tar.gz) = d9f40c4f85d38624a32f59450ee710825d82ee19ec5948faf67abc764c3f6799
-SIZE (OpenFodder-openfodder-1.5.3_GH0.tar.gz) = 424997
-SHA256 (OpenFodder-data-1.6.0_GH0.tar.gz) = 04368eea546de1ec17e875a9535d7d44b8e9cf587beba9fa7c5c06a750e10f45
-SIZE (OpenFodder-data-1.6.0_GH0.tar.gz) = 3385617
+TIMESTAMP = 1577825293
+SHA256 (OpenFodder-openfodder-1.6.0_GH0.tar.gz) = df2e6d9d82ed73340be8eea05ed0e26d5df4fbe64f7117aae66c39d7aa170843
+SIZE (OpenFodder-openfodder-1.6.0_GH0.tar.gz) = 1421940
+SHA256 (OpenFodder-data-1.7.0_GH0.tar.gz) = a5d39084e4d0e272ac8fa86f931e86923b70e8f84d9c01de47f8f0cd96909124
+SIZE (OpenFodder-data-1.7.0_GH0.tar.gz) = 3384943
+SHA256 (OpenFodder-scripts-c6f3076_GH0.tar.gz) = 3fbb82605c8bfbc3404220cee2044c368f0f82cdf23f9adcb6144e7743cf9c71
+SIZE (OpenFodder-scripts-c6f3076_GH0.tar.gz) = 50622
diff --git a/games/openfodder/files/patch-Source_stdafx.cpp b/games/openfodder/files/patch-Source_stdafx.cpp
deleted file mode 100644
index 4c1230a6b4bf..000000000000
--- a/games/openfodder/files/patch-Source_stdafx.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-Check DATADIR if ~/.local/share/ exists but lacks OpenFodder subdirectory.
-Allows to run demo on first launch on a common desktop.
-
---- Source/stdafx.cpp.orig	2018-12-15 08:47:57 UTC
-+++ Source/stdafx.cpp
-@@ -249,7 +249,7 @@ void local_BasePathGenerate() {
-     }
- 
-     // Fall back just incase
--    if (!FinalPath.size())
-+    if (!local_FileExists(FinalPath + "OpenFodder/"))
-         FinalPath = "/usr/local/share/";
- 
-     filePathFinal << FinalPath << "OpenFodder/";