Date: Fri, 22 Jul 2016 19:22:02 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418927 - in head/games: stonesoup stonesoup-sdl stonesoup/files Message-ID: <201607221922.u6MJM2fu036645@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Fri Jul 22 19:22:02 2016 New Revision: 418927 URL: https://svnweb.freebsd.org/changeset/ports/418927 Log: - Update to version 0.18.1 - Take over maintainership - Change WIZARD to NOWIZARD: this follows upstream and should better serve majority of package users - Switch to OPTION helpers and modernize the port - Add/remove missing/unnecessary dependencies - Move "-sdl" PKGNAMESUFFIX to the slave port, options should not change package name and this is also how other ports do it PR: 210670 Submitted by: Nikolai Lifanov Approved by: maintainer Added: head/games/stonesoup/files/patch-crash.cc (contents, props changed) head/games/stonesoup/files/patch-wiz-you.cc (contents, props changed) Modified: head/games/stonesoup-sdl/Makefile head/games/stonesoup/Makefile head/games/stonesoup/distinfo head/games/stonesoup/files/patch-Makefile head/games/stonesoup/files/patch-rltiles_Makefile head/games/stonesoup/pkg-plist Modified: head/games/stonesoup-sdl/Makefile ============================================================================== --- head/games/stonesoup-sdl/Makefile Fri Jul 22 17:15:12 2016 (r418926) +++ head/games/stonesoup-sdl/Makefile Fri Jul 22 19:22:02 2016 (r418927) @@ -2,6 +2,7 @@ # $FreeBSD$ PORT_OPTIONS+= SDL +PKGNAMESUFFIX= -sdl MASTERDIR= ${.CURDIR}/../stonesoup Modified: head/games/stonesoup/Makefile ============================================================================== --- head/games/stonesoup/Makefile Fri Jul 22 17:15:12 2016 (r418926) +++ head/games/stonesoup/Makefile Fri Jul 22 19:22:02 2016 (r418927) @@ -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,12 +29,6 @@ WRKSRC= ${WRKDIR}/stone_soup-${PORTVERS SUB_FILES= README.FreeBSD PLIST_SUB= SAVEDIR="${SAVEDIR}" -OPTIONS_DEFINE= SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES - -SOUND_DESC= Sound support -WIZARD_DESC= Wizard mode -LUA_BINDINGS_DESC= Bindings for LUA user scripts - MAKE_ARGS= prefix=${PREFIX} \ DATADIR=${DATADIR} \ SAVEDIR=${SAVEDIR} \ @@ -42,45 +36,38 @@ MAKE_ARGS= prefix=${PREFIX} \ 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 +OPTIONS_DEFINE= SDL SOUND NOWIZARD LUA DOCS EXAMPLES +OPTIONS_SUB= yes + +SOUND_DESC= Sound support +NOWIZARD_DESC= Disable Wizard mode +LUA_DESC= Bindings for LUA user scripts -.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 - -.if empty(PORT_OPTIONS:MLUA_BINDINGS) -MAKE_ARGS+= NO_LUA_BINDINGS=yes -.endif +NOWIZARD_MAKE_ARGS= NOWIZARD=y +SOUND_RUN_DEPENDS= sox:audio/sox +LUA_MAKE_ARGS_OFF= NO_LUA_BINDINGS=yes .include <bsd.port.pre.mk> @@ -89,17 +76,17 @@ CFLAGS+= -D_GLIBCXX_USE_C99 .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} +post-patch-SOUND-on: @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h @${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h -.else + +post-patch-SOUND-off: @${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/AppHdr.h -.endif pre-install: @${FIND} ${WRKSRC}/dat -type f -name '*.orig' | \ Modified: head/games/stonesoup/distinfo ============================================================================== --- head/games/stonesoup/distinfo Fri Jul 22 17:15:12 2016 (r418926) +++ head/games/stonesoup/distinfo Fri Jul 22 19:22:02 2016 (r418927) @@ -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 Modified: head/games/stonesoup/files/patch-Makefile ============================================================================== --- head/games/stonesoup/files/patch-Makefile Fri Jul 22 17:15:12 2016 (r418926) +++ head/games/stonesoup/files/patch-Makefile Fri Jul 22 19:22:02 2016 (r418927) @@ -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 Added: head/games/stonesoup/files/patch-crash.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/stonesoup/files/patch-crash.cc Fri Jul 22 19:22:02 2016 (r418927) @@ -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) Modified: head/games/stonesoup/files/patch-rltiles_Makefile ============================================================================== --- head/games/stonesoup/files/patch-rltiles_Makefile Fri Jul 22 17:15:12 2016 (r418926) +++ head/games/stonesoup/files/patch-rltiles_Makefile Fri Jul 22 19:22:02 2016 (r418927) @@ -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) Added: head/games/stonesoup/files/patch-wiz-you.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/stonesoup/files/patch-wiz-you.cc Fri Jul 22 19:22:02 2016 (r418927) @@ -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 Modified: head/games/stonesoup/pkg-plist ============================================================================== --- head/games/stonesoup/pkg-plist Fri Jul 22 17:15:12 2016 (r418926) +++ head/games/stonesoup/pkg-plist Fri Jul 22 19:22:02 2016 (r418927) @@ -43,6 +43,7 @@ bin/stonesoup %%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 @@ bin/stonesoup %%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 @@ bin/stonesoup %%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 @@ bin/stonesoup %%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 @@ bin/stonesoup %%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 @@ bin/stonesoup %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607221922.u6MJM2fu036645>