Works fine with system curses

3 files changed, 65 insertions, 3 deletions

diff --git a/games/robotfindskitten/Makefile b/games/robotfindskitten/Makefile
index 15cbbf9ed59..bf7d9ec4c06 100644
--- a/games/robotfindskitten/Makefile
+++ b/games/robotfindskitten/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2012/10/06 11:54:53 asau Exp $
+# $NetBSD: Makefile,v 1.3 2013/10/17 17:03:11 roy Exp $
 #
 
 DISTNAME=	robotfindskitten-1.7320508.406
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://robotfindskitten.org/download/POSIX/
 
@@ -15,5 +16,5 @@ USE_LIBTOOL=	yes
 
 INFO_FILES=	yes
 
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/robotfindskitten/distinfo b/games/robotfindskitten/distinfo
index fe71c755a91..10dd35d5df2 100644
--- a/games/robotfindskitten/distinfo
+++ b/games/robotfindskitten/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/02/17 16:57:25 jakllsch Exp $
+$NetBSD: distinfo,v 1.2 2013/10/17 17:03:11 roy Exp $
 
 SHA1 (robotfindskitten-1.7320508.406.tar.gz) = 226da9cbf644d786c573b3409af26d3714dcd661
 RMD160 (robotfindskitten-1.7320508.406.tar.gz) = bfbdbfdc0b7c81cd834a2f2ab005bd301ba5996b
 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
diff --git a/games/robotfindskitten/patches/patch-configure b/games/robotfindskitten/patches/patch-configure
new file mode 100644
index 00000000000..f3b5d4c3e21
--- /dev/null
+++ b/games/robotfindskitten/patches/patch-configure
@@ -0,0 +1,60 @@
+$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
+ 
+