Attachment #171919 for bug #210670

Lines 2-8 Link Here

(-)Makefile (-2 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= stonesoup	4	PORTNAME= stonesoup
5	PORTVERSION= 0.17.1	5	PORTVERSION= 0.18.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 29-35 Link Here
29	SUB_FILES= README.FreeBSD	29	SUB_FILES= README.FreeBSD
30	PLIST_SUB= SAVEDIR="${SAVEDIR}"	30	PLIST_SUB= SAVEDIR="${SAVEDIR}"
31		31
32	OPTIONS_DEFINE= SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES	32	OPTIONS_DEFINE= SDL SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES
33		33
34	SOUND_DESC= Sound support	34	SOUND_DESC= Sound support
35	WIZARD_DESC= Wizard mode	35	WIZARD_DESC= Wizard mode
Lines 42-47 Link Here
42	INSTALL_UGRP=root:games \	42	INSTALL_UGRP=root:games \
43	NO_AUTO_OPT=YesPlease \	43	NO_AUTO_OPT=YesPlease \
44	NO_OPTIMIZE=YesPlease \	44	NO_OPTIMIZE=YesPlease \
		45	NO_TRY_GOLD=YesPlease \
		46	POSIX=YesPlease \
45	SQLITE_INCLUDE_DIR=${LOCALBASE}/include \	47	SQLITE_INCLUDE_DIR=${LOCALBASE}/include \
46	SQLITE_LIB=-lsqlite3	48	SQLITE_LIB=-lsqlite3
47		49

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (stone_soup-0.17.1-nodeps.tar.xz) = 6314ea8229ec5b27804ff1788988bd110a16aadeb6b2f26660645c43ecfc49dd	1	TIMESTAMP = 1467136972
2	SIZE (stone_soup-0.17.1-nodeps.tar.xz) = 9114224	2	SHA256 (stone_soup-0.18.1-nodeps.tar.xz) = 4bdad7778f88a99470c725ff74a8145bdd60032f9ae48ce597f74b8ae784d850
		3	SIZE (stone_soup-0.18.1-nodeps.tar.xz) = 9716104




--- Makefile.orig	2016-04-30 03:53:03 UTC
+++ Makefile
@@ -72,7 +72,7 @@
 #    them; you can also ask for a package with convenience libraries instead --
 #    we'll try to provide them somewhere in the near future.
 

 
 # 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
@@ -106,7 +106,7 @@ include Makefile.obj
 # Which C++ standard to support
 STDFLAG = -std=c++11
 

 CFWARN := 
 CFWARN_L := -Wall -Wformat-security -Wundef
 
@@ -121,8 +121,6 @@ endif
 ifdef ANDROID
 LDFLAGS := $(EXTERNAL_LDFLAGS) $(LDFLAGS)
 else
-LDFLAGS := $(EXTERNAL_LDFLAGS)
+# LDFLAGS := $(EXTERNAL_LDFLAGS)
 endif
 
 #
@@ -122,8 +122,6 @@ endif
 #
 AR = ar
 RANLIB = ranlib
-CC = $(GCC)

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

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

 endif
 
 ifdef LTO
@@ -660,7 +639,7 @@ ifndef BUILD_LUA
         LUA_PACKAGE = lua-5.1
       endif
     else
-      LUA_PACKAGE = lua5.1
+      LUA_PACKAGE = lua-5.1
     endif
   endif
 endif
 ifndef BUILD_LUA
   ifndef LUA_PACKAGE

   endif
   INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I | sed -e 's/-I/-isystem /')
   CFLAGS_L  += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
@@ -673,7 +652,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
@@ -830,7 +809,7 @@ ifndef NOWIZARD
 endif
 
 DEFINES_L += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL2_CFLAGS)
-INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL2_INCLUDE)
+INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL2_INCLUDE) $(GL_INCLUDE)
 
 endif # TILES
 
@@ -831,7 +810,7 @@ ifndef NOWIZARD
 DEFINES += -DWIZARD
 endif
 ifdef NO_OPTIMIZE

 endif
 
 ifdef PCH
@@ -957,7 +936,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))
@@ -982,7 +961,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
 
-ifeq (,$(shell echo 'int main(){return 1;}'|$(GXX) -x c++ - -o /dev/null -fuse-ld=gold 2>&1))
-  LDFLAGS += -fuse-ld=gold
-endif
-
 LDFLAGS += $(CFOPTIMIZE) $(CFOPTIMIZE_L)
 
 ifdef REPORT




--- crash.cc.orig	2016-06-28 19:06:21 UTC
+++ crash.cc
@@ -270,14 +270,6 @@ void init_crash_handler()
 
 void dump_crash_info(FILE* file)
 {
-#if defined(UNIX)
-    const char *name = strsignal(_crash_signal);
-    if (name == nullptr)
-        name = "INVALID";
-
-    fprintf(file, "Crash caused by signal #%d: %s\n\n", _crash_signal,
-            name);
-#endif
 }
 
 #if defined(BACKTRACE_SUPPORTED)




--- rltiles/Makefile.orig	2016-04-30 03:53:03 UTC
+++ rltiles/Makefile
@@ -11,7 +11,6 @@ endif
 # Also, cross-compilation with no system libraries for host rather than target
 # is not supported.  If host=target, contribs are enough.
 
 PKGCONFIG = pkg-config
-CFLAGS := -O2 $(STDFLAG) -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
 
 ifdef ANDROID
   CXXFLAGS :=
@@ -50,14 +49,14 @@ endif
@@ -49,14 +47,14 @@ endif
 
 # Attempt to use a full compiler name, to make
 # distcc builds work nicely.

 
 DELETE = rm -f
 
@@ -134,6 +133,6 @@ distclean: clean
 	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
 
 $(TILEGEN): $(OBJECTS)




%%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/pakellas_experiments.des
%%DATADIR%%/dat/des/altar/trog_burn_book.des
%%DATADIR%%/dat/des/altar/trog_wizard.des
%%DATADIR%%/dat/des/altar/vehumet_trees.des

%%DATADIR%%/dat/descript/backgrounds.txt
%%DATADIR%%/dat/descript/branches.txt
%%DATADIR%%/dat/descript/cards.txt
%%DATADIR%%/dat/descript/clouds.txt
%%DATADIR%%/dat/descript/commands.txt
%%DATADIR%%/dat/descript/cs/ability.txt
%%DATADIR%%/dat/descript/cs/branches.txt

%%DATADIR%%/dat/descript/skills.txt
%%DATADIR%%/dat/descript/species.txt
%%DATADIR%%/dat/descript/spells.txt
%%DATADIR%%/dat/descript/status.txt
%%DATADIR%%/dat/descript/sv/ability.txt
%%DATADIR%%/dat/descript/sv/cards.txt
%%DATADIR%%/dat/descript/sv/commands.txt

%%DATADIR%%/docs/develop/ctags.txt
%%DATADIR%%/docs/develop/editor_tips.txt
%%DATADIR%%/docs/develop/gdb_tips.txt
%%DATADIR%%/docs/develop/keys.txt
%%DATADIR%%/docs/develop/levels/advanced.txt
%%DATADIR%%/docs/develop/levels/introduction.txt
%%DATADIR%%/docs/develop/levels/syntax.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.17_monster_glyphs.txt
%%DATADIR%%/settings/0.9_monster_glyphs.txt
%%DATADIR%%/settings/034_command_keys.txt
%%DATADIR%%/settings/034_monster_glyphs.txt
%%DATADIR%%/settings/052_monster_glyphs.txt
%%DATADIR%%/settings/060_monster_glyphs.txt
%%DATADIR%%/settings/071_monster_glyphs.txt

Return to bug 210670

Lines 1-6 Link Here

(-)files/patch-Makefile (-47 / +11 lines)
1	--- Makefile.orig 2015-12-08 12:42:11 UTC	1	--- Makefile.orig 2016-04-30 03:53:03 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -71,7 +71,7 @@	3	@@ -72,7 +72,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 --
5	# we'll try to provide them somewhere in the near future.	5	# we'll try to provide them somewhere in the near future.
6		6
Lines 9-15 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	@@ -105,7 +105,7 @@ include Makefile.obj	12	@@ -106,7 +106,7 @@ include Makefile.obj
13	# Which C++ standard to support	13	# Which C++ standard to support
14	STDFLAG = -std=c++11	14	STDFLAG = -std=c++11
15		15
Lines 18-34 Link Here
18	CFWARN :=	18	CFWARN :=
19	CFWARN_L := -Wall -Wformat-security -Wundef	19	CFWARN_L := -Wall -Wformat-security -Wundef
20		20
21	@@ -114,7 +114,7 @@ DEFINES := $(EXTERNAL_DEFINES)	21	@@ -121,8 +121,6 @@ endif
22	ifdef ANDROID
23	LDFLAGS := $(EXTERNAL_LDFLAGS) $(LDFLAGS)
24	else
25	-LDFLAGS := $(EXTERNAL_LDFLAGS)
26	+# LDFLAGS := $(EXTERNAL_LDFLAGS)
27	endif
28
29	#	22	#
30	@@ -122,8 +122,6 @@ endif
31	#
32	AR = ar	23	AR = ar
33	RANLIB = ranlib	24	RANLIB = ranlib
34	-CC = $(GCC)	25	-CC = $(GCC)
Lines 36-42 Link Here
36	RM = rm -f	27	RM = rm -f
37	COPY = cp	28	COPY = cp
38	COPY_R = cp -r	29	COPY_R = cp -r
39	@@ -512,16 +510,6 @@ ifneq ($(GCC_VER),)	30	@@ -511,16 +509,6 @@ ifneq ($(GCC_VER),)
40	GCC_VER_SUFFIX:=-$(GCC_VER)	31	GCC_VER_SUFFIX:=-$(GCC_VER)
41	endif	32	endif
42		33
Lines 53-59 Link Here
53	ifneq ($(FORCE_CC),)	44	ifneq ($(FORCE_CC),)
54	GCC := $(FORCE_CC)	45	GCC := $(FORCE_CC)
55	HOSTCC := $(FORCE_CC)	46	HOSTCC := $(FORCE_CC)
56	@@ -575,15 +563,6 @@ ifdef USE_ICC	47	@@ -574,15 +562,6 @@ ifdef USE_ICC
57		48
58	# Some very good optimization flags.	49	# Some very good optimization flags.
59	CFOPTIMIZE := -O2 -parallel	50	CFOPTIMIZE := -O2 -parallel
Lines 69-82 Link Here
69	endif	60	endif
70		61
71	ifdef LTO	62	ifdef LTO
72	@@ -655,13 +634,13 @@ ifndef BUILD_LUA	63	@@ -660,7 +639,7 @@ ifndef BUILD_LUA
73	LUA_PACKAGE = lua-5.1
74	endif
75	else
76	- LUA_PACKAGE = lua5.1
77	+ LUA_PACKAGE = lua-5.1
78	endif
79	endif
80	endif	64	endif
81	ifndef BUILD_LUA	65	ifndef BUILD_LUA
82	ifndef LUA_PACKAGE	66	ifndef LUA_PACKAGE
Lines 85-91 Link Here
85	endif	69	endif
86	INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I \| sed -e 's/-I/-isystem /')	70	INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I \| sed -e 's/-I/-isystem /')
87	CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)	71	CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
88	@@ -674,7 +653,7 @@ endif	72	@@ -673,7 +652,7 @@ endif
89		73
90	ifndef BUILD_SQLITE	74	ifndef BUILD_SQLITE
91	ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)	75	ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
Lines 94-109 Link Here
94	LIBS += $(SQLITE_LIB)	78	LIBS += $(SQLITE_LIB)
95	ifneq ($(shell grep -q sqlite3_prepare_v2 $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)	79	ifneq ($(shell grep -q sqlite3_prepare_v2 $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
96	DEFINES_L += -DANCIENT_SQLITE	80	DEFINES_L += -DANCIENT_SQLITE
97	@@ -762,7 +741,7 @@ endif	81	@@ -830,7 +809,7 @@ ifndef NOWIZARD
98	endif
99
100	DEFINES_L += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL2_CFLAGS)
101	-INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL2_INCLUDE)
102	+INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL2_INCLUDE) $(GL_INCLUDE)
103
104	endif # TILES
105
106	@@ -831,7 +810,7 @@ ifndef NOWIZARD
107	DEFINES += -DWIZARD	82	DEFINES += -DWIZARD
108	endif	83	endif
109	ifdef NO_OPTIMIZE	84	ifdef NO_OPTIMIZE
Lines 112-118 Link Here
112	endif	87	endif
113		88
114	ifdef PCH	89	ifdef PCH
115	@@ -958,7 +937,7 @@ else	90	@@ -957,7 +936,7 @@ else
116	SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\	91	SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\
117	{\	92	{\
118	fc-list \| sed 's/: .*//' \| grep -Fi "/$$name";\	93	fc-list \| sed 's/: .*//' \| grep -Fi "/$$name";\
Lines 121-127 Link Here
121	do [ -d $$dir ] && echo $$dir; done;\	96	do [ -d $$dir ] && echo $$dir; done;\
122	} \| xargs -I% find % -type f -iname $$name -print \| head -n1; } 2>/dev/null)	97	} \| xargs -I% find % -type f -iname $$name -print \| head -n1; } 2>/dev/null)
123	ifneq (,$(SYS_PROPORTIONAL_FONT))	98	ifneq (,$(SYS_PROPORTIONAL_FONT))
124	@@ -983,7 +962,7 @@ else	99	@@ -982,7 +961,7 @@ else
125	SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\	100	SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\
126	{\	101	{\
127	fc-list \| sed 's/: .*//' \| grep -Fi "/$$name";\	102	fc-list \| sed 's/: .*//' \| grep -Fi "/$$name";\
Lines 130-143 Link Here
130	do [ -d $$dir ] && echo $$dir; done;\	105	do [ -d $$dir ] && echo $$dir; done;\
131	} \| xargs -I% find % -type f -iname $$name -print \| head -n1; } 2>/dev/null)	106	} \| xargs -I% find % -type f -iname $$name -print \| head -n1; } 2>/dev/null)
132	ifneq (,$(SYS_MONOSPACED_FONT))	107	ifneq (,$(SYS_MONOSPACED_FONT))
133	@@ -1050,10 +1029,6 @@ CFWARN := -wd383,810,869,981,1418 -we14,
134	CFWARN_L :=
135	endif
136
137	-ifeq (,$(shell echo 'int main(){return 1;}'\|$(GXX) -x c++ - -o /dev/null -fuse-ld=gold 2>&1))
138	- LDFLAGS += -fuse-ld=gold
139	-endif
140	-
141	LDFLAGS += $(CFOPTIMIZE) $(CFOPTIMIZE_L)
142
143	ifdef REPORT

Line 0 Link Here

(-)files/patch-crash.cc (+17 lines)
	1	--- crash.cc.orig 2016-06-28 19:06:21 UTC
	2	+++ crash.cc
	3	@@ -270,14 +270,6 @@ void init_crash_handler()
	4
	5	void dump_crash_info(FILE* file)
	6	{
	7	-#if defined(UNIX)
	8	- const char *name = strsignal(_crash_signal);
	9	- if (name == nullptr)
	10	- name = "INVALID";
	11	-
	12	- fprintf(file, "Crash caused by signal #%d: %s\n\n", _crash_signal,
	13	- name);
	14	-#endif
	15	}
	16
	17	#if defined(BACKTRACE_SUPPORTED)

Lines 1-15 Link Here

(-)files/patch-rltiles_Makefile (-7 / +6 lines)
1	--- rltiles/Makefile.orig 2015-12-15 18:50:32 UTC	1	--- rltiles/Makefile.orig 2016-04-30 03:53:03 UTC
2	+++ rltiles/Makefile	2	+++ rltiles/Makefile
3	@@ -10,8 +10,6 @@ endif	3	@@ -11,7 +11,6 @@ endif
4	# Also, cross-compilation with no system libraries for host rather than target
5	# is not supported. If host=target, contribs are enough.	4	# is not supported. If host=target, contribs are enough.
6		5
		6	PKGCONFIG = pkg-config
7	-CFLAGS := -O2 $(STDFLAG) -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 :=
11	LDFLAGS :=	11	@@ -50,14 +49,14 @@ endif
12	@@ -49,14 +47,14 @@ endif
13		12
14	# Attempt to use a full compiler name, to make	13	# Attempt to use a full compiler name, to make
15	# distcc builds work nicely.	14	# distcc builds work nicely.
Lines 27-33 Link Here
27		26
28	DELETE = rm -f	27	DELETE = rm -f
29		28
30	@@ -133,6 +131,6 @@ distclean: clean	29	@@ -134,6 +133,6 @@ distclean: clean
31	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@	30	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
32		31
33	$(TILEGEN): $(OBJECTS)	32	$(TILEGEN): $(OBJECTS)

Lines 43-48 Link Here

(-)pkg-plist (-1 / +5 lines)
43	%%DATADIR%%/dat/des/altar/nemelex_the_gamble.des	43	%%DATADIR%%/dat/des/altar/nemelex_the_gamble.des
44	%%DATADIR%%/dat/des/altar/okawaru_arena.des	44	%%DATADIR%%/dat/des/altar/okawaru_arena.des
45	%%DATADIR%%/dat/des/altar/overflow.des	45	%%DATADIR%%/dat/des/altar/overflow.des
		46	%%DATADIR%%/dat/des/altar/pakellas_experiments.des
46	%%DATADIR%%/dat/des/altar/trog_burn_book.des	47	%%DATADIR%%/dat/des/altar/trog_burn_book.des
47	%%DATADIR%%/dat/des/altar/trog_wizard.des	48	%%DATADIR%%/dat/des/altar/trog_wizard.des
48	%%DATADIR%%/dat/des/altar/vehumet_trees.des	49	%%DATADIR%%/dat/des/altar/vehumet_trees.des
Lines 169-174 Link Here
169	%%DATADIR%%/dat/descript/backgrounds.txt	170	%%DATADIR%%/dat/descript/backgrounds.txt
170	%%DATADIR%%/dat/descript/branches.txt	171	%%DATADIR%%/dat/descript/branches.txt
171	%%DATADIR%%/dat/descript/cards.txt	172	%%DATADIR%%/dat/descript/cards.txt
		173	%%DATADIR%%/dat/descript/clouds.txt
172	%%DATADIR%%/dat/descript/commands.txt	174	%%DATADIR%%/dat/descript/commands.txt
173	%%DATADIR%%/dat/descript/cs/ability.txt	175	%%DATADIR%%/dat/descript/cs/ability.txt
174	%%DATADIR%%/dat/descript/cs/branches.txt	176	%%DATADIR%%/dat/descript/cs/branches.txt
Lines 388-393 Link Here
388	%%DATADIR%%/dat/descript/skills.txt	390	%%DATADIR%%/dat/descript/skills.txt
389	%%DATADIR%%/dat/descript/species.txt	391	%%DATADIR%%/dat/descript/species.txt
390	%%DATADIR%%/dat/descript/spells.txt	392	%%DATADIR%%/dat/descript/spells.txt
		393	%%DATADIR%%/dat/descript/status.txt
391	%%DATADIR%%/dat/descript/sv/ability.txt	394	%%DATADIR%%/dat/descript/sv/ability.txt
392	%%DATADIR%%/dat/descript/sv/cards.txt	395	%%DATADIR%%/dat/descript/sv/cards.txt
393	%%DATADIR%%/dat/descript/sv/commands.txt	396	%%DATADIR%%/dat/descript/sv/commands.txt
Lines 535-540 Link Here
535	%%DATADIR%%/docs/develop/ctags.txt	538	%%DATADIR%%/docs/develop/ctags.txt
536	%%DATADIR%%/docs/develop/editor_tips.txt	539	%%DATADIR%%/docs/develop/editor_tips.txt
537	%%DATADIR%%/docs/develop/gdb_tips.txt	540	%%DATADIR%%/docs/develop/gdb_tips.txt
		541	%%DATADIR%%/docs/develop/keys.txt
538	%%DATADIR%%/docs/develop/levels/advanced.txt	542	%%DATADIR%%/docs/develop/levels/advanced.txt
539	%%DATADIR%%/docs/develop/levels/introduction.txt	543	%%DATADIR%%/docs/develop/levels/introduction.txt
540	%%DATADIR%%/docs/develop/levels/syntax.txt	544	%%DATADIR%%/docs/develop/levels/syntax.txt
Lines 565-573 Link Here
565	%%DATADIR%%/settings/0.13_monster_glyphs.txt	569	%%DATADIR%%/settings/0.13_monster_glyphs.txt
566	%%DATADIR%%/settings/0.14_monster_glyphs.txt	570	%%DATADIR%%/settings/0.14_monster_glyphs.txt
567	%%DATADIR%%/settings/0.16_monster_glyphs.txt	571	%%DATADIR%%/settings/0.16_monster_glyphs.txt
		572	%%DATADIR%%/settings/0.17_monster_glyphs.txt
568	%%DATADIR%%/settings/0.9_monster_glyphs.txt	573	%%DATADIR%%/settings/0.9_monster_glyphs.txt
569	%%DATADIR%%/settings/034_command_keys.txt	574	%%DATADIR%%/settings/034_command_keys.txt
570	%%DATADIR%%/settings/034_monster_glyphs.txt
571	%%DATADIR%%/settings/052_monster_glyphs.txt	575	%%DATADIR%%/settings/052_monster_glyphs.txt
572	%%DATADIR%%/settings/060_monster_glyphs.txt	576	%%DATADIR%%/settings/060_monster_glyphs.txt
573	%%DATADIR%%/settings/071_monster_glyphs.txt	577	%%DATADIR%%/settings/071_monster_glyphs.txt