ports/182913: [MAINTAINER-UPDATE] Update games/stonesoup and games/stonesoup-sdl from version 0.11.1 to 0.13.0
Tobias Rehbein
tobias.rehbein at web.de
Wed Oct 16 17:30:02 UTC 2013
The following reply was made to PR ports/182913; it has been noted by GNATS.
From: Tobias Rehbein <tobias.rehbein at web.de>
To: bug-followup at FreeBSD.org
Cc:
Subject: Re: ports/182913: [MAINTAINER-UPDATE] Update games/stonesoup and
games/stonesoup-sdl from version 0.11.1 to 0.13.0
Date: Wed, 16 Oct 2013 19:18:30 +0200
--XsQoSWH+UP9D9v3l
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Updated set of patches:
* Fix build on FreeBSD 10
* Add NEED_ROOT
--XsQoSWH+UP9D9v3l
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="games__stonesoup__0.11.1-0.13.0__stage_v2.diff"
diff -urN games/stonesoup.orig/Makefile games/stonesoup/Makefile
--- games/stonesoup.orig/Makefile 2013-10-16 08:06:39.616114594 +0200
+++ games/stonesoup/Makefile 2013-10-16 07:58:49.000000000 +0200
@@ -2,7 +2,7 @@
# $FreeBSD: games/stonesoup/Makefile 327730 2013-09-20 17:36:33Z bapt $
PORTNAME= stonesoup
-PORTVERSION= 0.11.1
+PORTVERSION= 0.13.0
CATEGORIES= games
MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION}
DISTNAME= stone_soup-${PORTVERSION}-nodeps
@@ -13,13 +13,14 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKDIR}/stone_soup-${PORTVERSION}/licence.txt
+NEED_ROOT= yes
+
USE_SQLITE= yes
USE_XZ= yes
USES= bison gmake perl5 pkgconfig
USE_LUA= 5.1
USE_PERL5= build
-
SAVEDIR= \~/.stonesoup
WRKSRC= ${WRKDIR}/stone_soup-${PORTVERSION}/source/
@@ -35,22 +36,16 @@
MAKE_ARGS= prefix=${PREFIX} \
DATADIR=${DATADIR} \
SAVEDIR=${SAVEDIR} \
+ DESTDIR=${STAGEDIR} \
INSTALL_UGRP=root:games \
NO_AUTO_OPT=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"
+ LDFLAGS="-L${LOCALBASE}/lib"
-NO_STAGE= yes
.include <bsd.port.options.mk>
-.if ${CC:T:M*clang*}
-MAKE_ARGS+= NO_INLINE_DEPGEN=1
-.endif
-
.if defined(VERBOSE)
MAKE_ARGS+= V=yes
.endif
@@ -84,7 +79,14 @@
MAKE_ARGS+= NO_LUA_BINDINGS=yes
.endif
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 1000500
+CFLAGS+= -std=c++0x
+.endif
+
post-patch:
+ @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile
.if ${PORT_OPTIONS:MSOUND}
@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h
@${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h
@@ -92,14 +94,18 @@
@${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/AppHdr.h
.endif
+pre-install:
+ @${FIND} ${WRKSRC}/dat -type f -name '*.orig' | \
+ ${XARGS} ${RM}
+
post-install:
.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${DOCSDIR}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR}
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
- ${MKDIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${DATADIR}/settings/init.txt ${EXAMPLESDIR}/sample.crawlrc
+ ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ ${INSTALL_DATA} ${STAGEDIR}${DATADIR}/settings/init.txt ${STAGEDIR}${EXAMPLESDIR}/sample.crawlrc
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN games/stonesoup.orig/distinfo games/stonesoup/distinfo
--- games/stonesoup.orig/distinfo 2013-10-16 08:06:39.617115004 +0200
+++ games/stonesoup/distinfo 2013-10-16 07:57:15.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (stone_soup-0.11.1-nodeps.tar.xz) = 377d738cff21165763b252a57cd84049361d44db6d8d10f08f789cc9e7bb82b6
-SIZE (stone_soup-0.11.1-nodeps.tar.xz) = 7519768
+SHA256 (stone_soup-0.13.0-nodeps.tar.xz) = e2f0d9f1995b286faaa0794509398c793c2500b467f517158b1e7b0bf2e00ee7
+SIZE (stone_soup-0.13.0-nodeps.tar.xz) = 9456072
diff -urN games/stonesoup.orig/files/patch-AppHdr.h games/stonesoup/files/patch-AppHdr.h
--- games/stonesoup.orig/files/patch-AppHdr.h 1970-01-01 01:00:00.000000000 +0100
+++ games/stonesoup/files/patch-AppHdr.h 2013-10-16 07:57:15.000000000 +0200
@@ -0,0 +1,11 @@
+--- ./AppHdr.h.orig 2013-09-30 20:32:00.000000000 +0200
++++ ./AppHdr.h 2013-10-11 22:07:08.165888633 +0200
+@@ -146,7 +146,7 @@
+ //
+ // 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 &"
+
+ #include "libunix.h"
+
diff -urN games/stonesoup.orig/files/patch-Makefile games/stonesoup/files/patch-Makefile
--- games/stonesoup.orig/files/patch-Makefile 2013-10-16 08:06:39.615114674 +0200
+++ games/stonesoup/files/patch-Makefile 2013-10-16 07:57:15.000000000 +0200
@@ -1,6 +1,6 @@
---- ./Makefile.orig 2012-09-30 23:25:31.000000000 +0200
-+++ ./Makefile 2012-10-27 20:49:08.837330946 +0200
-@@ -66,7 +66,7 @@
+--- ./Makefile.orig 2013-09-30 20:32:00.000000000 +0200
++++ ./Makefile 2013-10-11 22:07:08.167887693 +0200
+@@ -69,7 +69,7 @@
# ask for a package with convenience libraries instead -- we'll try to provide
# them somewhere in the near future.
@@ -9,25 +9,16 @@
# 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
-@@ -112,7 +112,7 @@
-
- else
-
--CFOPTIMIZE := -O2
-+CFOPTIMIZE :=
-
- endif # USE_ICC
+@@ -101,7 +101,7 @@
+ #
-@@ -120,7 +120,7 @@
- CFOPTIMIZE += -flto=jobserver -fwhole-program
- endif
-CFOTHERS := -pipe $(EXTERNAL_FLAGS)
+CFOTHERS := $(CFLAGS)
CFWARN := -Wall -Wformat-security
CFWARN_L := -Wundef
-@@ -133,8 +133,6 @@
+@@ -118,8 +118,6 @@
#
AR = ar
RANLIB = ranlib
@@ -36,47 +27,44 @@
RM = rm -f
COPY = cp
COPY_R = cp -r
-@@ -530,30 +528,19 @@
- ifndef BUILD_LUA
- ifdef NO_PKGCONFIG
- BUILD_LUA = yes
-- endif
--endif
--ifndef BUILD_LUA
-- ifneq ($(shell $(PKGCONFIG) lua5.1 --exists || echo no),)
-- ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),)
-+ else
-+ LUA_PACKAGE := $(shell for lua in lua51 lua5.1 lua-5.1 lua; do \
-+ $(PKGCONFIG) $$lua --exists && test `$(PKGCONFIG) $$lua --modversion | head -c 3` = 5.1 && \
-+ echo $$lua && break;\
-+ done)
-+ ifeq (,$(LUA_PACKAGE))
+@@ -529,9 +527,9 @@
+ ifneq (,$(shell $(GXX) --version|grep 'g++.*4\.2\.'))
+ # OS X uses a buggy ancient version of gcc without fixes from even
+ # subsequent point releases of 4.2.
+- CFOPTIMIZE := -O0
++ CFOPTIMIZE :=
+ else
+- CFOPTIMIZE := -O2
++ CFOPTIMIZE :=
+ endif
+ endif
+
+@@ -585,7 +583,7 @@
BUILD_LUA = yes
+ endif
+ else
+- ifneq ($(shell $(PKGCONFIG) lua5.1 --exists || echo no),)
++ ifneq ($(shell $(PKGCONFIG) lua-5.1 --exists || echo no),)
+ ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),)
+ BUILD_LUA = yes
+ else
+@@ -596,13 +594,13 @@
+ endif
+ endif
else
-- ifeq ($(shell $(PKGCONFIG) lua --modversion | head -c 3),5.1)
-- LUA_PACKAGE = lua
-- else
-- BUILD_LUA = yes
-- endif
-+ INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I)
-+ CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
-+ LIBS += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --libs)
+- LUA_PACKAGE = lua5.1
++ LUA_PACKAGE = lua-5.1
endif
-- else
-- LUA_PACKAGE = lua5.1
-- endif
--endif
--ifndef BUILD_LUA
-- ifndef LUA_PACKAGE
-- LUA_PACKAGE = lua5.1
endif
-- INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I)
-- CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
-- LIBS += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --libs)
endif
-
- ifndef BUILD_SQLITE
-@@ -707,7 +694,7 @@
+ ifndef BUILD_LUA
+ ifndef LUA_PACKAGE
+- LUA_PACKAGE = lua5.1
++ LUA_PACKAGE = lua-5.1
+ endif
+ INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I)
+ CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
+@@ -754,7 +752,7 @@
DEFINES += -DWIZARD
endif
ifdef NO_OPTIMIZE
@@ -85,42 +73,26 @@
endif
ifdef PCH
-@@ -831,10 +818,12 @@
+@@ -878,7 +876,7 @@
INSTALL_FONTS += $(PROPORTIONAL_FONT)
endif
else
-- SYS_PROPORTIONAL_FONT = $(shell find /usr/share/fonts -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
-- ifeq (,$(SYS_PROPORTIONAL_FONT))
-- SYS_PROPORTIONAL_FONT = $(shell find /usr/local/share/fonts -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
-- endif
-+ SYS_PROPORTIONAL_FONT = $(shell name=$(OUR_PROPORTIONAL_FONT);\
-+ {\
-+ fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
-+ for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\
-+ do [ -d $$dir ] && echo $$dir; done;\
-+ } 2>/dev/null | xargs -I% find % -type f -iname $$name -print | head -n1)
- ifneq (,$(SYS_PROPORTIONAL_FONT))
- ifeq (,$(COPY_FONTS))
- DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
-@@ -854,10 +843,12 @@
+- SYS_PROPORTIONAL_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
++ SYS_PROPORTIONAL_FONT = $(shell dir=%%LOCALBASE%%/lib/X11/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
+ ifeq (,$(SYS_PROPORTIONAL_FONT))
+ SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
+ endif
+@@ -901,7 +899,7 @@
INSTALL_FONTS += $(MONOSPACED_FONT)
endif
else
-- SYS_MONOSPACED_FONT = $(shell find /usr/share/fonts -iname $(OUR_MONOSPACED_FONT)|head -n 1)
-- ifeq (,$(SYS_MONOSPACED_FONT))
-- SYS_MONOSPACED_FONT = $(shell find /usr/local/share/fonts -iname $(OUR_MONOSPACED_FONT)|head -n 1)
-- endif
-+ SYS_MONOSPACED_FONT = $(shell name=$(OUR_MONOSPACED_FONT);\
-+ {\
-+ fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
-+ for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\
-+ do [ -d $$dir ] && echo $$dir; done;\
-+ } 2>/dev/null | xargs -I% find % -type f -iname $$name -print | head -n1)
- ifneq (,$(SYS_MONOSPACED_FONT))
- ifeq (,$(COPY_FONTS))
- DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"
-@@ -1036,7 +1027,7 @@
- cmd-name.h $(INI_OBJECTS)
+- SYS_MONOSPACED_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
++ SYS_MONOSPACED_FONT = $(shell dir=%%LOCALBASE%%/lib/X11/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
+ ifeq (,$(SYS_MONOSPACED_FONT))
+ SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
+ endif
+@@ -1091,7 +1089,7 @@
+ cmd-name.h
SRC_PKG_BASE := stone_soup
-SRC_VERSION := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
@@ -128,11 +100,3 @@
MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|sed -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
export SRC_VERSION
-@@ -1049,6 +1040,7 @@
- greet:
- @if [ ! -e $(GAME) ]; then\
- printf " * If you experience any problems building Crawl, please take a second look\\n"\
-+ ;printf\
- " * at INSTALL.txt: the solution to your problem just might be in there!\\n";\
- fi
-
diff -urN games/stonesoup.orig/files/patch-dat__des__branches__dis.des games/stonesoup/files/patch-dat__des__branches__dis.des
--- games/stonesoup.orig/files/patch-dat__des__branches__dis.des 1970-01-01 01:00:00.000000000 +0100
+++ games/stonesoup/files/patch-dat__des__branches__dis.des 2013-10-16 07:57:15.000000000 +0200
@@ -0,0 +1,12 @@
+--- ./dat/des/branches/dis.des.orig 2013-10-11 22:08:34.949889217 +0200
++++ ./dat/des/branches/dis.des 2013-10-11 22:13:33.637913849 +0200
+@@ -209,8 +209,7 @@
+ KMONS: F = executioner
+ KMONS: ! = iron devil / skeletal warrior / hell knight / place:Zot:1 skeleton w:15
+ KMONS: ? = patrolling iron imp
+-: dgn.delayed_decay(_G, '%', 'human corpse / human skeleton, \
+-: human corpse / human skeleton')
++: dgn.delayed_decay(_G, '%', 'human corpse / human skeleton, human corpse / human skeleton')
+ : else
+ KMONS: 01 = ghost moth
+ KMONS: 23 = golden dragon
diff -urN games/stonesoup.orig/files/patch-dat__des__builder__shops.des games/stonesoup/files/patch-dat__des__builder__shops.des
--- games/stonesoup.orig/files/patch-dat__des__builder__shops.des 1970-01-01 01:00:00.000000000 +0100
+++ games/stonesoup/files/patch-dat__des__builder__shops.des 2013-10-16 07:57:15.000000000 +0200
@@ -0,0 +1,19 @@
+--- ./dat/des/builder/shops.des.orig 2013-09-30 20:32:00.000000000 +0200
++++ ./dat/des/builder/shops.des 2013-10-11 22:07:08.169887952 +0200
+@@ -228,15 +228,7 @@
+ : local shopname = util.random_from({"type:Blasphemy suffix:Boutique",
+ : "type:Evil suffix:Emporium", "type:Profane suffix:Products",
+ : "type:Sacrilege suffix:Store", "type:Wicked suffix:Wares"})
+-: kfeat("s = general shop " .. shopname .. " ; \
+-: potion of blood | any weapon ego:draining w:15 | any weapon ego:pain w:5 | \
+-: any weapon ego:vampiricism w:5 | demon blade w:5 | \
+-: demon whip w:5 | demon trident w:5 | wand of draining | scroll of torment | \
+-: staff of death | rod of demonology w:5 | \
+-: bottled efreet w:5 | lantern of shadows w:5 | book of necromancy | book of death | \
+-: book of unlife | randbook disc:necromancy w:5 | necronomicon w:1 | \
+-: grand grimoire w:1 | scythe unrand:scythe_of_curses w:1 | \
+-: long sword unrand:sword_of_zonguldrok w:1 | mace unrand:sceptre_of_torment w:1")
++: kfeat("s = general shop " .. shopname .. " ; potion of blood | any weapon ego:draining w:15 | any weapon ego:pain w:5 | any weapon ego:vampiricism w:5 | demon blade w:5 | demon whip w:5 | demon trident w:5 | wand of draining | scroll of torment | staff of death | rod of demonology w:5 | bottled efreet w:5 | lantern of shadows w:5 | book of necromancy | book of death | book of unlife | randbook disc:necromancy w:5 | necronomicon w:1 | grand grimoire w:1 | scythe unrand:scythe_of_curses w:1 | long sword unrand:sword_of_zonguldrok w:1 | mace unrand:sceptre_of_torment w:1")
+ KFEAT: a = altar_kikubaaqudgha / altar_yredelemnul / altar_makhleb / \
+ altar_beogh w:1 / altar_lugonu w:1
+ MAP
diff -urN games/stonesoup.orig/files/patch-dat__des__variable__grated_community.des games/stonesoup/files/patch-dat__des__variable__grated_community.des
--- games/stonesoup.orig/files/patch-dat__des__variable__grated_community.des 1970-01-01 01:00:00.000000000 +0100
+++ games/stonesoup/files/patch-dat__des__variable__grated_community.des 2013-10-16 07:57:15.000000000 +0200
@@ -0,0 +1,67 @@
+--- ./dat/des/variable/grated_community.des.orig 2013-10-11 22:08:21.868888937 +0200
++++ ./dat/des/variable/grated_community.des 2013-10-11 22:12:02.503889567 +0200
+@@ -67,11 +67,7 @@
+ q:5 sausage
+ KFEAT: C = distillery shop type:Miraculous suffix:Elixirs count:10 \
+ greed:50 ; potion of confusion
+-: kfeat("D = armour shop name:The_Legendary_" .. crawl.make_name() .. " \
+-: type:Legendary suffix:Smithy count:10 greed:40 ;\
+-: damaged plate armour ego:none | damaged chain mail ego:none |\
+-: damaged long sword ego:none | damaged shield ego:none |\
+-: damaged large shield ego:none | damaged battleaxe ego:none")
++: kfeat("D = armour shop name:The_Legendary_" .. crawl.make_name() .. " type:Legendary suffix:Smithy count:10 greed:40 ; damaged plate armour ego:none | damaged chain mail ego:none | damaged long sword ego:none | damaged shield ego:none | damaged large shield ego:none | damaged battleaxe ego:none")
+ SHUFFLE: QRSTUVX
+ SUBVAULT: Q : grated_community_mu_home1
+ SUBVAULT: R : grated_community_mu_home2
+@@ -166,16 +162,11 @@
+ KITEM: % = animal skin / nothing
+ MARKER: + = lua:restrict_door()
+ KFEAT: ~ = closed_door
+-: dgn.delayed_decay(_G, '*', 'human skeleton / yak skeleton / elf skeleton /\
+-: gnome skeleton / elephant skeleton /\
+-: sheep skeleton / manticore skeleton /\
+-: w:2 nothing, animal skin')
++: dgn.delayed_decay(_G, '*', 'human skeleton / yak skeleton / elf skeleton / gnome skeleton / elephant skeleton / sheep skeleton / manticore skeleton / w:2 nothing, animal skin')
+ KFEAT: 8 = granite_statue / orcish_idol / w:5 altar_trog /\
+ w:5 altar_beogh / w:1 altar_makhleb / w:4 floor
+ KITEM: $ = q:5 meat ration, giant spiked club, q:2 sausage
+-: kitem("$ = q:" .. crawl.random_range(1, 5) .. " sausage / w:5 nothing, \
+-: q:" .. crawl.random_range(1, 3) .. " meat ration / w:5 nothing, \
+-: giant spiked club / giant club / nothing")
++: kitem("$ = q:" .. crawl.random_range(1, 5) .. " sausage / w:5 nothing, q:" .. crawl.random_range(1, 3) .. " meat ration / w:5 nothing, giant spiked club / giant club / nothing")
+ : local frosty = crawl.random2(6)
+ : if frosty == 5 then
+ SUBST: 1 = 2
+@@ -218,10 +209,8 @@
+ KFEAT: * = altar_kikubaaqudgha / w:4 altar_sif_muna / w:1 altar_yredelemnul
+ KITEM: " = gold, any wand / w:15 nothing, any scroll / nothing
+ KFEAT: 8 = granite_statue / w:2 fountain_blood / w:1 floor
+-: kitem("? = q:" .. crawl.random_range(1, 3) .. " scroll of torment /\
+-: nothing, any scroll / nothing")
+-: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic /\
+-: nothing, any potion / nothing")
++: kitem("? = q:" .. crawl.random_range(1, 3) .. " scroll of torment / nothing, any scroll / nothing")
++: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic / nothing, any potion / nothing")
+ KITEM: & = book of necromancy / book of death / book of unlife / w:12 nothing
+ KMONS: P = col:darkgrey plant name:withered name_adjective \
+ tile:mons_withered_plant / col:lightgrey plant name:withered \
+@@ -233,8 +222,7 @@
+ nothing
+ KFEAT: 8 = granite_statue / fountain_sparkling / fountain_blue / w:1 floor
+ KITEM: ? = scroll of recharging / nothing, any scroll / nothing
+-: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic /\
+-: nothing, any potion / nothing")
++: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic / nothing, any potion / nothing")
+ KITEM: & = book of wizardry / book of power / book of party tricks /\
+ book of alchemy / w:12 nothing
+ KMONS: P = plant
+@@ -246,8 +234,7 @@
+ potion of brilliance / nothing
+ KFEAT: 8 = granite_statue / w:1 floor
+ KITEM: ? = scroll of immolation / nothing, any scroll / nothing
+-: kitem("! = q:" .. crawl.random_range(1, 3) .. " scroll of immolation /\
+-: nothing, any potion / nothing")
++: kitem("! = q:" .. crawl.random_range(1, 3) .. " scroll of immolation / nothing, any potion / nothing")
+ KITEM: & = book of fire / book of power / book of ice /\
+ book of the tempests / w:12 nothing
+ KFEAT: P = granite_statue
diff -urN games/stonesoup.orig/files/patch-files.cc games/stonesoup/files/patch-files.cc
--- games/stonesoup.orig/files/patch-files.cc 2013-10-16 08:06:39.616114594 +0200
+++ games/stonesoup/files/patch-files.cc 2013-10-16 07:57:15.000000000 +0200
@@ -1,8 +1,8 @@
---- ./files.cc.orig 2012-09-30 23:25:31.000000000 +0200
-+++ ./files.cc 2012-10-27 20:49:08.839666272 +0200
-@@ -618,8 +618,10 @@
+--- ./files.cc.orig 2013-09-30 20:32:00.000000000 +0200
++++ ./files.cc 2013-10-11 22:07:08.172887580 +0200
+@@ -626,8 +626,10 @@
{
- std::vector<player_save_info> chars;
+ vector<player_save_info> chars;
+#ifdef WIZARD
if (Options.no_save)
@@ -10,10 +10,10 @@
+#endif
#ifndef DISABLE_SAVEGAME_LISTS
- std::string searchpath = _get_savefile_directory();
-@@ -1741,8 +1743,10 @@
+ string searchpath = _get_savefile_directory();
+@@ -1792,8 +1794,10 @@
// returns false if a new game should start instead
- static bool _restore_game(const std::string& filename)
+ static bool _restore_game(const string& filename)
{
+#ifdef WIZARD
if (Options.no_save)
diff -urN games/stonesoup.orig/files/patch-ng-setup.cc games/stonesoup/files/patch-ng-setup.cc
--- games/stonesoup.orig/files/patch-ng-setup.cc 2013-10-16 08:06:39.616114594 +0200
+++ games/stonesoup/files/patch-ng-setup.cc 2013-10-16 07:57:15.000000000 +0200
@@ -1,7 +1,7 @@
---- ./ng-setup.cc.orig 2012-09-30 23:25:31.000000000 +0200
-+++ ./ng-setup.cc 2012-10-27 20:49:08.841950945 +0200
-@@ -1427,9 +1427,11 @@
- you.nemelex_sacrificing = true;
+--- ./ng-setup.cc.orig 2013-09-30 20:32:18.000000000 +0200
++++ ./ng-setup.cc 2013-10-11 22:07:08.174888114 +0200
+@@ -1430,9 +1430,11 @@
+ init_companions();
// Create the save file.
+#ifdef WIZARD
diff -urN games/stonesoup.orig/files/patch-rltiles__Makefile games/stonesoup/files/patch-rltiles__Makefile
--- games/stonesoup.orig/files/patch-rltiles__Makefile 2013-10-16 08:06:39.616114594 +0200
+++ games/stonesoup/files/patch-rltiles__Makefile 2013-10-16 07:57:15.000000000 +0200
@@ -1,5 +1,5 @@
---- ./rltiles/Makefile.orig 2012-09-30 23:25:31.000000000 +0200
-+++ ./rltiles/Makefile 2012-10-27 20:49:55.957667879 +0200
+--- ./rltiles/Makefile.orig 2013-09-30 20:32:00.000000000 +0200
++++ ./rltiles/Makefile 2013-10-11 22:07:08.176890218 +0200
@@ -1,7 +1,7 @@
uname_S := $(shell uname -s)
@@ -16,9 +16,9 @@
-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
+L_CFLAGS := $(CFLAGS)
- ifdef TILES
- ifndef CONTRIB_SDL
-@@ -29,24 +29,24 @@
+ ifdef ANDROID
+ CXXFLAGS :=
+@@ -35,24 +35,24 @@
PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a
endif
@@ -50,7 +50,7 @@
endif
# Attempt to use a full compiler name, to make
-@@ -58,7 +58,7 @@
+@@ -64,7 +64,7 @@
ifeq ($(shell which $(LMACH)gcc > /dev/null 2> /dev/null && echo "Yes"),)
LMACH :=
endif
@@ -59,7 +59,7 @@
DELETE = rm -f
-@@ -98,7 +98,7 @@
+@@ -109,7 +109,7 @@
$(QUIET_GEN)$(TILEGEN) -c $<
# CFLAGS difference check
@@ -68,16 +68,12 @@
.cflags: .force-cflags
@FLAGS='$(TRACK_CFLAGS)'; \
-@@ -127,9 +127,13 @@
+@@ -138,9 +138,9 @@
distclean: clean
%.o: %.cc .cflags
-- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -Wp,-MMD,$*.d,-MT,$@ -c $< -o $@
-+ifdef NO_INLINE_DEPGEN
-+ $(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -Wp,-MT,$@ -c $< -o $@
-+else
-+ $(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -Wp,-MMD,$*.d,-MT,$@ -c $< -o $@
-+endif
+- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
++ $(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -MMD -c $< -o $@
$(TILEGEN): $(OBJECTS)
- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
diff -urN games/stonesoup.orig/files/patch-rltiles__tool__tile.cc games/stonesoup/files/patch-rltiles__tool__tile.cc
--- games/stonesoup.orig/files/patch-rltiles__tool__tile.cc 2013-10-16 08:06:39.615114674 +0200
+++ games/stonesoup/files/patch-rltiles__tool__tile.cc 2013-10-16 07:57:15.000000000 +0200
@@ -1,5 +1,5 @@
---- ./rltiles/tool/tile.cc.orig 2012-09-30 23:25:33.000000000 +0200
-+++ ./rltiles/tool/tile.cc 2012-10-27 20:49:08.845367925 +0200
+--- ./rltiles/tool/tile.cc.orig 2013-09-30 20:32:00.000000000 +0200
++++ ./rltiles/tool/tile.cc 2013-10-11 22:07:08.178890955 +0200
@@ -125,10 +125,10 @@
if (flags[x + y * m_width])
continue;
diff -urN games/stonesoup.orig/files/patch-rltiles__tool__tile_list_processor.cc games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc
--- games/stonesoup.orig/files/patch-rltiles__tool__tile_list_processor.cc 2013-10-16 08:06:39.616114594 +0200
+++ games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc 2013-10-16 07:57:15.000000000 +0200
@@ -1,11 +1,11 @@
---- ./rltiles/tool/tile_list_processor.cc.orig 2012-09-30 23:25:33.000000000 +0200
-+++ ./rltiles/tool/tile_list_processor.cc 2012-10-27 20:49:08.847233795 +0200
-@@ -51,7 +51,7 @@
+--- ./rltiles/tool/tile_list_processor.cc.orig 2013-09-30 20:32:00.000000000 +0200
++++ ./rltiles/tool/tile_list_processor.cc 2013-10-11 22:07:08.181888672 +0200
+@@ -52,7 +52,7 @@
""
};
- if (m_sdir != "" || background && m_back_sdir != "")
+ if (m_sdir != "" || (background && m_back_sdir != ""))
{
- std::vector<const char *> dirs;
+ vector<const char *> dirs;
if (m_sdir != "")
diff -urN games/stonesoup.orig/files/patch-startup.cc games/stonesoup/files/patch-startup.cc
--- games/stonesoup.orig/files/patch-startup.cc 2013-10-16 08:06:39.615114674 +0200
+++ games/stonesoup/files/patch-startup.cc 2013-10-16 07:57:15.000000000 +0200
@@ -1,6 +1,6 @@
---- ./startup.cc.orig 2012-09-30 23:25:33.000000000 +0200
-+++ ./startup.cc 2012-10-27 20:49:08.848667287 +0200
-@@ -234,8 +234,10 @@
+--- ./startup.cc.orig 2013-09-30 20:32:00.000000000 +0200
++++ ./startup.cc 2013-10-11 22:07:08.183889437 +0200
+@@ -240,8 +240,10 @@
you.wizard = true;
#endif
// Save-less games are pointless except for tests.
diff -urN games/stonesoup.orig/pkg-descr games/stonesoup/pkg-descr
--- games/stonesoup.orig/pkg-descr 2013-10-16 08:06:39.617115004 +0200
+++ games/stonesoup/pkg-descr 2013-10-16 07:57:15.000000000 +0200
@@ -10,4 +10,4 @@
games/stonesoup - the traditional tty interfaced
games/stonesoup-sdl - the fancy SDL interface
-WWW: http://crawl.develz.org/
+WWW: http://crawl.develz.org/
diff -urN games/stonesoup.orig/pkg-plist games/stonesoup/pkg-plist
--- games/stonesoup.orig/pkg-plist 2013-10-16 08:06:39.617115004 +0200
+++ games/stonesoup/pkg-plist 2013-10-16 07:57:15.000000000 +0200
@@ -1,4 +1,6 @@
bin/stonesoup
+%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.crawlrc
%%DATADIR%%/dat/clua/autofight.lua
%%DATADIR%%/dat/clua/gearset.lua
%%DATADIR%%/dat/clua/kills.lua
@@ -35,11 +37,11 @@
%%DATADIR%%/dat/defaults/runrest_messages.txt
%%DATADIR%%/dat/defaults/standard_colours.txt
%%DATADIR%%/dat/des/altar/altar.des
-%%DATADIR%%/dat/des/altar/fedhas_garden.des
-%%DATADIR%%/dat/des/altar/grunt_ashenzari_visionary.des
-%%DATADIR%%/dat/des/altar/grunt_nemelex_the_gamble.des
+%%DATADIR%%/dat/des/altar/ashenzari_visionary.des
%%DATADIR%%/dat/des/altar/kiku_cage.des
%%DATADIR%%/dat/des/altar/lugonu_bribe.des
+%%DATADIR%%/dat/des/altar/nemelex_the_gamble.des
+%%DATADIR%%/dat/des/altar/okawaru_arena.des
%%DATADIR%%/dat/des/altar/overflow.des
%%DATADIR%%/dat/des/altar/trog_burn_book.des
%%DATADIR%%/dat/des/altar/trog_wizard.des
@@ -48,10 +50,13 @@
%%DATADIR%%/dat/des/altar/yredelemnul_ordeal.des
%%DATADIR%%/dat/des/branches/abyss.des
%%DATADIR%%/dat/des/branches/blade.des
+%%DATADIR%%/dat/des/branches/coc.des
%%DATADIR%%/dat/des/branches/crypt.des
-%%DATADIR%%/dat/des/branches/dwarf.des
+%%DATADIR%%/dat/des/branches/dis.des
%%DATADIR%%/dat/des/branches/elf.des
-%%DATADIR%%/dat/des/branches/hells.des
+%%DATADIR%%/dat/des/branches/forest.des
+%%DATADIR%%/dat/des/branches/geh.des
+%%DATADIR%%/dat/des/branches/hell.des
%%DATADIR%%/dat/des/branches/lair.des
%%DATADIR%%/dat/des/branches/orc.des
%%DATADIR%%/dat/des/branches/pan.des
@@ -60,15 +65,28 @@
%%DATADIR%%/dat/des/branches/snake.des
%%DATADIR%%/dat/des/branches/spider.des
%%DATADIR%%/dat/des/branches/swamp.des
+%%DATADIR%%/dat/des/branches/tar.des
%%DATADIR%%/dat/des/branches/temple.des
%%DATADIR%%/dat/des/branches/tomb.des
%%DATADIR%%/dat/des/branches/vaults.des
+%%DATADIR%%/dat/des/branches/vaults_rooms_empty.des
+%%DATADIR%%/dat/des/branches/vaults_rooms_hard.des
+%%DATADIR%%/dat/des/branches/vaults_rooms_standard.des
%%DATADIR%%/dat/des/branches/zot.des
%%DATADIR%%/dat/des/builder/arena.des
+%%DATADIR%%/dat/des/builder/decor.des
%%DATADIR%%/dat/des/builder/dummy.des
%%DATADIR%%/dat/des/builder/food.des
%%DATADIR%%/dat/des/builder/layout.des
+%%DATADIR%%/dat/des/builder/layout_caves.des
+%%DATADIR%%/dat/des/builder/layout_cellular.des
+%%DATADIR%%/dat/des/builder/layout_city.des
+%%DATADIR%%/dat/des/builder/layout_forest.des
+%%DATADIR%%/dat/des/builder/layout_grids.des
+%%DATADIR%%/dat/des/builder/layout_halls.des
%%DATADIR%%/dat/des/builder/layout_loops.des
+%%DATADIR%%/dat/des/builder/layout_pools.des
+%%DATADIR%%/dat/des/builder/layout_vaults.des
%%DATADIR%%/dat/des/builder/rooms.des
%%DATADIR%%/dat/des/builder/shops.des
%%DATADIR%%/dat/des/builder/uniques.des
@@ -100,35 +118,40 @@
%%DATADIR%%/dat/des/serial/magic_research.des
%%DATADIR%%/dat/des/serial/ponds.des
%%DATADIR%%/dat/des/serial/serial_guide.txt
+%%DATADIR%%/dat/des/serial/sigils.des
+%%DATADIR%%/dat/des/serial/teleporters.des
%%DATADIR%%/dat/des/serial/undead.des
%%DATADIR%%/dat/des/serial/window.des
+%%DATADIR%%/dat/des/sprint/arena_sprint.des
+%%DATADIR%%/dat/des/sprint/fedhas.des
+%%DATADIR%%/dat/des/sprint/linesprint.des
+%%DATADIR%%/dat/des/sprint/meat.des
%%DATADIR%%/dat/des/sprint/menkaure.des
+%%DATADIR%%/dat/des/sprint/pitsprint.des
%%DATADIR%%/dat/des/sprint/red_sonja.des
-%%DATADIR%%/dat/des/sprint/sprint_fedhas.des
%%DATADIR%%/dat/des/sprint/sprint_mu.des
%%DATADIR%%/dat/des/sprint/zigsprint.des
%%DATADIR%%/dat/des/test.des
%%DATADIR%%/dat/des/traps/beogh_trap.des
%%DATADIR%%/dat/des/traps/boulders.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/tutorial/lesson1.des
+%%DATADIR%%/dat/des/tutorial/lesson2.des
+%%DATADIR%%/dat/des/tutorial/lesson3.des
+%%DATADIR%%/dat/des/tutorial/lesson4.des
+%%DATADIR%%/dat/des/tutorial/lesson5.des
+%%DATADIR%%/dat/des/variable/ambush.des
%%DATADIR%%/dat/des/variable/ancient_champions.des
%%DATADIR%%/dat/des/variable/cathedral_bats.des
+%%DATADIR%%/dat/des/variable/compat.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/grunt_fire_pits.des
+%%DATADIR%%/dat/des/variable/geyser.des
+%%DATADIR%%/dat/des/variable/grated_community.des
%%DATADIR%%/dat/des/variable/large_abstract.des
%%DATADIR%%/dat/des/variable/large_themed.des
%%DATADIR%%/dat/des/variable/lemuel_castle.des
@@ -147,29 +170,55 @@
%%DATADIR%%/dat/descript/cs/commands.txt
%%DATADIR%%/dat/descript/cs/features.txt
%%DATADIR%%/dat/descript/cs/gods.txt
+%%DATADIR%%/dat/descript/cs/hints.txt
%%DATADIR%%/dat/descript/cs/items.txt
+%%DATADIR%%/dat/descript/cs/monsters.txt
+%%DATADIR%%/dat/descript/cs/quotes.txt
%%DATADIR%%/dat/descript/cs/species.txt
%%DATADIR%%/dat/descript/cs/spells.txt
+%%DATADIR%%/dat/descript/cs/tutorial.txt
%%DATADIR%%/dat/descript/cs/unident.txt
+%%DATADIR%%/dat/descript/cs/unrand.txt
+%%DATADIR%%/dat/descript/da/ability.txt
+%%DATADIR%%/dat/descript/da/backgrounds.txt
+%%DATADIR%%/dat/descript/da/branches.txt
+%%DATADIR%%/dat/descript/da/cards.txt
+%%DATADIR%%/dat/descript/da/commands.txt
+%%DATADIR%%/dat/descript/da/hints.txt
%%DATADIR%%/dat/descript/da/items.txt
%%DATADIR%%/dat/descript/da/monsters.txt
+%%DATADIR%%/dat/descript/da/quotes.txt
+%%DATADIR%%/dat/descript/da/skills.txt
%%DATADIR%%/dat/descript/da/species.txt
%%DATADIR%%/dat/descript/da/unident.txt
+%%DATADIR%%/dat/descript/da/unrand.txt
+%%DATADIR%%/dat/descript/de/ability.txt
%%DATADIR%%/dat/descript/de/backgrounds.txt
+%%DATADIR%%/dat/descript/de/branches.txt
+%%DATADIR%%/dat/descript/de/cards.txt
%%DATADIR%%/dat/descript/de/commands.txt
%%DATADIR%%/dat/descript/de/features.txt
%%DATADIR%%/dat/descript/de/gods.txt
+%%DATADIR%%/dat/descript/de/hints.txt
%%DATADIR%%/dat/descript/de/items.txt
%%DATADIR%%/dat/descript/de/monsters.txt
+%%DATADIR%%/dat/descript/de/quotes.txt
+%%DATADIR%%/dat/descript/de/skills.txt
%%DATADIR%%/dat/descript/de/species.txt
+%%DATADIR%%/dat/descript/de/spells.txt
+%%DATADIR%%/dat/descript/de/tutorial.txt
%%DATADIR%%/dat/descript/de/unident.txt
%%DATADIR%%/dat/descript/de/unrand.txt
%%DATADIR%%/dat/descript/el/ability.txt
%%DATADIR%%/dat/descript/el/backgrounds.txt
+%%DATADIR%%/dat/descript/el/branches.txt
%%DATADIR%%/dat/descript/el/gods.txt
%%DATADIR%%/dat/descript/el/items.txt
+%%DATADIR%%/dat/descript/el/monsters.txt
%%DATADIR%%/dat/descript/el/species.txt
+%%DATADIR%%/dat/descript/el/tutorial.txt
%%DATADIR%%/dat/descript/el/unident.txt
+%%DATADIR%%/dat/descript/el/unrand.txt
%%DATADIR%%/dat/descript/es/ability.txt
%%DATADIR%%/dat/descript/es/backgrounds.txt
%%DATADIR%%/dat/descript/es/branches.txt
@@ -182,6 +231,7 @@
%%DATADIR%%/dat/descript/es/quotes.txt
%%DATADIR%%/dat/descript/es/skills.txt
%%DATADIR%%/dat/descript/es/species.txt
+%%DATADIR%%/dat/descript/es/tutorial.txt
%%DATADIR%%/dat/descript/es/unident.txt
%%DATADIR%%/dat/descript/es/unrand.txt
%%DATADIR%%/dat/descript/features.txt
@@ -192,7 +242,6 @@
%%DATADIR%%/dat/descript/fi/features.txt
%%DATADIR%%/dat/descript/fi/items.txt
%%DATADIR%%/dat/descript/fi/monsters.txt
-%%DATADIR%%/dat/descript/fi/quotes.txt
%%DATADIR%%/dat/descript/fi/species.txt
%%DATADIR%%/dat/descript/fi/spells.txt
%%DATADIR%%/dat/descript/fi/unident.txt
@@ -204,22 +253,51 @@
%%DATADIR%%/dat/descript/fr/commands.txt
%%DATADIR%%/dat/descript/fr/features.txt
%%DATADIR%%/dat/descript/fr/gods.txt
+%%DATADIR%%/dat/descript/fr/hints.txt
%%DATADIR%%/dat/descript/fr/items.txt
%%DATADIR%%/dat/descript/fr/monsters.txt
%%DATADIR%%/dat/descript/fr/quotes.txt
%%DATADIR%%/dat/descript/fr/skills.txt
%%DATADIR%%/dat/descript/fr/species.txt
%%DATADIR%%/dat/descript/fr/spells.txt
+%%DATADIR%%/dat/descript/fr/tutorial.txt
%%DATADIR%%/dat/descript/fr/unident.txt
%%DATADIR%%/dat/descript/fr/unrand.txt
%%DATADIR%%/dat/descript/gods.txt
%%DATADIR%%/dat/descript/hints.txt
+%%DATADIR%%/dat/descript/hu/backgrounds.txt
%%DATADIR%%/dat/descript/hu/species.txt
+%%DATADIR%%/dat/descript/it/ability.txt
%%DATADIR%%/dat/descript/it/backgrounds.txt
+%%DATADIR%%/dat/descript/it/branches.txt
+%%DATADIR%%/dat/descript/it/cards.txt
+%%DATADIR%%/dat/descript/it/commands.txt
+%%DATADIR%%/dat/descript/it/features.txt
%%DATADIR%%/dat/descript/it/gods.txt
+%%DATADIR%%/dat/descript/it/hints.txt
+%%DATADIR%%/dat/descript/it/items.txt
+%%DATADIR%%/dat/descript/it/monsters.txt
+%%DATADIR%%/dat/descript/it/quotes.txt
%%DATADIR%%/dat/descript/it/skills.txt
%%DATADIR%%/dat/descript/it/species.txt
+%%DATADIR%%/dat/descript/it/spells.txt
+%%DATADIR%%/dat/descript/it/tutorial.txt
+%%DATADIR%%/dat/descript/it/unident.txt
+%%DATADIR%%/dat/descript/it/unrand.txt
%%DATADIR%%/dat/descript/items.txt
+%%DATADIR%%/dat/descript/ja/ability.txt
+%%DATADIR%%/dat/descript/ja/backgrounds.txt
+%%DATADIR%%/dat/descript/ja/branches.txt
+%%DATADIR%%/dat/descript/ja/commands.txt
+%%DATADIR%%/dat/descript/ja/gods.txt
+%%DATADIR%%/dat/descript/ja/items.txt
+%%DATADIR%%/dat/descript/ja/monsters.txt
+%%DATADIR%%/dat/descript/ja/skills.txt
+%%DATADIR%%/dat/descript/ja/species.txt
+%%DATADIR%%/dat/descript/ja/spells.txt
+%%DATADIR%%/dat/descript/ja/tutorial.txt
+%%DATADIR%%/dat/descript/ja/unident.txt
+%%DATADIR%%/dat/descript/ja/unrand.txt
%%DATADIR%%/dat/descript/ko/ability.txt
%%DATADIR%%/dat/descript/ko/backgrounds.txt
%%DATADIR%%/dat/descript/ko/branches.txt
@@ -227,12 +305,14 @@
%%DATADIR%%/dat/descript/ko/commands.txt
%%DATADIR%%/dat/descript/ko/features.txt
%%DATADIR%%/dat/descript/ko/gods.txt
+%%DATADIR%%/dat/descript/ko/hints.txt
%%DATADIR%%/dat/descript/ko/items.txt
%%DATADIR%%/dat/descript/ko/monsters.txt
%%DATADIR%%/dat/descript/ko/quotes.txt
%%DATADIR%%/dat/descript/ko/skills.txt
%%DATADIR%%/dat/descript/ko/species.txt
%%DATADIR%%/dat/descript/ko/spells.txt
+%%DATADIR%%/dat/descript/ko/tutorial.txt
%%DATADIR%%/dat/descript/ko/unident.txt
%%DATADIR%%/dat/descript/ko/unrand.txt
%%DATADIR%%/dat/descript/lt/backgrounds.txt
@@ -242,24 +322,36 @@
%%DATADIR%%/dat/descript/lt/skills.txt
%%DATADIR%%/dat/descript/lt/species.txt
%%DATADIR%%/dat/descript/lt/unident.txt
+%%DATADIR%%/dat/descript/lv/ability.txt
%%DATADIR%%/dat/descript/lv/backgrounds.txt
%%DATADIR%%/dat/descript/lv/cards.txt
%%DATADIR%%/dat/descript/lv/commands.txt
+%%DATADIR%%/dat/descript/lv/features.txt
%%DATADIR%%/dat/descript/lv/gods.txt
+%%DATADIR%%/dat/descript/lv/hints.txt
%%DATADIR%%/dat/descript/lv/items.txt
%%DATADIR%%/dat/descript/lv/monsters.txt
%%DATADIR%%/dat/descript/lv/skills.txt
%%DATADIR%%/dat/descript/lv/spells.txt
+%%DATADIR%%/dat/descript/lv/tutorial.txt
%%DATADIR%%/dat/descript/lv/unrand.txt
%%DATADIR%%/dat/descript/monsters.txt
+%%DATADIR%%/dat/descript/nl/ability.txt
+%%DATADIR%%/dat/descript/nl/tutorial.txt
+%%DATADIR%%/dat/descript/nl/unident.txt
+%%DATADIR%%/dat/descript/pl/ability.txt
%%DATADIR%%/dat/descript/pl/backgrounds.txt
+%%DATADIR%%/dat/descript/pl/cards.txt
+%%DATADIR%%/dat/descript/pl/gods.txt
%%DATADIR%%/dat/descript/pl/items.txt
%%DATADIR%%/dat/descript/pl/quotes.txt
+%%DATADIR%%/dat/descript/pl/skills.txt
%%DATADIR%%/dat/descript/pl/species.txt
%%DATADIR%%/dat/descript/pl/spells.txt
%%DATADIR%%/dat/descript/pl/tutorial.txt
%%DATADIR%%/dat/descript/pl/unident.txt
%%DATADIR%%/dat/descript/pl/unrand.txt
+%%DATADIR%%/dat/descript/pt/ability.txt
%%DATADIR%%/dat/descript/pt/commands.txt
%%DATADIR%%/dat/descript/pt/gods.txt
%%DATADIR%%/dat/descript/pt/items.txt
@@ -272,16 +364,27 @@
%%DATADIR%%/dat/descript/ru/commands.txt
%%DATADIR%%/dat/descript/ru/features.txt
%%DATADIR%%/dat/descript/ru/gods.txt
+%%DATADIR%%/dat/descript/ru/hints.txt
%%DATADIR%%/dat/descript/ru/items.txt
%%DATADIR%%/dat/descript/ru/monsters.txt
%%DATADIR%%/dat/descript/ru/quotes.txt
%%DATADIR%%/dat/descript/ru/skills.txt
%%DATADIR%%/dat/descript/ru/species.txt
+%%DATADIR%%/dat/descript/ru/spells.txt
+%%DATADIR%%/dat/descript/ru/tutorial.txt
%%DATADIR%%/dat/descript/ru/unident.txt
%%DATADIR%%/dat/descript/ru/unrand.txt
%%DATADIR%%/dat/descript/skills.txt
%%DATADIR%%/dat/descript/species.txt
%%DATADIR%%/dat/descript/spells.txt
+%%DATADIR%%/dat/descript/tr/ability.txt
+%%DATADIR%%/dat/descript/tr/cards.txt
+%%DATADIR%%/dat/descript/tr/commands.txt
+%%DATADIR%%/dat/descript/tr/gods.txt
+%%DATADIR%%/dat/descript/tr/items.txt
+%%DATADIR%%/dat/descript/tr/tutorial.txt
+%%DATADIR%%/dat/descript/tr/unident.txt
+%%DATADIR%%/dat/descript/tr/unrand.txt
%%DATADIR%%/dat/descript/tutorial.txt
%%DATADIR%%/dat/descript/unident.txt
%%DATADIR%%/dat/descript/unrand.txt
@@ -292,19 +395,44 @@
%%DATADIR%%/dat/descript/zh/commands.txt
%%DATADIR%%/dat/descript/zh/features.txt
%%DATADIR%%/dat/descript/zh/gods.txt
+%%DATADIR%%/dat/descript/zh/hints.txt
%%DATADIR%%/dat/descript/zh/items.txt
%%DATADIR%%/dat/descript/zh/monsters.txt
%%DATADIR%%/dat/descript/zh/skills.txt
%%DATADIR%%/dat/descript/zh/species.txt
+%%DATADIR%%/dat/descript/zh/spells.txt
+%%DATADIR%%/dat/descript/zh/tutorial.txt
%%DATADIR%%/dat/descript/zh/unident.txt
+%%DATADIR%%/dat/descript/zh/unrand.txt
%%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/layout/hyper.lua
+%%DATADIR%%/dat/dlua/layout/hyper_caves.lua
+%%DATADIR%%/dat/dlua/layout/hyper_city.lua
+%%DATADIR%%/dat/dlua/layout/hyper_debug.lua
+%%DATADIR%%/dat/dlua/layout/hyper_decor.lua
+%%DATADIR%%/dat/dlua/layout/hyper_fort.lua
+%%DATADIR%%/dat/dlua/layout/hyper_paint.lua
+%%DATADIR%%/dat/dlua/layout/hyper_place.lua
+%%DATADIR%%/dat/dlua/layout/hyper_rooms.lua
+%%DATADIR%%/dat/dlua/layout/hyper_shapes.lua
+%%DATADIR%%/dat/dlua/layout/hyper_strategy.lua
+%%DATADIR%%/dat/dlua/layout/hyper_usage.lua
+%%DATADIR%%/dat/dlua/layout/layout.lua
+%%DATADIR%%/dat/dlua/layout/omnigrid.lua
+%%DATADIR%%/dat/dlua/layout/procedural.lua
+%%DATADIR%%/dat/dlua/layout/procedural_complex.lua
+%%DATADIR%%/dat/dlua/layout/procedural_primitives.lua
+%%DATADIR%%/dat/dlua/layout/procedural_transform.lua
+%%DATADIR%%/dat/dlua/layout/rooms_primitive.lua
+%%DATADIR%%/dat/dlua/layout/theme.lua
+%%DATADIR%%/dat/dlua/layout/vector.lua
+%%DATADIR%%/dat/dlua/layout/zonify.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
@@ -322,6 +450,7 @@
%%DATADIR%%/dat/dlua/macro.lua
%%DATADIR%%/dat/dlua/mapinit.lua
%%DATADIR%%/dat/dlua/point.lua
+%%DATADIR%%/dat/dlua/profiler.lua
%%DATADIR%%/dat/dlua/sanity.lua
%%DATADIR%%/dat/dlua/sprint.lua
%%DATADIR%%/dat/dlua/stress.lua
@@ -330,20 +459,43 @@
%%DATADIR%%/dat/dlua/tutorial.lua
%%DATADIR%%/dat/dlua/userbase.lua
%%DATADIR%%/dat/dlua/util.lua
+%%DATADIR%%/dat/dlua/v_debug.lua
+%%DATADIR%%/dat/dlua/v_layouts.lua
+%%DATADIR%%/dat/dlua/v_paint.lua
+%%DATADIR%%/dat/dlua/v_rooms.lua
+%%DATADIR%%/dat/dlua/v_shapes.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/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_pooryurik_knight.png
+%%SDL%%%%DATADIR%%/dat/tiles/title_psiweapon_kiku.png
+%%SDL%%%%DATADIR%%/dat/tiles/title_shadyamish_octm.png
+%%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_entering_the_dungeon.png
+%%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_grabbing_the_orb.png
+%%SDL%%%%DATADIR%%/dat/tiles/wall.png
%%DATADIR%%/docs/CREDITS.txt
%%DATADIR%%/docs/aptitudes.txt
%%DATADIR%%/docs/arena.txt
%%DATADIR%%/docs/changelog.txt
%%DATADIR%%/docs/crawl_manual.txt
%%DATADIR%%/docs/develop/IRC.txt
+%%DATADIR%%/docs/develop/android.txt
%%DATADIR%%/docs/develop/coding_conventions.txt
%%DATADIR%%/docs/develop/gdb_tips.txt
%%DATADIR%%/docs/develop/levels/advanced.txt
@@ -359,19 +511,22 @@
%%DATADIR%%/docs/develop/spells.txt
%%DATADIR%%/docs/develop/testing.txt
%%DATADIR%%/docs/develop/tiles_creation.txt
+%%DATADIR%%/docs/develop/translation.txt
%%DATADIR%%/docs/fight_simulator.txt
%%DATADIR%%/docs/key_changes.txt
%%DATADIR%%/docs/keybind.txt
+%%DATADIR%%/docs/license/cc0.txt
%%DATADIR%%/docs/license/lgpl.txt
%%DATADIR%%/docs/license/libpng-LICENSE.txt
%%DATADIR%%/docs/license/lualicense.txt
%%DATADIR%%/docs/license/pcre_license.txt
+%%DATADIR%%/docs/license/worley.txt
%%DATADIR%%/docs/macros_guide.txt
%%DATADIR%%/docs/options_guide.txt
%%DATADIR%%/docs/quickstart.txt
%%DATADIR%%/docs/ssh_guide.txt
%%DATADIR%%/docs/tiles_help.txt
-%%DATADIR%%/docs/translation.txt
+%%DATADIR%%/settings/0.12_monster_glyphs.txt
%%DATADIR%%/settings/0.9_monster_glyphs.txt
%%DATADIR%%/settings/034_command_keys.txt
%%DATADIR%%/settings/034_monster_glyphs.txt
@@ -380,84 +535,55 @@
%%DATADIR%%/settings/071_monster_glyphs.txt
%%DATADIR%%/settings/080_monster_glyphs.txt
%%DATADIR%%/settings/advanced_optioneering.txt
-%%DATADIR%%/settings/autopickup_exceptions.txt
%%DATADIR%%/settings/dvorak_command_keys.txt
-%%DATADIR%%/settings/food_colouring.txt
%%DATADIR%%/settings/init.txt
-%%DATADIR%%/settings/menu_colours.txt
-%%DATADIR%%/settings/messages.txt
%%DATADIR%%/settings/no_vi_command_keys.txt
-%%DATADIR%%/settings/runrest_messages.txt
-%%DATADIR%%/settings/standard_colours.txt
-%%DATADIR%%/settings/tiles_options.txt
-%%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_pooryurik_knight.png
-%%SDL%%%%DATADIR%%/dat/tiles/title_shadyamish_octm.png
-%%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_entering_the_dungeon.png
-%%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_grabbing_the_orb.png
-%%SDL%%%%DATADIR%%/dat/tiles/wall.png
-%%SDL%%@dirrm %%DATADIR%%/dat/tiles
- at dirrm %%DATADIR%%/settings
- at dirrm %%DATADIR%%/docs/license
- at dirrm %%DATADIR%%/docs/develop/levels
- at dirrm %%DATADIR%%/docs/develop
- at dirrm %%DATADIR%%/docs
- at dirrm %%DATADIR%%/dat/lua
- at dirrm %%DATADIR%%/dat/dlua
- at dirrm %%DATADIR%%/dat/descript/zh
- at dirrm %%DATADIR%%/dat/descript/ru
- at dirrm %%DATADIR%%/dat/descript/pt
- at dirrm %%DATADIR%%/dat/descript/pl
- at dirrm %%DATADIR%%/dat/descript/lv
- at dirrm %%DATADIR%%/dat/descript/lt
- at dirrm %%DATADIR%%/dat/descript/ko
- at dirrm %%DATADIR%%/dat/descript/it
- at dirrm %%DATADIR%%/dat/descript/hu
- at dirrm %%DATADIR%%/dat/descript/fr
- at dirrm %%DATADIR%%/dat/descript/fi
- at dirrm %%DATADIR%%/dat/descript/es
- at dirrm %%DATADIR%%/dat/descript/el
- at dirrm %%DATADIR%%/dat/descript/de
- at dirrm %%DATADIR%%/dat/descript/da
- at dirrm %%DATADIR%%/dat/descript/cs
- at dirrm %%DATADIR%%/dat/descript
- at dirrm %%DATADIR%%/dat/des/zotdef
- at dirrm %%DATADIR%%/dat/des/variable
- at dirrm %%DATADIR%%/dat/des/tutorial
- at dirrm %%DATADIR%%/dat/des/traps
- at dirrm %%DATADIR%%/dat/des/sprint
- at dirrm %%DATADIR%%/dat/des/serial
- at dirrm %%DATADIR%%/dat/des/portals
- at dirrm %%DATADIR%%/dat/des/entry
- at dirrm %%DATADIR%%/dat/des/builder
- at dirrm %%DATADIR%%/dat/des/branches
- at dirrm %%DATADIR%%/dat/des/altar
- at dirrm %%DATADIR%%/dat/des
- at dirrm %%DATADIR%%/dat/defaults
- at dirrm %%DATADIR%%/dat/database/pl
- at dirrm %%DATADIR%%/dat/database/el
- at dirrm %%DATADIR%%/dat/database
- at dirrm %%DATADIR%%/dat/clua
- at dirrm %%DATADIR%%/dat
- at dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.crawlrc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+ at dirrmtry %%DATADIR%%/settings
+ at dirrmtry %%DATADIR%%/docs/license
+ at dirrmtry %%DATADIR%%/docs/develop/levels
+ at dirrmtry %%DATADIR%%/docs/develop
+ at dirrmtry %%DATADIR%%/docs
+%%SDL%%@dirrmtry %%DATADIR%%/dat/tiles
+ at dirrmtry %%DATADIR%%/dat/dlua/layout
+ at dirrmtry %%DATADIR%%/dat/dlua
+ at dirrmtry %%DATADIR%%/dat/descript/zh
+ at dirrmtry %%DATADIR%%/dat/descript/tr
+ at dirrmtry %%DATADIR%%/dat/descript/ru
+ at dirrmtry %%DATADIR%%/dat/descript/pt
+ at dirrmtry %%DATADIR%%/dat/descript/pl
+ at dirrmtry %%DATADIR%%/dat/descript/nl
+ at dirrmtry %%DATADIR%%/dat/descript/lv
+ at dirrmtry %%DATADIR%%/dat/descript/lt
+ at dirrmtry %%DATADIR%%/dat/descript/ko
+ at dirrmtry %%DATADIR%%/dat/descript/ja
+ at dirrmtry %%DATADIR%%/dat/descript/it
+ at dirrmtry %%DATADIR%%/dat/descript/hu
+ at dirrmtry %%DATADIR%%/dat/descript/fr
+ at dirrmtry %%DATADIR%%/dat/descript/fi
+ at dirrmtry %%DATADIR%%/dat/descript/es
+ at dirrmtry %%DATADIR%%/dat/descript/el
+ at dirrmtry %%DATADIR%%/dat/descript/de
+ at dirrmtry %%DATADIR%%/dat/descript/da
+ at dirrmtry %%DATADIR%%/dat/descript/cs
+ at dirrmtry %%DATADIR%%/dat/descript
+ at dirrmtry %%DATADIR%%/dat/des/zotdef
+ at dirrmtry %%DATADIR%%/dat/des/variable
+ at dirrmtry %%DATADIR%%/dat/des/tutorial
+ at dirrmtry %%DATADIR%%/dat/des/traps
+ at dirrmtry %%DATADIR%%/dat/des/sprint
+ at dirrmtry %%DATADIR%%/dat/des/serial
+ at dirrmtry %%DATADIR%%/dat/des/portals
+ at dirrmtry %%DATADIR%%/dat/des/entry
+ at dirrmtry %%DATADIR%%/dat/des/builder
+ at dirrmtry %%DATADIR%%/dat/des/branches
+ at dirrmtry %%DATADIR%%/dat/des/altar
+ at dirrmtry %%DATADIR%%/dat/des
+ at dirrmtry %%DATADIR%%/dat/defaults
+ at dirrmtry %%DATADIR%%/dat/database/pl
+ at dirrmtry %%DATADIR%%/dat/database/el
+ at dirrmtry %%DATADIR%%/dat/database
+ at dirrmtry %%DATADIR%%/dat/clua
+ at dirrmtry %%DATADIR%%/dat
+ at dirrmtry %%DATADIR%%
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
--XsQoSWH+UP9D9v3l
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="games__stonesoup-sdl__0.11.1-0.13.0__stage.diff"
diff -urN games/stonesoup-sdl.orig/Makefile games/stonesoup-sdl/Makefile
--- games/stonesoup-sdl.orig/Makefile 2013-10-11 22:41:50.661891660 +0200
+++ games/stonesoup-sdl/Makefile 2013-10-11 22:42:38.672889098 +0200
@@ -5,5 +5,4 @@
MASTERDIR= ${.CURDIR}/../stonesoup
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
--XsQoSWH+UP9D9v3l--
More information about the freebsd-ports-bugs
mailing list