Patches to fix curses use in -STABLE.

Broken by:	billf
Submitted by:	jhb
Apologies to:	maintainer

3 files changed, 70 insertions, 0 deletions

diff --git a/misc/delay/files/patch-ab b/misc/delay/files/patch-ab
new file mode 100644
index 000000000000..521cb82742f4
--- /dev/null
+++ b/misc/delay/files/patch-ab
@@ -0,0 +1,44 @@
+--- configure.orig	Sun Jan 23 23:57:09 2000
++++ configure	Mon Jan 24 00:06:51 2000
+@@ -1501,14 +1501,14 @@
+ fi
+ 
+ 
+-echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
+-echo "configure:1506: checking for initscr in -lcurses" >&5
+-ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
++echo "configure:1506: checking for initscr in -lncurses" >&5
++ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lcurses  $LIBS"
++LIBS="-lncurses  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1514 "configure"
+ #include "confdefs.h"
+@@ -1536,19 +1536,19 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
+ EOF
+ 
+-  LIBS="-lcurses $LIBS"
++  LIBS="-lncurses $LIBS"
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-for ac_hdr in curses.h
++for ac_hdr in ncurses.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/misc/delay/files/patch-ac b/misc/delay/files/patch-ac
new file mode 100644
index 000000000000..ba02a030082c
--- /dev/null
+++ b/misc/delay/files/patch-ac
@@ -0,0 +1,13 @@
+--- delay.c.orig	Mon Jan 24 00:13:12 2000
++++ delay.c	Mon Jan 24 00:20:24 2000
+@@ -24,8 +24,8 @@
+ #include <string.h>
+ #include "parsetime.h"
+ 
+-#ifdef HAVE_CURSES_H
+-#include <curses.h>
++#ifdef HAVE_NCURSES_H
++#include <ncurses.h>
+ #endif
+ 
+ /* The following code implements the actual delaying. If precise is true, it
diff --git a/misc/delay/files/patch-ad b/misc/delay/files/patch-ad
new file mode 100644
index 000000000000..fcb6f74f4534
--- /dev/null
+++ b/misc/delay/files/patch-ad
@@ -0,0 +1,13 @@
+--- curses.c.orig	Thu Dec 30 22:02:46 1999
++++ curses.c	Mon Jan 24 00:20:19 2000
+@@ -1,7 +1,7 @@
+-#ifdef HAVE_LIBCURSES
+-#ifdef HAVE_CURSES_H
++#ifdef HAVE_LIBNCURSES
++#ifdef HAVE_NCURSES_H
+ 
+-#include <curses.h>
++#include <ncurses.h>
+ 
+ #define FWIDTH 6
+ #define FHEIGHT 7