CVS commit: pkgsrc/games

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Dec 30 12:24:27 UTC 2020

Modified Files:
        pkgsrc/games/stone-soup: Makefile Makefile.common
        pkgsrc/games/stone-soup-sdl: Makefile

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/stone-soup/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/stone-soup/Makefile.common
cvs rdiff -u -r1.15 -r1.16 pkgsrc/games/stone-soup-sdl/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/stone-soup/Makefile
diff -u pkgsrc/games/stone-soup/Makefile:1.10 pkgsrc/games/stone-soup/Makefile:1.11
--- pkgsrc/games/stone-soup/Makefile:1.10       Wed Dec  9 12:28:39 2020
+++ pkgsrc/games/stone-soup/Makefile    Wed Dec 30 12:24:27 2020
@@ -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"
 

Index: pkgsrc/games/stone-soup/Makefile.common
diff -u pkgsrc/games/stone-soup/Makefile.common:1.5 pkgsrc/games/stone-soup/Makefile.common:1.6
--- pkgsrc/games/stone-soup/Makefile.common:1.5 Wed Dec  9 12:28:39 2020
+++ pkgsrc/games/stone-soup/Makefile.common     Wed Dec 30 12:24:27 2020
@@ -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_TOOLS+=   pkg-config gmake perl
 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+= DATADIR=${PREFIX}/share/sto
 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+=      source/contrib/
 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"

Index: pkgsrc/games/stone-soup-sdl/Makefile
diff -u pkgsrc/games/stone-soup-sdl/Makefile:1.15 pkgsrc/games/stone-soup-sdl/Makefile:1.16
--- pkgsrc/games/stone-soup-sdl/Makefile:1.15   Mon Dec 14 09:08:56 2020
+++ pkgsrc/games/stone-soup-sdl/Makefile        Wed Dec 30 12:24:27 2020
@@ -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"