commandergenius: update to Commander-Genius-2.2.1

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sat Apr 21 01:04:20 2018 +0200
Changeset:	e6aa239bd22ba9b6f2769148bcbdfa846aefdb9c

Modified Files:
	commandergenius/Makefile
	commandergenius/distinfo
Added Files:
	commandergenius/patches/patch-src_engine_unzip_miniunz.c

Log Message:
commandergenius: update to Commander-Genius-2.2.1

Changelog:

v2.2.1:
-------
- Thumb animation
- Code for settings that can be opened when in game launcher

v2.2.0:
-------
- Cleaned Repository
- More unified Menu for both Galaxy and Vorticon games
- Faster Builds
- Many bug fixes
- Player selection in Keen 4 Plus. Play as Lindsey, Council or Kyle
- Different character in Multiplayer mode
- Added support for Mod, Midi and FLAC
- Improved virtual gamepad for mobile version yet to come

v2.1.2:
-------
- Load Bitmap fixes
- Sprite selection screen when Single player mode (Galaxy)

v2.1.1:
-------
- Sprite Refinements (Galaxy)

v2.1.0:
-------
- lots of tidy ups in the menu code. Now a very unified menu is used
  for both vorticon and galaxy keen. This reduced the code by many previously copied
  files.
- More python support. First mod using no Exe file uses python scripts
  for the engine, MoMGalaxy. Now it has some more features more to the original
  Keen and less glitches.

v2.0.8:
-------
- More cleanups, improved audio volume management.

v2.0.7:
-------
- More Audio fixes, cleaned up code, less crashes

v2.0.6:
-------
- Full integration of SDL_mixer, IMF fixes. Now it sounds a bit better.
- Audio Code cleanups
- Improve CMake scripts
- Fixed some crashes

v2.0.5:
-------
- SDL_mixer added which fixes many problems

v2.0.2:
-------
- Bug fixes basically
- Bug that same music was loaded in all the levels fixed

v2.0.1:
-------
- Path fixes under windows
- Updated GsKit

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

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

diffstat:
 commandergenius/Makefile                           | 13 ++----
 commandergenius/distinfo                           | 13 +++---
 .../patches/patch-src_engine_unzip_miniunz.c       | 46 ++++++++++++++++++++++
 3 files changed, 55 insertions(+), 17 deletions(-)

diffs:
diff --git a/commandergenius/Makefile b/commandergenius/Makefile
index 8fbf1f8e53..7e2e47c1c9 100644
--- a/commandergenius/Makefile
+++ b/commandergenius/Makefile
@@ -2,15 +2,11 @@
 
 GITHUB_PROJECT=	Commander-Genius
 DISTNAME=	${GITHUB_TAG}
-PKGNAME=	${GITHUB_PROJECT}-2.0.0
+PKGNAME=	${GITHUB_PROJECT}-${GITHUB_TAG:S/^v//}
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=gerstrong/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
-GITHUB_TAG=	v200Release
-DISTFILES=	${DEFAULT_DISTFILES} GsKit-${GSKIT_VER}.tar.gz
-GSKIT_VER=	f925d1362f0bc99598141a97d5a200d5e6a41391
-SITES.GsKit-${GSKIT_VER}.tar.gz= \
-		-https://github.com/gerstrong/GsKit/archive/${GSKIT_VER}.tar.gz
+GITHUB_TAG=	v2.2.1
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://clonekeenplus.sourceforge.net/
@@ -31,9 +27,6 @@ INSTALLATION_DIRS=	bin share/doc/commandergenius
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-post-extract:
-	${MV} ${WRKDIR}/GsKit-${GSKIT_VER}/* ${WRKSRC}/GsKit/
-
 post-install:
 	cd ${WRKSRC}/vfsroot && ${FIND} . -type d | while read d; do \
 		${INSTALL_DATA_DIR} "${DESTDIR}${PREFIX}/share/commandergenius/$$d" || exit 1; \
@@ -43,8 +36,10 @@ post-install:
 	done
 
 .include "options.mk"
+.include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/SDL2_image/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/commandergenius/distinfo b/commandergenius/distinfo
index 3cba4ff5a6..f73eea6f41 100644
--- a/commandergenius/distinfo
+++ b/commandergenius/distinfo
@@ -1,13 +1,10 @@
 $NetBSD: distinfo,v 1.1 2015/08/19 21:21:53 yhardy Exp $
 
-SHA1 (Commander-Genius/GsKit-f925d1362f0bc99598141a97d5a200d5e6a41391.tar.gz) = 9f3985033da709ea704814d32da40f7c9a8fb5c5
-RMD160 (Commander-Genius/GsKit-f925d1362f0bc99598141a97d5a200d5e6a41391.tar.gz) = 7719e5c889337e8135eb67fb76bddb3640060134
-SHA512 (Commander-Genius/GsKit-f925d1362f0bc99598141a97d5a200d5e6a41391.tar.gz) = e13784f2fd2f3f21ce9b0bd6123168df47f02958155ca4f1d77d3bc4c6805d46caa9ae15e067c692e38befbb68e5be45bfbd429ae4f7b8d3e07353a8e08e6740
-Size (Commander-Genius/GsKit-f925d1362f0bc99598141a97d5a200d5e6a41391.tar.gz) = 182611 bytes
-SHA1 (Commander-Genius/v200Release.tar.gz) = 704a791ffdac7c4671f384e4723e8f9f4582b086
-RMD160 (Commander-Genius/v200Release.tar.gz) = a8600a64878b537993e7d5e0a44ce9d8f8f96f06
-SHA512 (Commander-Genius/v200Release.tar.gz) = 09ecab0af219c58a3611a1ad7563da863f050861b124eb4c53e19c8d7929d5f3eb58f42f5754f893b0df54c56b427d5bafcec491a74b511f26d6e8183649d6f9
-Size (Commander-Genius/v200Release.tar.gz) = 60764172 bytes
+SHA1 (Commander-Genius/v2.2.1.tar.gz) = c4dc168ea443ff4ae69dd787121c12dc13267091
+RMD160 (Commander-Genius/v2.2.1.tar.gz) = 102e64bff29c09daebf975d476715c48ce817a86
+SHA512 (Commander-Genius/v2.2.1.tar.gz) = c593dd9e0f8ababadbefeab9f5467fd8499ee36b03fb989d6ee19b5a68e84be208bebf2071db91babad74187dce020cf8e35e61e42c6cd627f81dda484e28270
+Size (Commander-Genius/v2.2.1.tar.gz) = 61044202 bytes
 SHA1 (patch-GsKit_base_video_scaler_scalebit.cpp) = 390a892f4bdece12bcb6b36f84dee5ac2cec0c90
 SHA1 (patch-src_engine_unzip_ioapi.h) = 80366fc999aae516da6ce0279e8049532c3df247
+SHA1 (patch-src_engine_unzip_miniunz.c) = 8c83c6e2e927e587533d248cb478797c3e15eae7
 SHA1 (patch-src_install.cmake) = d40e5bf407429eb54c6cb6970a5b23963e55d2a3
diff --git a/commandergenius/patches/patch-src_engine_unzip_miniunz.c b/commandergenius/patches/patch-src_engine_unzip_miniunz.c
new file mode 100644
index 0000000000..2fc581bf83
--- /dev/null
+++ b/commandergenius/patches/patch-src_engine_unzip_miniunz.c
@@ -0,0 +1,46 @@
+$NetBSD$
+
+Need sys/stat.h for mkdir.
+Use the unix methods for !WIN32
+
+--- src/engine/unzip/miniunz.c.orig	2018-04-14 07:26:16.000000000 +0000
++++ src/engine/unzip/miniunz.c
+@@ -45,6 +45,7 @@
+ #include <time.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <sys/stat.h>
+ 
+ #ifdef _WIN32
+ # include <direct.h>
+@@ -97,7 +98,6 @@ void change_file_date(filename,dosdate,t
+   SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
+   CloseHandle(hFile);
+ #else
+-#if defined(linux) || defined(__APPLE__)
+   struct utimbuf ut;
+   struct tm newdate;
+   newdate.tm_sec = tmu_date.tm_sec;
+@@ -114,7 +114,6 @@ void change_file_date(filename,dosdate,t
+   ut.actime=ut.modtime=mktime(&newdate);
+   utime(filename,&ut);
+ #endif
+-#endif
+ }
+ 
+ 
+@@ -127,13 +126,7 @@ int mymkdir(dirname)
+     int ret=0;
+ #if defined(WIN32) || defined(_WIN32)
+     ret = _mkdir(dirname);
+-#endif
+-
+-#if defined(__linux__) || __linux__
+-    ret = mkdir (dirname,0775);
+-#endif
+-
+-#if defined(__APPLE__)
++#else
+     ret = mkdir (dirname,0775);
+ #endif
+     return ret;