- Update to 0.7.1

- Split off SDL version into games/stonesoup-sdl slave port
- Note the new WWW site in pkg-descr

PR:		ports/147828
Submitted by:	maintainer
Approved by:	tabthorpe (mentor, implicit)

7 files changed, 171 insertions, 170 deletions

diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index 3bf9611e0677..9ccd7ced79fc 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	stonesoup
-PORTVERSION=	0.6.0
+PORTVERSION=	0.7.1
 CATEGORIES=	games
 MASTER_SITES=	SF/crawl-ref/Stone%20Soup/${PORTVERSION}
 DISTNAME=	stone_soup-${PORTVERSION}-nodeps
@@ -14,9 +14,7 @@ DISTNAME=	stone_soup-${PORTVERSION}-nodeps
 MAINTAINER=	tobias.rehbein@web.de
 COMMENT=	Dungeon Crawl Stone Soup - a fun, free rogue-like game
 
-LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
-RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-
+USE_SQLITE=	yes
 USE_BZIP2=	yes
 USE_BISON=	build
 USE_GMAKE=	yes
@@ -26,13 +24,12 @@ USE_PERL5_BUILD=	yes
 MAKE_JOBS_SAFE=	yes
 
 SAVEDIR?=	/var/games/${PORTNAME}
-WRKSRC=		${WRKDIR}/stone_soup-${PORTVERSION}/source/
+WRKSRC=		${WRKDIR}/stone_soup-${PORTVERSION}-1-g7ce9b19/source/
 
 SUB_FILES=	README.FreeBSD
 PLIST_SUB=	SAVEDIR="${SAVEDIR}"
 
-OPTIONS=	SDL		"SDL support (tiles interface)"	off \
-		SOUND		"Sound support"			off \
+OPTIONS=	SOUND		"Sound support"			off \
 		LUA_BINDINGS	"LUA bindings for user scripts"	on \
 		UNICODE		"Unicode glyphs (UTF-8)"	off \
 		WIZARD		"Wizard mode"			off
@@ -51,10 +48,7 @@ MAKE_ARGS+=	V=yes
 MAKE_ARGS+=	wizard
 .endif
 
-.if defined(WITHOUT_SDL)
-CONFLICTS+=	${PORTNAME}-sdl-[0-9]*
-PLIST_SUB+=	SDL="@comment "
-.else
+.if defined(WITH_SDL)
 CONFLICTS+=	${PORTNAME}-[0-9]*
 MAKE_ARGS+=	TILES=y
 PLIST_SUB+=	SDL=""
@@ -63,6 +57,9 @@ BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
 LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2
 USE_SDL=	sdl image
+.else
+CONFLICTS+=	${PORTNAME}-sdl-[0-9]*
+PLIST_SUB+=	SDL="@comment "
 .endif
 
 .if defined(WITH_SOUND)
diff --git a/games/stonesoup/distinfo b/games/stonesoup/distinfo
index c4e4276c55a7..88a115f51a0c 100644
--- a/games/stonesoup/distinfo
+++ b/games/stonesoup/distinfo
@@ -1,3 +1,3 @@
-MD5 (stone_soup-0.6.0-nodeps.tar.bz2) = 866e315470a592572e7ce8a7214c7615
-SHA256 (stone_soup-0.6.0-nodeps.tar.bz2) = f05ba17b64f3f669da3fb4185ed2e1425bd6a2fa8375fa4671807c67b2e4f8ff
-SIZE (stone_soup-0.6.0-nodeps.tar.bz2) = 4597191
+MD5 (stone_soup-0.7.1-nodeps.tar.bz2) = e5fa03fc9206ede190f288bf0b24500b
+SHA256 (stone_soup-0.7.1-nodeps.tar.bz2) = 4978869637595e6c3573f0cc72e7aa1be05ab2b73fcef691692c5cbc044251bb
+SIZE (stone_soup-0.7.1-nodeps.tar.bz2) = 4878043
diff --git a/games/stonesoup/files/patch-AppHdr.h b/games/stonesoup/files/patch-AppHdr.h
index 012d55f4d634..07149ac9005c 100644
--- a/games/stonesoup/files/patch-AppHdr.h
+++ b/games/stonesoup/files/patch-AppHdr.h
@@ -1,6 +1,6 @@
---- ./AppHdr.h.orig	2010-03-27 00:43:25.000000000 +0100
-+++ ./AppHdr.h	2010-04-18 13:17:52.000000000 +0200
-@@ -157,7 +157,7 @@
+--- ./AppHdr.h.orig	2010-07-24 05:31:45.000000000 +0200
++++ ./AppHdr.h	2010-08-05 09:25:27.000000000 +0200
+@@ -161,7 +161,7 @@
      //          setuid or setgid. Filenames passed to this command *are not
      //          validated in any way*.
      //
@@ -9,14 +9,3 @@
  
      // For cases when the game will be played on terms that don't support the
      // curses "bold == lighter" 16 colour mode. -- bwr
-@@ -457,8 +457,8 @@
-     #ifndef SAVE_PACKAGE_NONE
-     #ifdef USE_TAR
-       #define PACKAGE_SUFFIX ".tar.gz"
--      #define SAVE_PACKAGE_CMD "tar"
--      #define LOAD_UNPACKAGE_CMD "tar -zxf %s"PACKAGE_SUFFIX" -C %s"
-+      #define SAVE_PACKAGE_CMD "gtar"
-+      #define LOAD_UNPACKAGE_CMD "gtar -zxf %s"PACKAGE_SUFFIX" -C %s"
-       #define UNPACK_SPECIFIC_FILE_CMD LOAD_UNPACKAGE_CMD " %s"
-     #else
-     #ifdef USE_ZIP
diff --git a/games/stonesoup/files/patch-makefile b/games/stonesoup/files/patch-makefile
index ce73a4b0af31..ce4bf1bc5a98 100644
--- a/games/stonesoup/files/patch-makefile
+++ b/games/stonesoup/files/patch-makefile
@@ -1,22 +1,36 @@
---- ./makefile.orig	2010-03-27 00:43:25.000000000 +0100
-+++ ./makefile	2010-04-18 13:18:41.000000000 +0200
-@@ -44,7 +44,7 @@
+--- ./makefile.orig	2010-07-24 05:31:49.000000000 +0200
++++ ./makefile	2010-08-05 09:25:27.000000000 +0200
+@@ -45,14 +45,7 @@
  #    ask for a package with convenience libraries instead -- we'll try to provide
  #    them somewhere in the near future.
  
 -GAME = crawl
+-
+-ASSERTS = yes
+-
+-# 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
+-# _explicit_ rules defined for everything. So we don't need them.
+-MAKEFLAGS += -rR
 +GAME = stonesoup
  
  #
  # Compiler Flags
-@@ -82,19 +82,31 @@
+@@ -86,24 +79,39 @@
+ 
+ else
+ 
++ifndef FREEBSD_PORT
+ CFOPTIMIZE := -O2
++endif
  
  endif # USE_ICC
  
 +ifndef FREEBSD_PORT
- CFOTHERS := -fno-strict-aliasing -pipe $(EXTERNAL_FLAGS)
+ CFOTHERS := -pipe $(EXTERNAL_FLAGS)
  CFOTHERS_L := -fsigned-char
  CFWARN := -Wall
+ CFWARN_L := -Wundef
  
  DEFINES := $(EXTERNAL_DEFINES)
 +else
@@ -25,6 +39,7 @@
 +CFOTHERS := $(CFLAGS)
 +CFOTHERS_L := -fsigned-char
 +CFWARN := 
++CFWARN_L := 
 +
 +DEFINES := $(EXTERNAL_DEFINES)
 +endif
@@ -41,11 +56,23 @@
  RM = rm -f
  COPY = cp
  COPY_R = cp -r
-@@ -268,9 +280,10 @@
+@@ -135,10 +143,10 @@
+ endif
+ LIBZ := contrib/install/lib/libz.a
+ 
+-LUA_INCLUDE_DIR := /usr/include/lua5.1
+-LUA_LIB := -llua5.1
+-SQLITE_INCLUDE_DIR := /usr/include
+-SQLITE_LIB := -lsqlite3
++LUA_INCLUDE_DIR := ${LOCALBASE}/include/lua51
++LUA_LIB := -L${LOCALBASE}/lib/lua51 -llua-5.1
++SQLITE_INCLUDE_DIR := ${LOCALBASE}/include
++SQLITE_LIB := -L${LOCALBASE}/lib -lsqlite3
  
- # Permissions to set on the save directory.
- MCHMOD_SAVEDIR := 775
-+MCHMOD_LOGS := 664
+ #
+ # Platform Detection
+@@ -314,7 +322,7 @@
+ MCHMOD_LOGS := 664
  
  # The user:group to install the game as.
 -INSTALL_UGRP := games:games
@@ -53,83 +80,25 @@
  
  chroot_prefix :=
  prefix        :=
-@@ -386,25 +399,34 @@
- endif
- endif
- 
--ifndef BUILD_LUA
--  ifneq (,$(wildcard /usr/include/lua5.1))
--    INCLUDES_L += -I/usr/include/lua5.1
--    LIBS += -llua5.1
--  else
--    ifneq (,$(wildcard /usr/include/lua.h))
--      LIBS += -llua
-+ifndef FREEBSD_PORT
-+  ifndef BUILD_LUA
-+    ifneq (,$(wildcard /usr/include/lua5.1))
-+      INCLUDES_L += -I/usr/include/lua5.1
-+      LIBS += -llua5.1
-     else
--      BUILD_LUA = yes
-+      ifneq (,$(wildcard /usr/include/lua.h))
-+        LIBS += -llua
-+      else
-+        BUILD_LUA = yes
-+      endif
-     endif
-   endif
--endif
--
--ifndef BUILD_SQLITE
--  ifneq ($(shell grep -q sqlite3_prepare_v2 /usr/include/sqlite3.h 2>/dev/null && echo yes),yes)
--    BUILD_SQLITE = yes
--  else
--    LIBS += -lsqlite3
-+  
-+  ifndef BUILD_SQLITE
-+    ifneq ($(shell grep -q sqlite3_prepare_v2 /usr/include/sqlite3.h 2>/dev/null && echo yes),yes)
-+      BUILD_SQLITE = yes
-+    else
-+      LIBS += -lsqlite3
-+    endif
-   endif
-+else
-+  INCLUDES_L += -I${LOCALBASE}/include/
-+  INCLUDES_L += -I${LOCALBASE}/include/lua51
-+  LIBS += -L${LOCALBASE}/lib/
-+  LIBS += -L${LOCALBASE}/lib/lua51
-+  LIBS += -llua-5.1
-+  LIBS += -lsqlite3
- endif
- 
- RLTILES = rltiles
-@@ -476,11 +498,13 @@
+@@ -540,6 +548,7 @@
  
  endif # TILES
  
 +ifndef FREEBSD_PORT
- ifeq ($(GCC_GTE_4_3_0),1)
- CFWARN_L += -Wno-array-bounds
- endif
- 
- CFWARN_L += -Wno-parentheses -Wwrite-strings -Wshadow -pedantic -D_FORTIFY_SOURCE=0
-+endif
- CFOTHERS_L = $(EXTERNAL_FLAGS_L) $(EXTRA_FLAGS) $(DEFINES) $(SDL_CFLAGS)
+ # On clang, unknown -Wfoo is merely a warning, thus -Werror.
+ CFWARN_L += $(shell w=-Wno-array-bounds;echo|$(GCC) -E - -Werror $$w >/dev/null 2>&1 && echo $$w)
  
- ifndef NO_LUA_BINDINGS
-@@ -519,6 +543,7 @@
- 	NO_OPTIMIZE=YesPlease
- endif
- 
-+ifndef FREEBSD_PORT
- ifdef FULLDEBUG
- DEFINES += -DFULLDEBUG
- endif
-@@ -544,6 +569,11 @@
- CFWARN_L += -Wno-uninitialized
- endif
+@@ -607,6 +616,17 @@
+ ifndef NO_OPTIMIZE
+ CFWARN_L += -Wuninitialized
  endif
 +else # ifdef FREEBSD_PORT
++CFOTHERS_L = $(EXTERNAL_FLAGS_L) $(EXTRA_FLAGS) $(DEFINES) $(SDL_CFLAGS)
++
++ifndef NO_LUA_BINDINGS
++CFOTHERS_L += -DCLUA_BINDINGS
++endif
++
 +ifdef WIZARD
 +DEFINES += -DWIZARD
 +endif
@@ -137,16 +106,20 @@
  
  ifneq ($(strip $(chroot_prefix)),)
  	USE_CHROOT=YesPlease
-@@ -756,7 +786,7 @@
- SRC_VERSION   := $(shell git describe --tags --long 2>/dev/null || cat util/release_ver)
+@@ -822,10 +842,10 @@
+ 
+ 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   := $(cat util/release_ver)
  
  # when making release builds, use just the bare tag
--SRC_VERSION_SHORT := $(shell git describe --tags 2>/dev/null)
-+SRC_VERSION_SHORT := $(shell git describe --tags 2>/dev/null || cat util/release_ver)
+-SRC_VERSION_SHORT := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
++SRC_VERSION_SHORT := $(cat util/release_ver)
  ifneq (,$(SRC_VERSION_SHORT))
    ifeq (,$(findstring -,$(SRC_VERSION_SHORT)))
      SRC_VERSION := $(SRC_VERSION_SHORT)
-@@ -907,9 +937,11 @@
+@@ -983,9 +1003,11 @@
  	$(COPY) dat/tiles/VeraMono.ttf $(datadir_fp)/dat/tiles/
  endif
  endif
@@ -155,15 +128,6 @@
  	$(CHOWN) -R $(INSTALL_UGRP) $(datadir_fp) || true
  endif
 +endif
- ifneq ($(SAVEDIR),)
+ ifneq ($(savedir_fp),)
  	mkdir -p $(savedir_fp)/saves
  ifneq ($(patsubst /var/%,%,$(savedir_fp)),$(savedir_fp))
-@@ -924,6 +956,8 @@
- 	$(CHOWN) -R $(INSTALL_UGRP) $(savedir_fp) || true
- 	$(CHMOD) $(MCHMOD_SAVEDIR) $(savedir_fp) || true
- 	$(CHMOD) $(MCHMOD_SAVEDIR) $(savedir_fp)/saves || true
-+	$(CHMOD) $(MCHMOD_LOGS) $(savedir_fp)/saves/logfile || true
-+	$(CHMOD) $(MCHMOD_LOGS) $(savedir_fp)/saves/scores || true
- 	$(CHMOD) $(MCHMOD_SAVEDIR) $(savedir_fp)/morgue || true
- endif
- endif
diff --git a/games/stonesoup/files/patch-rltiles__Makefile b/games/stonesoup/files/patch-rltiles__Makefile
new file mode 100644
index 000000000000..361b0f79743a
--- /dev/null
+++ b/games/stonesoup/files/patch-rltiles__Makefile
@@ -0,0 +1,36 @@
+--- ./rltiles/Makefile.orig	2010-08-05 09:25:41.000000000 +0200
++++ ./rltiles/Makefile	2010-08-05 09:26:36.000000000 +0200
+@@ -10,7 +10,7 @@
+ PNG_INCLUDE := $(shell pkg-config libpng --cflags 2> /dev/null || echo "-I../contrib/install/include")
+ PNG_LIB := $(shell pkg-config libpng --libs 2> /dev/null || echo "../contrib/install/lib/libpng.a ../contrib/install/lib/libz.a")
+ 
+-CFLAGS := -O2 $(SDL_CFLAGS) $(PNG_INCLUDE)
++CFLAGS_L := $(CFLAGS) $(SDL_CFLAGS) $(PNG_INCLUDE)
+ LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB)
+ 
+ ifneq (,$(findstring MINGW,$(uname_S)))
+@@ -25,6 +25,7 @@
+ 
+ # Attempt to use a full compiler name, to make
+ # distcc builds work nicely.
++ifndef FREEBSD_PORT
+ LMACH := $(shell gcc -dumpmachine)-
+ ifeq ($(LMACH),-)
+ LMACH :=
+@@ -37,6 +38,7 @@
+ CF_ARCHS := $(patsubst %,-arch %,$(ARCH))
+ CXX += $(CF_ARCHS)
+ endif
++endif
+ 
+ DELETE = rm -f
+ 
+@@ -79,7 +81,7 @@
+ distclean: clean
+ 
+ %.o: %.cc
+-	$(QUIET_CXX)$(CXX) $(CFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
++	$(QUIET_CXX)$(CXX) $(CFLAGS_L) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
+ 
+ $(TILEGEN): $(OBJECTS)
+ 	$(QUIET_LINK)$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
diff --git a/games/stonesoup/pkg-descr b/games/stonesoup/pkg-descr
index 379fd1ad88e4..95330a35b1c9 100644
--- a/games/stonesoup/pkg-descr
+++ b/games/stonesoup/pkg-descr
@@ -5,4 +5,4 @@ in a quest for the mystifyingly fabulous Orb of Zot.
 Dungeon Crawl Stone Soup is a variant of Linley's Dungeon Crawl that's openly 
 developed and invites participation from the Crawl community.
 
-WWW:	http://crawl-ref.sourceforge.net/
+WWW:	http://crawl.develz.org/
diff --git a/games/stonesoup/pkg-plist b/games/stonesoup/pkg-plist
index 230720c0fcf6..4b0591635040 100644
--- a/games/stonesoup/pkg-plist
+++ b/games/stonesoup/pkg-plist
@@ -1,50 +1,57 @@
 bin/stonesoup
-%%DATADIR%%/dat/des/variable/mini_features.des
+%%DATADIR%%/dat/des/builder/arena.des
+%%DATADIR%%/dat/des/builder/didact.des
+%%DATADIR%%/dat/des/builder/dummy.des
+%%DATADIR%%/dat/des/builder/layout.des
+%%DATADIR%%/dat/des/builder/rooms.des
+%%DATADIR%%/dat/des/builder/uniques.des
+%%DATADIR%%/dat/des/tutorial/tutorial.des
+%%DATADIR%%/dat/des/sprint/sprint.des
+%%DATADIR%%/dat/des/sprint/sprint2.des
+%%DATADIR%%/dat/des/variable/large.des
 %%DATADIR%%/dat/des/variable/entry.des
 %%DATADIR%%/dat/des/variable/float.des
-%%DATADIR%%/dat/des/variable/large.des
-%%DATADIR%%/dat/des/variable/mini_monsters.des
 %%DATADIR%%/dat/des/variable/altar.des
 %%DATADIR%%/dat/des/variable/mini.des
-%%DATADIR%%/dat/des/portals/bailey.des
-%%DATADIR%%/dat/des/portals/trove.des
-%%DATADIR%%/dat/des/portals/bazaar.des
-%%DATADIR%%/dat/des/portals/sewer.des
-%%DATADIR%%/dat/des/portals/ziggurat.des
-%%DATADIR%%/dat/des/portals/ossuary.des
-%%DATADIR%%/dat/des/portals/wizlab.des
-%%DATADIR%%/dat/des/portals/icecave.des
-%%DATADIR%%/dat/des/portals/volcano.des
-%%DATADIR%%/dat/des/portals/lab.des
-%%DATADIR%%/dat/des/builder/arena.des
-%%DATADIR%%/dat/des/builder/uniques.des
-%%DATADIR%%/dat/des/builder/dummy.des
-%%DATADIR%%/dat/des/builder/didact.des
-%%DATADIR%%/dat/des/builder/rooms.des
-%%DATADIR%%/dat/des/builder/layout.des
-%%DATADIR%%/dat/des/branches/elf.des
-%%DATADIR%%/dat/des/branches/temple.des
-%%DATADIR%%/dat/des/branches/tomb.des
+%%DATADIR%%/dat/des/variable/mini_features.des
+%%DATADIR%%/dat/des/variable/mini_monsters.des
 %%DATADIR%%/dat/des/branches/zot.des
-%%DATADIR%%/dat/des/branches/lair.des
-%%DATADIR%%/dat/des/branches/shoals.des
-%%DATADIR%%/dat/des/branches/vaults.des
-%%DATADIR%%/dat/des/branches/crypt.des
 %%DATADIR%%/dat/des/branches/blade.des
-%%DATADIR%%/dat/des/branches/snake.des
-%%DATADIR%%/dat/des/branches/hive.des
+%%DATADIR%%/dat/des/branches/crypt.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
+%%DATADIR%%/dat/des/branches/shoals.des
 %%DATADIR%%/dat/des/branches/slime.des
+%%DATADIR%%/dat/des/branches/snake.des
 %%DATADIR%%/dat/des/branches/swamp.des
-%%DATADIR%%/dat/des/branches/orc.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/portals/ziggurat.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/spider.des
+%%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/guide.txt
 %%DATADIR%%/dat/clua/debug.lua
 %%DATADIR%%/dat/clua/util.lua
 %%DATADIR%%/dat/clua/userbase.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
@@ -58,6 +65,7 @@ bin/stonesoup
 %%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
@@ -92,6 +100,7 @@ bin/stonesoup
 %%DATADIR%%/dat/database/wpnnoise.txt
 %%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
@@ -99,6 +108,7 @@ bin/stonesoup
 %%DATADIR%%/dat/descript/features.txt
 %%DATADIR%%/dat/descript/cards.txt
 %%DATADIR%%/dat/descript/branches.txt
+%%DATADIR%%/dat/descript/backgrounds.txt
 %%DATADIR%%/dat/descript/unident.txt
 %%DATADIR%%/docs/develop/levels/triggerables.txt
 %%DATADIR%%/docs/develop/levels/syntax.txt
@@ -131,8 +141,8 @@ bin/stonesoup
 %%DATADIR%%/docs/aptitudes.txt
 %%DATADIR%%/docs/tiles_help.txt
 %%DATADIR%%/settings/034_command_keys.txt
-%%DATADIR%%/settings/tiles_options.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
@@ -141,39 +151,44 @@ bin/stonesoup
 %%DATADIR%%/settings/dvorak_command_keys.txt
 %%DATADIR%%/settings/dolls.txt
 %%DATADIR%%/settings/autopickup_exceptions.txt
+%%DATADIR%%/settings/060_monster_glyphs.txt
 %%DATADIR%%/settings/052_monster_glyphs.txt
 %%DATADIR%%/settings/034_monster_glyphs.txt
-%%DATADIR%%/settings/travel_stoppers.txt
-%%SDL%%%%DATADIR%%/dat/tiles/player.png
-%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.png
-%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png
-%%SDL%%%%DATADIR%%/dat/tiles/title.png
-%%SDL%%%%DATADIR%%/dat/tiles/main.png
-%%SDL%%%%DATADIR%%/dat/tiles/gui.png
-%%SDL%%%%DATADIR%%/dat/tiles/dngn.png
-%%SDL%%%%DATADIR%%/dat/tiles/Vera.ttf
-%%SDL%%%%DATADIR%%/dat/tiles/VeraMono.ttf
-%%SDL%%@dirrm %%DATADIR%%/dat/tiles
-@dirrm %%DATADIR%%/dat/des/variable
-@dirrm %%DATADIR%%/dat/des/portals
+%%DATADIR%%/settings/tiles_options.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.crawlrc
 @dirrm %%DATADIR%%/dat/des/builder
+@dirrm %%DATADIR%%/dat/des/tutorial
+@dirrm %%DATADIR%%/dat/des/sprint
+@dirrm %%DATADIR%%/dat/des/variable
 @dirrm %%DATADIR%%/dat/des/branches
+@dirrm %%DATADIR%%/dat/des/portals
 @dirrm %%DATADIR%%/dat/des
 @dirrm %%DATADIR%%/dat/clua
 @dirrm %%DATADIR%%/dat/lua
 @dirrm %%DATADIR%%/dat/database
 @dirrm %%DATADIR%%/dat/descript
-@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%%/
+%%SDL%%%%DATADIR%%/dat/tiles/feat.png
+%%SDL%%%%DATADIR%%/dat/tiles/title.png
+%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.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/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
+%%SDL%%@dirrm %%DATADIR%%/dat/tiles
+@dirrm %%DATADIR%%/dat
+@dirrm %%DATADIR%%/
 @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