Wed Dec 30 12:24:27 2020 UTC ()
stone-soup: Force use of ncurses for now.

Has issues with NetBSD curses. See the upstream issue:
https://github.com/crawl/crawl/issues/1661

PR pkg/55896


(nia)
diff -r1.10 -r1.11 pkgsrc/games/stone-soup/Makefile
diff -r1.5 -r1.6 pkgsrc/games/stone-soup/Makefile.common
diff -r1.15 -r1.16 pkgsrc/games/stone-soup-sdl/Makefile
cvs diff -r1.10 -r1.11 pkgsrc/games/stone-soup/Makefile (expand / switch to unified diff)

--- pkgsrc/games/stone-soup/Makefile 2020/12/09 12:28:39 1.10
+++ pkgsrc/games/stone-soup/Makefile 2020/12/30 12:24:27 1.11
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1# $NetBSD: Makefile,v 1.10 2020/12/09 12:28:39 nia Exp $ 1# $NetBSD: Makefile,v 1.11 2020/12/30 12:24:27 nia Exp $
 2
 3PKGREVISION= 1
2 4
3.include "Makefile.common" 5.include "Makefile.common"
4 6
5MAINTAINER= nia@NetBSD.org 7MAINTAINER= nia@NetBSD.org
6COMMENT= Dungeon Crawl Stone Soup - roguelike adventure (text-only version) 8COMMENT= Dungeon Crawl Stone Soup - roguelike adventure (text-only version)
7 9
8CONFLICTS+= stone-soup-sdl-[0-9]* 10CONFLICTS+= stone-soup-sdl-[0-9]*
9 11
10.include "../../mk/bsd.pkg.mk" 12.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/games/stone-soup/Makefile.common (expand / switch to unified diff)

--- pkgsrc/games/stone-soup/Makefile.common 2020/12/09 12:28:39 1.5
+++ pkgsrc/games/stone-soup/Makefile.common 2020/12/30 12:24:27 1.6
@@ -1,73 +1,66 @@ @@ -1,73 +1,66 @@
1# $NetBSD: Makefile.common,v 1.5 2020/12/09 12:28:39 nia Exp $ 1# $NetBSD: Makefile.common,v 1.6 2020/12/30 12:24:27 nia Exp $
2# used by games/stone-soup/Makefile 2# used by games/stone-soup/Makefile
3# used by games/stone-soup-sdl/Makefile 3# used by games/stone-soup-sdl/Makefile
4 4
5DISTNAME= stone_soup-0.25.1-nodeps 5DISTNAME= stone_soup-0.25.1-nodeps
6PKGNAME= ${DISTNAME:S/_/-/:S/-nodeps//1} 6PKGNAME= ${DISTNAME:S/_/-/:S/-nodeps//1}
7CATEGORIES= games 7CATEGORIES= games
8MASTER_SITES= ${MASTER_SITE_GITHUB:=crawl/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=crawl/}
9GITHUB_PROJECT= crawl 9GITHUB_PROJECT= crawl
10GITHUB_RELEASE= 0.25.1 10GITHUB_RELEASE= 0.25.1
11EXTRACT_SUFX= .tar.xz 11EXTRACT_SUFX= .tar.xz
12 12
13HOMEPAGE= https://crawl.develz.org/ 13HOMEPAGE= https://crawl.develz.org/
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16DISTINFO_FILE= ${.CURDIR}/../../games/stone-soup/distinfo 16DISTINFO_FILE= ${.CURDIR}/../../games/stone-soup/distinfo
17PATCHDIR= ${.CURDIR}/../../games/stone-soup/patches 17PATCHDIR= ${.CURDIR}/../../games/stone-soup/patches
18 18
19WRKSRC= ${WRKDIR}/stone_soup-${PKGVERSION_NOREV} 19WRKSRC= ${WRKDIR}/stone_soup-${PKGVERSION_NOREV}
20BUILD_DIRS= source 20BUILD_DIRS= source
21USE_TOOLS+= pkg-config gmake perl 21USE_TOOLS+= pkg-config gmake perl
22USE_LANGUAGES= c c++ 22USE_LANGUAGES= c c++
23USE_LIBTOOL= yes 23USE_LIBTOOL= yes
24 24
25USE_CURSES= wide 25CXXFLAGS+= -DCURSES_INCLUDE_FILE='<ncursesw/ncurses.h>'
26 26
27# C++11 27# C++11
28GCC_REQD+= 4.8 28GCC_REQD+= 4.8
29 29
30MAKE_FLAGS+= prefix=${PREFIX} 30MAKE_FLAGS+= prefix=${PREFIX}
31MAKE_FLAGS+= SAVEDIR='~/.crawl' 31MAKE_FLAGS+= SAVEDIR='~/.crawl'
32MAKE_FLAGS+= V=y 32MAKE_FLAGS+= V=y
33MAKE_FLAGS+= DATADIR=${PREFIX}/share/stone-soup 33MAKE_FLAGS+= DATADIR=${PREFIX}/share/stone-soup
34MAKE_FLAGS+= NO_AUTO_OPT=YesPlease 34MAKE_FLAGS+= NO_AUTO_OPT=YesPlease
35MAKE_FLAGS+= FORCE_CXX="${CXX} ${CXXFLAGS} ${LDFLAGS}" 35MAKE_FLAGS+= FORCE_CXX="${CXX} ${CXXFLAGS} ${LDFLAGS}"
36 36
37.include "../../mk/curses.buildlink3.mk" 
38.if !empty(CURSES_TYPE:Mncurses*) 
39. if ${CURSES_TYPE} == "ncursesw" 
40MAKE_FLAGS+= LIBNCURSES_IS_UNICODE=Yes 
41. endif 
42.else 
43MAKE_FLAGS+= NO_NCURSES=YesPlease 
44MAKE_FLAGS+= EXTRA_LIBS="-lcurses -pthread" 
45.endif 
46 
47REPLACE_PERL+= source/util/*.pl 37REPLACE_PERL+= source/util/*.pl
48REPLACE_PERL+= source/util/mac-crawl-build-update-cdo 38REPLACE_PERL+= source/util/mac-crawl-build-update-cdo
49REPLACE_PERL+= source/util/gen-mi-enum 39REPLACE_PERL+= source/util/gen-mi-enum
50REPLACE_PERL+= source/util/gather* 40REPLACE_PERL+= source/util/gather*
51REPLACE_PERL+= source/util/db_lint 41REPLACE_PERL+= source/util/db_lint
52REPLACE_PERL+= source/util/checkwhite 42REPLACE_PERL+= source/util/checkwhite
53REPLACE_PERL+= source/util/good-depfile 43REPLACE_PERL+= source/util/good-depfile
54 44
55TOOL_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml 45TOOL_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
56 46
57REPLACE_PYTHON+= sources/util/species-gen.py 47REPLACE_PYTHON+= sources/util/species-gen.py
58REPLACE_PYTHON+= sources/util/txc 48REPLACE_PYTHON+= sources/util/txc
59REPLACE_PYTHON+= sources/webserver/server.py 49REPLACE_PYTHON+= sources/webserver/server.py
60REPLACE_PYTHON+= sources/webserver/ws_handler.py 50REPLACE_PYTHON+= sources/webserver/ws_handler.py
61 51
62LUA_VERSIONS_ACCEPTED= 51 52LUA_VERSIONS_ACCEPTED= 51
63 53
64CHECK_PORTABILITY_SKIP+= source/contrib/sdl2/build-scripts/androidbuildlibs.sh 54CHECK_PORTABILITY_SKIP+= source/contrib/sdl2/build-scripts/androidbuildlibs.sh
65CHECK_PORTABILITY_SKIP+= source/contrib/sdl2/build-scripts/iosbuild.sh 55CHECK_PORTABILITY_SKIP+= source/contrib/sdl2/build-scripts/iosbuild.sh
66CHECK_PORTABILITY_SKIP+= source/contrib/sdl2-image/external/tiff-4.0.3/configure 56CHECK_PORTABILITY_SKIP+= source/contrib/sdl2-image/external/tiff-4.0.3/configure
67CHECK_PORTABILITY_SKIP+= */Xcode/*.sh 57CHECK_PORTABILITY_SKIP+= */Xcode/*.sh
68 58
69.include "../../databases/sqlite3/buildlink3.mk" 59.include "../../databases/sqlite3/buildlink3.mk"
 60# FIXME: Compatibility issue with NetBSD curses
 61# https://github.com/crawl/crawl/issues/1661
 62.include "../../devel/ncursesw/buildlink3.mk"
70.include "../../devel/zlib/buildlink3.mk" 63.include "../../devel/zlib/buildlink3.mk"
71.include "../../lang/lua/buildlink3.mk" 64.include "../../lang/lua/buildlink3.mk"
72.include "../../lang/python/tool.mk" 65.include "../../lang/python/tool.mk"
73.include "../../mk/pthread.buildlink3.mk" 66.include "../../mk/pthread.buildlink3.mk"
cvs diff -r1.15 -r1.16 pkgsrc/games/stone-soup-sdl/Makefile (expand / switch to unified diff)

--- pkgsrc/games/stone-soup-sdl/Makefile 2020/12/14 09:08:56 1.15
+++ pkgsrc/games/stone-soup-sdl/Makefile 2020/12/30 12:24:27 1.16
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1# $NetBSD: Makefile,v 1.15 2020/12/14 09:08:56 nia Exp $ 1# $NetBSD: Makefile,v 1.16 2020/12/30 12:24:27 nia Exp $
 2
 3PKGREVISION= 1
2 4
3.include "../../games/stone-soup/Makefile.common" 5.include "../../games/stone-soup/Makefile.common"
4 6
5PKGNAME= ${DISTNAME:S/_/-/:S/-soup/-soup-sdl/:S/-nodeps//1} 7PKGNAME= ${DISTNAME:S/_/-/:S/-soup/-soup-sdl/:S/-nodeps//1}
6 8
7MAINTAINER= nia@NetBSD.org 9MAINTAINER= nia@NetBSD.org
8COMMENT= Dungeon Crawl Stone Soup - roguelike adventure (tileset version) 10COMMENT= Dungeon Crawl Stone Soup - roguelike adventure (tileset version)
9 11
10CONFLICTS+= stone-soup-[0-9]* 12CONFLICTS+= stone-soup-[0-9]*
11 13
12TOOL_DEPENDS+= pngcrush-[0-9]*:../../graphics/pngcrush 14TOOL_DEPENDS+= pngcrush-[0-9]*:../../graphics/pngcrush
13BUILD_DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf 15BUILD_DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
14 16