dfhack-0.44.12.2_p20190721

New snapshot

Signed-off-by: Erik Moen <eroen-overlay@occam.eroen.eu>

8 files changed, 2562 insertions, 0 deletions

diff --git a/games-util/dfhack/dfhack-0.44.12.2_p20190721.ebuild b/games-util/dfhack/dfhack-0.44.12.2_p20190721.ebuild
new file mode 100644
index 0000000..4cf4d83
--- /dev/null
+++ b/games-util/dfhack/dfhack-0.44.12.2_p20190721.ebuild
@@ -0,0 +1,118 @@
+# By eroen <eroen-overlay@occam.eroen.eu>, 2012 - 2017
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+
+EAPI=6
+
+inherit versionator git-r3 cmake-utils
+
+df_PV=$(get_version_component_range 1-3)
+
+DESCRIPTION="Memory hacking library for Dwarf Fortress and a set of tools that use it"
+HOMEPAGE="http://github.com/DFHack/dfhack"
+EGIT_REPO_URI="https://github.com/DFHack/dfhack.git"
+if [[ $PV == *.9999 ]]; then
+	EGIT_BRANCH="develop"
+elif [[ $PV == *_alpha* || $PV == *_beta* ]]; then
+	EGIT_MIN_CLONE="single"
+	EGIT_COMMIT="${PV/_alpha/-alpha}"
+	EGIT_COMMIT="${EGIT_COMMIT/_beta/-beta}"
+else
+	EGIT_MIN_CLONE_TYPE=mirror
+	EGIT_COMMIT="e86e20717e34c8ad1bce6bdba6463f2df807ad79"
+	# xml_EGIT_COMMIT="X"
+fi
+
+KEYWORDS="-* ~amd64" # ~x86
+
+CMAKE_MIN_VERSION=2.8.0
+CMAKE_REMOVE_MODULES_LIST="FindCurses FindDoxygen CMakeVS10FindMake"
+
+LICENSE="ZLIB MIT BSD-2 BSD CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+
+# dfhack bundles lua (5.3 as of 0.43.05-alpha1)
+HDEPEND="
+	>=sys-devel/gcc-4.5
+	dev-lang/perl
+	dev-perl/XML-LibXML
+	dev-perl/XML-LibXSLT
+	"
+LIBRARY_DEPEND="
+	sys-libs/zlib
+	"
+DEPEND="${LIBRARY_DEPEND}
+	${HDEPEND}"
+RDEPEND="${LIBRARY_DEPEND}
+	~games-roguelike/dwarf-fortress-$df_PV"
+
+PATCHES=( "$FILESDIR"/dfhack-$PV )
+
+QA_PREBUILT="opt/dfhack/hack/libruby.so"
+
+src_unpack() {
+	git-r3_src_unpack
+	if [[ -n $xml_EGIT_COMMIT ]]; then
+		cd "$S/library/xml" || die
+		git checkout "$xml_EGIT_COMMIT" || die
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	local install="\${HOME}/.dwarf-fortress-${df_PV}_dfhack" exe="./libs/Dwarf_Fortress"
+	sed -e "s:^install=.*:install=${install}:" \
+		-e "s:^exe=.*:exe=\"${exe}\":" \
+		"$FILESDIR"/dfhack > "$T"/dfhack || die
+	cp "$FILESDIR"/dfhack-run "$T" || die
+
+	# No idea how this is supposed to work
+	sed -e 's/@.*@/gentoo/' \
+		-e 's/#cmakedefine/#define/' \
+		< library/include/git-describe.h.in \
+		> library/include/git-describe.h || die
+
+	# missing -lpthread
+	sed -e 's/${CMAKE_THREAD_LIBS_INIT}/& pthread/' \
+		-i plugins/devel/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDFHACK_BUILD_ARCH=$(usex amd64 64 "")$(usex x86 32 "")
+		-DEXTERNAL_TINYXML=NO # https://bugs.gentoo.org/show_bug.cgi?id=592696
+		-DCMAKE_INSTALL_PREFIX=/opt/dfhack
+		-DDFHACK_DATA_DESTINATION=/opt/dfhack/hack
+		-DDFHACK_LUA_DESTINATION=/opt/dfhack/hack/lua
+		-DDFHACK_PLUGIN_DESTINATION=/opt/dfhack/hack/plugins
+		-DDFHACK_LIBRARY_DESTINATION=/opt/dfhack/hack
+		-DDFHACK_RUBY_DESTINATION=/opt/dfhack/hack/ruby
+		-DBUILD_RUBY=OFF # TODO: downloads libruby.so
+		-DBUILD_DEV_PLUGINS=ON
+		-DBUILD_SKELETON=ON
+		)
+
+	cmake-utils_src_configure
+}
+
+DOCS=""
+src_install() {
+	cmake-utils_src_install
+
+	dobin "$T"/dfhack{,-run}
+}
+
+pkg_postinst() {
+	elog "Due to Dwarf Fortress' special needs regarding working directory,"
+	elog "specifying relative paths to DFHack plugins can give unintended results."
+	elog
+	elog "Your dfhack.init should be placed in \${HOME}/.dwarf-fortress-${df_PV}_dfhack/ ,"
+	elog "otherwise the example configuration will be used."
+	elog
+	elog "To start DFHack, please run dfhack"
+	elog
+	elog "If you experience segfaults on launch, please try rebuilding dwarf-fortress"
+	elog "with compiler optimizations disabled (CXXFLAGS=\"-O0\""
+}
diff --git a/games-util/dfhack/files/dfhack b/games-util/dfhack/files/dfhack
index 7456f5d..0b179b1 100644
--- a/games-util/dfhack/files/dfhack
+++ b/games-util/dfhack/files/dfhack
@@ -16,6 +16,7 @@ do_install() {
 do_dfhack_install() {
 	cp -rn "$dfhackdir"/dfhack-config "$install"/
 	cp -ns "$dfhackdir"/dfhack.init-example "$install"/
+	cp -ns "$dfhackdir"/onLoad.init-example "$install"/
 }
 
 if [ -d "$install" ]; then
diff --git a/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/01-respect.patch b/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/01-respect.patch
new file mode 100644
index 0000000..f67e57f
--- /dev/null
+++ b/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/01-respect.patch
@@ -0,0 +1,83 @@
+Respect DFHACK_DATA_DESTINATION
+
+From: eroen <dfhack@occam.eroen.eu>
+
+
+---
+ CMakeLists.txt         |    2 +-
+ library/CMakeLists.txt |    3 +++
+ library/Core.cpp       |   12 +++++++++---
+ 3 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9a9a03ca..61a66815 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -197,7 +197,7 @@ ENDIF()
+ # external tools will be installed here:
+ SET(DFHACK_BINARY_DESTINATION .)
+ # dfhack data goes here:
+-SET(DFHACK_DATA_DESTINATION hack)
++SET(DFHACK_DATA_DESTINATION hack CACHE INTERNAL "")
+ # plugin libs go here:
+ SET(DFHACK_PLUGIN_DESTINATION hack/plugins)
+ # dfhack header files go here:
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index d64b7429..124083b2 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -79,6 +79,9 @@ RemoteServer.cpp
+ RemoteTools.cpp
+ )
+ 
++set_property( SOURCE "Core.cpp" APPEND PROPERTY COMPILE_DEFINITIONS
++	"DFHACK_DATA_DESTINATION=\"${DFHACK_DATA_DESTINATION}\"" )
++
+ SET(MAIN_SOURCES_WINDOWS
+ Console-windows.cpp
+ Hooks-windows.cpp
+diff --git a/library/Core.cpp b/library/Core.cpp
+index 15d4be72..296a5fa3 100644
+--- a/library/Core.cpp
++++ b/library/Core.cpp
+@@ -78,6 +78,7 @@ using namespace DFHack;
+ #include <stdio.h>
+ #include <iomanip>
+ #include <stdlib.h>
++#include <string.h>
+ #include <fstream>
+ #include <thread>
+ #include <mutex>
+@@ -553,6 +554,7 @@ void Core::getScriptPaths(std::vector<std::string> *dest)
+     }
+     dest->push_back(df_path + "/raw/scripts");
+     dest->push_back(df_path + "/hack/scripts");
++    dest->push_back(DFHACK_DATA_DESTINATION "/scripts");
+     for (auto it = script_paths[1].begin(); it != script_paths[1].end(); ++it)
+         dest->push_back(*it);
+ }
+@@ -1580,7 +1582,11 @@ void Core::fatal (std::string output)
+ std::string Core::getHackPath()
+ {
+ #ifdef LINUX_BUILD
+-    return p->getPath() + "/hack/";
++    if(strncmp(DFHACK_DATA_DESTINATION, "hack", 5) == 0)
++        // This is the default value
++        return p->getPath() + "/hack/";
++    else
++        return DFHACK_DATA_DESTINATION "/";
+ #else
+     return p->getPath() + "\\hack\\";
+ #endif
+@@ -1612,9 +1618,9 @@ bool Core::Init()
+ 
+     // find out what we are...
+     #ifdef LINUX_BUILD
+-        const char * path = "hack/symbols.xml";
++        const char * path = DFHACK_DATA_DESTINATION "/symbols.xml";
+     #else
+-        const char * path = "hack\\symbols.xml";
++        const char * path = DFHACK_DATA_DESTINATION "\\symbols.xml";
+     #endif
+     auto local_vif = dts::make_unique<DFHack::VersionInfoFactory>();
+     cerr << "Identifying DF version.\n";
diff --git a/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/02-respect-dfhack_lua_destination.patch b/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/02-respect-dfhack_lua_destination.patch
new file mode 100644
index 0000000..92d365b
--- /dev/null
+++ b/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/02-respect-dfhack_lua_destination.patch
@@ -0,0 +1,1632 @@
+respect DFHACK_LUA_DESTINATION
+
+From: eroen <dfhack@occam.eroen.eu>
+
+
+---
+ CMakeLists.txt                   |    3 
+ depends/lua/CMakeLists.txt       |    5 
+ depends/lua/include/luaconf.h    |  774 --------------------------------------
+ depends/lua/include/luaconf.h.in |  774 ++++++++++++++++++++++++++++++++++++++
+ library/CMakeLists.txt           |    2 
+ 5 files changed, 781 insertions(+), 777 deletions(-)
+ delete mode 100644 depends/lua/include/luaconf.h
+ create mode 100644 depends/lua/include/luaconf.h.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 61a66815..73ab31e5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -203,7 +203,7 @@ SET(DFHACK_PLUGIN_DESTINATION hack/plugins)
+ # dfhack header files go here:
+ SET(DFHACK_INCLUDES_DESTINATION hack/include)
+ # dfhack lua files go here:
+-SET(DFHACK_LUA_DESTINATION hack/lua)
++SET(DFHACK_LUA_DESTINATION hack/lua CACHE INTERNAL "")
+ # the windows .lib file goes here:
+ SET(DFHACK_DEVLIB_DESTINATION hack)
+ 
+@@ -376,6 +376,7 @@ endif()
+ 
+ find_package(ZLIB REQUIRED)
+ include_directories(depends/protobuf)
++include_directories("${CMAKE_CURRENT_BINARY_DIR}/depends/lua/include")
+ include_directories(depends/lua/include)
+ include_directories(depends/md5)
+ 
+diff --git a/depends/lua/CMakeLists.txt b/depends/lua/CMakeLists.txt
+index fd3a59c0..84950b62 100644
+--- a/depends/lua/CMakeLists.txt
++++ b/depends/lua/CMakeLists.txt
+@@ -22,6 +22,10 @@ IF(UNIX)
+     ENDIF()
+ ENDIF()
+ 
++configure_file("include/luaconf.h.in" "include/luaconf.h" @ONLY)
++SET_SOURCE_FILES_PROPERTIES("${CMAKE_CURRENT_BINARY_DIR}/include" PROPERTIES HEADER_FILE_ONLY TRUE)
++include_directories("${CMAKE_CURRENT_BINARY_DIR}/include")
++
+ SET (HDR_LIBLUA
+ include/lapi.h
+ include/lauxlib.h
+@@ -42,7 +46,6 @@ include/lstring.h
+ include/ltable.h
+ include/ltm.h
+ include/lua.h
+-include/luaconf.h
+ include/lualib.h
+ include/lundump.h
+ include/lvm.h
+diff --git a/depends/lua/include/luaconf.h b/depends/lua/include/luaconf.h
+deleted file mode 100644
+index 051d2a94..00000000
+--- a/depends/lua/include/luaconf.h
++++ /dev/null
+@@ -1,774 +0,0 @@
+-/*
+-** $Id: luaconf.h,v 1.255 2016/05/01 20:06:09 roberto Exp $
+-** Configuration file for Lua
+-** See Copyright Notice in lua.h
+-*/
+-
+-
+-#ifndef luaconf_h
+-#define luaconf_h
+-
+-#include <limits.h>
+-#include <stddef.h>
+-
+-#define LUA_COMPAT_APIINTCASTS
+-#define LUA_COMPAT_IPAIRS
+-
+-// Patch for old glibc versions
+-#if !defined(LLONG_MAX) && defined(__LONG_LONG_MAX__)
+-#define LLONG_MAX __LONG_LONG_MAX__
+-#endif
+-
+-#if !defined(LLONG_MIN) && defined(__LONG_LONG_MAX__)
+-#define LLONG_MIN (-__LONG_LONG_MAX__ - 1LL)
+-#endif
+-
+-/*
+-** ===================================================================
+-** Search for "@@" to find all configurable definitions.
+-** ===================================================================
+-*/
+-
+-
+-/*
+-** {====================================================================
+-** System Configuration: macros to adapt (if needed) Lua to some
+-** particular platform, for instance compiling it with 32-bit numbers or
+-** restricting it to C89.
+-** =====================================================================
+-*/
+-
+-/*
+-@@ LUA_32BITS enables Lua with 32-bit integers and 32-bit floats. You
+-** can also define LUA_32BITS in the make file, but changing here you
+-** ensure that all software connected to Lua will be compiled with the
+-** same configuration.
+-*/
+-/* #define LUA_32BITS */
+-
+-
+-/*
+-@@ LUA_USE_C89 controls the use of non-ISO-C89 features.
+-** Define it if you want Lua to avoid the use of a few C99 features
+-** or Windows-specific features on Windows.
+-*/
+-/* #define LUA_USE_C89 */
+-
+-
+-/*
+-** By default, Lua on Windows use (some) specific Windows features
+-*/
+-#if !defined(LUA_USE_C89) && defined(_WIN32) && !defined(_WIN32_WCE)
+-#define LUA_USE_WINDOWS  /* enable goodies for regular Windows */
+-#endif
+-
+-
+-#if defined(LUA_USE_WINDOWS)
+-#define LUA_DL_DLL	/* enable support for DLL */
+-#define LUA_USE_C89	/* broadly, Windows is C89 */
+-#endif
+-
+-
+-#if defined(LUA_USE_LINUX)
+-#define LUA_USE_POSIX
+-#define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
+-#define LUA_USE_READLINE	/* needs some extra libraries */
+-#endif
+-
+-
+-#if defined(LUA_USE_MACOSX)
+-#define LUA_USE_POSIX
+-#define LUA_USE_DLOPEN		/* MacOS does not need -ldl */
+-#define LUA_USE_READLINE	/* needs an extra library: -lreadline */
+-#endif
+-
+-
+-/*
+-@@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for
+-** C89 ('long' and 'double'); Windows always has '__int64', so it does
+-** not need to use this case.
+-*/
+-#if defined(LUA_USE_C89) && !defined(LUA_USE_WINDOWS)
+-#define LUA_C89_NUMBERS
+-#endif
+-
+-
+-
+-/*
+-@@ LUAI_BITSINT defines the (minimum) number of bits in an 'int'.
+-*/
+-/* avoid undefined shifts */
+-#if ((INT_MAX >> 15) >> 15) >= 1
+-#define LUAI_BITSINT	32
+-#else
+-/* 'int' always must have at least 16 bits */
+-#define LUAI_BITSINT	16
+-#endif
+-
+-
+-/*
+-@@ LUA_INT_TYPE defines the type for Lua integers.
+-@@ LUA_FLOAT_TYPE defines the type for Lua floats.
+-** Lua should work fine with any mix of these options (if supported
+-** by your C compiler). The usual configurations are 64-bit integers
+-** and 'double' (the default), 32-bit integers and 'float' (for
+-** restricted platforms), and 'long'/'double' (for C compilers not
+-** compliant with C99, which may not have support for 'long long').
+-*/
+-
+-/* predefined options for LUA_INT_TYPE */
+-#define LUA_INT_INT		1
+-#define LUA_INT_LONG		2
+-#define LUA_INT_LONGLONG	3
+-
+-/* predefined options for LUA_FLOAT_TYPE */
+-#define LUA_FLOAT_FLOAT		1
+-#define LUA_FLOAT_DOUBLE	2
+-#define LUA_FLOAT_LONGDOUBLE	3
+-
+-#if defined(LUA_32BITS)		/* { */
+-/*
+-** 32-bit integers and 'float'
+-*/
+-#if LUAI_BITSINT >= 32  /* use 'int' if big enough */
+-#define LUA_INT_TYPE	LUA_INT_INT
+-#else  /* otherwise use 'long' */
+-#define LUA_INT_TYPE	LUA_INT_LONG
+-#endif
+-#define LUA_FLOAT_TYPE	LUA_FLOAT_FLOAT
+-
+-#elif defined(LUA_C89_NUMBERS)	/* }{ */
+-/*
+-** largest types available for C89 ('long' and 'double')
+-*/
+-#define LUA_INT_TYPE	LUA_INT_LONG
+-#define LUA_FLOAT_TYPE	LUA_FLOAT_DOUBLE
+-
+-#endif				/* } */
+-
+-
+-/*
+-** default configuration for 64-bit Lua ('long long' and 'double')
+-*/
+-#if !defined(LUA_INT_TYPE)
+-#define LUA_INT_TYPE	LUA_INT_LONGLONG
+-#endif
+-
+-#if !defined(LUA_FLOAT_TYPE)
+-#define LUA_FLOAT_TYPE	LUA_FLOAT_DOUBLE
+-#endif
+-
+-/* }================================================================== */
+-
+-
+-
+-
+-/*
+-** {==================================================================
+-** Configuration for Paths.
+-** ===================================================================
+-*/
+-
+-/*
+-@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for
+-** Lua libraries.
+-@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for
+-** C libraries.
+-** CHANGE them if your machine has a non-conventional directory
+-** hierarchy or if you want to install your libraries in
+-** non-conventional directories.
+-*/
+-#if defined(_WIN32)	/* { */
+-/*
+-** In Windows, any exclamation mark ('!') in the path is replaced by the
+-** path of the directory of the executable file of the current process.
+-*/
+-#define LUA_LDIR	"!\\hack\\lua\\"
+-#define LUA_CDIR	"!\\"
+-#define LUA_PATH_DEFAULT  \
+-		LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" ".\\?.lua"
+-#define LUA_CPATH_DEFAULT \
+-		LUA_CDIR"?.dll;" ".\\?.dll"
+-
+-#else			/* }{ */
+-
+-#define LUA_LDIR	"./hack/lua/"
+-#define LUA_CDIR	"./hack/"
+-#define LUA_PATH_DEFAULT  \
+-		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" "./?.lua"
+-#define LUA_CPATH_DEFAULT \
+-		LUA_CDIR"?.so;" "./?.so"
+-#endif			/* } */
+-
+-#define LUA_PATH_VAR "DFHACK_LUA_PATH"
+-#define LUA_CPATH_VAR "DFHACK_LUA_CPATH"
+-
+-/*
+-@@ LUA_DIRSEP is the directory separator (for submodules).
+-** CHANGE it if your machine does not use "/" as the directory separator
+-** and is not Windows. (On Windows Lua automatically uses "\".)
+-*/
+-#if defined(_WIN32)
+-#define LUA_DIRSEP	"\\"
+-#else
+-#define LUA_DIRSEP	"/"
+-#endif
+-
+-/* }================================================================== */
+-
+-
+-/*
+-** {==================================================================
+-** Marks for exported symbols in the C code
+-** ===================================================================
+-*/
+-
+-/*
+-@@ LUA_API is a mark for all core API functions.
+-@@ LUALIB_API is a mark for all auxiliary library functions.
+-@@ LUAMOD_API is a mark for all standard library opening functions.
+-** CHANGE them if you need to define those functions in some special way.
+-** For instance, if you want to create one Windows DLL with the core and
+-** the libraries, you may want to use the following definition (define
+-** LUA_BUILD_AS_DLL to get it).
+-*/
+-#if defined(LUA_BUILD_AS_DLL)	/* { */
+-
+-#if defined(_MSC_VER)
+-#if defined(LUA_CORE) || defined(LUA_LIB)	/* { */
+-#define LUA_API __declspec(dllexport)
+-#else						/* }{ */
+-#define LUA_API __declspec(dllimport)
+-#endif						/* } */
+-#else
+-#define LUA_API __attribute__ ((visibility("default")))
+-#endif
+-
+-#else				/* }{ */
+-
+-#define LUA_API		extern
+-
+-#endif				/* } */
+-
+-
+-/* more often than not the libs go together with the core */
+-#define LUALIB_API	LUA_API
+-#define LUAMOD_API	LUALIB_API
+-
+-
+-/*
+-@@ LUAI_FUNC is a mark for all extern functions that are not to be
+-** exported to outside modules.
+-@@ LUAI_DDEF and LUAI_DDEC are marks for all extern (const) variables
+-** that are not to be exported to outside modules (LUAI_DDEF for
+-** definitions and LUAI_DDEC for declarations).
+-** CHANGE them if you need to mark them in some special way. Elf/gcc
+-** (versions 3.2 and later) mark them as "hidden" to optimize access
+-** when Lua is compiled as a shared library. Not all elf targets support
+-** this attribute. Unfortunately, gcc does not offer a way to check
+-** whether the target offers that support, and those without support
+-** give a warning about it. To avoid these warnings, change to the
+-** default definition.
+-*/
+-#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
+-    defined(__ELF__)		/* { */
+-#define LUAI_FUNC	__attribute__((visibility("hidden"))) extern
+-#else				/* }{ */
+-#define LUAI_FUNC	extern
+-#endif				/* } */
+-
+-#define LUAI_DDEC	LUAI_FUNC
+-#define LUAI_DDEF	/* empty */
+-
+-/* }================================================================== */
+-
+-
+-/*
+-** {==================================================================
+-** Compatibility with previous versions
+-** ===================================================================
+-*/
+-
+-/*
+-@@ LUA_COMPAT_5_2 controls other macros for compatibility with Lua 5.2.
+-@@ LUA_COMPAT_5_1 controls other macros for compatibility with Lua 5.1.
+-** You can define it to get all options, or change specific options
+-** to fit your specific needs.
+-*/
+-#if defined(LUA_COMPAT_5_2)	/* { */
+-
+-/*
+-@@ LUA_COMPAT_MATHLIB controls the presence of several deprecated
+-** functions in the mathematical library.
+-*/
+-#define LUA_COMPAT_MATHLIB
+-
+-/*
+-@@ LUA_COMPAT_BITLIB controls the presence of library 'bit32'.
+-*/
+-#define LUA_COMPAT_BITLIB
+-
+-/*
+-@@ LUA_COMPAT_IPAIRS controls the effectiveness of the __ipairs metamethod.
+-*/
+-#define LUA_COMPAT_IPAIRS
+-
+-/*
+-@@ LUA_COMPAT_APIINTCASTS controls the presence of macros for
+-** manipulating other integer types (lua_pushunsigned, lua_tounsigned,
+-** luaL_checkint, luaL_checklong, etc.)
+-*/
+-#define LUA_COMPAT_APIINTCASTS
+-
+-#endif				/* } */
+-
+-
+-#if defined(LUA_COMPAT_5_1)	/* { */
+-
+-/* Incompatibilities from 5.2 -> 5.3 */
+-#define LUA_COMPAT_MATHLIB
+-#define LUA_COMPAT_APIINTCASTS
+-
+-/*
+-@@ LUA_COMPAT_UNPACK controls the presence of global 'unpack'.
+-** You can replace it with 'table.unpack'.
+-*/
+-#define LUA_COMPAT_UNPACK
+-
+-/*
+-@@ LUA_COMPAT_LOADERS controls the presence of table 'package.loaders'.
+-** You can replace it with 'package.searchers'.
+-*/
+-#define LUA_COMPAT_LOADERS
+-
+-/*
+-@@ macro 'lua_cpcall' emulates deprecated function lua_cpcall.
+-** You can call your C function directly (with light C functions).
+-*/
+-#define lua_cpcall(L,f,u)  \
+-	(lua_pushcfunction(L, (f)), \
+-	 lua_pushlightuserdata(L,(u)), \
+-	 lua_pcall(L,1,0,0))
+-
+-
+-/*
+-@@ LUA_COMPAT_LOG10 defines the function 'log10' in the math library.
+-** You can rewrite 'log10(x)' as 'log(x, 10)'.
+-*/
+-#define LUA_COMPAT_LOG10
+-
+-/*
+-@@ LUA_COMPAT_LOADSTRING defines the function 'loadstring' in the base
+-** library. You can rewrite 'loadstring(s)' as 'load(s)'.
+-*/
+-#define LUA_COMPAT_LOADSTRING
+-
+-/*
+-@@ LUA_COMPAT_MAXN defines the function 'maxn' in the table library.
+-*/
+-#define LUA_COMPAT_MAXN
+-
+-/*
+-@@ The following macros supply trivial compatibility for some
+-** changes in the API. The macros themselves document how to
+-** change your code to avoid using them.
+-*/
+-#define lua_strlen(L,i)		lua_rawlen(L, (i))
+-
+-#define lua_objlen(L,i)		lua_rawlen(L, (i))
+-
+-#define lua_equal(L,idx1,idx2)		lua_compare(L,(idx1),(idx2),LUA_OPEQ)
+-#define lua_lessthan(L,idx1,idx2)	lua_compare(L,(idx1),(idx2),LUA_OPLT)
+-
+-/*
+-@@ LUA_COMPAT_MODULE controls compatibility with previous
+-** module functions 'module' (Lua) and 'luaL_register' (C).
+-*/
+-#define LUA_COMPAT_MODULE
+-
+-#endif				/* } */
+-
+-
+-/*
+-@@ LUA_COMPAT_FLOATSTRING makes Lua format integral floats without a
+-@@ a float mark ('.0').
+-** This macro is not on by default even in compatibility mode,
+-** because this is not really an incompatibility.
+-*/
+-/* #define LUA_COMPAT_FLOATSTRING */
+-
+-/* }================================================================== */
+-
+-
+-
+-/*
+-** {==================================================================
+-** Configuration for Numbers.
+-** Change these definitions if no predefined LUA_FLOAT_* / LUA_INT_*
+-** satisfy your needs.
+-** ===================================================================
+-*/
+-
+-/*
+-@@ LUA_NUMBER is the floating-point type used by Lua.
+-@@ LUAI_UACNUMBER is the result of an 'usual argument conversion'
+-@@ over a floating number.
+-@@ l_mathlim(x) corrects limit name 'x' to the proper float type
+-** by prefixing it with one of FLT/DBL/LDBL.
+-@@ LUA_NUMBER_FRMLEN is the length modifier for writing floats.
+-@@ LUA_NUMBER_FMT is the format for writing floats.
+-@@ lua_number2str converts a float to a string.
+-@@ l_mathop allows the addition of an 'l' or 'f' to all math operations.
+-@@ l_floor takes the floor of a float.
+-@@ lua_str2number converts a decimal numeric string to a number.
+-*/
+-
+-
+-/* The following definitions are good for most cases here */
+-
+-#define l_floor(x)		(l_mathop(floor)(x))
+-
+-#define lua_number2str(s,sz,n)	l_sprintf((s), sz, LUA_NUMBER_FMT, (n))
+-
+-/*
+-@@ lua_numbertointeger converts a float number to an integer, or
+-** returns 0 if float is not within the range of a lua_Integer.
+-** (The range comparisons are tricky because of rounding. The tests
+-** here assume a two-complement representation, where MININTEGER always
+-** has an exact representation as a float; MAXINTEGER may not have one,
+-** and therefore its conversion to float may have an ill-defined value.)
+-*/
+-#define lua_numbertointeger(n,p) \
+-  ((n) >= (LUA_NUMBER)(LUA_MININTEGER) && \
+-   (n) < -(LUA_NUMBER)(LUA_MININTEGER) && \
+-      (*(p) = (LUA_INTEGER)(n), 1))
+-
+-
+-/* now the variable definitions */
+-
+-#if LUA_FLOAT_TYPE == LUA_FLOAT_FLOAT		/* { single float */
+-
+-#define LUA_NUMBER	float
+-
+-#define l_mathlim(n)		(FLT_##n)
+-
+-#define LUAI_UACNUMBER	double
+-
+-#define LUA_NUMBER_FRMLEN	""
+-#define LUA_NUMBER_FMT		"%.7g"
+-
+-#define l_mathop(op)		op##f
+-
+-#define lua_str2number(s,p)	strtof((s), (p))
+-
+-
+-#elif LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE	/* }{ long double */
+-
+-#define LUA_NUMBER	long double
+-
+-#define l_mathlim(n)		(LDBL_##n)
+-
+-#define LUAI_UACNUMBER	long double
+-
+-#define LUA_NUMBER_FRMLEN	"L"
+-#define LUA_NUMBER_FMT		"%.19Lg"
+-
+-#define l_mathop(op)		op##l
+-
+-#define lua_str2number(s,p)	strtold((s), (p))
+-
+-#elif LUA_FLOAT_TYPE == LUA_FLOAT_DOUBLE	/* }{ double */
+-
+-#define LUA_NUMBER	double
+-
+-#define l_mathlim(n)		(DBL_##n)
+-
+-#define LUAI_UACNUMBER	double
+-
+-#define LUA_NUMBER_FRMLEN	""
+-#define LUA_NUMBER_FMT		"%.14g"
+-
+-#define l_mathop(op)		op
+-
+-#define lua_str2number(s,p)	strtod((s), (p))
+-
+-#else						/* }{ */
+-
+-#error "numeric float type not defined"
+-
+-#endif					/* } */
+-
+-
+-
+-/*
+-@@ LUA_INTEGER is the integer type used by Lua.
+-**
+-@@ LUA_UNSIGNED is the unsigned version of LUA_INTEGER.
+-**
+-@@ LUAI_UACINT is the result of an 'usual argument conversion'
+-@@ over a lUA_INTEGER.
+-@@ LUA_INTEGER_FRMLEN is the length modifier for reading/writing integers.
+-@@ LUA_INTEGER_FMT is the format for writing integers.
+-@@ LUA_MAXINTEGER is the maximum value for a LUA_INTEGER.
+-@@ LUA_MININTEGER is the minimum value for a LUA_INTEGER.
+-@@ lua_integer2str converts an integer to a string.
+-*/
+-
+-
+-/* The following definitions are good for most cases here */
+-
+-#define LUA_INTEGER_FMT		"%" LUA_INTEGER_FRMLEN "d"
+-#define lua_integer2str(s,sz,n)	l_sprintf((s), sz, LUA_INTEGER_FMT, (n))
+-
+-#define LUAI_UACINT		LUA_INTEGER
+-
+-/*
+-** use LUAI_UACINT here to avoid problems with promotions (which
+-** can turn a comparison between unsigneds into a signed comparison)
+-*/
+-#define LUA_UNSIGNED		unsigned LUAI_UACINT
+-
+-
+-/* now the variable definitions */
+-
+-#if LUA_INT_TYPE == LUA_INT_INT		/* { int */
+-
+-#define LUA_INTEGER		int
+-#define LUA_INTEGER_FRMLEN	""
+-
+-#define LUA_MAXINTEGER		INT_MAX
+-#define LUA_MININTEGER		INT_MIN
+-
+-#elif LUA_INT_TYPE == LUA_INT_LONG	/* }{ long */
+-
+-#define LUA_INTEGER		long
+-#define LUA_INTEGER_FRMLEN	"l"
+-
+-#define LUA_MAXINTEGER		LONG_MAX
+-#define LUA_MININTEGER		LONG_MIN
+-
+-#elif LUA_INT_TYPE == LUA_INT_LONGLONG	/* }{ long long */
+-
+-/* use presence of macro LLONG_MAX as proxy for C99 compliance */
+-#if defined(LLONG_MAX)		/* { */
+-/* use ISO C99 stuff */
+-
+-#define LUA_INTEGER		long long
+-#define LUA_INTEGER_FRMLEN	"ll"
+-
+-#define LUA_MAXINTEGER		LLONG_MAX
+-#define LUA_MININTEGER		LLONG_MIN
+-
+-#elif defined(LUA_USE_WINDOWS) /* }{ */
+-/* in Windows, can use specific Windows types */
+-
+-#define LUA_INTEGER		__int64
+-#define LUA_INTEGER_FRMLEN	"I64"
+-
+-#define LUA_MAXINTEGER		_I64_MAX
+-#define LUA_MININTEGER		_I64_MIN
+-
+-#else				/* }{ */
+-
+-#error "Compiler does not support 'long long'. Use option '-DLUA_32BITS' \
+-  or '-DLUA_C89_NUMBERS' (see file 'luaconf.h' for details)"
+-
+-#endif				/* } */
+-
+-#else				/* }{ */
+-
+-#error "numeric integer type not defined"
+-
+-#endif				/* } */
+-
+-/* }================================================================== */
+-
+-
+-/*
+-** {==================================================================
+-** Dependencies with C99 and other C details
+-** ===================================================================
+-*/
+-
+-/*
+-@@ l_sprintf is equivalent to 'snprintf' or 'sprintf' in C89.
+-** (All uses in Lua have only one format item.)
+-*/
+-#if !defined(LUA_USE_C89)
+-#define l_sprintf(s,sz,f,i)	snprintf(s,sz,f,i)
+-#else
+-#define l_sprintf(s,sz,f,i)	((void)(sz), sprintf(s,f,i))
+-#endif
+-
+-
+-/*
+-@@ lua_strx2number converts an hexadecimal numeric string to a number.
+-** In C99, 'strtod' does that conversion. Otherwise, you can
+-** leave 'lua_strx2number' undefined and Lua will provide its own
+-** implementation.
+-*/
+-#if !defined(LUA_USE_C89)
+-#define lua_strx2number(s,p)		lua_str2number(s,p)
+-#endif
+-
+-
+-/*
+-@@ lua_number2strx converts a float to an hexadecimal numeric string.
+-** In C99, 'sprintf' (with format specifiers '%a'/'%A') does that.
+-** Otherwise, you can leave 'lua_number2strx' undefined and Lua will
+-** provide its own implementation.
+-*/
+-#if !defined(LUA_USE_C89)
+-#define lua_number2strx(L,b,sz,f,n)	((void)L, l_sprintf(b,sz,f,n))
+-#endif
+-
+-
+-/*
+-** 'strtof' and 'opf' variants for math functions are not valid in
+-** C89. Otherwise, the macro 'HUGE_VALF' is a good proxy for testing the
+-** availability of these variants. ('math.h' is already included in
+-** all files that use these macros.)
+-*/
+-#if defined(LUA_USE_C89) || (defined(HUGE_VAL) && !defined(HUGE_VALF))
+-#undef l_mathop  /* variants not available */
+-#undef lua_str2number
+-#define l_mathop(op)		(lua_Number)op  /* no variant */
+-#define lua_str2number(s,p)	((lua_Number)strtod((s), (p)))
+-#endif
+-
+-
+-/*
+-@@ LUA_KCONTEXT is the type of the context ('ctx') for continuation
+-** functions.  It must be a numerical type; Lua will use 'intptr_t' if
+-** available, otherwise it will use 'ptrdiff_t' (the nearest thing to
+-** 'intptr_t' in C89)
+-*/
+-#define LUA_KCONTEXT	ptrdiff_t
+-
+-#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \
+-    __STDC_VERSION__ >= 199901L
+-#include <stdint.h>
+-#if defined(INTPTR_MAX)  /* even in C99 this type is optional */
+-#undef LUA_KCONTEXT
+-#define LUA_KCONTEXT	intptr_t
+-#endif
+-#endif
+-
+-
+-/*
+-@@ lua_getlocaledecpoint gets the locale "radix character" (decimal point).
+-** Change that if you do not want to use C locales. (Code using this
+-** macro must include header 'locale.h'.)
+-*/
+-#if !defined(lua_getlocaledecpoint)
+-#define lua_getlocaledecpoint()		(localeconv()->decimal_point[0])
+-#endif
+-
+-/* }================================================================== */
+-
+-
+-/*
+-** {==================================================================
+-** Language Variations
+-** =====================================================================
+-*/
+-
+-/*
+-@@ LUA_NOCVTN2S/LUA_NOCVTS2N control how Lua performs some
+-** coercions. Define LUA_NOCVTN2S to turn off automatic coercion from
+-** numbers to strings. Define LUA_NOCVTS2N to turn off automatic
+-** coercion from strings to numbers.
+-*/
+-/* #define LUA_NOCVTN2S */
+-/* #define LUA_NOCVTS2N */
+-
+-
+-/*
+-@@ LUA_USE_APICHECK turns on several consistency checks on the C API.
+-** Define it as a help when debugging C code.
+-*/
+-#if defined(LUA_USE_APICHECK)
+-#include <assert.h>
+-#define luai_apicheck(l,e)	assert(e)
+-#endif
+-
+-/* }================================================================== */
+-
+-
+-/*
+-** {==================================================================
+-** Macros that affect the API and must be stable (that is, must be the
+-** same when you compile Lua and when you compile code that links to
+-** Lua). You probably do not want/need to change them.
+-** =====================================================================
+-*/
+-
+-/*
+-@@ LUAI_MAXSTACK limits the size of the Lua stack.
+-** CHANGE it if you need a different limit. This limit is arbitrary;
+-** its only purpose is to stop Lua from consuming unlimited stack
+-** space (and to reserve some numbers for pseudo-indices).
+-*/
+-#if LUAI_BITSINT >= 32
+-#define LUAI_MAXSTACK		1000000
+-#else
+-#define LUAI_MAXSTACK		15000
+-#endif
+-
+-
+-/*
+-@@ LUA_EXTRASPACE defines the size of a raw memory area associated with
+-** a Lua state with very fast access.
+-** CHANGE it if you need a different size.
+-*/
+-#define LUA_EXTRASPACE		(sizeof(void *))
+-
+-
+-/*
+-@@ LUA_IDSIZE gives the maximum size for the description of the source
+-@@ of a function in debug information.
+-** CHANGE it if you want a different size.
+-*/
+-#define LUA_IDSIZE	60
+-
+-
+-/*
+-@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
+-** CHANGE it if it uses too much C-stack space. (For long double,
+-** 'string.format("%.99f", 1e4932)' needs ~5030 bytes, so a
+-** smaller buffer would force a memory allocation for each call to
+-** 'string.format'.)
+-*/
+-#if defined(LUA_FLOAT_LONGDOUBLE)
+-#define LUAL_BUFFERSIZE		8192
+-#else
+-#define LUAL_BUFFERSIZE   ((int)(0x80 * sizeof(void*) * sizeof(lua_Integer)))
+-#endif
+-
+-/* }================================================================== */
+-
+-
+-/*
+-@@ LUA_QL describes how error messages quote program elements.
+-** Lua does not use these macros anymore; they are here for
+-** compatibility only.
+-*/
+-#define LUA_QL(x)	"'" x "'"
+-#define LUA_QS		LUA_QL("%s")
+-
+-
+-
+-
+-/* =================================================================== */
+-
+-/*
+-** Local configuration. You can use this space to add your redefinitions
+-** without modifying the main part of the file.
+-*/
+-
+-
+-
+-
+-
+-#endif
+-
+diff --git a/depends/lua/include/luaconf.h.in b/depends/lua/include/luaconf.h.in
+new file mode 100644
+index 00000000..9d50d5ea
+--- /dev/null
++++ b/depends/lua/include/luaconf.h.in
+@@ -0,0 +1,774 @@
++/*
++** $Id: luaconf.h,v 1.255 2016/05/01 20:06:09 roberto Exp $
++** Configuration file for Lua
++** See Copyright Notice in lua.h
++*/
++
++
++#ifndef luaconf_h
++#define luaconf_h
++
++#include <limits.h>
++#include <stddef.h>
++
++#define LUA_COMPAT_APIINTCASTS
++#define LUA_COMPAT_IPAIRS
++
++// Patch for old glibc versions
++#if !defined(LLONG_MAX) && defined(__LONG_LONG_MAX__)
++#define LLONG_MAX __LONG_LONG_MAX__
++#endif
++
++#if !defined(LLONG_MIN) && defined(__LONG_LONG_MAX__)
++#define LLONG_MIN (-__LONG_LONG_MAX__ - 1LL)
++#endif
++
++/*
++** ===================================================================
++** Search for "@@" to find all configurable definitions.
++** ===================================================================
++*/
++
++
++/*
++** {====================================================================
++** System Configuration: macros to adapt (if needed) Lua to some
++** particular platform, for instance compiling it with 32-bit numbers or
++** restricting it to C89.
++** =====================================================================
++*/
++
++/*
++@@ LUA_32BITS enables Lua with 32-bit integers and 32-bit floats. You
++** can also define LUA_32BITS in the make file, but changing here you
++** ensure that all software connected to Lua will be compiled with the
++** same configuration.
++*/
++/* #define LUA_32BITS */
++
++
++/*
++@@ LUA_USE_C89 controls the use of non-ISO-C89 features.
++** Define it if you want Lua to avoid the use of a few C99 features
++** or Windows-specific features on Windows.
++*/
++/* #define LUA_USE_C89 */
++
++
++/*
++** By default, Lua on Windows use (some) specific Windows features
++*/
++#if !defined(LUA_USE_C89) && defined(_WIN32) && !defined(_WIN32_WCE)
++#define LUA_USE_WINDOWS  /* enable goodies for regular Windows */
++#endif
++
++
++#if defined(LUA_USE_WINDOWS)
++#define LUA_DL_DLL	/* enable support for DLL */
++#define LUA_USE_C89	/* broadly, Windows is C89 */
++#endif
++
++
++#if defined(LUA_USE_LINUX)
++#define LUA_USE_POSIX
++#define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
++#define LUA_USE_READLINE	/* needs some extra libraries */
++#endif
++
++
++#if defined(LUA_USE_MACOSX)
++#define LUA_USE_POSIX
++#define LUA_USE_DLOPEN		/* MacOS does not need -ldl */
++#define LUA_USE_READLINE	/* needs an extra library: -lreadline */
++#endif
++
++
++/*
++@@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for
++** C89 ('long' and 'double'); Windows always has '__int64', so it does
++** not need to use this case.
++*/
++#if defined(LUA_USE_C89) && !defined(LUA_USE_WINDOWS)
++#define LUA_C89_NUMBERS
++#endif
++
++
++
++/*
++@@ LUAI_BITSINT defines the (minimum) number of bits in an 'int'.
++*/
++/* avoid undefined shifts */
++#if ((INT_MAX >> 15) >> 15) >= 1
++#define LUAI_BITSINT	32
++#else
++/* 'int' always must have at least 16 bits */
++#define LUAI_BITSINT	16
++#endif
++
++
++/*
++@@ LUA_INT_TYPE defines the type for Lua integers.
++@@ LUA_FLOAT_TYPE defines the type for Lua floats.
++** Lua should work fine with any mix of these options (if supported
++** by your C compiler). The usual configurations are 64-bit integers
++** and 'double' (the default), 32-bit integers and 'float' (for
++** restricted platforms), and 'long'/'double' (for C compilers not
++** compliant with C99, which may not have support for 'long long').
++*/
++
++/* predefined options for LUA_INT_TYPE */
++#define LUA_INT_INT		1
++#define LUA_INT_LONG		2
++#define LUA_INT_LONGLONG	3
++
++/* predefined options for LUA_FLOAT_TYPE */
++#define LUA_FLOAT_FLOAT		1
++#define LUA_FLOAT_DOUBLE	2
++#define LUA_FLOAT_LONGDOUBLE	3
++
++#if defined(LUA_32BITS)		/* { */
++/*
++** 32-bit integers and 'float'
++*/
++#if LUAI_BITSINT >= 32  /* use 'int' if big enough */
++#define LUA_INT_TYPE	LUA_INT_INT
++#else  /* otherwise use 'long' */
++#define LUA_INT_TYPE	LUA_INT_LONG
++#endif
++#define LUA_FLOAT_TYPE	LUA_FLOAT_FLOAT
++
++#elif defined(LUA_C89_NUMBERS)	/* }{ */
++/*
++** largest types available for C89 ('long' and 'double')
++*/
++#define LUA_INT_TYPE	LUA_INT_LONG
++#define LUA_FLOAT_TYPE	LUA_FLOAT_DOUBLE
++
++#endif				/* } */
++
++
++/*
++** default configuration for 64-bit Lua ('long long' and 'double')
++*/
++#if !defined(LUA_INT_TYPE)
++#define LUA_INT_TYPE	LUA_INT_LONGLONG
++#endif
++
++#if !defined(LUA_FLOAT_TYPE)
++#define LUA_FLOAT_TYPE	LUA_FLOAT_DOUBLE
++#endif
++
++/* }================================================================== */
++
++
++
++
++/*
++** {==================================================================
++** Configuration for Paths.
++** ===================================================================
++*/
++
++/*
++@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for
++** Lua libraries.
++@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for
++** C libraries.
++** CHANGE them if your machine has a non-conventional directory
++** hierarchy or if you want to install your libraries in
++** non-conventional directories.
++*/
++#if defined(_WIN32)	/* { */
++/*
++** In Windows, any exclamation mark ('!') in the path is replaced by the
++** path of the directory of the executable file of the current process.
++*/
++#define LUA_LDIR	"!\\hack\\lua\\"
++#define LUA_CDIR	"!\\"
++#define LUA_PATH_DEFAULT  \
++		LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" ".\\?.lua"
++#define LUA_CPATH_DEFAULT \
++		LUA_CDIR"?.dll;" ".\\?.dll"
++
++#else			/* }{ */
++
++#define LUA_LDIR	"@DFHACK_LUA_DESTINATION@" "/"
++#define LUA_CDIR	"./hack/"
++#define LUA_PATH_DEFAULT  \
++		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" "./?.lua"
++#define LUA_CPATH_DEFAULT \
++		LUA_CDIR"?.so;" "./?.so"
++#endif			/* } */
++
++#define LUA_PATH_VAR "DFHACK_LUA_PATH"
++#define LUA_CPATH_VAR "DFHACK_LUA_CPATH"
++
++/*
++@@ LUA_DIRSEP is the directory separator (for submodules).
++** CHANGE it if your machine does not use "/" as the directory separator
++** and is not Windows. (On Windows Lua automatically uses "\".)
++*/
++#if defined(_WIN32)
++#define LUA_DIRSEP	"\\"
++#else
++#define LUA_DIRSEP	"/"
++#endif
++
++/* }================================================================== */
++
++
++/*
++** {==================================================================
++** Marks for exported symbols in the C code
++** ===================================================================
++*/
++
++/*
++@@ LUA_API is a mark for all core API functions.
++@@ LUALIB_API is a mark for all auxiliary library functions.
++@@ LUAMOD_API is a mark for all standard library opening functions.
++** CHANGE them if you need to define those functions in some special way.
++** For instance, if you want to create one Windows DLL with the core and
++** the libraries, you may want to use the following definition (define
++** LUA_BUILD_AS_DLL to get it).
++*/
++#if defined(LUA_BUILD_AS_DLL)	/* { */
++
++#if defined(_MSC_VER)
++#if defined(LUA_CORE) || defined(LUA_LIB)	/* { */
++#define LUA_API __declspec(dllexport)
++#else						/* }{ */
++#define LUA_API __declspec(dllimport)
++#endif						/* } */
++#else
++#define LUA_API __attribute__ ((visibility("default")))
++#endif
++
++#else				/* }{ */
++
++#define LUA_API		extern
++
++#endif				/* } */
++
++
++/* more often than not the libs go together with the core */
++#define LUALIB_API	LUA_API
++#define LUAMOD_API	LUALIB_API
++
++
++/*
++@@ LUAI_FUNC is a mark for all extern functions that are not to be
++** exported to outside modules.
++@@ LUAI_DDEF and LUAI_DDEC are marks for all extern (const) variables
++** that are not to be exported to outside modules (LUAI_DDEF for
++** definitions and LUAI_DDEC for declarations).
++** CHANGE them if you need to mark them in some special way. Elf/gcc
++** (versions 3.2 and later) mark them as "hidden" to optimize access
++** when Lua is compiled as a shared library. Not all elf targets support
++** this attribute. Unfortunately, gcc does not offer a way to check
++** whether the target offers that support, and those without support
++** give a warning about it. To avoid these warnings, change to the
++** default definition.
++*/
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
++    defined(__ELF__)		/* { */
++#define LUAI_FUNC	__attribute__((visibility("hidden"))) extern
++#else				/* }{ */
++#define LUAI_FUNC	extern
++#endif				/* } */
++
++#define LUAI_DDEC	LUAI_FUNC
++#define LUAI_DDEF	/* empty */
++
++/* }================================================================== */
++
++
++/*
++** {==================================================================
++** Compatibility with previous versions
++** ===================================================================
++*/
++
++/*
++@@ LUA_COMPAT_5_2 controls other macros for compatibility with Lua 5.2.
++@@ LUA_COMPAT_5_1 controls other macros for compatibility with Lua 5.1.
++** You can define it to get all options, or change specific options
++** to fit your specific needs.
++*/
++#if defined(LUA_COMPAT_5_2)	/* { */
++
++/*
++@@ LUA_COMPAT_MATHLIB controls the presence of several deprecated
++** functions in the mathematical library.
++*/
++#define LUA_COMPAT_MATHLIB
++
++/*
++@@ LUA_COMPAT_BITLIB controls the presence of library 'bit32'.
++*/
++#define LUA_COMPAT_BITLIB
++
++/*
++@@ LUA_COMPAT_IPAIRS controls the effectiveness of the __ipairs metamethod.
++*/
++#define LUA_COMPAT_IPAIRS
++
++/*
++@@ LUA_COMPAT_APIINTCASTS controls the presence of macros for
++** manipulating other integer types (lua_pushunsigned, lua_tounsigned,
++** luaL_checkint, luaL_checklong, etc.)
++*/
++#define LUA_COMPAT_APIINTCASTS
++
++#endif				/* } */
++
++
++#if defined(LUA_COMPAT_5_1)	/* { */
++
++/* Incompatibilities from 5.2 -> 5.3 */
++#define LUA_COMPAT_MATHLIB
++#define LUA_COMPAT_APIINTCASTS
++
++/*
++@@ LUA_COMPAT_UNPACK controls the presence of global 'unpack'.
++** You can replace it with 'table.unpack'.
++*/
++#define LUA_COMPAT_UNPACK
++
++/*
++@@ LUA_COMPAT_LOADERS controls the presence of table 'package.loaders'.
++** You can replace it with 'package.searchers'.
++*/
++#define LUA_COMPAT_LOADERS
++
++/*
++@@ macro 'lua_cpcall' emulates deprecated function lua_cpcall.
++** You can call your C function directly (with light C functions).
++*/
++#define lua_cpcall(L,f,u)  \
++	(lua_pushcfunction(L, (f)), \
++	 lua_pushlightuserdata(L,(u)), \
++	 lua_pcall(L,1,0,0))
++
++
++/*
++@@ LUA_COMPAT_LOG10 defines the function 'log10' in the math library.
++** You can rewrite 'log10(x)' as 'log(x, 10)'.
++*/
++#define LUA_COMPAT_LOG10
++
++/*
++@@ LUA_COMPAT_LOADSTRING defines the function 'loadstring' in the base
++** library. You can rewrite 'loadstring(s)' as 'load(s)'.
++*/
++#define LUA_COMPAT_LOADSTRING
++
++/*
++@@ LUA_COMPAT_MAXN defines the function 'maxn' in the table library.
++*/
++#define LUA_COMPAT_MAXN
++
++/*
++@@ The following macros supply trivial compatibility for some
++** changes in the API. The macros themselves document how to
++** change your code to avoid using them.
++*/
++#define lua_strlen(L,i)		lua_rawlen(L, (i))
++
++#define lua_objlen(L,i)		lua_rawlen(L, (i))
++
++#define lua_equal(L,idx1,idx2)		lua_compare(L,(idx1),(idx2),LUA_OPEQ)
++#define lua_lessthan(L,idx1,idx2)	lua_compare(L,(idx1),(idx2),LUA_OPLT)
++
++/*
++@@ LUA_COMPAT_MODULE controls compatibility with previous
++** module functions 'module' (Lua) and 'luaL_register' (C).
++*/
++#define LUA_COMPAT_MODULE
++
++#endif				/* } */
++
++
++/*
++@@ LUA_COMPAT_FLOATSTRING makes Lua format integral floats without a
++@@ a float mark ('.0').
++** This macro is not on by default even in compatibility mode,
++** because this is not really an incompatibility.
++*/
++/* #define LUA_COMPAT_FLOATSTRING */
++
++/* }================================================================== */
++
++
++
++/*
++** {==================================================================
++** Configuration for Numbers.
++** Change these definitions if no predefined LUA_FLOAT_* / LUA_INT_*
++** satisfy your needs.
++** ===================================================================
++*/
++
++/*
++@@ LUA_NUMBER is the floating-point type used by Lua.
++@@ LUAI_UACNUMBER is the result of an 'usual argument conversion'
++@@ over a floating number.
++@@ l_mathlim(x) corrects limit name 'x' to the proper float type
++** by prefixing it with one of FLT/DBL/LDBL.
++@@ LUA_NUMBER_FRMLEN is the length modifier for writing floats.
++@@ LUA_NUMBER_FMT is the format for writing floats.
++@@ lua_number2str converts a float to a string.
++@@ l_mathop allows the addition of an 'l' or 'f' to all math operations.
++@@ l_floor takes the floor of a float.
++@@ lua_str2number converts a decimal numeric string to a number.
++*/
++
++
++/* The following definitions are good for most cases here */
++
++#define l_floor(x)		(l_mathop(floor)(x))
++
++#define lua_number2str(s,sz,n)	l_sprintf((s), sz, LUA_NUMBER_FMT, (n))
++
++/*
++@@ lua_numbertointeger converts a float number to an integer, or
++** returns 0 if float is not within the range of a lua_Integer.
++** (The range comparisons are tricky because of rounding. The tests
++** here assume a two-complement representation, where MININTEGER always
++** has an exact representation as a float; MAXINTEGER may not have one,
++** and therefore its conversion to float may have an ill-defined value.)
++*/
++#define lua_numbertointeger(n,p) \
++  ((n) >= (LUA_NUMBER)(LUA_MININTEGER) && \
++   (n) < -(LUA_NUMBER)(LUA_MININTEGER) && \
++      (*(p) = (LUA_INTEGER)(n), 1))
++
++
++/* now the variable definitions */
++
++#if LUA_FLOAT_TYPE == LUA_FLOAT_FLOAT		/* { single float */
++
++#define LUA_NUMBER	float
++
++#define l_mathlim(n)		(FLT_##n)
++
++#define LUAI_UACNUMBER	double
++
++#define LUA_NUMBER_FRMLEN	""
++#define LUA_NUMBER_FMT		"%.7g"
++
++#define l_mathop(op)		op##f
++
++#define lua_str2number(s,p)	strtof((s), (p))
++
++
++#elif LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE	/* }{ long double */
++
++#define LUA_NUMBER	long double
++
++#define l_mathlim(n)		(LDBL_##n)
++
++#define LUAI_UACNUMBER	long double
++
++#define LUA_NUMBER_FRMLEN	"L"
++#define LUA_NUMBER_FMT		"%.19Lg"
++
++#define l_mathop(op)		op##l
++
++#define lua_str2number(s,p)	strtold((s), (p))
++
++#elif LUA_FLOAT_TYPE == LUA_FLOAT_DOUBLE	/* }{ double */
++
++#define LUA_NUMBER	double
++
++#define l_mathlim(n)		(DBL_##n)
++
++#define LUAI_UACNUMBER	double
++
++#define LUA_NUMBER_FRMLEN	""
++#define LUA_NUMBER_FMT		"%.14g"
++
++#define l_mathop(op)		op
++
++#define lua_str2number(s,p)	strtod((s), (p))
++
++#else						/* }{ */
++
++#error "numeric float type not defined"
++
++#endif					/* } */
++
++
++
++/*
++@@ LUA_INTEGER is the integer type used by Lua.
++**
++@@ LUA_UNSIGNED is the unsigned version of LUA_INTEGER.
++**
++@@ LUAI_UACINT is the result of an 'usual argument conversion'
++@@ over a lUA_INTEGER.
++@@ LUA_INTEGER_FRMLEN is the length modifier for reading/writing integers.
++@@ LUA_INTEGER_FMT is the format for writing integers.
++@@ LUA_MAXINTEGER is the maximum value for a LUA_INTEGER.
++@@ LUA_MININTEGER is the minimum value for a LUA_INTEGER.
++@@ lua_integer2str converts an integer to a string.
++*/
++
++
++/* The following definitions are good for most cases here */
++
++#define LUA_INTEGER_FMT		"%" LUA_INTEGER_FRMLEN "d"
++#define lua_integer2str(s,sz,n)	l_sprintf((s), sz, LUA_INTEGER_FMT, (n))
++
++#define LUAI_UACINT		LUA_INTEGER
++
++/*
++** use LUAI_UACINT here to avoid problems with promotions (which
++** can turn a comparison between unsigneds into a signed comparison)
++*/
++#define LUA_UNSIGNED		unsigned LUAI_UACINT
++
++
++/* now the variable definitions */
++
++#if LUA_INT_TYPE == LUA_INT_INT		/* { int */
++
++#define LUA_INTEGER		int
++#define LUA_INTEGER_FRMLEN	""
++
++#define LUA_MAXINTEGER		INT_MAX
++#define LUA_MININTEGER		INT_MIN
++
++#elif LUA_INT_TYPE == LUA_INT_LONG	/* }{ long */
++
++#define LUA_INTEGER		long
++#define LUA_INTEGER_FRMLEN	"l"
++
++#define LUA_MAXINTEGER		LONG_MAX
++#define LUA_MININTEGER		LONG_MIN
++
++#elif LUA_INT_TYPE == LUA_INT_LONGLONG	/* }{ long long */
++
++/* use presence of macro LLONG_MAX as proxy for C99 compliance */
++#if defined(LLONG_MAX)		/* { */
++/* use ISO C99 stuff */
++
++#define LUA_INTEGER		long long
++#define LUA_INTEGER_FRMLEN	"ll"
++
++#define LUA_MAXINTEGER		LLONG_MAX
++#define LUA_MININTEGER		LLONG_MIN
++
++#elif defined(LUA_USE_WINDOWS) /* }{ */
++/* in Windows, can use specific Windows types */
++
++#define LUA_INTEGER		__int64
++#define LUA_INTEGER_FRMLEN	"I64"
++
++#define LUA_MAXINTEGER		_I64_MAX
++#define LUA_MININTEGER		_I64_MIN
++
++#else				/* }{ */
++
++#error "Compiler does not support 'long long'. Use option '-DLUA_32BITS' \
++  or '-DLUA_C89_NUMBERS' (see file 'luaconf.h' for details)"
++
++#endif				/* } */
++
++#else				/* }{ */
++
++#error "numeric integer type not defined"
++
++#endif				/* } */
++
++/* }================================================================== */
++
++
++/*
++** {==================================================================
++** Dependencies with C99 and other C details
++** ===================================================================
++*/
++
++/*
++@@ l_sprintf is equivalent to 'snprintf' or 'sprintf' in C89.
++** (All uses in Lua have only one format item.)
++*/
++#if !defined(LUA_USE_C89)
++#define l_sprintf(s,sz,f,i)	snprintf(s,sz,f,i)
++#else
++#define l_sprintf(s,sz,f,i)	((void)(sz), sprintf(s,f,i))
++#endif
++
++
++/*
++@@ lua_strx2number converts an hexadecimal numeric string to a number.
++** In C99, 'strtod' does that conversion. Otherwise, you can
++** leave 'lua_strx2number' undefined and Lua will provide its own
++** implementation.
++*/
++#if !defined(LUA_USE_C89)
++#define lua_strx2number(s,p)		lua_str2number(s,p)
++#endif
++
++
++/*
++@@ lua_number2strx converts a float to an hexadecimal numeric string.
++** In C99, 'sprintf' (with format specifiers '%a'/'%A') does that.
++** Otherwise, you can leave 'lua_number2strx' undefined and Lua will
++** provide its own implementation.
++*/
++#if !defined(LUA_USE_C89)
++#define lua_number2strx(L,b,sz,f,n)	((void)L, l_sprintf(b,sz,f,n))
++#endif
++
++
++/*
++** 'strtof' and 'opf' variants for math functions are not valid in
++** C89. Otherwise, the macro 'HUGE_VALF' is a good proxy for testing the
++** availability of these variants. ('math.h' is already included in
++** all files that use these macros.)
++*/
++#if defined(LUA_USE_C89) || (defined(HUGE_VAL) && !defined(HUGE_VALF))
++#undef l_mathop  /* variants not available */
++#undef lua_str2number
++#define l_mathop(op)		(lua_Number)op  /* no variant */
++#define lua_str2number(s,p)	((lua_Number)strtod((s), (p)))
++#endif
++
++
++/*
++@@ LUA_KCONTEXT is the type of the context ('ctx') for continuation
++** functions.  It must be a numerical type; Lua will use 'intptr_t' if
++** available, otherwise it will use 'ptrdiff_t' (the nearest thing to
++** 'intptr_t' in C89)
++*/
++#define LUA_KCONTEXT	ptrdiff_t
++
++#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \
++    __STDC_VERSION__ >= 199901L
++#include <stdint.h>
++#if defined(INTPTR_MAX)  /* even in C99 this type is optional */
++#undef LUA_KCONTEXT
++#define LUA_KCONTEXT	intptr_t
++#endif
++#endif
++
++
++/*
++@@ lua_getlocaledecpoint gets the locale "radix character" (decimal point).
++** Change that if you do not want to use C locales. (Code using this
++** macro must include header 'locale.h'.)
++*/
++#if !defined(lua_getlocaledecpoint)
++#define lua_getlocaledecpoint()		(localeconv()->decimal_point[0])
++#endif
++
++/* }================================================================== */
++
++
++/*
++** {==================================================================
++** Language Variations
++** =====================================================================
++*/
++
++/*
++@@ LUA_NOCVTN2S/LUA_NOCVTS2N control how Lua performs some
++** coercions. Define LUA_NOCVTN2S to turn off automatic coercion from
++** numbers to strings. Define LUA_NOCVTS2N to turn off automatic
++** coercion from strings to numbers.
++*/
++/* #define LUA_NOCVTN2S */
++/* #define LUA_NOCVTS2N */
++
++
++/*
++@@ LUA_USE_APICHECK turns on several consistency checks on the C API.
++** Define it as a help when debugging C code.
++*/
++#if defined(LUA_USE_APICHECK)
++#include <assert.h>
++#define luai_apicheck(l,e)	assert(e)
++#endif
++
++/* }================================================================== */
++
++
++/*
++** {==================================================================
++** Macros that affect the API and must be stable (that is, must be the
++** same when you compile Lua and when you compile code that links to
++** Lua). You probably do not want/need to change them.
++** =====================================================================
++*/
++
++/*
++@@ LUAI_MAXSTACK limits the size of the Lua stack.
++** CHANGE it if you need a different limit. This limit is arbitrary;
++** its only purpose is to stop Lua from consuming unlimited stack
++** space (and to reserve some numbers for pseudo-indices).
++*/
++#if LUAI_BITSINT >= 32
++#define LUAI_MAXSTACK		1000000
++#else
++#define LUAI_MAXSTACK		15000
++#endif
++
++
++/*
++@@ LUA_EXTRASPACE defines the size of a raw memory area associated with
++** a Lua state with very fast access.
++** CHANGE it if you need a different size.
++*/
++#define LUA_EXTRASPACE		(sizeof(void *))
++
++
++/*
++@@ LUA_IDSIZE gives the maximum size for the description of the source
++@@ of a function in debug information.
++** CHANGE it if you want a different size.
++*/
++#define LUA_IDSIZE	60
++
++
++/*
++@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
++** CHANGE it if it uses too much C-stack space. (For long double,
++** 'string.format("%.99f", 1e4932)' needs ~5030 bytes, so a
++** smaller buffer would force a memory allocation for each call to
++** 'string.format'.)
++*/
++#if defined(LUA_FLOAT_LONGDOUBLE)
++#define LUAL_BUFFERSIZE		8192
++#else
++#define LUAL_BUFFERSIZE   ((int)(0x80 * sizeof(void*) * sizeof(lua_Integer)))
++#endif
++
++/* }================================================================== */
++
++
++/*
++@@ LUA_QL describes how error messages quote program elements.
++** Lua does not use these macros anymore; they are here for
++** compatibility only.
++*/
++#define LUA_QL(x)	"'" x "'"
++#define LUA_QS		LUA_QL("%s")
++
++
++
++
++/* =================================================================== */
++
++/*
++** Local configuration. You can use this space to add your redefinitions
++** without modifying the main part of the file.
++*/
++
++
++
++
++
++#endif
++
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index 124083b2..9e7c9ce6 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -80,7 +80,7 @@ RemoteTools.cpp
+ )
+ 
+ set_property( SOURCE "Core.cpp" APPEND PROPERTY COMPILE_DEFINITIONS
+-	"DFHACK_DATA_DESTINATION=\"${DFHACK_DATA_DESTINATION}\"" )
++	"DFHACK_DATA_DESTINATION=\"${DFHACK_DATA_DESTINATION}\"")
+ 
+ SET(MAIN_SOURCES_WINDOWS
+ Console-windows.cpp
diff --git a/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/03-respect-0.patch b/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/03-respect-0.patch
new file mode 100644
index 0000000..76c504a
--- /dev/null
+++ b/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/03-respect-0.patch
@@ -0,0 +1,64 @@
+respect DFHACK_PLUGIN_DESTINATION
+
+From: eroen <dfhack@occam.eroen.eu>
+
+
+---
+ CMakeLists.txt            |    2 +-
+ library/CMakeLists.txt    |    4 +++-
+ library/PluginManager.cpp |    7 ++++++-
+ 3 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73ab31e5..4c4d5568 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -199,7 +199,7 @@ SET(DFHACK_BINARY_DESTINATION .)
+ # dfhack data goes here:
+ SET(DFHACK_DATA_DESTINATION hack CACHE INTERNAL "")
+ # plugin libs go here:
+-SET(DFHACK_PLUGIN_DESTINATION hack/plugins)
++SET(DFHACK_PLUGIN_DESTINATION hack/plugins CACHE INTERNAL "")
+ # dfhack header files go here:
+ SET(DFHACK_INCLUDES_DESTINATION hack/include)
+ # dfhack lua files go here:
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index 9e7c9ce6..151e6e3d 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -80,7 +80,9 @@ RemoteTools.cpp
+ )
+ 
+ set_property( SOURCE "Core.cpp" APPEND PROPERTY COMPILE_DEFINITIONS
+-	"DFHACK_DATA_DESTINATION=\"${DFHACK_DATA_DESTINATION}\"")
++	"DFHACK_DATA_DESTINATION=\"${DFHACK_DATA_DESTINATION}\"" )
++set_property( SOURCE "PluginManager.cpp" APPEND PROPERTY COMPILE_DEFINITIONS
++	"DFHACK_PLUGIN_DESTINATION=\"${DFHACK_PLUGIN_DESTINATION}\"" )
+ 
+ SET(MAIN_SOURCES_WINDOWS
+ Console-windows.cpp
+diff --git a/library/PluginManager.cpp b/library/PluginManager.cpp
+index b17f8e21..ab26b5bf 100644
+--- a/library/PluginManager.cpp
++++ b/library/PluginManager.cpp
+@@ -51,6 +51,7 @@ using namespace std;
+ #include "tinythread.h"
+ 
+ #include <assert.h>
++#include <string.h>
+ 
+ #define MUTEX_GUARD(lock) auto lock_##__LINE__ = make_mutex_guard(lock);
+ template <typename T>
+@@ -69,7 +70,11 @@ tthread::lock_guard<T> make_mutex_guard (T *mutex)
+ 
+ static string getPluginPath()
+ {
+-    return Core::getInstance().getHackPath() + "plugins/";
++    if(strncmp(DFHACK_PLUGIN_DESTINATION, "hack/plugins", 13) == 0)
++        // This is the default value
++        return Core::getInstance().getHackPath() + "plugins/";
++    else
++        return DFHACK_PLUGIN_DESTINATION "/";
+ }
+ 
+ static string getPluginPath (std::string name)
diff --git a/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/04-respect-1.patch b/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/04-respect-1.patch
new file mode 100644
index 0000000..a49181c
--- /dev/null
+++ b/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/04-respect-1.patch
@@ -0,0 +1,62 @@
+respect DFHACK_LIBRARY_DESTINATION
+
+From: eroen <dfhack@occam.eroen.eu>
+
+
+---
+ CMakeLists.txt              |    4 ++--
+ plugins/ruby/CMakeLists.txt |    2 ++
+ plugins/ruby/ruby.cpp       |    6 +++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4c4d5568..aada996d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -187,11 +187,11 @@ set(DFHACK_BUILD_ID "" CACHE STRING "Build ID (should be specified on command li
+ # the dfhack libraries will be installed here:
+ IF(UNIX)
+     # put the lib into DF/hack
+-    SET(DFHACK_LIBRARY_DESTINATION hack)
++    SET(DFHACK_LIBRARY_DESTINATION hack CACHE INTERNAL "")
+     SET(DFHACK_EGGY_DESTINATION libs)
+ ELSE()
+     # windows is crap, therefore we can't do nice things with it. leave the libs on a nasty pile...
+-    SET(DFHACK_LIBRARY_DESTINATION .)
++    SET(DFHACK_LIBRARY_DESTINATION . CACHE INTERNAL "")
+     SET(DFHACK_EGGY_DESTINATION .)
+ ENDIF()
+ # external tools will be installed here:
+diff --git a/plugins/ruby/CMakeLists.txt b/plugins/ruby/CMakeLists.txt
+index c2c80e79..36750bee 100644
+--- a/plugins/ruby/CMakeLists.txt
++++ b/plugins/ruby/CMakeLists.txt
+@@ -76,6 +76,8 @@ INCLUDE_DIRECTORIES("${dfhack_SOURCE_DIR}/depends/tthread")
+ 
+ DFHACK_PLUGIN(ruby ruby.cpp LINK_LIBRARIES dfhack-tinythread)
+ ADD_DEPENDENCIES(ruby ruby-autogen-rb)
++set_property( SOURCE "ruby.cpp" APPEND PROPERTY COMPILE_DEFINITIONS
++        "DFHACK_LIBRARY_DESTINATION=\"${DFHACK_LIBRARY_DESTINATION}\"" )
+ 
+ IF(EXISTS ${RUBYLIB})
+     INSTALL(FILES ${RUBYLIB} DESTINATION ${DFHACK_LIBRARY_DESTINATION} RENAME ${RUBYLIB_INSTALL_NAME})
+diff --git a/plugins/ruby/ruby.cpp b/plugins/ruby/ruby.cpp
+index 240a67cb..4811aa2f 100644
+--- a/plugins/ruby/ruby.cpp
++++ b/plugins/ruby/ruby.cpp
+@@ -323,12 +323,12 @@ static int df_loadruby(void)
+ {
+     const char *libpaths[] = {
+ #if defined(WIN32)
+-        "./libruby.dll",
++        DFHACK_LIBRARY_DESTINATION "./libruby.dll",
+ #elif defined(__APPLE__)
+-        "hack/libruby.dylib",
++        DFHACK_LIBRARY_DESTINATION "/libruby.dylib",
+         "/System/Library/Frameworks/Ruby.framework/Ruby",
+ #else
+-        "hack/libruby.so",
++        DFHACK_LIBRARY_DESTINATION "hack/libruby.so",
+         "libruby.so",
+ #endif
+         NULL
diff --git a/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/05-introduce.patch b/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/05-introduce.patch
new file mode 100644
index 0000000..9b7cc1b
--- /dev/null
+++ b/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/05-introduce.patch
@@ -0,0 +1,596 @@
+introduce DFHACK_RUBY_DESTINATION
+
+From: eroen <dfhack@occam.eroen.eu>
+
+
+---
+ CMakeLists.txt              |    2 
+ plugins/ruby/CMakeLists.txt |    8 +
+ plugins/ruby/ruby.cpp       |    2 
+ plugins/ruby/ruby.rb        |  258 -------------------------------------------
+ plugins/ruby/ruby.rb.in     |  258 +++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 267 insertions(+), 261 deletions(-)
+ delete mode 100644 plugins/ruby/ruby.rb
+ create mode 100644 plugins/ruby/ruby.rb.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aada996d..64cbfdaa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -204,6 +204,8 @@ SET(DFHACK_PLUGIN_DESTINATION hack/plugins CACHE INTERNAL "")
+ SET(DFHACK_INCLUDES_DESTINATION hack/include)
+ # dfhack lua files go here:
+ SET(DFHACK_LUA_DESTINATION hack/lua CACHE INTERNAL "")
++# dfhack ruby files go here:
++SET(DFHACK_RUBY_DESTINATION hack/ruby CACHE INTERNAL "")
+ # the windows .lib file goes here:
+ SET(DFHACK_DEVLIB_DESTINATION hack)
+ 
+diff --git a/plugins/ruby/CMakeLists.txt b/plugins/ruby/CMakeLists.txt
+index 36750bee..bae0396e 100644
+--- a/plugins/ruby/CMakeLists.txt
++++ b/plugins/ruby/CMakeLists.txt
+@@ -77,7 +77,8 @@ INCLUDE_DIRECTORIES("${dfhack_SOURCE_DIR}/depends/tthread")
+ DFHACK_PLUGIN(ruby ruby.cpp LINK_LIBRARIES dfhack-tinythread)
+ ADD_DEPENDENCIES(ruby ruby-autogen-rb)
+ set_property( SOURCE "ruby.cpp" APPEND PROPERTY COMPILE_DEFINITIONS
+-        "DFHACK_LIBRARY_DESTINATION=\"${DFHACK_LIBRARY_DESTINATION}\"" )
++        "DFHACK_LIBRARY_DESTINATION=\"${DFHACK_LIBRARY_DESTINATION}\""
++        "DFHACK_RUBY_DESTINATION=\"${DFHACK_RUBY_DESTINATION}\"")
+ 
+ IF(EXISTS ${RUBYLIB})
+     INSTALL(FILES ${RUBYLIB} DESTINATION ${DFHACK_LIBRARY_DESTINATION} RENAME ${RUBYLIB_INSTALL_NAME})
+@@ -88,8 +89,11 @@ ELSE()
+     ENDIF()
+ ENDIF()
+ 
++configure_file( ruby.rb.in ruby.rb @ONLY )
+ INSTALL(DIRECTORY .
+-        DESTINATION hack/ruby
++        DESTINATION ${DFHACK_RUBY_DESTINATION}
+         FILES_MATCHING PATTERN "*.rb")
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ruby.rb
++	DESTINATION ${DFHACK_RUBY_DESTINATION})
+ 
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RUBYAUTOGEN} DESTINATION hack/ruby)
+diff --git a/plugins/ruby/ruby.cpp b/plugins/ruby/ruby.cpp
+index 4811aa2f..7005e605 100644
+--- a/plugins/ruby/ruby.cpp
++++ b/plugins/ruby/ruby.cpp
+@@ -460,7 +460,7 @@ static void df_rubythread(void *p)
+ 
+     // load the default ruby-level definitions in the background
+     state=0;
+-    rb_eval_string_protect("require './hack/ruby/ruby'", &state);
++    rb_eval_string_protect("require '" DFHACK_RUBY_DESTINATION "/ruby'", &state);
+     if (state)
+         dump_rb_error();
+ 
+diff --git a/plugins/ruby/ruby.rb b/plugins/ruby/ruby.rb
+deleted file mode 100644
+index 663f8511..00000000
+--- a/plugins/ruby/ruby.rb
++++ /dev/null
+@@ -1,258 +0,0 @@
+-# redefine standard i/o methods to use the dfhack console
+-module Kernel
+-    def puts(*a)
+-        a.flatten.each { |l|
+-            # XXX looks like print_str crashes with strings longer than 4096... maybe not nullterminated ?
+-            # this workaround fixes it
+-            s = l.to_s.chomp + "\n"
+-            while s.length > 0
+-                DFHack.print_str(s[0, 4000])
+-                s[0, 4000] = ''
+-            end
+-        }
+-        nil
+-    end
+-
+-    def puts_err(*a)
+-        a.flatten.each { |l|
+-            s = l.to_s.chomp + "\n"
+-            while s.length > 0
+-                DFHack.print_err(s[0, 4000])
+-                s[0, 4000] = ''
+-            end
+-        }
+-        nil
+-    end
+-
+-    def p(*a)
+-        a.each { |e|
+-            puts_err e.inspect
+-        }
+-        nil
+-    end
+-end
+-
+-module DFHack
+-    VERSION = version
+-
+-    class OnupdateCallback
+-        attr_accessor :callback, :timelimit, :minyear, :minyeartick, :description
+-        def initialize(descr, cb, tl, initdelay=0)
+-            @description = descr
+-            @callback = cb
+-            @ticklimit = tl
+-            @minyear = (tl ? df.cur_year : 0)
+-            @minyeartick = (tl ? df.cur_year_tick+initdelay : 0)
+-        end
+-
+-        # run callback if timedout
+-        def check_run(year, yeartick, yearlen)
+-            if @ticklimit
+-                return unless year > @minyear or (year == @minyear and yeartick >= @minyeartick)
+-                @minyear = year
+-                @minyeartick = yeartick + @ticklimit
+-                if @minyeartick > yearlen
+-                    @minyear += 1
+-                    @minyeartick -= yearlen
+-                end
+-            end
+-            # t0 = Time.now
+-            @callback.call
+-            # dt = Time.now - t0 ; puts "rb cb #@description took #{'%.02f' % dt}s" if dt > 0.1
+-        rescue Exception
+-            df.onupdate_unregister self
+-            puts_err "onupdate #@description unregistered: #$!", $!.backtrace
+-        end
+-
+-        def <=>(o)
+-            [@minyear, @minyeartick] <=> [o.minyear, o.minyeartick]
+-        end
+-    end
+-
+-    class << self
+-        attr_accessor :onupdate_list, :onstatechange_list
+-
+-        # register a callback to be called every gframe or more
+-        # ex: DFHack.onupdate_register('fastdwarf') { DFHack.world.units[0].counters.job_counter = 0 }
+-        # if ticklimit is given, do not call unless this much game ticks have passed. Handles advmode time stretching.
+-        def onupdate_register(descr, ticklimit=nil, initialtickdelay=0, &b)
+-            raise ArgumentError, 'need a description as 1st arg' unless descr.kind_of?(::String)
+-            @onupdate_list ||= []
+-            @onupdate_list << OnupdateCallback.new(descr, b, ticklimit, initialtickdelay)
+-            DFHack.onupdate_active = true
+-            if onext = @onupdate_list.min
+-                DFHack.onupdate_minyear = onext.minyear
+-                DFHack.onupdate_minyeartick = onext.minyeartick
+-            end
+-            @onupdate_list.last
+-        end
+-
+-        # delete the callback for onupdate ; use the value returned by onupdate_register or the description
+-        def onupdate_unregister(b)
+-            b = @onupdate_list.find { |bb| bb.description == b } if b.kind_of?(String)
+-            @onupdate_list.delete b
+-            if @onupdate_list.empty?
+-                DFHack.onupdate_active = false
+-                DFHack.onupdate_minyear = DFHack.onupdate_minyeartick = DFHack.onupdate_minyeartickadv = -1
+-            end
+-        end
+-
+-        # same as onupdate_register, but remove the callback once it returns true
+-        def onupdate_register_once(*a)
+-            handle = onupdate_register(*a) {
+-                onupdate_unregister(handle) if yield
+-            }
+-        end
+-
+-        TICKS_PER_YEAR = 1200*28*12
+-        # this method is called by ruby.cpp if df.onupdate_active is true
+-        def onupdate
+-            @onupdate_list ||= []
+-
+-            y = yt = 0
+-            y = cur_year rescue 0
+-            ytmax = TICKS_PER_YEAR
+-            if df.gamemode == :ADVENTURE and df.respond_to?(:cur_year_tick_advmode)
+-                yt = cur_year_tick_advmode
+-                ytmax *= 144
+-            else
+-                yt = cur_year_tick rescue 0
+-            end
+-
+-            @onupdate_list.each { |o|
+-                o.check_run(y, yt, ytmax)
+-            }
+-
+-            if onext = @onupdate_list.min
+-                DFHack.onupdate_minyear = onext.minyear
+-                if ytmax > TICKS_PER_YEAR
+-                    DFHack.onupdate_minyeartick = -1
+-                    DFHack.onupdate_minyeartickadv = onext.minyeartick
+-                else
+-                    DFHack.onupdate_minyeartick = onext.minyeartick
+-                    DFHack.onupdate_minyeartickadv = -1
+-                end
+-            end
+-        end
+-
+-        # register a callback to be called every gframe or more
+-        # ex: DFHack.onstatechange_register { |newstate| puts "state changed to #{newstate}" }
+-        def onstatechange_register(&b)
+-            @onstatechange_list ||= []
+-            @onstatechange_list << b
+-            @onstatechange_list.last
+-        end
+-
+-        # delete the callback for onstatechange ; use the value returned by onstatechange_register
+-        def onstatechange_unregister(b)
+-            @onstatechange_list.delete b
+-        end
+-
+-        # same as onstatechange_register, but auto-unregisters if the block returns true
+-        def onstatechange_register_once
+-            handle = onstatechange_register { |st|
+-                onstatechange_unregister(handle) if yield(st)
+-            }
+-        end
+-
+-
+-        # this method is called by dfhack every 'onstatechange'
+-        def onstatechange(newstate)
+-            @onstatechange_list ||= []
+-            @onstatechange_list.each { |cb| cb.call(newstate) }
+-        end
+-
+-        # return true if the argument is under the cursor
+-        def at_cursor?(obj)
+-            same_pos?(obj, cursor)
+-        end
+-
+-        # returns true if both arguments are at the same x/y/z
+-        def same_pos?(pos1, pos2)
+-            pos1 = pos1.pos if pos1.respond_to?(:pos)
+-            pos2 = pos2.pos if pos2.respond_to?(:pos)
+-            pos1.x == pos2.x and pos1.y == pos2.y and pos1.z == pos2.z
+-        end
+-
+-        # try to match a user-specified name to one from the raws
+-        # uses case-switching and substring matching
+-        # eg match_rawname('coal', ['COAL_BITUMINOUS', 'BAUXITE']) => 'COAL_BITUMINOUS'
+-        def match_rawname(name, rawlist)
+-            rawlist.each { |r| return r if name == r }
+-            rawlist.each { |r| return r if name.downcase == r.downcase }
+-            may = rawlist.find_all { |r| r.downcase.index(name.downcase) }
+-            may.first if may.length == 1
+-        end
+-
+-        def translate_name(name, english=true, onlylastpart=false)
+-            out = []
+-
+-            if not onlylastpart
+-                out << name.first_name if name.first_name != ''
+-                if name.nickname != ''
+-                    case respond_to?(:d_init) && d_init.nickname[gametype]
+-                    when :REPLACE_ALL; return "`#{name.nickname}'"
+-                    when :REPLACE_FIRST; out.pop
+-                    end
+-                    out << "`#{name.nickname}'"
+-                end
+-            end
+-            return out.join(' ') unless name.words.find { |w| w >= 0 }
+-
+-            if not english
+-                tsl = world.raws.language.translations[name.language]
+-                if name.words[0] >= 0 or name.words[1] >= 0
+-                    out << ''
+-                    out.last << tsl.words[name.words[0]] if name.words[0] >= 0
+-                    out.last << tsl.words[name.words[1]] if name.words[1] >= 0
+-                end
+-                if name.words[5] >= 0
+-                    out << ''
+-                    (2..5).each { |i| out.last << tsl.words[name.words[i]] if name.words[i] >= 0 }
+-                end
+-                if name.words[6] >= 0
+-                    out << tsl.words[name.words[6]]
+-                end
+-            else
+-                wl = world.raws.language
+-                if name.words[0] >= 0 or name.words[1] >= 0
+-                    out << ''
+-                    out.last << wl.words[name.words[0]].forms[name.parts_of_speech[0]] if name.words[0] >= 0
+-                    out.last << wl.words[name.words[1]].forms[name.parts_of_speech[1]] if name.words[1] >= 0
+-                end
+-                if name.words[5] >= 0
+-                    out << 'the'
+-                    out.last.capitalize! if out.length == 1
+-                    out << wl.words[name.words[2]].forms[name.parts_of_speech[2]] if name.words[2] >= 0
+-                    out << wl.words[name.words[3]].forms[name.parts_of_speech[3]] if name.words[3] >= 0
+-                    if name.words[4] >= 0
+-                        out << wl.words[name.words[4]].forms[name.parts_of_speech[4]]
+-                        out.last << '-'
+-                    else
+-                        out << ''
+-                    end
+-                    out.last << wl.words[name.words[5]].forms[name.parts_of_speech[5]]
+-                end
+-                if name.words[6] >= 0
+-                    out << 'of'
+-                    out.last.capitalize! if out.length == 1
+-                    out << wl.words[name.words[6]].forms[name.parts_of_speech[6]]
+-                end
+-            end
+-
+-            out.join(' ')
+-        end
+-    end
+-end
+-
+-# global alias so we can write 'df.world.units.all[0]'
+-def df
+-    DFHack
+-end
+-
+-# load autogenned file
+-require './hack/ruby/ruby-autogen-defs'
+-require(RUBY_PLATFORM =~ /mswin|mingw|cygwin/i ? './hack/ruby/ruby-autogen-win' : './hack/ruby/ruby-autogen-gcc')
+-
+-# load all modules
+-Dir['./hack/ruby/*.rb'].each { |m| require m.chomp('.rb') if m !~ /ruby-autogen/ }
+diff --git a/plugins/ruby/ruby.rb.in b/plugins/ruby/ruby.rb.in
+new file mode 100644
+index 00000000..75c385ca
+--- /dev/null
++++ b/plugins/ruby/ruby.rb.in
+@@ -0,0 +1,258 @@
++# redefine standard i/o methods to use the dfhack console
++module Kernel
++    def puts(*a)
++        a.flatten.each { |l|
++            # XXX looks like print_str crashes with strings longer than 4096... maybe not nullterminated ?
++            # this workaround fixes it
++            s = l.to_s.chomp + "\n"
++            while s.length > 0
++                DFHack.print_str(s[0, 4000])
++                s[0, 4000] = ''
++            end
++        }
++        nil
++    end
++
++    def puts_err(*a)
++        a.flatten.each { |l|
++            s = l.to_s.chomp + "\n"
++            while s.length > 0
++                DFHack.print_err(s[0, 4000])
++                s[0, 4000] = ''
++            end
++        }
++        nil
++    end
++
++    def p(*a)
++        a.each { |e|
++            puts_err e.inspect
++        }
++        nil
++    end
++end
++
++module DFHack
++    VERSION = version
++
++    class OnupdateCallback
++        attr_accessor :callback, :timelimit, :minyear, :minyeartick, :description
++        def initialize(descr, cb, tl, initdelay=0)
++            @description = descr
++            @callback = cb
++            @ticklimit = tl
++            @minyear = (tl ? df.cur_year : 0)
++            @minyeartick = (tl ? df.cur_year_tick+initdelay : 0)
++        end
++
++        # run callback if timedout
++        def check_run(year, yeartick, yearlen)
++            if @ticklimit
++                return unless year > @minyear or (year == @minyear and yeartick >= @minyeartick)
++                @minyear = year
++                @minyeartick = yeartick + @ticklimit
++                if @minyeartick > yearlen
++                    @minyear += 1
++                    @minyeartick -= yearlen
++                end
++            end
++            # t0 = Time.now
++            @callback.call
++            # dt = Time.now - t0 ; puts "rb cb #@description took #{'%.02f' % dt}s" if dt > 0.1
++        rescue Exception
++            df.onupdate_unregister self
++            puts_err "onupdate #@description unregistered: #$!", $!.backtrace
++        end
++
++        def <=>(o)
++            [@minyear, @minyeartick] <=> [o.minyear, o.minyeartick]
++        end
++    end
++
++    class << self
++        attr_accessor :onupdate_list, :onstatechange_list
++
++        # register a callback to be called every gframe or more
++        # ex: DFHack.onupdate_register('fastdwarf') { DFHack.world.units[0].counters.job_counter = 0 }
++        # if ticklimit is given, do not call unless this much game ticks have passed. Handles advmode time stretching.
++        def onupdate_register(descr, ticklimit=nil, initialtickdelay=0, &b)
++            raise ArgumentError, 'need a description as 1st arg' unless descr.kind_of?(::String)
++            @onupdate_list ||= []
++            @onupdate_list << OnupdateCallback.new(descr, b, ticklimit, initialtickdelay)
++            DFHack.onupdate_active = true
++            if onext = @onupdate_list.min
++                DFHack.onupdate_minyear = onext.minyear
++                DFHack.onupdate_minyeartick = onext.minyeartick
++            end
++            @onupdate_list.last
++        end
++
++        # delete the callback for onupdate ; use the value returned by onupdate_register or the description
++        def onupdate_unregister(b)
++            b = @onupdate_list.find { |bb| bb.description == b } if b.kind_of?(String)
++            @onupdate_list.delete b
++            if @onupdate_list.empty?
++                DFHack.onupdate_active = false
++                DFHack.onupdate_minyear = DFHack.onupdate_minyeartick = DFHack.onupdate_minyeartickadv = -1
++            end
++        end
++
++        # same as onupdate_register, but remove the callback once it returns true
++        def onupdate_register_once(*a)
++            handle = onupdate_register(*a) {
++                onupdate_unregister(handle) if yield
++            }
++        end
++
++        TICKS_PER_YEAR = 1200*28*12
++        # this method is called by ruby.cpp if df.onupdate_active is true
++        def onupdate
++            @onupdate_list ||= []
++
++            y = yt = 0
++            y = cur_year rescue 0
++            ytmax = TICKS_PER_YEAR
++            if df.gamemode == :ADVENTURE and df.respond_to?(:cur_year_tick_advmode)
++                yt = cur_year_tick_advmode
++                ytmax *= 144
++            else
++                yt = cur_year_tick rescue 0
++            end
++
++            @onupdate_list.each { |o|
++                o.check_run(y, yt, ytmax)
++            }
++
++            if onext = @onupdate_list.min
++                DFHack.onupdate_minyear = onext.minyear
++                if ytmax > TICKS_PER_YEAR
++                    DFHack.onupdate_minyeartick = -1
++                    DFHack.onupdate_minyeartickadv = onext.minyeartick
++                else
++                    DFHack.onupdate_minyeartick = onext.minyeartick
++                    DFHack.onupdate_minyeartickadv = -1
++                end
++            end
++        end
++
++        # register a callback to be called every gframe or more
++        # ex: DFHack.onstatechange_register { |newstate| puts "state changed to #{newstate}" }
++        def onstatechange_register(&b)
++            @onstatechange_list ||= []
++            @onstatechange_list << b
++            @onstatechange_list.last
++        end
++
++        # delete the callback for onstatechange ; use the value returned by onstatechange_register
++        def onstatechange_unregister(b)
++            @onstatechange_list.delete b
++        end
++
++        # same as onstatechange_register, but auto-unregisters if the block returns true
++        def onstatechange_register_once
++            handle = onstatechange_register { |st|
++                onstatechange_unregister(handle) if yield(st)
++            }
++        end
++
++
++        # this method is called by dfhack every 'onstatechange'
++        def onstatechange(newstate)
++            @onstatechange_list ||= []
++            @onstatechange_list.each { |cb| cb.call(newstate) }
++        end
++
++        # return true if the argument is under the cursor
++        def at_cursor?(obj)
++            same_pos?(obj, cursor)
++        end
++
++        # returns true if both arguments are at the same x/y/z
++        def same_pos?(pos1, pos2)
++            pos1 = pos1.pos if pos1.respond_to?(:pos)
++            pos2 = pos2.pos if pos2.respond_to?(:pos)
++            pos1.x == pos2.x and pos1.y == pos2.y and pos1.z == pos2.z
++        end
++
++        # try to match a user-specified name to one from the raws
++        # uses case-switching and substring matching
++        # eg match_rawname('coal', ['COAL_BITUMINOUS', 'BAUXITE']) => 'COAL_BITUMINOUS'
++        def match_rawname(name, rawlist)
++            rawlist.each { |r| return r if name == r }
++            rawlist.each { |r| return r if name.downcase == r.downcase }
++            may = rawlist.find_all { |r| r.downcase.index(name.downcase) }
++            may.first if may.length == 1
++        end
++
++        def translate_name(name, english=true, onlylastpart=false)
++            out = []
++
++            if not onlylastpart
++                out << name.first_name if name.first_name != ''
++                if name.nickname != ''
++                    case respond_to?(:d_init) && d_init.nickname[gametype]
++                    when :REPLACE_ALL; return "`#{name.nickname}'"
++                    when :REPLACE_FIRST; out.pop
++                    end
++                    out << "`#{name.nickname}'"
++                end
++            end
++            return out.join(' ') unless name.words.find { |w| w >= 0 }
++
++            if not english
++                tsl = world.raws.language.translations[name.language]
++                if name.words[0] >= 0 or name.words[1] >= 0
++                    out << ''
++                    out.last << tsl.words[name.words[0]] if name.words[0] >= 0
++                    out.last << tsl.words[name.words[1]] if name.words[1] >= 0
++                end
++                if name.words[5] >= 0
++                    out << ''
++                    (2..5).each { |i| out.last << tsl.words[name.words[i]] if name.words[i] >= 0 }
++                end
++                if name.words[6] >= 0
++                    out << tsl.words[name.words[6]]
++                end
++            else
++                wl = world.raws.language
++                if name.words[0] >= 0 or name.words[1] >= 0
++                    out << ''
++                    out.last << wl.words[name.words[0]].forms[name.parts_of_speech[0]] if name.words[0] >= 0
++                    out.last << wl.words[name.words[1]].forms[name.parts_of_speech[1]] if name.words[1] >= 0
++                end
++                if name.words[5] >= 0
++                    out << 'the'
++                    out.last.capitalize! if out.length == 1
++                    out << wl.words[name.words[2]].forms[name.parts_of_speech[2]] if name.words[2] >= 0
++                    out << wl.words[name.words[3]].forms[name.parts_of_speech[3]] if name.words[3] >= 0
++                    if name.words[4] >= 0
++                        out << wl.words[name.words[4]].forms[name.parts_of_speech[4]]
++                        out.last << '-'
++                    else
++                        out << ''
++                    end
++                    out.last << wl.words[name.words[5]].forms[name.parts_of_speech[5]]
++                end
++                if name.words[6] >= 0
++                    out << 'of'
++                    out.last.capitalize! if out.length == 1
++                    out << wl.words[name.words[6]].forms[name.parts_of_speech[6]]
++                end
++            end
++
++            out.join(' ')
++        end
++    end
++end
++
++# global alias so we can write 'df.world.units.all[0]'
++def df
++    DFHack
++end
++
++# load autogenned file
++require '@DFHACK_RUBY_DESTINATION@/ruby-autogen-defs'
++require(RUBY_PLATFORM =~ /mswin|mingw|cygwin/i ? '@DFHACK_RUBY_DESTINATION@/ruby-autogen-win' : '@DFHACK_RUBY_DESTINATION@/ruby-autogen-gcc')
++
++# load all modules
++Dir['@DFHACK_RUBY_DESTINATION@/*.rb'].each { |m| require m.chomp('.rb') if m !~ /ruby-autogen/ }
diff --git a/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/series b/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/series
new file mode 100644
index 0000000..bf94601
--- /dev/null
+++ b/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/series
@@ -0,0 +1,6 @@
+# This series applies on GIT commit e86e20717e34c8ad1bce6bdba6463f2df807ad79
+01-respect.patch
+02-respect-dfhack_lua_destination.patch
+03-respect-0.patch
+04-respect-1.patch
+05-introduce.patch