Attachment #156718 for bug #200158

Lines 2-11 Link Here

(-)games/stonesoup/Makefile (-9 / +14 lines)
2	# $FreeBSD: head/games/stonesoup/Makefile 381876 2015-03-21 23:05:19Z bapt $	2	# $FreeBSD: head/games/stonesoup/Makefile 381876 2015-03-21 23:05:19Z bapt $
3		3
4	PORTNAME= stonesoup	4	PORTNAME= stonesoup
5	PORTVERSION= 0.15.2	5	PORTVERSION= 0.16.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}
		8	MASTER_SITES= http://crawl.develz.org/release/
9	DISTNAME= stone_soup-${PORTVERSION}-nodeps	9	DISTNAME= stone_soup-${PORTVERSION}-nodeps
10		10
11	MAINTAINER= tobias.rehbein@web.de	11	MAINTAINER= tobias.rehbein@web.de
Lines 25-34 Link Here
25	SUB_FILES= README.FreeBSD	25	SUB_FILES= README.FreeBSD
26	PLIST_SUB= SAVEDIR="${SAVEDIR}"	26	PLIST_SUB= SAVEDIR="${SAVEDIR}"
27		27
28	OPTIONS_DEFINE= SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES	28	# WIZARD is currently broken upstream, remove until fixed
		29	##OPTIONS_DEFINE= SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES
		30	OPTIONS_DEFINE= SOUND LUA_BINDINGS DOCS EXAMPLES
29		31
30	SOUND_DESC= Sound support	32	SOUND_DESC= Sound support
31	WIZARD_DESC= Wizard mode	33	##WIZARD_DESC= Wizard mode
32	LUA_BINDINGS_DESC= Bindings for LUA user scripts	34	LUA_BINDINGS_DESC= Bindings for LUA user scripts
33		35
34	MAKE_ARGS= prefix=${PREFIX} \	36	MAKE_ARGS= prefix=${PREFIX} \
Lines 40-45 Link Here
40	NO_OPTIMIZE=YesPlease \	42	NO_OPTIMIZE=YesPlease \
41	SQLITE_INCLUDE_DIR=${LOCALBASE}/include \	43	SQLITE_INCLUDE_DIR=${LOCALBASE}/include \
42	SQLITE_LIB=-lsqlite3 \	44	SQLITE_LIB=-lsqlite3 \
		45	SRC_VERSION=${PORTVERSION} \
43	LDFLAGS="-L${LOCALBASE}/lib"	46	LDFLAGS="-L${LOCALBASE}/lib"
44		47
45	.include <bsd.port.options.mk>	48	.include <bsd.port.options.mk>
Lines 48-60 Link Here
48	MAKE_ARGS+= V=yes	51	MAKE_ARGS+= V=yes
49	.endif	52	.endif
50		53
51	.if empty(PORT_OPTIONS:MWIZARD)	54	##.if empty(PORT_OPTIONS:MWIZARD)
52	MAKE_ARGS+= NOWIZARD=y	55	##MAKE_ARGS+= NOWIZARD=y
53	.endif	56	##.endif
54		57
55	.if ${PORT_OPTIONS:MSDL}	58	.if ${PORT_OPTIONS:MSDL}
56	CONFLICTS+= ${PORTNAME}-[0-9]*	59	CONFLICTS+= ${PORTNAME}-[0-9]*
57	MAKE_ARGS+= TILES=y	60	MAKE_ARGS+= TILES=y \
		61	GL_INCLUDE="-I ${LOCALBASE}/include/GL"
58	PLIST_SUB+= SDL=""	62	PLIST_SUB+= SDL=""
59	PKGNAMESUFFIX= -sdl	63	PKGNAMESUFFIX= -sdl
60	BUILD_DEPENDS+= fc-list:${PORTSDIR}/x11-fonts/fontconfig \	64	BUILD_DEPENDS+= fc-list:${PORTSDIR}/x11-fonts/fontconfig \
Lines 62-68 Link Here
62	RUN_DEPENDS+= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu	66	RUN_DEPENDS+= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
63	LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \	67	LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \
64	libfreetype.so:${PORTSDIR}/print/freetype2	68	libfreetype.so:${PORTSDIR}/print/freetype2
65	USE_SDL= sdl image	69	USE_SDL= sdl2 image2
		70	USE_GL= yes
66	.else	71	.else
67	USES+= ncurses	72	USES+= ncurses
68	CONFLICTS+= ${PORTNAME}-sdl-[0-9]*	73	CONFLICTS+= ${PORTNAME}-sdl-[0-9]*

Lines 1-2 Link Here

(-)games/stonesoup/distinfo (-2 / +2 lines)
1	SHA256 (stone_soup-0.15.2-nodeps.tar.xz) = e93a82880801fb60794c9c05ccbab03d5c7e1f105e5968d2cebc760d387a21e2	1	SHA256 (stone_soup-0.16.1-nodeps.tar.xz) = e93ae81f93dbeec17c1bd9ac8bcd84e951a5856124fb7c93c336e9678ab9cfe4
2	SIZE (stone_soup-0.15.2-nodeps.tar.xz) = 8979684	2	SIZE (stone_soup-0.16.1-nodeps.tar.xz) = 9250980

Lines 1-6 Link Here

(-)games/stonesoup/files/patch-AppHdr.h (-3 / +3 lines)
1	--- ./AppHdr.h.orig 2014-08-28 05:28:56.000000000 +0200	1	--- AppHdr.h.orig 2015-03-23 03:11:58 UTC
2	+++ ./AppHdr.h 2014-08-29 18:32:12.007217932 +0200	2	+++ AppHdr.h
3	@@ -146,7 +146,7 @@	3	@@ -147,7 +147,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-03-23 03:11:58 UTC
+++ Makefile
@@ -71,7 +71,7 @@
 #    them; you can also ask for a package with convenience libraries instead --
 #    we'll try to provide them somewhere in the near future.
 
-GAME = crawl
+GAME = stonesoup
 
 # 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
@@ -103,7 +103,7 @@ include Makefile.obj
 #
 
 
-CFOTHERS := -pipe $(EXTERNAL_FLAGS)
+CFOTHERS := $(CFLAGS)
 CFWARN := 
 CFWARN_L := -Wall -Wformat-security -Wundef
 
@@ -120,8 +120,6 @@ endif
 #
 AR = ar
 RANLIB = ranlib

 RM = rm -f
 COPY = cp
 COPY_R = cp -r
@@ -559,9 +557,9 @@ else
   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.

   endif
 endif
 
@@ -636,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)
@@ -655,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
@@ -743,7 +741,7 @@ endif
 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
 
@@ -816,7 +814,7 @@ ifndef NOWIZARD
 DEFINES += -DWIZARD
 endif
 ifdef NO_OPTIMIZE

 endif
 
 ifdef PCH
@@ -943,7 +941,7 @@ else
   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;\
+      for dir in %%LOCALBASE%%/share/fonts;\
       do [ -d $$dir ] && echo $$dir; done;\
     } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
   ifneq (,$(SYS_PROPORTIONAL_FONT))
@@ -968,7 +966,7 @@ else
   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;\
+      for dir in %%LOCALBASE%%/share/fonts;\
       do [ -d $$dir ] && echo $$dir; done;\
     } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
   ifneq (,$(SYS_MONOSPACED_FONT))
@@ -1177,7 +1175,6 @@ GENERATED_FILES := $(GENERATED_HEADERS) 
 
 LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
 SRC_PKG_BASE  := stone_soup
-SRC_VERSION   := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
+SRC_VERSION   := $(shell cat util/release_ver)
 MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|sed -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
 
 export SRC_VERSION
@@ -1311,6 +1308,7 @@ compflag.h: $(OBJECTS:.o=.cc) util/gen-c
 	$(QUIET_GEN)util/gen-cflg.pl compflag.h "$(ALL_CFLAGS)" "$(LDFLAGS)" "$(HOST)" "$(ARCH)"
 
 build.h: $(OBJECTS:.o=.cc) util/gen_ver.pl
+	@echo "$(SRC_VERSION)" > util/release_ver
 	$(QUIET_GEN)util/gen_ver.pl $@ $(MERGE_BASE)
 
 version.o: build.h compflag.h




--- ./dat/des/branches/dis.des.orig	2014-08-28 05:28:57.000000000 +0200
+++ ./dat/des/branches/dis.des	2014-08-29 18:32:12.084218945 +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




--- ./dat/des/builder/shops.des.orig	2014-08-28 05:28:57.000000000 +0200
+++ ./dat/des/builder/shops.des	2014-08-29 18:32:12.133218080 +0200
@@ -387,15 +387,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:vampirism 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:vampirism 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-08-28 05:28:57.000000000 +0200
+++ ./dat/des/variable/grated_community.des	2014-08-29 18:34:10.515212244 +0200
@@ -67,11 +67,7 @@
 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 @@
 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 beef jerky
-: kitem("$ = q:" .. crawl.random_range(1, 5) .. " beef jerky / 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) .. " beef jerky / 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
@@ -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("? = 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  \
@@ -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("! = 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
@@ -248,8 +236,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




--- rltiles/Makefile.orig	2015-03-23 03:11:58 UTC
+++ rltiles/Makefile
@@ -10,8 +10,6 @@ endif
 # Also, cross-compilation with no system libraries for host rather than target
 # is not supported.  If host=target, contribs are enough.
 
-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
-
 ifdef ANDROID
   CXXFLAGS :=
   LDFLAGS :=
@@ -49,14 +47,14 @@ endif
 
 # Attempt to use a full compiler name, to make
 # distcc builds work nicely.
-LMACH := $(shell gcc -dumpmachine)-
+LMACH := $(shell $(CC) -dumpmachine)-
 ifeq ($(LMACH),-)
 LMACH :=
 endif
-ifeq ($(shell which $(LMACH)gcc > /dev/null 2> /dev/null && echo "Yes"),)
+ifeq ($(shell which $(LMACH)$(CC) > /dev/null 2> /dev/null && echo "Yes"),)
 LMACH :=
 endif
-HOSTCXX ?= $(LMACH)g++
+HOSTCXX ?= $(LMACH)$(CXX)
 
 DELETE = rm -f
 
@@ -133,6 +131,6 @@ distclean: clean
 	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
 
 $(TILEGEN): $(OBJECTS)
-	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
+	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS) $(PNG_LIB)
 
 .PHONY: all clean distclean




--- ./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)
 
 ifneq (,$(findstring MINGW,$(uname_S)))
-LDFLAGS += -lmingw32
+L_LDFLAGS += -lmingw32
 endif
 
 # Note: since generation of tiles is done on the host, we don't care about
@@ -10,7 +10,7 @@
 # Also, cross-compilation with no system libraries for host rather than target
 # is not supported.  If host=target, contribs are enough.
 
-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
+L_CFLAGS := $(CFLAGS)
 
 ifdef ANDROID
   CXXFLAGS :=
@@ -35,24 +35,24 @@
     PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a
   endif
 
-  CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE)
-  LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB)
+  L_CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE)
+  L_LDFLAGS += $(LDFLAGS) $(SDL_LDFLAGS) $(PNG_LIB)
 
-  CFLAGS += -DUSE_TILE
+  L_CFLAGS += -DUSE_TILE
 endif
 
 ifdef DEBUG
-CFLAGS += -O0 -DDEBUG -ggdb
+L_CFLAGS += -O0 -DDEBUG -ggdb
 endif
 
 ifneq (,$(findstring MINGW,$(uname_S)))
-LDFLAGS += -lgdi32 -lwinmm
+L_LDFLAGS += -lgdi32 -lwinmm
 endif
 ifeq ($(uname_S),Darwin)
-LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL
+L_LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL
 endif
 ifeq ($(uname_S),Linux)
-LDFLAGS += -ldl -lpthread
+L_LDFLAGS += -ldl -lpthread
 endif
 
 # Attempt to use a full compiler name, to make
@@ -64,7 +64,7 @@
 ifeq ($(shell which $(LMACH)gcc > /dev/null 2> /dev/null && echo "Yes"),)
 LMACH :=
 endif
-HOSTCXX ?= $(LMACH)g++
+HOSTCXX ?= $(LMACH)$(CXX)
 
 DELETE = rm -f
 
@@ -109,7 +109,7 @@
 	$(QUIET_GEN)$(TILEGEN) -c $<
 
 # CFLAGS difference check
-TRACK_CFLAGS = $(subst ','\'',$(HOSTCXX) $(CFLAGS))           # (stray ' for highlights)
+TRACK_CFLAGS = $(subst ','\'',$(HOSTCXX) $(L_CFLAGS))           # (stray ' for highlights)
 
 .cflags: .force-cflags
 	@FLAGS='$(TRACK_CFLAGS)'; \
@@ -138,9 +138,9 @@
 distclean: clean
 
 %.o: %.cc .cflags
-	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
+	$(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -MMD -c $< -o $@
 
 $(TILEGEN): $(OBJECTS)
-	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
+	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(L_LDFLAGS)
 
 .PHONY: all clean distclean

Lines 1-6 Link Here

(-)games/stonesoup/files/patch-rltiles__tool__tile.cc (-3 / +3 lines)
1	--- ./rltiles/tool/tile.cc.orig 2014-04-09 17:36:33.000000000 +0200	1	--- rltiles/tool/tile.cc.orig 2015-03-23 03:11:58 UTC
2	+++ ./rltiles/tool/tile.cc 2014-05-06 21:21:37.808135615 +0200	2	+++ rltiles/tool/tile.cc
3	@@ -123,10 +123,10 @@	3	@@ -123,10 +123,10 @@ void tile::add_rim(const tile_colour &ri
4	if (flags[x + y * m_width])	4	if (flags[x + y * m_width])
5	continue;	5	continue;
6		6

Lines 1-6 Link Here

(-)games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc (-3 / +3 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 2015-03-23 03:11:58 UTC
2	+++ ./rltiles/tool/tile_list_processor.cc 2013-10-11 22:07:08.181888672 +0200	2	+++ rltiles/tool/tile_list_processor.cc
3	@@ -52,7 +52,7 @@	3	@@ -52,7 +52,7 @@ bool tile_list_processor::load_image(til
4	""	4	""
5	};	5	};
6		6




%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.crawlrc
%%DATADIR%%/dat/clua/autofight.lua
%%DATADIR%%/dat/clua/automagic.lua
%%DATADIR%%/dat/clua/gearset.lua
%%DATADIR%%/dat/clua/kills.lua
%%DATADIR%%/dat/clua/runrest.lua
%%DATADIR%%/dat/clua/stash.lua
%%DATADIR%%/dat/clua/trapwalk.lua
%%DATADIR%%/dat/clua/wield.lua
%%DATADIR%%/dat/database/FAQ.txt
%%DATADIR%%/dat/database/el/monflee.txt
%%DATADIR%%/dat/database/el/rand_all.txt

%%DATADIR%%/dat/database/wpnnoise.txt
%%DATADIR%%/dat/defaults/autopickup_exceptions.txt
%%DATADIR%%/dat/defaults/food_colouring.txt
%%DATADIR%%/dat/defaults/glyph_colours.txt
%%DATADIR%%/dat/defaults/menu_colours.txt
%%DATADIR%%/dat/defaults/messages.txt
%%DATADIR%%/dat/defaults/misc.txt

%%DATADIR%%/dat/des/builder/food.des
%%DATADIR%%/dat/des/builder/layout.des
%%DATADIR%%/dat/des/builder/layout_caves.des
%%DATADIR%%/dat/des/builder/layout_cc.des
%%DATADIR%%/dat/des/builder/layout_cellular.des
%%DATADIR%%/dat/des/builder/layout_city.des
%%DATADIR%%/dat/des/builder/layout_delve.des
%%DATADIR%%/dat/des/builder/layout_forest.des
%%DATADIR%%/dat/des/builder/layout_geoelf.des
%%DATADIR%%/dat/des/builder/layout_geoelf_castle.des
%%DATADIR%%/dat/des/builder/layout_grids.des
%%DATADIR%%/dat/des/builder/layout_halls.des
%%DATADIR%%/dat/des/builder/layout_loops.des

%%DATADIR%%/dat/dlua/luamark.lua
%%DATADIR%%/dat/dlua/macro.lua
%%DATADIR%%/dat/dlua/mapinit.lua
%%DATADIR%%/dat/dlua/persist.lua
%%DATADIR%%/dat/dlua/point.lua
%%DATADIR%%/dat/dlua/profiler.lua
%%DATADIR%%/dat/dlua/sanity.lua

%%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_baconkid_duvessa_dowan.png
%%SDL%%%%DATADIR%%/dat/tiles/title_baconkid_gastronok.png
%%SDL%%%%DATADIR%%/dat/tiles/title_baconkid_mnoleg.png
%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_dragon.png

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

%%DATADIR%%/settings/080_monster_glyphs.txt
%%DATADIR%%/settings/advanced_optioneering.txt
%%DATADIR%%/settings/colemak_command_keys.txt
%%DATADIR%%/settings/dec_glyphs.txt
%%DATADIR%%/settings/dvorak_command_keys.txt
%%DATADIR%%/settings/ibm_glyphs.txt
%%DATADIR%%/settings/init.txt
%%DATADIR%%/settings/no_vi_command_keys.txt
%%DATADIR%%/settings/old_unicode_glyphs.txt
%%DATADIR%%/settings/safe_move_shift.txt
@dir %%DATADIR%%/dat/clua
@dir %%DATADIR%%/dat/database/el
@dir %%DATADIR%%/dat/database/pl
@dir %%DATADIR%%/dat/database
@dir %%DATADIR%%/dat/defaults
@dir %%DATADIR%%/dat/des/altar
@dir %%DATADIR%%/dat/des/arrival
@dir %%DATADIR%%/dat/des/branches
@dir %%DATADIR%%/dat/des/builder
@dir %%DATADIR%%/dat/des/portals
@dir %%DATADIR%%/dat/des/serial
@dir %%DATADIR%%/dat/des/sprint
@dir %%DATADIR%%/dat/des/test
@dir %%DATADIR%%/dat/des/traps
@dir %%DATADIR%%/dat/des/tutorial
@dir %%DATADIR%%/dat/des/variable
@dir %%DATADIR%%/dat/des/zotdef
@dir %%DATADIR%%/dat/des
@dir %%DATADIR%%/dat/descript/cs
@dir %%DATADIR%%/dat/descript/da
@dir %%DATADIR%%/dat/descript/de
@dir %%DATADIR%%/dat/descript/el
@dir %%DATADIR%%/dat/descript/es
@dir %%DATADIR%%/dat/descript/fi
@dir %%DATADIR%%/dat/descript/fr
@dir %%DATADIR%%/dat/descript/hu
@dir %%DATADIR%%/dat/descript/it
@dir %%DATADIR%%/dat/descript/ja
@dir %%DATADIR%%/dat/descript/ko
@dir %%DATADIR%%/dat/descript/lt
@dir %%DATADIR%%/dat/descript/lv
@dir %%DATADIR%%/dat/descript/nl
@dir %%DATADIR%%/dat/descript/pl
@dir %%DATADIR%%/dat/descript/pt
@dir %%DATADIR%%/dat/descript/ru
@dir %%DATADIR%%/dat/descript/sv
@dir %%DATADIR%%/dat/descript/tr
@dir %%DATADIR%%/dat/descript/zh
@dir %%DATADIR%%/dat/descript
@dir %%DATADIR%%/dat/dlua/layout
@dir %%DATADIR%%/dat/dlua
%%SDL%%@dir %%DATADIR%%/dat/tiles
@dir %%DATADIR%%/dat
@dir %%DATADIR%%/docs/develop/levels
@dir %%DATADIR%%/docs/develop
@dir %%DATADIR%%/docs/license
@dir %%DATADIR%%/docs
@dir %%DATADIR%%/settings
@dir %%DATADIR%%

Return to bug 200158

Lines 1-24 Link Here

(-)games/stonesoup/files/patch-Makefile (-33 / +49 lines)
1	--- ./Makefile.orig 2014-08-28 05:28:56.000000000 +0200	1	--- Makefile.orig 2015-03-23 03:11:58 UTC
2	+++ ./Makefile 2014-08-29 18:32:12.040229158 +0200	2	+++ Makefile
3	@@ -69,7 +69,7 @@	3	@@ -71,7 +71,7 @@
4	# ask for a package with convenience libraries instead -- we'll try to provide	4	# them; you can also ask for a package with convenience libraries instead --
5	# them somewhere in the near future.	5	# we'll try to provide them somewhere in the near future.
6		6
7	-GAME = crawl	7	-GAME = crawl
8	+GAME = stonesoup	8	+GAME = stonesoup
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	@@ -101,7 +101,7 @@	12	@@ -103,7 +103,7 @@ include Makefile.obj
13	#	13	#
14		14
15		15
16	-CFOTHERS := -pipe $(EXTERNAL_FLAGS)	16	-CFOTHERS := -pipe $(EXTERNAL_FLAGS)
17	+CFOTHERS := $(CFLAGS)	17	+CFOTHERS := $(CFLAGS)
18	CFWARN := -Wall -Wformat-security	18	CFWARN :=
19	CFWARN_L := -Wundef	19	CFWARN_L := -Wall -Wformat-security -Wundef
20		20
21	@@ -118,8 +118,6 @@	21	@@ -120,8 +120,6 @@ endif
22	#	22	#
23	AR = ar	23	AR = ar
24	RANLIB = ranlib	24	RANLIB = ranlib
Lines 27-33 Link Here
27	RM = rm -f	27	RM = rm -f
28	COPY = cp	28	COPY = cp
29	COPY_R = cp -r	29	COPY_R = cp -r
30	@@ -535,9 +533,9 @@	30	@@ -559,9 +557,9 @@ else
31	ifneq (,$(shell $(GXX) --version\|grep 'g++.*4\.2\.'))	31	ifneq (,$(shell $(GXX) --version\|grep 'g++.*4\.2\.'))
32	# OS X uses a buggy ancient version of gcc without fixes from even	32	# OS X uses a buggy ancient version of gcc without fixes from even
33	# subsequent point releases of 4.2.	33	# subsequent point releases of 4.2.
Lines 39-45 Link Here
39	endif	39	endif
40	endif	40	endif
41		41
42	@@ -606,13 +604,13 @@	42	@@ -636,13 +634,13 @@ ifndef BUILD_LUA
43	LUA_PACKAGE = lua-5.1	43	LUA_PACKAGE = lua-5.1
44	endif	44	endif
45	else	45	else
Lines 55-61 Link Here
55	endif	55	endif
56	INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I \| sed -e 's/-I/-isystem /')	56	INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I \| sed -e 's/-I/-isystem /')
57	CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)	57	CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
58	@@ -625,7 +623,7 @@	58	@@ -655,7 +653,7 @@ endif
59		59
60	ifndef BUILD_SQLITE	60	ifndef BUILD_SQLITE
61	ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)	61	ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
Lines 64-70 Link Here
64	LIBS += $(SQLITE_LIB)	64	LIBS += $(SQLITE_LIB)
65	ifneq ($(shell grep -q sqlite3_prepare_v2 $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)	65	ifneq ($(shell grep -q sqlite3_prepare_v2 $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
66	DEFINES_L += -DANCIENT_SQLITE	66	DEFINES_L += -DANCIENT_SQLITE
67	@@ -777,7 +775,7 @@	67	@@ -743,7 +741,7 @@ endif
		68	endif
		69
		70	DEFINES_L += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL2_CFLAGS)
		71	-INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL2_INCLUDE)
		72	+INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL2_INCLUDE) $(GL_INCLUDE)
		73
		74	endif # TILES
		75
		76	@@ -816,7 +814,7 @@ ifndef NOWIZARD
68	DEFINES += -DWIZARD	77	DEFINES += -DWIZARD
69	endif	78	endif
70	ifdef NO_OPTIMIZE	79	ifdef NO_OPTIMIZE
Lines 73-102 Link Here
73	endif	82	endif
74		83
75	ifdef PCH	84	ifdef PCH
76	@@ -901,7 +899,7 @@	85	@@ -943,7 +941,7 @@ else
77	INSTALL_FONTS += $(PROPORTIONAL_FONT)	86	SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\
78	endif	87	{\
79	else	88	fc-list \| sed 's/: .*//' \| grep -Fi "/$$name";\
80	- SYS_PROPORTIONAL_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)\|head -n 1)	89	- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\
81	+ SYS_PROPORTIONAL_FONT = $(shell dir=%%LOCALBASE%%/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)\|head -n 1)	90	+ for dir in %%LOCALBASE%%/share/fonts;\
82	ifeq (,$(SYS_PROPORTIONAL_FONT))	91	do [ -d $$dir ] && echo $$dir; done;\
83	SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)\|head -n 1)	92	} \| xargs -I% find % -type f -iname $$name -print \| head -n1; } 2>/dev/null)
84	endif	93	ifneq (,$(SYS_PROPORTIONAL_FONT))
85	@@ -924,7 +922,7 @@	94	@@ -968,7 +966,7 @@ else
86	INSTALL_FONTS += $(MONOSPACED_FONT)	95	SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\
87	endif	96	{\
88	else	97	fc-list \| sed 's/: .*//' \| grep -Fi "/$$name";\
89	- SYS_MONOSPACED_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)\|head -n 1)	98	- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\
90	+ SYS_MONOSPACED_FONT = $(shell dir=%%LOCALBASE%%/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)\|head -n 1)	99	+ for dir in %%LOCALBASE%%/share/fonts;\
91	ifeq (,$(SYS_MONOSPACED_FONT))	100	do [ -d $$dir ] && echo $$dir; done;\
92	SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)\|head -n 1)	101	} \| xargs -I% find % -type f -iname $$name -print \| head -n1; } 2>/dev/null)
93	endif	102	ifneq (,$(SYS_MONOSPACED_FONT))
94	@@ -1127,7 +1125,7 @@	103	@@ -1177,7 +1175,6 @@ GENERATED_FILES := $(GENERATED_HEADERS)
95		104
96	LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))	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)
100	MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"\|sed -r 's/-.//;s/^([^.]+\.[^.]+)./\1/')	108	MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"\|sed -r 's/-.//;s/^([^.]+\.[^.]+)./\1/')
101		109
102	export SRC_VERSION	110	export SRC_VERSION
		111	@@ -1311,6 +1308,7 @@ compflag.h: $(OBJECTS:.o=.cc) util/gen-c
		112	$(QUIET_GEN)util/gen-cflg.pl compflag.h "$(ALL_CFLAGS)" "$(LDFLAGS)" "$(HOST)" "$(ARCH)"
		113
		114	build.h: $(OBJECTS:.o=.cc) util/gen_ver.pl
		115	+ @echo "$(SRC_VERSION)" > util/release_ver
		116	$(QUIET_GEN)util/gen_ver.pl $@ $(MERGE_BASE)
		117
		118	version.o: build.h compflag.h

Lines 1-12 Link Here

(-)games/stonesoup/files/patch-dat__des__branches__dis.des (-12 lines)
1	--- ./dat/des/branches/dis.des.orig 2014-08-28 05:28:57.000000000 +0200
2	+++ ./dat/des/branches/dis.des 2014-08-29 18:32:12.084218945 +0200
3	@@ -209,8 +209,7 @@
4	KMONS: F = executioner
5	KMONS: ! = iron devil / skeletal warrior / hell knight / place:Zot:1 skeleton w:15
6	KMONS: ? = patrolling iron imp
7	-: dgn.delayed_decay(_G, '%', 'human corpse / human skeleton, \
8	-: human corpse / human skeleton')
9	+: dgn.delayed_decay(_G, '%', 'human corpse / human skeleton, human corpse / human skeleton')
10	: else
11	KMONS: 01 = ghost moth
12	KMONS: 23 = golden dragon

Lines 1-19 Link Here

(-)games/stonesoup/files/patch-dat__des__builder__shops.des (-19 lines)
1	--- ./dat/des/builder/shops.des.orig 2014-08-28 05:28:57.000000000 +0200
2	+++ ./dat/des/builder/shops.des 2014-08-29 18:32:12.133218080 +0200
3	@@ -387,15 +387,7 @@
4	: local shopname = util.random_from({"type:Blasphemy suffix:Boutique",
5	: "type:Evil suffix:Emporium", "type:Profane suffix:Products",
6	: "type:Sacrilege suffix:Store", "type:Wicked suffix:Wares"})
7	-: kfeat("s = general shop " .. shopname .. " ; \
8	-: potion of blood \| any weapon ego:draining w:15 \| any weapon ego:pain w:5 \| \
9	-: any weapon ego:vampirism w:5 \| demon blade w:5 \| \
10	-: demon whip w:5 \| demon trident w:5 \| wand of draining \| scroll of torment \| \
11	-: staff 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 \| \
14	-: grand grimoire w:1 \| scythe unrand:scythe_of_curses 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:vampirism 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 / \
18	altar_beogh w:1 / altar_lugonu w:1
19	MAP

Lines 1-67 Link Here

(-)games/stonesoup/files/patch-dat__des__variable__grated_community.des (-67 lines)
1	--- ./dat/des/variable/grated_community.des.orig 2014-08-28 05:28:57.000000000 +0200
2	+++ ./dat/des/variable/grated_community.des 2014-08-29 18:34:10.515212244 +0200
3	@@ -67,11 +67,7 @@
4	KFEAT: C = distillery shop type:Miraculous suffix:Elixirs count:10 \
5	greed:50 ; potion of confusion
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 ;\
9	-: damaged plate armour ego:none \| damaged chain mail ego:none \|\
10	-: damaged long sword ego:none \| damaged shield ego:none \|\
11	-: 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
14	SUBVAULT: Q : grated_community_mu_home1
15	SUBVAULT: R : grated_community_mu_home2
16	@@ -168,16 +164,11 @@
17	KFEAT: ~ = closed_door
18	SUBST: * = *:35 -:1
19	KITEM: - = animal skin
20	-: dgn.delayed_decay_extra(_G, '*', 'human skeleton / yak skeleton /\
21	-: elf skeleton / kobold skeleton /\
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 /\
26	w:5 altar_beogh / w:1 altar_makhleb / w:4 floor
27	KITEM: $ = q:5 meat ration, giant spiked club, q:2 beef jerky
28	-: kitem("$ = q:" .. crawl.random_range(1, 5) .. " beef jerky / w:5 nothing, \
29	-: q:" .. crawl.random_range(1, 3) .. " meat ration / w:5 nothing, \
30	-: giant spiked club / giant club / nothing")
31	+: kitem("$ = q:" .. crawl.random_range(1, 5) .. " beef jerky / w:5 nothing, q:" .. crawl.random_range(1, 3) .. " meat ration / w:5 nothing, giant spiked club / giant club / nothing")
32	: local frosty = crawl.random2(6)
33	: if frosty == 5 then
34	SUBST: 1 = 2
35	@@ -220,10 +211,8 @@
36	KFEAT: * = altar_kikubaaqudgha / w:4 altar_sif_muna / w:1 altar_yredelemnul
37	KITEM: " = gold, any wand / w:15 nothing, any scroll / nothing
38	KFEAT: 8 = granite_statue / w:2 fountain_blood / w:1 floor
39	-: kitem("? = q:" .. crawl.random_range(1, 3) .. " scroll of torment /\
40	-: nothing, any scroll / nothing")
41	-: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic /\
42	-: nothing, any potion / nothing")
43	+: kitem("? = q:" .. crawl.random_range(1, 3) .. " scroll of torment / nothing, any scroll / nothing")
44	+: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic / nothing, any potion / 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 \
47	tile:mons_withered_plant / col:lightgrey plant name:withered \
48	@@ -235,8 +224,7 @@
49	nothing
50	KFEAT: 8 = granite_statue / fountain_sparkling / fountain_blue / w:1 floor
51	KITEM: ? = scroll of recharging / nothing, any scroll / nothing
52	-: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic /\
53	-: nothing, any potion / nothing")
54	+: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic / nothing, any potion / nothing")
55	KITEM: & = book of wizardry / book of power / book of party tricks /\
56	book of alchemy / w:12 nothing
57	KMONS: P = plant
58	@@ -248,8 +236,7 @@
59	potion of brilliance / nothing
60	KFEAT: 8 = granite_statue / w:1 floor
61	KITEM: ? = scroll of immolation / nothing, any scroll / nothing
62	-: kitem("! = q:" .. crawl.random_range(1, 3) .. " scroll of immolation /\
63	-: nothing, any potion / nothing")
64	+: kitem("! = q:" .. crawl.random_range(1, 3) .. " scroll of immolation / nothing, any potion / nothing")
65	KITEM: & = book of fire / book of power / book of ice /\
66	book of the tempests / w:12 nothing
67	KFEAT: P = granite_statue

Line 0 Link Here

(-)games/stonesoup/files/patch-rltiles_Makefile (+37 lines)
	1	--- rltiles/Makefile.orig 2015-03-23 03:11:58 UTC
	2	+++ rltiles/Makefile
	3	@@ -10,8 +10,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.
	6
	7	-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
	8	-
	9	ifdef ANDROID
	10	CXXFLAGS :=
	11	LDFLAGS :=
	12	@@ -49,14 +47,14 @@ endif
	13
	14	# Attempt to use a full compiler name, to make
	15	# distcc builds work nicely.
	16	-LMACH := $(shell gcc -dumpmachine)-
	17	+LMACH := $(shell $(CC) -dumpmachine)-
	18	ifeq ($(LMACH),-)
	19	LMACH :=
	20	endif
	21	-ifeq ($(shell which $(LMACH)gcc > /dev/null 2> /dev/null && echo "Yes"),)
	22	+ifeq ($(shell which $(LMACH)$(CC) > /dev/null 2> /dev/null && echo "Yes"),)
	23	LMACH :=
	24	endif
	25	-HOSTCXX ?= $(LMACH)g++
	26	+HOSTCXX ?= $(LMACH)$(CXX)
	27
	28	DELETE = rm -f
	29
	30	@@ -133,6 +131,6 @@ distclean: clean
	31	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
	32
	33	$(TILEGEN): $(OBJECTS)
	34	- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
	35	+ $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS) $(PNG_LIB)
	36
	37	.PHONY: all clean distclean

Lines 1-82 Link Here

(-)games/stonesoup/files/patch-rltiles__Makefile (-82 lines)
1	--- ./rltiles/Makefile.orig 2013-09-30 20:32:00.000000000 +0200
2	+++ ./rltiles/Makefile 2013-10-11 22:07:08.176890218 +0200
3	@@ -1,7 +1,7 @@
4	uname_S := $(shell uname -s)
5
6	ifneq (,$(findstring MINGW,$(uname_S)))
7	-LDFLAGS += -lmingw32
8	+L_LDFLAGS += -lmingw32
9	endif
10
11	# Note: since generation of tiles is done on the host, we don't care about
12	@@ -10,7 +10,7 @@
13	# Also, cross-compilation with no system libraries for host rather than target
14	# is not supported. If host=target, contribs are enough.
15
16	-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
17	+L_CFLAGS := $(CFLAGS)
18
19	ifdef ANDROID
20	CXXFLAGS :=
21	@@ -35,24 +35,24 @@
22	PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a
23	endif
24
25	- CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE)
26	- LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB)
27	+ L_CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE)
28	+ L_LDFLAGS += $(LDFLAGS) $(SDL_LDFLAGS) $(PNG_LIB)
29
30	- CFLAGS += -DUSE_TILE
31	+ L_CFLAGS += -DUSE_TILE
32	endif
33
34	ifdef DEBUG
35	-CFLAGS += -O0 -DDEBUG -ggdb
36	+L_CFLAGS += -O0 -DDEBUG -ggdb
37	endif
38
39	ifneq (,$(findstring MINGW,$(uname_S)))
40	-LDFLAGS += -lgdi32 -lwinmm
41	+L_LDFLAGS += -lgdi32 -lwinmm
42	endif
43	ifeq ($(uname_S),Darwin)
44	-LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL
45	+L_LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL
46	endif
47	ifeq ($(uname_S),Linux)
48	-LDFLAGS += -ldl -lpthread
49	+L_LDFLAGS += -ldl -lpthread
50	endif
51
52	# Attempt to use a full compiler name, to make
53	@@ -64,7 +64,7 @@
54	ifeq ($(shell which $(LMACH)gcc > /dev/null 2> /dev/null && echo "Yes"),)
55	LMACH :=
56	endif
57	-HOSTCXX ?= $(LMACH)g++
58	+HOSTCXX ?= $(LMACH)$(CXX)
59
60	DELETE = rm -f
61
62	@@ -109,7 +109,7 @@
63	$(QUIET_GEN)$(TILEGEN) -c $<
64
65	# CFLAGS difference check
66	-TRACK_CFLAGS = $(subst ','\'',$(HOSTCXX) $(CFLAGS)) # (stray ' for highlights)
67	+TRACK_CFLAGS = $(subst ','\'',$(HOSTCXX) $(L_CFLAGS)) # (stray ' for highlights)
68
69	.cflags: .force-cflags
70	@FLAGS='$(TRACK_CFLAGS)'; \
71	@@ -138,9 +138,9 @@
72	distclean: clean
73
74	%.o: %.cc .cflags
75	- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
76	+ $(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -MMD -c $< -o $@
77
78	$(TILEGEN): $(OBJECTS)
79	- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
80	+ $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(L_LDFLAGS)
81
82	.PHONY: all clean distclean

Lines 3-14 Link Here

(-)games/stonesoup/pkg-plist (-54 / +11 lines)
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/automagic.lua
6	%%DATADIR%%/dat/clua/gearset.lua
7	%%DATADIR%%/dat/clua/kills.lua	6	%%DATADIR%%/dat/clua/kills.lua
8	%%DATADIR%%/dat/clua/runrest.lua	7	%%DATADIR%%/dat/clua/runrest.lua
9	%%DATADIR%%/dat/clua/stash.lua	8	%%DATADIR%%/dat/clua/stash.lua
10	%%DATADIR%%/dat/clua/trapwalk.lua
11	%%DATADIR%%/dat/clua/wield.lua
12	%%DATADIR%%/dat/database/FAQ.txt	9	%%DATADIR%%/dat/database/FAQ.txt
13	%%DATADIR%%/dat/database/el/monflee.txt	10	%%DATADIR%%/dat/database/el/monflee.txt
14	%%DATADIR%%/dat/database/el/rand_all.txt	11	%%DATADIR%%/dat/database/el/rand_all.txt
Lines 33-38 Link Here
33	%%DATADIR%%/dat/database/wpnnoise.txt	30	%%DATADIR%%/dat/database/wpnnoise.txt
34	%%DATADIR%%/dat/defaults/autopickup_exceptions.txt	31	%%DATADIR%%/dat/defaults/autopickup_exceptions.txt
35	%%DATADIR%%/dat/defaults/food_colouring.txt	32	%%DATADIR%%/dat/defaults/food_colouring.txt
		33	%%DATADIR%%/dat/defaults/glyph_colours.txt
36	%%DATADIR%%/dat/defaults/menu_colours.txt	34	%%DATADIR%%/dat/defaults/menu_colours.txt
37	%%DATADIR%%/dat/defaults/messages.txt	35	%%DATADIR%%/dat/defaults/messages.txt
38	%%DATADIR%%/dat/defaults/misc.txt	36	%%DATADIR%%/dat/defaults/misc.txt
Lines 88-97 Link Here
88	%%DATADIR%%/dat/des/builder/food.des	86	%%DATADIR%%/dat/des/builder/food.des
89	%%DATADIR%%/dat/des/builder/layout.des	87	%%DATADIR%%/dat/des/builder/layout.des
90	%%DATADIR%%/dat/des/builder/layout_caves.des	88	%%DATADIR%%/dat/des/builder/layout_caves.des
		89	%%DATADIR%%/dat/des/builder/layout_cc.des
91	%%DATADIR%%/dat/des/builder/layout_cellular.des	90	%%DATADIR%%/dat/des/builder/layout_cellular.des
92	%%DATADIR%%/dat/des/builder/layout_city.des	91	%%DATADIR%%/dat/des/builder/layout_city.des
		92	%%DATADIR%%/dat/des/builder/layout_delve.des
93	%%DATADIR%%/dat/des/builder/layout_forest.des	93	%%DATADIR%%/dat/des/builder/layout_forest.des
94	%%DATADIR%%/dat/des/builder/layout_geoelf.des	94	%%DATADIR%%/dat/des/builder/layout_geoelf.des
		95	%%DATADIR%%/dat/des/builder/layout_geoelf_castle.des
95	%%DATADIR%%/dat/des/builder/layout_grids.des	96	%%DATADIR%%/dat/des/builder/layout_grids.des
96	%%DATADIR%%/dat/des/builder/layout_halls.des	97	%%DATADIR%%/dat/des/builder/layout_halls.des
97	%%DATADIR%%/dat/des/builder/layout_loops.des	98	%%DATADIR%%/dat/des/builder/layout_loops.des
Lines 480-485 Link Here
480	%%DATADIR%%/dat/dlua/luamark.lua	481	%%DATADIR%%/dat/dlua/luamark.lua
481	%%DATADIR%%/dat/dlua/macro.lua	482	%%DATADIR%%/dat/dlua/macro.lua
482	%%DATADIR%%/dat/dlua/mapinit.lua	483	%%DATADIR%%/dat/dlua/mapinit.lua
		484	%%DATADIR%%/dat/dlua/persist.lua
483	%%DATADIR%%/dat/dlua/point.lua	485	%%DATADIR%%/dat/dlua/point.lua
484	%%DATADIR%%/dat/dlua/profiler.lua	486	%%DATADIR%%/dat/dlua/profiler.lua
485	%%DATADIR%%/dat/dlua/sanity.lua	487	%%DATADIR%%/dat/dlua/sanity.lua
Lines 507-512 Link Here
507	%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png	509	%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png
508	%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-512x512.png	510	%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-512x512.png
509	%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.png	511	%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.png
		512	%%SDL%%%%DATADIR%%/dat/tiles/title_baconkid_duvessa_dowan.png
510	%%SDL%%%%DATADIR%%/dat/tiles/title_baconkid_gastronok.png	513	%%SDL%%%%DATADIR%%/dat/tiles/title_baconkid_gastronok.png
511	%%SDL%%%%DATADIR%%/dat/tiles/title_baconkid_mnoleg.png	514	%%SDL%%%%DATADIR%%/dat/tiles/title_baconkid_mnoleg.png
512	%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_dragon.png	515	%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_dragon.png
Lines 533-538 Link Here
533	%%DATADIR%%/docs/develop/IRC.txt	536	%%DATADIR%%/docs/develop/IRC.txt
534	%%DATADIR%%/docs/develop/android.txt	537	%%DATADIR%%/docs/develop/android.txt
535	%%DATADIR%%/docs/develop/coding_conventions.txt	538	%%DATADIR%%/docs/develop/coding_conventions.txt
		539	%%DATADIR%%/docs/develop/ctags.txt
536	%%DATADIR%%/docs/develop/gdb_tips.txt	540	%%DATADIR%%/docs/develop/gdb_tips.txt
537	%%DATADIR%%/docs/develop/levels/advanced.txt	541	%%DATADIR%%/docs/develop/levels/advanced.txt
538	%%DATADIR%%/docs/develop/levels/introduction.txt	542	%%DATADIR%%/docs/develop/levels/introduction.txt
Lines 573-629 Link Here
573	%%DATADIR%%/settings/080_monster_glyphs.txt	577	%%DATADIR%%/settings/080_monster_glyphs.txt
574	%%DATADIR%%/settings/advanced_optioneering.txt	578	%%DATADIR%%/settings/advanced_optioneering.txt
575	%%DATADIR%%/settings/colemak_command_keys.txt	579	%%DATADIR%%/settings/colemak_command_keys.txt
		580	%%DATADIR%%/settings/dec_glyphs.txt
576	%%DATADIR%%/settings/dvorak_command_keys.txt	581	%%DATADIR%%/settings/dvorak_command_keys.txt
		582	%%DATADIR%%/settings/ibm_glyphs.txt
577	%%DATADIR%%/settings/init.txt	583	%%DATADIR%%/settings/init.txt
578	%%DATADIR%%/settings/no_vi_command_keys.txt	584	%%DATADIR%%/settings/no_vi_command_keys.txt
579	%%PORTDOCS%%@dir %%DOCSDIR%%	585	%%DATADIR%%/settings/old_unicode_glyphs.txt
580	%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%	586	%%DATADIR%%/settings/safe_move_shift.txt
581	@dir %%DATADIR%%/dat/clua
582	@dir %%DATADIR%%/dat/database/el
583	@dir %%DATADIR%%/dat/database/pl
584	@dir %%DATADIR%%/dat/database
585	@dir %%DATADIR%%/dat/defaults
586	@dir %%DATADIR%%/dat/des/altar
587	@dir %%DATADIR%%/dat/des/arrival
588	@dir %%DATADIR%%/dat/des/branches
589	@dir %%DATADIR%%/dat/des/builder
590	@dir %%DATADIR%%/dat/des/portals
591	@dir %%DATADIR%%/dat/des/serial
592	@dir %%DATADIR%%/dat/des/sprint
593	@dir %%DATADIR%%/dat/des/test
594	@dir %%DATADIR%%/dat/des/traps
595	@dir %%DATADIR%%/dat/des/tutorial
596	@dir %%DATADIR%%/dat/des/variable
597	@dir %%DATADIR%%/dat/des/zotdef
598	@dir %%DATADIR%%/dat/des
599	@dir %%DATADIR%%/dat/descript/cs
600	@dir %%DATADIR%%/dat/descript/da
601	@dir %%DATADIR%%/dat/descript/de
602	@dir %%DATADIR%%/dat/descript/el
603	@dir %%DATADIR%%/dat/descript/es
604	@dir %%DATADIR%%/dat/descript/fi
605	@dir %%DATADIR%%/dat/descript/fr
606	@dir %%DATADIR%%/dat/descript/hu
607	@dir %%DATADIR%%/dat/descript/it
608	@dir %%DATADIR%%/dat/descript/ja
609	@dir %%DATADIR%%/dat/descript/ko
610	@dir %%DATADIR%%/dat/descript/lt
611	@dir %%DATADIR%%/dat/descript/lv
612	@dir %%DATADIR%%/dat/descript/nl
613	@dir %%DATADIR%%/dat/descript/pl
614	@dir %%DATADIR%%/dat/descript/pt
615	@dir %%DATADIR%%/dat/descript/ru
616	@dir %%DATADIR%%/dat/descript/sv
617	@dir %%DATADIR%%/dat/descript/tr
618	@dir %%DATADIR%%/dat/descript/zh
619	@dir %%DATADIR%%/dat/descript
620	@dir %%DATADIR%%/dat/dlua/layout
621	@dir %%DATADIR%%/dat/dlua
622	%%SDL%%@dir %%DATADIR%%/dat/tiles
623	@dir %%DATADIR%%/dat
624	@dir %%DATADIR%%/docs/develop/levels
625	@dir %%DATADIR%%/docs/develop
626	@dir %%DATADIR%%/docs/license
627	@dir %%DATADIR%%/docs
628	@dir %%DATADIR%%/settings
629	@dir %%DATADIR%%