Permalink
Browse files

Update to 0.11.0 cooperating with the MAINTAINER.

This port can now be built with Clang.

Feature safe:	yes
  • Loading branch information...
1 parent 898c54e commit 03f94ff6d1b3ceb6baeb383da33a600f286bb00d @knu knu committed Nov 12, 2012
View
@@ -6,7 +6,7 @@
#
PORTNAME= stonesoup
-PORTVERSION= 0.10.3
+PORTVERSION= 0.11.0
CATEGORIES= games
MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION}
DISTNAME= stone_soup-${PORTVERSION}-nodeps
@@ -23,7 +23,6 @@ USE_BISON= build
USE_GMAKE= yes
USE_LUA= 5.1
USE_PERL5_BUILD= yes
-USE_GCC= 4.2+
MAKE_JOBS_SAFE= yes
@@ -71,6 +70,9 @@ MAKE_ARGS+= TILES=y
PLIST_SUB+= SDL=""
PKGNAMESUFFIX= -sdl
USE_PKGCONFIG= yes
+BUILD_DEPENDS+= fc-list:${PORTSDIR}/x11-fonts/fontconfig \
+ ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2
USE_SDL= sdl image
View
@@ -1,2 +1,2 @@
-SHA256 (stone_soup-0.10.3-nodeps.tar.xz) = c61801030486bb7020992d95573fb9378e80355c400b82cfa0f476dbd823c4a2
-SIZE (stone_soup-0.10.3-nodeps.tar.xz) = 6486324
+SHA256 (stone_soup-0.11.0-nodeps.tar.xz) = 2a39307c9f88608ee2a33d3b831c51d9190c91ccdedadececda5edae6dd69002
+SIZE (stone_soup-0.11.0-nodeps.tar.xz) = 7516360
@@ -1,11 +0,0 @@
---- ./AppHdr.h.orig 2012-04-10 21:47:14.000000000 +0200
-+++ ./AppHdr.h 2012-04-14 18:50:22.264960252 +0200
-@@ -126,7 +126,7 @@
- //
- // 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 &"
-
- // For cases when the game will be played on terms that don't support the
- // curses "bold == lighter" 16 colour mode. -- bwr
@@ -1,15 +1,15 @@
---- ./Makefile.orig 2012-04-10 21:47:14.000000000 +0200
-+++ ./Makefile 2012-04-14 18:50:22.291961515 +0200
-@@ -63,7 +63,7 @@
+--- ./Makefile.orig 2012-09-30 23:25:31.000000000 +0200
++++ ./Makefile 2012-10-27 20:49:08.837330946 +0200
+@@ -66,7 +66,7 @@
# ask for a package with convenience libraries instead -- we'll try to provide
# them somewhere in the near future.
-GAME = crawl
+GAME = stonesoup
- ASSERTS = yes
-
-@@ -111,7 +111,7 @@
+ # 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
+@@ -112,7 +112,7 @@
else
@@ -18,7 +18,7 @@
endif # USE_ICC
-@@ -119,7 +119,7 @@
+@@ -120,7 +120,7 @@
CFOPTIMIZE += -flto=jobserver -fwhole-program
endif
@@ -27,7 +27,56 @@
CFWARN := -Wall -Wformat-security
CFWARN_L := -Wundef
-@@ -688,7 +688,7 @@
+@@ -133,8 +133,6 @@
+ #
+ AR = ar
+ RANLIB = ranlib
+-CC = $(GCC)
+-CXX = $(GXX)
+ RM = rm -f
+ COPY = cp
+ COPY_R = cp -r
+@@ -530,30 +528,19 @@
+ ifndef BUILD_LUA
+ ifdef NO_PKGCONFIG
+ BUILD_LUA = yes
+- endif
+-endif
+-ifndef BUILD_LUA
+- ifneq ($(shell $(PKGCONFIG) lua5.1 --exists || echo no),)
+- ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),)
++ else
++ LUA_PACKAGE := $(shell for lua in lua51 lua5.1 lua-5.1 lua; do \
++ $(PKGCONFIG) $$lua --exists && test `$(PKGCONFIG) $$lua --modversion | head -c 3` = 5.1 && \
++ echo $$lua && break;\
++ done)
++ ifeq (,$(LUA_PACKAGE))
+ BUILD_LUA = yes
+ else
+- ifeq ($(shell $(PKGCONFIG) lua --modversion | head -c 3),5.1)
+- LUA_PACKAGE = lua
+- else
+- BUILD_LUA = yes
+- endif
++ INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I)
++ CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
++ LIBS += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --libs)
+ endif
+- else
+- LUA_PACKAGE = lua5.1
+- endif
+-endif
+-ifndef BUILD_LUA
+- ifndef LUA_PACKAGE
+- LUA_PACKAGE = lua5.1
+ endif
+- INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I)
+- CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
+- LIBS += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --libs)
+ endif
+
+ ifndef BUILD_SQLITE
+@@ -707,7 +694,7 @@
DEFINES += -DWIZARD
endif
ifdef NO_OPTIMIZE
@@ -36,12 +85,54 @@
endif
ifdef PCH
-@@ -953,7 +953,7 @@
+@@ -831,10 +818,12 @@
+ INSTALL_FONTS += $(PROPORTIONAL_FONT)
+ endif
+ else
+- SYS_PROPORTIONAL_FONT = $(shell find /usr/share/fonts -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
+- ifeq (,$(SYS_PROPORTIONAL_FONT))
+- SYS_PROPORTIONAL_FONT = $(shell find /usr/local/share/fonts -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
+- endif
++ 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;\
++ do [ -d $$dir ] && echo $$dir; done;\
++ } 2>/dev/null | xargs -I% find % -type f -iname $$name -print | head -n1)
+ ifneq (,$(SYS_PROPORTIONAL_FONT))
+ ifeq (,$(COPY_FONTS))
+ DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
+@@ -854,10 +843,12 @@
+ INSTALL_FONTS += $(MONOSPACED_FONT)
+ endif
+ else
+- SYS_MONOSPACED_FONT = $(shell find /usr/share/fonts -iname $(OUR_MONOSPACED_FONT)|head -n 1)
+- ifeq (,$(SYS_MONOSPACED_FONT))
+- SYS_MONOSPACED_FONT = $(shell find /usr/local/share/fonts -iname $(OUR_MONOSPACED_FONT)|head -n 1)
+- endif
++ 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;\
++ do [ -d $$dir ] && echo $$dir; done;\
++ } 2>/dev/null | xargs -I% find % -type f -iname $$name -print | head -n1)
+ ifneq (,$(SYS_MONOSPACED_FONT))
+ ifeq (,$(COPY_FONTS))
+ DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"
+@@ -1036,7 +1027,7 @@
+ cmd-name.h $(INI_OBJECTS)
- GAME_DEPENDS := $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB_LIBS) dat/dlua/tags.lua
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
+@@ -1049,6 +1040,7 @@
+ greet:
+ @if [ ! -e $(GAME) ]; then\
+ printf " * If you experience any problems building Crawl, please take a second look\\n"\
++ ;printf\
+ " * at INSTALL.txt: the solution to your problem just might be in there!\\n";\
+ fi
+
@@ -0,0 +1,24 @@
+--- ./files.cc.orig 2012-09-30 23:25:31.000000000 +0200
++++ ./files.cc 2012-10-27 20:49:08.839666272 +0200
+@@ -618,8 +618,10 @@
+ {
+ std::vector<player_save_info> chars;
+
++#ifdef WIZARD
+ if (Options.no_save)
+ return chars;
++#endif
+
+ #ifndef DISABLE_SAVEGAME_LISTS
+ std::string searchpath = _get_savefile_directory();
+@@ -1741,8 +1743,10 @@
+ // returns false if a new game should start instead
+ static bool _restore_game(const std::string& filename)
+ {
++#ifdef WIZARD
+ if (Options.no_save)
+ return false;
++#endif
+
+ you.save = new package((_get_savefile_directory() + filename).c_str(), true);
+
@@ -0,0 +1,14 @@
+--- ./ng-setup.cc.orig 2012-09-30 23:25:31.000000000 +0200
++++ ./ng-setup.cc 2012-10-27 20:49:08.841950945 +0200
+@@ -1427,9 +1427,11 @@
+ you.nemelex_sacrificing = true;
+
+ // Create the save file.
++#ifdef WIZARD
+ if (Options.no_save)
+ you.save = new package();
+ else
++#endif
+ you.save = new package(get_savedir_filename(you.your_name).c_str(),
+ true, true);
+ }
@@ -1,5 +1,5 @@
---- ./rltiles/Makefile.orig 2012-04-10 21:47:25.000000000 +0200
-+++ ./rltiles/Makefile 2012-04-14 18:50:22.293960597 +0200
+--- ./rltiles/Makefile.orig 2012-09-30 23:25:31.000000000 +0200
++++ ./rltiles/Makefile 2012-10-27 20:49:55.957667879 +0200
@@ -1,7 +1,7 @@
uname_S := $(shell uname -s)
@@ -50,21 +50,34 @@
endif
# Attempt to use a full compiler name, to make
-@@ -100,7 +100,7 @@
- $(QUIET_GEN)$(TILEGEN) $<
+@@ -58,7 +58,7 @@
+ ifeq ($(shell which $(LMACH)gcc > /dev/null 2> /dev/null && echo "Yes"),)
+ LMACH :=
+ endif
+-HOSTCXX ?= $(LMACH)g++
++HOSTCXX ?= $(LMACH)$(CXX)
+
+ DELETE = rm -f
+
+@@ -98,7 +98,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)'; \
-@@ -129,9 +129,9 @@
+@@ -127,9 +127,13 @@
distclean: clean
%.o: %.cc .cflags
-- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
-+ $(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
+- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -Wp,-MMD,$*.d,-MT,$@ -c $< -o $@
++ifdef NO_INLINE_DEPGEN
++ $(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -Wp,-MT,$@ -c $< -o $@
++else
++ $(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -Wp,-MMD,$*.d,-MT,$@ -c $< -o $@
++endif
$(TILEGEN): $(OBJECTS)
- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
@@ -0,0 +1,17 @@
+--- ./rltiles/tool/tile.cc.orig 2012-09-30 23:25:33.000000000 +0200
++++ ./rltiles/tool/tile.cc 2012-10-27 20:49:08.845367925 +0200
+@@ -125,10 +125,10 @@
+ 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;
+ }
@@ -0,0 +1,11 @@
+--- ./rltiles/tool/tile_list_processor.cc.orig 2012-09-30 23:25:33.000000000 +0200
++++ ./rltiles/tool/tile_list_processor.cc 2012-10-27 20:49:08.847233795 +0200
+@@ -51,7 +51,7 @@
+ ""
+ };
+
+- if (m_sdir != "" || background && m_back_sdir != "")
++ if (m_sdir != "" || (background && m_back_sdir != ""))
+ {
+ std::vector<const char *> dirs;
+ if (m_sdir != "")
@@ -0,0 +1,13 @@
+--- ./startup.cc.orig 2012-09-30 23:25:33.000000000 +0200
++++ ./startup.cc 2012-10-27 20:49:08.848667287 +0200
+@@ -234,8 +234,10 @@
+ you.wizard = true;
+ #endif
+ // Save-less games are pointless except for tests.
++#ifdef WIZARD
+ if (Options.no_save)
+ you.wizard = true;
++#endif
+
+ init_properties();
+ burden_change();
Oops, something went wrong.

0 comments on commit 03f94ff

Please sign in to comment.