games/stonesoup, games/stonesoup-sdl: update to 0.20.0

This release is filled with cool new stuff. Read about it here:
http://crawl.develz.org/wordpress/crawl-0-20-scarf-our-wanderful-fried-frogs

Port changes:
o switch to new master site layout and enable https://
o drop several now unnecessary local patches
o chase SOUND refactoring
o implement and enable sound support for SDL (tiles) option unconditionally
   - this uses SDL_mixer and not /usr/local/bin/play like the SOUND option

8 files changed, 25 insertions, 79 deletions

diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index f05ed58e76e6..f154f7540346 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	stonesoup
-PORTVERSION=	0.19.5
-PORTREVISION=	2
+PORTVERSION=	0.20.0
 CATEGORIES=	games
-MASTER_SITES=	SF/crawl-ref/Stone%20Soup/${PORTVERSION}
-MASTER_SITES=	http://crawl.develz.org/release/
-DISTNAME=	stone_soup-${PORTVERSION}-nodeps
+MASTER_SITES=	https://crawl.develz.org/release/%SUBDIR%/ \
+		http://crawl.develz.org/release/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTVERSION:C/.[0-9]+$//}
+DISTNAME=	stone_soup-${DISTVERSION}
 
 MAINTAINER=	lifanov@FreeBSD.org
 COMMENT=	Dungeon Crawl Stone Soup - a fun, free rogue-like game
@@ -54,9 +54,9 @@ NOWIZARD_DESC=	Disable Wizard mode
 LUA_DESC=	Bindings for LUA user scripts
 
 SDL_CONFLICTS=	${PORTNAME}-[0-9]*
-SDL_USE=	sdl=sdl2,image2 gl=gl,glu
+SDL_USE=	sdl=sdl2,image2,mixer2 gl=gl,glu
 SDL_USES_OFF=	ncurses
-SDL_MAKE_ARGS=	TILES=y
+SDL_MAKE_ARGS=	TILES=y SOUND=y
 SDL_BUILD_DEPENDS=	\
 		fc-list:x11-fonts/fontconfig \
 		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
@@ -67,6 +67,7 @@ SDL_LIB_DEPENDS=libpng.so:graphics/png \
 SDL_CONFLICTS_OFF=	${PORTNAME}-sdl-[0-9]*
 
 NOWIZARD_MAKE_ARGS=	NOWIZARD=y
+SOUND_MAKE_ARGS=	SOUND=y
 SOUND_RUN_DEPENDS=	sox:audio/sox
 LUA_MAKE_ARGS_OFF=	NO_LUA_BINDINGS=yes
 
@@ -77,11 +78,11 @@ CFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
 
 post-patch-SOUND-on:
-	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h
-	@${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h
+	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/sound.h
+	@${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/sound.h
 
 post-patch-SOUND-off:
-	@${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/AppHdr.h
+	@${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/sound.h
 
 pre-install:
 	@${FIND} ${WRKSRC}/dat -type f -name '*.orig' -delete
@@ -94,4 +95,7 @@ post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/settings/init.txt ${STAGEDIR}${EXAMPLESDIR}/sample.crawlrc
 
+post-install:
+	@${RM} -r ${STAGEDIR}${DATADIR}/settings/mac
+
 .include <bsd.port.post.mk>
diff --git a/games/stonesoup/distinfo b/games/stonesoup/distinfo
index a1b5c43dd6d3..75c79206e67e 100644
--- a/games/stonesoup/distinfo
+++ b/games/stonesoup/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488572530
-SHA256 (stone_soup-0.19.5-nodeps.tar.xz) = 284846d67b716dad58fb96e3e56555a43bfaf64f69fafb3bedf4412d1615d403
-SIZE (stone_soup-0.19.5-nodeps.tar.xz) = 9886788
+TIMESTAMP = 1496157141
+SHA256 (stone_soup-0.20.0.tar.xz) = 26d63796e8262ff8c12bfde60169e27b85f4acaacf1b9ece345151419cddbcd3
+SIZE (stone_soup-0.20.0.tar.xz) = 28373360
diff --git a/games/stonesoup/files/patch-AppHdr.h b/games/stonesoup/files/patch-AppHdr.h
deleted file mode 100644
index e973b2b9f057..000000000000
--- a/games/stonesoup/files/patch-AppHdr.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- AppHdr.h.orig	2015-10-31 04:31:32 UTC
-+++ AppHdr.h
-@@ -152,7 +152,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"
- 
diff --git a/games/stonesoup/files/patch-crash.cc b/games/stonesoup/files/patch-crash.cc
deleted file mode 100644
index eb516bd3b7d8..000000000000
--- a/games/stonesoup/files/patch-crash.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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)
diff --git a/games/stonesoup/files/patch-rltiles_Makefile b/games/stonesoup/files/patch-rltiles_Makefile
index c51777d28f31..51542cdafe9b 100644
--- a/games/stonesoup/files/patch-rltiles_Makefile
+++ b/games/stonesoup/files/patch-rltiles_Makefile
@@ -26,11 +26,3 @@
  
  DELETE = rm -f
  
-@@ -134,6 +133,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
diff --git a/games/stonesoup/files/patch-rltiles__tool__tile.cc b/games/stonesoup/files/patch-rltiles__tool__tile.cc
deleted file mode 100644
index 61603578988f..000000000000
--- a/games/stonesoup/files/patch-rltiles__tool__tile.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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;
-             }
diff --git a/games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc b/games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc
deleted file mode 100644
index 2c5bbebb4687..000000000000
--- a/games/stonesoup/files/patch-rltiles__tool__tile_list_processor.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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<const char *> dirs;
-         if (m_sdir != "")
diff --git a/games/stonesoup/pkg-plist b/games/stonesoup/pkg-plist
index 6915e7824841..2fa2d9d3a93a 100644
--- a/games/stonesoup/pkg-plist
+++ b/games/stonesoup/pkg-plist
@@ -168,6 +168,7 @@ bin/stonesoup
 %%DATADIR%%/dat/des/variable/mini_features.des
 %%DATADIR%%/dat/des/variable/mini_monsters.des
 %%DATADIR%%/dat/des/variable/polyominoes.des
+%%DATADIR%%/dat/des/variable/the_bubble.des
 %%DATADIR%%/dat/des/variable/the_grid.des
 %%DATADIR%%/dat/descript/ability.txt
 %%DATADIR%%/dat/descript/backgrounds.txt
@@ -437,6 +438,8 @@ bin/stonesoup
 %%DATADIR%%/dat/dlua/fnwrap.lua
 %%DATADIR%%/dat/dlua/init.lua
 %%DATADIR%%/dat/dlua/iter.lua
+%%DATADIR%%/dat/dlua/lm_named_hatch.lua
+%%DATADIR%%/dat/dlua/lm_trans.lua
 %%DATADIR%%/dat/dlua/layout/geoelf.lua
 %%DATADIR%%/dat/dlua/layout/geoelf_corridors.lua
 %%DATADIR%%/dat/dlua/layout/geoelf_directions.lua
@@ -539,9 +542,12 @@ bin/stonesoup
 %%DATADIR%%/docs/crawl_manual.txt
 %%DATADIR%%/docs/develop/IRC.txt
 %%DATADIR%%/docs/develop/android.txt
+%%DATADIR%%/docs/develop/background_creation.txt
 %%DATADIR%%/docs/develop/coding_conventions.txt
+%%DATADIR%%/docs/develop/contribution-process.txt
 %%DATADIR%%/docs/develop/ctags.txt
 %%DATADIR%%/docs/develop/editor_tips.txt
+%%DATADIR%%/docs/develop/god_creation.txt
 %%DATADIR%%/docs/develop/gdb_tips.txt
 %%DATADIR%%/docs/develop/keys.txt
 %%DATADIR%%/docs/develop/levels/advanced.txt
@@ -550,10 +556,10 @@ bin/stonesoup
 %%DATADIR%%/docs/develop/levels/triggerables.txt
 %%DATADIR%%/docs/develop/monster_creation.txt
 %%DATADIR%%/docs/develop/monster_speech.txt
-%%DATADIR%%/docs/develop/new_dev_checklist.txt
+%%DATADIR%%/docs/develop/mutation_creation.txt
 %%DATADIR%%/docs/develop/patch_guide.txt
-%%DATADIR%%/docs/develop/process.txt
 %%DATADIR%%/docs/develop/save_compatibility.txt
+%%DATADIR%%/docs/develop/species_creation.txt
 %%DATADIR%%/docs/develop/spells.txt
 %%DATADIR%%/docs/develop/testing.txt
 %%DATADIR%%/docs/develop/tiles_creation.txt