Changes 5.8:

Interface changes
* turn on _XOPEN_CURSES definition in curses.h.
* change _nc_has_mouse to has_mouse, reflect its use in C++ and Ada95.
* add is_pad and is_subwin functions for opaque access to the WINDOW structure.
* add tiparm, based on review of X/Open Curses Issue 7.

Library Improvements
* add a terminal driver for Windows console, which supports a MinGW port to
  Windows.
* add extended functions which specify the SCREEN pointer for several curses
  functions which use the global SP.
* improve the NCURSES_NO_UTF8_ACS feature by adding a check for an extended
  terminfo capability U8.
* improve performance of tigetstr, etc., by using hashing code from tic.
* add WACS_xxx definitions to wide-character configuration for thick- and
  double-lines.
* modify init_pair to allow caller to create extra color pairs beyond the
  color_pairs limit, which use default colors.

Improvements to Programs
* add tabs program.
* modify tic's -I/-C dump to reformat acsc strings into canonical form (sorted,
  unique mapping).
* add checks in tic for inconsistent cursor-movement controls, and for
  inconsistent printer-controls.
* add special case to _nc_infotocap (used by tic and infocmp) to recognize the
  setaf/setab strings from xterm+256color and xterm+88color, and provide a
  reduced version which works with termcap.

15 files changed, 281 insertions, 81 deletions

diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 5dbf76cb4f9..203f69328b5 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.84 2010/06/21 14:49:00 tron Exp $
+# $NetBSD: Makefile,v 1.85 2011/02/28 11:02:46 adam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	4
 COMMENT=	CRT screen handling and optimization package
 
 INSTALLATION_DIRS+=	share/examples
 
 .if ${OPSYS} == "SunOS"
-# misc/screen  installs screen, screen-bce and screen-s
-# so we need to remove these  here to avoid a conflict.
-# this means we also remove the entries which have a
-# use=screen in them
+# misc/screen installs screen, screen-bce and screen-s, so we need to remove
+# these here to avoid a conflict; this means we also remove the entries which
+# have a use=screen in them
 SUBST_CLASSES+=		ti
 SUBST_STAGE.ti=		post-configure
 SUBST_MESSAGE.ti=	Removing screen entries from the terminfo database.
diff --git a/devel/ncurses/Makefile.common b/devel/ncurses/Makefile.common
index 32be9c9b63a..cbdd4cde898 100644
--- a/devel/ncurses/Makefile.common
+++ b/devel/ncurses/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.14 2010/11/13 21:08:56 shattered Exp $
+# $NetBSD: Makefile.common,v 1.15 2011/02/28 11:02:46 adam Exp $
 #
 # used by devel/ncursesw/Makefile
 
 DISTNAME=	ncurses-${NC_VERS}
-NC_VERS=	5.7
+NC_VERS=	5.8
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=ncurses/} \
 		ftp://dickey.his.com/ncurses/ \
@@ -11,6 +11,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=ncurses/} \
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://invisible-island.net/ncurses/ncurses.html
+LICENSE=	mit
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -56,4 +57,4 @@ TERMINFODIR=	share/terminfo
 # This prevents tic from writing into ~/.terminfo
 INSTALLATION_DIRS+=	${TERMINFODIR}
 
-PLIST_SUBST+=	TERMINFODIR=${TERMINFODIR:Q}
+PLIST_SUBST+=	TERMINFODIR=${TERMINFODIR}
diff --git a/devel/ncurses/PLIST b/devel/ncurses/PLIST
index c86068980a1..8c9f9f3d5b7 100644
--- a/devel/ncurses/PLIST
+++ b/devel/ncurses/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.19 2010/06/21 14:49:00 tron Exp $
+@comment $NetBSD: PLIST,v 1.20 2011/02/28 11:02:46 adam Exp $
 bin/captoinfo
 bin/clear
 bin/infocmp
 bin/infotocap
 bin/ncurses5-config
 bin/reset
+bin/tabs
 bin/tic
 bin/toe
 bin/tput
@@ -38,24 +39,46 @@ man/man1/captoinfo.1
 man/man1/clear.1
 man/man1/infocmp.1
 man/man1/infotocap.1
+man/man1/ncurses5-config.1
 man/man1/reset.1
+man/man1/tabs.1
 man/man1/tic.1
 man/man1/toe.1
 man/man1/tput.1
 man/man1/tset.1
+man/man3/BC.3
+man/man3/COLORS.3
 man/man3/COLOR_PAIR.3
+man/man3/COLOR_PAIRS.3
+man/man3/COLS.3
+man/man3/ESCDELAY.3
+man/man3/LINES.3
 man/man3/PAIR_NUMBER.3
+man/man3/PC.3
+man/man3/SP.3
+man/man3/TABSIZE.3
+man/man3/TYPE_ALNUM.3
+man/man3/TYPE_ALPHA.3
+man/man3/TYPE_ENUM.3
+man/man3/TYPE_INTEGER.3
+man/man3/TYPE_IPV4.3
+man/man3/TYPE_NUMERIC.3
+man/man3/TYPE_REGEXP.3
+man/man3/UP.3
 man/man3/_nc_free_and_exit.3
 man/man3/_nc_freeall.3
 man/man3/_nc_tracebits.3
 man/man3/_traceattr.3
 man/man3/_traceattr2.3
+man/man3/_tracecchar_t.3
+man/man3/_tracecchar_t2.3
 man/man3/_tracechar.3
 man/man3/_tracechtype.3
 man/man3/_tracechtype2.3
 man/man3/_tracedump.3
 man/man3/_tracef.3
 man/man3/_tracemouse.3
+man/man3/acs_map.3
 man/man3/add_wch.3
 man/man3/add_wchnstr.3
 man/man3/add_wchstr.3
@@ -67,6 +90,7 @@ man/man3/addnwstr.3
 man/man3/addstr.3
 man/man3/addwstr.3
 man/man3/assume_default_colors.3
+man/man3/assume_default_colors_sp.3
 man/man3/attr_get.3
 man/man3/attr_off.3
 man/man3/attr_on.3
@@ -75,26 +99,36 @@ man/man3/attroff.3
 man/man3/attron.3
 man/man3/attrset.3
 man/man3/baudrate.3
+man/man3/baudrate_sp.3
 man/man3/beep.3
+man/man3/beep_sp.3
 man/man3/bkgd.3
 man/man3/bkgdset.3
 man/man3/bkgrnd.3
 man/man3/bkgrndset.3
+man/man3/boolcodes.3
+man/man3/boolfnames.3
+man/man3/boolnames.3
 man/man3/border.3
 man/man3/border_set.3
 man/man3/bottom_panel.3
 man/man3/box.3
 man/man3/box_set.3
 man/man3/can_change_color.3
+man/man3/can_change_color_sp.3
 man/man3/cbreak.3
+man/man3/cbreak_sp.3
+man/man3/ceiling_panel.3
 man/man3/chgat.3
 man/man3/clear.3
 man/man3/clearok.3
 man/man3/clrtobot.3
 man/man3/clrtoeol.3
 man/man3/color_content.3
+man/man3/color_content_sp.3
 man/man3/color_set.3
 man/man3/copywin.3
+man/man3/cur_term.3
 man/man3/current_field.3
 man/man3/current_item.3
 man/man3/curs_add_wch.3
@@ -148,7 +182,9 @@ man/man3/curs_scanw.3
 man/man3/curs_scr_dump.3
 man/man3/curs_scroll.3
 man/man3/curs_set.3
+man/man3/curs_set_sp.3
 man/man3/curs_slk.3
+man/man3/curs_sp_funcs.3
 man/man3/curs_termattrs.3
 man/man3/curs_termcap.3
 man/man3/curs_terminfo.3
@@ -156,32 +192,43 @@ man/man3/curs_threads.3
 man/man3/curs_touch.3
 man/man3/curs_trace.3
 man/man3/curs_util.3
+man/man3/curs_variables.3
 man/man3/curs_window.3
+man/man3/curscr.3
 man/man3/curses_version.3
 man/man3/data_ahead.3
 man/man3/data_behind.3
 man/man3/def_prog_mode.3
+man/man3/def_prog_mode_sp.3
 man/man3/def_shell_mode.3
+man/man3/def_shell_mode_sp.3
 man/man3/default_colors.3
 man/man3/define_key.3
+man/man3/define_key_sp.3
 man/man3/del_curterm.3
+man/man3/del_curterm_sp.3
 man/man3/del_panel.3
 man/man3/delay_output.3
+man/man3/delay_output_sp.3
 man/man3/delch.3
 man/man3/deleteln.3
 man/man3/delscreen.3
 man/man3/delwin.3
 man/man3/derwin.3
 man/man3/doupdate.3
+man/man3/doupdate_sp.3
 man/man3/dup_field.3
 man/man3/dupwin.3
 man/man3/dynamic_field_info.3
 man/man3/echo.3
+man/man3/echo_sp.3
 man/man3/echo_wchar.3
 man/man3/echochar.3
 man/man3/endwin.3
+man/man3/endwin_sp.3
 man/man3/erase.3
 man/man3/erasechar.3
+man/man3/erasechar_sp.3
 man/man3/erasewchar.3
 man/man3/field_arg.3
 man/man3/field_back.3
@@ -201,8 +248,11 @@ man/man3/field_term.3
 man/man3/field_type.3
 man/man3/field_userptr.3
 man/man3/filter.3
+man/man3/filter_sp.3
 man/man3/flash.3
+man/man3/flash_sp.3
 man/man3/flushinp.3
+man/man3/flushinp_sp.3
 man/man3/form.3
 man/man3/form_cursor.3
 man/man3/form_data.3
@@ -233,14 +283,18 @@ man/man3/form_requestname.3
 man/man3/form_sub.3
 man/man3/form_term.3
 man/man3/form_userptr.3
+man/man3/form_variables.3
 man/man3/form_win.3
 man/man3/free_field.3
 man/man3/free_fieldtype.3
 man/man3/free_form.3
 man/man3/free_item.3
 man/man3/free_menu.3
+man/man3/get_escdelay.3
+man/man3/get_escdelay_sp.3
 man/man3/get_wch.3
 man/man3/get_wstr.3
+man/man3/getattrs.3
 man/man3/getbegx.3
 man/man3/getbegy.3
 man/man3/getbegyx.3
@@ -254,6 +308,7 @@ man/man3/getmaxx.3
 man/man3/getmaxy.3
 man/man3/getmaxyx.3
 man/man3/getmouse.3
+man/man3/getmouse_sp.3
 man/man3/getn_wstr.3
 man/man3/getnstr.3
 man/man3/getparx.3
@@ -262,12 +317,21 @@ man/man3/getparyx.3
 man/man3/getstr.3
 man/man3/getsyx.3
 man/man3/getwin.3
+man/man3/getwin_sp.3
 man/man3/getyx.3
+man/man3/ground_panel.3
 man/man3/halfdelay.3
+man/man3/halfdelay_sp.3
 man/man3/has_colors.3
+man/man3/has_colors_sp.3
 man/man3/has_ic.3
+man/man3/has_ic_sp.3
 man/man3/has_il.3
+man/man3/has_il_sp.3
 man/man3/has_key.3
+man/man3/has_key_sp.3
+man/man3/has_mouse.3
+man/man3/has_mouse_sp.3
 man/man3/hide_panel.3
 man/man3/hline.3
 man/man3/hline_set.3
@@ -281,7 +345,9 @@ man/man3/inch.3
 man/man3/inchnstr.3
 man/man3/inchstr.3
 man/man3/init_color.3
+man/man3/init_color_sp.3
 man/man3/init_pair.3
+man/man3/init_pair_sp.3
 man/man3/initscr.3
 man/man3/innstr.3
 man/man3/innwstr.3
@@ -295,6 +361,7 @@ man/man3/insnstr.3
 man/man3/insstr.3
 man/man3/instr.3
 man/man3/intrflush.3
+man/man3/intrflush_sp.3
 man/man3/inwstr.3
 man/man3/is_cleared.3
 man/man3/is_idcok.3
@@ -305,12 +372,15 @@ man/man3/is_leaveok.3
 man/man3/is_linetouched.3
 man/man3/is_nodelay.3
 man/man3/is_notimeout.3
+man/man3/is_pad.3
 man/man3/is_scrollok.3
+man/man3/is_subwin.3
 man/man3/is_syncok.3
 man/man3/is_term_resized.3
-man/man3/is_timeout.3
+man/man3/is_term_resized_sp.3
 man/man3/is_wintouched.3
 man/man3/isendwin.3
+man/man3/isendwin_sp.3
 man/man3/item_count.3
 man/man3/item_description.3
 man/man3/item_index.3
@@ -324,12 +394,17 @@ man/man3/item_userptr.3
 man/man3/item_value.3
 man/man3/item_visible.3
 man/man3/key_defined.3
+man/man3/key_defined_sp.3
 man/man3/key_name.3
 man/man3/keybound.3
+man/man3/keybound_sp.3
 man/man3/keyname.3
+man/man3/keyname_sp.3
 man/man3/keyok.3
+man/man3/keyok_sp.3
 man/man3/keypad.3
 man/man3/killchar.3
+man/man3/killchar_sp.3
 man/man3/killwchar.3
 man/man3/leaveok.3
 man/man3/legacy_coding.3
@@ -337,6 +412,7 @@ man/man3/link_field.3
 man/man3/link_fieldtype.3
 man/man3/longname.3
 man/man3/mcprint.3
+man/man3/mcprint_sp.3
 man/man3/menu.3
 man/man3/menu_attributes.3
 man/man3/menu_back.3
@@ -374,7 +450,9 @@ man/man3/mitem_value.3
 man/man3/mitem_visible.3
 man/man3/mouse_trafo.3
 man/man3/mouseinterval.3
+man/man3/mouseinterval_sp.3
 man/man3/mousemask.3
+man/man3/mousemask_sp.3
 man/man3/move.3
 man/man3/move_field.3
 man/man3/move_panel.3
@@ -390,6 +468,7 @@ man/man3/mvaddstr.3
 man/man3/mvaddwstr.3
 man/man3/mvchgat.3
 man/man3/mvcur.3
+man/man3/mvcur_sp.3
 man/man3/mvdelch.3
 man/man3/mvderwin.3
 man/man3/mvget_wch.3
@@ -462,29 +541,49 @@ man/man3/mvwscanw.3
 man/man3/mvwvline.3
 man/man3/mvwvline_set.3
 man/man3/napms.3
+man/man3/napms_sp.3
 man/man3/ncurses.3
 man/man3/new_field.3
 man/man3/new_fieldtype.3
 man/man3/new_form.3
+man/man3/new_form_sp.3
 man/man3/new_item.3
 man/man3/new_menu.3
+man/man3/new_menu_sp.3
 man/man3/new_page.3
 man/man3/new_panel.3
+man/man3/new_prescr.3
 man/man3/newpad.3
+man/man3/newpad_sp.3
+man/man3/newscr.3
 man/man3/newterm.3
+man/man3/newterm_sp.3
 man/man3/newwin.3
+man/man3/newwin_sp.3
 man/man3/nl.3
+man/man3/nl_sp.3
 man/man3/nocbreak.3
+man/man3/nocbreak_sp.3
 man/man3/nodelay.3
 man/man3/noecho.3
+man/man3/noecho_sp.3
 man/man3/nofilter.3
+man/man3/nofilter_sp.3
 man/man3/nonl.3
+man/man3/nonl_sp.3
 man/man3/noqiflush.3
+man/man3/noqiflush_sp.3
 man/man3/noraw.3
+man/man3/noraw_sp.3
 man/man3/notimeout.3
+man/man3/numcodes.3
+man/man3/numfnames.3
+man/man3/numnames.3
+man/man3/ospeed.3
 man/man3/overlay.3
 man/man3/overwrite.3
 man/man3/pair_content.3
+man/man3/pair_content_sp.3
 man/man3/panel.3
 man/man3/panel_above.3
 man/man3/panel_below.3
@@ -501,34 +600,50 @@ man/man3/post_menu.3
 man/man3/prefresh.3
 man/man3/printw.3
 man/man3/putp.3
+man/man3/putp_sp.3
 man/man3/putwin.3
 man/man3/qiflush.3
+man/man3/qiflush_sp.3
 man/man3/raw.3
+man/man3/raw_sp.3
 man/man3/redrawwin.3
 man/man3/refresh.3
 man/man3/replace_panel.3
 man/man3/reset_prog_mode.3
+man/man3/reset_prog_mode_sp.3
 man/man3/reset_shell_mode.3
+man/man3/reset_shell_mode_sp.3
 man/man3/resetty.3
+man/man3/resetty_sp.3
 man/man3/resize_term.3
+man/man3/resize_term_sp.3
 man/man3/resizeterm.3
+man/man3/resizeterm_sp.3
 man/man3/restartterm.3
+man/man3/restartterm_sp.3
 man/man3/ripoffline.3
+man/man3/ripoffline_sp.3
 man/man3/savetty.3
+man/man3/savetty_sp.3
 man/man3/scale_form.3
 man/man3/scale_menu.3
 man/man3/scanw.3
 man/man3/scr_dump.3
 man/man3/scr_init.3
+man/man3/scr_init_sp.3
 man/man3/scr_restore.3
+man/man3/scr_restore_sp.3
 man/man3/scr_set.3
+man/man3/scr_set_sp.3
 man/man3/scrl.3
 man/man3/scroll.3
 man/man3/scrollok.3
 man/man3/set_current_field.3
 man/man3/set_current_item.3
 man/man3/set_curterm.3
+man/man3/set_curterm_sp.3
 man/man3/set_escdelay.3
+man/man3/set_escdelay_sp.3
 man/man3/set_field_back.3
 man/man3/set_field_buffer.3
 man/man3/set_field_fore.3
@@ -574,6 +689,7 @@ man/man3/set_menu_win.3
 man/man3/set_new_page.3
 man/man3/set_panel_userptr.3
 man/man3/set_tabsize.3
+man/man3/set_tabsize_sp.3
 man/man3/set_term.3
 man/man3/set_top_row.3
 man/man3/setcchar.3
@@ -586,62 +702,109 @@ man/man3/slk_attr.3
 man/man3/slk_attr_off.3
 man/man3/slk_attr_on.3
 man/man3/slk_attr_set.3
+man/man3/slk_attr_set_sp.3
+man/man3/slk_attr_sp.3
 man/man3/slk_attroff.3
+man/man3/slk_attroff_sp.3
 man/man3/slk_attron.3
+man/man3/slk_attron_sp.3
 man/man3/slk_attrset.3
+man/man3/slk_attrset_sp.3
 man/man3/slk_clear.3
+man/man3/slk_clear_sp.3
 man/man3/slk_color.3
+man/man3/slk_color_sp.3
 man/man3/slk_init.3
+man/man3/slk_init_sp.3
 man/man3/slk_label.3
+man/man3/slk_label_sp.3
 man/man3/slk_noutrefresh.3
+man/man3/slk_noutrefresh_sp.3
 man/man3/slk_refresh.3
+man/man3/slk_refresh_sp.3
 man/man3/slk_restore.3
+man/man3/slk_restore_sp.3
 man/man3/slk_set.3
+man/man3/slk_set_sp.3
 man/man3/slk_touch.3
+man/man3/slk_touch_sp.3
+man/man3/slk_wset.3
 man/man3/standend.3
 man/man3/standout.3
 man/man3/start_color.3
+man/man3/start_color_sp.3
+man/man3/stdscr.3
+man/man3/strcodes.3
+man/man3/strfnames.3
+man/man3/strnames.3
 man/man3/subpad.3
 man/man3/subwin.3
 man/man3/syncok.3
 man/man3/term_attrs.3
+man/man3/term_attrs_sp.3
+man/man3/term_variables.3
 man/man3/termattrs.3
+man/man3/termattrs_sp.3
 man/man3/termname.3
+man/man3/termname_sp.3
 man/man3/tgetent.3
+man/man3/tgetent_sp.3
 man/man3/tgetflag.3
+man/man3/tgetflag_sp.3
 man/man3/tgetnum.3
+man/man3/tgetnum_sp.3
 man/man3/tgetstr.3
+man/man3/tgetstr_sp.3
 man/man3/tgoto.3
 man/man3/tigetflag.3
+man/man3/tigetflag_sp.3
 man/man3/tigetnum.3
+man/man3/tigetnum_sp.3
 man/man3/tigetstr.3
+man/man3/tigetstr_sp.3
 man/man3/timeout.3
+man/man3/tiparm.3
 man/man3/top_panel.3
 man/man3/top_row.3
 man/man3/touchline.3
 man/man3/touchwin.3
 man/man3/tparm.3
 man/man3/tputs.3
+man/man3/tputs_sp.3
 man/man3/trace.3
+man/man3/ttytype.3
 man/man3/typeahead.3
+man/man3/typeahead_sp.3
 man/man3/unctrl.3
+man/man3/unctrl_sp.3
 man/man3/unget_wch.3
+man/man3/unget_wch_sp.3
 man/man3/ungetch.3
+man/man3/ungetch_sp.3
 man/man3/ungetmouse.3
+man/man3/ungetmouse_sp.3
 man/man3/unpost_form.3
 man/man3/unpost_menu.3
 man/man3/untouchwin.3
 man/man3/update_panels.3
+man/man3/update_panels_sp.3
 man/man3/use_default_colors.3
+man/man3/use_default_colors_sp.3
 man/man3/use_env.3
+man/man3/use_env_sp.3
 man/man3/use_extended_names.3
 man/man3/use_legacy_coding.3
+man/man3/use_legacy_coding_sp.3
 man/man3/use_screen.3
 man/man3/use_window.3
 man/man3/vid_attr.3
+man/man3/vid_attr_sp.3
 man/man3/vid_puts.3
+man/man3/vid_puts_sp.3
 man/man3/vidattr.3
+man/man3/vidattr_sp.3
 man/man3/vidputs.3
+man/man3/vidputs_sp.3
 man/man3/vline.3
 man/man3/vline_set.3
 man/man3/vw_printw.3
@@ -729,6 +892,7 @@ man/man3/wsyncup.3
 man/man3/wtimeout.3
 man/man3/wtouchln.3
 man/man3/wunctrl.3
+man/man3/wunctrl_sp.3
 man/man3/wvline.3
 man/man3/wvline_set.3
 man/man5/term.5
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index 0bf3cf985c3..28b2623e849 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2009/07/13 20:36:42 ahoka Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2011/02/28 11:02:46 adam Exp $
 
 BUILDLINK_TREE+=	ncurses
 
@@ -24,8 +24,8 @@ BUILDLINK_INCDIRS.ncurses+=	include/ncurses
 .PHONY: buildlink-ncurses-curses-h buildlink-ncurses-ncurses-h
 buildlink-ncurses-curses-h:
 	${RUN}									\
-	src=${BUILDLINK_PREFIX.ncurses:Q}"/include/ncurses/curses.h";		\
-	dest=${BUILDLINK_DIR:Q}"/include/curses.h";				\
+	src=${BUILDLINK_PREFIX.ncurses}"/include/ncurses/curses.h";		\
+	dest=${BUILDLINK_DIR}"/include/curses.h";				\
 	if ${TEST} ! -f "$$dest" -a -f "$$src"; then				\
 		${ECHO_BUILDLINK_MSG} "Linking ncurses/curses.h -> curses.h.";	\
 		${MKDIR} `${DIRNAME} "$$dest"`;					\
@@ -34,8 +34,8 @@ buildlink-ncurses-curses-h:
 
 buildlink-ncurses-ncurses-h:
 	${RUN}									\
-	src=${BUILDLINK_PREFIX.ncurses:Q}"/include/ncurses/ncurses.h";		\
-	dest=${BUILDLINK_DIR:Q}"/include/ncurses.h";				\
+	src=${BUILDLINK_PREFIX.ncurses}"/include/ncurses/ncurses.h";		\
+	dest=${BUILDLINK_DIR}"/include/ncurses.h";				\
 	if ${TEST} ! -f "$$dest" -a -f "$$src"; then				\
 		${ECHO_BUILDLINK_MSG} "Linking ncurses/ncurses.h -> ncurses.h.";\
 		${MKDIR} `${DIRNAME} "$$dest"`;					\
diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk
index adb6c4fa342..3eb40907943 100644
--- a/devel/ncurses/builtin.mk
+++ b/devel/ncurses/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.30 2010/08/29 01:16:08 obache Exp $
+# $NetBSD: builtin.mk,v 1.31 2011/02/28 11:02:46 adam Exp $
 
 BUILTIN_PKG:=	ncurses
 
@@ -99,9 +99,9 @@ MAKEVARS+=	USE_BUILTIN.ncurses
 # If USE_NCURSES is set to yes, the use of an ncurses implementation
 # is forced.
 .if defined(USE_NCURSES) && !empty(USE_NCURSES:M[yY][eE][sS])
-.if !empty(IS_BUILTIN.ncurses:M[nN][oO])
+.  if !empty(IS_BUILTIN.ncurses:M[nN][oO])
 USE_BUILTIN.ncurses=	no
-.endif
+.  endif
 .endif
 # If it is set to chgat, a curses implementation with chgat(3) support
 # is considered good enough.
@@ -117,9 +117,9 @@ USE_BUILTIN.ncurses=	no
 
 # if terminfo is needed and we don't have it, use pkgsrc ncurses
 .if defined(USE_TERMINFO)
-.if !empty(BUILTIN_LIB_FOUND.terminfo:M[nN][oO])
+.  if !empty(BUILTIN_LIB_FOUND.terminfo:M[nN][oO])
 USE_BUILTIN.ncurses=	no
-.endif
+.  endif
 .endif
 
 # Define BUILTIN_LIBNAME.ncurses to be the base name of the built-in
@@ -164,8 +164,8 @@ buildlink-ncurses-extra-includes:
 	${RUN}								\
 	extra_includes="include/term.h";				\
 	for f in $$extra_includes; do					\
-		src=${BUILDLINK_PREFIX.ncurses:Q}"/$$f";		\
-		dest=${BUILDLINK_DIR:Q}"/$$f";				\
+		src=${BUILDLINK_PREFIX.ncurses}"/$$f";			\
+		dest=${BUILDLINK_DIR}"/$$f";				\
 		if ${TEST} ! -f "$$src"; then				\
 			${ECHO_BUILDLINK_MSG} "Touching extra ncurses header ($$f)"; \
 			${MKDIR} `${DIRNAME} "$$dest"`;			\
@@ -179,7 +179,7 @@ buildlink-ncurses-extra-includes:
 buildlink-curses-ncurses-h:
 	${RUN}								\
 	src=${H_NCURSES:Q};						\
-	dest=${BUILDLINK_DIR:Q}"/include/ncurses.h";			\
+	dest=${BUILDLINK_DIR}"/include/ncurses.h";			\
 	if ${TEST} ! -f "$$dest" -a -f "$$src"; then			\
 		fname=`${BASENAME} $$src`;				\
 		${ECHO_BUILDLINK_MSG} "Linking $$fname -> ncurses.h.";	\
diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo
index aaa21fdb37f..8e340e2bf7c 100644
--- a/devel/ncurses/distinfo
+++ b/devel/ncurses/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.18 2008/11/05 16:12:38 wiz Exp $
+$NetBSD: distinfo,v 1.19 2011/02/28 11:02:46 adam Exp $
 
-SHA1 (ncurses-5.7.tar.gz) = 8233ee56ed84ae05421e4e6d6db6c1fe72ee6797
-RMD160 (ncurses-5.7.tar.gz) = a19ca026d32255f5a4d22eb006d65182041e0234
-Size (ncurses-5.7.tar.gz) = 2445052 bytes
-SHA1 (patch-aa) = a3a24e73b79ca8611ae4d5616f1c671926ea5a64
-SHA1 (patch-ab) = 39679b18ba817af7ec47a17a62ab3ae6e214b443
-SHA1 (patch-ac) = 17b2b1cfed767441f8e4b5a4fc51fa0272758637
-SHA1 (patch-ad) = bfb957df138b1567d895882316c96011f44a1c30
-SHA1 (patch-ae) = 5e3396e7dafe0f772780d0c2ad2b9ec752c09a86
+SHA1 (ncurses-5.8.tar.gz) = 8e38c591667be8d39840dc2c4e1e897da230f155
+RMD160 (ncurses-5.8.tar.gz) = d0fbbafae56b9df4540cfe12359935b703508295
+Size (ncurses-5.8.tar.gz) = 2832852 bytes
+SHA1 (patch-aa) = ff83d492f6016af789ce8397c4bf87969095e4c4
+SHA1 (patch-ab) = 6bbc87f2189d184a120c77df68ac75a0b97e8e7a
+SHA1 (patch-ac) = 2a81d0d49d5bdfc5a7e88df08c062d8cb23caa86
+SHA1 (patch-ad) = 82e81dec3798f81efefd1cbbaee95ae39b46350c
+SHA1 (patch-cxx_cursesf.h) = 98ea07e87f00ba2c67a8c3f8e6d54693c8869f9b
+SHA1 (patch-cxx_cursesm.h) = 24194189201782b457bd3e2c953dcaa34dde99ea
diff --git a/devel/ncurses/patches/patch-aa b/devel/ncurses/patches/patch-aa
index af369ce6c6b..1520686c08a 100644
--- a/devel/ncurses/patches/patch-aa
+++ b/devel/ncurses/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.15 2007/01/08 11:01:05 adam Exp $
+$NetBSD: patch-aa,v 1.16 2011/02/28 11:02:46 adam Exp $
 
 --- misc/run_tic.in.orig	2006-10-28 21:43:30.000000000 +0200
 +++ misc/run_tic.in
-@@ -96,7 +96,7 @@ TICDIR=`echo $TERMINFO | sed -e 's%/shar
+@@ -122,7 +122,7 @@ TICDIR=`echo $TERMINFO | sed -e 's%/shar
  # would generate a lot of confusing error messages if we tried to overwrite it.
  # We explicitly remove its contents rather than the directory itself, in case
  # the directory is actually a symbolic link.
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.15 2007/01/08 11:01:05 adam Exp $
  
  if test "$ext_funcs" = 1 ; then
  cat <<EOF
-@@ -138,6 +138,9 @@ else
+@@ -164,6 +164,9 @@ else
  fi
  fi
  
diff --git a/devel/ncurses/patches/patch-ab b/devel/ncurses/patches/patch-ab
index 2b67207a5f3..8ec5f695f00 100644
--- a/devel/ncurses/patches/patch-ab
+++ b/devel/ncurses/patches/patch-ab
@@ -1,17 +1,23 @@
-$NetBSD: patch-ab,v 1.15 2007/01/08 11:01:05 adam Exp $
+$NetBSD: patch-ab,v 1.16 2011/02/28 11:02:46 adam Exp $
 
---- mk-1st.awk.orig	2006-10-08 02:14:08.000000000 +0200
+--- mk-1st.awk.orig	2010-08-07 20:42:30.000000000 +0000
 +++ mk-1st.awk
-@@ -308,7 +308,7 @@ END	{
- 				}
+@@ -396,11 +396,11 @@ END	{
  				end_name = lib_name;
  				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
--				printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)\n", compile, lib_name, OBJS
-+				printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)\n", compile, lib_name, OBJS
+ 				if ( is_ticlib() ) {
+-					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS, libtool_version
++					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS, libtool_version
+ 				} else if ( is_termlib() ) {
+-					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS, libtool_version
++					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS, libtool_version
+ 				} else {
+-					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS, libtool_version
++					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS, libtool_version
+ 				}
  				print  ""
  				print  "install \\"
- 				print  "install.libs \\"
-@@ -374,7 +374,7 @@ END	{
+@@ -469,7 +469,7 @@ END	{
  			print "mostlyclean::"
  			printf "\t-rm -f $(%s_OBJS)\n", OBJS
  			if ( MODEL == "LIBTOOL" ) {
@@ -20,7 +26,7 @@ $NetBSD: patch-ab,v 1.15 2007/01/08 11:01:05 adam Exp $
  			}
  		}
  		else if ( found == 2 )
-@@ -383,13 +383,13 @@ END	{
+@@ -478,13 +478,13 @@ END	{
  			print "mostlyclean::"
  			printf "\t-rm -f $(%s_OBJS)\n", OBJS
  			if ( MODEL == "LIBTOOL" ) {
diff --git a/devel/ncurses/patches/patch-ac b/devel/ncurses/patches/patch-ac
index 025ff29550b..a74088b40a1 100644
--- a/devel/ncurses/patches/patch-ac
+++ b/devel/ncurses/patches/patch-ac
@@ -1,17 +1,8 @@
-$NetBSD: patch-ac,v 1.16 2008/11/05 16:12:38 wiz Exp $
+$NetBSD: patch-ac,v 1.17 2011/02/28 11:02:46 adam Exp $
 
---- configure.orig	2008-10-26 00:04:38.000000000 +0000
+--- configure.orig	2011-02-21 01:40:36.000000000 +0000
 +++ configure
-@@ -2663,7 +2663,7 @@ if test "$cross_compiling" = yes ; then
-   LDCONFIG=:
- else
- case "$cf_cv_system_name" in #(vi
--freebsd*) #(vi
-+dragonfly*|freebsd*) #(vi
-   test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R"
-   ;;
- *) LDPATH=$PATH:/sbin:/usr/sbin
-@@ -8516,12 +8516,7 @@ case ".$MANPAGE_RENAMES" in #(vi
+@@ -9640,12 +9640,7 @@ case ".$MANPAGE_RENAMES" in #(vi
  .no) #(vi
    ;;
  .|.yes)
@@ -24,3 +15,12 @@ $NetBSD: patch-ac,v 1.16 2008/11/05 16:12:38 wiz Exp $
    ;;
  esac
  
+@@ -18449,7 +18444,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+ 
+-CPPFLAGS="$CPPFLAGS -I. -I../include"
++CPPFLAGS="-I. -I../include $CPPFLAGS"
+ if test "$srcdir" != "."; then
+ 	CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
+ fi
diff --git a/devel/ncurses/patches/patch-ad b/devel/ncurses/patches/patch-ad
index 818a4bb8552..2c48c3a9d2c 100644
--- a/devel/ncurses/patches/patch-ad
+++ b/devel/ncurses/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.10 2007/01/08 11:01:05 adam Exp $
+$NetBSD: patch-ad,v 1.11 2011/02/28 11:02:46 adam Exp $
 
---- c++/Makefile.in.orig	2006-10-21 19:07:49.000000000 +0200
+--- c++/Makefile.in.orig	2010-11-27 21:45:27.000000000 +0000
 +++ c++/Makefile.in
-@@ -154,7 +154,7 @@ LIB_OBJS = \
+@@ -167,7 +167,7 @@ LIB_OBJS = \
  
  ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
  	cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
 -		-o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
 +		-o $(LIBNAME) $(LIB_OBJS:.o=.lo) \
  		-rpath $(INSTALL_PREFIX)$(libdir) \
- 		-version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
+ 		$(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)
  
diff --git a/devel/ncurses/patches/patch-ae b/devel/ncurses/patches/patch-ae
deleted file mode 100644
index 04b70e371d7..00000000000
--- a/devel/ncurses/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.8 2007/01/08 11:01:05 adam Exp $
-
---- misc/Makefile.in.orig	2007-01-08 09:40:08.000000000 +0100
-+++ misc/Makefile.in
-@@ -66,7 +66,7 @@ ticfile		= $(ticdir).db
- source		= @TERMINFO_SRC@
- 
- INSTALL		= @INSTALL@
--INSTALL_PROG	= @INSTALL_PROGRAM@
-+INSTALL_PROG	= @INSTALL_SCRIPT@
- INSTALL_DATA	= @INSTALL_DATA@
- 
- ################################################################################
diff --git a/devel/ncurses/patches/patch-cxx_cursesf.h b/devel/ncurses/patches/patch-cxx_cursesf.h
new file mode 100644
index 00000000000..e3e84e89239
--- /dev/null
+++ b/devel/ncurses/patches/patch-cxx_cursesf.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-cxx_cursesf.h,v 1.1 2011/02/28 11:02:46 adam Exp $
+
+--- c++/cursesf.h.orig	2011-02-28 09:23:33.000000000 +0000
++++ c++/cursesf.h
+@@ -677,7 +677,7 @@ protected:
+   }
+ 
+ public:
+-  NCursesUserForm (NCursesFormField Fields[],
++  NCursesUserForm (NCursesFormField *Fields[],
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Fields=FALSE)
+@@ -686,7 +686,7 @@ public:
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+ 
+-  NCursesUserForm (NCursesFormField Fields[],
++  NCursesUserForm (NCursesFormField *Fields[],
+ 		   int nlines,
+ 		   int ncols,
+ 		   int begin_y = 0,
diff --git a/devel/ncurses/patches/patch-cxx_cursesm.h b/devel/ncurses/patches/patch-cxx_cursesm.h
new file mode 100644
index 00000000000..b49dfed3727
--- /dev/null
+++ b/devel/ncurses/patches/patch-cxx_cursesm.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-cxx_cursesm.h,v 1.1 2011/02/28 11:02:46 adam Exp $
+
+--- c++/cursesm.h.orig	2011-02-28 09:25:22.000000000 +0000
++++ c++/cursesm.h
+@@ -635,7 +635,7 @@ protected:
+   }
+ 
+ public:
+-  NCursesUserMenu (NCursesMenuItem Items[],
++  NCursesUserMenu (NCursesMenuItem *Items[],
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Items=FALSE)
+@@ -644,7 +644,7 @@ public:
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+ 
+-  NCursesUserMenu (NCursesMenuItem Items[],
++  NCursesUserMenu (NCursesMenuItem *Items[],
+ 		   int nlines,
+ 		   int ncols,
+ 		   int begin_y = 0,
diff --git a/devel/ncursesw/Makefile b/devel/ncursesw/Makefile
index 5ae73fb637d..82ce7e4c629 100644
--- a/devel/ncursesw/Makefile
+++ b/devel/ncursesw/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/07/26 05:47:45 dholland Exp $
+# $NetBSD: Makefile,v 1.9 2011/02/28 11:02:46 adam Exp $
 
 .include "../../devel/ncurses/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/ncurses/ncursesw/}
-PKGREVISION=	4
 COMMENT=	Wide character CRT screen handling and optimization package
 
 PATCHDIR=	${.CURDIR}/../../devel/ncurses/patches
@@ -24,8 +23,8 @@ SUBST_CLASSES+=		includes
 SUBST_MESSAGE.includes=	Fixing include paths for ncurses headers.
 SUBST_STAGE.includes=	post-build
 SUBST_FILES.includes=	include/curses.h
-SUBST_SED.includes=	-e 's,<ncurses_dll\.h>,<ncurses/ncurses_dll\.h>,' \
-			-e 's,<unctrl\.h>,<ncurses/unctrl\.h>,'
+SUBST_SED.includes=	-e 's,<ncurses_dll\.h>,<ncurses/ncurses_dll\.h>,'
+SUBST_SED.includes+=	-e 's,<unctrl\.h>,<ncurses/unctrl\.h>,'
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/curses.h ${DESTDIR}${PREFIX}/include/ncursesw/ncurses.h
diff --git a/devel/ncursesw/builtin.mk b/devel/ncursesw/builtin.mk
index 6fcd8bd99c8..9c4ed179c20 100644
--- a/devel/ncursesw/builtin.mk
+++ b/devel/ncursesw/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2010/02/25 16:01:47 drochner Exp $
+# $NetBSD: builtin.mk,v 1.10 2011/02/28 11:02:46 adam Exp $
 
 BUILTIN_PKG:=	ncursesw
 
@@ -147,10 +147,10 @@ buildlink-ncursesw-curses-h:
 	${RUN}								\
 	curses_h="ncursesw/ncurses.h curses.h";				\
 	for f in $$curses_h; do						\
-		src=${BUILDLINK_PREFIX.ncursesw:Q}"/include/$$f";	\
+		src=${BUILDLINK_PREFIX.ncursesw}"/include/$$f";	\
 		dests="ncursesw/ncurses.h ncursesw/curses.h ncurses.h curses.h"; \
 		for dest in $$dests; do					\
-			dest=${BUILDLINK_DIR:Q}"/include/$$dest";	\
+			dest=${BUILDLINK_DIR}"/include/$$dest";	\
 			if ${TEST} -f "$$src"; then			\
 				${ECHO_BUILDLINK_MSG} "Linking $$dest -> $$f."; \
 				${MKDIR} `${DIRNAME} "$$dest"`;		\