Update to 0.8.0

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

7 files changed, 198 insertions, 178 deletions

diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index 9ccd7ced79fc..726d49ece16f 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	stonesoup
-PORTVERSION=	0.7.1
+PORTVERSION=	0.8.0
 CATEGORIES=	games
 MASTER_SITES=	SF/crawl-ref/Stone%20Soup/${PORTVERSION}
 DISTNAME=	stone_soup-${PORTVERSION}-nodeps
@@ -24,19 +24,31 @@ USE_PERL5_BUILD=	yes
 MAKE_JOBS_SAFE=	yes
 
 SAVEDIR?=	/var/games/${PORTNAME}
-WRKSRC=		${WRKDIR}/stone_soup-${PORTVERSION}-1-g7ce9b19/source/
+WRKSRC=		${WRKDIR}/stone_soup-${PORTVERSION}/source/
 
 SUB_FILES=	README.FreeBSD
 PLIST_SUB=	SAVEDIR="${SAVEDIR}"
 
 OPTIONS=	SOUND		"Sound support"			off \
-		LUA_BINDINGS	"LUA bindings for user scripts"	on \
 		UNICODE		"Unicode glyphs (UTF-8)"	off \
 		WIZARD		"Wizard mode"			off
 
 MAKEFILE=	makefile
 MAKE_ARGS=	FREEBSD_PORT=yes
-MAKE_ARGS+=	prefix=${PREFIX} SAVEDIR=${SAVEDIR} DATADIR=${DATADIR}
+MAKE_ARGS+=	prefix=${PREFIX} \
+		SAVEDIR=${SAVEDIR} \
+		DATADIR=${DATADIR} \
+		INSTALL_UGRP=root:games \
+		MCHMOD=2755 \
+		MCHMOD_SAVEDIR=775 \
+		MCHMOD_LOGS=664 \
+		NO_AUTOOPT=YesPlease \
+		NO_OPTIMIZE=YesPlease \
+		LUA_INCLUDE_DIR=${LOCALBASE}/include/lua51 \
+		LUA_LIB=-llua-5.1 \
+		SQLITE_INCLUDE_DIR=${LOCALBASE}/include \
+		SQLITE_LIB=-lsqlite3 \
+		LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/lua51"
 
 .include <bsd.port.options.mk>
 
@@ -66,9 +78,11 @@ PLIST_SUB+=	SDL="@comment "
 RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
 .endif
 
-.if defined(WITHOUT_LUA_BINDINGS)
-MAKE_ARGS+=	NO_LUA_BINDINGS=yes
-.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
diff --git a/games/stonesoup/distinfo b/games/stonesoup/distinfo
index 88a115f51a0c..0c7f6aab5bdc 100644
--- a/games/stonesoup/distinfo
+++ b/games/stonesoup/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (stone_soup-0.8.0-nodeps.tar.bz2) = b8e3dd7d46db0ac0ab4a4e2ea626d645f181a6e56d22caac57704fd8484fe16c
+SIZE (stone_soup-0.8.0-nodeps.tar.bz2) = 6509944
diff --git a/games/stonesoup/files/patch-AppHdr.h b/games/stonesoup/files/patch-AppHdr.h
index 07149ac9005c..ffcaa9916444 100644
--- a/games/stonesoup/files/patch-AppHdr.h
+++ b/games/stonesoup/files/patch-AppHdr.h
@@ -1,11 +1,11 @@
---- ./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*.
+--- ./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 @@
      //
--    // #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 &"
+     // 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 ce4bf1bc5a98..86fd5155f46b 100644
--- a/games/stonesoup/files/patch-makefile
+++ b/games/stonesoup/files/patch-makefile
@@ -1,133 +1,80 @@
---- ./makefile.orig	2010-07-24 05:31:49.000000000 +0200
-+++ ./makefile	2010-08-05 09:25:27.000000000 +0200
-@@ -45,14 +45,7 @@
+--- ./makefile.orig	2011-04-26 15:08:48.000000000 +0200
++++ ./makefile	2011-06-02 19:52:05.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.
  
 -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
-@@ -86,24 +79,39 @@
+ ASSERTS = yes
+ 
+@@ -92,11 +92,11 @@
  
  else
  
-+ifndef FREEBSD_PORT
- CFOPTIMIZE := -O2
-+endif
+-CFOPTIMIZE := -O2
++CFOPTIMIZE :=
  
  endif # USE_ICC
  
-+ifndef FREEBSD_PORT
- CFOTHERS := -pipe $(EXTERNAL_FLAGS)
+-CFOTHERS := -pipe $(EXTERNAL_FLAGS)
++CFOTHERS := $(CFLAGS)
  CFOTHERS_L := -fsigned-char
  CFWARN := -Wall
  CFWARN_L := -Wundef
- 
- DEFINES := $(EXTERNAL_DEFINES)
-+else
-+NO_AUTO_OPT = YesPlease
-+
-+CFOTHERS := $(CFLAGS)
-+CFOTHERS_L := -fsigned-char
-+CFWARN := 
-+CFWARN_L := 
-+
-+DEFINES := $(EXTERNAL_DEFINES)
-+endif
- 
- #
- # The GCC and GXX variables are set later.
- #
- AR = ar
- RANLIB = ranlib
-+ifndef FREEBSD_PORT
- CC = $(GCC)
- CXX = $(GXX)
-+endif
- RM = rm -f
- COPY = cp
- COPY_R = cp -r
-@@ -135,10 +143,10 @@
+@@ -639,7 +639,7 @@
+ DEFINES += -DWIZARD
  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
- 
- #
- # Platform Detection
-@@ -314,7 +322,7 @@
- MCHMOD_LOGS := 664
- 
- # The user:group to install the game as.
--INSTALL_UGRP := games:games
-+INSTALL_UGRP := root:games
- 
- chroot_prefix :=
- prefix        :=
-@@ -540,6 +548,7 @@
- 
- endif # TILES
- 
-+ifndef FREEBSD_PORT
- # 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)
- 
-@@ -607,6 +616,17 @@
- ifndef NO_OPTIMIZE
- CFWARN_L += -Wuninitialized
+ ifdef NO_OPTIMIZE
+-CFOPTIMIZE  := -O0
++CFOPTIMIZE  :=
  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
-+endif # FREEBSD_PORT
- 
- ifneq ($(strip $(chroot_prefix)),)
- 	USE_CHROOT=YesPlease
-@@ -822,10 +842,10 @@
+ ifdef PCH
+ CFWARN_L += -Winvalid-pch
+@@ -872,10 +872,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)
++SRC_VERSION   := $(shell 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 := $(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)
-@@ -983,9 +1003,11 @@
- 	$(COPY) dat/tiles/VeraMono.ttf $(datadir_fp)/dat/tiles/
+@@ -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
-+ifndef FREEBSD_PORT
- ifeq ($(USE_DGAMELAUNCH),)
- 	$(CHOWN) -R $(INSTALL_UGRP) $(datadir_fp) || true
+-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
-+endif
- ifneq ($(savedir_fp),)
- 	mkdir -p $(savedir_fp)/saves
- ifneq ($(patsubst /var/%,%,$(savedir_fp)),$(savedir_fp))
+ 
+ clean: clean-rltiles
diff --git a/games/stonesoup/files/patch-rltiles__Makefile b/games/stonesoup/files/patch-rltiles__Makefile
index 361b0f79743a..51b7cc1ccfa1 100644
--- a/games/stonesoup/files/patch-rltiles__Makefile
+++ b/games/stonesoup/files/patch-rltiles__Makefile
@@ -1,36 +1,57 @@
---- ./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")
+--- ./rltiles/Makefile.orig	2011-04-19 14:37:42.000000000 +0200
++++ ./rltiles/Makefile	2011-06-02 19:51:42.000000000 +0200
+@@ -1,7 +1,7 @@
+ uname_S := $(shell uname -s)
+ 
+ ifneq (,$(findstring MINGW,$(uname_S)))
+-LDFLAGS += -lmingw32
++L_LDFLAGS += -lmingw32
+ endif
+ 
+ ifndef CONTRIB_SDL
+@@ -20,17 +20,17 @@
+ PNG_LIB := ../contrib/install/lib/libpng.a ../contrib/install/lib/libz.a
+ endif
  
 -CFLAGS := -O2 $(SDL_CFLAGS) $(PNG_INCLUDE)
-+CFLAGS_L := $(CFLAGS) $(SDL_CFLAGS) $(PNG_INCLUDE)
- LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB)
+-LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB)
++L_CFLAGS := $(CFLAGS) $(SDL_CFLAGS) $(PNG_INCLUDE)
++L_LDFLAGS += $(LDFLAGS) $(SDL_LDFLAGS) $(PNG_LIB)
  
  ifneq (,$(findstring MINGW,$(uname_S)))
-@@ -25,6 +25,7 @@
+-LDFLAGS += -lgdi32 -lwinmm
++L_LDFLAGS += -lgdi32 -lwinmm
+ endif
+ ifeq ($(uname_S),Darwin)
+-LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL
++L_LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL
+ endif
+ ifeq ($(uname_S),Linux)
+-LDFLAGS += -ldl -lpthread
++L_LDFLAGS += -ldl -lpthread
+ endif
  
  # Attempt to use a full compiler name, to make
- # distcc builds work nicely.
-+ifndef FREEBSD_PORT
- LMACH := $(shell gcc -dumpmachine)-
- ifeq ($(LMACH),-)
+@@ -43,10 +43,6 @@
  LMACH :=
-@@ -37,6 +38,7 @@
- CF_ARCHS := $(patsubst %,-arch %,$(ARCH))
- CXX += $(CF_ARCHS)
  endif
-+endif
+ CXX = $(LMACH)g++
+-ifdef ARCH
+-CF_ARCHS := $(patsubst %,-arch %,$(ARCH))
+-CXX += $(CF_ARCHS)
+-endif
  
  DELETE = rm -f
  
-@@ -79,7 +81,7 @@
+@@ -89,9 +85,9 @@
  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 $@
++	$(QUIET_CXX)$(CXX) $(L_CFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
  
  $(TILEGEN): $(OBJECTS)
- 	$(QUIET_LINK)$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
+-	$(QUIET_LINK)$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
++	$(QUIET_LINK)$(CXX) $(OBJECTS) -o $@ $(L_LDFLAGS)
+ 
+ .PHONY: all clean distclean
diff --git a/games/stonesoup/pkg-descr b/games/stonesoup/pkg-descr
index 95330a35b1c9..13a8f1b62089 100644
--- a/games/stonesoup/pkg-descr
+++ b/games/stonesoup/pkg-descr
@@ -5,4 +5,9 @@ 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.
 
+This port comes with two interfaces:
+
+    games/stonesoup - the traditional tty interfaced
+    games/stonesoup-sdl - the fancy SDL interface
+
 WWW:	http://crawl.develz.org/
diff --git a/games/stonesoup/pkg-plist b/games/stonesoup/pkg-plist
index 4b0591635040..15a83b5a119b 100644
--- a/games/stonesoup/pkg-plist
+++ b/games/stonesoup/pkg-plist
@@ -1,23 +1,8 @@
 bin/stonesoup
-%%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/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/branches/zot.des
 %%DATADIR%%/dat/des/branches/blade.des
 %%DATADIR%%/dat/des/branches/crypt.des
+%%DATADIR%%/dat/des/branches/dwarf.des
 %%DATADIR%%/dat/des/branches/elf.des
 %%DATADIR%%/dat/des/branches/hells.des
 %%DATADIR%%/dat/des/branches/hive.des
@@ -32,6 +17,39 @@ 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/float.des
+%%DATADIR%%/dat/des/variable/gnoll_camp.des
+%%DATADIR%%/dat/des/variable/large.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/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/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
@@ -44,9 +62,11 @@ bin/stonesoup
 %%DATADIR%%/dat/des/portals/wizlab.des
 %%DATADIR%%/dat/des/portals/bailey.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
@@ -72,6 +92,7 @@ bin/stonesoup
 %%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
@@ -93,6 +114,7 @@ bin/stonesoup
 %%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
@@ -106,6 +128,7 @@ bin/stonesoup
 %%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
@@ -116,6 +139,7 @@ bin/stonesoup
 %%DATADIR%%/docs/develop/levels/advanced.txt
 %%DATADIR%%/docs/develop/IRC.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
@@ -128,8 +152,7 @@ bin/stonesoup
 %%DATADIR%%/docs/license/lualicense.txt
 %%DATADIR%%/docs/license/libpng-LICENSE.txt
 %%DATADIR%%/docs/license/lgpl.txt
-%%DATADIR%%/docs/034_changes.txt
-%%DATADIR%%/docs/ssh_guide.txt
+%%DATADIR%%/docs/aptitudes.txt
 %%DATADIR%%/docs/quickstart.txt
 %%DATADIR%%/docs/options_guide.txt
 %%DATADIR%%/docs/macros_guide.txt
@@ -138,8 +161,7 @@ bin/stonesoup
 %%DATADIR%%/docs/crawl_manual.txt
 %%DATADIR%%/docs/changelog.txt
 %%DATADIR%%/docs/arena.txt
-%%DATADIR%%/docs/aptitudes.txt
-%%DATADIR%%/docs/tiles_help.txt
+%%DATADIR%%/docs/ssh_guide.txt
 %%DATADIR%%/settings/034_command_keys.txt
 %%DATADIR%%/settings/standard_colours.txt
 %%DATADIR%%/settings/runrest_messages.txt
@@ -151,45 +173,57 @@ bin/stonesoup
 %%DATADIR%%/settings/dvorak_command_keys.txt
 %%DATADIR%%/settings/dolls.txt
 %%DATADIR%%/settings/autopickup_exceptions.txt
+%%DATADIR%%/settings/advanced_optioneering.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/builder
+@dirrm %%DATADIR%%/dat/des/branches
+@dirrm %%DATADIR%%/dat/des/variable
 @dirrm %%DATADIR%%/dat/des/tutorial
+@dirrm %%DATADIR%%/dat/des/entry
 @dirrm %%DATADIR%%/dat/des/sprint
-@dirrm %%DATADIR%%/dat/des/variable
-@dirrm %%DATADIR%%/dat/des/branches
+@dirrm %%DATADIR%%/dat/des/zotdef
+@dirrm %%DATADIR%%/dat/des/builder
 @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
+%%SDL%%@dirrm %%DATADIR%%/dat/tiles
+@dirrm %%DATADIR%%/dat
 @dirrm %%DATADIR%%/docs/develop/levels
 @dirrm %%DATADIR%%/docs/develop
 @dirrm %%DATADIR%%/docs/license
 @dirrm %%DATADIR%%/docs
 @dirrm %%DATADIR%%/settings
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/
-%%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%%/
+@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
+