- Update to 0.10.2

* New species: Octopodes, sentient land-capable octopuses.
   * Skill training system reworked. Dancing is really gone this time!
   * All polearms have reaching.
   * Constriction (nagas, octopodes, some snakes, tentacled monstrosities).
   * New version of the Abyss.
   * Lots of fixes for various crash cases
   * Grey draconians can't drown - we mean it this time
   * Slaying now works as expected for magical staves
   * Allies are not allowed to smite enemies through glass
   * Allies can now cast Orb of Destruction
   * Reaching with polearms is not allowed while trapped in a net/web
   * Description text updates to match 0.10 changes
   * plus many other small updates and fixes.
 - Unbreak clang builds

PR:	ports/166856
Submitted by:	Tobias Rehbein <tobias.rehbein@web.de> (maintainer)
Approved by:	eadler (mentor)

games/stonesoup/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	stonesoup
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.10.2
 CATEGORIES=	games
 MASTER_SITES=	SF/crawl-ref/Stone%20Soup/${PORTVERSION}
 DISTNAME=	stone_soup-${PORTVERSION}-nodeps
@@ -19,7 +18,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/stone_soup-${PORTVERSION}/licence.txt
 
 USE_SQLITE=	yes
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_BISON=	build
 USE_GMAKE=	yes
 USE_LUA=	5.1
@@ -38,12 +37,11 @@ OPTIONS=	SOUND		"Sound support"			off \
 		WIZARD		"Wizard mode"			off \
 		LUA_BINDINGS	"Bindings for LUA user scripts"	off
 
-MAKEFILE=	makefile
 MAKE_ARGS=	prefix=${PREFIX} \
 		DATADIR=${DATADIR} \
 		SAVEDIR=${SAVEDIR} \
 		INSTALL_UGRP=root:games \
-		NO_AUTOOPT=YesPlease \
+		NO_AUTO_OPT=YesPlease \
 		NO_OPTIMIZE=YesPlease \
 		LUA_INCLUDE_DIR=${LOCALBASE}/include/lua51 \
 		LUA_LIB=-llua-5.1 \
@@ -53,16 +51,16 @@ MAKE_ARGS=	prefix=${PREFIX} \
 
 .include <bsd.port.options.mk>
 
-.if ${CC} == "clang" || ${CXX} == "clang++"
-BROKEN=		requires gcc at this time
+.if ${CC:T:M*clang*}
+MAKE_ARGS+=	NO_INLINE_DEPGEN=1
 .endif
 
 .if defined(VERBOSE)
 MAKE_ARGS+=	V=yes
 .endif
 
-.if defined(WITH_WIZARD)
-MAKE_ARGS+=	wizard
+.if defined(WITHOUT_WIZARD)
+MAKE_ARGS+=	NOWIZARD=y
 .endif
 
 .if defined(WITH_SDL)

games/stonesoup/distinfo

@@ -1,2 +1,2 @@
-SHA256 (stone_soup-0.9.1-nodeps.tar.bz2) = ca1fed18d241dcb8d9201e1f24c4930ff7616df4c40af45701058b95c1ccc961
-SIZE (stone_soup-0.9.1-nodeps.tar.bz2) = 6540169
+SHA256 (stone_soup-0.10.2-nodeps.tar.xz) = d5af628ea6ab402a91a0579aed45650ac6e294acf60bebee60b783fbf9039a49
+SIZE (stone_soup-0.10.2-nodeps.tar.xz) = 6486456

games/stonesoup/files/patch-AppHdr.h

@@ -1,6 +1,6 @@
---- ./AppHdr.h.orig	2011-08-12 20:37:59.000000000 +0200
-+++ ./AppHdr.h	2011-10-04 20:14:30.000000000 +0200
-@@ -125,7 +125,7 @@
+--- ./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*.
      //

games/stonesoup/files/patch-Makefile

@@ -1,6 +1,6 @@
---- ./makefile.orig	2011-08-12 20:37:59.000000000 +0200
-+++ ./makefile	2011-10-04 20:14:30.000000000 +0200
-@@ -51,7 +51,7 @@
+--- ./Makefile.orig	2012-04-10 21:47:14.000000000 +0200
++++ ./Makefile	2012-04-14 18:50:22.291961515 +0200
+@@ -63,7 +63,7 @@
  #    ask for a package with convenience libraries instead -- we'll try to provide
  #    them somewhere in the near future.
  
@@ -9,7 +9,7 @@
  
  ASSERTS = yes
  
-@@ -92,11 +92,11 @@
+@@ -111,7 +111,7 @@
  
  else
  
@@ -18,26 +18,30 @@
  
  endif # USE_ICC
  
+@@ -119,7 +119,7 @@
+ CFOPTIMIZE += -flto=jobserver -fwhole-program
+ endif
+ 
 -CFOTHERS := -pipe $(EXTERNAL_FLAGS)
 +CFOTHERS := $(CFLAGS)
- CFWARN := -Wall
+ CFWARN := -Wall -Wformat-security
  CFWARN_L := -Wundef
  
-@@ -664,7 +664,7 @@
+@@ -688,7 +688,7 @@
  DEFINES += -DWIZARD
  endif
  ifdef NO_OPTIMIZE
 -CFOPTIMIZE  := -O0
 +CFOPTIMIZE  :=
  endif
- ifdef PCH
- CFWARN_L += -Winvalid-pch
-@@ -901,7 +901,7 @@
  
- GAME_DEPENDS  := $(DESTTILEFILES) $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB_LIBS)
+ ifdef PCH
+@@ -953,7 +953,7 @@
+ 
+ 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   := $(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
- 

games/stonesoup/files/patch-rltiles__Makefile

@@ -1,5 +1,5 @@
---- ./rltiles/Makefile.orig	2011-08-10 18:05:30.000000000 +0200
-+++ ./rltiles/Makefile	2011-10-04 20:14:30.000000000 +0200
+--- ./rltiles/Makefile.orig	2012-04-10 21:47:25.000000000 +0200
++++ ./rltiles/Makefile	2012-04-14 18:50:22.293960597 +0200
 @@ -1,7 +1,7 @@
  uname_S := $(shell uname -s)
  
@@ -9,14 +9,32 @@
  endif
  
  # Note: since generation of tiles is done on the host, we don't care about
-@@ -26,17 +26,17 @@
- PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a
+@@ -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 TILES
+   ifndef CONTRIB_SDL
+@@ -29,24 +29,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
  
--CFLAGS := -O2 $(SDL_CFLAGS) $(PNG_INCLUDE)
--LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB)
-+L_CFLAGS := $(CFLAGS) $(SDL_CFLAGS) $(PNG_INCLUDE)
-+L_LDFLAGS += $(LDFLAGS) $(SDL_LDFLAGS) $(PNG_LIB)
+ ifdef DEBUG
+-CFLAGS += -O0 -DDEBUG -ggdb
++L_CFLAGS += -O0 -DDEBUG -ggdb
+ endif
  
  ifneq (,$(findstring MINGW,$(uname_S)))
 -LDFLAGS += -lgdi32 -lwinmm
@@ -32,15 +50,24 @@
  endif
  
  # Attempt to use a full compiler name, to make
-@@ -92,9 +92,9 @@
+@@ -100,7 +100,7 @@
+ 	$(QUIET_GEN)$(TILEGEN) $<
+ 
+ # 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)'; \
+@@ -129,9 +129,9 @@
  distclean: clean
  
- %.o: %.cc
--	$(QUIET_CXX)$(CXX) $(CFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
-+	$(QUIET_CXX)$(CXX) $(L_CFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
+ %.o: %.cc .cflags
+-	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
++	$(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
  
  $(TILEGEN): $(OBJECTS)
--	$(QUIET_LINK)$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
-+	$(QUIET_LINK)$(CXX) $(OBJECTS) -o $@ $(L_LDFLAGS)
+-	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
++	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(L_LDFLAGS)
  
  .PHONY: all clean distclean

games/stonesoup/pkg-plist

@@ -1,5 +1,31 @@
 bin/stonesoup
-%%DATADIR%%/dat/des/branches/zot.des
+%%DATADIR%%/dat/database/FAQ.txt
+%%DATADIR%%/dat/database/godspeak.txt
+%%DATADIR%%/dat/database/help.txt
+%%DATADIR%%/dat/database/insult.txt
+%%DATADIR%%/dat/database/miscname.txt
+%%DATADIR%%/dat/database/monflee.txt
+%%DATADIR%%/dat/database/monname.txt
+%%DATADIR%%/dat/database/monspeak.txt
+%%DATADIR%%/dat/database/monspell.txt
+%%DATADIR%%/dat/database/quotes.txt
+%%DATADIR%%/dat/database/rand_all.txt
+%%DATADIR%%/dat/database/rand_arm.txt
+%%DATADIR%%/dat/database/rand_wpn.txt
+%%DATADIR%%/dat/database/randbook.txt
+%%DATADIR%%/dat/database/randname.txt
+%%DATADIR%%/dat/database/shout.txt
+%%DATADIR%%/dat/database/wpnnoise.txt
+%%DATADIR%%/dat/des/altar/altar.des
+%%DATADIR%%/dat/des/altar/fedhas_garden.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/yredelemnul_ordeal.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
@@ -12,40 +38,29 @@ bin/stonesoup
 %%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/tomb.des
 %%DATADIR%%/dat/des/branches/vaults.des
-%%DATADIR%%/dat/des/branches/abyss.des
-%%DATADIR%%/dat/des/variable/large_lemuel_castle.des
-%%DATADIR%%/dat/des/variable/float.des
-%%DATADIR%%/dat/des/variable/large.des
-%%DATADIR%%/dat/des/variable/altar.des
-%%DATADIR%%/dat/des/variable/mini.des
-%%DATADIR%%/dat/des/variable/mini_features.des
-%%DATADIR%%/dat/des/variable/mini_monsters.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/traps/beogh_trap.des
-%%DATADIR%%/dat/des/traps/grate.des
-%%DATADIR%%/dat/des/traps/monster_doors.des
-%%DATADIR%%/dat/des/traps/spider_basket.des
-%%DATADIR%%/dat/des/traps/xom_trap.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/rooms.des
+%%DATADIR%%/dat/des/builder/shops.des
+%%DATADIR%%/dat/des/builder/uniques.des
 %%DATADIR%%/dat/des/entry/entry_guide.txt
-%%DATADIR%%/dat/des/entry/entry_large.des
+%%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/sprint/sprint.des
-%%DATADIR%%/dat/des/sprint/sprint2.des
-%%DATADIR%%/dat/des/sprint/sprint_fedhas.des
-%%DATADIR%%/dat/des/sprint/sprint_mu.des
-%%DATADIR%%/dat/des/zotdef/zotdef.des
-%%DATADIR%%/dat/des/portals/ziggurat.des
+%%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
@@ -54,117 +69,130 @@ bin/stonesoup
 %%DATADIR%%/dat/des/portals/trove.des
 %%DATADIR%%/dat/des/portals/volcano.des
 %%DATADIR%%/dat/des/portals/wizlab.des
-%%DATADIR%%/dat/des/portals/bailey.des
-%%DATADIR%%/dat/des/builder/layout.des
-%%DATADIR%%/dat/des/builder/didact.des
-%%DATADIR%%/dat/des/builder/dummy.des
-%%DATADIR%%/dat/des/builder/arena.des
-%%DATADIR%%/dat/des/builder/rooms.des
-%%DATADIR%%/dat/des/builder/shops.des
-%%DATADIR%%/dat/des/builder/uniques.des
-%%DATADIR%%/dat/des/serial/window.des
+%%DATADIR%%/dat/des/portals/ziggurat.des
+%%DATADIR%%/dat/des/serial/bayou.des
 %%DATADIR%%/dat/des/serial/corridors.des
 %%DATADIR%%/dat/des/serial/curves.des
 %%DATADIR%%/dat/des/serial/glass.des
 %%DATADIR%%/dat/des/serial/gnoll_camp.des
 %%DATADIR%%/dat/des/serial/ponds.des
 %%DATADIR%%/dat/des/serial/serial_guide.txt
-%%DATADIR%%/dat/des/serial/bayou.des
-%%DATADIR%%/dat/des/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/sprint_fedhas.des
+%%DATADIR%%/dat/des/sprint/sprint_mu.des
 %%DATADIR%%/dat/des/test.des
-%%DATADIR%%/dat/dlua/debug.lua
-%%DATADIR%%/dat/dlua/util.lua
-%%DATADIR%%/dat/dlua/userbase.lua
-%%DATADIR%%/dat/dlua/tutorial.lua
-%%DATADIR%%/dat/dlua/test.lua
-%%DATADIR%%/dat/dlua/stress.lua
-%%DATADIR%%/dat/dlua/sprint.lua
-%%DATADIR%%/dat/dlua/sanity.lua
-%%DATADIR%%/dat/dlua/point.lua
-%%DATADIR%%/dat/dlua/mapinit.lua
-%%DATADIR%%/dat/dlua/macro.lua
-%%DATADIR%%/dat/dlua/luamark.lua
-%%DATADIR%%/dat/dlua/loadmaps.lua
-%%DATADIR%%/dat/dlua/lm_trove.lua
-%%DATADIR%%/dat/dlua/lm_trig.lua
-%%DATADIR%%/dat/dlua/lm_toll.lua
-%%DATADIR%%/dat/dlua/lm_tmsg.lua
-%%DATADIR%%/dat/dlua/lm_timed.lua
-%%DATADIR%%/dat/dlua/lm_props.lua
-%%DATADIR%%/dat/dlua/lm_pdesc.lua
-%%DATADIR%%/dat/dlua/lm_mslav.lua
-%%DATADIR%%/dat/dlua/lm_monst.lua
-%%DATADIR%%/dat/dlua/lm_mon_prop.lua
-%%DATADIR%%/dat/dlua/lm_items.lua
-%%DATADIR%%/dat/dlua/lm_fog.lua
-%%DATADIR%%/dat/dlua/lm_flags.lua
-%%DATADIR%%/dat/dlua/lm_door.lua
-%%DATADIR%%/dat/dlua/lm_1way.lua
-%%DATADIR%%/dat/dlua/iter.lua
-%%DATADIR%%/dat/dlua/init.lua
-%%DATADIR%%/dat/dlua/fnwrap.lua
-%%DATADIR%%/dat/dlua/dungeon.lua
-%%DATADIR%%/dat/dlua/ziggurat.lua
-%%DATADIR%%/dat/lua/runrest.lua
-%%DATADIR%%/dat/lua/trapwalk.lua
-%%DATADIR%%/dat/lua/stash.lua
-%%DATADIR%%/dat/lua/wield.lua
-%%DATADIR%%/dat/lua/kills.lua
-%%DATADIR%%/dat/lua/gearset.lua
-%%DATADIR%%/dat/lua/autofight.lua
-%%DATADIR%%/dat/database/FAQ.txt
-%%DATADIR%%/dat/database/shout.txt
-%%DATADIR%%/dat/database/randname.txt
-%%DATADIR%%/dat/database/randbook.txt
-%%DATADIR%%/dat/database/rand_wpn.txt
-%%DATADIR%%/dat/database/rand_arm.txt
-%%DATADIR%%/dat/database/rand_all.txt
-%%DATADIR%%/dat/database/quotes.txt
-%%DATADIR%%/dat/database/monspell.txt
-%%DATADIR%%/dat/database/monspeak.txt
-%%DATADIR%%/dat/database/monname.txt
-%%DATADIR%%/dat/database/monflee.txt
-%%DATADIR%%/dat/database/miscname.txt
-%%DATADIR%%/dat/database/insult.txt
-%%DATADIR%%/dat/database/help.txt
-%%DATADIR%%/dat/database/godspeak.txt
-%%DATADIR%%/dat/database/wpnnoise.txt
+%%DATADIR%%/dat/des/traps/beogh_trap.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/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/spells.txt
-%%DATADIR%%/dat/descript/species.txt
-%%DATADIR%%/dat/descript/skills.txt
-%%DATADIR%%/dat/descript/monsters.txt
-%%DATADIR%%/dat/descript/items.txt
-%%DATADIR%%/dat/descript/gods.txt
-%%DATADIR%%/dat/descript/features.txt
-%%DATADIR%%/dat/descript/commands.txt
-%%DATADIR%%/dat/descript/cards.txt
-%%DATADIR%%/dat/descript/branches.txt
 %%DATADIR%%/dat/descript/backgrounds.txt
+%%DATADIR%%/dat/descript/branches.txt
+%%DATADIR%%/dat/descript/cards.txt
+%%DATADIR%%/dat/descript/commands.txt
+%%DATADIR%%/dat/descript/features.txt
+%%DATADIR%%/dat/descript/gods.txt
+%%DATADIR%%/dat/descript/items.txt
+%%DATADIR%%/dat/descript/monsters.txt
+%%DATADIR%%/dat/descript/skills.txt
+%%DATADIR%%/dat/descript/species.txt
+%%DATADIR%%/dat/descript/spells.txt
 %%DATADIR%%/dat/descript/unident.txt
-%%SDL%%%%DATADIR%%/dat/tiles/feat.png
-%%SDL%%%%DATADIR%%/dat/tiles/title_omndra_zot_demon.png
-%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_undead_warrior.png
-%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_summoner.png
-%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_kitchen_duty.png
-%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_dragon.png
-%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.png
-%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-512x512.png
-%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png
-%%SDL%%%%DATADIR%%/dat/tiles/player.png
-%%SDL%%%%DATADIR%%/dat/tiles/main.png
-%%SDL%%%%DATADIR%%/dat/tiles/logo.png
-%%SDL%%%%DATADIR%%/dat/tiles/icons.png
-%%SDL%%%%DATADIR%%/dat/tiles/gui.png
-%%SDL%%%%DATADIR%%/dat/tiles/floor.png
-%%SDL%%%%DATADIR%%/dat/tiles/wall.png
+%%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
 %%SDL%%%%DATADIR%%/dat/tiles/Vera.ttf
 %%SDL%%%%DATADIR%%/dat/tiles/VeraMono.ttf
+%%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/player.png
+%%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_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_denzi_kitchen_duty.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_shadyamish_octm.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
@@ -179,6 +207,7 @@ bin/stonesoup
 %%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
@@ -199,7 +228,6 @@ bin/stonesoup
 %%DATADIR%%/settings/init.txt
 %%DATADIR%%/settings/food_colouring.txt
 %%DATADIR%%/settings/dvorak_command_keys.txt
-%%DATADIR%%/settings/dolls.txt
 %%DATADIR%%/settings/autopickup_exceptions.txt
 %%DATADIR%%/settings/advanced_optioneering.txt
 %%DATADIR%%/settings/080_monster_glyphs.txt
@@ -207,9 +235,11 @@ bin/stonesoup
 %%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
 @dirrm %%DATADIR%%/dat/des/variable
 @dirrm %%DATADIR%%/dat/des/tutorial