Update to ncurses-5.1-20000722

4 files changed, 23 insertions, 19 deletions

diff --git a/lib/libmenu/Makefile b/lib/libmenu/Makefile
index 84f0b6f9c66..18ea99426f1 100644
--- a/lib/libmenu/Makefile
+++ b/lib/libmenu/Makefile
@@ -6,15 +6,15 @@ SRCS=	m_adabind.c m_attribs.c m_cursor.c m_driver.c m_format.c \
 	m_req_name.c m_scale.c m_spacing.c m_sub.c m_userptr.c m_win.c
 HDRS=	menu.h eti.h
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libcurses -DHAVE_CONFIG_H
-MAN=	menu.3tbl menu_attribs.3 menu_cursor.3 menu_driver.3 menu_format.3 \
+MAN=	menu.3tbl menu_attributes.3 menu_cursor.3 menu_driver.3 menu_format.3 \
 	menu_hook.3 menu_items.3 menu_mark.3 menu_new.3 menu_opts.3 \
 	menu_pattern.3 menu_post.3 menu_requestname.3 menu_spacing.3 \
 	menu_userptr.3 menu_win.3 mitem_current.3 mitem_name.3 mitem_new.3 \
 	mitem_opts.3 mitem_userptr.3 mitem_value.3 mitem_visible.3
-MLINKS=	menu_attribs.3 set_menu_fore.3 menu_attribs.3 menu_fore.3 \
-        menu_attribs.3 set_menu_back.3 menu_attribs.3 menu_back.3 \
-        menu_attribs.3 set_menu_grey.3 menu_attribs.3 menu_grey.3 \
-        menu_attribs.3 set_menu_pad.3 menu_attribs.3 menu_pad.3 \
+MLINKS=	menu_attributes.3 set_menu_fore.3 menu_attributes.3 menu_fore.3 \
+        menu_attributes.3 set_menu_back.3 menu_attributes.3 menu_back.3 \
+        menu_attributes.3 set_menu_grey.3 menu_attributes.3 menu_grey.3 \
+        menu_attributes.3 set_menu_pad.3 menu_attributes.3 menu_pad.3 \
         menu_cursor.3 pos_menu_cursor.3 menu_format.3 set_menu_format.3 \
         menu_hook.3 set_item_init.3 menu_hook.3 item_init.3 menu_hook.3 \
         set_item_term.3 menu_hook.3 item_term.3 menu_hook.3 \
diff --git a/lib/libmenu/menu.3tbl b/lib/libmenu/menu.3tbl
index 01e1e36b1c0..cf7e1e6d5cd 100644
--- a/lib/libmenu/menu.3tbl
+++ b/lib/libmenu/menu.3tbl
@@ -1,8 +1,8 @@
 '\" t
-.\" $OpenBSD: menu.3tbl,v 1.4 1999/01/22 03:45:06 millert Exp $
+.\" $OpenBSD: menu.3tbl,v 1.5 2000/07/24 04:06:12 millert Exp $
 .\"
 .\"***************************************************************************
-.\" Copyright (c) 1998 Free Software Foundation, Inc.                        *
+.\" Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -29,7 +29,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $From: menu.3x,v 1.13 1998/11/29 01:09:07 Rick.Ohnemus Exp $
+.\" $From: menu.3x,v 1.14 2000/07/15 22:55:59 tom Exp $
 .TH menu 3 ""
 .SH NAME
 \fBmenu\fR - curses extension for programming menus
@@ -79,18 +79,18 @@ item_term 	\fBmenu_hook\fR(3)
 item_userptr	\fBmitem_userptr\fR(3)
 item_value	\fBmitem_value\fR(3)
 item_visible	\fBmitem_visible\fR(3)
-menu_back 	\fBmenu_attribs\fR(3)
+menu_back 	\fBmenu_attributes\fR(3)
 menu_driver	\fBmenu_driver\fR(3)
-menu_fore 	\fBmenu_attribs\fR(3)
+menu_fore 	\fBmenu_attributes\fR(3)
 menu_format	\fBmenu_format\fR(3)
-menu_grey 	\fBmenu_attribs\fR(3)
+menu_grey 	\fBmenu_attributes\fR(3)
 menu_init 	\fBmenu_hook\fR(3)
 menu_items	\fBmenu_items\fR(3)
 menu_mark 	\fBmenu_mark\fR(3)
 menu_opts 	\fBmenu_opts\fR(3)
 menu_opts_off	\fBmenu_opts\fR(3)
 menu_opts_on	\fBmenu_opts\fR(3)
-menu_pad  	\fBmenu_attribs\fR(3)
+menu_pad  	\fBmenu_attributes\fR(3)
 menu_pattern	\fBmenu_pattern\fR(3)
 menu_request_by_name	\fBmenu_requestname\fR(3)
 menu_request_name	\fBmenu_requestname\fR(3)
@@ -110,15 +110,15 @@ set_item_opts	\fBmitem_opts\fR(3)
 set_item_term	\fBmenu_hook\fR(3)
 set_item_userptr	\fBmitem_userptr\fR(3)
 set_item_value	\fBmitem_value\fR(3)
-set_menu_back	\fBmenu_attribs\fR(3)
-set_menu_fore	\fBmenu_attribs\fR(3)
+set_menu_back	\fBmenu_attributes\fR(3)
+set_menu_fore	\fBmenu_attributes\fR(3)
 set_menu_format	\fBmenu_format\fR(3)
-set_menu_grey	\fBmenu_attribs\fR(3)
+set_menu_grey	\fBmenu_attributes\fR(3)
 set_menu_init	\fBmenu_hook\fR(3)
 set_menu_items	\fBmenu_items\fR(3)
 set_menu_mark	\fBmenu_mark\fR(3)
 set_menu_opts	\fBmitem_opts\fR(3)
-set_menu_pad	\fBmenu_attribs\fR(3)
+set_menu_pad	\fBmenu_attributes\fR(3)
 set_menu_pattern	\fBmenu_pattern\fR(3)
 set_menu_spacing	\fBmenu_spacing\fR(3)
 set_menu_sub	\fBmenu_win\fR(3)
diff --git a/lib/libmenu/menu.h b/lib/libmenu/menu.h
index 30ec458ec71..519a1a1335e 100644
--- a/lib/libmenu/menu.h
+++ b/lib/libmenu/menu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: menu.h,v 1.5 1999/05/17 03:04:26 millert Exp $	*/
+/*	$OpenBSD: menu.h,v 1.6 2000/07/24 04:06:12 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -35,6 +35,10 @@
 #ifndef ETI_MENU
 #define ETI_MENU
 
+#ifdef AMIGA
+#define TEXT TEXT_ncurses
+#endif
+
 #include <curses.h>
 #include <eti.h>
 
diff --git a/lib/libmenu/menu_attribs.3 b/lib/libmenu/menu_attributes.3
index 47389609262..e400d63fe20 100644
--- a/lib/libmenu/menu_attribs.3
+++ b/lib/libmenu/menu_attributes.3
@@ -1,5 +1,5 @@
 '\" t
-.\" $OpenBSD: menu_attribs.3,v 1.6 1999/01/22 03:45:06 millert Exp $
+.\" $OpenBSD: menu_attributes.3,v 1.1 2000/07/24 04:06:12 millert Exp $
 .\"
 .\"***************************************************************************
 .\" Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -29,7 +29,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $From: menu_attribs.3x,v 1.6 1998/11/29 01:09:20 Rick.Ohnemus Exp $
+.\" $From: menu_attributes.3x,v 1.6 1998/11/29 01:09:20 Rick.Ohnemus Exp $
 .TH menu_attributes 3 ""
 .SH NAME
 \fBmenu_attributes\fR - color and attribute control for menus