robotfindskitten: make patch for ncurses obsolete

5 files changed, 14 insertions, 70 deletions

diff --git a/games/robotfindskitten/Makefile b/games/robotfindskitten/Makefile
index 4c2c0cfe4d6..b3072a3a595 100644
--- a/games/robotfindskitten/Makefile
+++ b/games/robotfindskitten/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2015/08/18 07:31:09 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/06/08 21:55:28 rillig Exp $
 #
 
 DISTNAME=	robotfindskitten-1.7320508.406
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://robotfindskitten.org/download/POSIX/
 
@@ -15,6 +15,7 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 
 INFO_FILES=	yes
+FAKE_NCURSES=	yes
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/robotfindskitten/distinfo b/games/robotfindskitten/distinfo
index c52aacd61ef..053a2ba66be 100644
--- a/games/robotfindskitten/distinfo
+++ b/games/robotfindskitten/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:44:23 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/06/08 21:55:28 rillig Exp $
 
 BLAKE2s (robotfindskitten-1.7320508.406.tar.gz) = 0827123f74e4077c15f2c3b56f705c1318e0a5724b213581e999d0867b12b6e1
 SHA512 (robotfindskitten-1.7320508.406.tar.gz) = 96c8f9968336cda5f079ca4b69a17a76444a3291b1354d594d2a9b89cb0d88296b983c70076da3334774710d811b33a90fe513ba5dca330808e5345e6c920865
 Size (robotfindskitten-1.7320508.406.tar.gz) = 406412 bytes
-SHA1 (patch-configure) = 0ac7bf23c092e6302db9ac040845663cdcab5f2e
-SHA1 (patch-src_Makefile.in) = 84636145ec95e38d25b140ce4a9adf7c7f087e15
-SHA1 (patch-src_robotfindskitten.c) = ec94eb49711f4f3d439e354a29c7217b363b23cf
+SHA1 (patch-src_Makefile.in) = b86047359beb9ae8e37303e91b90401920cb18c0
+SHA1 (patch-src_robotfindskitten.c) = 3de2a29060bb3f3889608b3917e6e54dbc5837b1
diff --git a/games/robotfindskitten/patches/patch-configure b/games/robotfindskitten/patches/patch-configure
deleted file mode 100644
index f3b5d4c3e21..00000000000
--- a/games/robotfindskitten/patches/patch-configure
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2013/10/17 17:03:11 roy Exp $
-
---- configure.orig	2013-10-17 16:59:41.000000000 +0000
-+++ configure
-@@ -19185,13 +19185,13 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
--echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6; }
--if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for initscr in -lcurses" >&5
-+echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_curses_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lncurses  $LIBS"
-+LIBS="-lcurses  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -19232,29 +19232,29 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- 	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
--  ac_cv_lib_ncurses_initscr=yes
-+  ac_cv_lib_curses_initscr=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_lib_ncurses_initscr=no
-+	ac_cv_lib_curses_initscr=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_initscr" >&5
--echo "${ECHO_T}$ac_cv_lib_ncurses_initscr" >&6; }
--if test $ac_cv_lib_ncurses_initscr = yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_curses_initscr" >&5
-+echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6; }
-+if test $ac_cv_lib_curses_initscr = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBNCURSES 1
-+#define HAVE_LIBCURSES 1
- _ACEOF
- 
--  LIBS="-lncurses $LIBS"
-+  LIBS="-lcurses $LIBS"
- 
- else
--  curses
-+  ncurses
- fi
- 
- 
diff --git a/games/robotfindskitten/patches/patch-src_Makefile.in b/games/robotfindskitten/patches/patch-src_Makefile.in
index bc888eaee7f..e4bc3d0d60b 100644
--- a/games/robotfindskitten/patches/patch-src_Makefile.in
+++ b/games/robotfindskitten/patches/patch-src_Makefile.in
@@ -1,5 +1,7 @@
-$NetBSD: patch-src_Makefile.in,v 1.1.1.1 2012/02/17 16:57:25 jakllsch Exp $
-Install binary in usual location.
+$NetBSD: patch-src_Makefile.in,v 1.2 2022/06/08 21:55:28 rillig Exp $
+
+Install binary in the usual location.
+
 --- src/Makefile.in.orig	2007-11-27 21:16:18.000000000 +0000
 +++ src/Makefile.in
 @@ -170,7 +170,7 @@ sysconfdir = @sysconfdir@
diff --git a/games/robotfindskitten/patches/patch-src_robotfindskitten.c b/games/robotfindskitten/patches/patch-src_robotfindskitten.c
index bd4177f5eaa..6a8065887d1 100644
--- a/games/robotfindskitten/patches/patch-src_robotfindskitten.c
+++ b/games/robotfindskitten/patches/patch-src_robotfindskitten.c
@@ -1,5 +1,7 @@
-$NetBSD: patch-src_robotfindskitten.c,v 1.1.1.1 2012/02/17 16:57:25 jakllsch Exp $
-Fix compile warning on NetBSD due to use of time(3) wihout <time.h>.
+$NetBSD: patch-src_robotfindskitten.c,v 1.2 2022/06/08 21:55:28 rillig Exp $
+
+Fix compile warning on NetBSD due to use of time(3) without <time.h>.
+
 --- src/robotfindskitten.c.orig	2007-12-01 04:25:21.000000000 +0000
 +++ src/robotfindskitten.c
 @@ -37,6 +37,7 @@ static char* ver = VERSION;