pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openfodder: Import openfodder-1.0.0 as wip/openfodder



Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Thu May 12 22:33:49 2016 +0200
Changeset:	2a291d6853556168d6ea8abab9b0f3fa83a6fdf7

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

Log Message:
openfodder: Import openfodder-1.0.0 as wip/openfodder

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

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

diffstat:
 Makefile                                   |   1 +
 openfodder/DESCR                           |  24 +++++++
 openfodder/Makefile                        |  46 ++++++++++++
 openfodder/PLIST                           | 112 +++++++++++++++++++++++++++++
 openfodder/distinfo                        |   7 ++
 openfodder/patches/patch-Source_stdafx.cpp |  26 +++++++
 6 files changed, 216 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 687974e..3fda6a9 100644
--- a/Makefile
+++ b/Makefile
@@ -2203,6 +2203,7 @@ SUBDIR+=	openclonk
 SUBDIR+=	opendchub
 SUBDIR+=	opendylan
 SUBDIR+=	openerp-server
+SUBDIR+=	openfodder
 SUBDIR+=	openh264
 SUBDIR+=	openjdk8-openjfx
 SUBDIR+=	openlogos
diff --git a/openfodder/DESCR b/openfodder/DESCR
new file mode 100644
index 0000000..1d8333c
--- /dev/null
+++ b/openfodder/DESCR
@@ -0,0 +1,24 @@
+Cannon Fodder is an action-strategy shoot 'em up game developed by
+Sensible Software and published by Virgin Interactive.  The game
+is military-themed and based on shooting action but with a strategy
+game-style control system. The player directs troops through numerous
+missions, battling enemy infantry, vehicles and installations.
+
+Open Fodder requires the user to own a copy of Cannon Fodder, and
+to copy the data files into the game data directory.  At present,
+it supports 3 versions:
+
+1) Dos Retail CD Version Copy 'CF_ENG.DAT' from the CD to the
+Data/Dos_CD folder
+
+2) Amiga Retail Use the WHDLoad installer on an Amiga to extract
+the game files, and copy all the extracted files into the Data/Amiga
+folder
+
+3) Amiga CD32 Retail Copy the files from the 'Fodder' folder on
+the CD-Rom, to the Data/Amiga_CD folder. For the final video,
+Extract Track2 from the CD and name it 'Track2.flv', placed in the
+Amiga_CD folder.
+
+Open Fodder includes the Amiga Format Christmas Special and Amiga
+Power Issue #31 Demo.
diff --git a/openfodder/Makefile b/openfodder/Makefile
new file mode 100644
index 0000000..8835403
--- /dev/null
+++ b/openfodder/Makefile
@@ -0,0 +1,46 @@
+# $NetBSD$
+
+GITHUB_PROJECT=	openfodder
+DISTNAME=	1.0.0
+PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_GITHUB:=segrax/}
+DIST_SUBDIR=	${GITHUB_PROJECT}
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	${MASTER_SITE_GITHUB:=segrax/openfodder/}
+COMMENT=	Engine for the Cannon Fodder game
+LICENSE=	gnu-gpl-v3
+
+WRKSRC=		${WRKDIR}/openfodder-1.0.0
+USE_LANGUAGES=	c++
+
+CXXFLAGS+=	-std=c++0x
+CXXFLAGS+=	-D OPENFODDER_DATADIR=\"${PREFIX}/share/openfodder\"
+CXXFLAGS+=	-I${WRKSRC}/Source
+CXXFLAGS+=	`sdl2-config --cflags`
+LIBS+=		`sdl2-config --libs`
+LIBS+=		-lSDL2_mixer
+LIBS+=		${X11_LDFLAGS}
+
+FODDER_SRCDIRS=	Source Source/PC Source/Amiga
+FODDER_SRCS=	${FODDER_SRCDIRS:=/*.cpp}
+
+INSTALLATION_DIRS+=	bin share/openfodder
+
+do-build:
+	cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -o OpenFodder ${FODDER_SRCS} ${LIBS}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/OpenFodder ${DESTDIR}${PREFIX}/bin
+	cd ${WRKSRC}/Run && ${FIND} . -type d | while read d; do \
+		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/openfodder/$$d || exit 1; \
+	done
+	cd ${WRKSRC}/Run && ${FIND} . -type f | while read f; do \
+		${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/share/openfodder/$${f%/*} || exit 1; \
+	done
+
+.include "../../audio/SDL2_mixer/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/openfodder/PLIST b/openfodder/PLIST
new file mode 100644
index 0000000..547fc44
--- /dev/null
+++ b/openfodder/PLIST
@@ -0,0 +1,112 @@
+@comment $NetBSD$
+bin/OpenFodder
+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/_AmigaFormatDataHere
+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/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/Saves/_SavesHere
diff --git a/openfodder/distinfo b/openfodder/distinfo
new file mode 100644
index 0000000..11f8269
--- /dev/null
+++ b/openfodder/distinfo
@@ -0,0 +1,7 @@
+$NetBSD$
+
+SHA1 (openfodder/1.0.0.tar.gz) = 4e764a879609958296a2bfdee0c722a0405a5847
+RMD160 (openfodder/1.0.0.tar.gz) = ecf75571653edc2cf5aa97539897e578ee15f0fc
+SHA512 (openfodder/1.0.0.tar.gz) = db94a0873f6ac119a9e7fc9355a27c1765d5b6ef1c949a7202cd66da1bb94a8a986cd3c3a9b3b49936bac27409cb9d6f8eb094b64dcfc443d52b3a4db39a3b48
+Size (openfodder/1.0.0.tar.gz) = 34387003 bytes
+SHA1 (patch-Source_stdafx.cpp) = cfac2ac52d190d80c2e361271f8bce3ee5da34b5
diff --git a/openfodder/patches/patch-Source_stdafx.cpp b/openfodder/patches/patch-Source_stdafx.cpp
new file mode 100644
index 0000000..064a10f
--- /dev/null
+++ b/openfodder/patches/patch-Source_stdafx.cpp
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Check argc before accessing argv.
+
+Use PREFIX when searching for data.
+
+--- ./Source/stdafx.cpp.orig	2015-11-08 06:10:34.000000000 +0000
++++ ./Source/stdafx.cpp
+@@ -32,7 +32,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] );
+ 		}
+ 	}
+@@ -51,6 +51,8 @@ int main(int argc, char *args[]) {
+ std::string local_PathGenerate( const std::string& pFile, const std::string& pPath, bool pData = true ) {
+ 	std::stringstream	 filePathFinal;
+ 
++	filePathFinal << OPENFODDER_DATADIR << "/";
++
+ 	if (pData)
+ 		filePathFinal << "Data/";
+ 	else


Home | Main Index | Thread Index | Old Index