vcmi: fix data path.

* add dependency on innoextract for vcmibuilder.

games-strategy/vcmi/patches/vcmi-0.99.patchset

@@ -1,4 +1,4 @@
-From a86a1589dca96679890a9e53214cf8a403737171 Mon Sep 17 00:00:00 2001
+From bd0d48e6d2354d8e437f97bff5c59697b7b2248f Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Tue, 7 Jan 2014 23:02:10 +0100
 Subject: Link to libnetwork, since we use sockets.
@@ -20,10 +20,10 @@ index 563913b..f1e6424 100644
  	install(TARGETS vcmiserver DESTINATION ${BIN_DIR})
  endif()
 -- 
-2.14.2
+2.19.0
 
 
-From 4748787f27ceb9515eb89154f94eb5ce3da1ca09 Mon Sep 17 00:00:00 2001
+From cb7a53869f9cea3e40692ccebbe6b5185704efd6 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Wed, 8 Jan 2014 21:14:51 +0100
 Subject: Support for renaming threads.
@@ -52,10 +52,10 @@ index 2027390..3a0a207 100644
  	prctl(PR_SET_NAME, name.c_str(), 0, 0, 0);
  #endif
 -- 
-2.14.2
+2.19.0
 
 
-From 25f533d80108594cace58ca3dbc7736700baed90 Mon Sep 17 00:00:00 2001
+From 3df6c3e7826ff3277e77194d5b0bc131497d93d6 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 27 Jan 2014 20:18:36 +0100
 Subject: Fix settings dir path.
@@ -83,7 +83,7 @@ index d9f9c97..fd824a8 100755
  #	echo "                  " "Requires wget and Internet connection"
  #	echo
 -	echo " --dest DIRECTORY " "Path where resulting data will be placed. Default is ~/.local/share/vcmi"
-+	echo " --dest DIRECTORY " "Path where resulting data will be placed. Default is `finddir B_USER_SETTINGS_DIRECTORY`/vcmi"
++	echo " --dest DIRECTORY " "Path where resulting data will be placed. Default is `finddir B_USER_NONPACKAGED_DATA_DIRECTORY`/vcmi"
  	echo
  	echo " --validate       " "Run basic validness checks"
  	exit 0
@@ -92,15 +92,15 @@ index d9f9c97..fd824a8 100755
  	if [[ -z "$XDG_DATA_HOME" ]]
  	then
 -		dest_dir="$HOME/.local/share/vcmi"
-+		dest_dir="`finddir B_USER_SETTINGS_DIRECTORY`/vcmi"
++		dest_dir="`finddir B_USER_NONPACKAGED_DATA_DIRECTORY`/vcmi"
  	else
  		dest_dir="$XDG_DATA_HOME/vcmi"
  	fi
 -- 
-2.14.2
+2.19.0
 
 
-From 821d04ae49a167ba86d785493f419d3efdae5f47 Mon Sep 17 00:00:00 2001
+From 620082b7acc5e44a70643e7479a02fa4e8710ce4 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 6 Nov 2017 21:23:13 +0100
 Subject: don't use backtrace on Haiku
@@ -143,5 +143,28 @@ index 2856422..1d2ba8d 100644
  	#endif
  
 -- 
-2.14.2
+2.19.0
+
+
+From 8c28309d2ef0f009cae8fcdac8a5413093911d0e Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 15 Sep 2018 21:12:35 +0200
+Subject: fix data dir
+
+
+diff --git a/lib/VCMIDirs.cpp b/lib/VCMIDirs.cpp
+index a2148a6..0768ee7 100644
+--- a/lib/VCMIDirs.cpp
++++ b/lib/VCMIDirs.cpp
+@@ -470,7 +470,7 @@ bfs::path VCMIDirsXDG::userDataPath() const
+ 	// $XDG_DATA_HOME, default: $HOME/.local/share
+ 	const char* homeDir;
+ 	if ((homeDir = getenv("XDG_DATA_HOME")))
+-		return homeDir;
++		return bfs::path(homeDir) / "vcmi";
+ 	else if ((homeDir = getenv("HOME")))
+ 		return bfs::path(homeDir) / ".local" / "share" / "vcmi";
+ 	else
+-- 
+2.19.0
 

games-strategy/vcmi/vcmi-0.99.recipe

@@ -8,12 +8,12 @@ You'll require the original game files to use this port."
 HOMEPAGE="https://vcmi.eu"
 COPYRIGHT="2005-2017 VCMI Team"
 LICENSE="GNU GPL v2"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://github.com/vcmi/vcmi/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="b7f2459d7e054c8bdcf419cbb80040e751d3dbb06dc1113ac28f7365930f902e"
 PATCHES="vcmi-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
@@ -28,6 +28,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	cmd:innoextract
 	lib:libavcodec$secondaryArchSuffix
 	lib:libboost_filesystem$secondaryArchSuffix
 	lib:libboost_program_options$secondaryArchSuffix