13 files changed, 273 insertions, 298 deletions

diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index 83522965dfb8..a78248eb5047 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	stonesoup
-PORTVERSION=	0.4.5
+PORTVERSION=	0.5
 CATEGORIES=	games
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	crawl-ref
+MASTER_SITES=	SF/crawl-ref
 DISTNAME=	stone_soup-${PORTVERSION}-src
 EXTRACT_SUFX=	.tbz2
 
@@ -25,47 +24,59 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/source/
 SUB_FILES=	README.FreeBSD
 PLIST_SUB=	SAVEDIR="${SAVEDIR}"
 
-OPTIONS=	X11		"X11 support"			off \
-		SOUND		"sound support"			off \
-		LUA_BINDINGS	"LUA bindings for user scripts"	on
+OPTIONS=	SDL		"SDL support (tiles interface)"	off \
+		SOUND		"Sound support"			off \
+		LUA_BINDINGS	"LUA bindings for user scripts"	on \
+		UNICODE		"Unicode glyphs (UTF-8)"	off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_X11)
-USE_XORG=	x11
-LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
-MAKEFILE=	makefile.x11
-PLIST_SUB+=	X11=""
+.if defined(WITH_SDL)
+MAKEFILE=	makefile_tiles.unix
+MAKE_JOBS_UNSAFE=	yes
+PLIST_SUB+=	SDL=""
+USE_SDL=	image
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
+		freetype:${PORTSDIR}/print/freetype2
 .else
 MAKEFILE=	makefile.unix
-PLIST_SUB+=	X11="@comment "
+MAKE_JOBS_SAFE=	yes
+PLIST_SUB+=	SDL="@comment "
 .endif
 
 .if defined(WITH_SOUND)
 RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
-.endif
+.endif #WITH_SOUND
 
 post-patch:
-.for makefile in makefile.unix makefile.x11
-	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/${makefile}
-	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/${makefile}
-	@${REINPLACE_CMD} -e "s,%%SAVEDIR%%,${SAVEDIR}," ${WRKSRC}/${makefile}
-	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/${makefile}
+	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e "s,%%SAVEDIR%%,${SAVEDIR}," ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/${MAKEFILE}
 .if defined(WITHOUT_LUA_BINDINGS)
-	@${REINPLACE_CMD} -e "s,-DCLUA_BINDINGS,," ${WRKSRC}/${makefile}
+	@${REINPLACE_CMD} -e "s,-DCLUA_BINDINGS,," ${WRKSRC}/${MAKEFILE}
+.endif
+.if defined(WITH_UNICODE)
+	@${REINPLACE_CMD} -e "s,%%UNICODE%%,y," ${WRKSRC}/${MAKEFILE}
+.else
+	@${REINPLACE_CMD} -e "s,%%UNICODE%%,n," ${WRKSRC}/${MAKEFILE}
 .endif
-.endfor
-	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h
 .if defined(WITH_SOUND)
+	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h
 	@${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h
 .else
 	@${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/AppHdr.h
 .endif
+.if defined(WITH_SDL)
+	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/tilesdl.cc
+.endif
+
+pre-build:
+	@cd ${WRKSRC} && ${GMAKE} depend
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for doc in CREDITS README.txt licence.txt
+.for doc in CREDITS.txt README.txt licence.txt
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${doc} ${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${DOCSDIR}
@@ -75,4 +86,4 @@ post-install:
 	${INSTALL_DATA} ${DATADIR}/settings/init.txt ${EXAMPLESDIR}/sample.crawlrc
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/stonesoup/distinfo b/games/stonesoup/distinfo
index 7b26adc74260..8a83f937db1c 100644
--- a/games/stonesoup/distinfo
+++ b/games/stonesoup/distinfo
@@ -1,3 +1,3 @@
-MD5 (stone_soup-0.4.5-src.tbz2) = fc4214fc79d162c855aa48aa1c6eee68
-SHA256 (stone_soup-0.4.5-src.tbz2) = d78da12e0fc9211dd28dd4cac2775567f51118fca23fc44fc9672caf64bb4cec
-SIZE (stone_soup-0.4.5-src.tbz2) = 3768835
+MD5 (stone_soup-0.5-src.tbz2) = ee43ae01f6900a88727aa4299f0f41d7
+SHA256 (stone_soup-0.5-src.tbz2) = 34a96d3b7d4ad91d3e0f548c9134d7df3afe7131fd858d0adf60a3ca604a7ec8
+SIZE (stone_soup-0.5-src.tbz2) = 5884852
diff --git a/games/stonesoup/files/patch-AppHdr.h b/games/stonesoup/files/patch-AppHdr.h
index 5541c983fc4f..895c836b0537 100644
--- a/games/stonesoup/files/patch-AppHdr.h
+++ b/games/stonesoup/files/patch-AppHdr.h
@@ -1,6 +1,6 @@
---- AppHdr.h.orig	2008-07-14 04:17:51.000000000 +0200
-+++ AppHdr.h	2008-07-17 10:34:43.000000000 +0200
-@@ -146,7 +146,7 @@
+--- ./AppHdr.h.orig	2009-06-12 12:32:16.000000000 +0200
++++ ./AppHdr.h	2009-06-19 13:54:51.000000000 +0200
+@@ -124,7 +124,7 @@
      //          setuid or setgid. Filenames passed to this command *are not
      //          validated in any way*.
      //
@@ -9,7 +9,7 @@
  
      // For cases when the game will be played on terms that don't support the
      // curses "bold == lighter" 16 colour mode. -- bwr
-@@ -408,8 +408,8 @@
+@@ -401,8 +401,8 @@
      // PACKAGE_SUFFIX is used when the package file name is needed
      //
      // Comment these lines out if you want to leave the save files uncompressed.
diff --git a/games/stonesoup/files/patch-initfile.cc b/games/stonesoup/files/patch-initfile.cc
index cd3c0a73ced7..de6229f550bc 100644
--- a/games/stonesoup/files/patch-initfile.cc
+++ b/games/stonesoup/files/patch-initfile.cc
@@ -1,9 +1,9 @@
---- initfile.cc.orig	2009-01-19 20:08:34.000000000 +0000
-+++ initfile.cc	2009-01-19 20:09:20.000000000 +0000
-@@ -2196,12 +2196,12 @@
- #endif
-     else BOOL_OPTION(show_gold_turns);
+--- ./initfile.cc.orig	2009-06-12 12:32:16.000000000 +0200
++++ ./initfile.cc	2009-06-19 13:54:51.000000000 +0200
+@@ -2333,12 +2333,12 @@
+ #ifndef USE_TILE
      else BOOL_OPTION(show_beam);
+ #endif
 -#ifndef SAVE_DIR_PATH
 +// #ifndef SAVE_DIR_PATH
      else if (key == "morgue_dir")
diff --git a/games/stonesoup/files/patch-makefile.unix b/games/stonesoup/files/patch-makefile.unix
index fce80b6bab38..d9e885d19729 100644
--- a/games/stonesoup/files/patch-makefile.unix
+++ b/games/stonesoup/files/patch-makefile.unix
@@ -1,7 +1,7 @@
---- makefile.unix.orig	2009-01-13 02:40:36.000000000 +0000
-+++ makefile.unix	2009-01-19 20:08:18.000000000 +0000
+--- ./makefile.unix.orig	2009-06-12 12:39:29.000000000 +0200
++++ ./makefile.unix	2009-06-19 13:54:52.000000000 +0200
 @@ -4,7 +4,7 @@
- # Modified for Crawl Reference by $Author: zelgadis $ on $Date: 2008-12-20 01:20:09 -0500 (Sat, 20 Dec 2008) $
+ # Modified for Crawl Reference by $Author: ennewalker $ on $Date: 2009-02-14 17:59:13 +0100 (Sa, 14 Feb 2009) $
  #
  
 -GAME = crawl
@@ -11,20 +11,30 @@
  # it will make a variable called OBJECTS that contains all the libraries
 @@ -12,7 +12,6 @@
  
- OBJECTS += libunix.o
+ OBJECTS += libunix.o crash-u.o
  
 -CXX = g++
  DELETE = rm -f
  COPY = cp
  OS_TYPE = UNIX
-@@ -37,15 +36,15 @@
+@@ -21,7 +20,7 @@
+ 
+ # Change this to y (case-sensitive!) if you want to use Unicode glyphs
+ # in the map, and you have libncursesw available.
+-UNICODE_GLYPHS = n
++UNICODE_GLYPHS = %%UNICODE%%
+ 
+ # If you're using UNICODE_GLYPHS=y, and have a preferred Unicode
+ # (UTF-8) locale you want Crawl to use, you can set it here. The
+@@ -39,16 +38,15 @@
  MCHMOD_SAVEDIR := 775
  
  # The user:group to install the game as.
--INSTALL_UGRP ?= games:games
--INSTALLDIR   ?= /usr/games/crawl
-+INSTALL_UGRP ?= root:games
-+INSTALLDIR   ?= %%PREFIX%%/bin
+-INSTALL_UGRP := games:games
+-
+-INSTALLDIR   := /usr/games/crawl
++INSTALL_UGRP := root:games
++INSTALLDIR   := %%PREFIX%%/bin
  
  # If you're installing Crawl for multiple users, you *must* set this to a
  # valid path before building Crawl. This is not necessary if you are building
@@ -32,37 +42,16 @@
  
 -# SAVEDIR := /usr/games/crawl/saves/
 -# DATADIR := /usr/games/crawl/data/
-+SAVEDIR := %%SAVEDIR%%/
-+DATADIR := %%DATADIR%%/
++SAVEDIR := %%SAVEDIR%%
++DATADIR := %%DATADIR%%
  
  LEX  := flex
  YACC := bison -y
-@@ -58,7 +57,7 @@
- NDBM_FILE := /usr/include/ndbm.h
- 
- HAVE_DBH  := $(shell [ -f $(DBH_FILE) ] && echo y)
--HAVE_NDBM := $(shell [ -f $(NDBM_FILE) -a "`uname`" = "Darwin" ] && echo y)
-+HAVE_NDBM := $(shell [ -f $(NDBM_FILE) -a \( "`uname`" = "Darwin" -o "`uname`" = "FreeBSD" \) ] && echo y)
- 
- ifeq ($(strip $(HAVE_DBH)),y)
- ifneq ($(shell grep dbm_open $(DBH_FILE)),)
-@@ -70,9 +69,11 @@
- ifeq ($(strip $(HAVE_NDBM)),y)
- SELDBM ?= -DDB_NDBM
- ifeq ($(SELDBM),-DDB_NDBM)
-+ifneq ($(shell echo "`uname`"),FreeBSD)
- LIBDBM := -ldbm
- endif
- endif
-+endif
- 
- SQLSRC   := util/sqlite
- SQLLIB   := sqlite3
-@@ -89,17 +90,8 @@
+@@ -70,17 +68,8 @@
  
  INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES)
  
--CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic
+-CFWARN := -Wall -Wno-parentheses -Wwrite-strings -Wshadow -pedantic
 -
  CFOTHERS := -fsigned-char -D$(OS_TYPE) $(EXTRA_FLAGS) -DCLUA_BINDINGS
  
@@ -76,32 +65,32 @@
  ifneq ($(strip $(SAVEDIR)),)
  CFOTHERS += '-DSAVE_DIR_PATH="$(strip $(SAVEDIR))"'
  endif
-@@ -138,8 +130,8 @@
- 
- CFOTHERS += $(SELDBM)
+@@ -117,8 +106,8 @@
+ LIBCURS  = ncurses
+ endif
  
 -CFLAGS  := $(INCLUDES) $(CFWARN) $(CFOTHERS)
 -YCFLAGS := $(INCLUDES) $(CFOTHERS)
-+LOCAL_CXXFLAGS  := $(INCLUDES) $(CFWARN) $(CXXFLAGS) $(CFOTHERS)
++LOCAL_CFLAGS  := $(INCLUDES) $(CXXFLAGS) $(CFOTHERS)
 +YCFLAGS := $(INCLUDES) $(CXXFLAGS) $(CFOTHERS)
  
  UTIL = util/
  
-@@ -181,7 +173,7 @@
- 	rm -f $(DEPENDENCY_MKF)
+@@ -160,7 +149,7 @@
+ 	rm -f $(DEPENDENCY_MKF).tmp
  	@for i in $^; do \
  	    echo "Updating dependencies for $$i"; \
--	    $(CXX) -MM $(CFLAGS) $$i >>$(DEPENDENCY_MKF) 2>/dev/null; \
-+	    $(CXX) -MM $(LOCAL_CXXFLAGS) $$i >>$(DEPENDENCY_MKF) 2>/dev/null; \
+-	    $(CXX) -MM $(CFLAGS) $$i >>$(DEPENDENCY_MKF).tmp 2>/dev/null; \
++	    $(CXX) -MM $(LOCAL_CFLAGS) $$i >>$(DEPENDENCY_MKF).tmp 2>/dev/null; \
  	done
+ 	mv -f $(DEPENDENCY_MKF).tmp $(DEPENDENCY_MKF)
  
- -include $(DEPENDENCY_MKF)
-@@ -277,17 +269,17 @@
+@@ -257,17 +246,17 @@
  	$(DELETE) $(DEPENDENCY_MKF)
  
  $(GAME): $(GAME_DEPENDS)
 -	${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
-+	${CXX} ${LDFLAGS} $(LOCAL_CXXFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
++	${CXX} ${LDFLAGS} $(LOCAL_CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
  
  .PHONY : debug
  
@@ -109,11 +98,11 @@
  
  profile: $(GAME_DEPENDS)
 -	${CXX} -g -p ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
-+	${CXX} -g -p ${LDFLAGS} $(LOCAL_CXXFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
++	${CXX} -g -p ${LDFLAGS} $(LOCAL_CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
  
  .cc.o:
 -	${CXX} ${CFLAGS} -c $<
-+	${CXX} ${LOCAL_CXXFLAGS} -c $<
++	${CXX} ${LOCAL_CFLAGS} -c $<
  
  # [ds] Note we don't use the standard CFLAGS here; that's intentional, most
  # flex/bison combos I've tried don't produce code that passes the warnings
diff --git a/games/stonesoup/files/patch-makefile.x11 b/games/stonesoup/files/patch-makefile.x11
deleted file mode 100644
index d0ed6668307c..000000000000
--- a/games/stonesoup/files/patch-makefile.x11
+++ /dev/null
@@ -1,151 +0,0 @@
---- makefile.x11.orig	2008-07-14 04:17:51.000000000 +0200
-+++ makefile.x11	2008-07-18 08:49:37.000000000 +0200
-@@ -4,7 +4,7 @@
- # Modified for Crawl Reference by $Author: dshaligram $ on $Date: 2007-06-24T16:27:58.475101Z $
- #
- 
--GAME = crawl
-+GAME = stonesoup
- 
- # this file contains a list of the libraries.
- # it will make a variable called OBJECTS that contains all the libraries
-@@ -12,7 +12,6 @@
- 
- OBJECTS += libgui.o tile1.o tile2.o libx11.o guic.o guic-x11.o
- 
--CXX = g++
- DELETE = rm -f
- COPY = cp
- OS_TYPE = UNIX
-@@ -22,8 +21,13 @@
- PNG_INCLUDE := -I/sw/include
- PNG_LIB := -L/sw/lib
- else
-+ifneq ($(shell echo "`uname`"),FreeBSD)
- PNG_INCLUDE :=
- PNG_LIB :=
-+else
-+PNG_INCLUDE := -I%%LOCALBASE%%/include
-+PNG_LIB := -L%%LOCALBASE%%/lib
-+endif
- endif
- 
- # If you have lex and yacc, set DOYACC to y (lowercase y).
-@@ -36,15 +40,15 @@
- MCHMOD_SAVEDIR := 775
- 
- # The user:group to install the game as.
--INSTALL_UGRP ?= games:games
--INSTALLDIR   ?= /usr/games/crawl
-+INSTALL_UGRP ?= root:games
-+INSTALLDIR   ?= %%PREFIX%%/bin
- 
- # If you're installing Crawl for multiple users, you *must* set this to a
- # valid path before building Crawl. This is not necessary if you are building
- # Crawl for a single user.
- 
--# SAVEDIR := /usr/games/crawl/saves/
--# DATADIR := /usr/games/crawl/data/
-+SAVEDIR := %%SAVEDIR%%/
-+DATADIR := %%DATADIR%%/
- 
- LEX  := flex
- YACC := bison -y
-@@ -57,7 +61,7 @@
- NDBM_FILE := /usr/include/ndbm.h
- 
- HAVE_DBH  := $(shell [ -f $(DBH_FILE) ] && echo y)
--HAVE_NDBM := $(shell [ -f $(NDBM_FILE) -a "`uname`" = "Darwin" ] && echo y)
-+HAVE_NDBM := $(shell [ -f $(NDBM_FILE) -a \( "`uname`" = "Darwin" -o "`uname`" = "FreeBSD" \) ] && echo y)
- 
- ifeq ($(strip $(HAVE_DBH)),y)
- ifneq ($(shell grep dbm_open $(DBH_FILE)),)
-@@ -69,9 +73,11 @@
- ifeq ($(strip $(HAVE_NDBM)),y)
- SELDBM ?= -DDB_NDBM
- ifeq ($(SELDBM),-DDB_NDBM)
-+ifneq ($(shell echo "`uname`"),FreeBSD)
- LIBDBM := -ldbm
- endif
- endif
-+endif
- 
- SQLSRC   := util/sqlite
- SQLLIB   := sqlite3
-@@ -88,17 +94,8 @@
- 
- INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES) $(PNG_INCLUDE)
- 
--CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic
--
- CFOTHERS := -fsigned-char -D$(OS_TYPE) $(EXTRA_FLAGS) -DCLUA_BINDINGS
- 
--ifneq ($(HURRY),y)
--ifneq ($(DEBUG_CRAWL),y)
--CFWARN += -Wuninitialized
--CFOTHERS += -O2
--endif
--endif
--
- ifneq ($(strip $(SAVEDIR)),)
- CFOTHERS += '-DSAVE_DIR_PATH="$(strip $(SAVEDIR))"'
- endif
-@@ -109,8 +106,8 @@
- 
- CFOTHERS += $(SELDBM)
- 
--CFLAGS  := $(INCLUDES) $(CFWARN) $(CFOTHERS)
--YCFLAGS := $(INCLUDES) $(CFOTHERS)
-+LOCAL_CXXFLAGS  := $(INCLUDES) $(CFWARN) $(CXXFLAGS) $(CFOTHERS)
-+YCFLAGS := $(INCLUDES) $(CXXFLAGS) $(CFOTHERS)
- 
- UTIL = util/
- 
-@@ -170,7 +167,7 @@
- 	rm -f $(DEPENDENCY_MKF)
- 	@for i in $^; do \
- 	    echo "Updating dependencies for $$i"; \
--	    $(CXX) -MM $(CFLAGS) $$i >>$(DEPENDENCY_MKF) 2>/dev/null; \
-+	    $(CXX) -MM $(LOCAL_CXXFLAGS) $$i >>$(DEPENDENCY_MKF) 2>/dev/null; \
- 	done
- 
- -include $(DEPENDENCY_MKF)
-@@ -215,7 +212,7 @@
- $(ORIGTILEHEADERS): makerltiles
- 
- makerltiles:
--	cd $(RLTILES) && make -f makefile.unix all CFLAGS="$(PNG_INCLUDE)" LDFLAGS="$(PNG_LIB)" && cd ..
-+	cd $(RLTILES) && gmake -f makefile.unix all CFLAGS="$(CFLAGS) $(PNG_INCLUDE)" LDFLAGS="$(PNG_LIB)" && cd ..
- 
- $(TILEHEADERS): $(ORIGTILEHEADERS)
- 	cp $(RLTILES)$@ .
-@@ -227,7 +224,7 @@
- 	$(COPY) $< $@
- 
- clean-rltiles:
--	cd $(RLTILES) && make -f makefile.unix distclean && cd ..
-+	cd $(RLTILES) && gmake -f makefile.unix distclean && cd ..
- 	$(DELETE) $(TILEHEADERS)
- 
- ##########################################################################
-@@ -293,16 +290,16 @@
- 	$(DELETE) $(DEPENDENCY_MKF)
- 
- $(GAME): $(GAME_DEPENDS)
--	${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
-+	${CXX} ${LDFLAGS} $(LOCAL_CXXFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
- 
- debug: $(GAME_DEPENDS)
--	${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
-+	${CXX} ${LDFLAGS} $(LOCAL_CXXFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
- 
- profile: $(GAME_DEPENDS)
--	${CXX} -g -p ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
-+	${CXX} -g -p ${LDFLAGS} $(LOCAL_CXXFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
- 
- .cc.o:
--	${CXX} ${CFLAGS} -c $<
-+	${CXX} ${LOCAL_CXXFLAGS} -c $<
- 
- # [ds] Note we don't use the standard CFLAGS here; that's intentional, most
- # flex/bison combos I've tried don't produce code that passes the warnings
diff --git a/games/stonesoup/files/patch-makefile_tiles.unix b/games/stonesoup/files/patch-makefile_tiles.unix
new file mode 100644
index 000000000000..b76ec21d78eb
--- /dev/null
+++ b/games/stonesoup/files/patch-makefile_tiles.unix
@@ -0,0 +1,140 @@
+--- ./makefile_tiles.unix.orig	2009-06-12 12:32:15.000000000 +0200
++++ ./makefile_tiles.unix	2009-06-19 13:54:52.000000000 +0200
+@@ -4,7 +4,7 @@
+ # Modified for Crawl Reference by $Author: dshaligram $ on $Date: 2007-06-24T16:27:58.475101Z $
+ #
+ 
+-GAME = crawl
++GAME = stonesoup
+ 
+ # this file contains a list of the libraries.
+ # it will make a variable called OBJECTS that contains all the libraries
+@@ -15,7 +15,6 @@
+ SDL_CFLAGS := $(shell sdl-config --cflags)
+ SDL_LDFLAGS := $(shell sdl-config --libs) -lSDLmain
+ 
+-CXX = g++
+ DELETE = rm -f
+ COPY = cp
+ OS_TYPE = UNIX
+@@ -25,7 +24,7 @@
+ 
+ # Change this to y if you want to use Unicode glyphs in the map, and you have
+ # libncursesw available.
+-UNICODE_GLYPHS = n
++UNICODE_GLYPHS = %%UNICODE%%
+ 
+ ifeq ($(strip $(OSX)),y)
+ PNG_INCLUDE := -I/sw/include
+@@ -41,7 +40,7 @@
+ else
+ PNG_INCLUDE :=
+ PNG_LIB :=
+-FREETYPE_INCLUDE := -I/usr/include/freetype2
++FREETYPE_INCLUDE := -I/usr/local/include/freetype2
+ endif
+ 
+ # If you have lex and yacc, set DOYACC to y (lowercase y).
+@@ -54,16 +53,16 @@
+ MCHMOD_SAVEDIR := 775
+ 
+ # The user:group to install the game as.
+-INSTALL_UGRP := games:games
++INSTALL_UGRP := root:games
+ 
+-INSTALLDIR   := /usr/games/crawl
++INSTALLDIR   := %%PREFIX%%/bin
+ 
+ # If you're installing Crawl for multiple users, you *must* set this to a
+ # valid path before building Crawl. This is not necessary if you are building
+ # Crawl for a single user.
+ 
+-# SAVEDIR := /usr/games/crawl/saves/
+-# DATADIR := /usr/games/crawl/data/
++SAVEDIR := %%SAVEDIR%%
++DATADIR := %%DATADIR%%
+ 
+ LEX  := flex
+ YACC := bison -y
+@@ -105,17 +104,8 @@
+ 
+ INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES) $(PNG_INCLUDE) $(FREETYPE_INCLUDE)
+ 
+-CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic -Wno-parentheses
+-
+ CFOTHERS := -fsigned-char -D$(OS_TYPE) $(EXTRA_FLAGS) -DCLUA_BINDINGS
+ 
+-ifneq ($(HURRY),y)
+-ifneq ($(DEBUG_CRAWL),y)
+-CFWARN += -Wuninitialized
+-CFOTHERS += -O2
+-endif
+-endif
+-
+ ifneq ($(strip $(SAVEDIR)),)
+ CFOTHERS += '-DSAVE_DIR_PATH="$(strip $(SAVEDIR))"'
+ endif
+@@ -124,8 +114,8 @@
+ CFOTHERS += '-DDATA_DIR_PATH="$(strip $(DATADIR))"'
+ endif
+ 
+-CFLAGS  := $(INCLUDES) $(CFWARN) $(CFOTHERS) $(SDL_CFLAGS)
+-YCFLAGS := $(INCLUDES) $(CFOTHERS)
++LOCAL_CFLAGS  := $(INCLUDES) $(CXXFLAGS) $(CFWARN) $(CFOTHERS) $(SDL_CFLAGS)
++YCFLAGS := $(INCLUDES) $(CXXFLAGS) $(CFOTHERS)
+ 
+ UTIL = util/
+ 
+@@ -167,7 +157,7 @@
+ 	rm -f $(DEPENDENCY_MKF).tmp
+ 	@for i in $^; do \
+ 	    echo "Updating dependencies for $$i"; \
+-	    $(CXX) -MM $(CFLAGS) $$i >>$(DEPENDENCY_MKF).tmp 2>/dev/null; \
++	    $(CXX) -MM $(LOCAL_CFLAGS) $$i >>$(DEPENDENCY_MKF).tmp 2>/dev/null; \
+ 	done
+ 	mv -f $(DEPENDENCY_MKF).tmp $(DEPENDENCY_MKF)
+ 
+@@ -210,7 +200,7 @@
+ ORIGTILEFILES = $(TILEFILES:%=$(RLTILES)/%)
+ 
+ makerltiles:
+-	cd $(RLTILES) && make -f makefile.unix all
++	cd $(RLTILES) && gmake -f makefile.unix all
+ 
+ $(TILEDEFSRCS): makerltiles
+ 
+@@ -222,7 +212,7 @@
+ 	$(COPY) $< $@
+ 
+ clean-rltiles:
+-	cd $(RLTILES) && make -f makefile.unix distclean && cd ..
++	cd $(RLTILES) && gmake -f makefile.unix distclean && cd ..
+ 
+ ##########################################################################
+ 
+@@ -287,21 +277,21 @@
+ 	$(DELETE) $(DEPENDENCY_MKF)
+ 
+ $(GAME): $(GAME_DEPENDS)
+-	${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
++	${CXX} ${LDFLAGS} $(LOCAL_CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
+ 
+ .PHONY : debug
+ 
+ debug: $(GAME)
+ 
+ profile: $(GAME_DEPENDS)
+-	${CXX} -g -p ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
++	${CXX} -g -p ${LDFLAGS} $(LOCAL_CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
+ 
+ %.o: %.cc $(TILEDEFHDRS)
+-	${CXX} ${CFLAGS} -c $< -o $@
++	${CXX} ${LOCAL_CFLAGS} -c $< -o $@
+ 
+ # STL is bad in debug.  Always compile this file with optimizations.
+ tilebuf.o: tilebuf.cc $(TILEDEFHDRS)
+-	${CXX} ${CFLAGS} -O2 -c $< -o $@
++	${CXX} ${LOCAL_CFLAGS} -O2 -c $< -o $@
+ 
+ # [ds] Note we don't use the standard CFLAGS here; that's intentional, most
+ # flex/bison combos I've tried don't produce code that passes the warnings
diff --git a/games/stonesoup/files/patch-rltiles_bmp2png_makefile.lin b/games/stonesoup/files/patch-rltiles_bmp2png_makefile.lin
deleted file mode 100644
index 29658ecec3c0..000000000000
--- a/games/stonesoup/files/patch-rltiles_bmp2png_makefile.lin
+++ /dev/null
@@ -1,12 +0,0 @@
---- rltiles/bmp2png/makefile.lin.orig	2008-07-18 08:50:02.000000000 +0200
-+++ rltiles/bmp2png/makefile.lin	2008-07-18 08:50:58.000000000 +0200
-@@ -8,8 +8,7 @@
- BINDIR  = /usr/local/bin
- endif
- 
--CC      = gcc
--LD      = gcc
-+LD      = $(CC)
- ifndef INSTALL
- INSTALL = install -s -m 755
- endif
diff --git a/games/stonesoup/files/patch-rltiles_makefile.unix b/games/stonesoup/files/patch-rltiles_makefile.unix
deleted file mode 100644
index 30a76d8a8bf5..000000000000
--- a/games/stonesoup/files/patch-rltiles_makefile.unix
+++ /dev/null
@@ -1,33 +0,0 @@
---- rltiles/makefile.unix.orig	2008-07-14 04:17:52.000000000 +0200
-+++ rltiles/makefile.unix	2008-07-18 08:50:43.000000000 +0200
-@@ -12,7 +12,6 @@
- B2P = bmp2png
- B2PTOOL = $(B2PSRC)$(B2P)
- 
--CC = cc
- DELETE = rm -f
- 
- OBJECTS = \
-@@ -104,11 +103,11 @@
- #
- 
- $(B2PTOOL):
--	cd $(B2PSRC) && make -f makefile.lin $(B2P) && cd ..
-+	cd $(B2PSRC) && gmake -f makefile.lin $(B2P) && cd ..
- 
- %.png: %.bmp $(B2PTOOL)
- 	$(DELETE) $@
--	$(B2PTOOL) -Q $<
-+	$(B2PTOOL) -X -Q $<
- 
- ##########################################################################
- # Cleaning...
-@@ -117,7 +116,7 @@
- clean:
- 	$(DELETE) $(OBJECTS)
- 	$(DELETE) $(ALLTOOLS)
--	cd $(B2PSRC) && make -f makefile.lin clean && cd ..
-+	cd $(B2PSRC) && gmake -f makefile.lin clean && cd ..
- 
- distclean: clean
- 	$(DELETE) $(GENERATEDBMP)
diff --git a/games/stonesoup/files/patch-tilesdl.cc b/games/stonesoup/files/patch-tilesdl.cc
new file mode 100644
index 000000000000..a9997c5b9338
--- /dev/null
+++ b/games/stonesoup/files/patch-tilesdl.cc
@@ -0,0 +1,11 @@
+--- ./tilesdl.cc.orig	2009-06-19 13:55:52.000000000 +0200
++++ ./tilesdl.cc	2009-06-19 13:56:17.000000000 +0200
+@@ -234,7 +234,7 @@
+ #ifdef WIN32TILES
+     const char *icon_name = "dat/tiles/stone_soup_icon-win32.png";
+ #else
+-    const char *icon_name = "dat/tiles/stone_soup_icon-32x32.png";
++    const char *icon_name = "%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png";
+ #endif
+     SDL_Surface *icon = IMG_Load(icon_name);
+     if (!icon)
diff --git a/games/stonesoup/files/patch-util_lua_src_Makefile b/games/stonesoup/files/patch-util__lua__src__Makefile
index d67eaf9c266e..0a0ae5723651 100644
--- a/games/stonesoup/files/patch-util_lua_src_Makefile
+++ b/games/stonesoup/files/patch-util__lua__src__Makefile
@@ -1,5 +1,5 @@
---- util/lua/src/Makefile.orig	2008-07-14 04:17:51.000000000 +0200
-+++ util/lua/src/Makefile	2008-07-18 08:49:37.000000000 +0200
+--- ./util/lua/src/Makefile.orig	2009-06-12 12:24:43.000000000 +0200
++++ ./util/lua/src/Makefile	2009-06-19 13:54:52.000000000 +0200
 @@ -9,8 +9,6 @@
  # Your platform. See PLATS for possible values.
  PLAT= none
diff --git a/games/stonesoup/files/patch-util_sqlite_Makefile b/games/stonesoup/files/patch-util__sqlite__Makefile
index c43a36ec5403..b4fe77842137 100644
--- a/games/stonesoup/files/patch-util_sqlite_Makefile
+++ b/games/stonesoup/files/patch-util__sqlite__Makefile
@@ -1,5 +1,5 @@
---- util/sqlite/Makefile.orig	2008-07-14 04:17:51.000000000 +0200
-+++ util/sqlite/Makefile	2008-07-18 08:50:23.000000000 +0200
+--- ./util/sqlite/Makefile.orig	2009-06-12 12:27:11.000000000 +0200
++++ ./util/sqlite/Makefile	2009-06-19 13:54:52.000000000 +0200
 @@ -4,12 +4,11 @@
  
  LIBSQL = libsqlite3.a
diff --git a/games/stonesoup/pkg-plist b/games/stonesoup/pkg-plist
index 7469ebc31532..7e8693fc8092 100644
--- a/games/stonesoup/pkg-plist
+++ b/games/stonesoup/pkg-plist
@@ -1,18 +1,19 @@
 bin/stonesoup
-%%DATADIR%%/dat/lua/chnkdata.lua
+%%DATADIR%%/dat/lua/runrest.lua
 %%DATADIR%%/dat/lua/trapwalk.lua
 %%DATADIR%%/dat/lua/stash.lua
-%%DATADIR%%/dat/lua/safechnk.lua
-%%DATADIR%%/dat/lua/runrest.lua
+%%DATADIR%%/dat/lua/wield.lua
 %%DATADIR%%/dat/lua/pickup.lua
 %%DATADIR%%/dat/lua/kills.lua
 %%DATADIR%%/dat/lua/gearset.lua
-%%DATADIR%%/dat/lua/eat.lua
-%%DATADIR%%/dat/lua/wield.lua
 %%DATADIR%%/dat/clua/dungeon.lua
+%%DATADIR%%/dat/clua/util.lua
+%%DATADIR%%/dat/clua/userbase.lua
+%%DATADIR%%/dat/clua/point.lua
 %%DATADIR%%/dat/clua/macro.lua
 %%DATADIR%%/dat/clua/luamark.lua
 %%DATADIR%%/dat/clua/loadmaps.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
@@ -20,7 +21,7 @@ bin/stonesoup
 %%DATADIR%%/dat/clua/lm_fog.lua
 %%DATADIR%%/dat/clua/lm_flags.lua
 %%DATADIR%%/dat/clua/lm_1way.lua
-%%DATADIR%%/dat/clua/userbase.lua
+%%DATADIR%%/dat/clua/ziggurat.lua
 %%DATADIR%%/dat/descript/ability.txt
 %%DATADIR%%/dat/descript/spells.txt
 %%DATADIR%%/dat/descript/skills.txt
@@ -28,43 +29,59 @@ bin/stonesoup
 %%DATADIR%%/dat/descript/items.txt
 %%DATADIR%%/dat/descript/gods.txt
 %%DATADIR%%/dat/descript/features.txt
+%%DATADIR%%/dat/descript/cards.txt
 %%DATADIR%%/dat/descript/branches.txt
 %%DATADIR%%/dat/descript/unident.txt
-%%DATADIR%%/dat/database/godspeak.txt
+%%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/miscname.txt
 %%DATADIR%%/dat/database/insult.txt
 %%DATADIR%%/dat/database/help.txt
+%%DATADIR%%/dat/database/godspeak.txt
 %%DATADIR%%/dat/database/wpnnoise.txt
 %%DATADIR%%/dat/altar.des
+%%DATADIR%%/dat/ziggurat.des
 %%DATADIR%%/dat/vaults.des
 %%DATADIR%%/dat/temple.des
-%%DATADIR%%/dat/portal.des
+%%DATADIR%%/dat/sewer.des
+%%DATADIR%%/dat/rooms.des
 %%DATADIR%%/dat/pan.des
 %%DATADIR%%/dat/orc.des
+%%DATADIR%%/dat/minitomb.des
 %%DATADIR%%/dat/mini.des
 %%DATADIR%%/dat/layout.des
 %%DATADIR%%/dat/large.des
 %%DATADIR%%/dat/lair.des
 %%DATADIR%%/dat/lab.des
+%%DATADIR%%/dat/icecave.des
 %%DATADIR%%/dat/hive.des
 %%DATADIR%%/dat/hells.des
 %%DATADIR%%/dat/float.des
 %%DATADIR%%/dat/entry.des
 %%DATADIR%%/dat/elf.des
+%%DATADIR%%/dat/dummy.des
+%%DATADIR%%/dat/didact.des
 %%DATADIR%%/dat/crypt.des
 %%DATADIR%%/dat/bazaar.des
+%%DATADIR%%/dat/arena.des
 %%DATADIR%%/dat/zot.des
-%%X11%%%%DATADIR%%/dat/tiles/wall2d.png
-%%X11%%%%DATADIR%%/dat/tiles/title.png
-%%X11%%%%DATADIR%%/dat/tiles/tile.png
-%%X11%%%%DATADIR%%/dat/tiles/player.png
+%%SDL%%%%DATADIR%%/dat/tiles/Vera.ttf
+%%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/dngn.png
+%%SDL%%%%DATADIR%%/dat/tiles/VeraMono.ttf
+%%SDL%%%%DATADIR%%/dat/tiles/title.png
 %%DATADIR%%/settings/034_command_keys.txt
 %%DATADIR%%/settings/tiles_options.txt
 %%DATADIR%%/settings/standard_colours.txt
@@ -84,15 +101,18 @@ bin/stonesoup
 %%DATADIR%%/docs/monster_speech.txt
 %%DATADIR%%/docs/macros_guide.txt
 %%DATADIR%%/docs/lualicense.txt
+%%DATADIR%%/docs/lgpl.txt
 %%DATADIR%%/docs/level_design.txt
 %%DATADIR%%/docs/keybind.txt
+%%DATADIR%%/docs/key_changes.txt
 %%DATADIR%%/docs/crawl_manual.txt
 %%DATADIR%%/docs/coding_conventions.txt
+%%DATADIR%%/docs/arena.txt
 %%DATADIR%%/docs/aptitudes.txt
 %%DATADIR%%/docs/tiles_help.txt
 @exec chown -R root:games %D/%%DATADIR%%
 @exec install -d -o root -g games -m 775 %%SAVEDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/licence.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
@@ -101,11 +121,11 @@ bin/stonesoup
 @dirrm %%DATADIR%%/dat/clua
 @dirrm %%DATADIR%%/dat/descript
 @dirrm %%DATADIR%%/dat/database
-%%X11%%@dirrm %%DATADIR%%/dat/tiles/
+%%SDL%%@dirrm %%DATADIR%%/dat/tiles
 @dirrm %%DATADIR%%/dat
 @dirrm %%DATADIR%%/settings
 @dirrm %%DATADIR%%/docs
 @dirrm %%DATADIR%%/
 @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
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%