Attachment #142384 for bug #189400

View | Details | Raw Unified | Return to bug 189400
Collapse All | Expand All




# $FreeBSD: head/games/stonesoup/Makefile 351411 2014-04-16 18:28:47Z zeising $

PORTNAME=	stonesoup
PORTVERSION=	0.14.1
PORTREVISION=	1
CATEGORIES=	games
MASTER_SITES=	SF/crawl-ref/Stone%20Soup/${PORTVERSION}
DISTNAME=	stone_soup-${PORTVERSION}-nodeps


USE_SQLITE=	yes
USE_XZ=		yes
USES=		bison gmake perl5 pkgconfig compiler
USE_LUA=	5.1
USE_PERL5=	build



.include <bsd.port.pre.mk>

.if ${COMPILER_TYPE} == clang
CFLAGS+=	-std=c++0x
.endif


Lines 1-2 Link Here

(-)games/stonesoup/distinfo (-2 / +2 lines)
1	SHA256 (stone_soup-0.13.1-nodeps.tar.xz) = 9e32ca7e48bc3e12ce6bc8d963b01a0bce3f5826c6ca1d60947867f5602921e8	1	SHA256 (stone_soup-0.14.1-nodeps.tar.xz) = 91726d0224b93ba26b5d4bd3762bc5aabe1f02974ea6c937be89dc6c6ab7a4dd
2	SIZE (stone_soup-0.13.1-nodeps.tar.xz) = 9456356	2	SIZE (stone_soup-0.14.1-nodeps.tar.xz) = 8903416

Lines 1-5 Link Here

(-)games/stonesoup/files/patch-AppHdr.h (-2 / +2 lines)
1	--- ./AppHdr.h.orig 2013-09-30 20:32:00.000000000 +0200	1	--- ./AppHdr.h.orig 2014-04-09 17:36:32.000000000 +0200
2	+++ ./AppHdr.h 2013-10-11 22:07:08.165888633 +0200	2	+++ ./AppHdr.h 2014-05-06 21:21:37.796136568 +0200
3	@@ -146,7 +146,7 @@	3	@@ -146,7 +146,7 @@
4	//	4	//
5	// WARNING: Filenames passed to this command are not validated in any way.	5	// WARNING: Filenames passed to this command are not validated in any way.

Lines 1-5 Link Here

(-)games/stonesoup/files/patch-Makefile (-8 / +17 lines)
1	--- ./Makefile.orig 2013-09-30 20:32:00.000000000 +0200	1	--- ./Makefile.orig 2014-04-28 16:57:38.000000000 +0200
2	+++ ./Makefile 2013-10-11 22:07:08.167887693 +0200	2	+++ ./Makefile 2014-05-06 21:21:37.798136726 +0200
3	@@ -69,7 +69,7 @@	3	@@ -69,7 +69,7 @@
4	# ask for a package with convenience libraries instead -- we'll try to provide	4	# ask for a package with convenience libraries instead -- we'll try to provide
5	# them somewhere in the near future.	5	# them somewhere in the near future.
Lines 62-70 Link Here
62	- LUA_PACKAGE = lua5.1	62	- LUA_PACKAGE = lua5.1
63	+ LUA_PACKAGE = lua-5.1	63	+ LUA_PACKAGE = lua-5.1
64	endif	64	endif
65	INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I)	65	INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I \| sed -e 's/-I/-isystem /')
66	CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)	66	CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
67	@@ -754,7 +752,7 @@	67	@@ -611,7 +609,7 @@
		68
		69	ifndef BUILD_SQLITE
		70	ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
		71	- # INCLUDES_L += -isystem $(SQLITE_INCLUDE_DIR)
		72	+ INCLUDES_L += -isystem $(SQLITE_INCLUDE_DIR)
		73	LIBS += $(SQLITE_LIB)
		74	ifneq ($(shell grep -q sqlite3_prepare_v2 $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
		75	DEFINES_L += -DANCIENT_SQLITE
		76	@@ -756,7 +754,7 @@
68	DEFINES += -DWIZARD	77	DEFINES += -DWIZARD
69	endif	78	endif
70	ifdef NO_OPTIMIZE	79	ifdef NO_OPTIMIZE
Lines 73-79 Link Here
73	endif	82	endif
74		83
75	ifdef PCH	84	ifdef PCH
76	@@ -878,7 +876,7 @@	85	@@ -880,7 +878,7 @@
77	INSTALL_FONTS += $(PROPORTIONAL_FONT)	86	INSTALL_FONTS += $(PROPORTIONAL_FONT)
78	endif	87	endif
79	else	88	else
Lines 82-88 Link Here
82	ifeq (,$(SYS_PROPORTIONAL_FONT))	91	ifeq (,$(SYS_PROPORTIONAL_FONT))
83	SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)\|head -n 1)	92	SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)\|head -n 1)
84	endif	93	endif
85	@@ -901,7 +899,7 @@	94	@@ -903,7 +901,7 @@
86	INSTALL_FONTS += $(MONOSPACED_FONT)	95	INSTALL_FONTS += $(MONOSPACED_FONT)
87	endif	96	endif
88	else	97	else
Lines 91-99 Link Here
91	ifeq (,$(SYS_MONOSPACED_FONT))	100	ifeq (,$(SYS_MONOSPACED_FONT))
92	SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)\|head -n 1)	101	SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)\|head -n 1)
93	endif	102	endif
94	@@ -1091,7 +1089,7 @@	103	@@ -1099,7 +1097,7 @@
95	cmd-name.h
96		104
		105	LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
97	SRC_PKG_BASE := stone_soup	106	SRC_PKG_BASE := stone_soup
98	-SRC_VERSION := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null \|\| cat util/release_ver)	107	-SRC_VERSION := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null \|\| cat util/release_ver)
99	+SRC_VERSION := $(shell cat util/release_ver)	108	+SRC_VERSION := $(shell cat util/release_ver)

Lines 1-5 Link Here

(-)games/stonesoup/files/patch-dat__des__branches__dis.des (-2 / +2 lines)
1	--- ./dat/des/branches/dis.des.orig 2013-10-11 22:08:34.949889217 +0200	1	--- ./dat/des/branches/dis.des.orig 2014-04-09 17:36:32.000000000 +0200
2	+++ ./dat/des/branches/dis.des 2013-10-11 22:13:33.637913849 +0200	2	+++ ./dat/des/branches/dis.des 2014-05-06 21:21:37.801135609 +0200
3	@@ -209,8 +209,7 @@	3	@@ -209,8 +209,7 @@
4	KMONS: F = executioner	4	KMONS: F = executioner
5	KMONS: ! = iron devil / skeletal warrior / hell knight / place:Zot:1 skeleton w:15	5	KMONS: ! = iron devil / skeletal warrior / hell knight / place:Zot:1 skeleton w:15




--- ./dat/des/builder/shops.des.orig	2014-04-24 22:39:22.000000000 +0200
+++ ./dat/des/builder/shops.des	2014-05-06 21:23:13.323133248 +0200
@@ -390,15 +390,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"})

-:   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 | \
-:   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 | \
-:   bastard 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 | 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 | bastard 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




--- ./dat/des/variable/grated_community.des.orig	2014-04-09 17:36:32.000000000 +0200
+++ ./dat/des/variable/grated_community.des	2014-05-06 21:21:37.804135690 +0200
@@ -67,11 +67,7 @@
             q:5 sausage
 KFEAT:  C = distillery shop type:Miraculous suffix:Elixirs count:10 \
             greed:50 ; potion of confusion
 : local smithy = string.gsub(crawl.make_name(), " ", "_")
-: kfeat("D = armour shop name:The_Legendary_" .. smithy .. " \
-:        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_" .. smithy .. " 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
@@ -168,16 +164,11 @@
 KITEM:  % = animal skin / nothing
 MARKER: + = lua:restrict_door()
 KFEAT:  ~ = closed_door
 SUBST: * = *:35 -:1
 KITEM: - = animal skin
-: dgn.delayed_decay_extra(_G, '*', 'human skeleton / yak skeleton /\
-:                            elf skeleton / kobold skeleton /\
-:                            elephant skeleton / sheep skeleton /\
-:                            manticore skeleton', 'animal skin')
+: dgn.delayed_decay_extra(_G, '*', 'human skeleton / yak skeleton / elf skeleton / kobold skeleton / elephant skeleton / sheep skeleton / manticore skeleton', '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

 : local frosty = crawl.random2(6)
 : if frosty == 5 then
 SUBST:  1 = 2
@@ -220,10 +211,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: & = 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  \
@@ -235,8 +224,7 @@
            nothing
 KFEAT: 8 = granite_statue / fountain_sparkling / fountain_blue / w:1 floor
 KITEM: ? = scroll of recharging / nothing, any scroll / nothing

 KITEM: & = book of wizardry / book of power / book of party tricks /\
        book of alchemy / w:12 nothing
 KMONS: P = plant
@@ -248,8 +236,7 @@
            potion of brilliance / nothing
 KFEAT: 8 = granite_statue / w:1 floor
 KITEM: ? = scroll of immolation / nothing, any scroll / nothing




--- ./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 @@
 {
     vector<player_save_info> chars;
 
+#ifdef WIZARD
     if (Options.no_save)
         return chars;
+#endif
 
 #ifndef DISABLE_SAVEGAME_LISTS
     string searchpath = _get_savefile_directory();
@@ -1792,8 +1794,10 @@
 // returns false if a new game should start instead
 static bool _restore_game(const string& filename)
 {
+#ifdef WIZARD
     if (Options.no_save)
         return false;
+#endif
 
     you.save = new package((_get_savefile_directory() + filename).c_str(), 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
     if (Options.no_save)
         you.save = new package();
     else
+#endif
         you.save = new package(get_savedir_filename(you.your_name).c_str(),
                                true, true);
 }

Lines 1-5 Link Here

(-)games/stonesoup/files/patch-rltiles__Makefile (-2 / +2 lines)
1	--- ./rltiles/Makefile.orig 2013-09-30 20:32:00.000000000 +0200	1	--- ./rltiles/Makefile.orig 2014-03-27 19:55:47.000000000 +0100
2	+++ ./rltiles/Makefile 2013-10-11 22:07:08.176890218 +0200	2	+++ ./rltiles/Makefile 2014-05-06 21:21:37.806135849 +0200
3	@@ -1,7 +1,7 @@	3	@@ -1,7 +1,7 @@
4	uname_S := $(shell uname -s)	4	uname_S := $(shell uname -s)
5		5

Lines 1-6 Link Here

(-)games/stonesoup/files/patch-rltiles__tool__tile.cc (-3 / +3 lines)
1	--- ./rltiles/tool/tile.cc.orig 2013-09-30 20:32:00.000000000 +0200	1	--- ./rltiles/tool/tile.cc.orig 2014-04-09 17:36:33.000000000 +0200
2	+++ ./rltiles/tool/tile.cc 2013-10-11 22:07:08.178890955 +0200	2	+++ ./rltiles/tool/tile.cc 2014-05-06 21:21:37.808135615 +0200
3	@@ -125,10 +125,10 @@	3	@@ -123,10 +123,10 @@
4	if (flags[x + y * m_width])	4	if (flags[x + y * m_width])
5	continue;	5	continue;
6		6

Lines 1-5 Link Here

(-)games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc (-2 / +2 lines)
1	--- ./rltiles/tool/tile_list_processor.cc.orig 2013-09-30 20:32:00.000000000 +0200	1	--- ./rltiles/tool/tile_list_processor.cc.orig 2014-04-09 17:36:33.000000000 +0200
2	+++ ./rltiles/tool/tile_list_processor.cc 2013-10-11 22:07:08.181888672 +0200	2	+++ ./rltiles/tool/tile_list_processor.cc 2014-05-06 21:21:37.810135271 +0200
3	@@ -52,7 +52,7 @@	3	@@ -52,7 +52,7 @@
4	""	4	""
5	};	5	};




--- ./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.
+#ifdef WIZARD
     if (Options.no_save)
         you.wizard = true;
+#endif
 
     init_properties();
     burden_change();

Lines 2-7 Link Here

(-)games/stonesoup/pkg-plist (-64 / +82 lines)
2	%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD	2	%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
3	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.crawlrc	3	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.crawlrc
4	%%DATADIR%%/dat/clua/autofight.lua	4	%%DATADIR%%/dat/clua/autofight.lua
		5	%%DATADIR%%/dat/clua/automagic.lua
5	%%DATADIR%%/dat/clua/gearset.lua	6	%%DATADIR%%/dat/clua/gearset.lua
6	%%DATADIR%%/dat/clua/kills.lua	7	%%DATADIR%%/dat/clua/kills.lua
7	%%DATADIR%%/dat/clua/runrest.lua	8	%%DATADIR%%/dat/clua/runrest.lua
Lines 48-60 Link Here
48	%%DATADIR%%/dat/des/altar/vehumet_trees.des	49	%%DATADIR%%/dat/des/altar/vehumet_trees.des
49	%%DATADIR%%/dat/des/altar/xom_monty_hall.des	50	%%DATADIR%%/dat/des/altar/xom_monty_hall.des
50	%%DATADIR%%/dat/des/altar/yredelemnul_ordeal.des	51	%%DATADIR%%/dat/des/altar/yredelemnul_ordeal.des
		52	%%DATADIR%%/dat/des/arrival/arrival_guide.txt
		53	%%DATADIR%%/dat/des/arrival/large.des
		54	%%DATADIR%%/dat/des/arrival/simple.des
		55	%%DATADIR%%/dat/des/arrival/small.des
		56	%%DATADIR%%/dat/des/arrival/twisted.des
51	%%DATADIR%%/dat/des/branches/abyss.des	57	%%DATADIR%%/dat/des/branches/abyss.des
52	%%DATADIR%%/dat/des/branches/blade.des	58	%%DATADIR%%/dat/des/branches/blade.des
53	%%DATADIR%%/dat/des/branches/coc.des	59	%%DATADIR%%/dat/des/branches/coc.des
54	%%DATADIR%%/dat/des/branches/crypt.des	60	%%DATADIR%%/dat/des/branches/crypt.des
		61	%%DATADIR%%/dat/des/branches/depths.des
		62	%%DATADIR%%/dat/des/branches/depths_encompass.des
55	%%DATADIR%%/dat/des/branches/dis.des	63	%%DATADIR%%/dat/des/branches/dis.des
56	%%DATADIR%%/dat/des/branches/elf.des	64	%%DATADIR%%/dat/des/branches/elf.des
57	%%DATADIR%%/dat/des/branches/forest.des
58	%%DATADIR%%/dat/des/branches/geh.des	65	%%DATADIR%%/dat/des/branches/geh.des
59	%%DATADIR%%/dat/des/branches/hell.des	66	%%DATADIR%%/dat/des/branches/hell.des
60	%%DATADIR%%/dat/des/branches/lair.des	67	%%DATADIR%%/dat/des/branches/lair.des
Lines 90-100 Link Here
90	%%DATADIR%%/dat/des/builder/rooms.des	97	%%DATADIR%%/dat/des/builder/rooms.des
91	%%DATADIR%%/dat/des/builder/shops.des	98	%%DATADIR%%/dat/des/builder/shops.des
92	%%DATADIR%%/dat/des/builder/uniques.des	99	%%DATADIR%%/dat/des/builder/uniques.des
93	%%DATADIR%%/dat/des/entry/entry_guide.txt
94	%%DATADIR%%/dat/des/entry/large.des
95	%%DATADIR%%/dat/des/entry/simple.des
96	%%DATADIR%%/dat/des/entry/small.des
97	%%DATADIR%%/dat/des/entry/twisted.des
98	%%DATADIR%%/dat/des/guide.txt	100	%%DATADIR%%/dat/des/guide.txt
99	%%DATADIR%%/dat/des/portals/bailey.des	101	%%DATADIR%%/dat/des/portals/bailey.des
100	%%DATADIR%%/dat/des/portals/bazaar.des	102	%%DATADIR%%/dat/des/portals/bazaar.des
Lines 116-125 Link Here
116	%%DATADIR%%/dat/des/serial/gnoll_camp.des	118	%%DATADIR%%/dat/des/serial/gnoll_camp.des
117	%%DATADIR%%/dat/des/serial/ice.des	119	%%DATADIR%%/dat/des/serial/ice.des
118	%%DATADIR%%/dat/des/serial/magic_research.des	120	%%DATADIR%%/dat/des/serial/magic_research.des
		121	%%DATADIR%%/dat/des/serial/park.des
119	%%DATADIR%%/dat/des/serial/ponds.des	122	%%DATADIR%%/dat/des/serial/ponds.des
120	%%DATADIR%%/dat/des/serial/serial_guide.txt	123	%%DATADIR%%/dat/des/serial/serial_guide.txt
121	%%DATADIR%%/dat/des/serial/sigils.des	124	%%DATADIR%%/dat/des/serial/sigils.des
122	%%DATADIR%%/dat/des/serial/teleporters.des
123	%%DATADIR%%/dat/des/serial/undead.des	125	%%DATADIR%%/dat/des/serial/undead.des
124	%%DATADIR%%/dat/des/serial/window.des	126	%%DATADIR%%/dat/des/serial/window.des
125	%%DATADIR%%/dat/des/sprint/arena_sprint.des	127	%%DATADIR%%/dat/des/sprint/arena_sprint.des
Lines 132-154 Link Here
132	%%DATADIR%%/dat/des/sprint/sprint_mu.des	134	%%DATADIR%%/dat/des/sprint/sprint_mu.des
133	%%DATADIR%%/dat/des/sprint/zigsprint.des	135	%%DATADIR%%/dat/des/sprint/zigsprint.des
134	%%DATADIR%%/dat/des/test.des	136	%%DATADIR%%/dat/des/test.des
		137	%%DATADIR%%/dat/des/test/suite-los.des
		138	%%DATADIR%%/dat/des/test/suite.des
135	%%DATADIR%%/dat/des/traps/beogh_trap.des	139	%%DATADIR%%/dat/des/traps/beogh_trap.des
136	%%DATADIR%%/dat/des/traps/boulders.des	140	%%DATADIR%%/dat/des/traps/boulders.des
137	%%DATADIR%%/dat/des/traps/grate.des	141	%%DATADIR%%/dat/des/traps/grate.des
138	%%DATADIR%%/dat/des/traps/rats_trap.des	142	%%DATADIR%%/dat/des/traps/rats_trap.des
139	%%DATADIR%%/dat/des/traps/spider_basket.des	143	%%DATADIR%%/dat/des/traps/spider_basket.des
140	%%DATADIR%%/dat/des/traps/xom_trap.des	144	%%DATADIR%%/dat/des/tutorial/lesson%%LUA_VER_SH%%.des
141	%%DATADIR%%/dat/des/tutorial/lesson1.des
142	%%DATADIR%%/dat/des/tutorial/lesson2.des	145	%%DATADIR%%/dat/des/tutorial/lesson2.des
143	%%DATADIR%%/dat/des/tutorial/lesson3.des	146	%%DATADIR%%/dat/des/tutorial/lesson3.des
144	%%DATADIR%%/dat/des/tutorial/lesson4.des	147	%%DATADIR%%/dat/des/tutorial/lesson4.des
145	%%DATADIR%%/dat/des/tutorial/lesson5.des	148	%%DATADIR%%/dat/des/tutorial/lesson5.des
146	%%DATADIR%%/dat/des/variable/ambush.des	149	%%DATADIR%%/dat/des/variable/ambush.des
147	%%DATADIR%%/dat/des/variable/ancient_champions.des	150	%%DATADIR%%/dat/des/variable/ancient_champions.des
		151	%%DATADIR%%/dat/des/variable/arcadia.des
148	%%DATADIR%%/dat/des/variable/cathedral_bats.des	152	%%DATADIR%%/dat/des/variable/cathedral_bats.des
149	%%DATADIR%%/dat/des/variable/compat.des	153	%%DATADIR%%/dat/des/variable/compat.des
150	%%DATADIR%%/dat/des/variable/dk_crumbling.des	154	%%DATADIR%%/dat/des/variable/d_encompass.des
151	%%DATADIR%%/dat/des/variable/encompass.des
152	%%DATADIR%%/dat/des/variable/float.des	155	%%DATADIR%%/dat/des/variable/float.des
153	%%DATADIR%%/dat/des/variable/geyser.des	156	%%DATADIR%%/dat/des/variable/geyser.des
154	%%DATADIR%%/dat/des/variable/grated_community.des	157	%%DATADIR%%/dat/des/variable/grated_community.des
Lines 158-164 Link Here
158	%%DATADIR%%/dat/des/variable/mini.des	161	%%DATADIR%%/dat/des/variable/mini.des
159	%%DATADIR%%/dat/des/variable/mini_features.des	162	%%DATADIR%%/dat/des/variable/mini_features.des
160	%%DATADIR%%/dat/des/variable/mini_monsters.des	163	%%DATADIR%%/dat/des/variable/mini_monsters.des
161	%%DATADIR%%/dat/des/variable/tomb_raider.des
162	%%DATADIR%%/dat/des/zotdef/zotdef.des	164	%%DATADIR%%/dat/des/zotdef/zotdef.des
163	%%DATADIR%%/dat/descript/ability.txt	165	%%DATADIR%%/dat/descript/ability.txt
164	%%DATADIR%%/dat/descript/backgrounds.txt	166	%%DATADIR%%/dat/descript/backgrounds.txt
Lines 267-273 Link Here
267	%%DATADIR%%/dat/descript/hints.txt	269	%%DATADIR%%/dat/descript/hints.txt
268	%%DATADIR%%/dat/descript/hu/backgrounds.txt	270	%%DATADIR%%/dat/descript/hu/backgrounds.txt
269	%%DATADIR%%/dat/descript/hu/species.txt	271	%%DATADIR%%/dat/descript/hu/species.txt
270	%%DATADIR%%/dat/descript/it/ability.txt
271	%%DATADIR%%/dat/descript/it/backgrounds.txt	272	%%DATADIR%%/dat/descript/it/backgrounds.txt
272	%%DATADIR%%/dat/descript/it/branches.txt	273	%%DATADIR%%/dat/descript/it/branches.txt
273	%%DATADIR%%/dat/descript/it/cards.txt	274	%%DATADIR%%/dat/descript/it/cards.txt
Lines 280-286 Link Here
280	%%DATADIR%%/dat/descript/it/quotes.txt	281	%%DATADIR%%/dat/descript/it/quotes.txt
281	%%DATADIR%%/dat/descript/it/skills.txt	282	%%DATADIR%%/dat/descript/it/skills.txt
282	%%DATADIR%%/dat/descript/it/species.txt	283	%%DATADIR%%/dat/descript/it/species.txt
283	%%DATADIR%%/dat/descript/it/spells.txt
284	%%DATADIR%%/dat/descript/it/tutorial.txt	284	%%DATADIR%%/dat/descript/it/tutorial.txt
285	%%DATADIR%%/dat/descript/it/unident.txt	285	%%DATADIR%%/dat/descript/it/unident.txt
286	%%DATADIR%%/dat/descript/it/unrand.txt	286	%%DATADIR%%/dat/descript/it/unrand.txt
Lines 288-295 Link Here
288	%%DATADIR%%/dat/descript/ja/ability.txt	288	%%DATADIR%%/dat/descript/ja/ability.txt
289	%%DATADIR%%/dat/descript/ja/backgrounds.txt	289	%%DATADIR%%/dat/descript/ja/backgrounds.txt
290	%%DATADIR%%/dat/descript/ja/branches.txt	290	%%DATADIR%%/dat/descript/ja/branches.txt
		291	%%DATADIR%%/dat/descript/ja/cards.txt
291	%%DATADIR%%/dat/descript/ja/commands.txt	292	%%DATADIR%%/dat/descript/ja/commands.txt
292	%%DATADIR%%/dat/descript/ja/gods.txt	293	%%DATADIR%%/dat/descript/ja/gods.txt
		294	%%DATADIR%%/dat/descript/ja/hints.txt
293	%%DATADIR%%/dat/descript/ja/items.txt	295	%%DATADIR%%/dat/descript/ja/items.txt
294	%%DATADIR%%/dat/descript/ja/monsters.txt	296	%%DATADIR%%/dat/descript/ja/monsters.txt
295	%%DATADIR%%/dat/descript/ja/skills.txt	297	%%DATADIR%%/dat/descript/ja/skills.txt
Lines 324-329 Link Here
324	%%DATADIR%%/dat/descript/lt/unident.txt	326	%%DATADIR%%/dat/descript/lt/unident.txt
325	%%DATADIR%%/dat/descript/lv/ability.txt	327	%%DATADIR%%/dat/descript/lv/ability.txt
326	%%DATADIR%%/dat/descript/lv/backgrounds.txt	328	%%DATADIR%%/dat/descript/lv/backgrounds.txt
		329	%%DATADIR%%/dat/descript/lv/branches.txt
327	%%DATADIR%%/dat/descript/lv/cards.txt	330	%%DATADIR%%/dat/descript/lv/cards.txt
328	%%DATADIR%%/dat/descript/lv/commands.txt	331	%%DATADIR%%/dat/descript/lv/commands.txt
329	%%DATADIR%%/dat/descript/lv/features.txt	332	%%DATADIR%%/dat/descript/lv/features.txt
Lines 332-339 Link Here
332	%%DATADIR%%/dat/descript/lv/items.txt	335	%%DATADIR%%/dat/descript/lv/items.txt
333	%%DATADIR%%/dat/descript/lv/monsters.txt	336	%%DATADIR%%/dat/descript/lv/monsters.txt
334	%%DATADIR%%/dat/descript/lv/skills.txt	337	%%DATADIR%%/dat/descript/lv/skills.txt
		338	%%DATADIR%%/dat/descript/lv/species.txt
335	%%DATADIR%%/dat/descript/lv/spells.txt	339	%%DATADIR%%/dat/descript/lv/spells.txt
336	%%DATADIR%%/dat/descript/lv/tutorial.txt	340	%%DATADIR%%/dat/descript/lv/tutorial.txt
		341	%%DATADIR%%/dat/descript/lv/unident.txt
337	%%DATADIR%%/dat/descript/lv/unrand.txt	342	%%DATADIR%%/dat/descript/lv/unrand.txt
338	%%DATADIR%%/dat/descript/monsters.txt	343	%%DATADIR%%/dat/descript/monsters.txt
339	%%DATADIR%%/dat/descript/nl/ability.txt	344	%%DATADIR%%/dat/descript/nl/ability.txt
Lines 342-349 Link Here
342	%%DATADIR%%/dat/descript/pl/ability.txt	347	%%DATADIR%%/dat/descript/pl/ability.txt
343	%%DATADIR%%/dat/descript/pl/backgrounds.txt	348	%%DATADIR%%/dat/descript/pl/backgrounds.txt
344	%%DATADIR%%/dat/descript/pl/cards.txt	349	%%DATADIR%%/dat/descript/pl/cards.txt
		350	%%DATADIR%%/dat/descript/pl/commands.txt
		351	%%DATADIR%%/dat/descript/pl/features.txt
345	%%DATADIR%%/dat/descript/pl/gods.txt	352	%%DATADIR%%/dat/descript/pl/gods.txt
		353	%%DATADIR%%/dat/descript/pl/hints.txt
346	%%DATADIR%%/dat/descript/pl/items.txt	354	%%DATADIR%%/dat/descript/pl/items.txt
		355	%%DATADIR%%/dat/descript/pl/monsters.txt
347	%%DATADIR%%/dat/descript/pl/quotes.txt	356	%%DATADIR%%/dat/descript/pl/quotes.txt
348	%%DATADIR%%/dat/descript/pl/skills.txt	357	%%DATADIR%%/dat/descript/pl/skills.txt
349	%%DATADIR%%/dat/descript/pl/species.txt	358	%%DATADIR%%/dat/descript/pl/species.txt
Lines 382-387 Link Here
382	%%DATADIR%%/dat/descript/tr/commands.txt	391	%%DATADIR%%/dat/descript/tr/commands.txt
383	%%DATADIR%%/dat/descript/tr/gods.txt	392	%%DATADIR%%/dat/descript/tr/gods.txt
384	%%DATADIR%%/dat/descript/tr/items.txt	393	%%DATADIR%%/dat/descript/tr/items.txt
		394	%%DATADIR%%/dat/descript/tr/quotes.txt
		395	%%DATADIR%%/dat/descript/tr/species.txt
385	%%DATADIR%%/dat/descript/tr/tutorial.txt	396	%%DATADIR%%/dat/descript/tr/tutorial.txt
386	%%DATADIR%%/dat/descript/tr/unident.txt	397	%%DATADIR%%/dat/descript/tr/unident.txt
387	%%DATADIR%%/dat/descript/tr/unrand.txt	398	%%DATADIR%%/dat/descript/tr/unrand.txt
Lines 398-403 Link Here
398	%%DATADIR%%/dat/descript/zh/hints.txt	409	%%DATADIR%%/dat/descript/zh/hints.txt
399	%%DATADIR%%/dat/descript/zh/items.txt	410	%%DATADIR%%/dat/descript/zh/items.txt
400	%%DATADIR%%/dat/descript/zh/monsters.txt	411	%%DATADIR%%/dat/descript/zh/monsters.txt
		412	%%DATADIR%%/dat/descript/zh/quotes.txt
401	%%DATADIR%%/dat/descript/zh/skills.txt	413	%%DATADIR%%/dat/descript/zh/skills.txt
402	%%DATADIR%%/dat/descript/zh/species.txt	414	%%DATADIR%%/dat/descript/zh/species.txt
403	%%DATADIR%%/dat/descript/zh/spells.txt	415	%%DATADIR%%/dat/descript/zh/spells.txt
Lines 431-437 Link Here
431	%%DATADIR%%/dat/dlua/layout/theme.lua	443	%%DATADIR%%/dat/dlua/layout/theme.lua
432	%%DATADIR%%/dat/dlua/layout/vector.lua	444	%%DATADIR%%/dat/dlua/layout/vector.lua
433	%%DATADIR%%/dat/dlua/layout/zonify.lua	445	%%DATADIR%%/dat/dlua/layout/zonify.lua
434	%%DATADIR%%/dat/dlua/lm_1way.lua	446	%%DATADIR%%/dat/dlua/lm_%%LUA_VER_SH%%way.lua
435	%%DATADIR%%/dat/dlua/lm_door.lua	447	%%DATADIR%%/dat/dlua/lm_door.lua
436	%%DATADIR%%/dat/dlua/lm_fog.lua	448	%%DATADIR%%/dat/dlua/lm_fog.lua
437	%%DATADIR%%/dat/dlua/lm_items.lua	449	%%DATADIR%%/dat/dlua/lm_items.lua
Lines 464-469 Link Here
464	%%DATADIR%%/dat/dlua/v_paint.lua	476	%%DATADIR%%/dat/dlua/v_paint.lua
465	%%DATADIR%%/dat/dlua/v_rooms.lua	477	%%DATADIR%%/dat/dlua/v_rooms.lua
466	%%DATADIR%%/dat/dlua/v_shapes.lua	478	%%DATADIR%%/dat/dlua/v_shapes.lua
		479	%%DATADIR%%/dat/dlua/vault.lua
467	%%DATADIR%%/dat/dlua/ziggurat.lua	480	%%DATADIR%%/dat/dlua/ziggurat.lua
468	%%SDL%%%%DATADIR%%/dat/tiles/feat.png	481	%%SDL%%%%DATADIR%%/dat/tiles/feat.png
469	%%SDL%%%%DATADIR%%/dat/tiles/floor.png	482	%%SDL%%%%DATADIR%%/dat/tiles/floor.png
Lines 473-480 Link Here
473	%%SDL%%%%DATADIR%%/dat/tiles/main.png	486	%%SDL%%%%DATADIR%%/dat/tiles/main.png
474	%%SDL%%%%DATADIR%%/dat/tiles/player.png	487	%%SDL%%%%DATADIR%%/dat/tiles/player.png
475	%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png	488	%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png
476	%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-512x512.png	489	%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-%%LUA_VER_STR%%2x%%LUA_VER_STR%%2.png
477	%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.png	490	%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.png
		491	%%SDL%%%%DATADIR%%/dat/tiles/title_baconkid_gastronok.png
		492	%%SDL%%%%DATADIR%%/dat/tiles/title_baconkid_mnoleg.png
478	%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_dragon.png	493	%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_dragon.png
479	%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_evil_mage.png	494	%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_evil_mage.png
480	%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_invasion.png	495	%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_invasion.png
Lines 485-490 Link Here
485	%%SDL%%%%DATADIR%%/dat/tiles/title_omndra_zot_demon.png	500	%%SDL%%%%DATADIR%%/dat/tiles/title_omndra_zot_demon.png
486	%%SDL%%%%DATADIR%%/dat/tiles/title_pooryurik_knight.png	501	%%SDL%%%%DATADIR%%/dat/tiles/title_pooryurik_knight.png
487	%%SDL%%%%DATADIR%%/dat/tiles/title_psiweapon_kiku.png	502	%%SDL%%%%DATADIR%%/dat/tiles/title_psiweapon_kiku.png
		503	%%SDL%%%%DATADIR%%/dat/tiles/title_psiweapon_roxanne.png
488	%%SDL%%%%DATADIR%%/dat/tiles/title_shadyamish_octm.png	504	%%SDL%%%%DATADIR%%/dat/tiles/title_shadyamish_octm.png
489	%%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_entering_the_dungeon.png	505	%%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_entering_the_dungeon.png
490	%%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_grabbing_the_orb.png	506	%%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_grabbing_the_orb.png
Lines 513-519 Link Here
513	%%DATADIR%%/docs/develop/tiles_creation.txt	529	%%DATADIR%%/docs/develop/tiles_creation.txt
514	%%DATADIR%%/docs/develop/translation.txt	530	%%DATADIR%%/docs/develop/translation.txt
515	%%DATADIR%%/docs/fight_simulator.txt	531	%%DATADIR%%/docs/fight_simulator.txt
516	%%DATADIR%%/docs/key_changes.txt
517	%%DATADIR%%/docs/keybind.txt	532	%%DATADIR%%/docs/keybind.txt
518	%%DATADIR%%/docs/license/cc0.txt	533	%%DATADIR%%/docs/license/cc0.txt
519	%%DATADIR%%/docs/license/lgpl.txt	534	%%DATADIR%%/docs/license/lgpl.txt
Lines 526-589 Link Here
526	%%DATADIR%%/docs/quickstart.txt	541	%%DATADIR%%/docs/quickstart.txt
527	%%DATADIR%%/docs/ssh_guide.txt	542	%%DATADIR%%/docs/ssh_guide.txt
528	%%DATADIR%%/docs/tiles_help.txt	543	%%DATADIR%%/docs/tiles_help.txt
529	%%DATADIR%%/settings/0.12_monster_glyphs.txt	544	%%DATADIR%%/settings/0.%%LUA_VER_SH%%2_monster_glyphs.txt
		545	%%DATADIR%%/settings/0.%%LUA_VER_SH%%3_monster_glyphs.txt
530	%%DATADIR%%/settings/0.9_monster_glyphs.txt	546	%%DATADIR%%/settings/0.9_monster_glyphs.txt
531	%%DATADIR%%/settings/034_command_keys.txt	547	%%DATADIR%%/settings/034_command_keys.txt
532	%%DATADIR%%/settings/034_monster_glyphs.txt	548	%%DATADIR%%/settings/034_monster_glyphs.txt
533	%%DATADIR%%/settings/052_monster_glyphs.txt	549	%%DATADIR%%/settings/052_monster_glyphs.txt
534	%%DATADIR%%/settings/060_monster_glyphs.txt	550	%%DATADIR%%/settings/060_monster_glyphs.txt
535	%%DATADIR%%/settings/071_monster_glyphs.txt	551	%%DATADIR%%/settings/07%%LUA_VER_SH%%_monster_glyphs.txt
536	%%DATADIR%%/settings/080_monster_glyphs.txt	552	%%DATADIR%%/settings/080_monster_glyphs.txt
537	%%DATADIR%%/settings/advanced_optioneering.txt	553	%%DATADIR%%/settings/advanced_optioneering.txt
		554	%%DATADIR%%/settings/colemak_command_keys.txt
538	%%DATADIR%%/settings/dvorak_command_keys.txt	555	%%DATADIR%%/settings/dvorak_command_keys.txt
539	%%DATADIR%%/settings/init.txt	556	%%DATADIR%%/settings/init.txt
540	%%DATADIR%%/settings/no_vi_command_keys.txt	557	%%DATADIR%%/settings/no_vi_command_keys.txt
541	@dirrmtry %%DATADIR%%/settings	558	%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
542	@dirrmtry %%DATADIR%%/docs/license	559	%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
543	@dirrmtry %%DATADIR%%/docs/develop/levels	560	@dirrmtry %%DATADIR%%/dat/clua
544	@dirrmtry %%DATADIR%%/docs/develop
545	@dirrmtry %%DATADIR%%/docs
546	%%SDL%%@dirrmtry %%DATADIR%%/dat/tiles
547	@dirrmtry %%DATADIR%%/dat/dlua/layout
548	@dirrmtry %%DATADIR%%/dat/dlua
549	@dirrmtry %%DATADIR%%/dat/descript/zh
550	@dirrmtry %%DATADIR%%/dat/descript/tr
551	@dirrmtry %%DATADIR%%/dat/descript/ru
552	@dirrmtry %%DATADIR%%/dat/descript/pt
553	@dirrmtry %%DATADIR%%/dat/descript/pl
554	@dirrmtry %%DATADIR%%/dat/descript/nl
555	@dirrmtry %%DATADIR%%/dat/descript/lv
556	@dirrmtry %%DATADIR%%/dat/descript/lt
557	@dirrmtry %%DATADIR%%/dat/descript/ko
558	@dirrmtry %%DATADIR%%/dat/descript/ja
559	@dirrmtry %%DATADIR%%/dat/descript/it
560	@dirrmtry %%DATADIR%%/dat/descript/hu
561	@dirrmtry %%DATADIR%%/dat/descript/fr
562	@dirrmtry %%DATADIR%%/dat/descript/fi
563	@dirrmtry %%DATADIR%%/dat/descript/es
564	@dirrmtry %%DATADIR%%/dat/descript/el
565	@dirrmtry %%DATADIR%%/dat/descript/de
566	@dirrmtry %%DATADIR%%/dat/descript/da
567	@dirrmtry %%DATADIR%%/dat/descript/cs
568	@dirrmtry %%DATADIR%%/dat/descript
569	@dirrmtry %%DATADIR%%/dat/des/zotdef
570	@dirrmtry %%DATADIR%%/dat/des/variable
571	@dirrmtry %%DATADIR%%/dat/des/tutorial
572	@dirrmtry %%DATADIR%%/dat/des/traps
573	@dirrmtry %%DATADIR%%/dat/des/sprint
574	@dirrmtry %%DATADIR%%/dat/des/serial
575	@dirrmtry %%DATADIR%%/dat/des/portals
576	@dirrmtry %%DATADIR%%/dat/des/entry
577	@dirrmtry %%DATADIR%%/dat/des/builder
578	@dirrmtry %%DATADIR%%/dat/des/branches
579	@dirrmtry %%DATADIR%%/dat/des/altar
580	@dirrmtry %%DATADIR%%/dat/des
581	@dirrmtry %%DATADIR%%/dat/defaults
582	@dirrmtry %%DATADIR%%/dat/database/pl
583	@dirrmtry %%DATADIR%%/dat/database/el	561	@dirrmtry %%DATADIR%%/dat/database/el
		562	@dirrmtry %%DATADIR%%/dat/database/pl
584	@dirrmtry %%DATADIR%%/dat/database	563	@dirrmtry %%DATADIR%%/dat/database
585	@dirrmtry %%DATADIR%%/dat/clua	564	@dirrmtry %%DATADIR%%/dat/defaults
		565	@dirrmtry %%DATADIR%%/dat/des/altar
		566	@dirrmtry %%DATADIR%%/dat/des/arrival
		567	@dirrmtry %%DATADIR%%/dat/des/branches
		568	@dirrmtry %%DATADIR%%/dat/des/builder
		569	@dirrmtry %%DATADIR%%/dat/des/portals
		570	@dirrmtry %%DATADIR%%/dat/des/serial
		571	@dirrmtry %%DATADIR%%/dat/des/sprint
		572	@dirrmtry %%DATADIR%%/dat/des/test
		573	@dirrmtry %%DATADIR%%/dat/des/traps
		574	@dirrmtry %%DATADIR%%/dat/des/tutorial
		575	@dirrmtry %%DATADIR%%/dat/des/variable
		576	@dirrmtry %%DATADIR%%/dat/des/zotdef
		577	@dirrmtry %%DATADIR%%/dat/des
		578	@dirrmtry %%DATADIR%%/dat/descript/cs
		579	@dirrmtry %%DATADIR%%/dat/descript/da
		580	@dirrmtry %%DATADIR%%/dat/descript/de
		581	@dirrmtry %%DATADIR%%/dat/descript/el
		582	@dirrmtry %%DATADIR%%/dat/descript/es
		583	@dirrmtry %%DATADIR%%/dat/descript/fi
		584	@dirrmtry %%DATADIR%%/dat/descript/fr
		585	@dirrmtry %%DATADIR%%/dat/descript/hu
		586	@dirrmtry %%DATADIR%%/dat/descript/it
		587	@dirrmtry %%DATADIR%%/dat/descript/ja
		588	@dirrmtry %%DATADIR%%/dat/descript/ko
		589	@dirrmtry %%DATADIR%%/dat/descript/lt
		590	@dirrmtry %%DATADIR%%/dat/descript/lv
		591	@dirrmtry %%DATADIR%%/dat/descript/nl
		592	@dirrmtry %%DATADIR%%/dat/descript/pl
		593	@dirrmtry %%DATADIR%%/dat/descript/pt
		594	@dirrmtry %%DATADIR%%/dat/descript/ru
		595	@dirrmtry %%DATADIR%%/dat/descript/tr
		596	@dirrmtry %%DATADIR%%/dat/descript/zh
		597	@dirrmtry %%DATADIR%%/dat/descript
		598	@dirrmtry %%DATADIR%%/dat/dlua/layout
		599	@dirrmtry %%DATADIR%%/dat/dlua
		600	%%SDL%%@dirrmtry %%DATADIR%%/dat/tiles
586	@dirrmtry %%DATADIR%%/dat	601	@dirrmtry %%DATADIR%%/dat
		602	@dirrmtry %%DATADIR%%/docs/develop/levels
		603	@dirrmtry %%DATADIR%%/docs/develop
		604	@dirrmtry %%DATADIR%%/docs/license
		605	@dirrmtry %%DATADIR%%/docs
		606	@dirrmtry %%DATADIR%%/settings
587	@dirrmtry %%DATADIR%%	607	@dirrmtry %%DATADIR%%
588	%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
589	%%PORTDOCS%%@dirrmtry %%DOCSDIR%%

Return to bug 189400

Lines 2-9 Link Here

(-)games/stonesoup/Makefile (-4 / +3 lines)
2	# $FreeBSD: head/games/stonesoup/Makefile 351411 2014-04-16 18:28:47Z zeising $	2	# $FreeBSD: head/games/stonesoup/Makefile 351411 2014-04-16 18:28:47Z zeising $
3		3
4	PORTNAME= stonesoup	4	PORTNAME= stonesoup
5	PORTVERSION= 0.13.1	5	PORTVERSION= 0.14.1
6	PORTREVISION= 1
7	CATEGORIES= games	6	CATEGORIES= games
8	MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION}	7	MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION}
9	DISTNAME= stone_soup-${PORTVERSION}-nodeps	8	DISTNAME= stone_soup-${PORTVERSION}-nodeps
Lines 16-22 Link Here
16		15
17	USE_SQLITE= yes	16	USE_SQLITE= yes
18	USE_XZ= yes	17	USE_XZ= yes
19	USES= bison gmake perl5 pkgconfig	18	USES= bison gmake perl5 pkgconfig compiler
20	USE_LUA= 5.1	19	USE_LUA= 5.1
21	USE_PERL5= build	20	USE_PERL5= build
22		21
Lines 80-86 Link Here
80		79
81	.include <bsd.port.pre.mk>	80	.include <bsd.port.pre.mk>
82		81
83	.if ${OSVERSION} >= 1000100	82	.if ${COMPILER_TYPE} == clang
84	CFLAGS+= -std=c++0x	83	CFLAGS+= -std=c++0x
85	.endif	84	.endif
86		85

Lines 1-6 Link Here

(-)games/stonesoup/files/patch-dat__des__builder__shops.des (-7 / +7 lines)
1	--- ./dat/des/builder/shops.des.orig 2013-09-30 20:32:00.000000000 +0200	1	--- ./dat/des/builder/shops.des.orig 2014-04-24 22:39:22.000000000 +0200
2	+++ ./dat/des/builder/shops.des 2013-10-11 22:07:08.169887952 +0200	2	+++ ./dat/des/builder/shops.des 2014-05-06 21:23:13.323133248 +0200
3	@@ -228,15 +228,7 @@	3	@@ -390,15 +390,7 @@
4	: local shopname = util.random_from({"type:Blasphemy suffix:Boutique",	4	: local shopname = util.random_from({"type:Blasphemy suffix:Boutique",
5	: "type:Evil suffix:Emporium", "type:Profane suffix:Products",	5	: "type:Evil suffix:Emporium", "type:Profane suffix:Products",
6	: "type:Sacrilege suffix:Store", "type:Wicked suffix:Wares"})	6	: "type:Sacrilege suffix:Store", "type:Wicked suffix:Wares"})
Lines 8-19 Link Here
8	-: potion of blood \| any weapon ego:draining w:15 \| any weapon ego:pain w:5 \| \	8	-: potion of blood \| any weapon ego:draining w:15 \| any weapon ego:pain w:5 \| \
9	-: any weapon ego:vampiricism w:5 \| demon blade w:5 \| \	9	-: any weapon ego:vampiricism w:5 \| demon blade w:5 \| \
10	-: demon whip w:5 \| demon trident w:5 \| wand of draining \| scroll of torment \| \	10	-: demon whip w:5 \| demon trident w:5 \| wand of draining \| scroll of torment \| \
11	-: staff of death \| rod of demonology w:5 \| \	11	-: staff of death \| \
12	-: bottled efreet w:5 \| lantern of shadows w:5 \| book of necromancy \| book of death \| \	12	-: lantern of shadows w:5 \| book of necromancy \| book of death \| \
13	-: book of unlife \| randbook disc:necromancy w:5 \| necronomicon w:1 \| \	13	-: book of unlife \| randbook disc:necromancy w:5 \| necronomicon w:1 \| \
14	-: grand grimoire w:1 \| scythe unrand:scythe_of_curses w:1 \| \	14	-: grand grimoire w:1 \| scythe unrand:scythe_of_curses w:1 \| \
15	-: long sword unrand:sword_of_zonguldrok w:1 \| mace unrand:sceptre_of_torment w:1")	15	-: bastard sword unrand:sword_of_zonguldrok w:1 \| mace unrand:sceptre_of_torment w:1")
16	+: 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")	16	+: 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 \| 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 \| bastard sword unrand:sword_of_zonguldrok w:1 \| mace unrand:sceptre_of_torment w:1")
17	KFEAT: a = altar_kikubaaqudgha / altar_yredelemnul / altar_makhleb / \	17	KFEAT: a = altar_kikubaaqudgha / altar_yredelemnul / altar_makhleb / \
18	altar_beogh w:1 / altar_lugonu w:1	18	altar_beogh w:1 / altar_lugonu w:1
19	MAP	19	MAP

Lines 1-27 Link Here

(-)games/stonesoup/files/patch-dat__des__variable__grated_community.des (-16 / +16 lines)
1	--- ./dat/des/variable/grated_community.des.orig 2013-10-11 22:08:21.868888937 +0200	1	--- ./dat/des/variable/grated_community.des.orig 2014-04-09 17:36:32.000000000 +0200
2	+++ ./dat/des/variable/grated_community.des 2013-10-11 22:12:02.503889567 +0200	2	+++ ./dat/des/variable/grated_community.des 2014-05-06 21:21:37.804135690 +0200
3	@@ -67,11 +67,7 @@	3	@@ -67,11 +67,7 @@
4	q:5 sausage
5	KFEAT: C = distillery shop type:Miraculous suffix:Elixirs count:10 \	4	KFEAT: C = distillery shop type:Miraculous suffix:Elixirs count:10 \
6	greed:50 ; potion of confusion	5	greed:50 ; potion of confusion
7	-: kfeat("D = armour shop name:The_Legendary_" .. crawl.make_name() .. " \	6	: local smithy = string.gsub(crawl.make_name(), " ", "_")
		7	-: kfeat("D = armour shop name:The_Legendary_" .. smithy .. " \
8	-: type:Legendary suffix:Smithy count:10 greed:40 ;\	8	-: type:Legendary suffix:Smithy count:10 greed:40 ;\
9	-: damaged plate armour ego:none \| damaged chain mail ego:none \|\	9	-: damaged plate armour ego:none \| damaged chain mail ego:none \|\
10	-: damaged long sword ego:none \| damaged shield ego:none \|\	10	-: damaged long sword ego:none \| damaged shield ego:none \|\
11	-: damaged large shield ego:none \| damaged battleaxe ego:none")	11	-: damaged large shield ego:none \| damaged battleaxe ego:none")
12	+: 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")	12	+: kfeat("D = armour shop name:The_Legendary_" .. smithy .. " 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")
13	SHUFFLE: QRSTUVX	13	SHUFFLE: QRSTUVX
14	SUBVAULT: Q : grated_community_mu_home1	14	SUBVAULT: Q : grated_community_mu_home1
15	SUBVAULT: R : grated_community_mu_home2	15	SUBVAULT: R : grated_community_mu_home2
16	@@ -166,16 +162,11 @@	16	@@ -168,16 +164,11 @@
17	KITEM: % = animal skin / nothing
18	MARKER: + = lua:restrict_door()
19	KFEAT: ~ = closed_door	17	KFEAT: ~ = closed_door
20	-: dgn.delayed_decay(_G, '*', 'human skeleton / yak skeleton / elf skeleton /\	18	SUBST: * = *:35 -:1
21	-: gnome skeleton / elephant skeleton /\	19	KITEM: - = animal skin
22	-: sheep skeleton / manticore skeleton /\	20	-: dgn.delayed_decay_extra(_G, '*', 'human skeleton / yak skeleton /\
23	-: w:2 nothing, animal skin')	21	-: elf skeleton / kobold skeleton /\
24	+: dgn.delayed_decay(_G, '*', 'human skeleton / yak skeleton / elf skeleton / gnome skeleton / elephant skeleton / sheep skeleton / manticore skeleton / w:2 nothing, animal skin')	22	-: elephant skeleton / sheep skeleton /\
		23	-: manticore skeleton', 'animal skin')
		24	+: dgn.delayed_decay_extra(_G, '*', 'human skeleton / yak skeleton / elf skeleton / kobold skeleton / elephant skeleton / sheep skeleton / manticore skeleton', 'animal skin')
25	KFEAT: 8 = granite_statue / orcish_idol / w:5 altar_trog /\	25	KFEAT: 8 = granite_statue / orcish_idol / w:5 altar_trog /\
26	w:5 altar_beogh / w:1 altar_makhleb / w:4 floor	26	w:5 altar_beogh / w:1 altar_makhleb / w:4 floor
27	KITEM: $ = q:5 meat ration, giant spiked club, q:2 sausage	27	KITEM: $ = q:5 meat ration, giant spiked club, q:2 sausage
Lines 32-38 Link Here
32	: local frosty = crawl.random2(6)	32	: local frosty = crawl.random2(6)
33	: if frosty == 5 then	33	: if frosty == 5 then
34	SUBST: 1 = 2	34	SUBST: 1 = 2
35	@@ -218,10 +209,8 @@	35	@@ -220,10 +211,8 @@
36	KFEAT: * = altar_kikubaaqudgha / w:4 altar_sif_muna / w:1 altar_yredelemnul	36	KFEAT: * = altar_kikubaaqudgha / w:4 altar_sif_muna / w:1 altar_yredelemnul
37	KITEM: " = gold, any wand / w:15 nothing, any scroll / nothing	37	KITEM: " = gold, any wand / w:15 nothing, any scroll / nothing
38	KFEAT: 8 = granite_statue / w:2 fountain_blood / w:1 floor	38	KFEAT: 8 = granite_statue / w:2 fountain_blood / w:1 floor
Lines 45-51 Link Here
45	KITEM: & = book of necromancy / book of death / book of unlife / w:12 nothing	45	KITEM: & = book of necromancy / book of death / book of unlife / w:12 nothing
46	KMONS: P = col:darkgrey plant name:withered name_adjective \	46	KMONS: P = col:darkgrey plant name:withered name_adjective \
47	tile:mons_withered_plant / col:lightgrey plant name:withered \	47	tile:mons_withered_plant / col:lightgrey plant name:withered \
48	@@ -233,8 +222,7 @@	48	@@ -235,8 +224,7 @@
49	nothing	49	nothing
50	KFEAT: 8 = granite_statue / fountain_sparkling / fountain_blue / w:1 floor	50	KFEAT: 8 = granite_statue / fountain_sparkling / fountain_blue / w:1 floor
51	KITEM: ? = scroll of recharging / nothing, any scroll / nothing	51	KITEM: ? = scroll of recharging / nothing, any scroll / nothing
Lines 55-61 Link Here
55	KITEM: & = book of wizardry / book of power / book of party tricks /\	55	KITEM: & = book of wizardry / book of power / book of party tricks /\
56	book of alchemy / w:12 nothing	56	book of alchemy / w:12 nothing
57	KMONS: P = plant	57	KMONS: P = plant
58	@@ -246,8 +234,7 @@	58	@@ -248,8 +236,7 @@
59	potion of brilliance / nothing	59	potion of brilliance / nothing
60	KFEAT: 8 = granite_statue / w:1 floor	60	KFEAT: 8 = granite_statue / w:1 floor
61	KITEM: ? = scroll of immolation / nothing, any scroll / nothing	61	KITEM: ? = scroll of immolation / nothing, any scroll / nothing

Lines 1-24 Link Here

(-)games/stonesoup/files/patch-files.cc (-24 lines)
1	--- ./files.cc.orig 2013-09-30 20:32:00.000000000 +0200
2	+++ ./files.cc 2013-10-11 22:07:08.172887580 +0200
3	@@ -626,8 +626,10 @@
4	{
5	vector<player_save_info> chars;
6
7	+#ifdef WIZARD
8	if (Options.no_save)
9	return chars;
10	+#endif
11
12	#ifndef DISABLE_SAVEGAME_LISTS
13	string searchpath = _get_savefile_directory();
14	@@ -1792,8 +1794,10 @@
15	// returns false if a new game should start instead
16	static bool _restore_game(const string& filename)
17	{
18	+#ifdef WIZARD
19	if (Options.no_save)
20	return false;
21	+#endif
22
23	you.save = new package((_get_savefile_directory() + filename).c_str(), true);
24

Lines 1-14 Link Here

(-)games/stonesoup/files/patch-ng-setup.cc (-14 lines)
1	--- ./ng-setup.cc.orig 2013-09-30 20:32:18.000000000 +0200
2	+++ ./ng-setup.cc 2013-10-11 22:07:08.174888114 +0200
3	@@ -1430,9 +1430,11 @@
4	init_companions();
5
6	// Create the save file.
7	+#ifdef WIZARD
8	if (Options.no_save)
9	you.save = new package();
10	else
11	+#endif
12	you.save = new package(get_savedir_filename(you.your_name).c_str(),
13	true, true);
14	}

Lines 1-13 Link Here

(-)games/stonesoup/files/patch-startup.cc (-13 lines)
1	--- ./startup.cc.orig 2013-09-30 20:32:00.000000000 +0200
2	+++ ./startup.cc 2013-10-11 22:07:08.183889437 +0200
3	@@ -240,8 +240,10 @@
4	you.wizard = true;
5	#endif
6	// Save-less games are pointless except for tests.
7	+#ifdef WIZARD
8	if (Options.no_save)
9	you.wizard = true;
10	+#endif
11
12	init_properties();
13	burden_change();