update to stone-soup 0.26.1 for python3 support

This commit is contained in:
daniel 2021-03-06 08:13:44 +00:00
parent f6963a74aa
commit a67288b816
5 changed files with 22 additions and 28 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.40 2021/02/23 19:39:23 sthen Exp $
# $OpenBSD: Makefile,v 1.41 2021/03/06 08:13:44 daniel Exp $
BROKEN-hppa = ICE on dgn-shoals.cc:638
COMMENT = dungeon crawl stone soup
VERSION = 0.23.2
VERSION = 0.26.1
DISTNAME= stone_soup-${VERSION}-nodeps
PKGNAME= stone-soup-${VERSION}
REVISION= 1
CATEGORIES = games
@ -18,13 +18,14 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} c m sqlite3
MASTER_SITES = https://crawl.develz.org/release/${VERSION:R}/
MASTER_SITES = https://crawl.develz.org/release/${VERSION:R}/ \
https://github.com/crawl/crawl/releases/download/${VERSION}/
EXTRACT_SUFX= .tar.xz
COMPILER = base-clang ports-gcc
MODULES = lang/python \
lang/lua
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
MODLUA_VERSION = 5.1
BUILD_DEPENDS = graphics/pngcrush \

View File

@ -1,2 +1,2 @@
SHA256 (stone_soup-0.23.2-nodeps.tar.xz) = KgCWIZX1t6TC+9H8XvWX7rfgT6C576RxrggZCDEEgcM=
SIZE (stone_soup-0.23.2-nodeps.tar.xz) = 11046032
SHA256 (stone_soup-0.26.1-nodeps.tar.xz) = zoX4P4Lh3sTPxWAJBKmo5qS9fSNOYHgxDyUVLK4VF7U=
SIZE (stone_soup-0.26.1-nodeps.tar.xz) = 11242088

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-source_Makefile,v 1.5 2019/04/28 18:35:42 kirby Exp $
$OpenBSD: patch-source_Makefile,v 1.6 2021/03/06 08:13:44 daniel Exp $
Index: source/Makefile
--- source/Makefile.orig
+++ source/Makefile
@@ -215,9 +215,6 @@ ifdef msys
@@ -240,9 +240,6 @@ ifdef msys
BUILD_LIBPNG = YesPlease
COPY_FONTS = yes
endif
@ -12,7 +12,7 @@ Index: source/Makefile
endif
ifeq ($(uname_S),Darwin)
STRIP := strip -x
@@ -325,11 +322,8 @@ endif
@@ -345,11 +342,8 @@ endif
#
ifndef NO_APPLE_PLATFORM
ifeq ($(uname_S),Darwin)
@ -24,7 +24,7 @@ Index: source/Makefile
ifdef WIN32
@@ -511,15 +505,7 @@ ifneq ($(GCC_VER),)
@@ -457,15 +451,7 @@ ifneq ($(GCC_VER),)
GCC_VER_SUFFIX:=-$(GCC_VER)
endif
@ -40,16 +40,7 @@ Index: source/Makefile
ifneq ($(FORCE_CC),)
GCC := $(FORCE_CC)
@@ -673,7 +659,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
@@ -1122,51 +1108,6 @@ ifndef NO_OPTIMIZE
@@ -1107,51 +1093,6 @@ ifndef NO_OPTIMIZE
endif
endif
endif

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.no-no_x11,v 1.8 2019/04/28 18:35:42 kirby Exp $
@comment $OpenBSD: PFRAG.no-no_x11,v 1.9 2021/03/06 08:13:44 daniel Exp $
share/applications/crawl-tiles.desktop
share/crawl/dat/tiles/
share/crawl/dat/tiles/feat.png
@ -28,6 +28,7 @@ share/crawl/dat/tiles/title_froggy_jiyva_felid.png
share/crawl/dat/tiles/title_froggy_natasha_and_boris.png
share/crawl/dat/tiles/title_froggy_rune_and_run_failed_on_dis.png
share/crawl/dat/tiles/title_froggy_thunder_fist_nikola.png
share/crawl/dat/tiles/title_nibiki_octopode.png
share/crawl/dat/tiles/title_omndra_zot_demon.png
share/crawl/dat/tiles/title_peileppe_bloax_eye.png
share/crawl/dat/tiles/title_ploomutoo_ijyb.png

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2019/04/28 18:35:42 kirby Exp $
@comment $OpenBSD: PLIST,v 1.8 2021/03/06 08:13:44 daniel Exp $
@bin bin/crawl-ss
@man man/man6/crawl-ss.6
share/crawl/
@ -36,7 +36,6 @@ share/crawl/dat/database/shout.txt
share/crawl/dat/database/wpnnoise.txt
share/crawl/dat/defaults/
share/crawl/dat/defaults/autopickup_exceptions.txt
share/crawl/dat/defaults/food_colouring.txt
share/crawl/dat/defaults/glyph_colours.txt
share/crawl/dat/defaults/menu_colours.txt
share/crawl/dat/defaults/messages.txt
@ -44,6 +43,7 @@ share/crawl/dat/defaults/misc.txt
share/crawl/dat/defaults/runrest_messages.txt
share/crawl/dat/defaults/standard_colours.txt
share/crawl/dat/des/
share/crawl/dat/des/00init.des
share/crawl/dat/des/altar/
share/crawl/dat/des/altar/altar.des
share/crawl/dat/des/altar/ashenzari_visionary.des
@ -52,7 +52,6 @@ share/crawl/dat/des/altar/lugonu_bribe.des
share/crawl/dat/des/altar/nemelex_the_gamble.des
share/crawl/dat/des/altar/okawaru_arena.des
share/crawl/dat/des/altar/overflow.des
share/crawl/dat/des/altar/pakellas_experiments.des
share/crawl/dat/des/altar/trog_burn_book.des
share/crawl/dat/des/altar/trog_wizard.des
share/crawl/dat/des/altar/vehumet_trees.des
@ -191,6 +190,7 @@ share/crawl/dat/des/variable/mini_monsters.des
share/crawl/dat/des/variable/polyominoes.des
share/crawl/dat/des/variable/the_bubble.des
share/crawl/dat/des/variable/the_grid.des
share/crawl/dat/des/variable/winding_woodlands.des
share/crawl/dat/descript/
share/crawl/dat/descript/ability.txt
share/crawl/dat/descript/backgrounds.txt
@ -514,6 +514,7 @@ share/crawl/dat/dist_bones/bones.store.Zot
share/crawl/dat/dlua/
share/crawl/dat/dlua/debug.lua
share/crawl/dat/dlua/dungeon.lua
share/crawl/dat/dlua/explorer.lua
share/crawl/dat/dlua/fnwrap.lua
share/crawl/dat/dlua/gauntlet.lua
share/crawl/dat/dlua/ghost.lua
@ -593,11 +594,10 @@ share/crawl/docs/aptitudes.txt
share/crawl/docs/arena.txt
@comment share/crawl/docs/changelog.txt
share/crawl/docs/crawl_manual.txt
@comment share/crawl/docs/develop/new_dev_checklist.txt
@comment share/crawl/docs/develop/process.txt
@comment share/crawl/docs/develop/
@comment share/crawl/docs/develop/IRC.txt
@comment share/crawl/docs/develop/android.txt
@comment share/crawl/docs/develop/arena.txt
@comment share/crawl/docs/develop/background_creation.txt
@comment share/crawl/docs/develop/coding_conventions.txt
@comment share/crawl/docs/develop/ctags.txt
@ -616,7 +616,7 @@ share/crawl/docs/crawl_manual.txt
@comment share/crawl/docs/develop/patch_guide.txt
@comment share/crawl/docs/develop/save_compatibility.txt
@comment share/crawl/docs/develop/spells.txt
@comment share/crawl/docs/develop/testing.txt
@comment share/crawl/docs/develop/test_plug_and_play_cc.txt
@comment share/crawl/docs/develop/tiles_creation.txt
@comment share/crawl/docs/develop/translation.txt
share/crawl/docs/fight_simulator.txt
@ -630,6 +630,7 @@ share/crawl/docs/keybind.txt
@comment share/crawl/docs/license/worley.txt
share/crawl/docs/macros_guide.txt
share/crawl/docs/options_guide.txt
share/crawl/docs/quickstart.md
share/crawl/docs/quickstart.txt
@comment share/crawl/docs/ssh_guide.txt
share/crawl/docs/tiles_help.txt