aboutsummaryrefslogtreecommitdiffstats
path: root/games
diff options
context:
space:
mode:
Diffstat (limited to 'games')
-rw-r--r--games/stonesoup/Makefile6
-rw-r--r--games/stonesoup/distinfo4
-rw-r--r--games/stonesoup/files/patch-AppHdr.h11
-rw-r--r--games/stonesoup/files/patch-Makefile111
-rw-r--r--games/stonesoup/files/patch-files.cc24
-rw-r--r--games/stonesoup/files/patch-ng-setup.cc14
-rw-r--r--games/stonesoup/files/patch-rltiles__Makefile27
-rw-r--r--games/stonesoup/files/patch-rltiles__tool__tile.cc17
-rw-r--r--games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc11
-rw-r--r--games/stonesoup/files/patch-startup.cc13
-rw-r--r--games/stonesoup/pkg-plist346
11 files changed, 477 insertions, 107 deletions
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index 2b02ce06cd8a..a60015717ced 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= stonesoup
-PORTVERSION= 0.10.3
+PORTVERSION= 0.11.0
CATEGORIES= games
MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION}
DISTNAME= stone_soup-${PORTVERSION}-nodeps
@@ -23,7 +23,6 @@ USE_BISON= build
USE_GMAKE= yes
USE_LUA= 5.1
USE_PERL5_BUILD= yes
-USE_GCC= 4.2+
MAKE_JOBS_SAFE= yes
@@ -71,6 +70,9 @@ MAKE_ARGS+= TILES=y
PLIST_SUB+= SDL=""
PKGNAMESUFFIX= -sdl
USE_PKGCONFIG= yes
+BUILD_DEPENDS+= fc-list:${PORTSDIR}/x11-fonts/fontconfig \
+ ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2
USE_SDL= sdl image
diff --git a/games/stonesoup/distinfo b/games/stonesoup/distinfo
index e383a34df2d9..ed65b6cb8a09 100644
--- a/games/stonesoup/distinfo
+++ b/games/stonesoup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (stone_soup-0.10.3-nodeps.tar.xz) = c61801030486bb7020992d95573fb9378e80355c400b82cfa0f476dbd823c4a2
-SIZE (stone_soup-0.10.3-nodeps.tar.xz) = 6486324
+SHA256 (stone_soup-0.11.0-nodeps.tar.xz) = 2a39307c9f88608ee2a33d3b831c51d9190c91ccdedadececda5edae6dd69002
+SIZE (stone_soup-0.11.0-nodeps.tar.xz) = 7516360
diff --git a/games/stonesoup/files/patch-AppHdr.h b/games/stonesoup/files/patch-AppHdr.h
deleted file mode 100644
index c5a9585fb45d..000000000000
--- a/games/stonesoup/files/patch-AppHdr.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./AppHdr.h.orig 2012-04-10 21:47:14.000000000 +0200
-+++ ./AppHdr.h 2012-04-14 18:50:22.264960252 +0200
-@@ -126,7 +126,7 @@
- //
- // WARNING: Filenames passed to this command *are not validated in any 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 &"
-
- // For cases when the game will be played on terms that don't support the
- // curses "bold == lighter" 16 colour mode. -- bwr
diff --git a/games/stonesoup/files/patch-Makefile b/games/stonesoup/files/patch-Makefile
index 204caf85e3fb..93024c69c2b7 100644
--- a/games/stonesoup/files/patch-Makefile
+++ b/games/stonesoup/files/patch-Makefile
@@ -1,15 +1,15 @@
---- ./Makefile.orig 2012-04-10 21:47:14.000000000 +0200
-+++ ./Makefile 2012-04-14 18:50:22.291961515 +0200
-@@ -63,7 +63,7 @@
+--- ./Makefile.orig 2012-09-30 23:25:31.000000000 +0200
++++ ./Makefile 2012-10-27 20:49:08.837330946 +0200
+@@ -66,7 +66,7 @@
# ask for a package with convenience libraries instead -- we'll try to provide
# them somewhere in the near future.
-GAME = crawl
+GAME = stonesoup
- ASSERTS = yes
-
-@@ -111,7 +111,7 @@
+ # 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
+@@ -112,7 +112,7 @@
else
@@ -18,7 +18,7 @@
endif # USE_ICC
-@@ -119,7 +119,7 @@
+@@ -120,7 +120,7 @@
CFOPTIMIZE += -flto=jobserver -fwhole-program
endif
@@ -27,7 +27,56 @@
CFWARN := -Wall -Wformat-security
CFWARN_L := -Wundef
-@@ -688,7 +688,7 @@
+@@ -133,8 +133,6 @@
+ #
+ AR = ar
+ RANLIB = ranlib
+-CC = $(GCC)
+-CXX = $(GXX)
+ RM = rm -f
+ COPY = cp
+ COPY_R = cp -r
+@@ -530,30 +528,19 @@
+ ifndef BUILD_LUA
+ ifdef NO_PKGCONFIG
+ BUILD_LUA = yes
+- endif
+-endif
+-ifndef BUILD_LUA
+- ifneq ($(shell $(PKGCONFIG) lua5.1 --exists || echo no),)
+- ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),)
++ else
++ LUA_PACKAGE := $(shell for lua in lua51 lua5.1 lua-5.1 lua; do \
++ $(PKGCONFIG) $$lua --exists && test `$(PKGCONFIG) $$lua --modversion | head -c 3` = 5.1 && \
++ echo $$lua && break;\
++ done)
++ ifeq (,$(LUA_PACKAGE))
+ BUILD_LUA = yes
+ else
+- ifeq ($(shell $(PKGCONFIG) lua --modversion | head -c 3),5.1)
+- LUA_PACKAGE = lua
+- else
+- BUILD_LUA = yes
+- endif
++ INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I)
++ CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
++ LIBS += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --libs)
+ endif
+- else
+- LUA_PACKAGE = lua5.1
+- endif
+-endif
+-ifndef BUILD_LUA
+- ifndef LUA_PACKAGE
+- LUA_PACKAGE = lua5.1
+ endif
+- INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I)
+- CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
+- LIBS += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --libs)
+ endif
+
+ ifndef BUILD_SQLITE
+@@ -707,7 +694,7 @@
DEFINES += -DWIZARD
endif
ifdef NO_OPTIMIZE
@@ -36,12 +85,54 @@
endif
ifdef PCH
-@@ -953,7 +953,7 @@
+@@ -831,10 +818,12 @@
+ INSTALL_FONTS += $(PROPORTIONAL_FONT)
+ endif
+ else
+- SYS_PROPORTIONAL_FONT = $(shell find /usr/share/fonts -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
+- ifeq (,$(SYS_PROPORTIONAL_FONT))
+- SYS_PROPORTIONAL_FONT = $(shell find /usr/local/share/fonts -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
+- endif
++ 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;\
++ 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 += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
+@@ -854,10 +843,12 @@
+ INSTALL_FONTS += $(MONOSPACED_FONT)
+ endif
+ else
+- SYS_MONOSPACED_FONT = $(shell find /usr/share/fonts -iname $(OUR_MONOSPACED_FONT)|head -n 1)
+- ifeq (,$(SYS_MONOSPACED_FONT))
+- SYS_MONOSPACED_FONT = $(shell find /usr/local/share/fonts -iname $(OUR_MONOSPACED_FONT)|head -n 1)
+- endif
++ 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;\
++ 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 += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"
+@@ -1036,7 +1027,7 @@
+ cmd-name.h $(INI_OBJECTS)
- GAME_DEPENDS := $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB_LIBS) dat/dlua/tags.lua
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/')
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 there!\\n";\
+ fi
+
diff --git a/games/stonesoup/files/patch-files.cc b/games/stonesoup/files/patch-files.cc
new file mode 100644
index 000000000000..f553e91268ae
--- /dev/null
+++ b/games/stonesoup/files/patch-files.cc
@@ -0,0 +1,24 @@
+--- ./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 @@
+ {
+ std::vector<player_save_info> chars;
+
++#ifdef WIZARD
+ if (Options.no_save)
+ return chars;
++#endif
+
+ #ifndef DISABLE_SAVEGAME_LISTS
+ std::string searchpath = _get_savefile_directory();
+@@ -1741,8 +1743,10 @@
+ // returns false if a new game should start instead
+ static bool _restore_game(const std::string& filename)
+ {
++#ifdef WIZARD
+ if (Options.no_save)
+ return false;
++#endif
+
+ you.save = new package((_get_savefile_directory() + filename).c_str(), true);
+
diff --git a/games/stonesoup/files/patch-ng-setup.cc b/games/stonesoup/files/patch-ng-setup.cc
new file mode 100644
index 000000000000..d9b83a0f0b00
--- /dev/null
+++ b/games/stonesoup/files/patch-ng-setup.cc
@@ -0,0 +1,14 @@
+--- ./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 = true;
+
+ // Create the save file.
++#ifdef WIZARD
+ if (Options.no_save)
+ you.save = new package();
+ else
++#endif
+ you.save = new package(get_savedir_filename(you.your_name).c_str(),
+ true, true);
+ }
diff --git a/games/stonesoup/files/patch-rltiles__Makefile b/games/stonesoup/files/patch-rltiles__Makefile
index 8428ca4efded..2cc0c6ee69e1 100644
--- a/games/stonesoup/files/patch-rltiles__Makefile
+++ b/games/stonesoup/files/patch-rltiles__Makefile
@@ -1,5 +1,5 @@
---- ./rltiles/Makefile.orig 2012-04-10 21:47:25.000000000 +0200
-+++ ./rltiles/Makefile 2012-04-14 18:50:22.293960597 +0200
+--- ./rltiles/Makefile.orig 2012-09-30 23:25:31.000000000 +0200
++++ ./rltiles/Makefile 2012-10-27 20:49:55.957667879 +0200
@@ -1,7 +1,7 @@
uname_S := $(shell uname -s)
@@ -50,8 +50,17 @@
endif
# Attempt to use a full compiler name, to make
-@@ -100,7 +100,7 @@
- $(QUIET_GEN)$(TILEGEN) $<
+@@ -58,7 +58,7 @@
+ ifeq ($(shell which $(LMACH)gcc > /dev/null 2> /dev/null && echo "Yes"),)
+ LMACH :=
+ endif
+-HOSTCXX ?= $(LMACH)g++
++HOSTCXX ?= $(LMACH)$(CXX)
+
+ DELETE = rm -f
+
+@@ -98,7 +98,7 @@
+ $(QUIET_GEN)$(TILEGEN) -c $<
# CFLAGS difference check
-TRACK_CFLAGS = $(subst ','\'',$(HOSTCXX) $(CFLAGS)) # (stray ' for highlights)
@@ -59,12 +68,16 @@
.cflags: .force-cflags
@FLAGS='$(TRACK_CFLAGS)'; \
-@@ -129,9 +129,9 @@
+@@ -127,9 +127,13 @@
distclean: clean
%.o: %.cc .cflags
-- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
-+ $(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
+- $(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
$(TILEGEN): $(OBJECTS)
- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
diff --git a/games/stonesoup/files/patch-rltiles__tool__tile.cc b/games/stonesoup/files/patch-rltiles__tool__tile.cc
new file mode 100644
index 000000000000..eeef30874c57
--- /dev/null
+++ b/games/stonesoup/files/patch-rltiles__tool__tile.cc
@@ -0,0 +1,17 @@
+--- ./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
+@@ -125,10 +125,10 @@
+ if (flags[x + y * m_width])
+ continue;
+
+- if (x > 0 && flags[(x-1) + y * m_width]
+- || y > 0 && flags[x + (y-1) * m_width]
+- || x < m_width - 1 && flags[(x+1) + y * m_width]
+- || y < m_height - 1 && flags[x + (y+1) * m_width])
++ if ((x > 0 && flags[(x-1) + y * m_width])
++ || (y > 0 && flags[x + (y-1) * m_width])
++ || (x < m_width - 1 && flags[(x+1) + y * m_width])
++ || (y < m_height - 1 && flags[x + (y+1) * m_width]))
+ {
+ get_pixel(x,y) = rim;
+ }
diff --git a/games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc b/games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc
new file mode 100644
index 000000000000..845baa8d9a4f
--- /dev/null
+++ b/games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc
@@ -0,0 +1,11 @@
+--- ./rltiles/tool/tile_list_processor.cc.orig 2012-09-30 23:25:33.000000000 +0200
++++ ./rltiles/tool/tile_list_processor.cc 2012-10-27 20:49:08.847233795 +0200
+@@ -51,7 +51,7 @@
+ ""
+ };
+
+- if (m_sdir != "" || background && m_back_sdir != "")
++ if (m_sdir != "" || (background && m_back_sdir != ""))
+ {
+ std::vector<const char *> dirs;
+ if (m_sdir != "")
diff --git a/games/stonesoup/files/patch-startup.cc b/games/stonesoup/files/patch-startup.cc
new file mode 100644
index 000000000000..44f849219414
--- /dev/null
+++ b/games/stonesoup/files/patch-startup.cc
@@ -0,0 +1,13 @@
+--- ./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 @@
+ you.wizard = true;
+ #endif
+ // Save-less games are pointless except for tests.
++#ifdef WIZARD
+ if (Options.no_save)
+ you.wizard = true;
++#endif
+
+ init_properties();
+ burden_change();
diff --git a/games/stonesoup/pkg-plist b/games/stonesoup/pkg-plist
index 430806293bf4..f154a70f5470 100644
--- a/games/stonesoup/pkg-plist
+++ b/games/stonesoup/pkg-plist
@@ -1,5 +1,15 @@
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/insult.txt
@@ -8,7 +18,8 @@ bin/stonesoup
%%DATADIR%%/dat/database/monname.txt
%%DATADIR%%/dat/database/monspeak.txt
%%DATADIR%%/dat/database/monspell.txt
-%%DATADIR%%/dat/database/quotes.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
@@ -16,14 +27,24 @@ bin/stonesoup
%%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/des/branches/abyss.des
%%DATADIR%%/dat/des/branches/blade.des
@@ -31,7 +52,6 @@ bin/stonesoup
%%DATADIR%%/dat/des/branches/dwarf.des
%%DATADIR%%/dat/des/branches/elf.des
%%DATADIR%%/dat/des/branches/hells.des
-%%DATADIR%%/dat/des/branches/hive.des
%%DATADIR%%/dat/des/branches/lair.des
%%DATADIR%%/dat/des/branches/orc.des
%%DATADIR%%/dat/des/branches/pan.des
@@ -45,10 +65,10 @@ bin/stonesoup
%%DATADIR%%/dat/des/branches/vaults.des
%%DATADIR%%/dat/des/branches/zot.des
%%DATADIR%%/dat/des/builder/arena.des
-%%DATADIR%%/dat/des/builder/didact.des
%%DATADIR%%/dat/des/builder/dummy.des
%%DATADIR%%/dat/des/builder/food.des
%%DATADIR%%/dat/des/builder/layout.des
+%%DATADIR%%/dat/des/builder/layout_loops.des
%%DATADIR%%/dat/des/builder/rooms.des
%%DATADIR%%/dat/des/builder/shops.des
%%DATADIR%%/dat/des/builder/uniques.des
@@ -60,31 +80,36 @@ bin/stonesoup
%%DATADIR%%/dat/des/guide.txt
%%DATADIR%%/dat/des/portals/bailey.des
%%DATADIR%%/dat/des/portals/bazaar.des
-%%DATADIR%%/dat/des/portals/hive.des.disabled
%%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/spider.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/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/ice.des
+%%DATADIR%%/dat/des/serial/magic_research.des
%%DATADIR%%/dat/des/serial/ponds.des
%%DATADIR%%/dat/des/serial/serial_guide.txt
%%DATADIR%%/dat/des/serial/undead.des
%%DATADIR%%/dat/des/serial/window.des
-%%DATADIR%%/dat/des/sprint/sprint.des
-%%DATADIR%%/dat/des/sprint/sprint2.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
@@ -103,6 +128,7 @@ bin/stonesoup
%%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
@@ -116,14 +142,161 @@ bin/stonesoup
%%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/descript/es/ability.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/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/items.txt
+%%DATADIR%%/dat/descript/fr/monsters.txt
+%%DATADIR%%/dat/descript/fr/quotes.txt
+%%DATADIR%%/dat/descript/fr/skills.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/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/lv/monsters.txt
+%%DATADIR%%/dat/descript/lv/skills.txt
+%%DATADIR%%/dat/descript/lv/spells.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/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/unrand.txt
+%%DATADIR%%/dat/descript/zh/ability.txt
+%%DATADIR%%/dat/descript/zh/backgrounds.txt
+%%DATADIR%%/dat/descript/zh/branches.txt
+%%DATADIR%%/dat/descript/zh/cards.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/species.txt
+%%DATADIR%%/dat/descript/zh/unident.txt
%%DATADIR%%/dat/dlua/debug.lua
%%DATADIR%%/dat/dlua/dungeon.lua
%%DATADIR%%/dat/dlua/fnwrap.lua
@@ -165,8 +338,58 @@ bin/stonesoup
%%DATADIR%%/dat/lua/stash.lua
%%DATADIR%%/dat/lua/trapwalk.lua
%%DATADIR%%/dat/lua/wield.lua
-%%SDL%%%%DATADIR%%/dat/tiles/Vera.ttf
-%%SDL%%%%DATADIR%%/dat/tiles/VeraMono.ttf
+%%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%%/docs/key_changes.txt
+%%DATADIR%%/docs/keybind.txt
+%%DATADIR%%/docs/license/lgpl.txt
+%%DATADIR%%/docs/license/libpng-LICENSE.txt
+%%DATADIR%%/docs/license/lualicense.txt
+%%DATADIR%%/docs/license/pcre_license.txt
+%%DATADIR%%/docs/macros_guide.txt
+%%DATADIR%%/docs/options_guide.txt
+%%DATADIR%%/docs/quickstart.txt
+%%DATADIR%%/docs/ssh_guide.txt
+%%DATADIR%%/docs/tiles_help.txt
+%%DATADIR%%/docs/translation.txt
+%%DATADIR%%/settings/0.9_monster_glyphs.txt
+%%DATADIR%%/settings/034_command_keys.txt
+%%DATADIR%%/settings/034_monster_glyphs.txt
+%%DATADIR%%/settings/052_monster_glyphs.txt
+%%DATADIR%%/settings/060_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
@@ -185,83 +408,56 @@ bin/stonesoup
%%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
-%%DATADIR%%/docs/develop/levels/triggerables.txt
-%%DATADIR%%/docs/develop/levels/syntax.txt
-%%DATADIR%%/docs/develop/levels/introduction.txt
-%%DATADIR%%/docs/develop/levels/advanced.txt
-%%DATADIR%%/docs/develop/IRC.txt
-%%DATADIR%%/docs/develop/gdb_tips.txt
-%%DATADIR%%/docs/develop/testing.txt
-%%DATADIR%%/docs/develop/spells.txt
-%%DATADIR%%/docs/develop/save_compatibility.txt
-%%DATADIR%%/docs/develop/release.txt
-%%DATADIR%%/docs/develop/process.txt
-%%DATADIR%%/docs/develop/patch_guide.txt
-%%DATADIR%%/docs/develop/monster_speech.txt
-%%DATADIR%%/docs/develop/coding_conventions.txt
-%%DATADIR%%/docs/develop/tiles_creation.txt
-%%DATADIR%%/docs/license/pcre_license.txt
-%%DATADIR%%/docs/license/mt19937.txt
-%%DATADIR%%/docs/license/lualicense.txt
-%%DATADIR%%/docs/license/libpng-LICENSE.txt
-%%DATADIR%%/docs/license/lgpl.txt
-%%DATADIR%%/docs/CREDITS.txt
-%%DATADIR%%/docs/aptitudes.txt
-%%DATADIR%%/docs/ssh_guide.txt
-%%DATADIR%%/docs/quickstart.txt
-%%DATADIR%%/docs/options_guide.txt
-%%DATADIR%%/docs/macros_guide.txt
-%%DATADIR%%/docs/keybind.txt
-%%DATADIR%%/docs/key_changes.txt
-%%DATADIR%%/docs/crawl_manual.txt
-%%DATADIR%%/docs/changelog.txt
-%%DATADIR%%/docs/arena.txt
-%%DATADIR%%/docs/tiles_help.txt
-%%DATADIR%%/settings/034_command_keys.txt
-%%DATADIR%%/settings/standard_colours.txt
-%%DATADIR%%/settings/runrest_messages.txt
-%%DATADIR%%/settings/no_vi_command_keys.txt
-%%DATADIR%%/settings/messages.txt
-%%DATADIR%%/settings/menu_colours.txt
-%%DATADIR%%/settings/init.txt
-%%DATADIR%%/settings/food_colouring.txt
-%%DATADIR%%/settings/dvorak_command_keys.txt
-%%DATADIR%%/settings/autopickup_exceptions.txt
-%%DATADIR%%/settings/advanced_optioneering.txt
-%%DATADIR%%/settings/080_monster_glyphs.txt
-%%DATADIR%%/settings/071_monster_glyphs.txt
-%%DATADIR%%/settings/060_monster_glyphs.txt
-%%DATADIR%%/settings/052_monster_glyphs.txt
-%%DATADIR%%/settings/034_monster_glyphs.txt
-%%DATADIR%%/settings/0.9_monster_glyphs.txt
-%%DATADIR%%/settings/tiles_options.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.crawlrc
-@dirrm %%DATADIR%%/dat/des/altar
-@dirrm %%DATADIR%%/dat/des/branches
+%%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/dlua
+@dirrm %%DATADIR%%/dat/descript/zh
+@dirrm %%DATADIR%%/dat/descript/ru
+@dirrm %%DATADIR%%/dat/descript/pt
+@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/fr
+@dirrm %%DATADIR%%/dat/descript/fi
+@dirrm %%DATADIR%%/dat/descript/es
+@dirrm %%DATADIR%%/dat/descript/el
+@dirrm %%DATADIR%%/dat/descript/de
+@dirrm %%DATADIR%%/dat/descript/da
+@dirrm %%DATADIR%%/dat/descript/cs
+@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/entry
@dirrm %%DATADIR%%/dat/des/sprint
-@dirrm %%DATADIR%%/dat/des/zotdef
+@dirrm %%DATADIR%%/dat/des/serial
@dirrm %%DATADIR%%/dat/des/portals
+@dirrm %%DATADIR%%/dat/des/entry
@dirrm %%DATADIR%%/dat/des/builder
-@dirrm %%DATADIR%%/dat/des/serial
+@dirrm %%DATADIR%%/dat/des/branches
+@dirrm %%DATADIR%%/dat/des/altar
@dirrm %%DATADIR%%/dat/des
-@dirrm %%DATADIR%%/dat/dlua
-@dirrm %%DATADIR%%/dat/lua
+@dirrm %%DATADIR%%/dat/defaults
+@dirrm %%DATADIR%%/dat/database/pl
+@dirrm %%DATADIR%%/dat/database/el
@dirrm %%DATADIR%%/dat/database
-@dirrm %%DATADIR%%/dat/descript
-%%SDL%%@dirrm %%DATADIR%%/dat/tiles
+@dirrm %%DATADIR%%/dat/clua
@dirrm %%DATADIR%%/dat
-@dirrm %%DATADIR%%/docs/develop/levels
-@dirrm %%DATADIR%%/docs/develop
-@dirrm %%DATADIR%%/docs/license
-@dirrm %%DATADIR%%/docs
-@dirrm %%DATADIR%%/settings
@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.crawlrc
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%