Index: head/games/stonesoup/Makefile =================================================================== --- head/games/stonesoup/Makefile (revision 494537) +++ head/games/stonesoup/Makefile (revision 494538) @@ -1,108 +1,112 @@ # Created by: Tobias Rehbein # $FreeBSD$ PORTNAME= stonesoup -PORTVERSION= 0.23.0 +PORTVERSION= 0.23.1 CATEGORIES= games MAINTAINER= lifanov@FreeBSD.org COMMENT= Dungeon Crawl Stone Soup - a fun, free rogue-like game LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../../LICENSE NOT_FOR_ARCHS= armv6 NOT_FOR_ARCHS_REASON= missing platform \#define or unsupported compiler BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} USES= bison compiler:c++11-lib gmake lua:51 perl5 pkgconfig \ python:build shebangfix sqlite tar:xz USE_GITHUB= yes GH_ACCOUNT= crawl GH_PROJECT= crawl USE_PERL5= build SHEBANG_FILES= util/gen-mi-enum \ util/good-depfile \ util/species-gen.py \ util/txc SAVEDIR= \~/.stonesoup WRKSRC_SUBDIR= crawl-ref/source SUB_FILES= README.FreeBSD PLIST_SUB= SAVEDIR="${SAVEDIR}" MAKE_ARGS= prefix=${PREFIX} \ DATADIR=${DATADIR} \ - SAVEDIR=${SAVEDIR} \ DESTDIR=${STAGEDIR} \ + FORCE_CC=${CC} \ + FORCE_CXX=${CXX} \ INSTALL_UGRP=root:games \ + LUA_PACKAGE=lua-5.1 \ NO_AUTO_OPT=YesPlease \ NO_OPTIMIZE=YesPlease \ NO_TRY_GOLD=YesPlease \ + NOSSE=YesPlease \ POSIX=YesPlease \ + SAVEDIR=${SAVEDIR} \ SQLITE_INCLUDE_DIR=${LOCALBASE}/include \ SQLITE_LIB=-lsqlite3 \ V=yes OPTIONS_DEFINE= SDL SOUND NOWIZARD LUA DOCS EXAMPLES OPTIONS_DEFAULT=LUA OPTIONS_SUB= yes SOUND_DESC= Sound support NOWIZARD_DESC= Disable Wizard mode LUA_DESC= Bindings for LUA user scripts SDL_CONFLICTS= ${PORTNAME}-[0-9]* SDL_USE= sdl=sdl2,image2,mixer2 gl=gl,glu SDL_USES= gl SDL_USES_OFF= ncurses SDL_MAKE_ARGS= TILES=y SOUND=y SDL_BUILD_DEPENDS= \ fc-list:x11-fonts/fontconfig \ ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu SDL_RUN_DEPENDS= \ ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu SDL_LIB_DEPENDS=libpng.so:graphics/png \ libfreetype.so:print/freetype2 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 .include .if ${CHOSEN_COMPILER_TYPE} != clang CFLAGS+= -D_GLIBCXX_USE_C99 .endif post-patch-SOUND-on: @${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}/sound.h pre-build: @${ECHO} ${PORTVERSION} > ${WRKSRC}/util/release_ver pre-install: @${FIND} ${WRKSRC}/dat -type f -name '*.orig' -delete post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR} 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 Index: head/games/stonesoup/distinfo =================================================================== --- head/games/stonesoup/distinfo (revision 494537) +++ head/games/stonesoup/distinfo (revision 494538) @@ -1,3 +1,3 @@ -TIMESTAMP = 1549601507 -SHA256 (crawl-crawl-0.23.0_GH0.tar.gz) = 44d26e398b5e95e61bb3fd12e0c250ab87e32dd5f2c6fc66cc34185e44af0d8d -SIZE (crawl-crawl-0.23.0_GH0.tar.gz) = 13001398 +TIMESTAMP = 1551666149 +SHA256 (crawl-crawl-0.23.1_GH0.tar.gz) = 89141ea995f0e8c517fd19e447e8420eca51977c9b358543f0b17a27bf8afeb6 +SIZE (crawl-crawl-0.23.1_GH0.tar.gz) = 13006184 Index: head/games/stonesoup/files/patch-Makefile =================================================================== --- head/games/stonesoup/files/patch-Makefile (revision 494537) +++ head/games/stonesoup/files/patch-Makefile (revision 494538) @@ -1,96 +1,54 @@ ---- Makefile.orig 2016-04-30 03:53:03 UTC +--- Makefile.orig 2019-03-04 02:25:24 UTC +++ Makefile -@@ -72,7 +72,7 @@ +@@ -75,7 +75,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 -@@ -106,23 +106,17 @@ include Makefile.obj - # Which C++ standard to support - STDFLAG = -std=c++11 +@@ -114,7 +114,7 @@ ifdef ANDROID + NOSSE := Yes + endif -CFOTHERS := -pipe $(EXTERNAL_FLAGS) -+CFOTHERS := $(CFLAGS) - CFWARN := - CFWARN_L := -Wall -Wformat-security -Wundef ++CFOTHERS := $(EXTERNAL_FLAGS) + ifndef NOSSE + # force SSE2 dependency, so as to avoid both x87 indeterminacies, and + # to prevent lua from using non-standard rounding methods. +@@ -513,15 +513,6 @@ ifdef USE_ICC - DEFINES := $(EXTERNAL_DEFINES) - --ifndef ANDROID --LDFLAGS := --endif -- - # - # The GCC and GXX variables are set later. - # - AR = ar - RANLIB = ranlib --CC = $(GCC) --CXX = $(GXX) - RM = rm -f - COPY = cp - COPY_R = cp -r -@@ -511,16 +505,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) - HOSTCC := $(FORCE_CC) -@@ -574,15 +558,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 - else - CFOPTIMIZE := -O2 - endif endif - ifdef LTO -@@ -660,7 +635,7 @@ ifndef BUILD_LUA - 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) -@@ -673,7 +648,7 @@ endif + # Define this to automatically generate code optimized for your machine +@@ -635,7 +626,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 -@@ -830,7 +805,7 @@ ifndef NOWIZARD +@@ -798,7 +789,7 @@ ifndef NOWIZARD DEFINES += -DWIZARD endif ifdef NO_OPTIMIZE -CFOPTIMIZE := -O0 +CFOPTIMIZE := endif ifdef PCH