- Update to 0.16.1

PR:		200158
Submitted by:	tobias.rehbein@web.de (maintainer)

13 files changed, 168 insertions, 309 deletions

diff --git a/games/stonesoup-sdl/Makefile b/games/stonesoup-sdl/Makefile
index 954fd18ba144..53f688d962e6 100644
--- a/games/stonesoup-sdl/Makefile
+++ b/games/stonesoup-sdl/Makefile
@@ -1,8 +1,6 @@
 # Created by: tobias.rehbein@web.de
 # $FreeBSD$
 
-PORTREVISION=	1
-
 PORT_OPTIONS+=	SDL
 
 MASTERDIR=	${.CURDIR}/../stonesoup
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index c356e2c78903..fa89c3b9ab4f 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -2,22 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	stonesoup
-PORTVERSION=	0.15.2
-PORTREVISION=	1
+PORTVERSION=	0.16.1
 CATEGORIES=	games
 MASTER_SITES=	SF/crawl-ref/Stone%20Soup/${PORTVERSION}
+MASTER_SITES=	http://crawl.develz.org/release/
 DISTNAME=	stone_soup-${PORTVERSION}-nodeps
 
 MAINTAINER=	tobias.rehbein@web.de
 COMMENT=	Dungeon Crawl Stone Soup - a fun, free rogue-like game
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKDIR}/stone_soup-${PORTVERSION}/licence.txt
+LICENSE_FILE=	${WRKSRC}/../licence.txt
 
 USE_SQLITE=	yes
-USES=		bison compiler gmake lua:51 perl5 pkgconfig shebangfix tar:xz
+USES=		bison compiler:c++11-lib gmake lua:51 perl5 pkgconfig \
+		shebangfix tar:xz
+
 USE_PERL5=	build
-SHEBANG_FILES=	util/gen-mi-enum
+SHEBANG_FILES=	util/gen-mi-enum \
+		util/good-depfile
 
 SAVEDIR=	\~/.stonesoup
 WRKSRC=		${WRKDIR}/stone_soup-${PORTVERSION}/source/
@@ -25,10 +28,12 @@ WRKSRC=		${WRKDIR}/stone_soup-${PORTVERSION}/source/
 SUB_FILES=	README.FreeBSD
 PLIST_SUB=	SAVEDIR="${SAVEDIR}"
 
-OPTIONS_DEFINE=	SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES
+# WIZARD is currently broken upstream, remove until fixed
+##OPTIONS_DEFINE=	SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES
+OPTIONS_DEFINE=	SOUND LUA_BINDINGS DOCS EXAMPLES
 
 SOUND_DESC=	Sound support
-WIZARD_DESC=	Wizard mode
+##WIZARD_DESC=	Wizard mode
 LUA_BINDINGS_DESC=	Bindings for LUA user scripts
 
 MAKE_ARGS=	prefix=${PREFIX} \
@@ -39,8 +44,7 @@ MAKE_ARGS=	prefix=${PREFIX} \
 		NO_AUTO_OPT=YesPlease \
 		NO_OPTIMIZE=YesPlease \
 		SQLITE_INCLUDE_DIR=${LOCALBASE}/include \
-		SQLITE_LIB=-lsqlite3 \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		SQLITE_LIB=-lsqlite3
 
 .include <bsd.port.options.mk>
 
@@ -48,13 +52,14 @@ MAKE_ARGS=	prefix=${PREFIX} \
 MAKE_ARGS+=	V=yes
 .endif
 
-.if empty(PORT_OPTIONS:MWIZARD)
-MAKE_ARGS+=	NOWIZARD=y
-.endif
+##.if empty(PORT_OPTIONS:MWIZARD)
+##MAKE_ARGS+=	NOWIZARD=y
+##.endif
 
 .if ${PORT_OPTIONS:MSDL}
 CONFLICTS+=	${PORTNAME}-[0-9]*
-MAKE_ARGS+=	TILES=y
+MAKE_ARGS+=	TILES=y \
+		GL_INCLUDE="-I ${LOCALBASE}/include/GL"
 PLIST_SUB+=	SDL=""
 PKGNAMESUFFIX=	-sdl
 BUILD_DEPENDS+=	fc-list:${PORTSDIR}/x11-fonts/fontconfig \
@@ -62,7 +67,8 @@ BUILD_DEPENDS+=	fc-list:${PORTSDIR}/x11-fonts/fontconfig \
 RUN_DEPENDS+=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
 LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2
-USE_SDL=	sdl image
+USE_SDL=	sdl2 image2
+USE_GL=		yes
 .else
 USES+=		ncurses
 CONFLICTS+=	${PORTNAME}-sdl-[0-9]*
@@ -79,12 +85,12 @@ MAKE_ARGS+=	NO_LUA_BINDINGS=yes
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} == clang
-CFLAGS+=	-std=c++0x
+.if ${COMPILER_TYPE} != clang
+CFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile
+#	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile
 .if ${PORT_OPTIONS:MSOUND}
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h
 	@${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h
diff --git a/games/stonesoup/distinfo b/games/stonesoup/distinfo
index 400ca6357ed3..b998a467c652 100644
--- a/games/stonesoup/distinfo
+++ b/games/stonesoup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (stone_soup-0.15.2-nodeps.tar.xz) = e93a82880801fb60794c9c05ccbab03d5c7e1f105e5968d2cebc760d387a21e2
-SIZE (stone_soup-0.15.2-nodeps.tar.xz) = 8979684
+SHA256 (stone_soup-0.16.1-nodeps.tar.xz) = e93ae81f93dbeec17c1bd9ac8bcd84e951a5856124fb7c93c336e9678ab9cfe4
+SIZE (stone_soup-0.16.1-nodeps.tar.xz) = 9250980
diff --git a/games/stonesoup/files/patch-AppHdr.h b/games/stonesoup/files/patch-AppHdr.h
index 58784912bfe4..88dfa91487d4 100644
--- a/games/stonesoup/files/patch-AppHdr.h
+++ b/games/stonesoup/files/patch-AppHdr.h
@@ -1,6 +1,6 @@
---- ./AppHdr.h.orig	2014-08-28 05:28:56.000000000 +0200
-+++ ./AppHdr.h	2014-08-29 18:32:12.007217932 +0200
-@@ -146,7 +146,7 @@
+--- AppHdr.h.orig	2015-03-23 01:49:21 UTC
++++ AppHdr.h
+@@ -147,7 +147,7 @@ static inline double pow(int x, double y
      //
      // WARNING: Filenames passed to this command *are not validated in any way*.
      //
diff --git a/games/stonesoup/files/patch-Makefile b/games/stonesoup/files/patch-Makefile
index de953b0b10d1..91e38ff8c7ff 100644
--- a/games/stonesoup/files/patch-Makefile
+++ b/games/stonesoup/files/patch-Makefile
@@ -1,24 +1,33 @@
---- ./Makefile.orig	2014-08-28 05:28:56.000000000 +0200
-+++ ./Makefile	2014-08-29 18:32:12.040229158 +0200
-@@ -69,7 +69,7 @@
- #    ask for a package with convenience libraries instead -- we'll try to provide
- #    them somewhere in the near future.
+--- Makefile.orig	2015-03-23 01:49:21 UTC
++++ Makefile
+@@ -71,7 +71,7 @@
+ #    them; you can also ask for a package with convenience libraries instead --
+ #    we'll try to provide them somewhere in the near future.
  
 -GAME = crawl
 +GAME = stonesoup
  
  # Disable GNU Make implicit rules and variables. Leaving them enabled will slow
  # down MinGW and Cygwin builds by a very VERY noticeable degree. Besides, we have
-@@ -101,7 +101,7 @@
+@@ -103,7 +103,7 @@ include Makefile.obj
  #
  
  
 -CFOTHERS := -pipe $(EXTERNAL_FLAGS)
 +CFOTHERS := $(CFLAGS)
- CFWARN := -Wall -Wformat-security
- CFWARN_L := -Wundef
+ CFWARN := 
+ CFWARN_L := -Wall -Wformat-security -Wundef
+ 
+@@ -112,7 +112,7 @@ DEFINES := $(EXTERNAL_DEFINES)
+ ifdef ANDROID
+ LDFLAGS := $(EXTERNAL_LDFLAGS) $(LDFLAGS)
+ else
+-LDFLAGS := $(EXTERNAL_LDFLAGS)
++# LDFLAGS := $(EXTERNAL_LDFLAGS)
+ endif
  
-@@ -118,8 +118,6 @@
+ #
+@@ -120,8 +120,6 @@ endif
  #
  AR = ar
  RANLIB = ranlib
@@ -27,19 +36,40 @@
  RM = rm -f
  COPY = cp
  COPY_R = cp -r
-@@ -535,9 +533,9 @@
-   ifneq (,$(shell $(GXX) --version|grep 'g++.*4\.2\.'))
-     # OS X uses a buggy ancient version of gcc without fixes from even
-     # subsequent point releases of 4.2.
+@@ -495,16 +493,6 @@ ifneq ($(GCC_VER),)
+ GCC_VER_SUFFIX:=-$(GCC_VER)
+ endif
+ 
+-# Attempt to use a full compiler name, to make
+-# distcc builds work nicely.
+-LMACH := $(shell gcc -dumpmachine)-
+-ifeq ($(LMACH),-)
+-LMACH :=
+-endif
+-ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null && echo "Yes"),)
+-LMACH :=
+-endif
+-
+ ifneq ($(FORCE_CC),)
+ GCC := $(FORCE_CC)
+ else
+@@ -554,15 +542,6 @@ ifdef USE_ICC
+ 
+ # Some very good optimization flags.
+   CFOPTIMIZE := -O2 -parallel
+-else
+-
+-  ifneq (,$(shell $(GXX) --version|grep 'g++.*4\.2\.'))
+-    # OS X uses a buggy ancient version of gcc without fixes from even
+-    # subsequent point releases of 4.2.
 -    CFOPTIMIZE := -O0
-+    CFOPTIMIZE :=
-   else
+-  else
 -    CFOPTIMIZE := -O2
-+    CFOPTIMIZE :=
-   endif
+-  endif
  endif
  
-@@ -606,13 +604,13 @@
+ ifdef LTO
+@@ -636,13 +615,13 @@ ifndef BUILD_LUA
          LUA_PACKAGE = lua-5.1
        endif
      else
@@ -55,7 +85,7 @@
    endif
    INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I | sed -e 's/-I/-isystem /')
    CFLAGS_L  += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
-@@ -625,7 +623,7 @@
+@@ -655,7 +634,7 @@ endif
  
  ifndef BUILD_SQLITE
    ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
@@ -64,7 +94,16 @@
      LIBS += $(SQLITE_LIB)
      ifneq ($(shell grep -q sqlite3_prepare_v2 $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
        DEFINES_L += -DANCIENT_SQLITE
-@@ -777,7 +775,7 @@
+@@ -743,7 +722,7 @@ endif
+ endif
+ 
+ DEFINES_L += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL2_CFLAGS)
+-INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL2_INCLUDE)
++INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL2_INCLUDE) $(GL_INCLUDE)
+ 
+ endif # TILES
+ 
+@@ -816,7 +795,7 @@ ifndef NOWIZARD
  DEFINES += -DWIZARD
  endif
  ifdef NO_OPTIMIZE
@@ -73,30 +112,32 @@
  endif
  
  ifdef PCH
-@@ -901,7 +899,7 @@
-     INSTALL_FONTS += $(PROPORTIONAL_FONT)
-   endif
- else
--  SYS_PROPORTIONAL_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
-+  SYS_PROPORTIONAL_FONT = $(shell dir=%%LOCALBASE%%/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
-   ifeq (,$(SYS_PROPORTIONAL_FONT))
-     SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
-   endif
-@@ -924,7 +922,7 @@
-     INSTALL_FONTS += $(MONOSPACED_FONT)
-   endif
- else
--  SYS_MONOSPACED_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
-+  SYS_MONOSPACED_FONT = $(shell dir=%%LOCALBASE%%/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
-   ifeq (,$(SYS_MONOSPACED_FONT))
-     SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
-   endif
-@@ -1127,7 +1125,7 @@
+@@ -943,7 +922,7 @@ else
+   SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\
+     {\
+       fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
+-      for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\
++      for dir in %%LOCALBASE%%/share/fonts;\
+       do [ -d $$dir ] && echo $$dir; done;\
+     } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
+   ifneq (,$(SYS_PROPORTIONAL_FONT))
+@@ -968,7 +947,7 @@ else
+   SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\
+     {\
+       fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
+-      for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\
++      for dir in %%LOCALBASE%%/share/fonts;\
+       do [ -d $$dir ] && echo $$dir; done;\
+     } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
+   ifneq (,$(SYS_MONOSPACED_FONT))
+@@ -1035,10 +1014,6 @@ CFWARN := -wd383,810,869,981,1418 -we14,
+ CFWARN_L :=
+ endif
  
- LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
- SRC_PKG_BASE  := stone_soup
--SRC_VERSION   := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
-+SRC_VERSION   := $(shell cat util/release_ver)
- MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|sed -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
+-ifeq (,$(shell echo 'int main(){return 1;}'|$(GXX) -x c++ - -o /dev/null -fuse-ld=gold 2>&1))
+-  LDFLAGS += -fuse-ld=gold
+-endif
+-
+ LDFLAGS += $(CFOPTIMIZE) $(CFOPTIMIZE_L)
  
- export SRC_VERSION
+ ifdef REPORT
diff --git a/games/stonesoup/files/patch-dat__des__branches__dis.des b/games/stonesoup/files/patch-dat__des__branches__dis.des
deleted file mode 100644
index db5be3fb177e..000000000000
--- a/games/stonesoup/files/patch-dat__des__branches__dis.des
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./dat/des/branches/dis.des.orig	2014-08-28 05:28:57.000000000 +0200
-+++ ./dat/des/branches/dis.des	2014-08-29 18:32:12.084218945 +0200
-@@ -209,8 +209,7 @@
- KMONS:   F = executioner
- KMONS:   ! = iron devil / skeletal warrior / hell knight / place:Zot:1 skeleton w:15
- KMONS:   ? = patrolling iron imp
--: dgn.delayed_decay(_G, '%', 'human corpse / human skeleton, \
--:                             human corpse / human skeleton')
-+: dgn.delayed_decay(_G, '%', 'human corpse / human skeleton, human corpse / human skeleton')
- : else
- KMONS:   01 = ghost moth
- KMONS:   23 = golden dragon
diff --git a/games/stonesoup/files/patch-dat__des__builder__shops.des b/games/stonesoup/files/patch-dat__des__builder__shops.des
deleted file mode 100644
index 030b6703fc03..000000000000
--- a/games/stonesoup/files/patch-dat__des__builder__shops.des
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./dat/des/builder/shops.des.orig	2014-08-28 05:28:57.000000000 +0200
-+++ ./dat/des/builder/shops.des	2014-08-29 18:32:12.133218080 +0200
-@@ -387,15 +387,7 @@
- : local shopname = util.random_from({"type:Blasphemy suffix:Boutique",
- :   "type:Evil suffix:Emporium", "type:Profane suffix:Products",
- :   "type:Sacrilege suffix:Store", "type:Wicked suffix:Wares"})
--: kfeat("s = general shop " .. shopname .. " ; \
--:   potion of blood | any weapon ego:draining w:15 | any weapon ego:pain w:5 | \
--:   any weapon ego:vampirism w:5 | demon blade w:5 | \
--:   demon whip w:5 | demon trident w:5 | wand of draining | scroll of torment | \
--:   staff of death | \
--:   lantern of shadows w:5 | book of necromancy | book of death | \
--:   book of unlife | randbook disc:necromancy w:5 | necronomicon w:1 | \
--:   grand grimoire w:1 | scythe unrand:scythe_of_curses w:1 | \
--:   bastard sword unrand:sword_of_zonguldrok w:1 | mace unrand:sceptre_of_torment w:1")
-+: kfeat("s = general shop " .. shopname .. " ; potion of blood | any weapon ego:draining w:15 | any weapon ego:pain w:5 | any weapon ego:vampirism w:5 | demon blade w:5 | demon whip w:5 | demon trident w:5 | wand of draining | scroll of torment | staff of death | lantern of shadows w:5 | book of necromancy | book of death | book of unlife | randbook disc:necromancy w:5 | necronomicon w:1 | grand grimoire w:1 | scythe unrand:scythe_of_curses w:1 | bastard sword unrand:sword_of_zonguldrok w:1 | mace unrand:sceptre_of_torment w:1")
- KFEAT: a = altar_kikubaaqudgha / altar_yredelemnul / altar_makhleb / \
-            altar_beogh w:1 / altar_lugonu w:1
- MAP
diff --git a/games/stonesoup/files/patch-dat__des__variable__grated_community.des b/games/stonesoup/files/patch-dat__des__variable__grated_community.des
deleted file mode 100644
index 0b011936492e..000000000000
--- a/games/stonesoup/files/patch-dat__des__variable__grated_community.des
+++ /dev/null
@@ -1,67 +0,0 @@
---- ./dat/des/variable/grated_community.des.orig	2014-08-28 05:28:57.000000000 +0200
-+++ ./dat/des/variable/grated_community.des	2014-08-29 18:34:10.515212244 +0200
-@@ -67,11 +67,7 @@
- KFEAT:  C = distillery shop type:Miraculous suffix:Elixirs count:10 \
-             greed:50 ; potion of confusion
- : local smithy = string.gsub(crawl.make_name(), " ", "_")
--: kfeat("D = armour shop name:The_Legendary_" .. smithy .. " \
--:        type:Legendary suffix:Smithy count:10 greed:40 ;\
--:        damaged plate armour ego:none | damaged chain mail ego:none |\
--:        damaged long sword ego:none | damaged shield ego:none |\
--:        damaged large shield ego:none | damaged battleaxe ego:none")
-+: kfeat("D = armour shop name:The_Legendary_" .. smithy .. " type:Legendary suffix:Smithy count:10 greed:40 ; damaged plate armour ego:none | damaged chain mail ego:none | damaged long sword ego:none | damaged shield ego:none | damaged large shield ego:none | damaged battleaxe ego:none")
- SHUFFLE:  QRSTUVX
- SUBVAULT: Q : grated_community_mu_home1
- SUBVAULT: R : grated_community_mu_home2
-@@ -168,16 +164,11 @@
- KFEAT:  ~ = closed_door
- SUBST: * = *:35 -:1
- KITEM: - = animal skin
--: dgn.delayed_decay_extra(_G, '*', 'human skeleton / yak skeleton /\
--:                            elf skeleton / kobold skeleton /\
--:                            elephant skeleton / sheep skeleton /\
--:                            manticore skeleton', 'animal skin')
-+: dgn.delayed_decay_extra(_G, '*', 'human skeleton / yak skeleton /elf skeleton / kobold skeleton / elephant skeleton / sheep skeleton / manticore skeleton', 'animal skin')
- KFEAT:  8 = granite_statue / orcish_idol / w:5 altar_trog /\
-             w:5 altar_beogh / w:1 altar_makhleb / w:4 floor
- KITEM:  $ = q:5 meat ration, giant spiked club, q:2 beef jerky
--: kitem("$ = q:" .. crawl.random_range(1, 5) .. " beef jerky / w:5 nothing, \
--:            q:" .. crawl.random_range(1, 3) .. " meat ration / w:5 nothing, \
--:            giant spiked club / giant club / nothing")
-+: kitem("$ = q:" .. crawl.random_range(1, 5) .. " beef jerky / w:5 nothing, q:" .. crawl.random_range(1, 3) .. " meat ration / w:5 nothing, giant spiked club / giant club / nothing")
- : local frosty = crawl.random2(6)
- : if frosty == 5 then
- SUBST:  1 = 2
-@@ -220,10 +211,8 @@
- KFEAT: * = altar_kikubaaqudgha / w:4 altar_sif_muna / w:1 altar_yredelemnul
- KITEM: " = gold, any wand / w:15 nothing, any scroll / nothing
- KFEAT: 8 = granite_statue / w:2 fountain_blood / w:1 floor
--: kitem("? = q:" .. crawl.random_range(1, 3) .. " scroll of torment /\
--:        nothing, any scroll / nothing")
--: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic /\
--:        nothing, any potion / nothing")
-+: kitem("? = q:" .. crawl.random_range(1, 3) .. " scroll of torment / nothing, any scroll / nothing")
-+: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic / nothing, any potion / nothing")
- KITEM: & = book of necromancy / book of death / book of unlife / w:12 nothing
- KMONS: P = col:darkgrey plant name:withered name_adjective               \
-            tile:mons_withered_plant / col:lightgrey plant name:withered  \
-@@ -235,8 +224,7 @@
-            nothing
- KFEAT: 8 = granite_statue / fountain_sparkling / fountain_blue / w:1 floor
- KITEM: ? = scroll of recharging / nothing, any scroll / nothing
--: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic /\
--:        nothing, any potion / nothing")
-+: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic / nothing, any potion / nothing")
- KITEM: & = book of wizardry / book of power / book of party tricks /\
-        book of alchemy / w:12 nothing
- KMONS: P = plant
-@@ -248,8 +236,7 @@
-            potion of brilliance / nothing
- KFEAT: 8 = granite_statue / w:1 floor
- KITEM: ? = scroll of immolation / nothing, any scroll / nothing
--: kitem("! = q:" .. crawl.random_range(1, 3) .. " scroll of immolation /\
--:        nothing, any potion / nothing")
-+: kitem("! = q:" .. crawl.random_range(1, 3) .. " scroll of immolation / nothing, any potion / nothing")
- KITEM: & = book of fire / book of power / book of ice /\
-        book of the tempests / w:12 nothing
- KFEAT: P = granite_statue
diff --git a/games/stonesoup/files/patch-rltiles_Makefile b/games/stonesoup/files/patch-rltiles_Makefile
new file mode 100644
index 000000000000..373c1d07f1f7
--- /dev/null
+++ b/games/stonesoup/files/patch-rltiles_Makefile
@@ -0,0 +1,37 @@
+--- rltiles/Makefile.orig	2015-03-04 04:53:28 UTC
++++ rltiles/Makefile
+@@ -10,8 +10,6 @@ endif
+ # Also, cross-compilation with no system libraries for host rather than target
+ # is not supported.  If host=target, contribs are enough.
+ 
+-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
+-
+ ifdef ANDROID
+   CXXFLAGS :=
+   LDFLAGS :=
+@@ -49,14 +47,14 @@ endif
+ 
+ # Attempt to use a full compiler name, to make
+ # distcc builds work nicely.
+-LMACH := $(shell gcc -dumpmachine)-
++LMACH := $(shell $(CC) -dumpmachine)-
+ ifeq ($(LMACH),-)
+ LMACH :=
+ endif
+-ifeq ($(shell which $(LMACH)gcc > /dev/null 2> /dev/null && echo "Yes"),)
++ifeq ($(shell which $(LMACH)$(CC) > /dev/null 2> /dev/null && echo "Yes"),)
+ LMACH :=
+ endif
+-HOSTCXX ?= $(LMACH)g++
++HOSTCXX ?= $(LMACH)$(CXX)
+ 
+ DELETE = rm -f
+ 
+@@ -133,6 +131,6 @@ distclean: clean
+ 	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
+ 
+ $(TILEGEN): $(OBJECTS)
+-	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
++	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(CFLAGS) $(LDFLAGS) $(PNG_LIB)
+ 
+ .PHONY: all clean distclean
diff --git a/games/stonesoup/files/patch-rltiles__Makefile b/games/stonesoup/files/patch-rltiles__Makefile
deleted file mode 100644
index fd9e8eddc968..000000000000
--- a/games/stonesoup/files/patch-rltiles__Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
---- ./rltiles/Makefile.orig	2013-09-30 20:32:00.000000000 +0200
-+++ ./rltiles/Makefile	2013-10-11 22:07:08.176890218 +0200
-@@ -1,7 +1,7 @@
- uname_S := $(shell uname -s)
- 
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lmingw32
-+L_LDFLAGS += -lmingw32
- endif
- 
- # Note: since generation of tiles is done on the host, we don't care about
-@@ -10,7 +10,7 @@
- # Also, cross-compilation with no system libraries for host rather than target
- # is not supported.  If host=target, contribs are enough.
- 
--CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
-+L_CFLAGS := $(CFLAGS)
- 
- ifdef ANDROID
-   CXXFLAGS :=
-@@ -35,24 +35,24 @@
-     PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a
-   endif
- 
--  CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE)
--  LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB)
-+  L_CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE)
-+  L_LDFLAGS += $(LDFLAGS) $(SDL_LDFLAGS) $(PNG_LIB)
- 
--  CFLAGS += -DUSE_TILE
-+  L_CFLAGS += -DUSE_TILE
- endif
- 
- ifdef DEBUG
--CFLAGS += -O0 -DDEBUG -ggdb
-+L_CFLAGS += -O0 -DDEBUG -ggdb
- endif
- 
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lgdi32 -lwinmm
-+L_LDFLAGS += -lgdi32 -lwinmm
- endif
- ifeq ($(uname_S),Darwin)
--LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL
-+L_LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL
- endif
- ifeq ($(uname_S),Linux)
--LDFLAGS += -ldl -lpthread
-+L_LDFLAGS += -ldl -lpthread
- endif
- 
- # Attempt to use a full compiler name, to make
-@@ -64,7 +64,7 @@
- ifeq ($(shell which $(LMACH)gcc > /dev/null 2> /dev/null && echo "Yes"),)
- LMACH :=
- endif
--HOSTCXX ?= $(LMACH)g++
-+HOSTCXX ?= $(LMACH)$(CXX)
- 
- DELETE = rm -f
- 
-@@ -109,7 +109,7 @@
- 	$(QUIET_GEN)$(TILEGEN) -c $<
- 
- # CFLAGS difference check
--TRACK_CFLAGS = $(subst ','\'',$(HOSTCXX) $(CFLAGS))           # (stray ' for highlights)
-+TRACK_CFLAGS = $(subst ','\'',$(HOSTCXX) $(L_CFLAGS))           # (stray ' for highlights)
- 
- .cflags: .force-cflags
- 	@FLAGS='$(TRACK_CFLAGS)'; \
-@@ -138,9 +138,9 @@
- distclean: clean
- 
- %.o: %.cc .cflags
--	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
-+	$(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -MMD -c $< -o $@
- 
- $(TILEGEN): $(OBJECTS)
--	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
-+	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(L_LDFLAGS)
- 
- .PHONY: all clean distclean
diff --git a/games/stonesoup/files/patch-rltiles__tool__tile.cc b/games/stonesoup/files/patch-rltiles__tool__tile.cc
index ecb6243d7498..61603578988f 100644
--- a/games/stonesoup/files/patch-rltiles__tool__tile.cc
+++ b/games/stonesoup/files/patch-rltiles__tool__tile.cc
@@ -1,6 +1,6 @@
---- ./rltiles/tool/tile.cc.orig	2014-04-09 17:36:33.000000000 +0200
-+++ ./rltiles/tool/tile.cc	2014-05-06 21:21:37.808135615 +0200
-@@ -123,10 +123,10 @@
+--- rltiles/tool/tile.cc.orig	2015-03-04 04:53:29 UTC
++++ rltiles/tool/tile.cc
+@@ -123,10 +123,10 @@ void tile::add_rim(const tile_colour &ri
              if (flags[x + y * m_width])
                  continue;
  
diff --git a/games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc b/games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc
index 7716093bdf9d..2c5bbebb4687 100644
--- a/games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc
+++ b/games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc
@@ -1,6 +1,6 @@
---- ./rltiles/tool/tile_list_processor.cc.orig	2013-09-30 20:32:00.000000000 +0200
-+++ ./rltiles/tool/tile_list_processor.cc	2013-10-11 22:07:08.181888672 +0200
-@@ -52,7 +52,7 @@
+--- rltiles/tool/tile_list_processor.cc.orig	2015-03-04 04:53:29 UTC
++++ rltiles/tool/tile_list_processor.cc
+@@ -52,7 +52,7 @@ bool tile_list_processor::load_image(til
          ""
      };
  
diff --git a/games/stonesoup/pkg-plist b/games/stonesoup/pkg-plist
index bd3e28ad5332..11973ac51fd0 100644
--- a/games/stonesoup/pkg-plist
+++ b/games/stonesoup/pkg-plist
@@ -3,12 +3,9 @@ bin/stonesoup
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.crawlrc
 %%DATADIR%%/dat/clua/autofight.lua
 %%DATADIR%%/dat/clua/automagic.lua
-%%DATADIR%%/dat/clua/gearset.lua
 %%DATADIR%%/dat/clua/kills.lua
 %%DATADIR%%/dat/clua/runrest.lua
 %%DATADIR%%/dat/clua/stash.lua
-%%DATADIR%%/dat/clua/trapwalk.lua
-%%DATADIR%%/dat/clua/wield.lua
 %%DATADIR%%/dat/database/FAQ.txt
 %%DATADIR%%/dat/database/el/monflee.txt
 %%DATADIR%%/dat/database/el/rand_all.txt
@@ -33,6 +30,7 @@ bin/stonesoup
 %%DATADIR%%/dat/database/wpnnoise.txt
 %%DATADIR%%/dat/defaults/autopickup_exceptions.txt
 %%DATADIR%%/dat/defaults/food_colouring.txt
+%%DATADIR%%/dat/defaults/glyph_colours.txt
 %%DATADIR%%/dat/defaults/menu_colours.txt
 %%DATADIR%%/dat/defaults/messages.txt
 %%DATADIR%%/dat/defaults/misc.txt
@@ -88,10 +86,13 @@ bin/stonesoup
 %%DATADIR%%/dat/des/builder/food.des
 %%DATADIR%%/dat/des/builder/layout.des
 %%DATADIR%%/dat/des/builder/layout_caves.des
+%%DATADIR%%/dat/des/builder/layout_cc.des
 %%DATADIR%%/dat/des/builder/layout_cellular.des
 %%DATADIR%%/dat/des/builder/layout_city.des
+%%DATADIR%%/dat/des/builder/layout_delve.des
 %%DATADIR%%/dat/des/builder/layout_forest.des
 %%DATADIR%%/dat/des/builder/layout_geoelf.des
+%%DATADIR%%/dat/des/builder/layout_geoelf_castle.des
 %%DATADIR%%/dat/des/builder/layout_grids.des
 %%DATADIR%%/dat/des/builder/layout_halls.des
 %%DATADIR%%/dat/des/builder/layout_loops.des
@@ -480,6 +481,7 @@ bin/stonesoup
 %%DATADIR%%/dat/dlua/luamark.lua
 %%DATADIR%%/dat/dlua/macro.lua
 %%DATADIR%%/dat/dlua/mapinit.lua
+%%DATADIR%%/dat/dlua/persist.lua
 %%DATADIR%%/dat/dlua/point.lua
 %%DATADIR%%/dat/dlua/profiler.lua
 %%DATADIR%%/dat/dlua/sanity.lua
@@ -507,6 +509,7 @@ bin/stonesoup
 %%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png
 %%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-512x512.png
 %%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.png
+%%SDL%%%%DATADIR%%/dat/tiles/title_baconkid_duvessa_dowan.png
 %%SDL%%%%DATADIR%%/dat/tiles/title_baconkid_gastronok.png
 %%SDL%%%%DATADIR%%/dat/tiles/title_baconkid_mnoleg.png
 %%SDL%%%%DATADIR%%/dat/tiles/title_denzi_dragon.png
@@ -533,6 +536,7 @@ bin/stonesoup
 %%DATADIR%%/docs/develop/IRC.txt
 %%DATADIR%%/docs/develop/android.txt
 %%DATADIR%%/docs/develop/coding_conventions.txt
+%%DATADIR%%/docs/develop/ctags.txt
 %%DATADIR%%/docs/develop/gdb_tips.txt
 %%DATADIR%%/docs/develop/levels/advanced.txt
 %%DATADIR%%/docs/develop/levels/introduction.txt
@@ -573,57 +577,10 @@ bin/stonesoup
 %%DATADIR%%/settings/080_monster_glyphs.txt
 %%DATADIR%%/settings/advanced_optioneering.txt
 %%DATADIR%%/settings/colemak_command_keys.txt
+%%DATADIR%%/settings/dec_glyphs.txt
 %%DATADIR%%/settings/dvorak_command_keys.txt
+%%DATADIR%%/settings/ibm_glyphs.txt
 %%DATADIR%%/settings/init.txt
 %%DATADIR%%/settings/no_vi_command_keys.txt
-%%PORTDOCS%%@dir %%DOCSDIR%%
-%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%
-@dir %%DATADIR%%/dat/clua
-@dir %%DATADIR%%/dat/database/el
-@dir %%DATADIR%%/dat/database/pl
-@dir %%DATADIR%%/dat/database
-@dir %%DATADIR%%/dat/defaults
-@dir %%DATADIR%%/dat/des/altar
-@dir %%DATADIR%%/dat/des/arrival
-@dir %%DATADIR%%/dat/des/branches
-@dir %%DATADIR%%/dat/des/builder
-@dir %%DATADIR%%/dat/des/portals
-@dir %%DATADIR%%/dat/des/serial
-@dir %%DATADIR%%/dat/des/sprint
-@dir %%DATADIR%%/dat/des/test
-@dir %%DATADIR%%/dat/des/traps
-@dir %%DATADIR%%/dat/des/tutorial
-@dir %%DATADIR%%/dat/des/variable
-@dir %%DATADIR%%/dat/des/zotdef
-@dir %%DATADIR%%/dat/des
-@dir %%DATADIR%%/dat/descript/cs
-@dir %%DATADIR%%/dat/descript/da
-@dir %%DATADIR%%/dat/descript/de
-@dir %%DATADIR%%/dat/descript/el
-@dir %%DATADIR%%/dat/descript/es
-@dir %%DATADIR%%/dat/descript/fi
-@dir %%DATADIR%%/dat/descript/fr
-@dir %%DATADIR%%/dat/descript/hu
-@dir %%DATADIR%%/dat/descript/it
-@dir %%DATADIR%%/dat/descript/ja
-@dir %%DATADIR%%/dat/descript/ko
-@dir %%DATADIR%%/dat/descript/lt
-@dir %%DATADIR%%/dat/descript/lv
-@dir %%DATADIR%%/dat/descript/nl
-@dir %%DATADIR%%/dat/descript/pl
-@dir %%DATADIR%%/dat/descript/pt
-@dir %%DATADIR%%/dat/descript/ru
-@dir %%DATADIR%%/dat/descript/sv
-@dir %%DATADIR%%/dat/descript/tr
-@dir %%DATADIR%%/dat/descript/zh
-@dir %%DATADIR%%/dat/descript
-@dir %%DATADIR%%/dat/dlua/layout
-@dir %%DATADIR%%/dat/dlua
-%%SDL%%@dir %%DATADIR%%/dat/tiles
-@dir %%DATADIR%%/dat
-@dir %%DATADIR%%/docs/develop/levels
-@dir %%DATADIR%%/docs/develop
-@dir %%DATADIR%%/docs/license
-@dir %%DATADIR%%/docs
-@dir %%DATADIR%%/settings
-@dir %%DATADIR%%
+%%DATADIR%%/settings/old_unicode_glyphs.txt
+%%DATADIR%%/settings/safe_move_shift.txt