Attachment 172795 Details for Bug 210670 – games/stonesoup: 0.17.1 -> 0.18.1 and cleanups

[patch] games/stonesoup: 0.17.1 -> 0.18.1 and cleanups

stonesoup-0.18.1_and_cleanups.diff (text/plain), 13.74 KB, created by Nikolai Lifanov on 2016-07-21 19:17:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolai Lifanov

Created: 2016-07-21 19:17:54 UTC

Size: 13.74 KB

patch

obsolete

>Index: UPDATING
>===================================================================
>--- UPDATING	(revision 418879)
>+++ UPDATING	(working copy)
>@@ -5,7 +5,14 @@
> You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
>+2016XXXX:
>+  AFFECTS: users of games/stonesoup-*
>+  AUTHOR: lifanov@mail.lifanov.com
> 
>+  The WIZARD option has been renamed to NOWIZARD and is now an opt-out to
>+  better reflect the upstream. If you run a shared game server and would
>+  like the Wizard mode support disabled, please update port options.
>+
> 20160718:
>   AFFECTS: users of www/awstats
>   AUTHOR: adamw@FreeBSD.org
>Index: games/stonesoup/Makefile
>===================================================================
>--- games/stonesoup/Makefile	(revision 418879)
>+++ games/stonesoup/Makefile	(working copy)
>@@ -2,13 +2,13 @@
> # $FreeBSD$
> 
> PORTNAME=	stonesoup
>-PORTVERSION=	0.17.1
>+PORTVERSION=	0.18.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
>+MAINTAINER=	lifanov@mail.lifanov.com
> COMMENT=	Dungeon Crawl Stone Soup - a fun, free rogue-like game
> 
> LICENSE=	GPLv2
>@@ -29,11 +29,13 @@
> SUB_FILES=	README.FreeBSD
> PLIST_SUB=	SAVEDIR="${SAVEDIR}"
> 
>-OPTIONS_DEFINE=	SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES
>+OPTIONS_DEFINE=	SDL SOUND NOWIZARD LUA DOCS EXAMPLES
>+OPTIONS_SUB=	yes
> 
>+UI_DESC=	User interface
> SOUND_DESC=	Sound support
>-WIZARD_DESC=	Wizard mode
>-LUA_BINDINGS_DESC=	Bindings for LUA user scripts
>+NOWIZARD_DESC=	Disable Wizard mode
>+LUA_DESC=	Bindings for LUA user scripts
> 
> MAKE_ARGS=	prefix=${PREFIX} \
> 		DATADIR=${DATADIR} \
>@@ -42,46 +44,32 @@
> 		INSTALL_UGRP=root:games \
> 		NO_AUTO_OPT=YesPlease \
> 		NO_OPTIMIZE=YesPlease \
>+		NO_TRY_GOLD=YesPlease \
>+		POSIX=YesPlease \
> 		SQLITE_INCLUDE_DIR=${LOCALBASE}/include \
> 		SQLITE_LIB=-lsqlite3
> 
>-.include <bsd.port.options.mk>
>-
> .if defined(VERBOSE)
> MAKE_ARGS+=	V=yes
> .endif
> 
>-.if empty(PORT_OPTIONS:MWIZARD)
>-MAKE_ARGS+=	NOWIZARD=y
>-.endif
>-
>-.if ${PORT_OPTIONS:MSDL}
>-CONFLICTS+=	${PORTNAME}-[0-9]*
>-MAKE_ARGS+=	TILES=y \
>-		GL_INCLUDE="-I ${LOCALBASE}/include/GL"
>-PLIST_SUB+=	SDL=""
>-PKGNAMESUFFIX=	-sdl
>-BUILD_DEPENDS+=	fc-list:x11-fonts/fontconfig \
>+SDL_CONFLICTS=	${PORTNAME}-[0-9]*
>+SDL_USE=	sdl=sdl2,image2 gl=gl,glu
>+SDL_USES_OFF=	ncurses
>+SDL_MAKE_ARGS=	TILES=y
>+SDL_BUILD_DEPENDS=	\
>+		fc-list:x11-fonts/fontconfig \
> 		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
>-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
>-LIB_DEPENDS+=	libpng.so:graphics/png \
>+SDL_RUN_DEPENDS=	\
>+		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
>+SDL_LIB_DEPENDS=libpng.so:graphics/png \
> 		libfreetype.so:print/freetype2
>-USE_SDL=	sdl2 image2
>-USE_GL=		yes
>-.else
>-USES+=		ncurses
>-CONFLICTS+=	${PORTNAME}-sdl-[0-9]*
>-PLIST_SUB+=	SDL="@comment "
>-.endif
>+SDL_CONFLICTS_OFF=	${PORTNAME}-sdl-[0-9]*
> 
>-.if ${PORT_OPTIONS:MSOUND}
>-RUN_DEPENDS+=	sox:audio/sox
>-.endif
>+NOWIZARD_MAKE_ARGS=	NOWIZARD=y
>+SOUND_RUN_DEPENDS=	sox:audio/sox
>+LUA_MAKE_ARGS_OFF=	NO_LUA_BINDINGS=yes
> 
>-.if empty(PORT_OPTIONS:MLUA_BINDINGS)
>-MAKE_ARGS+=	NO_LUA_BINDINGS=yes
>-.endif
>-
> .include <bsd.port.pre.mk>
> 
> .if ${COMPILER_TYPE} != clang
>@@ -89,11 +77,12 @@
> .endif
> 
> .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
>+MAKE_ARGS+=	NO_YACC=YesPlease
> CFLAGS+=	-std=c++11
>+LDFLAGS:=	-Wl,-rpath=${_GCC_RUNTIME} ${LDFLAGS}
> .endif
> 
> post-patch:
>-#	@${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
>Index: games/stonesoup/distinfo
>===================================================================
>--- games/stonesoup/distinfo	(revision 418879)
>+++ games/stonesoup/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (stone_soup-0.17.1-nodeps.tar.xz) = 6314ea8229ec5b27804ff1788988bd110a16aadeb6b2f26660645c43ecfc49dd
>-SIZE (stone_soup-0.17.1-nodeps.tar.xz) = 9114224
>+TIMESTAMP = 1467136972
>+SHA256 (stone_soup-0.18.1-nodeps.tar.xz) = 4bdad7778f88a99470c725ff74a8145bdd60032f9ae48ce597f74b8ae784d850
>+SIZE (stone_soup-0.18.1-nodeps.tar.xz) = 9716104
>Index: games/stonesoup/files/patch-Makefile
>===================================================================
>--- games/stonesoup/files/patch-Makefile	(revision 418879)
>+++ games/stonesoup/files/patch-Makefile	(working copy)
>@@ -1,6 +1,6 @@
>---- Makefile.orig	2015-12-08 12:42:11 UTC
>+--- Makefile.orig	2016-04-30 03:53:03 UTC
> +++ Makefile
>-@@ -71,7 +71,7 @@
>+@@ -72,7 +72,7 @@
>  #    them; you can also ask for a package with convenience libraries instead --
>  #    we'll try to provide them somewhere in the near future.
>  
>@@ -9,7 +9,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
>-@@ -105,7 +105,7 @@ include Makefile.obj
>+@@ -106,23 +106,17 @@ include Makefile.obj
>  # Which C++ standard to support
>  STDFLAG = -std=c++11
>  
>@@ -18,16 +18,14 @@
>  CFWARN := 
>  CFWARN_L := -Wall -Wformat-security -Wundef
>  
>-@@ -114,7 +114,7 @@ DEFINES := $(EXTERNAL_DEFINES)
>- ifdef ANDROID
>- LDFLAGS := $(EXTERNAL_LDFLAGS) $(LDFLAGS)
>- else
>--LDFLAGS := $(EXTERNAL_LDFLAGS)
>-+# LDFLAGS := $(EXTERNAL_LDFLAGS)
>- endif
>+ DEFINES := $(EXTERNAL_DEFINES)
>  
>+-ifndef ANDROID
>+-LDFLAGS :=
>+-endif
>+-
>  #
>-@@ -122,8 +122,6 @@ endif
>+ # The GCC and GXX variables are set later.
>  #
>  AR = ar
>  RANLIB = ranlib
>@@ -36,7 +34,7 @@
>  RM = rm -f
>  COPY = cp
>  COPY_R = cp -r
>-@@ -512,16 +510,6 @@ ifneq ($(GCC_VER),)
>+@@ -511,16 +505,6 @@ ifneq ($(GCC_VER),)
>  GCC_VER_SUFFIX:=-$(GCC_VER)
>  endif
>  
>@@ -53,7 +51,7 @@
>  ifneq ($(FORCE_CC),)
>  GCC := $(FORCE_CC)
>  HOSTCC := $(FORCE_CC)
>-@@ -575,15 +563,6 @@ ifdef USE_ICC
>+@@ -574,15 +558,6 @@ ifdef USE_ICC
>  
>  # Some very good optimization flags.
>    CFOPTIMIZE := -O2 -parallel
>@@ -69,14 +67,7 @@
>  endif
>  
>  ifdef LTO
>-@@ -655,13 +634,13 @@ ifndef BUILD_LUA
>-         LUA_PACKAGE = lua-5.1
>-       endif
>-     else
>--      LUA_PACKAGE = lua5.1
>-+      LUA_PACKAGE = lua-5.1
>-     endif
>-   endif
>+@@ -660,7 +635,7 @@ ifndef BUILD_LUA
>  endif
>  ifndef BUILD_LUA
>    ifndef LUA_PACKAGE
>@@ -85,7 +76,7 @@
>    endif
>    INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I | sed -e 's/-I/-isystem /')
>    CFLAGS_L  += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other)
>-@@ -674,7 +653,7 @@ endif
>+@@ -673,7 +648,7 @@ endif
>  
>  ifndef BUILD_SQLITE
>    ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
>@@ -94,16 +85,7 @@
>      LIBS += $(SQLITE_LIB)
>      ifneq ($(shell grep -q sqlite3_prepare_v2 $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
>        DEFINES_L += -DANCIENT_SQLITE
>-@@ -762,7 +741,7 @@ endif
>- endif
>- 
>- DEFINES_L += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL2_CFLAGS)
>--INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL2_INCLUDE)
>-+INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL2_INCLUDE) $(GL_INCLUDE)
>- 
>- endif # TILES
>- 
>-@@ -831,7 +810,7 @@ ifndef NOWIZARD
>+@@ -830,7 +805,7 @@ ifndef NOWIZARD
>  DEFINES += -DWIZARD
>  endif
>  ifdef NO_OPTIMIZE
>@@ -112,7 +94,7 @@
>  endif
>  
>  ifdef PCH
>-@@ -958,7 +937,7 @@ else
>+@@ -957,7 +932,7 @@ else
>    SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\
>      {\
>        fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
>@@ -121,7 +103,7 @@
>        do [ -d $$dir ] && echo $$dir; done;\
>      } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
>    ifneq (,$(SYS_PROPORTIONAL_FONT))
>-@@ -983,7 +962,7 @@ else
>+@@ -982,7 +957,7 @@ else
>    SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\
>      {\
>        fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
>@@ -130,14 +112,3 @@
>        do [ -d $$dir ] && echo $$dir; done;\
>      } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
>    ifneq (,$(SYS_MONOSPACED_FONT))
>-@@ -1050,10 +1029,6 @@ CFWARN := -wd383,810,869,981,1418 -we14,
>- CFWARN_L :=
>- endif
>- 
>--ifeq (,$(shell echo 'int main(){return 1;}'|$(GXX) -x c++ - -o /dev/null -fuse-ld=gold 2>&1))
>--  LDFLAGS += -fuse-ld=gold
>--endif
>--
>- LDFLAGS += $(CFOPTIMIZE) $(CFOPTIMIZE_L)
>- 
>- ifdef REPORT
>Index: games/stonesoup/files/patch-crash.cc
>===================================================================
>--- games/stonesoup/files/patch-crash.cc	(nonexistent)
>+++ games/stonesoup/files/patch-crash.cc	(working copy)
>@@ -0,0 +1,17 @@
>+--- crash.cc.orig	2016-06-28 19:06:21 UTC
>++++ crash.cc
>+@@ -270,14 +270,6 @@ void init_crash_handler()
>+ 
>+ void dump_crash_info(FILE* file)
>+ {
>+-#if defined(UNIX)
>+-    const char *name = strsignal(_crash_signal);
>+-    if (name == nullptr)
>+-        name = "INVALID";
>+-
>+-    fprintf(file, "Crash caused by signal #%d: %s\n\n", _crash_signal,
>+-            name);
>+-#endif
>+ }
>+ 
>+ #if defined(BACKTRACE_SUPPORTED)
>
>Property changes on: games/stonesoup/files/patch-crash.cc
>___________________________________________________________________
>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: games/stonesoup/files/patch-rltiles_Makefile
>===================================================================
>--- games/stonesoup/files/patch-rltiles_Makefile	(revision 418879)
>+++ games/stonesoup/files/patch-rltiles_Makefile	(working copy)
>@@ -1,15 +1,14 @@
>---- rltiles/Makefile.orig	2015-12-15 18:50:32 UTC
>+--- rltiles/Makefile.orig	2016-04-30 03:53:03 UTC
> +++ rltiles/Makefile
>-@@ -10,8 +10,6 @@ endif
>- # Also, cross-compilation with no system libraries for host rather than target
>+@@ -11,7 +11,6 @@ endif
>  # is not supported.  If host=target, contribs are enough.
>  
>+ PKGCONFIG = pkg-config
> -CFLAGS := -O2 $(STDFLAG) -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
>--
>+ 
>  ifdef ANDROID
>    CXXFLAGS :=
>-   LDFLAGS :=
>-@@ -49,14 +47,14 @@ endif
>+@@ -50,14 +49,14 @@ endif
>  
>  # Attempt to use a full compiler name, to make
>  # distcc builds work nicely.
>@@ -27,7 +26,7 @@
>  
>  DELETE = rm -f
>  
>-@@ -133,6 +131,6 @@ distclean: clean
>+@@ -134,6 +133,6 @@ distclean: clean
>  	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
>  
>  $(TILEGEN): $(OBJECTS)
>Index: games/stonesoup/files/patch-wiz-you.cc
>===================================================================
>--- games/stonesoup/files/patch-wiz-you.cc	(nonexistent)
>+++ games/stonesoup/files/patch-wiz-you.cc	(working copy)
>@@ -0,0 +1,15 @@
>+--- wiz-you.cc.orig	2016-06-29 18:11:14 UTC
>++++ wiz-you.cc
>+@@ -1126,6 +1126,7 @@ void wizard_join_religion()
>+     }
>+ }
>+ 
>++#ifdef WIZARD
>+ void wizard_xom_acts()
>+ {
>+     char specs[80];
>+@@ -1158,3 +1159,4 @@ void wizard_xom_acts()
>+     dprf("Okay, Xom is doing '%s'.", xom_effect_to_name(event).c_str());
>+     xom_take_action(event, severity);
>+ }
>++#endif
>
>Property changes on: games/stonesoup/files/patch-wiz-you.cc
>___________________________________________________________________
>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: games/stonesoup/pkg-plist
>===================================================================
>--- games/stonesoup/pkg-plist	(revision 418879)
>+++ games/stonesoup/pkg-plist	(working copy)
>@@ -43,6 +43,7 @@
> %%DATADIR%%/dat/des/altar/nemelex_the_gamble.des
> %%DATADIR%%/dat/des/altar/okawaru_arena.des
> %%DATADIR%%/dat/des/altar/overflow.des
>+%%DATADIR%%/dat/des/altar/pakellas_experiments.des
> %%DATADIR%%/dat/des/altar/trog_burn_book.des
> %%DATADIR%%/dat/des/altar/trog_wizard.des
> %%DATADIR%%/dat/des/altar/vehumet_trees.des
>@@ -169,6 +170,7 @@
> %%DATADIR%%/dat/descript/backgrounds.txt
> %%DATADIR%%/dat/descript/branches.txt
> %%DATADIR%%/dat/descript/cards.txt
>+%%DATADIR%%/dat/descript/clouds.txt
> %%DATADIR%%/dat/descript/commands.txt
> %%DATADIR%%/dat/descript/cs/ability.txt
> %%DATADIR%%/dat/descript/cs/branches.txt
>@@ -388,6 +390,7 @@
> %%DATADIR%%/dat/descript/skills.txt
> %%DATADIR%%/dat/descript/species.txt
> %%DATADIR%%/dat/descript/spells.txt
>+%%DATADIR%%/dat/descript/status.txt
> %%DATADIR%%/dat/descript/sv/ability.txt
> %%DATADIR%%/dat/descript/sv/cards.txt
> %%DATADIR%%/dat/descript/sv/commands.txt
>@@ -500,6 +503,7 @@
> %%SDL%%%%DATADIR%%/dat/tiles/gui.png
> %%SDL%%%%DATADIR%%/dat/tiles/icons.png
> %%SDL%%%%DATADIR%%/dat/tiles/logo.png
>+%%SDL%%%%DATADIR%%/dat/tiles/logosmall.png
> %%SDL%%%%DATADIR%%/dat/tiles/main.png
> %%SDL%%%%DATADIR%%/dat/tiles/player.png
> %%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png
>@@ -535,6 +539,7 @@
> %%DATADIR%%/docs/develop/ctags.txt
> %%DATADIR%%/docs/develop/editor_tips.txt
> %%DATADIR%%/docs/develop/gdb_tips.txt
>+%%DATADIR%%/docs/develop/keys.txt
> %%DATADIR%%/docs/develop/levels/advanced.txt
> %%DATADIR%%/docs/develop/levels/introduction.txt
> %%DATADIR%%/docs/develop/levels/syntax.txt
>@@ -565,9 +570,9 @@
> %%DATADIR%%/settings/0.13_monster_glyphs.txt
> %%DATADIR%%/settings/0.14_monster_glyphs.txt
> %%DATADIR%%/settings/0.16_monster_glyphs.txt
>+%%DATADIR%%/settings/0.17_monster_glyphs.txt
> %%DATADIR%%/settings/0.9_monster_glyphs.txt
> %%DATADIR%%/settings/034_command_keys.txt
>-%%DATADIR%%/settings/034_monster_glyphs.txt
> %%DATADIR%%/settings/052_monster_glyphs.txt
> %%DATADIR%%/settings/060_monster_glyphs.txt
> %%DATADIR%%/settings/071_monster_glyphs.txt
>Index: games/stonesoup-sdl/Makefile
>===================================================================
>--- games/stonesoup-sdl/Makefile	(revision 418879)
>+++ games/stonesoup-sdl/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> # $FreeBSD$
> 
> PORT_OPTIONS+=	SDL
>+PKGNAMESUFFIX=	-sdl
> 
> MASTERDIR=	${.CURDIR}/../stonesoup
>

Actions: View | Diff

Attachments on bug 210670: 171919 | 171953 | 172784 | 172795 | 172796 | 172798 | 172799 | 172800 | 172801 | 172802 | 172803 | 172804 | 172805 | 172806 | 172807