openfodder: update to openfodder-1.5

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: openfodder: update to openfodder-1.5
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Tue, 11 Dec 2018 18:48:09 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Tue Dec 11 20:48:09 2018 +0200
Changeset:	f2c2eb63f04c9f7404ee2f206e344e5df42e0596

Modified Files:
	openfodder/Makefile
	openfodder/PLIST
	openfodder/distinfo
	openfodder/patches/patch-Source_stdafx.cpp

Log Message:
openfodder: update to openfodder-1.5

pkgsrc changes: make a separate package for the data
No changelog provided.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f2c2eb63f04c9f7404ee2f206e344e5df42e0596

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openfodder/Makefile                        |  22 ++----
 openfodder/PLIST                           | 122 +----------------------------
 openfodder/distinfo                        |  18 ++---
 openfodder/patches/patch-Source_stdafx.cpp |  51 +++++-------
 4 files changed, 38 insertions(+), 175 deletions(-)

diffs:
diff --git a/openfodder/Makefile b/openfodder/Makefile
index 78853fc432..e6e42aa432 100644
--- a/openfodder/Makefile
+++ b/openfodder/Makefile
@@ -1,18 +1,14 @@
 # $NetBSD$
 
 GITHUB_PROJECT=	openfodder
-DISTNAME=	1.4.0
+DISTNAME=	1.5
 PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_GITHUB:=segrax/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=OpenFodder/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
-DISTFILES=	${DEFAULT_DISTFILES}
-DISTFILES+=	data-${PKGVERSION_NOREV}.zip
-SITES.data-1.4.0.zip= \
-		-https://github.com/OpenFodder/data/releases/download/1.4/OpenFodder.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/segrax/openfodder/
+HOMEPAGE=	http://openfodder.com
 COMMENT=	Engine for the Cannon Fodder game
 LICENSE=	gnu-gpl-v3
 
@@ -26,22 +22,20 @@ LIBS+=		`sdl2-config --libs`
 LIBS+=		-lSDL2_mixer
 LIBS+=		${X11_LDFLAGS}
 
+DEPENDS+=	openfodder-data-${DISTNAME}:../../wip/openfodder-data
+
 FODDER_SRCDIRS=	Source Source/Amiga Source/PC Source/Structures
 FODDER_SRCS=	${FODDER_SRCDIRS:=/*.cpp}
 
-INSTALLATION_DIRS+=	bin share/OpenFodder
+INSTALLATION_DIRS+=	bin share/doc/OpenFodder
 
 do-build:
+	${ECHO} 'const char* gitversion="pkgsrc-${PKGVERSION_NOREV}";' > ${WRKSRC}/Source/gitver.hpp
 	cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -o OpenFodder ${FODDER_SRCS} ${LIBS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/OpenFodder ${DESTDIR}${PREFIX}/bin
-	cd ${WRKDIR}/OpenFodder && ${FIND} . -type d | while read d; do \
-		${INSTALL_DATA_DIR} "${DESTDIR}${PREFIX}/share/OpenFodder/$$d" || exit 1; \
-	done
-	cd ${WRKDIR}/OpenFodder && ${FIND} . -type f | while read f; do \
-		${INSTALL_DATA} "$$f" "${DESTDIR}${PREFIX}/share/OpenFodder/$${f%/*}" || exit 1; \
-	done
+	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/OpenFodder/
 
 .include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
diff --git a/openfodder/PLIST b/openfodder/PLIST
index 7617d01421..da4e671281 100644
--- a/openfodder/PLIST
+++ b/openfodder/PLIST
@@ -1,123 +1,3 @@
 @comment $NetBSD$
 bin/OpenFodder
-share/OpenFodder/Campaigns/Amiga Format Christmas Special.ofc
-share/OpenFodder/Campaigns/Cannon Fodder 2.ofc
-share/OpenFodder/Campaigns/Cannon Fodder Plus.ofc
-share/OpenFodder/Campaigns/Cannon Fodder.ofc
-share/OpenFodder/Campaigns/segras.ofc
-share/OpenFodder/Campaigns/segras/alessandro.map
-share/OpenFodder/Campaigns/segras/alessandro.spt
-share/OpenFodder/Campaigns/segras/segras first.map
-share/OpenFodder/Campaigns/segras/segras first.spt
-share/OpenFodder/Data/Amiga/_AmigaDataHere
-share/OpenFodder/Data/AmigaFormat_XMAS/AFXBASE.BLK
-share/OpenFodder/Data/AmigaFormat_XMAS/AFXBASE.INS
-share/OpenFodder/Data/AmigaFormat_XMAS/AFXBASE.SNG
-share/OpenFodder/Data/AmigaFormat_XMAS/AFXSUB0.BLK
-share/OpenFodder/Data/AmigaFormat_XMAS/afxarmy.lbm
-share/OpenFodder/Data/AmigaFormat_XMAS/afxbase.bht
-share/OpenFodder/Data/AmigaFormat_XMAS/afxbase.hit
-share/OpenFodder/Data/AmigaFormat_XMAS/afxbase.pal
-share/OpenFodder/Data/AmigaFormat_XMAS/afxbase.swp
-share/OpenFodder/Data/AmigaFormat_XMAS/afxcopt.lbm
-share/OpenFodder/Data/AmigaFormat_XMAS/afxsub0.bht
-share/OpenFodder/Data/AmigaFormat_XMAS/afxsub0.hit
-share/OpenFodder/Data/AmigaFormat_XMAS/afxsub0.swp
-share/OpenFodder/Data/AmigaFormat_XMAS/apmenu.lbm
-share/OpenFodder/Data/AmigaFormat_XMAS/mapm1.map
-share/OpenFodder/Data/AmigaFormat_XMAS/mapm1.spt
-share/OpenFodder/Data/AmigaFormat_XMAS/mapm2.map
-share/OpenFodder/Data/AmigaFormat_XMAS/mapm2.spt
-share/OpenFodder/Data/AmigaFormat_XMAS/pstuff.lbm
-share/OpenFodder/Data/Amiga_CD/_AmigaCD32DataHere
-share/OpenFodder/Data/Custom/Maps/Segras First.map
-share/OpenFodder/Data/Custom/Maps/Segras First.spt
-share/OpenFodder/Data/Dos2_CD/_Dos2CDDataHere
-share/OpenFodder/Data/Dos_CD/_DosCDDataHere
-share/OpenFodder/Data/Plus/1.lbm
-share/OpenFodder/Data/Plus/10.lbm
-share/OpenFodder/Data/Plus/11.lbm
-share/OpenFodder/Data/Plus/2.lbm
-share/OpenFodder/Data/Plus/3.lbm
-share/OpenFodder/Data/Plus/4.lbm
-share/OpenFodder/Data/Plus/5.lbm
-share/OpenFodder/Data/Plus/6.lbm
-share/OpenFodder/Data/Plus/7.lbm
-share/OpenFodder/Data/Plus/8.lbm
-share/OpenFodder/Data/Plus/9.lbm
-share/OpenFodder/Data/Plus/apmenu.lbm
-share/OpenFodder/Data/Plus/junarmy.lbm
-share/OpenFodder/Data/Plus/junbase.bht
-share/OpenFodder/Data/Plus/junbase.blk
-share/OpenFodder/Data/Plus/junbase.hit
-share/OpenFodder/Data/Plus/junbase.ins
-share/OpenFodder/Data/Plus/junbase.pal
-share/OpenFodder/Data/Plus/junbase.sng
-share/OpenFodder/Data/Plus/junbase.swp
-share/OpenFodder/Data/Plus/juncopt.lbm
-share/OpenFodder/Data/Plus/junsub1.bht
-share/OpenFodder/Data/Plus/junsub1.blk
-share/OpenFodder/Data/Plus/junsub1.hit
-share/OpenFodder/Data/Plus/junsub1.swp
-share/OpenFodder/Data/Plus/mapm1.map
-share/OpenFodder/Data/Plus/mapm1.spt
-share/OpenFodder/Data/Plus/mapm2.map
-share/OpenFodder/Data/Plus/mapm2.spt
-share/OpenFodder/Data/Plus/mapm3.map
-share/OpenFodder/Data/Plus/mapm3.spt
-share/OpenFodder/Data/Plus/mapm4.map
-share/OpenFodder/Data/Plus/mapm4.spt
-share/OpenFodder/Data/Plus/pstuff.lbm
-share/OpenFodder/Data/WAV/rjp.DESBASE(1).wav
-share/OpenFodder/Data/WAV/rjp.DESBASE(2).wav
-share/OpenFodder/Data/WAV/rjp.DESBASE(3).wav
-share/OpenFodder/Data/WAV/rjp.DESBASE(4).wav
-share/OpenFodder/Data/WAV/rjp.DESBASE(5).wav
-share/OpenFodder/Data/WAV/rjp.ICEBASE(1).wav
-share/OpenFodder/Data/WAV/rjp.ICEBASE(2).wav
-share/OpenFodder/Data/WAV/rjp.ICEBASE(3).wav
-share/OpenFodder/Data/WAV/rjp.ICEBASE(4).wav
-share/OpenFodder/Data/WAV/rjp.ICEBASE(5).wav
-share/OpenFodder/Data/WAV/rjp.INTBASE(1).wav
-share/OpenFodder/Data/WAV/rjp.INTBASE(2).wav
-share/OpenFodder/Data/WAV/rjp.INTBASE(3).wav
-share/OpenFodder/Data/WAV/rjp.INTBASE(4).wav
-share/OpenFodder/Data/WAV/rjp.INTBASE(5).wav
-share/OpenFodder/Data/WAV/rjp.INTBASE(6).wav
-share/OpenFodder/Data/WAV/rjp.INTBASE(7).wav
-share/OpenFodder/Data/WAV/rjp.JON(1).wav
-share/OpenFodder/Data/WAV/rjp.JON(10).wav
-share/OpenFodder/Data/WAV/rjp.JON(11).wav
-share/OpenFodder/Data/WAV/rjp.JON(12).wav
-share/OpenFodder/Data/WAV/rjp.JON(13).wav
-share/OpenFodder/Data/WAV/rjp.JON(14).wav
-share/OpenFodder/Data/WAV/rjp.JON(15).wav
-share/OpenFodder/Data/WAV/rjp.JON(16).wav
-share/OpenFodder/Data/WAV/rjp.JON(2).wav
-share/OpenFodder/Data/WAV/rjp.JON(3).wav
-share/OpenFodder/Data/WAV/rjp.JON(4).wav
-share/OpenFodder/Data/WAV/rjp.JON(5).wav
-share/OpenFodder/Data/WAV/rjp.JON(6).wav
-share/OpenFodder/Data/WAV/rjp.JON(7).wav
-share/OpenFodder/Data/WAV/rjp.JON(8).wav
-share/OpenFodder/Data/WAV/rjp.JON(9).wav
-share/OpenFodder/Data/WAV/rjp.JUNBASE(1).wav
-share/OpenFodder/Data/WAV/rjp.JUNBASE(2).wav
-share/OpenFodder/Data/WAV/rjp.JUNBASE(3).wav
-share/OpenFodder/Data/WAV/rjp.JUNBASE(4).wav
-share/OpenFodder/Data/WAV/rjp.JUNBASE(5).wav
-share/OpenFodder/Data/WAV/rjp.JUNBASE(6).wav
-share/OpenFodder/Data/WAV/rjp.JUNBASE(7).wav
-share/OpenFodder/Data/WAV/rjp.JUNBASE(8).wav
-share/OpenFodder/Data/WAV/rjp.MORBASE(1).wav
-share/OpenFodder/Data/WAV/rjp.MORBASE(2).wav
-share/OpenFodder/Data/WAV/rjp.MORBASE(3).wav
-share/OpenFodder/Data/WAV/rjp.MORBASE(4).wav
-share/OpenFodder/Data/WAV/rjp.MORBASE(5).wav
-share/OpenFodder/Data/WAV/rjp.MORBASE(6).wav
-share/OpenFodder/Data/WAV/rjp.MORBASE(7).wav
-share/OpenFodder/Data/WAV/rjp.MORBASE(8).wav
-share/OpenFodder/Data/WAV/rjp.WARX4(1).wav
-share/OpenFodder/Data/WAV/rjp.WARX4(2).wav
-share/OpenFodder/README.md
-share/OpenFodder/Saves/_SavesHere
+share/doc/OpenFodder/README.md
diff --git a/openfodder/distinfo b/openfodder/distinfo
index 106fc1a75b..22caf5893e 100644
--- a/openfodder/distinfo
+++ b/openfodder/distinfo
@@ -1,11 +1,11 @@
 $NetBSD$
 
-SHA1 (openfodder/1.4.0.tar.gz) = 266e9c53cbb17c2873b5875f066f173962caad44
-RMD160 (openfodder/1.4.0.tar.gz) = b6e48fcf0669fa6bc8f1009e085a2139f745232c
-SHA512 (openfodder/1.4.0.tar.gz) = 7242cb2809843f60e86494f34d007abe4973bbb895a60ec5de0790071fa6b8cf2023ca2f33cedab3472da8ee40348e4646190e544de10b90329a64298ee0ac4f
-Size (openfodder/1.4.0.tar.gz) = 331036 bytes
-SHA1 (openfodder/data-1.4.0.zip) = 6e19e158385ab9703656f6ce6522be1fb89f78fb
-RMD160 (openfodder/data-1.4.0.zip) = f0f95230b280fcf58f7abe9b0e762dec4dc22b4a
-SHA512 (openfodder/data-1.4.0.zip) = ee6c812be3f619460d5a1277b9e2d3fc2d4e3a1f195c19749823befe4fe5b861fefd87029ab0f1f48fcaae1693bd703658ca0b0e6581c8ec721dfe58d4c432ed
-Size (openfodder/data-1.4.0.zip) = 34426431 bytes
-SHA1 (patch-Source_stdafx.cpp) = a085c1868f11bbfd497f70c6abd240d83c4d496f
+SHA1 (openfodder/1.5.tar.gz) = c03491d226c33e4091bb048fac4aab3093d26259
+RMD160 (openfodder/1.5.tar.gz) = d8a868027f9199b0e2f002396b78cdd5fea77d98
+SHA512 (openfodder/1.5.tar.gz) = 2323384fe265a5eb795356da586eb47a748b238c1d8506e216383c94df449902fb726d13d6cd1d7e3ff6abafab8cc417ef2107754b521be9bdc6eb2ce0bd870e
+Size (openfodder/1.5.tar.gz) = 422711 bytes
+SHA1 (openfodder/Data.Pack.1.5.zip) = eef927b6803ac00fb15a87c347d51c4deaefa456
+RMD160 (openfodder/Data.Pack.1.5.zip) = 8f8cb3ae04b308aaf3fced11f8c20ff5f3b1eebb
+SHA512 (openfodder/Data.Pack.1.5.zip) = c37c586fc97c018ccdfb2d140b16529ae7942b4664a7e2ecc1ec22bcbff75af5ef41847576ba3743b56b2fb9faf2c6aea570f30cbf8af5c3c967bfcca2c8eddc
+Size (openfodder/Data.Pack.1.5.zip) = 34716145 bytes
+SHA1 (patch-Source_stdafx.cpp) = be4b9baa22d9b5750f8400ca6e913dac4a8e3e1c
diff --git a/openfodder/patches/patch-Source_stdafx.cpp b/openfodder/patches/patch-Source_stdafx.cpp
index 30c747f058..6bbd72d19e 100644
--- a/openfodder/patches/patch-Source_stdafx.cpp
+++ b/openfodder/patches/patch-Source_stdafx.cpp
@@ -1,41 +1,30 @@
 $NetBSD$
 
-Check argc before accessing argv.
-
 Use PREFIX when searching for data.
 
---- Source/stdafx.cpp.orig	2018-02-01 19:54:26.000000000 +0000
+--- Source/stdafx.cpp.orig	2018-12-11 09:43:06.000000000 +0000
 +++ Source/stdafx.cpp
-@@ -39,7 +39,7 @@ int main(int argc, char *args[]) {
- 		if (strcmp( args[1], "skipintro" ) == 0)
- 			SkipIntro = true;
- 
--		if (strcmp( args[2], "map" ) == 0) {
-+		if ((argc > 3) && strcmp( args[2], "map" ) == 0) {
- 			MapNumber = atoi( args[3] );
- 		}
- 	}
-@@ -110,14 +110,19 @@ std::string local_PathGenerate( const st
-             if (path) {
-                 FinalPath = path;
-                 FinalPath.append("/.local/share/");
-+                filePathFinal << FinalPath << "OpenFodder/";
-+                if (!local_FileExists(filePathFinal.str())) {
-+                    FinalPath = "";
-+                    filePathFinal.str("");
-+                }
-             }
+@@ -245,14 +245,19 @@ void local_BasePathGenerate() {
+         if (path) {
+             FinalPath = path;
+             FinalPath.append("/.local/share/");
++            filePathFinal << FinalPath << "OpenFodder/";
++            if (!local_FileExists(filePathFinal.str())) {
++                FinalPath = "";
++                filePathFinal.str("");
++            }
          }
+     }
  
-         // Fall back just incase
--        if(!FinalPath.size())
--            FinalPath = "/usr/local/share/";
+     // Fall back just incase
+-    if (!FinalPath.size())
+-        FinalPath = "/usr/local/share/";
 -
--        filePathFinal << FinalPath << "OpenFodder/";
-+        if(!FinalPath.size()) {
-+            FinalPath = OPENFODDER_DATADIR;
-+            filePathFinal << FinalPath << "OpenFodder/";
-+        }
+-    filePathFinal << FinalPath << "OpenFodder/";
++    if (!FinalPath.size()) {
++        FinalPath = OPENFODDER_DATADIR;
++        filePathFinal << FinalPath << "OpenFodder/";
++    }
  
-     #endif
+ #endif
Prev by Date: librsvg: one TODO done, one to go
Next by Date: dosbox-x: update to dosbox-x-0.82.12
Previous by Thread: librsvg: one TODO done, one to go
Next by Thread: dosbox-x: update to dosbox-x-0.82.12
Indexes:
Home | Main Index | Thread Index | Old Index