Index: head/games/stonesoup/Makefile =================================================================== --- head/games/stonesoup/Makefile (revision 387489) +++ head/games/stonesoup/Makefile (revision 387490) @@ -1,106 +1,112 @@ # Created by: Tobias Rehbein # $FreeBSD$ PORTNAME= stonesoup -PORTVERSION= 0.15.2 -PORTREVISION= 1 +PORTVERSION= 0.16.1 CATEGORIES= games MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION} +MASTER_SITES= http://crawl.develz.org/release/ DISTNAME= stone_soup-${PORTVERSION}-nodeps MAINTAINER= tobias.rehbein@web.de COMMENT= Dungeon Crawl Stone Soup - a fun, free rogue-like game LICENSE= GPLv2 -LICENSE_FILE= ${WRKDIR}/stone_soup-${PORTVERSION}/licence.txt +LICENSE_FILE= ${WRKSRC}/../licence.txt USE_SQLITE= yes -USES= bison compiler gmake lua:51 perl5 pkgconfig shebangfix tar:xz +USES= bison compiler:c++11-lib gmake lua:51 perl5 pkgconfig \ + shebangfix tar:xz + USE_PERL5= build -SHEBANG_FILES= util/gen-mi-enum +SHEBANG_FILES= util/gen-mi-enum \ + util/good-depfile SAVEDIR= \~/.stonesoup WRKSRC= ${WRKDIR}/stone_soup-${PORTVERSION}/source/ SUB_FILES= README.FreeBSD PLIST_SUB= SAVEDIR="${SAVEDIR}" -OPTIONS_DEFINE= SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES +# WIZARD is currently broken upstream, remove until fixed +##OPTIONS_DEFINE= SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES +OPTIONS_DEFINE= SOUND LUA_BINDINGS DOCS EXAMPLES SOUND_DESC= Sound support -WIZARD_DESC= Wizard mode +##WIZARD_DESC= Wizard mode LUA_BINDINGS_DESC= Bindings for LUA user scripts MAKE_ARGS= prefix=${PREFIX} \ DATADIR=${DATADIR} \ SAVEDIR=${SAVEDIR} \ DESTDIR=${STAGEDIR} \ INSTALL_UGRP=root:games \ NO_AUTO_OPT=YesPlease \ NO_OPTIMIZE=YesPlease \ SQLITE_INCLUDE_DIR=${LOCALBASE}/include \ - SQLITE_LIB=-lsqlite3 \ - LDFLAGS="-L${LOCALBASE}/lib" + SQLITE_LIB=-lsqlite3 .include .if defined(VERBOSE) MAKE_ARGS+= V=yes .endif -.if empty(PORT_OPTIONS:MWIZARD) -MAKE_ARGS+= NOWIZARD=y -.endif +##.if empty(PORT_OPTIONS:MWIZARD) +##MAKE_ARGS+= NOWIZARD=y +##.endif .if ${PORT_OPTIONS:MSDL} CONFLICTS+= ${PORTNAME}-[0-9]* -MAKE_ARGS+= TILES=y +MAKE_ARGS+= TILES=y \ + GL_INCLUDE="-I ${LOCALBASE}/include/GL" PLIST_SUB+= SDL="" PKGNAMESUFFIX= -sdl BUILD_DEPENDS+= fc-list:${PORTSDIR}/x11-fonts/fontconfig \ ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu RUN_DEPENDS+= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 -USE_SDL= sdl image +USE_SDL= sdl2 image2 +USE_GL= yes .else USES+= ncurses CONFLICTS+= ${PORTNAME}-sdl-[0-9]* PLIST_SUB+= SDL="@comment " .endif .if ${PORT_OPTIONS:MSOUND} RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox .endif .if empty(PORT_OPTIONS:MLUA_BINDINGS) MAKE_ARGS+= NO_LUA_BINDINGS=yes .endif .include -.if ${COMPILER_TYPE} == clang -CFLAGS+= -std=c++0x +.if ${COMPILER_TYPE} != clang +CFLAGS+= -D_GLIBCXX_USE_C99 .endif post-patch: - @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile +# @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile .if ${PORT_OPTIONS:MSOUND} @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h @${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h .else @${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/AppHdr.h .endif pre-install: @${FIND} ${WRKSRC}/dat -type f -name '*.orig' | \ ${XARGS} ${RM} post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${STAGEDIR}${DATADIR}/settings/init.txt ${STAGEDIR}${EXAMPLESDIR}/sample.crawlrc .include Index: head/games/stonesoup/distinfo =================================================================== --- head/games/stonesoup/distinfo (revision 387489) +++ head/games/stonesoup/distinfo (revision 387490) @@ -1,2 +1,2 @@ -SHA256 (stone_soup-0.15.2-nodeps.tar.xz) = e93a82880801fb60794c9c05ccbab03d5c7e1f105e5968d2cebc760d387a21e2 -SIZE (stone_soup-0.15.2-nodeps.tar.xz) = 8979684 +SHA256 (stone_soup-0.16.1-nodeps.tar.xz) = e93ae81f93dbeec17c1bd9ac8bcd84e951a5856124fb7c93c336e9678ab9cfe4 +SIZE (stone_soup-0.16.1-nodeps.tar.xz) = 9250980 Index: head/games/stonesoup/files/patch-dat__des__builder__shops.des =================================================================== --- head/games/stonesoup/files/patch-dat__des__builder__shops.des (revision 387489) +++ head/games/stonesoup/files/patch-dat__des__builder__shops.des (nonexistent) @@ -1,19 +0,0 @@ ---- ./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 Property changes on: head/games/stonesoup/files/patch-dat__des__builder__shops.des ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/stonesoup/files/patch-dat__des__variable__grated_community.des =================================================================== --- head/games/stonesoup/files/patch-dat__des__variable__grated_community.des (revision 387489) +++ head/games/stonesoup/files/patch-dat__des__variable__grated_community.des (nonexistent) @@ -1,67 +0,0 @@ ---- ./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 Property changes on: head/games/stonesoup/files/patch-dat__des__variable__grated_community.des ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/stonesoup/files/patch-rltiles__Makefile =================================================================== --- head/games/stonesoup/files/patch-rltiles__Makefile (revision 387489) +++ head/games/stonesoup/files/patch-rltiles__Makefile (nonexistent) @@ -1,82 +0,0 @@ ---- ./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 Property changes on: head/games/stonesoup/files/patch-rltiles__Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/stonesoup/files/patch-dat__des__branches__dis.des =================================================================== --- head/games/stonesoup/files/patch-dat__des__branches__dis.des (revision 387489) +++ head/games/stonesoup/files/patch-dat__des__branches__dis.des (nonexistent) @@ -1,12 +0,0 @@ ---- ./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 Property changes on: head/games/stonesoup/files/patch-dat__des__branches__dis.des ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/stonesoup/files/patch-AppHdr.h =================================================================== --- head/games/stonesoup/files/patch-AppHdr.h (revision 387489) +++ head/games/stonesoup/files/patch-AppHdr.h (revision 387490) @@ -1,11 +1,11 @@ ---- ./AppHdr.h.orig 2014-08-28 05:28:56.000000000 +0200 -+++ ./AppHdr.h 2014-08-29 18:32:12.007217932 +0200 -@@ -146,7 +146,7 @@ +--- AppHdr.h.orig 2015-03-23 01:49:21 UTC ++++ AppHdr.h +@@ -147,7 +147,7 @@ static inline double pow(int x, double y // // WARNING: Filenames passed to this command *are not validated in any way*. // - // #define SOUND_PLAY_COMMAND "/usr/bin/play -v .5 \"%s\" 2>/dev/null &" + %%SOUND%%#define SOUND_PLAY_COMMAND "%%LOCALBASE%%/bin/play -v .5 \"%s\" 2>/dev/null &" #include "libunix.h" Index: head/games/stonesoup/files/patch-Makefile =================================================================== --- head/games/stonesoup/files/patch-Makefile (revision 387489) +++ head/games/stonesoup/files/patch-Makefile (revision 387490) @@ -1,102 +1,143 @@ ---- ./Makefile.orig 2014-08-28 05:28:56.000000000 +0200 -+++ ./Makefile 2014-08-29 18:32:12.040229158 +0200 -@@ -69,7 +69,7 @@ - # ask for a package with convenience libraries instead -- we'll try to provide - # them somewhere in the near future. +--- Makefile.orig 2015-03-23 01:49:21 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 -@@ -101,7 +101,7 @@ +@@ -103,7 +103,7 @@ include Makefile.obj # -CFOTHERS := -pipe $(EXTERNAL_FLAGS) +CFOTHERS := $(CFLAGS) - CFWARN := -Wall -Wformat-security - CFWARN_L := -Wundef + CFWARN := + CFWARN_L := -Wall -Wformat-security -Wundef -@@ -118,8 +118,6 @@ +@@ -112,7 +112,7 @@ DEFINES := $(EXTERNAL_DEFINES) + ifdef ANDROID + LDFLAGS := $(EXTERNAL_LDFLAGS) $(LDFLAGS) + else +-LDFLAGS := $(EXTERNAL_LDFLAGS) ++# LDFLAGS := $(EXTERNAL_LDFLAGS) + endif + # +@@ -120,8 +120,6 @@ endif + # AR = ar RANLIB = ranlib -CC = $(GCC) -CXX = $(GXX) RM = rm -f COPY = cp COPY_R = cp -r -@@ -535,9 +533,9 @@ - ifneq (,$(shell $(GXX) --version|grep 'g++.*4\.2\.')) - # OS X uses a buggy ancient version of gcc without fixes from even - # subsequent point releases of 4.2. +@@ -495,16 +493,6 @@ ifneq ($(GCC_VER),) + GCC_VER_SUFFIX:=-$(GCC_VER) + endif + +-# Attempt to use a full compiler name, to make +-# distcc builds work nicely. +-LMACH := $(shell gcc -dumpmachine)- +-ifeq ($(LMACH),-) +-LMACH := +-endif +-ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null && echo "Yes"),) +-LMACH := +-endif +- + ifneq ($(FORCE_CC),) + GCC := $(FORCE_CC) + else +@@ -554,15 +542,6 @@ ifdef USE_ICC + + # Some very good optimization flags. + CFOPTIMIZE := -O2 -parallel +-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. - CFOPTIMIZE := -O0 -+ CFOPTIMIZE := - else +- else - CFOPTIMIZE := -O2 -+ CFOPTIMIZE := - endif +- endif endif -@@ -606,13 +604,13 @@ + ifdef LTO +@@ -636,13 +615,13 @@ 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 - LUA_PACKAGE = lua5.1 + LUA_PACKAGE = lua-5.1 endif INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I | sed -e 's/-I/-isystem /') CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other) -@@ -625,7 +623,7 @@ +@@ -655,7 +634,7 @@ endif ifndef BUILD_SQLITE ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes) - # INCLUDES_L += -isystem $(SQLITE_INCLUDE_DIR) + INCLUDES_L += -isystem $(SQLITE_INCLUDE_DIR) 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 -@@ -777,7 +775,7 @@ +@@ -743,7 +722,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 +795,7 @@ ifndef NOWIZARD DEFINES += -DWIZARD endif ifdef NO_OPTIMIZE -CFOPTIMIZE := -O0 +CFOPTIMIZE := endif ifdef PCH -@@ -901,7 +899,7 @@ - INSTALL_FONTS += $(PROPORTIONAL_FONT) - endif - else -- SYS_PROPORTIONAL_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) -+ SYS_PROPORTIONAL_FONT = $(shell dir=%%LOCALBASE%%/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) - ifeq (,$(SYS_PROPORTIONAL_FONT)) - SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) - endif -@@ -924,7 +922,7 @@ - INSTALL_FONTS += $(MONOSPACED_FONT) - endif - else -- SYS_MONOSPACED_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) -+ SYS_MONOSPACED_FONT = $(shell dir=%%LOCALBASE%%/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) - ifeq (,$(SYS_MONOSPACED_FONT)) - SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) - endif -@@ -1127,7 +1125,7 @@ +@@ -943,7 +922,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 +947,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)) +@@ -1035,10 +1014,6 @@ CFWARN := -wd383,810,869,981,1418 -we14, + CFWARN_L := + endif - 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/') +-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) - export SRC_VERSION + ifdef REPORT Index: head/games/stonesoup/files/patch-rltiles_Makefile =================================================================== --- head/games/stonesoup/files/patch-rltiles_Makefile (nonexistent) +++ head/games/stonesoup/files/patch-rltiles_Makefile (revision 387490) @@ -0,0 +1,37 @@ +--- rltiles/Makefile.orig 2015-03-04 04:53:28 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 $@ $(CFLAGS) $(LDFLAGS) $(PNG_LIB) + + .PHONY: all clean distclean Property changes on: head/games/stonesoup/files/patch-rltiles_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/stonesoup/files/patch-rltiles__tool__tile.cc =================================================================== --- head/games/stonesoup/files/patch-rltiles__tool__tile.cc (revision 387489) +++ head/games/stonesoup/files/patch-rltiles__tool__tile.cc (revision 387490) @@ -1,17 +1,17 @@ ---- ./rltiles/tool/tile.cc.orig 2014-04-09 17:36:33.000000000 +0200 -+++ ./rltiles/tool/tile.cc 2014-05-06 21:21:37.808135615 +0200 -@@ -123,10 +123,10 @@ +--- rltiles/tool/tile.cc.orig 2015-03-04 04:53:29 UTC ++++ rltiles/tool/tile.cc +@@ -123,10 +123,10 @@ void tile::add_rim(const tile_colour &ri if (flags[x + y * m_width]) continue; - if (x > 0 && flags[(x-1) + y * m_width] - || y > 0 && flags[x + (y-1) * m_width] - || x < m_width - 1 && flags[(x+1) + y * m_width] - || y < m_height - 1 && flags[x + (y+1) * m_width]) + if ((x > 0 && flags[(x-1) + y * m_width]) + || (y > 0 && flags[x + (y-1) * m_width]) + || (x < m_width - 1 && flags[(x+1) + y * m_width]) + || (y < m_height - 1 && flags[x + (y+1) * m_width])) { get_pixel(x,y) = rim; } Index: head/games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc =================================================================== --- head/games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc (revision 387489) +++ head/games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc (revision 387490) @@ -1,11 +1,11 @@ ---- ./rltiles/tool/tile_list_processor.cc.orig 2013-09-30 20:32:00.000000000 +0200 -+++ ./rltiles/tool/tile_list_processor.cc 2013-10-11 22:07:08.181888672 +0200 -@@ -52,7 +52,7 @@ +--- rltiles/tool/tile_list_processor.cc.orig 2015-03-04 04:53:29 UTC ++++ rltiles/tool/tile_list_processor.cc +@@ -52,7 +52,7 @@ bool tile_list_processor::load_image(til "" }; - if (m_sdir != "" || background && m_back_sdir != "") + if (m_sdir != "" || (background && m_back_sdir != "")) { vector dirs; if (m_sdir != "") Index: head/games/stonesoup/pkg-plist =================================================================== --- head/games/stonesoup/pkg-plist (revision 387489) +++ head/games/stonesoup/pkg-plist (revision 387490) @@ -1,629 +1,586 @@ bin/stonesoup %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD %%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/godname.txt %%DATADIR%%/dat/database/godspeak.txt %%DATADIR%%/dat/database/help.txt %%DATADIR%%/dat/database/insult.txt %%DATADIR%%/dat/database/miscname.txt %%DATADIR%%/dat/database/monflee.txt %%DATADIR%%/dat/database/monname.txt %%DATADIR%%/dat/database/monspeak.txt %%DATADIR%%/dat/database/monspell.txt %%DATADIR%%/dat/database/montitle.txt %%DATADIR%%/dat/database/pl/godspeak.txt %%DATADIR%%/dat/database/pl/miscname.txt %%DATADIR%%/dat/database/rand_all.txt %%DATADIR%%/dat/database/rand_arm.txt %%DATADIR%%/dat/database/rand_wpn.txt %%DATADIR%%/dat/database/randbook.txt %%DATADIR%%/dat/database/randname.txt %%DATADIR%%/dat/database/shout.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/defaults/runrest_messages.txt %%DATADIR%%/dat/defaults/standard_colours.txt %%DATADIR%%/dat/des/altar/altar.des %%DATADIR%%/dat/des/altar/ashenzari_visionary.des %%DATADIR%%/dat/des/altar/kiku_cage.des %%DATADIR%%/dat/des/altar/lugonu_bribe.des %%DATADIR%%/dat/des/altar/nemelex_the_gamble.des %%DATADIR%%/dat/des/altar/okawaru_arena.des %%DATADIR%%/dat/des/altar/overflow.des %%DATADIR%%/dat/des/altar/trog_burn_book.des %%DATADIR%%/dat/des/altar/trog_wizard.des %%DATADIR%%/dat/des/altar/vehumet_trees.des %%DATADIR%%/dat/des/altar/xom_monty_hall.des %%DATADIR%%/dat/des/altar/xom_sheep.des %%DATADIR%%/dat/des/altar/yredelemnul_ordeal.des %%DATADIR%%/dat/des/arrival/arrival_guide.txt %%DATADIR%%/dat/des/arrival/large.des %%DATADIR%%/dat/des/arrival/simple.des %%DATADIR%%/dat/des/arrival/small.des %%DATADIR%%/dat/des/arrival/twisted.des %%DATADIR%%/dat/des/branches/abyss.des %%DATADIR%%/dat/des/branches/blade.des %%DATADIR%%/dat/des/branches/coc.des %%DATADIR%%/dat/des/branches/crypt.des %%DATADIR%%/dat/des/branches/depths.des %%DATADIR%%/dat/des/branches/depths_encompass.des %%DATADIR%%/dat/des/branches/dis.des %%DATADIR%%/dat/des/branches/elf.des %%DATADIR%%/dat/des/branches/geh.des %%DATADIR%%/dat/des/branches/hell.des %%DATADIR%%/dat/des/branches/lair.des %%DATADIR%%/dat/des/branches/orc.des %%DATADIR%%/dat/des/branches/pan.des %%DATADIR%%/dat/des/branches/shoals.des %%DATADIR%%/dat/des/branches/slime.des %%DATADIR%%/dat/des/branches/snake.des %%DATADIR%%/dat/des/branches/spider.des %%DATADIR%%/dat/des/branches/swamp.des %%DATADIR%%/dat/des/branches/tar.des %%DATADIR%%/dat/des/branches/temple.des %%DATADIR%%/dat/des/branches/tomb.des %%DATADIR%%/dat/des/branches/vaults.des %%DATADIR%%/dat/des/branches/vaults_rooms_empty.des %%DATADIR%%/dat/des/branches/vaults_rooms_hard.des %%DATADIR%%/dat/des/branches/vaults_rooms_standard.des %%DATADIR%%/dat/des/branches/zot.des %%DATADIR%%/dat/des/builder/arena.des %%DATADIR%%/dat/des/builder/decor.des %%DATADIR%%/dat/des/builder/dummy.des %%DATADIR%%/dat/des/builder/food.des %%DATADIR%%/dat/des/builder/layout.des %%DATADIR%%/dat/des/builder/layout_caves.des +%%DATADIR%%/dat/des/builder/layout_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/des/builder/layout_overlapping_boxes.des %%DATADIR%%/dat/des/builder/layout_pan_divisions.des %%DATADIR%%/dat/des/builder/layout_pools.des %%DATADIR%%/dat/des/builder/layout_vaults.des %%DATADIR%%/dat/des/builder/rooms.des %%DATADIR%%/dat/des/builder/shops.des %%DATADIR%%/dat/des/builder/uniques.des %%DATADIR%%/dat/des/guide.txt %%DATADIR%%/dat/des/portals/bailey.des %%DATADIR%%/dat/des/portals/bazaar.des %%DATADIR%%/dat/des/portals/icecave.des %%DATADIR%%/dat/des/portals/lab.des %%DATADIR%%/dat/des/portals/ossuary.des %%DATADIR%%/dat/des/portals/sewer.des %%DATADIR%%/dat/des/portals/trove.des %%DATADIR%%/dat/des/portals/volcano.des %%DATADIR%%/dat/des/portals/wizlab.des %%DATADIR%%/dat/des/portals/ziggurat.des %%DATADIR%%/dat/des/serial/aquarium.des %%DATADIR%%/dat/des/serial/bayou.des %%DATADIR%%/dat/des/serial/column_ruins.des %%DATADIR%%/dat/des/serial/corridors.des %%DATADIR%%/dat/des/serial/curves.des %%DATADIR%%/dat/des/serial/forest.des %%DATADIR%%/dat/des/serial/glass.des %%DATADIR%%/dat/des/serial/gnoll_camp.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/serial/window.des %%DATADIR%%/dat/des/sprint/arena_sprint.des %%DATADIR%%/dat/des/sprint/fedhas.des %%DATADIR%%/dat/des/sprint/linesprint.des %%DATADIR%%/dat/des/sprint/meat.des %%DATADIR%%/dat/des/sprint/menkaure.des %%DATADIR%%/dat/des/sprint/pitsprint.des %%DATADIR%%/dat/des/sprint/red_sonja.des %%DATADIR%%/dat/des/sprint/sprint_mu.des %%DATADIR%%/dat/des/sprint/zigsprint.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/traps/spider_basket.des %%DATADIR%%/dat/des/tutorial/lesson1.des %%DATADIR%%/dat/des/tutorial/lesson2.des %%DATADIR%%/dat/des/tutorial/lesson3.des %%DATADIR%%/dat/des/tutorial/lesson4.des %%DATADIR%%/dat/des/tutorial/lesson5.des %%DATADIR%%/dat/des/variable/ambush.des %%DATADIR%%/dat/des/variable/ancient_champions.des %%DATADIR%%/dat/des/variable/arcadia.des %%DATADIR%%/dat/des/variable/cathedral_bats.des %%DATADIR%%/dat/des/variable/compat.des %%DATADIR%%/dat/des/variable/d_encompass.des %%DATADIR%%/dat/des/variable/float.des %%DATADIR%%/dat/des/variable/geyser.des %%DATADIR%%/dat/des/variable/grated_community.des %%DATADIR%%/dat/des/variable/large_abstract.des %%DATADIR%%/dat/des/variable/large_themed.des %%DATADIR%%/dat/des/variable/lemuel_castle.des %%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/cards.txt %%DATADIR%%/dat/descript/commands.txt %%DATADIR%%/dat/descript/cs/ability.txt %%DATADIR%%/dat/descript/cs/branches.txt %%DATADIR%%/dat/descript/cs/commands.txt %%DATADIR%%/dat/descript/cs/features.txt %%DATADIR%%/dat/descript/cs/gods.txt %%DATADIR%%/dat/descript/cs/hints.txt %%DATADIR%%/dat/descript/cs/items.txt %%DATADIR%%/dat/descript/cs/monsters.txt %%DATADIR%%/dat/descript/cs/quotes.txt %%DATADIR%%/dat/descript/cs/species.txt %%DATADIR%%/dat/descript/cs/spells.txt %%DATADIR%%/dat/descript/cs/tutorial.txt %%DATADIR%%/dat/descript/cs/unident.txt %%DATADIR%%/dat/descript/cs/unrand.txt %%DATADIR%%/dat/descript/da/ability.txt %%DATADIR%%/dat/descript/da/backgrounds.txt %%DATADIR%%/dat/descript/da/branches.txt %%DATADIR%%/dat/descript/da/cards.txt %%DATADIR%%/dat/descript/da/commands.txt %%DATADIR%%/dat/descript/da/hints.txt %%DATADIR%%/dat/descript/da/items.txt %%DATADIR%%/dat/descript/da/monsters.txt %%DATADIR%%/dat/descript/da/quotes.txt %%DATADIR%%/dat/descript/da/skills.txt %%DATADIR%%/dat/descript/da/species.txt %%DATADIR%%/dat/descript/da/unident.txt %%DATADIR%%/dat/descript/da/unrand.txt %%DATADIR%%/dat/descript/de/ability.txt %%DATADIR%%/dat/descript/de/backgrounds.txt %%DATADIR%%/dat/descript/de/branches.txt %%DATADIR%%/dat/descript/de/cards.txt %%DATADIR%%/dat/descript/de/commands.txt %%DATADIR%%/dat/descript/de/features.txt %%DATADIR%%/dat/descript/de/gods.txt %%DATADIR%%/dat/descript/de/hints.txt %%DATADIR%%/dat/descript/de/items.txt %%DATADIR%%/dat/descript/de/monsters.txt %%DATADIR%%/dat/descript/de/quotes.txt %%DATADIR%%/dat/descript/de/skills.txt %%DATADIR%%/dat/descript/de/species.txt %%DATADIR%%/dat/descript/de/spells.txt %%DATADIR%%/dat/descript/de/tutorial.txt %%DATADIR%%/dat/descript/de/unident.txt %%DATADIR%%/dat/descript/de/unrand.txt %%DATADIR%%/dat/descript/el/ability.txt %%DATADIR%%/dat/descript/el/backgrounds.txt %%DATADIR%%/dat/descript/el/branches.txt %%DATADIR%%/dat/descript/el/gods.txt %%DATADIR%%/dat/descript/el/items.txt %%DATADIR%%/dat/descript/el/monsters.txt %%DATADIR%%/dat/descript/el/species.txt %%DATADIR%%/dat/descript/el/tutorial.txt %%DATADIR%%/dat/descript/el/unident.txt %%DATADIR%%/dat/descript/el/unrand.txt %%DATADIR%%/dat/descript/es/ability.txt %%DATADIR%%/dat/descript/es/backgrounds.txt %%DATADIR%%/dat/descript/es/branches.txt %%DATADIR%%/dat/descript/es/cards.txt %%DATADIR%%/dat/descript/es/commands.txt %%DATADIR%%/dat/descript/es/features.txt %%DATADIR%%/dat/descript/es/gods.txt %%DATADIR%%/dat/descript/es/items.txt %%DATADIR%%/dat/descript/es/monsters.txt %%DATADIR%%/dat/descript/es/quotes.txt %%DATADIR%%/dat/descript/es/skills.txt %%DATADIR%%/dat/descript/es/species.txt %%DATADIR%%/dat/descript/es/tutorial.txt %%DATADIR%%/dat/descript/es/unident.txt %%DATADIR%%/dat/descript/es/unrand.txt %%DATADIR%%/dat/descript/features.txt %%DATADIR%%/dat/descript/fi/ability.txt %%DATADIR%%/dat/descript/fi/backgrounds.txt %%DATADIR%%/dat/descript/fi/cards.txt %%DATADIR%%/dat/descript/fi/commands.txt %%DATADIR%%/dat/descript/fi/features.txt %%DATADIR%%/dat/descript/fi/items.txt %%DATADIR%%/dat/descript/fi/monsters.txt %%DATADIR%%/dat/descript/fi/species.txt %%DATADIR%%/dat/descript/fi/spells.txt %%DATADIR%%/dat/descript/fi/unident.txt %%DATADIR%%/dat/descript/fi/unrand.txt %%DATADIR%%/dat/descript/fr/ability.txt %%DATADIR%%/dat/descript/fr/backgrounds.txt %%DATADIR%%/dat/descript/fr/branches.txt %%DATADIR%%/dat/descript/fr/cards.txt %%DATADIR%%/dat/descript/fr/commands.txt %%DATADIR%%/dat/descript/fr/features.txt %%DATADIR%%/dat/descript/fr/gods.txt %%DATADIR%%/dat/descript/fr/hints.txt %%DATADIR%%/dat/descript/fr/items.txt %%DATADIR%%/dat/descript/fr/monsters.txt %%DATADIR%%/dat/descript/fr/quotes.txt %%DATADIR%%/dat/descript/fr/skills.txt %%DATADIR%%/dat/descript/fr/species.txt %%DATADIR%%/dat/descript/fr/spells.txt %%DATADIR%%/dat/descript/fr/tutorial.txt %%DATADIR%%/dat/descript/fr/unident.txt %%DATADIR%%/dat/descript/fr/unrand.txt %%DATADIR%%/dat/descript/gods.txt %%DATADIR%%/dat/descript/hints.txt %%DATADIR%%/dat/descript/hu/backgrounds.txt %%DATADIR%%/dat/descript/hu/species.txt %%DATADIR%%/dat/descript/it/backgrounds.txt %%DATADIR%%/dat/descript/it/branches.txt %%DATADIR%%/dat/descript/it/cards.txt %%DATADIR%%/dat/descript/it/commands.txt %%DATADIR%%/dat/descript/it/features.txt %%DATADIR%%/dat/descript/it/gods.txt %%DATADIR%%/dat/descript/it/hints.txt %%DATADIR%%/dat/descript/it/items.txt %%DATADIR%%/dat/descript/it/monsters.txt %%DATADIR%%/dat/descript/it/quotes.txt %%DATADIR%%/dat/descript/it/skills.txt %%DATADIR%%/dat/descript/it/species.txt %%DATADIR%%/dat/descript/it/tutorial.txt %%DATADIR%%/dat/descript/it/unident.txt %%DATADIR%%/dat/descript/it/unrand.txt %%DATADIR%%/dat/descript/items.txt %%DATADIR%%/dat/descript/ja/ability.txt %%DATADIR%%/dat/descript/ja/backgrounds.txt %%DATADIR%%/dat/descript/ja/branches.txt %%DATADIR%%/dat/descript/ja/cards.txt %%DATADIR%%/dat/descript/ja/commands.txt %%DATADIR%%/dat/descript/ja/gods.txt %%DATADIR%%/dat/descript/ja/hints.txt %%DATADIR%%/dat/descript/ja/items.txt %%DATADIR%%/dat/descript/ja/monsters.txt %%DATADIR%%/dat/descript/ja/skills.txt %%DATADIR%%/dat/descript/ja/species.txt %%DATADIR%%/dat/descript/ja/spells.txt %%DATADIR%%/dat/descript/ja/tutorial.txt %%DATADIR%%/dat/descript/ja/unident.txt %%DATADIR%%/dat/descript/ja/unrand.txt %%DATADIR%%/dat/descript/ko/ability.txt %%DATADIR%%/dat/descript/ko/backgrounds.txt %%DATADIR%%/dat/descript/ko/branches.txt %%DATADIR%%/dat/descript/ko/cards.txt %%DATADIR%%/dat/descript/ko/commands.txt %%DATADIR%%/dat/descript/ko/features.txt %%DATADIR%%/dat/descript/ko/gods.txt %%DATADIR%%/dat/descript/ko/hints.txt %%DATADIR%%/dat/descript/ko/items.txt %%DATADIR%%/dat/descript/ko/monsters.txt %%DATADIR%%/dat/descript/ko/quotes.txt %%DATADIR%%/dat/descript/ko/skills.txt %%DATADIR%%/dat/descript/ko/species.txt %%DATADIR%%/dat/descript/ko/spells.txt %%DATADIR%%/dat/descript/ko/tutorial.txt %%DATADIR%%/dat/descript/ko/unident.txt %%DATADIR%%/dat/descript/ko/unrand.txt %%DATADIR%%/dat/descript/lt/backgrounds.txt %%DATADIR%%/dat/descript/lt/branches.txt %%DATADIR%%/dat/descript/lt/commands.txt %%DATADIR%%/dat/descript/lt/monsters.txt %%DATADIR%%/dat/descript/lt/skills.txt %%DATADIR%%/dat/descript/lt/species.txt %%DATADIR%%/dat/descript/lt/unident.txt %%DATADIR%%/dat/descript/lv/ability.txt %%DATADIR%%/dat/descript/lv/backgrounds.txt %%DATADIR%%/dat/descript/lv/branches.txt %%DATADIR%%/dat/descript/lv/cards.txt %%DATADIR%%/dat/descript/lv/commands.txt %%DATADIR%%/dat/descript/lv/features.txt %%DATADIR%%/dat/descript/lv/gods.txt %%DATADIR%%/dat/descript/lv/hints.txt %%DATADIR%%/dat/descript/lv/items.txt %%DATADIR%%/dat/descript/lv/monsters.txt %%DATADIR%%/dat/descript/lv/skills.txt %%DATADIR%%/dat/descript/lv/species.txt %%DATADIR%%/dat/descript/lv/spells.txt %%DATADIR%%/dat/descript/lv/tutorial.txt %%DATADIR%%/dat/descript/lv/unident.txt %%DATADIR%%/dat/descript/lv/unrand.txt %%DATADIR%%/dat/descript/monsters.txt %%DATADIR%%/dat/descript/nl/ability.txt %%DATADIR%%/dat/descript/nl/tutorial.txt %%DATADIR%%/dat/descript/nl/unident.txt %%DATADIR%%/dat/descript/pl/ability.txt %%DATADIR%%/dat/descript/pl/backgrounds.txt %%DATADIR%%/dat/descript/pl/cards.txt %%DATADIR%%/dat/descript/pl/commands.txt %%DATADIR%%/dat/descript/pl/features.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%%/dat/descript/pl/spells.txt %%DATADIR%%/dat/descript/pl/tutorial.txt %%DATADIR%%/dat/descript/pl/unident.txt %%DATADIR%%/dat/descript/pl/unrand.txt %%DATADIR%%/dat/descript/pt/ability.txt %%DATADIR%%/dat/descript/pt/commands.txt %%DATADIR%%/dat/descript/pt/gods.txt %%DATADIR%%/dat/descript/pt/items.txt %%DATADIR%%/dat/descript/pt/unident.txt %%DATADIR%%/dat/descript/quotes.txt %%DATADIR%%/dat/descript/ru/ability.txt %%DATADIR%%/dat/descript/ru/backgrounds.txt %%DATADIR%%/dat/descript/ru/branches.txt %%DATADIR%%/dat/descript/ru/cards.txt %%DATADIR%%/dat/descript/ru/commands.txt %%DATADIR%%/dat/descript/ru/features.txt %%DATADIR%%/dat/descript/ru/gods.txt %%DATADIR%%/dat/descript/ru/hints.txt %%DATADIR%%/dat/descript/ru/items.txt %%DATADIR%%/dat/descript/ru/monsters.txt %%DATADIR%%/dat/descript/ru/quotes.txt %%DATADIR%%/dat/descript/ru/skills.txt %%DATADIR%%/dat/descript/ru/species.txt %%DATADIR%%/dat/descript/ru/spells.txt %%DATADIR%%/dat/descript/ru/tutorial.txt %%DATADIR%%/dat/descript/ru/unident.txt %%DATADIR%%/dat/descript/ru/unrand.txt %%DATADIR%%/dat/descript/skills.txt %%DATADIR%%/dat/descript/species.txt %%DATADIR%%/dat/descript/spells.txt %%DATADIR%%/dat/descript/sv/ability.txt %%DATADIR%%/dat/descript/sv/cards.txt %%DATADIR%%/dat/descript/sv/commands.txt %%DATADIR%%/dat/descript/sv/features.txt %%DATADIR%%/dat/descript/sv/items.txt %%DATADIR%%/dat/descript/sv/monsters.txt %%DATADIR%%/dat/descript/sv/species.txt %%DATADIR%%/dat/descript/sv/unrand.txt %%DATADIR%%/dat/descript/tr/ability.txt %%DATADIR%%/dat/descript/tr/cards.txt %%DATADIR%%/dat/descript/tr/commands.txt %%DATADIR%%/dat/descript/tr/gods.txt %%DATADIR%%/dat/descript/tr/items.txt %%DATADIR%%/dat/descript/tr/quotes.txt %%DATADIR%%/dat/descript/tr/species.txt %%DATADIR%%/dat/descript/tr/tutorial.txt %%DATADIR%%/dat/descript/tr/unident.txt %%DATADIR%%/dat/descript/tr/unrand.txt %%DATADIR%%/dat/descript/tutorial.txt %%DATADIR%%/dat/descript/unident.txt %%DATADIR%%/dat/descript/unrand.txt %%DATADIR%%/dat/descript/zh/ability.txt %%DATADIR%%/dat/descript/zh/backgrounds.txt %%DATADIR%%/dat/descript/zh/branches.txt %%DATADIR%%/dat/descript/zh/cards.txt %%DATADIR%%/dat/descript/zh/commands.txt %%DATADIR%%/dat/descript/zh/features.txt %%DATADIR%%/dat/descript/zh/gods.txt %%DATADIR%%/dat/descript/zh/hints.txt %%DATADIR%%/dat/descript/zh/items.txt %%DATADIR%%/dat/descript/zh/monsters.txt %%DATADIR%%/dat/descript/zh/quotes.txt %%DATADIR%%/dat/descript/zh/skills.txt %%DATADIR%%/dat/descript/zh/species.txt %%DATADIR%%/dat/descript/zh/spells.txt %%DATADIR%%/dat/descript/zh/tutorial.txt %%DATADIR%%/dat/descript/zh/unident.txt %%DATADIR%%/dat/descript/zh/unrand.txt %%DATADIR%%/dat/dlua/debug.lua %%DATADIR%%/dat/dlua/dungeon.lua %%DATADIR%%/dat/dlua/fnwrap.lua %%DATADIR%%/dat/dlua/init.lua %%DATADIR%%/dat/dlua/iter.lua %%DATADIR%%/dat/dlua/layout/geoelf.lua %%DATADIR%%/dat/dlua/layout/geoelf_corridors.lua %%DATADIR%%/dat/dlua/layout/geoelf_directions.lua %%DATADIR%%/dat/dlua/layout/geoelf_glyphs.lua %%DATADIR%%/dat/dlua/layout/geoelf_rooms.lua %%DATADIR%%/dat/dlua/layout/hyper.lua %%DATADIR%%/dat/dlua/layout/hyper_caves.lua %%DATADIR%%/dat/dlua/layout/hyper_city.lua %%DATADIR%%/dat/dlua/layout/hyper_debug.lua %%DATADIR%%/dat/dlua/layout/hyper_decor.lua %%DATADIR%%/dat/dlua/layout/hyper_fort.lua %%DATADIR%%/dat/dlua/layout/hyper_paint.lua %%DATADIR%%/dat/dlua/layout/hyper_place.lua %%DATADIR%%/dat/dlua/layout/hyper_rooms.lua %%DATADIR%%/dat/dlua/layout/hyper_shapes.lua %%DATADIR%%/dat/dlua/layout/hyper_strategy.lua %%DATADIR%%/dat/dlua/layout/hyper_usage.lua %%DATADIR%%/dat/dlua/layout/layout.lua %%DATADIR%%/dat/dlua/layout/minimum_map_area.lua %%DATADIR%%/dat/dlua/layout/omnigrid.lua %%DATADIR%%/dat/dlua/layout/procedural.lua %%DATADIR%%/dat/dlua/layout/procedural_complex.lua %%DATADIR%%/dat/dlua/layout/procedural_primitives.lua %%DATADIR%%/dat/dlua/layout/procedural_transform.lua %%DATADIR%%/dat/dlua/layout/rooms_primitive.lua %%DATADIR%%/dat/dlua/layout/theme.lua %%DATADIR%%/dat/dlua/layout/vector.lua %%DATADIR%%/dat/dlua/layout/zonify.lua %%DATADIR%%/dat/dlua/lm_1way.lua %%DATADIR%%/dat/dlua/lm_door.lua %%DATADIR%%/dat/dlua/lm_fog.lua %%DATADIR%%/dat/dlua/lm_items.lua %%DATADIR%%/dat/dlua/lm_mon_prop.lua %%DATADIR%%/dat/dlua/lm_monst.lua %%DATADIR%%/dat/dlua/lm_mslav.lua %%DATADIR%%/dat/dlua/lm_pdesc.lua %%DATADIR%%/dat/dlua/lm_props.lua %%DATADIR%%/dat/dlua/lm_timed.lua %%DATADIR%%/dat/dlua/lm_tmsg.lua %%DATADIR%%/dat/dlua/lm_toll.lua %%DATADIR%%/dat/dlua/lm_trig.lua %%DATADIR%%/dat/dlua/lm_trove.lua %%DATADIR%%/dat/dlua/loadmaps.lua %%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 %%DATADIR%%/dat/dlua/sprint.lua %%DATADIR%%/dat/dlua/stress.lua %%DATADIR%%/dat/dlua/tags.lua %%DATADIR%%/dat/dlua/test.lua %%DATADIR%%/dat/dlua/tutorial.lua %%DATADIR%%/dat/dlua/userbase.lua %%DATADIR%%/dat/dlua/util.lua %%DATADIR%%/dat/dlua/v_debug.lua %%DATADIR%%/dat/dlua/v_layouts.lua %%DATADIR%%/dat/dlua/v_paint.lua %%DATADIR%%/dat/dlua/v_rooms.lua %%DATADIR%%/dat/dlua/v_shapes.lua %%DATADIR%%/dat/dlua/vault.lua %%DATADIR%%/dat/dlua/ziggurat.lua %%SDL%%%%DATADIR%%/dat/tiles/feat.png %%SDL%%%%DATADIR%%/dat/tiles/floor.png %%SDL%%%%DATADIR%%/dat/tiles/gui.png %%SDL%%%%DATADIR%%/dat/tiles/icons.png %%SDL%%%%DATADIR%%/dat/tiles/logo.png %%SDL%%%%DATADIR%%/dat/tiles/main.png %%SDL%%%%DATADIR%%/dat/tiles/player.png %%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png %%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-512x512.png %%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.png +%%SDL%%%%DATADIR%%/dat/tiles/title_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 %%SDL%%%%DATADIR%%/dat/tiles/title_denzi_evil_mage.png %%SDL%%%%DATADIR%%/dat/tiles/title_denzi_invasion.png %%SDL%%%%DATADIR%%/dat/tiles/title_denzi_kitchen_duty.png %%SDL%%%%DATADIR%%/dat/tiles/title_denzi_summoner.png %%SDL%%%%DATADIR%%/dat/tiles/title_denzi_undead_warrior.png %%SDL%%%%DATADIR%%/dat/tiles/title_firemage.png %%SDL%%%%DATADIR%%/dat/tiles/title_omndra_zot_demon.png %%SDL%%%%DATADIR%%/dat/tiles/title_peileppe_bloax_eye.png %%SDL%%%%DATADIR%%/dat/tiles/title_pooryurik_knight.png %%SDL%%%%DATADIR%%/dat/tiles/title_psiweapon_kiku.png %%SDL%%%%DATADIR%%/dat/tiles/title_psiweapon_roxanne.png %%SDL%%%%DATADIR%%/dat/tiles/title_shadyamish_octm.png %%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_entering_the_dungeon.png %%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_grabbing_the_orb.png %%SDL%%%%DATADIR%%/dat/tiles/wall.png %%DATADIR%%/docs/CREDITS.txt %%DATADIR%%/docs/aptitudes.txt %%DATADIR%%/docs/arena.txt %%DATADIR%%/docs/changelog.txt %%DATADIR%%/docs/crawl_manual.txt %%DATADIR%%/docs/develop/IRC.txt %%DATADIR%%/docs/develop/android.txt %%DATADIR%%/docs/develop/coding_conventions.txt +%%DATADIR%%/docs/develop/ctags.txt %%DATADIR%%/docs/develop/gdb_tips.txt %%DATADIR%%/docs/develop/levels/advanced.txt %%DATADIR%%/docs/develop/levels/introduction.txt %%DATADIR%%/docs/develop/levels/syntax.txt %%DATADIR%%/docs/develop/levels/triggerables.txt %%DATADIR%%/docs/develop/monster_speech.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%%/docs/develop/tiles_creation.txt %%DATADIR%%/docs/develop/translation.txt %%DATADIR%%/docs/fight_simulator.txt %%DATADIR%%/docs/keybind.txt %%DATADIR%%/docs/license/cc0.txt %%DATADIR%%/docs/license/lgpl.txt %%DATADIR%%/docs/license/libpng-LICENSE.txt %%DATADIR%%/docs/license/lualicense.txt %%DATADIR%%/docs/license/pcre_license.txt %%DATADIR%%/docs/license/worley.txt %%DATADIR%%/docs/macros_guide.txt %%DATADIR%%/docs/options_guide.txt %%DATADIR%%/docs/quickstart.txt %%DATADIR%%/docs/ssh_guide.txt %%DATADIR%%/docs/tiles_help.txt %%DATADIR%%/settings/0.12_monster_glyphs.txt %%DATADIR%%/settings/0.13_monster_glyphs.txt %%DATADIR%%/settings/0.14_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 %%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 -%%PORTDOCS%%@dir %%DOCSDIR%% -%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%% -@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%% +%%DATADIR%%/settings/old_unicode_glyphs.txt +%%DATADIR%%/settings/safe_move_shift.txt Index: head/games/stonesoup-sdl/Makefile =================================================================== --- head/games/stonesoup-sdl/Makefile (revision 387489) +++ head/games/stonesoup-sdl/Makefile (revision 387490) @@ -1,10 +1,8 @@ # Created by: tobias.rehbein@web.de # $FreeBSD$ -PORTREVISION= 1 - PORT_OPTIONS+= SDL MASTERDIR= ${.CURDIR}/../stonesoup .include "${MASTERDIR}/Makefile"