aliados really uses terminfo.

5 files changed, 146 insertions, 3 deletions

diff --git a/emulators/aliados/Makefile b/emulators/aliados/Makefile
index e0c05b11485..6c3a1de490e 100644
--- a/emulators/aliados/Makefile
+++ b/emulators/aliados/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2013/08/21 10:23:41 shattered Exp $
+# $NetBSD: Makefile,v 1.8 2013/10/16 23:59:36 roy Exp $
 #
 
 DISTNAME=		aliados-0.2.0
+PKGREVISION=		1
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.arrakis.es/~ninsesabe/aliados/
 EXTRACT_SUFX=		.tgz
@@ -23,5 +24,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/aliados
 	${INSTALL_DATA} ${WRKSRC}/aliadosdoc.html ${DESTDIR}${PREFIX}/share/doc/aliados
 
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/terminfo.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/aliados/distinfo b/emulators/aliados/distinfo
index 5c31931076c..599e7a7363b 100644
--- a/emulators/aliados/distinfo
+++ b/emulators/aliados/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.4 2013/08/21 10:23:41 shattered Exp $
+$NetBSD: distinfo,v 1.5 2013/10/16 23:59:36 roy Exp $
 
 SHA1 (aliados-0.2.0.tgz) = 07de1cdf27cff9e15764df7d09d327badf90b92c
 RMD160 (aliados-0.2.0.tgz) = ede3ed71908b166658fc82f651a87243fbf10dff
 Size (aliados-0.2.0.tgz) = 128397 bytes
+SHA1 (patch-configure) = 737e114f2eac860a29e4984c2f973e4233238477
+SHA1 (patch-configure.ac) = c5c5300f48deee8aae633eeb7528b6aec9e6a908
 SHA1 (patch-cpm.cpp) = cd7350f8d854c10ec3afefb15df37855680a4ed9
+SHA1 (patch-realconsole.cpp) = 3dda687f9964399820b69fdd04ce2d8b23bdfdd3
diff --git a/emulators/aliados/patches/patch-configure b/emulators/aliados/patches/patch-configure
new file mode 100644
index 00000000000..44f1157b506
--- /dev/null
+++ b/emulators/aliados/patches/patch-configure
@@ -0,0 +1,92 @@
+$NetBSD: patch-configure,v 1.1 2013/10/16 23:59:36 roy Exp $
+
+--- configure.orig	2005-05-11 15:16:21.000000000 +0000
++++ configure
+@@ -3630,7 +3630,7 @@ done
+ 
+ 
+ 
+-for ac_header in ncurses.h
++for ac_header in term.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -3776,6 +3776,69 @@ fi
+ done
+ 
+ 
++echo "$as_me:$LINENO: checking for tputs in -ltinfo" >&5
++echo $ECHO_N "checking for tputs in -ltinfo... $ECHO_C" >&6
++if test "${ac_cv_lib_tinfo_tputs+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltinfo  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char tputs ();
++int
++main ()
++{
++tputs ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_tinfo_tputs=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_tinfo_tputs=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_tinfo_tputs" >&5
++echo "${ECHO_T}$ac_cv_lib_tinfo_tputs" >&6
++if test $ac_cv_lib_tinfo_tputs = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBNCURSES 1
++_ACEOF
++
++  LIBS="-ltinfo $LIBS"
++
++else
++
+ echo "$as_me:$LINENO: checking for tputs in -lncurses" >&5
+ echo $ECHO_N "checking for tputs in -lncurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_ncurses_tputs+set}" = set; then
+@@ -3845,6 +3908,8 @@ fi
+ 
+ fi
+ 
++fi
++
+ 
+ if test "$enable_disasm_libz80" = "yes" || test "$enable_imcz80" = "no" ; then
+ 
diff --git a/emulators/aliados/patches/patch-configure.ac b/emulators/aliados/patches/patch-configure.ac
new file mode 100644
index 00000000000..627b984eaeb
--- /dev/null
+++ b/emulators/aliados/patches/patch-configure.ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure.ac,v 1.1 2013/10/16 23:59:36 roy Exp $
+
+--- configure.ac.orig	2005-05-07 20:06:59.000000000 +0000
++++ configure.ac
+@@ -61,8 +61,10 @@ fi
+ 
+ 
+ if test "$enable_curses" != "no" ; then
+-	AC_CHECK_HEADERS([ncurses.h], , AC_MSG_ERROR([ncurses headers not found]) )
+-	AC_CHECK_LIB([ncurses], [tputs], , AC_MSG_ERROR([ncurses libs not found]) )
++	AC_CHECK_HEADERS([term.h], , AC_MSG_ERROR([terminfo header not found]) )
++	AC_CHECK_LIB([tinfo], [tputs], 
++	[AC_CHECK_LIB([ncurses], [tputs], 
++	, AC_MSG_ERROR([terminfo libs not found]) ) ] )
+ fi
+ 
+ 
diff --git a/emulators/aliados/patches/patch-realconsole.cpp b/emulators/aliados/patches/patch-realconsole.cpp
new file mode 100644
index 00000000000..51fbd568773
--- /dev/null
+++ b/emulators/aliados/patches/patch-realconsole.cpp
@@ -0,0 +1,30 @@
+$NetBSD: patch-realconsole.cpp,v 1.1 2013/10/16 23:59:36 roy Exp $
+
+--- realconsole.cpp.orig	2005-05-14 21:11:38.000000000 +0000
++++ realconsole.cpp
+@@ -5,11 +5,15 @@
+ 
+ #ifndef NO_CURSES
+ 
+-#include <ncurses.h>
+ #include <term.h>
+ 
+ #endif
+ 
++#ifndef ERR
++#define	ERR	(-1)	/* Error return */
++#define	OK	(0)	/* Success return */
++#endif
++
+ #include <termios.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+@@ -223,7 +227,7 @@ inline void calltparm (const char * str,
+ {
+ 	if (str != NULL)
+ 	{
+-		calltputs (tparm ( (char *) str, n) );
++		calltputs (tparm ( (char *) str, n, 0, 0, 0, 0, 0, 0, 0, 0) );
+ 	}
+ }
+