7 files changed, 127 insertions, 167 deletions

diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index 64dec14b8809..99b44f91d26d 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	stonesoup
-PORTVERSION=	0.8.1
+PORTVERSION=	0.9.1
 CATEGORIES=	games
 MASTER_SITES=	SF/crawl-ref/Stone%20Soup/${PORTVERSION}
 DISTNAME=	stone_soup-${PORTVERSION}-nodeps
@@ -14,35 +14,34 @@ DISTNAME=	stone_soup-${PORTVERSION}-nodeps
 MAINTAINER=	tobias.rehbein@web.de
 COMMENT=	Dungeon Crawl Stone Soup - a fun, free rogue-like game
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKDIR}/stone_soup-${PORTVERSION}/licence.txt
+
 USE_SQLITE=	yes
 USE_BZIP2=	yes
 USE_BISON=	build
 USE_GMAKE=	yes
 USE_LUA=	5.1
 USE_PERL5_BUILD=	yes
-USE_NCURSES=	yes
+USE_GCC=	4.2+
 
 MAKE_JOBS_SAFE=	yes
 
-SAVEDIR?=	/var/games/${PORTNAME}
+SAVEDIR=	\~/.stonesoup
 WRKSRC=		${WRKDIR}/stone_soup-${PORTVERSION}/source/
 
 SUB_FILES=	README.FreeBSD
 PLIST_SUB=	SAVEDIR="${SAVEDIR}"
 
 OPTIONS=	SOUND		"Sound support"			off \
-		UNICODE		"Unicode glyphs (UTF-8)"	off \
-		WIZARD		"Wizard mode"			off
+		WIZARD		"Wizard mode"			off \
+		LUA_BINDINGS	"Bindings for LUA user scripts"	off
 
 MAKEFILE=	makefile
-MAKE_ARGS=	FREEBSD_PORT=yes
-MAKE_ARGS+=	prefix=${PREFIX} \
-		SAVEDIR=${SAVEDIR} \
+MAKE_ARGS=	prefix=${PREFIX} \
 		DATADIR=${DATADIR} \
+		SAVEDIR=${SAVEDIR} \
 		INSTALL_UGRP=root:games \
-		MCHMOD=2755 \
-		MCHMOD_SAVEDIR=775 \
-		MCHMOD_LOGS=664 \
 		NO_AUTOOPT=YesPlease \
 		NO_OPTIMIZE=YesPlease \
 		LUA_INCLUDE_DIR=${LOCALBASE}/include/lua51 \
@@ -53,6 +52,10 @@ MAKE_ARGS+=	prefix=${PREFIX} \
 
 .include <bsd.port.options.mk>
 
+.if ${CC} == "clang" || ${CXX} == "clang++"
+BROKEN=		requires gcc at this time
+.endif
+
 .if defined(VERBOSE)
 MAKE_ARGS+=	V=yes
 .endif
@@ -71,6 +74,7 @@ LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2
 USE_SDL=	sdl image
 .else
+USE_NCURSES=	yes
 CONFLICTS+=	${PORTNAME}-sdl-[0-9]*
 PLIST_SUB+=	SDL="@comment "
 .endif
@@ -79,14 +83,8 @@ PLIST_SUB+=	SDL="@comment "
 RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
 .endif
 
-# NO_LUA_BINDINGS is bit-rotten. Upstream thinks about fixing or removing it.
-#	
-# .if defined(WITHOUT_LUA_BINDINGS)
-# MAKE_ARGS+=	NO_LUA_BINDINGS=yes
-# .endif
-
-.if defined(WITH_UNICODE)
-MAKE_ARGS+=	USE_UNICODE=yes
+.if defined(WITHOUT_LUA_BINDINGS)
+MAKE_ARGS+=	NO_LUA_BINDINGS=yes
 .endif
 
 post-patch:
diff --git a/games/stonesoup/distinfo b/games/stonesoup/distinfo
index 3ca27bd688e7..1d115d031478 100644
--- a/games/stonesoup/distinfo
+++ b/games/stonesoup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (stone_soup-0.8.1-nodeps.tar.bz2) = 91a7d8a9f3f2df333fa8e25548a4d0c233c8a145db0ad339bec4844d90aba9cf
-SIZE (stone_soup-0.8.1-nodeps.tar.bz2) = 6507956
+SHA256 (stone_soup-0.9.1-nodeps.tar.bz2) = ca1fed18d241dcb8d9201e1f24c4930ff7616df4c40af45701058b95c1ccc961
+SIZE (stone_soup-0.9.1-nodeps.tar.bz2) = 6540169
diff --git a/games/stonesoup/files/README.FreeBSD.in b/games/stonesoup/files/README.FreeBSD.in
index 0e560601b584..f6637795a0ba 100644
--- a/games/stonesoup/files/README.FreeBSD.in
+++ b/games/stonesoup/files/README.FreeBSD.in
@@ -1,5 +1,7 @@
-The end-user documentation for ``Dungeon Crawl Stone Soup`` can be found in
+The end-user documentation for ``Dungeon Crawl Stone Soup`` can be found
+in-game and in `%%DATADIR%%/docs`.
 
-	%%DATADIR%%/docs 
+If the game fails to start after an upgrade try to delete the old save games
+using `rm -rf ~/.stonesoup/saves`.
 
 Happy crawling!
diff --git a/games/stonesoup/files/patch-AppHdr.h b/games/stonesoup/files/patch-AppHdr.h
index ffcaa9916444..46523a6a5890 100644
--- a/games/stonesoup/files/patch-AppHdr.h
+++ b/games/stonesoup/files/patch-AppHdr.h
@@ -1,6 +1,6 @@
---- ./AppHdr.h.orig	2011-04-26 15:08:47.000000000 +0200
-+++ ./AppHdr.h	2011-06-02 19:51:41.000000000 +0200
-@@ -135,7 +135,7 @@
+--- ./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 @@
      //
      // WARNING: Filenames passed to this command *are not validated in any way*.
      //
diff --git a/games/stonesoup/files/patch-makefile b/games/stonesoup/files/patch-makefile
index 86fd5155f46b..1338f84916ce 100644
--- a/games/stonesoup/files/patch-makefile
+++ b/games/stonesoup/files/patch-makefile
@@ -1,5 +1,5 @@
---- ./makefile.orig	2011-04-26 15:08:48.000000000 +0200
-+++ ./makefile	2011-06-02 19:52:05.000000000 +0200
+--- ./makefile.orig	2011-08-12 20:37:59.000000000 +0200
++++ ./makefile	2011-10-04 20:14:30.000000000 +0200
 @@ -51,7 +51,7 @@
  #    ask for a package with convenience libraries instead -- we'll try to provide
  #    them somewhere in the near future.
@@ -20,10 +20,10 @@
  
 -CFOTHERS := -pipe $(EXTERNAL_FLAGS)
 +CFOTHERS := $(CFLAGS)
- CFOTHERS_L := -fsigned-char
  CFWARN := -Wall
  CFWARN_L := -Wundef
-@@ -639,7 +639,7 @@
+ 
+@@ -664,7 +664,7 @@
  DEFINES += -DWIZARD
  endif
  ifdef NO_OPTIMIZE
@@ -32,49 +32,12 @@
  endif
  ifdef PCH
  CFWARN_L += -Winvalid-pch
-@@ -872,10 +872,10 @@
+@@ -901,7 +901,7 @@
  
  GAME_DEPENDS  := $(DESTTILEFILES) $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB_LIBS)
  SRC_PKG_BASE  := stone_soup
--SRC_VERSION   := $(shell git describe --tags --long $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
-+SRC_VERSION   := $(shell cat util/release_ver)
+-SRC_VERSION   := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
++SRC_VERSION   := $(cat util/release_ver)
  
- # when making release builds, use just the bare tag
--SRC_VERSION_SHORT := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
-+SRC_VERSION_SHORT := $(shell cat util/release_ver)
- ifneq (,$(SRC_VERSION_SHORT))
-   ifeq (,$(findstring -,$(SRC_VERSION_SHORT)))
-     SRC_VERSION := $(SRC_VERSION_SHORT)
-@@ -1041,7 +1041,7 @@
- ifneq ($(savedir_fp),)
- 	mkdir -p $(savedir_fp)/saves
- 	mkdir -p $(savedir_fp)/morgue
--ifeq ($(USE_DGAMELAUNCH),)
-+#ifeq ($(USE_DGAMELAUNCH),)
- 	$(CHOWN) $(INSTALL_UGRP) $(prefix_fp)/$(bin_prefix)/$(GAME) || true
- 	$(CHMOD) $(MCHMOD) $(prefix_fp)/$(bin_prefix)/$(GAME) || true
- 	$(CHOWN) -R $(INSTALL_UGRP) $(datadir_fp) || true
-@@ -1049,7 +1049,7 @@
- 	$(CHMOD) $(MCHMOD_SAVEDIR) $(savedir_fp) || true
- 	$(CHMOD) $(MCHMOD_SAVEDIR) $(savedir_fp)/saves || true
- 	$(CHMOD) $(MCHMOD_SAVEDIR) $(savedir_fp)/morgue || true
--endif
-+#endif
- endif
- ifneq ($(shareddir_fp),)
- 	mkdir -p $(shareddir_fp)
-@@ -1060,12 +1060,12 @@
- 	touch $(shareddir_fp)/logfile
- 	touch $(shareddir_fp)/scores
- endif
--ifeq ($(USE_DGAMELAUNCH),)
-+#ifeq ($(USE_DGAMELAUNCH),)
- 	$(CHOWN) -R $(INSTALL_UGRP) $(shareddir_fp) || true
- 	$(CHMOD) $(MCHMOD_SAVEDIR) $(shareddir_fp) || true
- 	$(CHMOD) $(MCHMOD_LOGS) $(shareddir_fp)/logfile || true
- 	$(CHMOD) $(MCHMOD_LOGS) $(shareddir_fp)/scores || true
--endif
-+#endif
- endif
+ export SRC_VERSION
  
- clean: clean-rltiles
diff --git a/games/stonesoup/files/patch-rltiles__Makefile b/games/stonesoup/files/patch-rltiles__Makefile
index 51b7cc1ccfa1..8e5bf3392962 100644
--- a/games/stonesoup/files/patch-rltiles__Makefile
+++ b/games/stonesoup/files/patch-rltiles__Makefile
@@ -1,5 +1,5 @@
---- ./rltiles/Makefile.orig	2011-04-19 14:37:42.000000000 +0200
-+++ ./rltiles/Makefile	2011-06-02 19:51:42.000000000 +0200
+--- ./rltiles/Makefile.orig	2011-08-10 18:05:30.000000000 +0200
++++ ./rltiles/Makefile	2011-10-04 20:14:30.000000000 +0200
 @@ -1,7 +1,7 @@
  uname_S := $(shell uname -s)
  
@@ -8,9 +8,9 @@
 +L_LDFLAGS += -lmingw32
  endif
  
- ifndef CONTRIB_SDL
-@@ -20,17 +20,17 @@
- PNG_LIB := ../contrib/install/lib/libpng.a ../contrib/install/lib/libz.a
+ # 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
  endif
  
 -CFLAGS := -O2 $(SDL_CFLAGS) $(PNG_INCLUDE)
@@ -32,18 +32,7 @@
  endif
  
  # Attempt to use a full compiler name, to make
-@@ -43,10 +43,6 @@
- LMACH :=
- endif
- CXX = $(LMACH)g++
--ifdef ARCH
--CF_ARCHS := $(patsubst %,-arch %,$(ARCH))
--CXX += $(CF_ARCHS)
--endif
- 
- DELETE = rm -f
- 
-@@ -89,9 +85,9 @@
+@@ -92,9 +92,9 @@
  distclean: clean
  
  %.o: %.cc
diff --git a/games/stonesoup/pkg-plist b/games/stonesoup/pkg-plist
index 15a83b5a119b..e9b8de6cc562 100644
--- a/games/stonesoup/pkg-plist
+++ b/games/stonesoup/pkg-plist
@@ -17,39 +17,33 @@ bin/stonesoup
 %%DATADIR%%/dat/des/branches/tomb.des
 %%DATADIR%%/dat/des/branches/vaults.des
 %%DATADIR%%/dat/des/branches/abyss.des
-%%DATADIR%%/dat/des/variable/traps.des
+%%DATADIR%%/dat/des/variable/large_lemuel_castle.des
 %%DATADIR%%/dat/des/variable/float.des
-%%DATADIR%%/dat/des/variable/gnoll_camp.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/variable/serial_corexii_hall.des
-%%DATADIR%%/dat/des/variable/serial_curves.des
-%%DATADIR%%/dat/des/variable/serial_window.des
-%%DATADIR%%/dat/des/variable/altar.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/entry/entry.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/entry/entry_guide.txt
 %%DATADIR%%/dat/des/entry/entry_large.des
-%%DATADIR%%/dat/des/entry/entry_simple.des
-%%DATADIR%%/dat/des/entry/entry_small.des
-%%DATADIR%%/dat/des/entry/entry_twisted.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/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/portals/ziggurat.des
 %%DATADIR%%/dat/des/portals/bazaar.des
 %%DATADIR%%/dat/des/portals/icecave.des
@@ -61,48 +55,63 @@ bin/stonesoup
 %%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/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/test.des
-%%DATADIR%%/dat/clua/debug.lua
-%%DATADIR%%/dat/clua/util.lua
-%%DATADIR%%/dat/clua/userbase.lua
-%%DATADIR%%/dat/clua/tutorial.lua
-%%DATADIR%%/dat/clua/test.lua
-%%DATADIR%%/dat/clua/sprint.lua
-%%DATADIR%%/dat/clua/sanity.lua
-%%DATADIR%%/dat/clua/point.lua
-%%DATADIR%%/dat/clua/mapinit.lua
-%%DATADIR%%/dat/clua/macro.lua
-%%DATADIR%%/dat/clua/luamark.lua
-%%DATADIR%%/dat/clua/loadmaps.lua
-%%DATADIR%%/dat/clua/lm_trove.lua
-%%DATADIR%%/dat/clua/lm_trig.lua
-%%DATADIR%%/dat/clua/lm_toll.lua
-%%DATADIR%%/dat/clua/lm_tmsg.lua
-%%DATADIR%%/dat/clua/lm_timed.lua
-%%DATADIR%%/dat/clua/lm_props.lua
-%%DATADIR%%/dat/clua/lm_pdesc.lua
-%%DATADIR%%/dat/clua/lm_mslav.lua
-%%DATADIR%%/dat/clua/lm_monst.lua
-%%DATADIR%%/dat/clua/lm_mon_prop.lua
-%%DATADIR%%/dat/clua/lm_items.lua
-%%DATADIR%%/dat/clua/lm_fog.lua
-%%DATADIR%%/dat/clua/lm_flags.lua
-%%DATADIR%%/dat/clua/lm_door.lua
-%%DATADIR%%/dat/clua/lm_1way.lua
-%%DATADIR%%/dat/clua/iter.lua
-%%DATADIR%%/dat/clua/init.lua
-%%DATADIR%%/dat/clua/fnwrap.lua
-%%DATADIR%%/dat/clua/dungeon.lua
-%%DATADIR%%/dat/clua/ziggurat.lua
-%%DATADIR%%/dat/lua/autofight.lua
+%%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/runrest.lua
-%%DATADIR%%/dat/lua/pickup.lua
+%%DATADIR%%/dat/lua/wield.lua
 %%DATADIR%%/dat/lua/kills.lua
 %%DATADIR%%/dat/lua/gearset.lua
-%%DATADIR%%/dat/lua/wield.lua
+%%DATADIR%%/dat/lua/autofight.lua
 %%DATADIR%%/dat/database/FAQ.txt
 %%DATADIR%%/dat/database/shout.txt
 %%DATADIR%%/dat/database/randname.txt
@@ -133,6 +142,24 @@ bin/stonesoup
 %%DATADIR%%/dat/descript/branches.txt
 %%DATADIR%%/dat/descript/backgrounds.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
+%%SDL%%%%DATADIR%%/dat/tiles/Vera.ttf
+%%SDL%%%%DATADIR%%/dat/tiles/VeraMono.ttf
 %%DATADIR%%/docs/develop/levels/triggerables.txt
 %%DATADIR%%/docs/develop/levels/syntax.txt
 %%DATADIR%%/docs/develop/levels/introduction.txt
@@ -153,6 +180,7 @@ bin/stonesoup
 %%DATADIR%%/docs/license/libpng-LICENSE.txt
 %%DATADIR%%/docs/license/lgpl.txt
 %%DATADIR%%/docs/aptitudes.txt
+%%DATADIR%%/docs/ssh_guide.txt
 %%DATADIR%%/docs/quickstart.txt
 %%DATADIR%%/docs/options_guide.txt
 %%DATADIR%%/docs/macros_guide.txt
@@ -161,7 +189,7 @@ bin/stonesoup
 %%DATADIR%%/docs/crawl_manual.txt
 %%DATADIR%%/docs/changelog.txt
 %%DATADIR%%/docs/arena.txt
-%%DATADIR%%/docs/ssh_guide.txt
+%%DATADIR%%/docs/tiles_help.txt
 %%DATADIR%%/settings/034_command_keys.txt
 %%DATADIR%%/settings/standard_colours.txt
 %%DATADIR%%/settings/runrest_messages.txt
@@ -174,41 +202,26 @@ bin/stonesoup
 %%DATADIR%%/settings/dolls.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/tiles_options.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
-%%SDL%%%%DATADIR%%/dat/tiles/Vera.ttf
-%%SDL%%%%DATADIR%%/dat/tiles/VeraMono.ttf
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.crawlrc
 @dirrm %%DATADIR%%/dat/des/branches
 @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/builder
 @dirrm %%DATADIR%%/dat/des/portals
+@dirrm %%DATADIR%%/dat/des/builder
+@dirrm %%DATADIR%%/dat/des/serial
 @dirrm %%DATADIR%%/dat/des
-@dirrm %%DATADIR%%/dat/clua
+@dirrm %%DATADIR%%/dat/dlua
 @dirrm %%DATADIR%%/dat/lua
 @dirrm %%DATADIR%%/dat/database
 @dirrm %%DATADIR%%/dat/descript
@@ -222,8 +235,3 @@ bin/stonesoup
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@exec install -d -o root -g games -m 775 %%SAVEDIR%%/saves %%SAVEDIR%%/morgue
-@exec touch %%SAVEDIR%%/saves/logfile %%SAVEDIR%%/saves/scores
-@exec chmod 664  %%SAVEDIR%%/saves/logfile %%SAVEDIR%%/saves/scores
-@unexec rmdir %%SAVEDIR%% >/dev/null 2>&1 || echo 'stonesoup save-game directory (%%SAVEDIR%%) not removed due to existing save games. If you are permanently removing this port, you should do a ``rm -rf %%SAVEDIR%%``.' | fmt
-