Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Sep 2013 20:40:02 GMT
From:      Tobias Rehbein <tobias.rehbein@web.de>
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/179834: [maintainer-update] update games/stonesoup to version 0.12.2
Message-ID:  <201309222040.r8MKe2Nx064997@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/179834; it has been noted by GNATS.

From: Tobias Rehbein <tobias.rehbein@web.de>
To: bug-followup@FreeBSD.org
Cc: Nikolai Lifanov <lifanov@mail.lifanov.com>
Subject: Re: ports/179834: [maintainer-update] update games/stonesoup to
 version 0.12.2
Date: Sun, 22 Sep 2013 22:05:42 +0200

 --z6Eq5LdranGa6ru8
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Here is another patch, rerolled after r327730. I hope somebody picks it
 up and commits it.
 
 It's very annoying to work on patches, which are rotting three months. I
 understand the commiters are volunteers too, but at least a response on
 questions would be nice.
 
 Regards,
 
 	Tobias
 
 
 --z6Eq5LdranGa6ru8
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="games__stonesoup-0.11.1-0_12.2.diff"
 Content-Transfer-Encoding: quoted-printable
 
 diff -urN games/stonesoup.orig/Makefile games/stonesoup/Makefile
 --- games/stonesoup.orig/Makefile	2013-09-22 21:36:41.809165963 +0200
 +++ games/stonesoup/Makefile	2013-09-22 21:37:48.548163338 +0200
 @@ -2,7 +2,7 @@
  # $FreeBSD: games/stonesoup/Makefile 327730 2013-09-20 17:36:33Z bapt $
 =20
  PORTNAME=3D	stonesoup
 -PORTVERSION=3D	0.11.1
 +PORTVERSION=3D	0.12.2
  CATEGORIES=3D	games
  MASTER_SITES=3D	SF/crawl-ref/Stone%20Soup/${PORTVERSION}
  DISTNAME=3D	stone_soup-${PORTVERSION}-nodeps
 @@ -85,6 +85,7 @@
  .endif
 =20
  post-patch:
 +	@${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
 @@ -92,6 +93,10 @@
  	@${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/AppHdr.h
  .endif
 =20
 +pre-install:
 +	@${FIND} ${WRKSRC}/dat -type f -name '*.orig' | \
 +		${XARGS} ${RM}
 +
  post-install:
  .if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
 diff -urN games/stonesoup.orig/Makefile.rej games/stonesoup/Makefile.rej
 --- games/stonesoup.orig/Makefile.rej	1970-01-01 01:00:00.000000000 +0100
 +++ games/stonesoup/Makefile.rej	2013-09-22 21:37:48.549163240 +0200
 @@ -0,0 +1,33 @@
 +***************
 +*** 40,57 ****
 +  		INSTALL_UGRP=3Droot:games \
 +  		NO_AUTO_OPT=3DYesPlease \
 +  		NO_OPTIMIZE=3DYesPlease \
 +- 		LUA_INCLUDE_DIR=3D${LOCALBASE}/include/lua51 \
 +- 		LUA_LIB=3D-llua-5.1 \
 +  		SQLITE_INCLUDE_DIR=3D${LOCALBASE}/include \
 +  		SQLITE_LIB=3D-lsqlite3 \
 +- 		LDFLAGS=3D"-L${LOCALBASE}/lib -L${LOCALBASE}/lib/lua51"
 + =20
 +  .include <bsd.port.options.mk>
 + =20
 +- .if ${CC:T:M*clang*}
 +- MAKE_ARGS+=3D	NO_INLINE_DEPGEN=3D1
 +- .endif
 +-=20
 +  .if defined(VERBOSE)
 +  MAKE_ARGS+=3D	V=3Dyes
 +  .endif
 +--- 40,51 ----
 +  		INSTALL_UGRP=3Droot:games \
 +  		NO_AUTO_OPT=3DYesPlease \
 +  		NO_OPTIMIZE=3DYesPlease \
 +  		SQLITE_INCLUDE_DIR=3D${LOCALBASE}/include \
 +  		SQLITE_LIB=3D-lsqlite3 \
 ++ 		LDFLAGS=3D"-L${LOCALBASE}/lib"
 + =20
 +  .include <bsd.port.options.mk>
 + =20
 +  .if defined(VERBOSE)
 +  MAKE_ARGS+=3D	V=3Dyes
 +  .endif
 diff -urN games/stonesoup.orig/distinfo games/stonesoup/distinfo
 --- games/stonesoup.orig/distinfo	2013-09-22 21:36:41.810162261 +0200
 +++ games/stonesoup/distinfo	2013-09-22 21:37:48.549163240 +0200
 @@ -1,2 +1,2 @@
 -SHA256 (stone_soup-0.11.1-nodeps.tar.xz) =3D 377d738cff21165763b252a57cd84=
 049361d44db6d8d10f08f789cc9e7bb82b6
 -SIZE (stone_soup-0.11.1-nodeps.tar.xz) =3D 7519768
 +SHA256 (stone_soup-0.12.2-nodeps.tar.xz) =3D d9ecb2c121596fa635fd98a3f1363=
 038beabf67159c7822e79eaf4698efef274
 +SIZE (stone_soup-0.12.2-nodeps.tar.xz) =3D 8661464
 diff -urN games/stonesoup.orig/files/patch-AppHdr.h games/stonesoup/files/p=
 atch-AppHdr.h
 --- games/stonesoup.orig/files/patch-AppHdr.h	1970-01-01 01:00:00.000000000=
  +0100
 +++ games/stonesoup/files/patch-AppHdr.h	2013-09-22 21:37:48.550185258 +0200
 @@ -0,0 +1,11 @@
 +--- ./AppHdr.h.orig	2013-06-01 04:52:08.000000000 +0200
 ++++ ./AppHdr.h	2013-06-18 19:24:52.991224396 +0200
 +@@ -132,7 +132,7 @@
 +     //
 +     // WARNING: Filenames passed to this command *are not validated in an=
 y way*.
 +     //
 +-    // #define SOUND_PLAY_COMMAND "/usr/bin/play -v .5 \"%s\" 2>/dev/null=
  &"
 ++    %%SOUND%%#define SOUND_PLAY_COMMAND "%%LOCALBASE%%/bin/play -v .5 \"%=
 s\" 2>/dev/null &"
 +=20
 +     #include "libunix.h"
 +=20
 diff -urN games/stonesoup.orig/files/patch-Makefile games/stonesoup/files/p=
 atch-Makefile
 --- games/stonesoup.orig/files/patch-Makefile	2013-09-22 21:36:41.809165963=
  +0200
 +++ games/stonesoup/files/patch-Makefile	2013-09-22 21:37:48.550185258 +0200
 @@ -1,6 +1,6 @@
 ---- ./Makefile.orig	2012-09-30 23:25:31.000000000 +0200
 -+++ ./Makefile	2012-10-27 20:49:08.837330946 +0200
 -@@ -66,7 +66,7 @@
 +--- ./Makefile.orig	2013-06-01 06:17:58.000000000 +0200
 ++++ ./Makefile	2013-06-18 19:24:52.993224597 +0200
 +@@ -69,7 +69,7 @@
   #    ask for a package with convenience libraries instead -- we'll try to=
  provide
   #    them somewhere in the near future.
  =20
 @@ -9,25 +9,16 @@
  =20
   # Disable GNU Make implicit rules and variables. Leaving them enabled wil=
 l slow
   # down MinGW and Cygwin builds by a very VERY noticeable degree. Besides,=
  we have
 -@@ -112,7 +112,7 @@
 -=20
 - else
 -=20
 --CFOPTIMIZE :=3D -O2
 -+CFOPTIMIZE :=3D
 -=20
 - endif # USE_ICC
 +@@ -101,7 +101,7 @@
 + #
  =20
 -@@ -120,7 +120,7 @@
 - CFOPTIMIZE +=3D -flto=3Djobserver -fwhole-program
 - endif
  =20
  -CFOTHERS :=3D -pipe $(EXTERNAL_FLAGS)
  +CFOTHERS :=3D $(CFLAGS)
   CFWARN :=3D -Wall -Wformat-security
   CFWARN_L :=3D -Wundef
  =20
 -@@ -133,8 +133,6 @@
 +@@ -118,8 +118,6 @@
   #
   AR =3D ar
   RANLIB =3D ranlib
 @@ -36,7 +27,19 @@
   RM =3D rm -f
   COPY =3D cp
   COPY_R =3D cp -r
 -@@ -530,30 +528,19 @@
 +@@ -530,9 +528,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.
 +-    CFOPTIMIZE :=3D -O1
 ++    CFOPTIMIZE :=3D
 +   else
 +-    CFOPTIMIZE :=3D -O2
 ++    CFOPTIMIZE :=3D
 +   endif
 + endif
 +=20
 +@@ -570,31 +568,20 @@
   ifndef BUILD_LUA
     ifdef NO_PKGCONFIG
       BUILD_LUA =3D yes
 @@ -64,19 +67,20 @@
       endif
  -  else
  -    LUA_PACKAGE =3D lua5.1
 --  endif
 --endif
 +   endif
 + endif
  -ifndef BUILD_LUA
  -  ifndef LUA_PACKAGE
  -    LUA_PACKAGE =3D lua5.1
 -   endif
 +-  endif
  -  INCLUDES_L +=3D $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I)
  -  CFLAGS_L  +=3D $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
  -  LIBS +=3D $(shell $(PKGCONFIG) $(LUA_PACKAGE) --libs)
 - endif
 +-endif
  =20
   ifndef BUILD_SQLITE
 -@@ -707,7 +694,7 @@
 +   ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2=
 >/dev/null && echo yes),yes)
 +@@ -740,7 +727,7 @@
   DEFINES +=3D -DWIZARD
   endif
   ifdef NO_OPTIMIZE
 @@ -85,41 +89,25 @@
   endif
  =20
   ifdef PCH
 -@@ -831,10 +818,12 @@
 +@@ -864,7 +851,7 @@
       INSTALL_FONTS +=3D $(PROPORTIONAL_FONT)
     endif
   else
 --  SYS_PROPORTIONAL_FONT =3D $(shell find /usr/share/fonts -iname $(OUR_PR=
 OPORTIONAL_FONT)|head -n 1)
 --  ifeq (,$(SYS_PROPORTIONAL_FONT))
 --    SYS_PROPORTIONAL_FONT =3D $(shell find /usr/local/share/fonts -iname =
 $(OUR_PROPORTIONAL_FONT)|head -n 1)
 --  endif
 -+  SYS_PROPORTIONAL_FONT =3D $(shell name=3D$(OUR_PROPORTIONAL_FONT);\
 -+    {\
 -+      fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
 -+      for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/f=
 onts;\
 -+      do [ -d $$dir ] && echo $$dir; done;\
 -+    } 2>/dev/null | xargs -I% find % -type f -iname $$name -print | head =
 -n1)
 -   ifneq (,$(SYS_PROPORTIONAL_FONT))
 -     ifeq (,$(COPY_FONTS))
 -       DEFINES +=3D -DPROPORTIONAL_FONT=3D\"$(SYS_PROPORTIONAL_FONT)\"
 -@@ -854,10 +843,12 @@
 +-  SYS_PROPORTIONAL_FONT =3D $(shell dir=3D/usr/share/fonts; [ -d $$dir ] =
 && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
 ++  SYS_PROPORTIONAL_FONT =3D $(shell dir=3D%%LOCALBASE%%/lib/X11/fonts; [ =
 -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
 +   ifeq (,$(SYS_PROPORTIONAL_FONT))
 +     SYS_PROPORTIONAL_FONT =3D $(shell dir=3D/usr/local/share/fonts ; [ -d=
  $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
 +   endif
 +@@ -887,7 +874,7 @@
       INSTALL_FONTS +=3D $(MONOSPACED_FONT)
     endif
   else
 --  SYS_MONOSPACED_FONT =3D $(shell find /usr/share/fonts -iname $(OUR_MONO=
 SPACED_FONT)|head -n 1)
 --  ifeq (,$(SYS_MONOSPACED_FONT))
 --    SYS_MONOSPACED_FONT =3D $(shell find /usr/local/share/fonts -iname $(=
 OUR_MONOSPACED_FONT)|head -n 1)
 --  endif
 -+  SYS_MONOSPACED_FONT =3D $(shell name=3D$(OUR_MONOSPACED_FONT);\
 -+    {\
 -+      fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
 -+      for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/f=
 onts;\
 -+      do [ -d $$dir ] && echo $$dir; done;\
 -+    } 2>/dev/null | xargs -I% find % -type f -iname $$name -print | head =
 -n1)
 -   ifneq (,$(SYS_MONOSPACED_FONT))
 -     ifeq (,$(COPY_FONTS))
 -       DEFINES +=3D -DMONOSPACED_FONT=3D\"$(SYS_MONOSPACED_FONT)\"
 -@@ -1036,7 +1027,7 @@
 +-  SYS_MONOSPACED_FONT =3D $(shell dir=3D/usr/share/fonts; [ -d $$dir ] &&=
  find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
 ++  SYS_MONOSPACED_FONT =3D $(shell dir=3D%%LOCALBASE%%/lib/X11/fonts; [ -d=
  $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
 +   ifeq (,$(SYS_MONOSPACED_FONT))
 +     SYS_MONOSPACED_FONT =3D $(shell dir=3D/usr/local/share/fonts; [ -d $$=
 dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
 +   endif
 +@@ -1073,7 +1060,7 @@
                      cmd-name.h $(INI_OBJECTS)
  =20
   SRC_PKG_BASE  :=3D stone_soup
 @@ -128,11 +116,3 @@
   MAJOR_VERSION =3D $(shell echo "$(SRC_VERSION)"|sed -r 's/-.*//;s/^([^.]+=
 \.[^.]+).*/\1/')
  =20
   export SRC_VERSION
 -@@ -1049,6 +1040,7 @@
 - greet:
 - 	@if [ ! -e $(GAME) ]; then\
 - 		printf "  * If you experience any problems building Crawl, please take =
 a second look\\n"\
 -+		;printf\
 - 		"  * at INSTALL.txt: the solution to your problem just might be in ther=
 e!\\n";\
 - 	fi
 -=20
 diff -urN games/stonesoup.orig/files/patch-dat__des__branches__hells.des ga=
 mes/stonesoup/files/patch-dat__des__branches__hells.des
 --- games/stonesoup.orig/files/patch-dat__des__branches__hells.des	1970-01-=
 01 01:00:00.000000000 +0100
 +++ games/stonesoup/files/patch-dat__des__branches__hells.des	2013-09-22 21=
 :37:48.551164694 +0200
 @@ -0,0 +1,12 @@
 +--- ./dat/des/branches/hells.des.orig	2013-06-01 04:52:08.000000000 +0200
 ++++ ./dat/des/branches/hells.des	2013-06-18 19:24:52.996224493 +0200
 +@@ -379,8 +379,7 @@
 + KMONS:   F =3D executioner
 + KMONS:   ! =3D iron devil / skeletal warrior / hell knight / place:Zot:1 =
 skeleton w:15
 + KMONS:   ? =3D 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 =3D ghost moth
 + KMONS:   23 =3D golden dragon
 diff -urN games/stonesoup.orig/files/patch-dat__des__variable__grated_commu=
 nity.des games/stonesoup/files/patch-dat__des__variable__grated_community.d=
 es
 --- games/stonesoup.orig/files/patch-dat__des__variable__grated_community.d=
 es	1970-01-01 01:00:00.000000000 +0100
 +++ games/stonesoup/files/patch-dat__des__variable__grated_community.des	20=
 13-09-22 21:37:48.552177483 +0200
 @@ -0,0 +1,67 @@
 +--- ./dat/des/variable/grated_community.des.orig	2013-06-01 04:52:08.00000=
 0000 +0200
 ++++ ./dat/des/variable/grated_community.des	2013-06-18 19:24:52.998224087 =
 +0200
 +@@ -67,11 +67,7 @@
 +             q:5 sausage
 + KFEAT:  C =3D distillery shop type:Miraculous suffix:Elixirs count:10 \
 +             greed:50 ; potion of confusion
 +-: kfeat("D =3D armour shop name:The_Legendary_" .. crawl.make_name() .. "=
  \
 +-:        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 =3D armour shop name:The_Legendary_" .. crawl.make_name() .. "=
  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:non=
 e")
 + SHUFFLE:  QRSTUVX
 + SUBVAULT: Q : grated_community_mu_home1
 + SUBVAULT: R : grated_community_mu_home2
 +@@ -166,16 +162,11 @@
 + KITEM:  % =3D animal skin / nothing
 + MARKER: + =3D lua:restrict_door()
 + KFEAT:  ~ =3D closed_door
 +-: dgn.delayed_decay(_G, '*', 'human skeleton / yak skeleton / elf skeleto=
 n /\
 +-:                            gnome skeleton / elephant skeleton /\
 +-:                            sheep skeleton / manticore skeleton /\
 +-:                            w:2 nothing, animal skin')
 ++: dgn.delayed_decay(_G, '*', 'human skeleton / yak skeleton / elf skeleto=
 n / gnome skeleton / elephant skeleton / sheep skeleton / manticore skeleto=
 n / w:2 nothing, animal skin')
 + KFEAT:  8 =3D granite_statue / orcish_idol / w:5 altar_trog /\
 +             w:5 altar_beogh / w:1 altar_makhleb / w:4 floor
 + KITEM:  $ =3D q:5 meat ration, giant spiked club, q:2 sausage
 +-: kitem("$ =3D q:" .. crawl.random_range(1, 5) .. " sausage / w:5 nothing=
 , \
 +-:            q:" .. crawl.random_range(1, 3) .. " meat ration / w:5 nothi=
 ng, \
 +-:            giant spiked club / giant club / nothing")
 ++: kitem("$ =3D q:" .. crawl.random_range(1, 5) .. " sausage / w:5 nothing=
 , q:" .. crawl.random_range(1, 3) .. " meat ration / w:5 nothing, giant spi=
 ked club / giant club / nothing")
 + : local frosty =3D crawl.random2(6)
 + : if frosty =3D=3D 5 then
 + SUBST:  1 =3D 2
 +@@ -218,10 +209,8 @@
 + KFEAT: * =3D altar_kikubaaqudgha / w:4 altar_sif_muna / w:1 altar_yredele=
 mnul
 + KITEM: " =3D gold, any wand / w:15 nothing, any scroll / nothing
 + KFEAT: 8 =3D granite_statue / w:2 fountain_blood / w:1 floor
 +-: kitem("? =3D q:" .. crawl.random_range(1, 3) .. " scroll of torment /\
 +-:        nothing, any scroll / nothing")
 +-: kitem("! =3D q:" .. crawl.random_range(1, 3) .. " potion of magic /\
 +-:        nothing, any potion / nothing")
 ++: kitem("? =3D q:" .. crawl.random_range(1, 3) .. " scroll of torment / n=
 othing, any scroll / nothing")
 ++: kitem("! =3D q:" .. crawl.random_range(1, 3) .. " potion of magic / not=
 hing, any potion / nothing")
 + KITEM: & =3D book of necromancy / book of death / book of unlife / w:12 n=
 othing
 + KMONS: P =3D col:darkgrey plant name:withered name_adjective             =
   \
 +            tile:mons_withered_plant / col:lightgrey plant name:withered  \
 +@@ -233,8 +222,7 @@
 +            nothing
 + KFEAT: 8 =3D granite_statue / fountain_sparkling / fountain_blue / w:1 fl=
 oor
 + KITEM: ? =3D scroll of recharging / nothing, any scroll / nothing
 +-: kitem("! =3D q:" .. crawl.random_range(1, 3) .. " potion of magic /\
 +-:        nothing, any potion / nothing")
 ++: kitem("! =3D q:" .. crawl.random_range(1, 3) .. " potion of magic / not=
 hing, any potion / nothing")
 + KITEM: & =3D book of wizardry / book of power / book of party tricks /\
 +        book of alchemy / w:12 nothing
 + KMONS: P =3D plant
 +@@ -246,8 +234,7 @@
 +            potion of brilliance / nothing
 + KFEAT: 8 =3D granite_statue / w:1 floor
 + KITEM: ? =3D scroll of immolation / nothing, any scroll / nothing
 +-: kitem("! =3D q:" .. crawl.random_range(1, 3) .. " scroll of immolation =
 /\
 +-:        nothing, any potion / nothing")
 ++: kitem("! =3D q:" .. crawl.random_range(1, 3) .. " scroll of immolation =
 / nothing, any potion / nothing")
 + KITEM: & =3D book of fire / book of power / book of ice /\
 +        book of the tempests / w:12 nothing
 + KFEAT: P =3D granite_statue
 diff -urN games/stonesoup.orig/files/patch-files.cc games/stonesoup/files/p=
 atch-files.cc
 --- games/stonesoup.orig/files/patch-files.cc	2013-09-22 21:36:41.809165963=
  +0200
 +++ games/stonesoup/files/patch-files.cc	2013-09-22 21:37:48.552177483 +0200
 @@ -1,8 +1,8 @@
 ---- ./files.cc.orig	2012-09-30 23:25:31.000000000 +0200
 -+++ ./files.cc	2012-10-27 20:49:08.839666272 +0200
 -@@ -618,8 +618,10 @@
 +--- ./files.cc.orig	2013-06-01 04:52:08.000000000 +0200
 ++++ ./files.cc	2013-06-18 19:24:53.000224795 +0200
 +@@ -629,8 +629,10 @@
   {
 -     std::vector<player_save_info> chars;
 +     vector<player_save_info> chars;
  =20
  +#ifdef WIZARD
       if (Options.no_save)
 @@ -10,10 +10,10 @@
  +#endif
  =20
   #ifndef DISABLE_SAVEGAME_LISTS
 -     std::string searchpath =3D _get_savefile_directory();
 -@@ -1741,8 +1743,10 @@
 +     string searchpath =3D _get_savefile_directory();
 +@@ -1778,8 +1780,10 @@
   // returns false if a new game should start instead
 - static bool _restore_game(const std::string& filename)
 + static bool _restore_game(const string& filename)
   {
  +#ifdef WIZARD
       if (Options.no_save)
 diff -urN games/stonesoup.orig/files/patch-ng-setup.cc games/stonesoup/file=
 s/patch-ng-setup.cc
 --- games/stonesoup.orig/files/patch-ng-setup.cc	2013-09-22 21:36:41.809165=
 963 +0200
 +++ games/stonesoup/files/patch-ng-setup.cc	2013-09-22 21:37:48.553164640 +=
 0200
 @@ -1,7 +1,7 @@
 ---- ./ng-setup.cc.orig	2012-09-30 23:25:31.000000000 +0200
 -+++ ./ng-setup.cc	2012-10-27 20:49:08.841950945 +0200
 -@@ -1427,9 +1427,11 @@
 -         you.nemelex_sacrificing =3D true;
 +--- ./ng-setup.cc.orig	2013-06-01 04:52:08.000000000 +0200
 ++++ ./ng-setup.cc	2013-06-18 19:24:53.002224996 +0200
 +@@ -1396,9 +1396,11 @@
 +     init_companions();
  =20
       // Create the save file.
  +#ifdef WIZARD
 diff -urN games/stonesoup.orig/files/patch-rltiles__Makefile games/stonesou=
 p/files/patch-rltiles__Makefile
 --- games/stonesoup.orig/files/patch-rltiles__Makefile	2013-09-22 21:36:41.=
 809165963 +0200
 +++ games/stonesoup/files/patch-rltiles__Makefile	2013-09-22 21:37:48.55316=
 4640 +0200
 @@ -1,5 +1,5 @@
 ---- ./rltiles/Makefile.orig	2012-09-30 23:25:31.000000000 +0200
 -+++ ./rltiles/Makefile	2012-10-27 20:49:55.957667879 +0200
 +--- ./rltiles/Makefile.orig	2013-06-01 04:52:08.000000000 +0200
 ++++ ./rltiles/Makefile	2013-06-18 19:28:17.705226603 +0200
  @@ -1,7 +1,7 @@
   uname_S :=3D $(shell uname -s)
  =20
 @@ -16,9 +16,9 @@
  -CFLAGS :=3D -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
  +L_CFLAGS :=3D $(CFLAGS)
  =20
 - ifdef TILES
 -   ifndef CONTRIB_SDL
 -@@ -29,24 +29,24 @@
 + ifdef ANDROID
 +   CXXFLAGS :=3D
 +@@ -35,24 +35,24 @@
       PNG_LIB :=3D ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/insta=
 ll/$(ARCH)/lib/libz.a
     endif
  =20
 @@ -50,7 +50,7 @@
   endif
  =20
   # Attempt to use a full compiler name, to make
 -@@ -58,7 +58,7 @@
 +@@ -64,7 +64,7 @@
   ifeq ($(shell which $(LMACH)gcc > /dev/null 2> /dev/null && echo "Yes"),)
   LMACH :=3D
   endif
 @@ -59,7 +59,7 @@
  =20
   DELETE =3D rm -f
  =20
 -@@ -98,7 +98,7 @@
 +@@ -109,7 +109,7 @@
   	$(QUIET_GEN)$(TILEGEN) -c $<
  =20
   # CFLAGS difference check
 @@ -68,16 +68,12 @@
  =20
   .cflags: .force-cflags
   	@FLAGS=3D'$(TRACK_CFLAGS)'; \
 -@@ -127,9 +127,13 @@
 +@@ -138,9 +138,9 @@
   distclean: clean
  =20
   %.o: %.cc .cflags
 --	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -Wp,-MMD,$*.d,-MT,$@ -c $< -o $@
 -+ifdef NO_INLINE_DEPGEN
 -+	$(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -Wp,-MT,$@ -c $< -o $@
 -+else
 -+	$(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -Wp,-MMD,$*.d,-MT,$@ -c $< -o $@
 -+endif
 +-	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
 ++	$(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -MMD -c $< -o $@
  =20
   $(TILEGEN): $(OBJECTS)
  -	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
 diff -urN games/stonesoup.orig/files/patch-rltiles__tool__tile.cc games/sto=
 nesoup/files/patch-rltiles__tool__tile.cc
 --- games/stonesoup.orig/files/patch-rltiles__tool__tile.cc	2013-09-22 21:3=
 6:41.809165963 +0200
 +++ games/stonesoup/files/patch-rltiles__tool__tile.cc	2013-09-22 21:37:48.=
 554163384 +0200
 @@ -1,5 +1,5 @@
 ---- ./rltiles/tool/tile.cc.orig	2012-09-30 23:25:33.000000000 +0200
 -+++ ./rltiles/tool/tile.cc	2012-10-27 20:49:08.845367925 +0200
 +--- ./rltiles/tool/tile.cc.orig	2013-06-01 04:52:09.000000000 +0200
 ++++ ./rltiles/tool/tile.cc	2013-06-18 19:24:53.005224791 +0200
  @@ -125,10 +125,10 @@
               if (flags[x + y * m_width])
                   continue;
 diff -urN games/stonesoup.orig/files/patch-rltiles__tool__tile_list_process=
 or.cc games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc
 --- games/stonesoup.orig/files/patch-rltiles__tool__tile_list_processor.cc	=
 2013-09-22 21:36:41.809165963 +0200
 +++ games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc	2013-=
 09-22 21:37:48.554163384 +0200
 @@ -1,5 +1,5 @@
 ---- ./rltiles/tool/tile_list_processor.cc.orig	2012-09-30 23:25:33.0000000=
 00 +0200
 -+++ ./rltiles/tool/tile_list_processor.cc	2012-10-27 20:49:08.847233795 +0=
 200
 +--- ./rltiles/tool/tile_list_processor.cc.orig	2013-06-01 04:52:09.0000000=
 00 +0200
 ++++ ./rltiles/tool/tile_list_processor.cc	2013-06-18 19:24:53.008224181 +0=
 200
  @@ -51,7 +51,7 @@
           ""
       };
 @@ -7,5 +7,5 @@
  -    if (m_sdir !=3D "" || background && m_back_sdir !=3D "")
  +    if (m_sdir !=3D "" || (background && m_back_sdir !=3D ""))
       {
 -         std::vector<const char *> dirs;
 +         vector<const char *> dirs;
           if (m_sdir !=3D "")
 diff -urN games/stonesoup.orig/files/patch-startup.cc games/stonesoup/files=
 /patch-startup.cc
 --- games/stonesoup.orig/files/patch-startup.cc	2013-09-22 21:36:41.8091659=
 63 +0200
 +++ games/stonesoup/files/patch-startup.cc	2013-09-22 21:37:48.555162048 +0=
 200
 @@ -1,6 +1,6 @@
 ---- ./startup.cc.orig	2012-09-30 23:25:33.000000000 +0200
 -+++ ./startup.cc	2012-10-27 20:49:08.848667287 +0200
 -@@ -234,8 +234,10 @@
 +--- ./startup.cc.orig	2013-06-01 04:52:09.000000000 +0200
 ++++ ./startup.cc	2013-06-18 19:24:53.009224484 +0200
 +@@ -237,8 +237,10 @@
       you.wizard =3D true;
   #endif
       // Save-less games are pointless except for tests.
 diff -urN games/stonesoup.orig/pkg-descr games/stonesoup/pkg-descr
 --- games/stonesoup.orig/pkg-descr	2013-09-22 21:36:41.810162261 +0200
 +++ games/stonesoup/pkg-descr	2013-09-22 21:37:48.555162048 +0200
 @@ -10,4 +10,4 @@
      games/stonesoup - the traditional tty interfaced
      games/stonesoup-sdl - the fancy SDL interface
 =20
 -WWW:	http://crawl.develz.org/
 +WWW: http://crawl.develz.org/
 diff -urN games/stonesoup.orig/pkg-plist games/stonesoup/pkg-plist
 --- games/stonesoup.orig/pkg-plist	2013-09-22 21:36:41.809165963 +0200
 +++ games/stonesoup/pkg-plist	2013-09-22 21:37:48.556162696 +0200
 @@ -1,461 +1,521 @@
  bin/stonesoup
 -%%DATADIR%%/dat/clua/autofight.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
 -%%DATADIR%%/dat/database/godname.txt
 -%%DATADIR%%/dat/database/godspeak.txt
 -%%DATADIR%%/dat/database/help.txt
 +%%DATADIR%%/dat/database/el/monflee.txt
  %%DATADIR%%/dat/database/insult.txt
 -%%DATADIR%%/dat/database/miscname.txt
 +%%DATADIR%%/dat/database/shout.txt
 +%%DATADIR%%/dat/database/help.txt
 +%%DATADIR%%/dat/database/godname.txt
 +%%DATADIR%%/dat/database/wpnnoise.txt
 +%%DATADIR%%/dat/database/rand_all.txt
  %%DATADIR%%/dat/database/monflee.txt
 -%%DATADIR%%/dat/database/monname.txt
 -%%DATADIR%%/dat/database/monspeak.txt
 +%%DATADIR%%/dat/database/randname.txt
  %%DATADIR%%/dat/database/monspell.txt
  %%DATADIR%%/dat/database/pl/godspeak.txt
  %%DATADIR%%/dat/database/pl/miscname.txt
 -%%DATADIR%%/dat/database/rand_all.txt
  %%DATADIR%%/dat/database/rand_arm.txt
 -%%DATADIR%%/dat/database/rand_wpn.txt
 +%%DATADIR%%/dat/database/godspeak.txt
  %%DATADIR%%/dat/database/randbook.txt
 -%%DATADIR%%/dat/database/randname.txt
 -%%DATADIR%%/dat/database/shout.txt
 -%%DATADIR%%/dat/database/wpnnoise.txt
 -%%DATADIR%%/dat/defaults/autopickup_exceptions.txt
 -%%DATADIR%%/dat/defaults/food_colouring.txt
 -%%DATADIR%%/dat/defaults/menu_colours.txt
 -%%DATADIR%%/dat/defaults/messages.txt
 -%%DATADIR%%/dat/defaults/misc.txt
 -%%DATADIR%%/dat/defaults/runrest_messages.txt
 -%%DATADIR%%/dat/defaults/standard_colours.txt
 -%%DATADIR%%/dat/des/altar/altar.des
 -%%DATADIR%%/dat/des/altar/fedhas_garden.des
 -%%DATADIR%%/dat/des/altar/grunt_ashenzari_visionary.des
 -%%DATADIR%%/dat/des/altar/grunt_nemelex_the_gamble.des
 -%%DATADIR%%/dat/des/altar/kiku_cage.des
 -%%DATADIR%%/dat/des/altar/lugonu_bribe.des
 -%%DATADIR%%/dat/des/altar/overflow.des
 -%%DATADIR%%/dat/des/altar/trog_burn_book.des
 -%%DATADIR%%/dat/des/altar/trog_wizard.des
 -%%DATADIR%%/dat/des/altar/vehumet_trees.des
 -%%DATADIR%%/dat/des/altar/xom_monty_hall.des
 -%%DATADIR%%/dat/des/altar/yredelemnul_ordeal.des
 +%%DATADIR%%/dat/database/monspeak.txt
 +%%DATADIR%%/dat/database/rand_wpn.txt
 +%%DATADIR%%/dat/database/FAQ.txt
 +%%DATADIR%%/dat/database/monname.txt
 +%%DATADIR%%/dat/database/miscname.txt
 +%%DATADIR%%/dat/dlua/lm_1way.lua
 +%%DATADIR%%/dat/dlua/dungeon.lua
 +%%DATADIR%%/dat/dlua/v_debug.lua
 +%%DATADIR%%/dat/dlua/v_layouts.lua
 +%%DATADIR%%/dat/dlua/v_paint.lua
 +%%DATADIR%%/dat/dlua/lm_fog.lua
 +%%DATADIR%%/dat/dlua/lm_items.lua
 +%%DATADIR%%/dat/dlua/iter.lua
 +%%DATADIR%%/dat/dlua/macro.lua
 +%%DATADIR%%/dat/dlua/tags.lua
 +%%DATADIR%%/dat/dlua/lm_door.lua
 +%%DATADIR%%/dat/dlua/lm_mon_prop.lua
 +%%DATADIR%%/dat/dlua/v_shapes.lua
 +%%DATADIR%%/dat/dlua/luamark.lua
 +%%DATADIR%%/dat/dlua/init.lua
 +%%DATADIR%%/dat/dlua/v_rooms.lua
 +%%DATADIR%%/dat/dlua/point.lua
 +%%DATADIR%%/dat/dlua/fnwrap.lua
 +%%DATADIR%%/dat/dlua/lm_props.lua
 +%%DATADIR%%/dat/dlua/lm_timed.lua
 +%%DATADIR%%/dat/dlua/lm_pdesc.lua
 +%%DATADIR%%/dat/dlua/mapinit.lua
 +%%DATADIR%%/dat/dlua/test.lua
 +%%DATADIR%%/dat/dlua/lm_trove.lua
 +%%DATADIR%%/dat/dlua/sanity.lua
 +%%DATADIR%%/dat/dlua/util.lua
 +%%DATADIR%%/dat/dlua/debug.lua
 +%%DATADIR%%/dat/dlua/lm_trig.lua
 +%%DATADIR%%/dat/dlua/lm_monst.lua
 +%%DATADIR%%/dat/dlua/lm_toll.lua
 +%%DATADIR%%/dat/dlua/ziggurat.lua
 +%%DATADIR%%/dat/dlua/userbase.lua
 +%%DATADIR%%/dat/dlua/layout/zonify.lua
 +%%DATADIR%%/dat/dlua/layout/hyper_rooms.lua
 +%%DATADIR%%/dat/dlua/layout/hyper_strategy.lua
 +%%DATADIR%%/dat/dlua/layout/hyper_paint.lua
 +%%DATADIR%%/dat/dlua/layout/hyper_debug.lua
 +%%DATADIR%%/dat/dlua/layout/procedural.lua
 +%%DATADIR%%/dat/dlua/layout/hyper_place.lua
 +%%DATADIR%%/dat/dlua/layout/vector.lua
 +%%DATADIR%%/dat/dlua/layout/hyper_usage.lua
 +%%DATADIR%%/dat/dlua/layout/hyper_city.lua
 +%%DATADIR%%/dat/dlua/layout/hyper_shapes.lua
 +%%DATADIR%%/dat/dlua/layout/hyper.lua
 +%%DATADIR%%/dat/dlua/layout/hyper_decor.lua
 +%%DATADIR%%/dat/dlua/layout/hyper_fort.lua
 +%%DATADIR%%/dat/dlua/tutorial.lua
 +%%DATADIR%%/dat/dlua/lm_mslav.lua
 +%%DATADIR%%/dat/dlua/sprint.lua
 +%%DATADIR%%/dat/dlua/lm_tmsg.lua
 +%%DATADIR%%/dat/dlua/stress.lua
 +%%DATADIR%%/dat/dlua/loadmaps.lua
 +%%DATADIR%%/dat/clua/kills.lua
 +%%DATADIR%%/dat/clua/wield.lua
 +%%DATADIR%%/dat/clua/runrest.lua
 +%%DATADIR%%/dat/clua/autofight.lua
 +%%DATADIR%%/dat/clua/stash.lua
 +%%DATADIR%%/dat/clua/trapwalk.lua
 +%%DATADIR%%/dat/clua/gearset.lua
 +%%DATADIR%%/dat/des/tutorial/lesson1.des
 +%%DATADIR%%/dat/des/tutorial/lesson3.des
 +%%DATADIR%%/dat/des/tutorial/lesson4.des
 +%%DATADIR%%/dat/des/tutorial/lesson5.des
 +%%DATADIR%%/dat/des/tutorial/lesson2.des
 +%%DATADIR%%/dat/des/guide.txt
 +%%DATADIR%%/dat/des/entry/entry_guide.txt
 +%%DATADIR%%/dat/des/entry/twisted.des
 +%%DATADIR%%/dat/des/entry/simple.des
 +%%DATADIR%%/dat/des/entry/small.des
 +%%DATADIR%%/dat/des/entry/large.des
 +%%DATADIR%%/dat/des/portals/lab.des
 +%%DATADIR%%/dat/des/portals/ziggurat.des
 +%%DATADIR%%/dat/des/portals/wizlab.des
 +%%DATADIR%%/dat/des/portals/trove.des
 +%%DATADIR%%/dat/des/portals/bazaar.des
 +%%DATADIR%%/dat/des/portals/volcano.des
 +%%DATADIR%%/dat/des/portals/icecave.des
 +%%DATADIR%%/dat/des/portals/bailey.des
 +%%DATADIR%%/dat/des/portals/sewer.des
 +%%DATADIR%%/dat/des/portals/ossuary.des
 +%%DATADIR%%/dat/des/variable/mini_features.des
 +%%DATADIR%%/dat/des/variable/ambush.des
 +%%DATADIR%%/dat/des/variable/mini.des
 +%%DATADIR%%/dat/des/variable/grated_community.des
 +%%DATADIR%%/dat/des/variable/ancient_champions.des
 +%%DATADIR%%/dat/des/variable/lemuel_castle.des
 +%%DATADIR%%/dat/des/variable/large_themed.des
 +%%DATADIR%%/dat/des/variable/compat.des
 +%%DATADIR%%/dat/des/variable/tomb_raider.des
 +%%DATADIR%%/dat/des/variable/float.des
 +%%DATADIR%%/dat/des/variable/mini_monsters.des
 +%%DATADIR%%/dat/des/variable/geyser.des
 +%%DATADIR%%/dat/des/variable/cathedral_bats.des
 +%%DATADIR%%/dat/des/variable/dk_crumbling.des
 +%%DATADIR%%/dat/des/variable/large_abstract.des
 +%%DATADIR%%/dat/des/variable/okawaru_arena.des
 +%%DATADIR%%/dat/des/variable/encompass.des
  %%DATADIR%%/dat/des/branches/abyss.des
 -%%DATADIR%%/dat/des/branches/blade.des
 -%%DATADIR%%/dat/des/branches/crypt.des
 -%%DATADIR%%/dat/des/branches/dwarf.des
 +%%DATADIR%%/dat/des/branches/shoals.des
  %%DATADIR%%/dat/des/branches/elf.des
 +%%DATADIR%%/dat/des/branches/pan.des
  %%DATADIR%%/dat/des/branches/hells.des
 +%%DATADIR%%/dat/des/branches/vaults_rooms_standard.des
 +%%DATADIR%%/dat/des/branches/temple.des
 +%%DATADIR%%/dat/des/branches/dwarf.des
 +%%DATADIR%%/dat/des/branches/blade.des
 +%%DATADIR%%/dat/des/branches/zot.des
 +%%DATADIR%%/dat/des/branches/vaults_rooms_empty.des
  %%DATADIR%%/dat/des/branches/lair.des
 -%%DATADIR%%/dat/des/branches/orc.des
 -%%DATADIR%%/dat/des/branches/pan.des
 -%%DATADIR%%/dat/des/branches/shoals.des
 -%%DATADIR%%/dat/des/branches/slime.des
  %%DATADIR%%/dat/des/branches/snake.des
 -%%DATADIR%%/dat/des/branches/spider.des
 -%%DATADIR%%/dat/des/branches/swamp.des
 -%%DATADIR%%/dat/des/branches/temple.des
 +%%DATADIR%%/dat/des/branches/vaults_rooms_hard.des
  %%DATADIR%%/dat/des/branches/tomb.des
 +%%DATADIR%%/dat/des/branches/swamp.des
  %%DATADIR%%/dat/des/branches/vaults.des
 -%%DATADIR%%/dat/des/branches/zot.des
 +%%DATADIR%%/dat/des/branches/crypt.des
 +%%DATADIR%%/dat/des/branches/orc.des
 +%%DATADIR%%/dat/des/branches/spider.des
 +%%DATADIR%%/dat/des/branches/slime.des
 +%%DATADIR%%/dat/des/sprint/menkaure.des
 +%%DATADIR%%/dat/des/sprint/sprint_mu.des
 +%%DATADIR%%/dat/des/sprint/zigsprint.des
 +%%DATADIR%%/dat/des/sprint/pitsprint.des
 +%%DATADIR%%/dat/des/sprint/meat.des
 +%%DATADIR%%/dat/des/sprint/fedhas.des
 +%%DATADIR%%/dat/des/sprint/red_sonja.des
 +%%DATADIR%%/dat/des/sprint/arena_sprint.des
 +%%DATADIR%%/dat/des/zotdef/zotdef.des
 +%%DATADIR%%/dat/des/traps/xom_trap.des
 +%%DATADIR%%/dat/des/traps/boulders.des
 +%%DATADIR%%/dat/des/traps/monster_doors.des
 +%%DATADIR%%/dat/des/traps/grate.des
 +%%DATADIR%%/dat/des/traps/spider_basket.des
 +%%DATADIR%%/dat/des/traps/collapsing_statue.des
 +%%DATADIR%%/dat/des/traps/beogh_trap.des
 +%%DATADIR%%/dat/des/traps/rats_trap.des
 +%%DATADIR%%/dat/des/traps/cloud_traps.des
 +%%DATADIR%%/dat/des/test.des
 +%%DATADIR%%/dat/des/altar/xom_monty_hall.des
 +%%DATADIR%%/dat/des/altar/vehumet_trees.des
 +%%DATADIR%%/dat/des/altar/yredelemnul_ordeal.des
 +%%DATADIR%%/dat/des/altar/lugonu_bribe.des
 +%%DATADIR%%/dat/des/altar/kiku_cage.des
 +%%DATADIR%%/dat/des/altar/fedhas_garden.des
 +%%DATADIR%%/dat/des/altar/trog_burn_book.des
 +%%DATADIR%%/dat/des/altar/ashenzari_visionary.des
 +%%DATADIR%%/dat/des/altar/overflow.des
 +%%DATADIR%%/dat/des/altar/nemelex_the_gamble.des
 +%%DATADIR%%/dat/des/altar/trog_wizard.des
 +%%DATADIR%%/dat/des/altar/altar.des
 +%%DATADIR%%/dat/des/builder/rooms.des
  %%DATADIR%%/dat/des/builder/arena.des
  %%DATADIR%%/dat/des/builder/dummy.des
 -%%DATADIR%%/dat/des/builder/food.des
 +%%DATADIR%%/dat/des/builder/layout_vaults.des
  %%DATADIR%%/dat/des/builder/layout.des
  %%DATADIR%%/dat/des/builder/layout_loops.des
 -%%DATADIR%%/dat/des/builder/rooms.des
 +%%DATADIR%%/dat/des/builder/layout_pools.des
 +%%DATADIR%%/dat/des/builder/food.des
  %%DATADIR%%/dat/des/builder/shops.des
 +%%DATADIR%%/dat/des/builder/layout_caves.des
  %%DATADIR%%/dat/des/builder/uniques.des
 -%%DATADIR%%/dat/des/entry/entry_guide.txt
 -%%DATADIR%%/dat/des/entry/large.des
 -%%DATADIR%%/dat/des/entry/simple.des
 -%%DATADIR%%/dat/des/entry/small.des
 -%%DATADIR%%/dat/des/entry/twisted.des
 -%%DATADIR%%/dat/des/guide.txt
 -%%DATADIR%%/dat/des/portals/bailey.des
 -%%DATADIR%%/dat/des/portals/bazaar.des
 -%%DATADIR%%/dat/des/portals/icecave.des
 -%%DATADIR%%/dat/des/portals/lab.des
 -%%DATADIR%%/dat/des/portals/ossuary.des
 -%%DATADIR%%/dat/des/portals/sewer.des
 -%%DATADIR%%/dat/des/portals/trove.des
 -%%DATADIR%%/dat/des/portals/volcano.des
 -%%DATADIR%%/dat/des/portals/wizlab.des
 -%%DATADIR%%/dat/des/portals/ziggurat.des
 -%%DATADIR%%/dat/des/serial/aquarium.des
 -%%DATADIR%%/dat/des/serial/bayou.des
  %%DATADIR%%/dat/des/serial/column_ruins.des
 -%%DATADIR%%/dat/des/serial/corridors.des
 +%%DATADIR%%/dat/des/serial/undead.des
 +%%DATADIR%%/dat/des/serial/magic_research.des
  %%DATADIR%%/dat/des/serial/curves.des
  %%DATADIR%%/dat/des/serial/forest.des
  %%DATADIR%%/dat/des/serial/glass.des
 -%%DATADIR%%/dat/des/serial/gnoll_camp.des
 +%%DATADIR%%/dat/des/serial/window.des
  %%DATADIR%%/dat/des/serial/ice.des
 -%%DATADIR%%/dat/des/serial/magic_research.des
 -%%DATADIR%%/dat/des/serial/ponds.des
 +%%DATADIR%%/dat/des/serial/rogues_gallery.des
 +%%DATADIR%%/dat/des/serial/corridors.des
 +%%DATADIR%%/dat/des/serial/bayou.des
 +%%DATADIR%%/dat/des/serial/teleporters.des
 +%%DATADIR%%/dat/des/serial/gnoll_camp.des
  %%DATADIR%%/dat/des/serial/serial_guide.txt
 -%%DATADIR%%/dat/des/serial/undead.des
 -%%DATADIR%%/dat/des/serial/window.des
 -%%DATADIR%%/dat/des/sprint/menkaure.des
 -%%DATADIR%%/dat/des/sprint/red_sonja.des
 -%%DATADIR%%/dat/des/sprint/sprint_fedhas.des
 -%%DATADIR%%/dat/des/sprint/sprint_mu.des
 -%%DATADIR%%/dat/des/sprint/zigsprint.des
 -%%DATADIR%%/dat/des/test.des
 -%%DATADIR%%/dat/des/traps/beogh_trap.des
 -%%DATADIR%%/dat/des/traps/boulders.des
 -%%DATADIR%%/dat/des/traps/cloud_traps.des
 -%%DATADIR%%/dat/des/traps/collapsing_statue.des
 -%%DATADIR%%/dat/des/traps/grate.des
 -%%DATADIR%%/dat/des/traps/monster_doors.des
 -%%DATADIR%%/dat/des/traps/rats_trap.des
 -%%DATADIR%%/dat/des/traps/spider_basket.des
 -%%DATADIR%%/dat/des/traps/xom_trap.des
 -%%DATADIR%%/dat/des/tutorial/tutorial_lesson1.des
 -%%DATADIR%%/dat/des/tutorial/tutorial_lesson2.des
 -%%DATADIR%%/dat/des/tutorial/tutorial_lesson3.des
 -%%DATADIR%%/dat/des/tutorial/tutorial_lesson4.des
 -%%DATADIR%%/dat/des/tutorial/tutorial_lesson5.des
 -%%DATADIR%%/dat/des/variable/ancient_champions.des
 -%%DATADIR%%/dat/des/variable/cathedral_bats.des
 -%%DATADIR%%/dat/des/variable/dk_crumbling.des
 -%%DATADIR%%/dat/des/variable/encompass.des
 -%%DATADIR%%/dat/des/variable/evilmike_ambush.des
 -%%DATADIR%%/dat/des/variable/float.des
 -%%DATADIR%%/dat/des/variable/grunt_fire_pits.des
 -%%DATADIR%%/dat/des/variable/large_abstract.des
 -%%DATADIR%%/dat/des/variable/large_themed.des
 -%%DATADIR%%/dat/des/variable/lemuel_castle.des
 -%%DATADIR%%/dat/des/variable/mini.des
 -%%DATADIR%%/dat/des/variable/mini_features.des
 -%%DATADIR%%/dat/des/variable/mini_monsters.des
 -%%DATADIR%%/dat/des/variable/tomb_raider.des
 -%%DATADIR%%/dat/des/zotdef/zotdef.des
 -%%DATADIR%%/dat/descript/ability.txt
 -%%DATADIR%%/dat/descript/backgrounds.txt
 -%%DATADIR%%/dat/descript/branches.txt
 -%%DATADIR%%/dat/descript/cards.txt
 -%%DATADIR%%/dat/descript/commands.txt
 -%%DATADIR%%/dat/descript/cs/ability.txt
 -%%DATADIR%%/dat/descript/cs/branches.txt
 -%%DATADIR%%/dat/descript/cs/commands.txt
 -%%DATADIR%%/dat/descript/cs/features.txt
 -%%DATADIR%%/dat/descript/cs/gods.txt
 -%%DATADIR%%/dat/descript/cs/items.txt
 -%%DATADIR%%/dat/descript/cs/species.txt
 -%%DATADIR%%/dat/descript/cs/spells.txt
 -%%DATADIR%%/dat/descript/cs/unident.txt
 -%%DATADIR%%/dat/descript/da/items.txt
 -%%DATADIR%%/dat/descript/da/monsters.txt
 -%%DATADIR%%/dat/descript/da/species.txt
 -%%DATADIR%%/dat/descript/da/unident.txt
 -%%DATADIR%%/dat/descript/de/backgrounds.txt
 -%%DATADIR%%/dat/descript/de/commands.txt
 -%%DATADIR%%/dat/descript/de/features.txt
 -%%DATADIR%%/dat/descript/de/gods.txt
 -%%DATADIR%%/dat/descript/de/items.txt
 -%%DATADIR%%/dat/descript/de/monsters.txt
 -%%DATADIR%%/dat/descript/de/species.txt
 -%%DATADIR%%/dat/descript/de/unident.txt
 -%%DATADIR%%/dat/descript/de/unrand.txt
 -%%DATADIR%%/dat/descript/el/ability.txt
 -%%DATADIR%%/dat/descript/el/backgrounds.txt
 -%%DATADIR%%/dat/descript/el/gods.txt
 -%%DATADIR%%/dat/descript/el/items.txt
 -%%DATADIR%%/dat/descript/el/species.txt
 -%%DATADIR%%/dat/descript/el/unident.txt
 +%%DATADIR%%/dat/des/serial/aquarium.des
 +%%DATADIR%%/dat/des/serial/sigils.des
 +%%DATADIR%%/dat/des/serial/ponds.des
 +%%DATADIR%%/dat/defaults/standard_colours.txt
 +%%DATADIR%%/dat/defaults/menu_colours.txt
 +%%DATADIR%%/dat/defaults/food_colouring.txt
 +%%DATADIR%%/dat/defaults/autopickup_exceptions.txt
 +%%DATADIR%%/dat/defaults/misc.txt
 +%%DATADIR%%/dat/defaults/runrest_messages.txt
 +%%DATADIR%%/dat/defaults/messages.txt
 +%%DATADIR%%/dat/descript/spells.txt
 +%%DATADIR%%/dat/descript/features.txt
 +%%DATADIR%%/dat/descript/hu/species.txt
 +%%DATADIR%%/dat/descript/es/branches.txt
  %%DATADIR%%/dat/descript/es/ability.txt
 +%%DATADIR%%/dat/descript/es/items.txt
 +%%DATADIR%%/dat/descript/es/unrand.txt
 +%%DATADIR%%/dat/descript/es/features.txt
 +%%DATADIR%%/dat/descript/es/unident.txt
 +%%DATADIR%%/dat/descript/es/species.txt
  %%DATADIR%%/dat/descript/es/backgrounds.txt
 -%%DATADIR%%/dat/descript/es/branches.txt
 -%%DATADIR%%/dat/descript/es/cards.txt
  %%DATADIR%%/dat/descript/es/commands.txt
 -%%DATADIR%%/dat/descript/es/features.txt
 -%%DATADIR%%/dat/descript/es/gods.txt
 -%%DATADIR%%/dat/descript/es/items.txt
  %%DATADIR%%/dat/descript/es/monsters.txt
 -%%DATADIR%%/dat/descript/es/quotes.txt
  %%DATADIR%%/dat/descript/es/skills.txt
 -%%DATADIR%%/dat/descript/es/species.txt
 -%%DATADIR%%/dat/descript/es/unident.txt
 -%%DATADIR%%/dat/descript/es/unrand.txt
 -%%DATADIR%%/dat/descript/features.txt
 -%%DATADIR%%/dat/descript/fi/ability.txt
 -%%DATADIR%%/dat/descript/fi/backgrounds.txt
 -%%DATADIR%%/dat/descript/fi/cards.txt
 -%%DATADIR%%/dat/descript/fi/commands.txt
 -%%DATADIR%%/dat/descript/fi/features.txt
 -%%DATADIR%%/dat/descript/fi/items.txt
 -%%DATADIR%%/dat/descript/fi/monsters.txt
 -%%DATADIR%%/dat/descript/fi/quotes.txt
 -%%DATADIR%%/dat/descript/fi/species.txt
 -%%DATADIR%%/dat/descript/fi/spells.txt
 -%%DATADIR%%/dat/descript/fi/unident.txt
 -%%DATADIR%%/dat/descript/fi/unrand.txt
 -%%DATADIR%%/dat/descript/fr/ability.txt
 +%%DATADIR%%/dat/descript/es/cards.txt
 +%%DATADIR%%/dat/descript/es/gods.txt
 +%%DATADIR%%/dat/descript/pl/skills.txt
 +%%DATADIR%%/dat/descript/pl/spells.txt
 +%%DATADIR%%/dat/descript/pl/monsters.txt
 +%%DATADIR%%/dat/descript/pl/tutorial.txt
 +%%DATADIR%%/dat/descript/pl/unrand.txt
 +%%DATADIR%%/dat/descript/pl/backgrounds.txt
 +%%DATADIR%%/dat/descript/pl/species.txt
 +%%DATADIR%%/dat/descript/pl/unident.txt
 +%%DATADIR%%/dat/descript/pl/items.txt
 +%%DATADIR%%/dat/descript/pl/features.txt
 +%%DATADIR%%/dat/descript/lt/branches.txt
 +%%DATADIR%%/dat/descript/lt/skills.txt
 +%%DATADIR%%/dat/descript/lt/commands.txt
 +%%DATADIR%%/dat/descript/lt/monsters.txt
 +%%DATADIR%%/dat/descript/lt/backgrounds.txt
 +%%DATADIR%%/dat/descript/lt/species.txt
 +%%DATADIR%%/dat/descript/lt/unident.txt
 +%%DATADIR%%/dat/descript/branches.txt
 +%%DATADIR%%/dat/descript/cards.txt
 +%%DATADIR%%/dat/descript/tutorial.txt
 +%%DATADIR%%/dat/descript/cs/gods.txt
 +%%DATADIR%%/dat/descript/cs/unrand.txt
 +%%DATADIR%%/dat/descript/cs/commands.txt
 +%%DATADIR%%/dat/descript/cs/unident.txt
 +%%DATADIR%%/dat/descript/cs/species.txt
 +%%DATADIR%%/dat/descript/cs/branches.txt
 +%%DATADIR%%/dat/descript/cs/tutorial.txt
 +%%DATADIR%%/dat/descript/cs/items.txt
 +%%DATADIR%%/dat/descript/cs/hints.txt
 +%%DATADIR%%/dat/descript/cs/ability.txt
 +%%DATADIR%%/dat/descript/cs/spells.txt
 +%%DATADIR%%/dat/descript/cs/features.txt
 +%%DATADIR%%/dat/descript/species.txt
 +%%DATADIR%%/dat/descript/unident.txt
 +%%DATADIR%%/dat/descript/backgrounds.txt
 +%%DATADIR%%/dat/descript/gods.txt
 +%%DATADIR%%/dat/descript/fr/tutorial.txt
  %%DATADIR%%/dat/descript/fr/backgrounds.txt
  %%DATADIR%%/dat/descript/fr/branches.txt
 -%%DATADIR%%/dat/descript/fr/cards.txt
 -%%DATADIR%%/dat/descript/fr/commands.txt
 -%%DATADIR%%/dat/descript/fr/features.txt
 -%%DATADIR%%/dat/descript/fr/gods.txt
 +%%DATADIR%%/dat/descript/fr/ability.txt
  %%DATADIR%%/dat/descript/fr/items.txt
 -%%DATADIR%%/dat/descript/fr/monsters.txt
 -%%DATADIR%%/dat/descript/fr/quotes.txt
 -%%DATADIR%%/dat/descript/fr/skills.txt
 +%%DATADIR%%/dat/descript/fr/unrand.txt
 +%%DATADIR%%/dat/descript/fr/features.txt
 +%%DATADIR%%/dat/descript/fr/hints.txt
  %%DATADIR%%/dat/descript/fr/species.txt
 -%%DATADIR%%/dat/descript/fr/spells.txt
  %%DATADIR%%/dat/descript/fr/unident.txt
 -%%DATADIR%%/dat/descript/fr/unrand.txt
 -%%DATADIR%%/dat/descript/gods.txt
 -%%DATADIR%%/dat/descript/hints.txt
 -%%DATADIR%%/dat/descript/hu/species.txt
 -%%DATADIR%%/dat/descript/it/backgrounds.txt
 -%%DATADIR%%/dat/descript/it/gods.txt
 -%%DATADIR%%/dat/descript/it/skills.txt
 -%%DATADIR%%/dat/descript/it/species.txt
 +%%DATADIR%%/dat/descript/fr/cards.txt
 +%%DATADIR%%/dat/descript/fr/spells.txt
 +%%DATADIR%%/dat/descript/fr/commands.txt
 +%%DATADIR%%/dat/descript/fr/skills.txt
 +%%DATADIR%%/dat/descript/fr/monsters.txt
 +%%DATADIR%%/dat/descript/fr/gods.txt
 +%%DATADIR%%/dat/descript/skills.txt
  %%DATADIR%%/dat/descript/items.txt
 -%%DATADIR%%/dat/descript/ko/ability.txt
 -%%DATADIR%%/dat/descript/ko/backgrounds.txt
 -%%DATADIR%%/dat/descript/ko/branches.txt
 -%%DATADIR%%/dat/descript/ko/cards.txt
 -%%DATADIR%%/dat/descript/ko/commands.txt
 -%%DATADIR%%/dat/descript/ko/features.txt
 -%%DATADIR%%/dat/descript/ko/gods.txt
 -%%DATADIR%%/dat/descript/ko/items.txt
 -%%DATADIR%%/dat/descript/ko/monsters.txt
 -%%DATADIR%%/dat/descript/ko/quotes.txt
 -%%DATADIR%%/dat/descript/ko/skills.txt
 -%%DATADIR%%/dat/descript/ko/species.txt
 -%%DATADIR%%/dat/descript/ko/spells.txt
 -%%DATADIR%%/dat/descript/ko/unident.txt
 -%%DATADIR%%/dat/descript/ko/unrand.txt
 -%%DATADIR%%/dat/descript/lt/backgrounds.txt
 -%%DATADIR%%/dat/descript/lt/branches.txt
 -%%DATADIR%%/dat/descript/lt/commands.txt
 -%%DATADIR%%/dat/descript/lt/monsters.txt
 -%%DATADIR%%/dat/descript/lt/skills.txt
 -%%DATADIR%%/dat/descript/lt/species.txt
 -%%DATADIR%%/dat/descript/lt/unident.txt
 -%%DATADIR%%/dat/descript/lv/backgrounds.txt
 -%%DATADIR%%/dat/descript/lv/cards.txt
 -%%DATADIR%%/dat/descript/lv/commands.txt
 -%%DATADIR%%/dat/descript/lv/gods.txt
 -%%DATADIR%%/dat/descript/lv/items.txt
 +%%DATADIR%%/dat/descript/monsters.txt
 +%%DATADIR%%/dat/descript/el/items.txt
 +%%DATADIR%%/dat/descript/el/ability.txt
 +%%DATADIR%%/dat/descript/el/backgrounds.txt
 +%%DATADIR%%/dat/descript/el/species.txt
 +%%DATADIR%%/dat/descript/el/unident.txt
 +%%DATADIR%%/dat/descript/el/gods.txt
 +%%DATADIR%%/dat/descript/commands.txt
 +%%DATADIR%%/dat/descript/ja/monsters.txt
 +%%DATADIR%%/dat/descript/ja/unrand.txt
 +%%DATADIR%%/dat/descript/ja/species.txt
 +%%DATADIR%%/dat/descript/ja/backgrounds.txt
 +%%DATADIR%%/dat/descript/ja/branches.txt
 +%%DATADIR%%/dat/descript/ja/gods.txt
 +%%DATADIR%%/dat/descript/ja/items.txt
 +%%DATADIR%%/dat/descript/ja/spells.txt
 +%%DATADIR%%/dat/descript/de/species.txt
 +%%DATADIR%%/dat/descript/de/unident.txt
 +%%DATADIR%%/dat/descript/de/hints.txt
 +%%DATADIR%%/dat/descript/de/commands.txt
 +%%DATADIR%%/dat/descript/de/monsters.txt
 +%%DATADIR%%/dat/descript/de/unrand.txt
 +%%DATADIR%%/dat/descript/de/items.txt
 +%%DATADIR%%/dat/descript/de/ability.txt
 +%%DATADIR%%/dat/descript/de/skills.txt
 +%%DATADIR%%/dat/descript/de/gods.txt
 +%%DATADIR%%/dat/descript/de/features.txt
 +%%DATADIR%%/dat/descript/de/branches.txt
 +%%DATADIR%%/dat/descript/de/tutorial.txt
 +%%DATADIR%%/dat/descript/de/backgrounds.txt
 +%%DATADIR%%/dat/descript/de/cards.txt
 +%%DATADIR%%/dat/descript/ru/monsters.txt
 +%%DATADIR%%/dat/descript/ru/commands.txt
 +%%DATADIR%%/dat/descript/ru/spells.txt
 +%%DATADIR%%/dat/descript/ru/ability.txt
 +%%DATADIR%%/dat/descript/ru/hints.txt
 +%%DATADIR%%/dat/descript/ru/gods.txt
 +%%DATADIR%%/dat/descript/ru/skills.txt
 +%%DATADIR%%/dat/descript/ru/items.txt
 +%%DATADIR%%/dat/descript/ru/backgrounds.txt
 +%%DATADIR%%/dat/descript/ru/features.txt
 +%%DATADIR%%/dat/descript/ru/cards.txt
 +%%DATADIR%%/dat/descript/ru/species.txt
 +%%DATADIR%%/dat/descript/ru/unident.txt
 +%%DATADIR%%/dat/descript/ru/branches.txt
 +%%DATADIR%%/dat/descript/ru/tutorial.txt
 +%%DATADIR%%/dat/descript/ru/unrand.txt
  %%DATADIR%%/dat/descript/lv/monsters.txt
 +%%DATADIR%%/dat/descript/lv/gods.txt
 +%%DATADIR%%/dat/descript/lv/commands.txt
  %%DATADIR%%/dat/descript/lv/skills.txt
  %%DATADIR%%/dat/descript/lv/spells.txt
 +%%DATADIR%%/dat/descript/lv/hints.txt
 +%%DATADIR%%/dat/descript/lv/items.txt
 +%%DATADIR%%/dat/descript/lv/ability.txt
 +%%DATADIR%%/dat/descript/lv/features.txt
 +%%DATADIR%%/dat/descript/lv/cards.txt
  %%DATADIR%%/dat/descript/lv/unrand.txt
 -%%DATADIR%%/dat/descript/monsters.txt
 -%%DATADIR%%/dat/descript/pl/backgrounds.txt
 -%%DATADIR%%/dat/descript/pl/items.txt
 -%%DATADIR%%/dat/descript/pl/quotes.txt
 -%%DATADIR%%/dat/descript/pl/species.txt
 -%%DATADIR%%/dat/descript/pl/spells.txt
 -%%DATADIR%%/dat/descript/pl/tutorial.txt
 -%%DATADIR%%/dat/descript/pl/unident.txt
 -%%DATADIR%%/dat/descript/pl/unrand.txt
 -%%DATADIR%%/dat/descript/pt/commands.txt
 +%%DATADIR%%/dat/descript/lv/tutorial.txt
 +%%DATADIR%%/dat/descript/lv/backgrounds.txt
 +%%DATADIR%%/dat/descript/ko/gods.txt
 +%%DATADIR%%/dat/descript/ko/unrand.txt
 +%%DATADIR%%/dat/descript/ko/backgrounds.txt
 +%%DATADIR%%/dat/descript/ko/monsters.txt
 +%%DATADIR%%/dat/descript/ko/species.txt
 +%%DATADIR%%/dat/descript/ko/commands.txt
 +%%DATADIR%%/dat/descript/ko/unident.txt
 +%%DATADIR%%/dat/descript/ko/cards.txt
 +%%DATADIR%%/dat/descript/ko/hints.txt
 +%%DATADIR%%/dat/descript/ko/features.txt
 +%%DATADIR%%/dat/descript/ko/skills.txt
 +%%DATADIR%%/dat/descript/ko/items.txt
 +%%DATADIR%%/dat/descript/ko/ability.txt
 +%%DATADIR%%/dat/descript/ko/spells.txt
 +%%DATADIR%%/dat/descript/ko/tutorial.txt
 +%%DATADIR%%/dat/descript/ko/branches.txt
  %%DATADIR%%/dat/descript/pt/gods.txt
 -%%DATADIR%%/dat/descript/pt/items.txt
  %%DATADIR%%/dat/descript/pt/unident.txt
 -%%DATADIR%%/dat/descript/quotes.txt
 -%%DATADIR%%/dat/descript/ru/ability.txt
 -%%DATADIR%%/dat/descript/ru/backgrounds.txt
 -%%DATADIR%%/dat/descript/ru/branches.txt
 -%%DATADIR%%/dat/descript/ru/cards.txt
 -%%DATADIR%%/dat/descript/ru/commands.txt
 -%%DATADIR%%/dat/descript/ru/features.txt
 -%%DATADIR%%/dat/descript/ru/gods.txt
 -%%DATADIR%%/dat/descript/ru/items.txt
 -%%DATADIR%%/dat/descript/ru/monsters.txt
 -%%DATADIR%%/dat/descript/ru/quotes.txt
 -%%DATADIR%%/dat/descript/ru/skills.txt
 -%%DATADIR%%/dat/descript/ru/species.txt
 -%%DATADIR%%/dat/descript/ru/unident.txt
 -%%DATADIR%%/dat/descript/ru/unrand.txt
 -%%DATADIR%%/dat/descript/skills.txt
 -%%DATADIR%%/dat/descript/species.txt
 -%%DATADIR%%/dat/descript/spells.txt
 -%%DATADIR%%/dat/descript/tutorial.txt
 -%%DATADIR%%/dat/descript/unident.txt
 +%%DATADIR%%/dat/descript/pt/ability.txt
 +%%DATADIR%%/dat/descript/pt/items.txt
 +%%DATADIR%%/dat/descript/pt/commands.txt
 +%%DATADIR%%/dat/descript/hints.txt
 +%%DATADIR%%/dat/descript/fi/features.txt
 +%%DATADIR%%/dat/descript/fi/ability.txt
 +%%DATADIR%%/dat/descript/fi/unrand.txt
 +%%DATADIR%%/dat/descript/fi/backgrounds.txt
 +%%DATADIR%%/dat/descript/fi/items.txt
 +%%DATADIR%%/dat/descript/fi/species.txt
 +%%DATADIR%%/dat/descript/fi/unident.txt
 +%%DATADIR%%/dat/descript/fi/monsters.txt
 +%%DATADIR%%/dat/descript/fi/cards.txt
 +%%DATADIR%%/dat/descript/fi/commands.txt
 +%%DATADIR%%/dat/descript/fi/spells.txt
 +%%DATADIR%%/dat/descript/it/skills.txt
 +%%DATADIR%%/dat/descript/it/backgrounds.txt
 +%%DATADIR%%/dat/descript/it/gods.txt
 +%%DATADIR%%/dat/descript/it/species.txt
 +%%DATADIR%%/dat/descript/ability.txt
 +%%DATADIR%%/dat/descript/da/monsters.txt
 +%%DATADIR%%/dat/descript/da/skills.txt
 +%%DATADIR%%/dat/descript/da/species.txt
 +%%DATADIR%%/dat/descript/da/unident.txt
 +%%DATADIR%%/dat/descript/da/items.txt
  %%DATADIR%%/dat/descript/unrand.txt
 +%%DATADIR%%/dat/descript/tr/gods.txt
 +%%DATADIR%%/dat/descript/tr/tutorial.txt
 +%%DATADIR%%/dat/descript/tr/ability.txt
 +%%DATADIR%%/dat/descript/tr/unrand.txt
 +%%DATADIR%%/dat/descript/tr/items.txt
 +%%DATADIR%%/dat/descript/zh/gods.txt
  %%DATADIR%%/dat/descript/zh/ability.txt
 -%%DATADIR%%/dat/descript/zh/backgrounds.txt
 -%%DATADIR%%/dat/descript/zh/branches.txt
 +%%DATADIR%%/dat/descript/zh/monsters.txt
  %%DATADIR%%/dat/descript/zh/cards.txt
 +%%DATADIR%%/dat/descript/zh/backgrounds.txt
 +%%DATADIR%%/dat/descript/zh/unrand.txt
  %%DATADIR%%/dat/descript/zh/commands.txt
 -%%DATADIR%%/dat/descript/zh/features.txt
 -%%DATADIR%%/dat/descript/zh/gods.txt
  %%DATADIR%%/dat/descript/zh/items.txt
 -%%DATADIR%%/dat/descript/zh/monsters.txt
 -%%DATADIR%%/dat/descript/zh/skills.txt
 +%%DATADIR%%/dat/descript/zh/branches.txt
  %%DATADIR%%/dat/descript/zh/species.txt
  %%DATADIR%%/dat/descript/zh/unident.txt
 -%%DATADIR%%/dat/dlua/debug.lua
 -%%DATADIR%%/dat/dlua/dungeon.lua
 -%%DATADIR%%/dat/dlua/fnwrap.lua
 -%%DATADIR%%/dat/dlua/init.lua
 -%%DATADIR%%/dat/dlua/iter.lua
 -%%DATADIR%%/dat/dlua/lm_1way.lua
 -%%DATADIR%%/dat/dlua/lm_door.lua
 -%%DATADIR%%/dat/dlua/lm_flags.lua
 -%%DATADIR%%/dat/dlua/lm_fog.lua
 -%%DATADIR%%/dat/dlua/lm_items.lua
 -%%DATADIR%%/dat/dlua/lm_mon_prop.lua
 -%%DATADIR%%/dat/dlua/lm_monst.lua
 -%%DATADIR%%/dat/dlua/lm_mslav.lua
 -%%DATADIR%%/dat/dlua/lm_pdesc.lua
 -%%DATADIR%%/dat/dlua/lm_props.lua
 -%%DATADIR%%/dat/dlua/lm_timed.lua
 -%%DATADIR%%/dat/dlua/lm_tmsg.lua
 -%%DATADIR%%/dat/dlua/lm_toll.lua
 -%%DATADIR%%/dat/dlua/lm_trig.lua
 -%%DATADIR%%/dat/dlua/lm_trove.lua
 -%%DATADIR%%/dat/dlua/loadmaps.lua
 -%%DATADIR%%/dat/dlua/luamark.lua
 -%%DATADIR%%/dat/dlua/macro.lua
 -%%DATADIR%%/dat/dlua/mapinit.lua
 -%%DATADIR%%/dat/dlua/point.lua
 -%%DATADIR%%/dat/dlua/sanity.lua
 -%%DATADIR%%/dat/dlua/sprint.lua
 -%%DATADIR%%/dat/dlua/stress.lua
 -%%DATADIR%%/dat/dlua/tags.lua
 -%%DATADIR%%/dat/dlua/test.lua
 -%%DATADIR%%/dat/dlua/tutorial.lua
 -%%DATADIR%%/dat/dlua/userbase.lua
 -%%DATADIR%%/dat/dlua/util.lua
 -%%DATADIR%%/dat/dlua/ziggurat.lua
 -%%DATADIR%%/dat/lua/autofight.lua
 -%%DATADIR%%/dat/lua/gearset.lua
 -%%DATADIR%%/dat/lua/kills.lua
 -%%DATADIR%%/dat/lua/runrest.lua
 -%%DATADIR%%/dat/lua/stash.lua
 -%%DATADIR%%/dat/lua/trapwalk.lua
 -%%DATADIR%%/dat/lua/wield.lua
 -%%DATADIR%%/docs/CREDITS.txt
 -%%DATADIR%%/docs/aptitudes.txt
 -%%DATADIR%%/docs/arena.txt
 -%%DATADIR%%/docs/changelog.txt
 -%%DATADIR%%/docs/crawl_manual.txt
 -%%DATADIR%%/docs/develop/IRC.txt
 -%%DATADIR%%/docs/develop/coding_conventions.txt
 -%%DATADIR%%/docs/develop/gdb_tips.txt
 -%%DATADIR%%/docs/develop/levels/advanced.txt
 -%%DATADIR%%/docs/develop/levels/introduction.txt
 -%%DATADIR%%/docs/develop/levels/syntax.txt
 -%%DATADIR%%/docs/develop/levels/triggerables.txt
 -%%DATADIR%%/docs/develop/monster_speech.txt
 -%%DATADIR%%/docs/develop/new_dev_checklist.txt
 -%%DATADIR%%/docs/develop/patch_guide.txt
 -%%DATADIR%%/docs/develop/process.txt
 -%%DATADIR%%/docs/develop/release.txt
 -%%DATADIR%%/docs/develop/save_compatibility.txt
 -%%DATADIR%%/docs/develop/spells.txt
 -%%DATADIR%%/docs/develop/testing.txt
 -%%DATADIR%%/docs/develop/tiles_creation.txt
 -%%DATADIR%%/docs/fight_simulator.txt
 +%%DATADIR%%/dat/descript/zh/tutorial.txt
 +%%DATADIR%%/dat/descript/zh/hints.txt
 +%%DATADIR%%/dat/descript/zh/spells.txt
 +%%DATADIR%%/dat/descript/zh/skills.txt
 +%%DATADIR%%/dat/descript/zh/features.txt
 +%%DATADIR%%/docs/macros_guide.txt
  %%DATADIR%%/docs/key_changes.txt
 -%%DATADIR%%/docs/keybind.txt
 -%%DATADIR%%/docs/license/lgpl.txt
 -%%DATADIR%%/docs/license/libpng-LICENSE.txt
 +%%DATADIR%%/docs/quickstart.txt
 +%%DATADIR%%/docs/arena.txt
  %%DATADIR%%/docs/license/lualicense.txt
 +%%DATADIR%%/docs/license/worley.txt
 +%%DATADIR%%/docs/license/libpng-LICENSE.txt
 +%%DATADIR%%/docs/license/lgpl.txt
  %%DATADIR%%/docs/license/pcre_license.txt
 -%%DATADIR%%/docs/macros_guide.txt
 +%%DATADIR%%/docs/license/cc0.txt
  %%DATADIR%%/docs/options_guide.txt
 -%%DATADIR%%/docs/quickstart.txt
 +%%DATADIR%%/docs/aptitudes.txt
 +%%DATADIR%%/docs/crawl_manual.txt
 +%%DATADIR%%/docs/fight_simulator.txt
  %%DATADIR%%/docs/ssh_guide.txt
 +%%DATADIR%%/docs/changelog.txt
 +%%DATADIR%%/docs/keybind.txt
  %%DATADIR%%/docs/tiles_help.txt
 +%%DATADIR%%/docs/develop/save_compatibility.txt
 +%%DATADIR%%/docs/develop/android.txt
 +%%DATADIR%%/docs/develop/tiles_creation.txt
 +%%DATADIR%%/docs/develop/monster_speech.txt
 +%%DATADIR%%/docs/develop/testing.txt
 +%%DATADIR%%/docs/develop/process.txt
 +%%DATADIR%%/docs/develop/levels/triggerables.txt
 +%%DATADIR%%/docs/develop/levels/advanced.txt
 +%%DATADIR%%/docs/develop/levels/syntax.txt
 +%%DATADIR%%/docs/develop/levels/introduction.txt
 +%%DATADIR%%/docs/develop/coding_conventions.txt
 +%%DATADIR%%/docs/develop/patch_guide.txt
 +%%DATADIR%%/docs/develop/gdb_tips.txt
 +%%DATADIR%%/docs/develop/new_dev_checklist.txt
 +%%DATADIR%%/docs/develop/spells.txt
 +%%DATADIR%%/docs/develop/IRC.txt
 +%%DATADIR%%/docs/develop/release.txt
 +%%DATADIR%%/docs/CREDITS.txt
  %%DATADIR%%/docs/translation.txt
 -%%DATADIR%%/settings/0.9_monster_glyphs.txt
 +%%DATADIR%%/settings/no_vi_command_keys.txt
  %%DATADIR%%/settings/034_command_keys.txt
 -%%DATADIR%%/settings/034_monster_glyphs.txt
 +%%DATADIR%%/settings/advanced_optioneering.txt
 +%%DATADIR%%/settings/init.txt
 +%%DATADIR%%/settings/080_monster_glyphs.txt
  %%DATADIR%%/settings/052_monster_glyphs.txt
  %%DATADIR%%/settings/060_monster_glyphs.txt
 +%%DATADIR%%/settings/0.9_monster_glyphs.txt
 +%%DATADIR%%/settings/034_monster_glyphs.txt
  %%DATADIR%%/settings/071_monster_glyphs.txt
 -%%DATADIR%%/settings/080_monster_glyphs.txt
 -%%DATADIR%%/settings/advanced_optioneering.txt
 -%%DATADIR%%/settings/autopickup_exceptions.txt
  %%DATADIR%%/settings/dvorak_command_keys.txt
 -%%DATADIR%%/settings/food_colouring.txt
 -%%DATADIR%%/settings/init.txt
 -%%DATADIR%%/settings/menu_colours.txt
 -%%DATADIR%%/settings/messages.txt
 -%%DATADIR%%/settings/no_vi_command_keys.txt
 -%%DATADIR%%/settings/runrest_messages.txt
 -%%DATADIR%%/settings/standard_colours.txt
 -%%DATADIR%%/settings/tiles_options.txt
 -%%SDL%%%%DATADIR%%/dat/tiles/feat.png
 -%%SDL%%%%DATADIR%%/dat/tiles/floor.png
 -%%SDL%%%%DATADIR%%/dat/tiles/gui.png
 -%%SDL%%%%DATADIR%%/dat/tiles/icons.png
 -%%SDL%%%%DATADIR%%/dat/tiles/logo.png
 -%%SDL%%%%DATADIR%%/dat/tiles/main.png
 +%%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_grabbing_the_orb.png
 +%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.png
 +%%SDL%%%%DATADIR%%/dat/tiles/wall.png
 +%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_undead_warrior.png
 +%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_dragon.png
  %%SDL%%%%DATADIR%%/dat/tiles/player.png
 +%%SDL%%%%DATADIR%%/dat/tiles/title_shadyamish_octm.png
 +%%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_entering_the_dungeon.png
 +%%SDL%%%%DATADIR%%/dat/tiles/icons.png
 +%%SDL%%%%DATADIR%%/dat/tiles/feat.png
 +%%SDL%%%%DATADIR%%/dat/tiles/title_pooryurik_knight.png
  %%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png
 +%%SDL%%%%DATADIR%%/dat/tiles/title_firemage.png
 +%%SDL%%%%DATADIR%%/dat/tiles/title_omndra_zot_demon.png
 +%%SDL%%%%DATADIR%%/dat/tiles/logo.png
 +%%SDL%%%%DATADIR%%/dat/tiles/floor.png
  %%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-512x512.png
 -%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.png
 -%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_dragon.png
 -%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_evil_mage.png
 -%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_invasion.png
 +%%SDL%%%%DATADIR%%/dat/tiles/title_psiweapon_kiku.png
  %%SDL%%%%DATADIR%%/dat/tiles/title_denzi_kitchen_duty.png
 +%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_invasion.png
  %%SDL%%%%DATADIR%%/dat/tiles/title_denzi_summoner.png
 -%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_undead_warrior.png
 -%%SDL%%%%DATADIR%%/dat/tiles/title_firemage.png
 -%%SDL%%%%DATADIR%%/dat/tiles/title_omndra_zot_demon.png
 -%%SDL%%%%DATADIR%%/dat/tiles/title_pooryurik_knight.png
 -%%SDL%%%%DATADIR%%/dat/tiles/title_shadyamish_octm.png
 -%%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_entering_the_dungeon.png
 -%%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_grabbing_the_orb.png
 -%%SDL%%%%DATADIR%%/dat/tiles/wall.png
 +%%SDL%%%%DATADIR%%/dat/tiles/gui.png
 +%%SDL%%%%DATADIR%%/dat/tiles/main.png
 +%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_evil_mage.png
  %%SDL%%@dirrm %%DATADIR%%/dat/tiles
 -@dirrm %%DATADIR%%/settings
 -@dirrm %%DATADIR%%/docs/license
 -@dirrm %%DATADIR%%/docs/develop/levels
 -@dirrm %%DATADIR%%/docs/develop
 -@dirrm %%DATADIR%%/docs
 -@dirrm %%DATADIR%%/dat/lua
 +@dirrm %%DATADIR%%/dat/database/el
 +@dirrm %%DATADIR%%/dat/database/pl
 +@dirrm %%DATADIR%%/dat/database
 +@dirrm %%DATADIR%%/dat/dlua/layout
  @dirrm %%DATADIR%%/dat/dlua
 -@dirrm %%DATADIR%%/dat/descript/zh
 -@dirrm %%DATADIR%%/dat/descript/ru
 -@dirrm %%DATADIR%%/dat/descript/pt
 +@dirrm %%DATADIR%%/dat/clua
 +@dirrm %%DATADIR%%/dat/des/tutorial
 +@dirrm %%DATADIR%%/dat/des/entry
 +@dirrm %%DATADIR%%/dat/des/portals
 +@dirrm %%DATADIR%%/dat/des/variable
 +@dirrm %%DATADIR%%/dat/des/branches
 +@dirrm %%DATADIR%%/dat/des/sprint
 +@dirrm %%DATADIR%%/dat/des/zotdef
 +@dirrm %%DATADIR%%/dat/des/traps
 +@dirrm %%DATADIR%%/dat/des/altar
 +@dirrm %%DATADIR%%/dat/des/builder
 +@dirrm %%DATADIR%%/dat/des/serial
 +@dirrm %%DATADIR%%/dat/des
 +@dirrm %%DATADIR%%/dat/defaults
 +@dirrm %%DATADIR%%/dat/descript/hu
 +@dirrm %%DATADIR%%/dat/descript/es
  @dirrm %%DATADIR%%/dat/descript/pl
 -@dirrm %%DATADIR%%/dat/descript/lv
  @dirrm %%DATADIR%%/dat/descript/lt
 -@dirrm %%DATADIR%%/dat/descript/ko
 -@dirrm %%DATADIR%%/dat/descript/it
 -@dirrm %%DATADIR%%/dat/descript/hu
 +@dirrm %%DATADIR%%/dat/descript/cs
  @dirrm %%DATADIR%%/dat/descript/fr
 -@dirrm %%DATADIR%%/dat/descript/fi
 -@dirrm %%DATADIR%%/dat/descript/es
  @dirrm %%DATADIR%%/dat/descript/el
 +@dirrm %%DATADIR%%/dat/descript/ja
  @dirrm %%DATADIR%%/dat/descript/de
 +@dirrm %%DATADIR%%/dat/descript/ru
 +@dirrm %%DATADIR%%/dat/descript/lv
 +@dirrm %%DATADIR%%/dat/descript/ko
 +@dirrm %%DATADIR%%/dat/descript/pt
 +@dirrm %%DATADIR%%/dat/descript/fi
 +@dirrm %%DATADIR%%/dat/descript/it
  @dirrm %%DATADIR%%/dat/descript/da
 -@dirrm %%DATADIR%%/dat/descript/cs
 +@dirrm %%DATADIR%%/dat/descript/tr
 +@dirrm %%DATADIR%%/dat/descript/zh
  @dirrm %%DATADIR%%/dat/descript
 -@dirrm %%DATADIR%%/dat/des/zotdef
 -@dirrm %%DATADIR%%/dat/des/variable
 -@dirrm %%DATADIR%%/dat/des/tutorial
 -@dirrm %%DATADIR%%/dat/des/traps
 -@dirrm %%DATADIR%%/dat/des/sprint
 -@dirrm %%DATADIR%%/dat/des/serial
 -@dirrm %%DATADIR%%/dat/des/portals
 -@dirrm %%DATADIR%%/dat/des/entry
 -@dirrm %%DATADIR%%/dat/des/builder
 -@dirrm %%DATADIR%%/dat/des/branches
 -@dirrm %%DATADIR%%/dat/des/altar
 -@dirrm %%DATADIR%%/dat/des
 -@dirrm %%DATADIR%%/dat/defaults
 -@dirrm %%DATADIR%%/dat/database/pl
 -@dirrm %%DATADIR%%/dat/database/el
 -@dirrm %%DATADIR%%/dat/database
 -@dirrm %%DATADIR%%/dat/clua
  @dirrm %%DATADIR%%/dat
 +@dirrm %%DATADIR%%/docs/license
 +@dirrm %%DATADIR%%/docs/develop/levels
 +@dirrm %%DATADIR%%/docs/develop
 +@dirrm %%DATADIR%%/docs
 +@dirrm %%DATADIR%%/settings
  @dirrm %%DATADIR%%
  %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --z6Eq5LdranGa6ru8--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309222040.r8MKe2Nx064997>