Attachment #165222 for bug #206009

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




# $FreeBSD: head/games/stonesoup/Makefile 394379 2015-08-16 02:50:50Z jbeich $

PORTNAME=	stonesoup
PORTVERSION=	0.17.1
CATEGORIES=	games
MASTER_SITES=	SF/crawl-ref/Stone%20Soup/${PORTVERSION}
MASTER_SITES=	http://crawl.develz.org/release/

SUB_FILES=	README.FreeBSD
PLIST_SUB=	SAVEDIR="${SAVEDIR}"

OPTIONS_DEFINE=	SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES
##OPTIONS_DEFINE=	SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES
OPTIONS_DEFINE=	SOUND LUA_BINDINGS DOCS EXAMPLES

SOUND_DESC=	Sound support
WIZARD_DESC=	Wizard mode
LUA_BINDINGS_DESC=	Bindings for LUA user scripts

MAKE_ARGS=	prefix=${PREFIX} \

MAKE_ARGS+=	V=yes
.endif

.if empty(PORT_OPTIONS:MWIZARD)
MAKE_ARGS+=	NOWIZARD=y
.endif

.if ${PORT_OPTIONS:MSDL}
CONFLICTS+=	${PORTNAME}-[0-9]*

Lines 1-2 Link Here

(-)games/stonesoup/distinfo (-2 / +2 lines)
1	SHA256 (stone_soup-0.16.2-nodeps.tar.xz) = 26b4d968f858916254f2e49866da33c8f86d5617e38abd9b51813882dadc0179	1	SHA256 (stone_soup-0.17.1-nodeps.tar.xz) = 6314ea8229ec5b27804ff1788988bd110a16aadeb6b2f26660645c43ecfc49dd
2	SIZE (stone_soup-0.16.2-nodeps.tar.xz) = 9252540	2	SIZE (stone_soup-0.17.1-nodeps.tar.xz) = 9114224

Lines 1-6 Link Here

(-)games/stonesoup/files/patch-AppHdr.h (-2 / +2 lines)
1	--- AppHdr.h.orig 2015-03-23 01:49:21 UTC	1	--- AppHdr.h.orig 2015-10-31 04:31:32 UTC
2	+++ AppHdr.h	2	+++ AppHdr.h
3	@@ -147,7 +147,7 @@ static inline double pow(int x, double y	3	@@ -152,7 +152,7 @@ static inline double pow(int x, double y
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.
6	//	6	//




--- Makefile.orig	2015-12-08 12:42:11 UTC
+++ Makefile
@@ -71,7 +71,7 @@
 #    them; you can also ask for a package with convenience libraries instead --

 
 # 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
@@ -105,7 +105,7 @@ include Makefile.obj
 # Which C++ standard to support
 STDFLAG = -std=c++11
 
-CFOTHERS := -pipe $(EXTERNAL_FLAGS)
+CFOTHERS := $(CFLAGS)
 CFWARN := 
 CFWARN_L := -Wall -Wformat-security -Wundef
 
@@ -114,7 +114,7 @@ DEFINES := $(EXTERNAL_DEFINES)
 ifdef ANDROID
 LDFLAGS := $(EXTERNAL_LDFLAGS) $(LDFLAGS)
 else

 endif
 
 #
@@ -122,8 +122,6 @@ endif
 #
 AR = ar
 RANLIB = ranlib

 RM = rm -f
 COPY = cp
 COPY_R = cp -r
@@ -512,16 +510,6 @@ ifneq ($(GCC_VER),)
 GCC_VER_SUFFIX:=-$(GCC_VER)
 endif
 

-
 ifneq ($(FORCE_CC),)
 GCC := $(FORCE_CC)
 HOSTCC := $(FORCE_CC)
@@ -575,15 +563,6 @@ ifdef USE_ICC
 
 # Some very good optimization flags.
   CFOPTIMIZE := -O2 -parallel

 endif
 
 ifdef LTO
@@ -655,13 +634,13 @@ ifndef BUILD_LUA
         LUA_PACKAGE = lua-5.1
       endif
     else

   endif
   INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I | sed -e 's/-I/-isystem /')
   CFLAGS_L  += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
@@ -674,7 +653,7 @@ endif
 
 ifndef BUILD_SQLITE
   ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)

     LIBS += $(SQLITE_LIB)
     ifneq ($(shell grep -q sqlite3_prepare_v2 $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
       DEFINES_L += -DANCIENT_SQLITE
@@ -762,7 +741,7 @@ endif
 endif
 
 DEFINES_L += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL2_CFLAGS)

 
 endif # TILES
 
@@ -831,7 +810,7 @@ ifndef NOWIZARD
 DEFINES += -DWIZARD
 endif
 ifdef NO_OPTIMIZE

 endif
 
 ifdef PCH
@@ -958,7 +937,7 @@ else
   SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\
     {\
       fc-list | sed 's/: .*//' | grep -Fi "/$$name";\

       do [ -d $$dir ] && echo $$dir; done;\
     } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
   ifneq (,$(SYS_PROPORTIONAL_FONT))
@@ -983,7 +962,7 @@ else
   SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\
     {\
       fc-list | sed 's/: .*//' | grep -Fi "/$$name";\

       do [ -d $$dir ] && echo $$dir; done;\
     } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
   ifneq (,$(SYS_MONOSPACED_FONT))
@@ -1050,10 +1029,6 @@ CFWARN := -wd383,810,869,981,1418 -we14,
 CFWARN_L :=
 endif
 

Lines 1-10 Link Here

(-)games/stonesoup/files/patch-rltiles_Makefile (-2 / +2 lines)
1	--- rltiles/Makefile.orig 2015-03-04 04:53:28 UTC	1	--- rltiles/Makefile.orig 2015-12-15 18:50:32 UTC
2	+++ rltiles/Makefile	2	+++ rltiles/Makefile
3	@@ -10,8 +10,6 @@ endif	3	@@ -10,8 +10,6 @@ endif
4	# Also, cross-compilation with no system libraries for host rather than target	4	# Also, cross-compilation with no system libraries for host rather than target
5	# is not supported. If host=target, contribs are enough.	5	# is not supported. If host=target, contribs are enough.
6		6
7	-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter	7	-CFLAGS := -O2 $(STDFLAG) -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
8	-	8	-
9	ifdef ANDROID	9	ifdef ANDROID
10	CXXFLAGS :=	10	CXXFLAGS :=




%%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/alphashops.des
%%DATADIR%%/dat/des/builder/arena.des
%%DATADIR%%/dat/des/builder/decor.des
%%DATADIR%%/dat/des/builder/dummy.des

%%DATADIR%%/dat/des/serial/ice.des
%%DATADIR%%/dat/des/serial/magic_research.des
%%DATADIR%%/dat/des/serial/park.des
%%DATADIR%%/dat/des/serial/ponds.des
%%DATADIR%%/dat/des/serial/serial_guide.txt
%%DATADIR%%/dat/des/serial/sigils.des
%%DATADIR%%/dat/des/serial/undead.des

%%DATADIR%%/dat/des/test.des
%%DATADIR%%/dat/des/test/suite-los.des
%%DATADIR%%/dat/des/test/suite.des
%%DATADIR%%/dat/des/traps/beogh_trap.des
%%DATADIR%%/dat/des/traps/boulders.des
%%DATADIR%%/dat/des/traps/grate.des
%%DATADIR%%/dat/des/traps/rats_trap.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/arcadia.des
%%DATADIR%%/dat/des/variable/cathedral_bats.des
%%DATADIR%%/dat/des/variable/compat.des

%%DATADIR%%/dat/des/variable/mini.des
%%DATADIR%%/dat/des/variable/mini_features.des
%%DATADIR%%/dat/des/variable/mini_monsters.des
%%DATADIR%%/dat/des/zotdef/zotdef.des
%%DATADIR%%/dat/descript/ability.txt
%%DATADIR%%/dat/descript/backgrounds.txt
%%DATADIR%%/dat/descript/branches.txt

%%DATADIR%%/dat/descript/pl/gods.txt
%%DATADIR%%/dat/descript/pl/hints.txt
%%DATADIR%%/dat/descript/pl/items.txt
%%DATADIR%%/dat/descript/pl/monsters.txt
%%DATADIR%%/dat/descript/pl/quotes.txt
%%DATADIR%%/dat/descript/pl/skills.txt
%%DATADIR%%/dat/descript/pl/species.txt

%%DATADIR%%/docs/develop/android.txt
%%DATADIR%%/docs/develop/coding_conventions.txt
%%DATADIR%%/docs/develop/ctags.txt
%%DATADIR%%/docs/develop/editor_tips.txt
%%DATADIR%%/docs/develop/gdb_tips.txt
%%DATADIR%%/docs/develop/levels/advanced.txt
%%DATADIR%%/docs/develop/levels/introduction.txt

%%DATADIR%%/docs/develop/new_dev_checklist.txt
%%DATADIR%%/docs/develop/patch_guide.txt
%%DATADIR%%/docs/develop/process.txt
%%DATADIR%%/docs/develop/release.txt
%%DATADIR%%/docs/develop/save_compatibility.txt
%%DATADIR%%/docs/develop/spells.txt
%%DATADIR%%/docs/develop/testing.txt

%%DATADIR%%/settings/0.12_monster_glyphs.txt
%%DATADIR%%/settings/0.13_monster_glyphs.txt
%%DATADIR%%/settings/0.14_monster_glyphs.txt
%%DATADIR%%/settings/0.16_monster_glyphs.txt
%%DATADIR%%/settings/0.9_monster_glyphs.txt
%%DATADIR%%/settings/034_command_keys.txt
%%DATADIR%%/settings/034_monster_glyphs.txt

Return to bug 206009

Lines 2-8 Link Here

(-)games/stonesoup/Makefile (-8 / +6 lines)
2	# $FreeBSD: head/games/stonesoup/Makefile 394379 2015-08-16 02:50:50Z jbeich $	2	# $FreeBSD: head/games/stonesoup/Makefile 394379 2015-08-16 02:50:50Z jbeich $
3		3
4	PORTNAME= stonesoup	4	PORTNAME= stonesoup
5	PORTVERSION= 0.16.2	5	PORTVERSION= 0.17.1
6	CATEGORIES= games	6	CATEGORIES= games
7	MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION}	7	MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION}
8	MASTER_SITES= http://crawl.develz.org/release/	8	MASTER_SITES= http://crawl.develz.org/release/
Lines 28-39 Link Here
28	SUB_FILES= README.FreeBSD	28	SUB_FILES= README.FreeBSD
29	PLIST_SUB= SAVEDIR="${SAVEDIR}"	29	PLIST_SUB= SAVEDIR="${SAVEDIR}"
30		30
31	# WIZARD is currently broken upstream, remove until fixed	31	OPTIONS_DEFINE= SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES
32	##OPTIONS_DEFINE= SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES
33	OPTIONS_DEFINE= SOUND LUA_BINDINGS DOCS EXAMPLES
34		32
35	SOUND_DESC= Sound support	33	SOUND_DESC= Sound support
36	##WIZARD_DESC= Wizard mode	34	WIZARD_DESC= Wizard mode
37	LUA_BINDINGS_DESC= Bindings for LUA user scripts	35	LUA_BINDINGS_DESC= Bindings for LUA user scripts
38		36
39	MAKE_ARGS= prefix=${PREFIX} \	37	MAKE_ARGS= prefix=${PREFIX} \
Lines 52-60 Link Here
52	MAKE_ARGS+= V=yes	50	MAKE_ARGS+= V=yes
53	.endif	51	.endif
54		52
55	##.if empty(PORT_OPTIONS:MWIZARD)	53	.if empty(PORT_OPTIONS:MWIZARD)
56	##MAKE_ARGS+= NOWIZARD=y	54	MAKE_ARGS+= NOWIZARD=y
57	##.endif	55	.endif
58		56
59	.if ${PORT_OPTIONS:MSDL}	57	.if ${PORT_OPTIONS:MSDL}
60	CONFLICTS+= ${PORTNAME}-[0-9]*	58	CONFLICTS+= ${PORTNAME}-[0-9]*

Lines 1-4 Link Here

(-)games/stonesoup/files/patch-Makefile (-16 / +16 lines)
1	--- Makefile.orig 2015-03-23 01:49:21 UTC	1	--- Makefile.orig 2015-12-08 12:42:11 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -71,7 +71,7 @@	3	@@ -71,7 +71,7 @@
4	# them; you can also ask for a package with convenience libraries instead --	4	# them; you can also ask for a package with convenience libraries instead --
Lines 9-24 Link Here
9		9
10	# Disable GNU Make implicit rules and variables. Leaving them enabled will slow	10	# Disable GNU Make implicit rules and variables. Leaving them enabled will slow
11	# down MinGW and Cygwin builds by a very VERY noticeable degree. Besides, we have	11	# down MinGW and Cygwin builds by a very VERY noticeable degree. Besides, we have
12	@@ -103,7 +103,7 @@ include Makefile.obj	12	@@ -105,7 +105,7 @@ include Makefile.obj
13	#	13	# Which C++ standard to support
14		14	STDFLAG = -std=c++11
15		15
16	-CFOTHERS := -pipe $(EXTERNAL_FLAGS)	16	-CFOTHERS := -pipe $(EXTERNAL_FLAGS)
17	+CFOTHERS := $(CFLAGS)	17	+CFOTHERS := $(CFLAGS)
18	CFWARN :=	18	CFWARN :=
19	CFWARN_L := -Wall -Wformat-security -Wundef	19	CFWARN_L := -Wall -Wformat-security -Wundef
20		20
21	@@ -112,7 +112,7 @@ DEFINES := $(EXTERNAL_DEFINES)	21	@@ -114,7 +114,7 @@ DEFINES := $(EXTERNAL_DEFINES)
22	ifdef ANDROID	22	ifdef ANDROID
23	LDFLAGS := $(EXTERNAL_LDFLAGS) $(LDFLAGS)	23	LDFLAGS := $(EXTERNAL_LDFLAGS) $(LDFLAGS)
24	else	24	else
Lines 27-33 Link Here
27	endif	27	endif
28		28
29	#	29	#
30	@@ -120,8 +120,6 @@ endif	30	@@ -122,8 +122,6 @@ endif
31	#	31	#
32	AR = ar	32	AR = ar
33	RANLIB = ranlib	33	RANLIB = ranlib
Lines 36-42 Link Here
36	RM = rm -f	36	RM = rm -f
37	COPY = cp	37	COPY = cp
38	COPY_R = cp -r	38	COPY_R = cp -r
39	@@ -495,16 +493,6 @@ ifneq ($(GCC_VER),)	39	@@ -512,16 +510,6 @@ ifneq ($(GCC_VER),)
40	GCC_VER_SUFFIX:=-$(GCC_VER)	40	GCC_VER_SUFFIX:=-$(GCC_VER)
41	endif	41	endif
42		42
Lines 52-59 Link Here
52	-	52	-
53	ifneq ($(FORCE_CC),)	53	ifneq ($(FORCE_CC),)
54	GCC := $(FORCE_CC)	54	GCC := $(FORCE_CC)
55	else	55	HOSTCC := $(FORCE_CC)
56	@@ -554,15 +542,6 @@ ifdef USE_ICC	56	@@ -575,15 +563,6 @@ ifdef USE_ICC
57		57
58	# Some very good optimization flags.	58	# Some very good optimization flags.
59	CFOPTIMIZE := -O2 -parallel	59	CFOPTIMIZE := -O2 -parallel
Lines 69-75 Link Here
69	endif	69	endif
70		70
71	ifdef LTO	71	ifdef LTO
72	@@ -636,13 +615,13 @@ ifndef BUILD_LUA	72	@@ -655,13 +634,13 @@ ifndef BUILD_LUA
73	LUA_PACKAGE = lua-5.1	73	LUA_PACKAGE = lua-5.1
74	endif	74	endif
75	else	75	else
Lines 85-91 Link Here
85	endif	85	endif
86	INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I \| sed -e 's/-I/-isystem /')	86	INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I \| sed -e 's/-I/-isystem /')
87	CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)	87	CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
88	@@ -655,7 +634,7 @@ endif	88	@@ -674,7 +653,7 @@ endif
89		89
90	ifndef BUILD_SQLITE	90	ifndef BUILD_SQLITE
91	ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)	91	ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
Lines 94-100 Link Here
94	LIBS += $(SQLITE_LIB)	94	LIBS += $(SQLITE_LIB)
95	ifneq ($(shell grep -q sqlite3_prepare_v2 $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)	95	ifneq ($(shell grep -q sqlite3_prepare_v2 $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
96	DEFINES_L += -DANCIENT_SQLITE	96	DEFINES_L += -DANCIENT_SQLITE
97	@@ -743,7 +722,7 @@ endif	97	@@ -762,7 +741,7 @@ endif
98	endif	98	endif
99		99
100	DEFINES_L += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL2_CFLAGS)	100	DEFINES_L += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL2_CFLAGS)
Lines 103-109 Link Here
103		103
104	endif # TILES	104	endif # TILES
105		105
106	@@ -816,7 +795,7 @@ ifndef NOWIZARD	106	@@ -831,7 +810,7 @@ ifndef NOWIZARD
107	DEFINES += -DWIZARD	107	DEFINES += -DWIZARD
108	endif	108	endif
109	ifdef NO_OPTIMIZE	109	ifdef NO_OPTIMIZE
Lines 112-118 Link Here
112	endif	112	endif
113		113
114	ifdef PCH	114	ifdef PCH
115	@@ -943,7 +922,7 @@ else	115	@@ -958,7 +937,7 @@ else
116	SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\	116	SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\
117	{\	117	{\
118	fc-list \| sed 's/: .*//' \| grep -Fi "/$$name";\	118	fc-list \| sed 's/: .*//' \| grep -Fi "/$$name";\
Lines 121-127 Link Here
121	do [ -d $$dir ] && echo $$dir; done;\	121	do [ -d $$dir ] && echo $$dir; done;\
122	} \| xargs -I% find % -type f -iname $$name -print \| head -n1; } 2>/dev/null)	122	} \| xargs -I% find % -type f -iname $$name -print \| head -n1; } 2>/dev/null)
123	ifneq (,$(SYS_PROPORTIONAL_FONT))	123	ifneq (,$(SYS_PROPORTIONAL_FONT))
124	@@ -968,7 +947,7 @@ else	124	@@ -983,7 +962,7 @@ else
125	SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\	125	SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\
126	{\	126	{\
127	fc-list \| sed 's/: .*//' \| grep -Fi "/$$name";\	127	fc-list \| sed 's/: .*//' \| grep -Fi "/$$name";\
Lines 130-136 Link Here
130	do [ -d $$dir ] && echo $$dir; done;\	130	do [ -d $$dir ] && echo $$dir; done;\
131	} \| xargs -I% find % -type f -iname $$name -print \| head -n1; } 2>/dev/null)	131	} \| xargs -I% find % -type f -iname $$name -print \| head -n1; } 2>/dev/null)
132	ifneq (,$(SYS_MONOSPACED_FONT))	132	ifneq (,$(SYS_MONOSPACED_FONT))
133	@@ -1035,10 +1014,6 @@ CFWARN := -wd383,810,869,981,1418 -we14,	133	@@ -1050,10 +1029,6 @@ CFWARN := -wd383,810,869,981,1418 -we14,
134	CFWARN_L :=	134	CFWARN_L :=
135	endif	135	endif
136		136

Lines 80-85 Link Here

(-)games/stonesoup/pkg-plist (-6 / +3 lines)
80	%%DATADIR%%/dat/des/branches/vaults_rooms_hard.des	80	%%DATADIR%%/dat/des/branches/vaults_rooms_hard.des
81	%%DATADIR%%/dat/des/branches/vaults_rooms_standard.des	81	%%DATADIR%%/dat/des/branches/vaults_rooms_standard.des
82	%%DATADIR%%/dat/des/branches/zot.des	82	%%DATADIR%%/dat/des/branches/zot.des
		83	%%DATADIR%%/dat/des/builder/alphashops.des
83	%%DATADIR%%/dat/des/builder/arena.des	84	%%DATADIR%%/dat/des/builder/arena.des
84	%%DATADIR%%/dat/des/builder/decor.des	85	%%DATADIR%%/dat/des/builder/decor.des
85	%%DATADIR%%/dat/des/builder/dummy.des	86	%%DATADIR%%/dat/des/builder/dummy.des
Lines 125-131 Link Here
125	%%DATADIR%%/dat/des/serial/ice.des	126	%%DATADIR%%/dat/des/serial/ice.des
126	%%DATADIR%%/dat/des/serial/magic_research.des	127	%%DATADIR%%/dat/des/serial/magic_research.des
127	%%DATADIR%%/dat/des/serial/park.des	128	%%DATADIR%%/dat/des/serial/park.des
128	%%DATADIR%%/dat/des/serial/ponds.des
129	%%DATADIR%%/dat/des/serial/serial_guide.txt	129	%%DATADIR%%/dat/des/serial/serial_guide.txt
130	%%DATADIR%%/dat/des/serial/sigils.des	130	%%DATADIR%%/dat/des/serial/sigils.des
131	%%DATADIR%%/dat/des/serial/undead.des	131	%%DATADIR%%/dat/des/serial/undead.des
Lines 142-148 Link Here
142	%%DATADIR%%/dat/des/test.des	142	%%DATADIR%%/dat/des/test.des
143	%%DATADIR%%/dat/des/test/suite-los.des	143	%%DATADIR%%/dat/des/test/suite-los.des
144	%%DATADIR%%/dat/des/test/suite.des	144	%%DATADIR%%/dat/des/test/suite.des
145	%%DATADIR%%/dat/des/traps/beogh_trap.des
146	%%DATADIR%%/dat/des/traps/boulders.des	145	%%DATADIR%%/dat/des/traps/boulders.des
147	%%DATADIR%%/dat/des/traps/grate.des	146	%%DATADIR%%/dat/des/traps/grate.des
148	%%DATADIR%%/dat/des/traps/rats_trap.des	147	%%DATADIR%%/dat/des/traps/rats_trap.des
Lines 153-159 Link Here
153	%%DATADIR%%/dat/des/tutorial/lesson4.des	152	%%DATADIR%%/dat/des/tutorial/lesson4.des
154	%%DATADIR%%/dat/des/tutorial/lesson5.des	153	%%DATADIR%%/dat/des/tutorial/lesson5.des
155	%%DATADIR%%/dat/des/variable/ambush.des	154	%%DATADIR%%/dat/des/variable/ambush.des
156	%%DATADIR%%/dat/des/variable/ancient_champions.des
157	%%DATADIR%%/dat/des/variable/arcadia.des	155	%%DATADIR%%/dat/des/variable/arcadia.des
158	%%DATADIR%%/dat/des/variable/cathedral_bats.des	156	%%DATADIR%%/dat/des/variable/cathedral_bats.des
159	%%DATADIR%%/dat/des/variable/compat.des	157	%%DATADIR%%/dat/des/variable/compat.des
Lines 167-173 Link Here
167	%%DATADIR%%/dat/des/variable/mini.des	165	%%DATADIR%%/dat/des/variable/mini.des
168	%%DATADIR%%/dat/des/variable/mini_features.des	166	%%DATADIR%%/dat/des/variable/mini_features.des
169	%%DATADIR%%/dat/des/variable/mini_monsters.des	167	%%DATADIR%%/dat/des/variable/mini_monsters.des
170	%%DATADIR%%/dat/des/zotdef/zotdef.des
171	%%DATADIR%%/dat/descript/ability.txt	168	%%DATADIR%%/dat/descript/ability.txt
172	%%DATADIR%%/dat/descript/backgrounds.txt	169	%%DATADIR%%/dat/descript/backgrounds.txt
173	%%DATADIR%%/dat/descript/branches.txt	170	%%DATADIR%%/dat/descript/branches.txt
Lines 358-364 Link Here
358	%%DATADIR%%/dat/descript/pl/gods.txt	355	%%DATADIR%%/dat/descript/pl/gods.txt
359	%%DATADIR%%/dat/descript/pl/hints.txt	356	%%DATADIR%%/dat/descript/pl/hints.txt
360	%%DATADIR%%/dat/descript/pl/items.txt	357	%%DATADIR%%/dat/descript/pl/items.txt
361	%%DATADIR%%/dat/descript/pl/monsters.txt
362	%%DATADIR%%/dat/descript/pl/quotes.txt	358	%%DATADIR%%/dat/descript/pl/quotes.txt
363	%%DATADIR%%/dat/descript/pl/skills.txt	359	%%DATADIR%%/dat/descript/pl/skills.txt
364	%%DATADIR%%/dat/descript/pl/species.txt	360	%%DATADIR%%/dat/descript/pl/species.txt
Lines 537-542 Link Here
537	%%DATADIR%%/docs/develop/android.txt	533	%%DATADIR%%/docs/develop/android.txt
538	%%DATADIR%%/docs/develop/coding_conventions.txt	534	%%DATADIR%%/docs/develop/coding_conventions.txt
539	%%DATADIR%%/docs/develop/ctags.txt	535	%%DATADIR%%/docs/develop/ctags.txt
		536	%%DATADIR%%/docs/develop/editor_tips.txt
540	%%DATADIR%%/docs/develop/gdb_tips.txt	537	%%DATADIR%%/docs/develop/gdb_tips.txt
541	%%DATADIR%%/docs/develop/levels/advanced.txt	538	%%DATADIR%%/docs/develop/levels/advanced.txt
542	%%DATADIR%%/docs/develop/levels/introduction.txt	539	%%DATADIR%%/docs/develop/levels/introduction.txt
Lines 546-552 Link Here
546	%%DATADIR%%/docs/develop/new_dev_checklist.txt	543	%%DATADIR%%/docs/develop/new_dev_checklist.txt
547	%%DATADIR%%/docs/develop/patch_guide.txt	544	%%DATADIR%%/docs/develop/patch_guide.txt
548	%%DATADIR%%/docs/develop/process.txt	545	%%DATADIR%%/docs/develop/process.txt
549	%%DATADIR%%/docs/develop/release.txt
550	%%DATADIR%%/docs/develop/save_compatibility.txt	546	%%DATADIR%%/docs/develop/save_compatibility.txt
551	%%DATADIR%%/docs/develop/spells.txt	547	%%DATADIR%%/docs/develop/spells.txt
552	%%DATADIR%%/docs/develop/testing.txt	548	%%DATADIR%%/docs/develop/testing.txt
Lines 568-573 Link Here
568	%%DATADIR%%/settings/0.12_monster_glyphs.txt	564	%%DATADIR%%/settings/0.12_monster_glyphs.txt
569	%%DATADIR%%/settings/0.13_monster_glyphs.txt	565	%%DATADIR%%/settings/0.13_monster_glyphs.txt
570	%%DATADIR%%/settings/0.14_monster_glyphs.txt	566	%%DATADIR%%/settings/0.14_monster_glyphs.txt
		567	%%DATADIR%%/settings/0.16_monster_glyphs.txt
571	%%DATADIR%%/settings/0.9_monster_glyphs.txt	568	%%DATADIR%%/settings/0.9_monster_glyphs.txt
572	%%DATADIR%%/settings/034_command_keys.txt	569	%%DATADIR%%/settings/034_command_keys.txt
573	%%DATADIR%%/settings/034_monster_glyphs.txt	570	%%DATADIR%%/settings/034_monster_glyphs.txt