[pkgsrc/trunk]: pkgsrc/games stone-soup: Force use of ncurses for now.

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/58e4a087b2ab
branches:  trunk
changeset: 443872:58e4a087b2ab
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Dec 30 12:24:27 2020 +0000

description:
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

diffstat:

 games/stone-soup-sdl/Makefile    |   4 +++-
 games/stone-soup/Makefile        |   4 +++-
 games/stone-soup/Makefile.common |  17 +++++------------
 3 files changed, 11 insertions(+), 14 deletions(-)

diffs (67 lines):

diff -r 7fb587e29b52 -r 58e4a087b2ab games/stone-soup-sdl/Makefile
--- a/games/stone-soup-sdl/Makefile     Wed Dec 30 12:04:08 2020 +0000
+++ b/games/stone-soup-sdl/Makefile     Wed Dec 30 12:24:27 2020 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2020/12/14 09:08:56 nia Exp $
+# $NetBSD: Makefile,v 1.16 2020/12/30 12:24:27 nia Exp $
+
+PKGREVISION=   1
 
 .include "../../games/stone-soup/Makefile.common"
 
diff -r 7fb587e29b52 -r 58e4a087b2ab games/stone-soup/Makefile
--- a/games/stone-soup/Makefile Wed Dec 30 12:04:08 2020 +0000
+++ b/games/stone-soup/Makefile Wed Dec 30 12:24:27 2020 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2020/12/09 12:28:39 nia Exp $
+# $NetBSD: Makefile,v 1.11 2020/12/30 12:24:27 nia Exp $
+
+PKGREVISION=   1
 
 .include "Makefile.common"
 
diff -r 7fb587e29b52 -r 58e4a087b2ab games/stone-soup/Makefile.common
--- a/games/stone-soup/Makefile.common  Wed Dec 30 12:04:08 2020 +0000
+++ b/games/stone-soup/Makefile.common  Wed Dec 30 12:24:27 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2020/12/09 12:28:39 nia Exp $
+# $NetBSD: Makefile.common,v 1.6 2020/12/30 12:24:27 nia Exp $
 # used by games/stone-soup/Makefile
 # used by games/stone-soup-sdl/Makefile
 
@@ -22,7 +22,7 @@
 USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
 
-USE_CURSES=    wide
+CXXFLAGS+=     -DCURSES_INCLUDE_FILE='<ncursesw/ncurses.h>'
 
 # C++11
 GCC_REQD+=     4.8
@@ -34,16 +34,6 @@
 MAKE_FLAGS+=   NO_AUTO_OPT=YesPlease
 MAKE_FLAGS+=   FORCE_CXX="${CXX} ${CXXFLAGS} ${LDFLAGS}"
 
-.include "../../mk/curses.buildlink3.mk"
-.if !empty(CURSES_TYPE:Mncurses*)
-.  if ${CURSES_TYPE} == "ncursesw"
-MAKE_FLAGS+=   LIBNCURSES_IS_UNICODE=Yes
-.  endif
-.else
-MAKE_FLAGS+=   NO_NCURSES=YesPlease
-MAKE_FLAGS+=   EXTRA_LIBS="-lcurses -pthread"
-.endif
-
 REPLACE_PERL+= source/util/*.pl
 REPLACE_PERL+= source/util/mac-crawl-build-update-cdo
 REPLACE_PERL+= source/util/gen-mi-enum
@@ -67,6 +57,9 @@
 CHECK_PORTABILITY_SKIP+=       */Xcode/*.sh
 
 .include "../../databases/sqlite3/buildlink3.mk"
+# FIXME: Compatibility issue with NetBSD curses
+# https://github.com/crawl/crawl/issues/1661
+.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../lang/python/tool.mk"