Update to 5.5. Solaris PLIST should be checked for correctness.

This  release  is  designed  to  be upward compatible from ncurses 5.0
through   5.4;  very  few  applications  will  require  recompilation,
depending   on  the  platform.  These  are  the  highlights  from  the
change-log since ncurses 5.4 release.

Interface changes:
  * terminfo   installs  "xterm-new"  as  "xterm"  entry  rather  than
    "xterm-old" (aka xterm-r6).
  * terminfo  data  is  installed using the tic -x option (few systems
    still use ncurses 4.2).
  * modify  C++  binding to work with newer C++ compilers by providing
    initializers  and  using  modern casts. Old-style header names are
    still  used  in  this  release  to allow compiling with not-so-old
    compilers.
  * modify parameter type in c++ binding for insch() and mvwinsch() to
    be  consistent  with  underlying  ncurses  library  (was  char, is
    chtype).
  * change NCursesWindow::err_handler() to a virtual function.
  * form  and  menu  libraries  now  work  with  wide-character  data.
    Applications  which  bypassed the form library and manipulated the
    FIELD.buf  data  directly  will  not  work properly with libformw,
    since   that   no   longer   points  to  an  array  of  char.  The
    set_field_buffer()  and field_buffer() functions translate to/from
    the actual field data.
  * add  symbol  to  curses.h which can be used to suppress include of
    stdbool.h, e.g.,
             #define NCURSES_ENABLE_STDBOOL_H 0
             #include <curses.h>

  * change  SP->_current_attr  to  a pointer, adjust ifdef's to ensure
    that  libtinfo.so  and  libtinfow.so have the same ABI. The reason
    for  this  is  that  the  corresponding  data which belongs to the
    upper-level ncurses library has a different size in each model.
  * winnstr()   now   returns  multibyte  character  strings  for  the
    wide-character configuration.
  * assume_default_colors()      no      longer      requires     that
    use_default_colors() be called first.
  * data_ahead() now works with wide-characters.
  * slk_set()  and  slk_wset()  now  accept  and  store  multibyte  or
    multicolumn characters.
  * start_color()  now returns OK if colors have already been started.
    start_color() also returns ERR if it cannot allocate memory.
  * pair_content()  now returns -1 for consistency with init_pair() if
    it corresponds to the default-color.
  * unctrl()  now returns null if its parameter does not correspond to
    an unsigned char.

New features and improvements:
  * library
       + environment     variable     NCURSES_NO_UTF8_ACS     supports
         miscellaneous   terminal  emulators  which  ignore  alternate
         character set escape sequences when in UTF-8 mode.
       + modify  initialization  of  key  lookup  table  so that if an
         extended  capability (tic -x) string is defined, and its name
         begins  with  'k',  ncurses  will automatically treat it as a
         key.
       + change  GPM  initialization,  using  dl  library  to  load it
         dynamically at runtime.
       + form, menu and panel libraries support debug-tracing.
  * add   NCURSES-Programming-HOWTO.html   by   Pradeep   Padala  (see
    http://tldp.org/HOWTO/NCURSES-Programming-HOWTO/).
  * programs:
  * infocmp:
       + The  -i  option  now matches 8-bit controls against its table
         entries, e.g., so it can analyze the xterm-8bit entry.
       + add  "-x"  option to infocmp like tic's "-x", for use in "-F"
         comparisons.  This  modifies  infocmp to only report extended
         capabilities  if  the  -x  option  is given, making this more
         consistent  with  tic.  Some scripts may break, since infocmp
         previous gave this information without an option.
  * tic:
       + modify  termcap-parsing  to retain 2-character aliases at the
         beginning of an entry if the "-x" option is used in tic.
       + filter  out  long  extended names when translating to termcap
         format.  Only  two  characters  are  permissible  for termcap
         capability names.
       + correct  translation  of  "%%" in terminfo format to termcap,
         e.g., using "tic -C".
       + modify  the  "-c  -v" options to ignore delays when comparing
         strings.  Also  modify  it  to  ignore a canceled sgr string,
         e.g.,  for terminals which cannot properly combine attributes
         in one control sequence.
       + add  a  check  for  improperly  ended  strings, i.e., where a
         following line begins in column 1.
       + add a check in tic for terminfo entries having an sgr0 but no
         sgr string. This confuses Tru64 and HPUX curses when combined
         with  color,  e.g., making them leave line-drawing characters
         in odd places.
       + add  check (with debug configuration) that provides about the
         runtime  changes  that  would  be  made  to  sgr0 for termcap
         applications.
  * tset:
       + add  -c  and  -w  options  to allow user to suppress ncurses'
         resizing  of the terminal emulator window in the special case
         where it is not able to detect the true size.

Major bug fixes:
  * improve  logic  in tgetent() which adjusts the termcap "me" string
    to  work with ISO-2022 string used in xterm-new. This is a feature
    that was incompletely implemented in ncurses 5.3. ncurses attempts
    to  provide  termcap clients with the portion of the sgr0 (termcap
    "me") string that does not reset line-drawing.
  * cells  in  the  WINDOW  which  are  continuations of a multicolumn
    character   are   encoded   differently,  making  repainting  more
    reliable.
  * amend  change to setupterm() in ncurses 5.4 (20030405) which would
    reuse  the value of cur_term if the same output was selected. This
    now  reuses  it  only  when  setupterm() is called from tgetent(),
    which  has no notion of separate SCREENs. Note that tgetent() must
    be called after initscr() or newterm() to use this feature.
  * make  setcchar() now works when its wchar_t* parameter is pointing
    to a string which contains more data than can be converted.
  * win_wchnstr() now works for more than one cell.
  * resizeterm() now processes all levels of window hierarchy.
  * disable  GPM  mouse support when $TERM happens to be prefixed with
    "xterm".  Gpm_Open()  would otherwise assert that it can deal with
    mouse events in this case.
  * add  SP->_screen_acs_map[], used to ensure that mapping of missing
    line-drawing   characters   is   handled  properly.  For  example,
    ACS_DARROW  is  absent  from  xterm-new, and it was coincidentally
    displayed the same as ACS_BTEE.

Portability:
  * configure script:
       + new options:

           --enable-largefile
                   set  compiler  and  linker  flags  to use largefile
                   support.

           --enable-ext-colors
                   Allow  encoding  of  256  foreground and background
                   colors,    e.g.,   with   the   xterm-256color   or
                   xterm-88color terminfo entries. This requires ABI 6
                   because it changes the size of cchar_t.

           --enable-ext-mouse
                   This  defines NCURSES_MOUSE_VERSION 2, and modifies
                   the encoding of mouse events to support wheel mice,
                   which may transmit buttons 4 and 5. This works with
                   xterm and similar terminal emulators. This requires
                   ABI  6  because  it  changes  the encoding of mouse
                   events.

           --with-chtype
                   overriding of the non-LP64 model's use of chtype

           --with-mmask-t
                   overriding of the non-LP64 model's use of mmask_t

           --without-xterm-new
                   Installs  "xterm-old"  as  the "xterm" entry of the
                   terminfo database.

       + The  --with-termlib option now accepts a value which sets the
         name  of the terminfo library. This would allow a packager to
         build libtinfow.so renamed to coincide with libtinfo.so
       + fixes/improvements for cross-compiling:
            o suppress     $suffix     in     misc/run_tic.sh     when
              cross-compiling.  This  allows cross-compiles to use the
              host's  tic  program  to  handle the "make install.data"
              step.
            o correct       BUILD_CPPFLAGS       substitution       in
              ncurses/Makefile.in,  to  allow  cross-compiling  from a
              separate directory tree.
  * library:
       + add  ifdef's  for  _LP64  in curses.h to avoid using wasteful
         64-bits  for  chtype  and  mmask_t,  but add configure option
         --disable-lp64 in case anyone used that configuration.
       + modify  C++  binding to use some C internal functions to make
         it compile properly on Solaris (and other platforms).
       + remove  check  in  newwin()  that prevents allocating windows
         that extend beyond the screen (Solaris does this).
       + check  for  nl_langinfo(CODESET),  use  it if available. This
         replaces  ad  hoc  tests of environment variables to check if
         the  terminal is setup for UTF-8 encoding. Applications which
         do  not  call  setlocale()  should be corrected, to make them
         work properly with UTF-8 encoding.
         In  particular,  applications  which  assume (and do not call
         setlocale())  that Latin-1 codes are printable will no longer
         work  in a UTF-8 locale since the ad hoc check of environment
         variables  to  see  if  the locale was UTF-8 is not used when
         nl_langinfo(CODESET) is available.
       + use  setlocale() to query the program's current locale rather
         than  using  getenv().  This supports applications which rely
         upon  legacy treatment of 8-bit characters when the locale is
         not initialized.

7 files changed, 42 insertions, 41 deletions

diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 083aef1dfbb..84a0d64c6f5 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2005/05/22 22:06:28 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2005/10/20 00:01:32 wiz Exp $
 
 DISTNAME=	ncurses-${NC_VERS}
-PKGREVISION=	1
-NC_VERS=	5.4
+NC_VERS=	5.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=ncurses/} \
 		ftp://dickey.his.com/ncurses/ \
diff --git a/devel/ncurses/PLIST b/devel/ncurses/PLIST
index 8ae06b1ee5c..db26857944e 100644
--- a/devel/ncurses/PLIST
+++ b/devel/ncurses/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/09/22 08:09:28 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/10/20 00:01:32 wiz Exp $
 bin/captoinfo
 bin/clear
 bin/infocmp
@@ -843,6 +843,7 @@ ${TERMINFODIR}/a/adm42-ns
 ${TERMINFODIR}/a/adm5
 ${TERMINFODIR}/a/aepro
 ${TERMINFODIR}/a/aixterm
+${TERMINFODIR}/a/aixterm-16color
 ${TERMINFODIR}/a/aixterm-m
 ${TERMINFODIR}/a/aixterm-m-old
 ${TERMINFODIR}/a/aj
@@ -1541,6 +1542,7 @@ ${TERMINFODIR}/e/elks-glasstty
 ${TERMINFODIR}/e/elks-vt52
 ${TERMINFODIR}/e/emots
 ${TERMINFODIR}/e/emu
+${TERMINFODIR}/e/emu-220
 ${TERMINFODIR}/e/emx-base
 ${TERMINFODIR}/e/env230
 ${TERMINFODIR}/e/envision230
@@ -1762,6 +1764,7 @@ ${TERMINFODIR}/h/hpgeneric
 ${TERMINFODIR}/h/hpsub
 ${TERMINFODIR}/h/hpterm
 ${TERMINFODIR}/h/htx11
+${TERMINFODIR}/h/hurd
 ${TERMINFODIR}/h/hz1000
 ${TERMINFODIR}/h/hz1420
 ${TERMINFODIR}/h/hz1500
@@ -1952,6 +1955,7 @@ ${TERMINFODIR}/m/minitel1b-80
 ${TERMINFODIR}/m/minix
 ${TERMINFODIR}/m/minix-old
 ${TERMINFODIR}/m/minix-old-am
+${TERMINFODIR}/m/mlterm
 ${TERMINFODIR}/m/mm314
 ${TERMINFODIR}/m/mm340
 ${TERMINFODIR}/m/mod
@@ -1960,6 +1964,7 @@ ${TERMINFODIR}/m/modgraph
 ${TERMINFODIR}/m/modgraph2
 ${TERMINFODIR}/m/modgraph48
 ${TERMINFODIR}/m/mono-emx
+${TERMINFODIR}/m/morphos
 ${TERMINFODIR}/m/mouse-sun
 ${TERMINFODIR}/m/ms-vt-utf8
 ${TERMINFODIR}/m/ms-vt100
@@ -2375,6 +2380,7 @@ ${TERMINFODIR}/r/rt6221
 ${TERMINFODIR}/r/rt6221-w
 ${TERMINFODIR}/r/rtpc
 ${TERMINFODIR}/r/rxvt
+${TERMINFODIR}/r/rxvt+pcfkeys
 ${TERMINFODIR}/r/rxvt-16color
 ${TERMINFODIR}/r/rxvt-basic
 ${TERMINFODIR}/r/rxvt-color
@@ -2394,11 +2400,12 @@ ${TERMINFODIR}/s/scoansi
 ${TERMINFODIR}/s/scoansi-new
 ${TERMINFODIR}/s/scoansi-old
 ${NOT_SUNOS}${TERMINFODIR}/s/screen
-${NOT_SUNOS}${TERMINFODIR}/s/screen-w
-${NOT_SUNOS}${TERMINFODIR}/s/screen.teraterm
 ${NOT_SUNOS}${TERMINFODIR}/s/screen-bce
 ${NOT_SUNOS}${TERMINFODIR}/s/screen-s
+${NOT_SUNOS}${TERMINFODIR}/s/screen-w
 ${NOT_SUNOS}${TERMINFODIR}/s/screen.linux
+${NOT_SUNOS}${TERMINFODIR}/s/screen.teraterm
+${TERMINFODIR}/s/screen.xterm-new
 ${TERMINFODIR}/s/screen.xterm-r6
 ${TERMINFODIR}/s/screen.xterm-xfree86
 ${TERMINFODIR}/s/screen2
@@ -2422,6 +2429,7 @@ ${TERMINFODIR}/s/sun-48
 ${TERMINFODIR}/s/sun-c
 ${TERMINFODIR}/s/sun-cgsix
 ${TERMINFODIR}/s/sun-cmd
+${TERMINFODIR}/s/sun-color
 ${TERMINFODIR}/s/sun-e
 ${TERMINFODIR}/s/sun-e-s
 ${TERMINFODIR}/s/sun-il
@@ -2755,6 +2763,7 @@ ${TERMINFODIR}/v/vt100-nam
 ${TERMINFODIR}/v/vt100-nam-w
 ${TERMINFODIR}/v/vt100-nav
 ${TERMINFODIR}/v/vt100-nav-w
+${TERMINFODIR}/v/vt100-putty
 ${TERMINFODIR}/v/vt100-s
 ${TERMINFODIR}/v/vt100-s-bot
 ${TERMINFODIR}/v/vt100-s-top
@@ -3120,6 +3129,7 @@ ${TERMINFODIR}/x/xnuppc-m-f
 ${TERMINFODIR}/x/xnuppc-m-f2
 ${TERMINFODIR}/x/xtalk
 ${TERMINFODIR}/x/xterm
+${TERMINFODIR}/x/xterm+pcfkeys
 ${TERMINFODIR}/x/xterm+sl
 ${TERMINFODIR}/x/xterm+sl-twm
 ${TERMINFODIR}/x/xterm-1002
@@ -3149,6 +3159,7 @@ ${TERMINFODIR}/x/xterm-xf86-v33
 ${TERMINFODIR}/x/xterm-xf86-v333
 ${TERMINFODIR}/x/xterm-xf86-v40
 ${TERMINFODIR}/x/xterm-xf86-v43
+${TERMINFODIR}/x/xterm-xf86-v44
 ${TERMINFODIR}/x/xterm-xfree86
 ${TERMINFODIR}/x/xterm-xi
 ${TERMINFODIR}/x/xterm1
diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo
index bfe7f82f1de..b933f877c7d 100644
--- a/devel/ncurses/distinfo
+++ b/devel/ncurses/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2005/02/23 22:24:21 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/10/20 00:01:32 wiz Exp $
 
-SHA1 (ncurses-5.4.tar.gz) = c0dfaf2c4d383915f898a97c8caeace8a0a2c8b7
-RMD160 (ncurses-5.4.tar.gz) = 36369f4e2c76c396de51809deb8a671d8ca3d19e
-Size (ncurses-5.4.tar.gz) = 2154022 bytes
-SHA1 (patch-aa) = 436c8b4ad94efa1144a0506f05b23a8a36af37fa
-SHA1 (patch-ab) = f5399f83b013345685530042b28f91e37a8e66e2
-SHA1 (patch-ac) = a27f115e6d3654ac0b57667435be48d9c798ea0f
-SHA1 (patch-ad) = f9ad26a687a8da6883bdc2eb4c2a7fb414896e70
+SHA1 (ncurses-5.5.tar.gz) = 46414a72e91a62f63a8c9af00f0d65497f5ecc5a
+RMD160 (ncurses-5.5.tar.gz) = aac34d2530519fbb0fde7af87a365205339ba230
+Size (ncurses-5.5.tar.gz) = 2314030 bytes
+SHA1 (patch-aa) = fc02f67e19529a07caa4053ebbf292423450959a
+SHA1 (patch-ab) = 1928dd0450d036579872c968ad5198e09bf135fc
+SHA1 (patch-ac) = 934f4df2e651a1dd1fbd05da5202601578a12f86
+SHA1 (patch-ad) = 4b46bb3e85bd8c84f41c5be259735af680507ba5
diff --git a/devel/ncurses/patches/patch-aa b/devel/ncurses/patches/patch-aa
index eee0a5f0fe7..b32089ee5e9 100644
--- a/devel/ncurses/patches/patch-aa
+++ b/devel/ncurses/patches/patch-aa
@@ -1,18 +1,18 @@
-$NetBSD: patch-aa,v 1.13 2004/03/03 13:36:09 adam Exp $
+$NetBSD: patch-aa,v 1.14 2005/10/20 00:01:32 wiz Exp $
 
---- misc/run_tic.in.orig	2003-09-06 22:31:44.000000000 +0000
+--- misc/run_tic.in.orig	2005-09-18 01:13:49.000000000 +0200
 +++ misc/run_tic.in
-@@ -91,7 +91,7 @@ TICDIR=`echo $TERMINFO | sed -e 's%/shar
+@@ -96,7 +96,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.
 -( cd $TERMINFO && rm -fr ? 2>/dev/null )
 +#( cd $TERMINFO && rm -fr ? 2>/dev/null )
  
- # If we're not installing into /usr/share/, we'll have to adjust the location
- # of the tabset files in terminfo.src (which are in a parallel directory).
-@@ -123,6 +123,9 @@ else
- 	exit 1
+ if test "$ext_funcs" = 1 ; then
+ cat <<EOF
+@@ -138,6 +138,9 @@ else
+ fi
  fi
  
 +# For NetBSD pkgsrc, don't bother with setting a symbolic link.
diff --git a/devel/ncurses/patches/patch-ab b/devel/ncurses/patches/patch-ab
index a022a4e773e..3e2929c0fe2 100644
--- a/devel/ncurses/patches/patch-ab
+++ b/devel/ncurses/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.13 2004/03/08 13:26:03 wiz Exp $
+$NetBSD: patch-ab,v 1.14 2005/10/20 00:01:32 wiz Exp $
 
---- mk-1st.awk.orig	Sat Jan 10 21:48:43 2004
+--- mk-1st.awk.orig	2005-06-18 21:15:57.000000000 +0200
 +++ mk-1st.awk
-@@ -287,7 +287,7 @@ END	{
+@@ -303,7 +303,7 @@ END	{
  				}
  				end_name = lib_name;
  				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.13 2004/03/08 13:26:03 wiz Exp $
  				print  ""
  				print  "install \\"
  				print  "install.libs \\"
-@@ -353,7 +353,7 @@ END	{
+@@ -369,7 +369,7 @@ END	{
  			print "mostlyclean::"
  			printf "\t-rm -f $(%s_OBJS)\n", OBJS
  			if ( MODEL == "LIBTOOL" ) {
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.13 2004/03/08 13:26:03 wiz Exp $
  			}
  		}
  		else if ( found == 2 )
-@@ -362,13 +362,13 @@ END	{
+@@ -378,13 +378,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 63f21c05661..a06f558bde5 100644
--- a/devel/ncurses/patches/patch-ac
+++ b/devel/ncurses/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.12 2004/03/03 13:36:09 adam Exp $
+$NetBSD: patch-ac,v 1.13 2005/10/20 00:01:32 wiz Exp $
 
---- configure.orig	2004-02-01 01:03:42.000000000 +0000
+--- configure.orig	2005-09-24 23:50:50.000000000 +0200
 +++ configure
-@@ -5537,12 +5537,7 @@ case ".$MANPAGE_RENAMES" in #(vi
+@@ -7763,12 +7763,7 @@ case ".$MANPAGE_RENAMES" in #(vi
  .no) #(vi
    ;;
  .|.yes)
diff --git a/devel/ncurses/patches/patch-ad b/devel/ncurses/patches/patch-ad
index f4ecaf27af1..c00e0deff8e 100644
--- a/devel/ncurses/patches/patch-ad
+++ b/devel/ncurses/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2004/03/08 13:26:03 wiz Exp $
+$NetBSD: patch-ad,v 1.9 2005/10/20 00:01:32 wiz Exp $
 
---- c++/Makefile.in.orig	Fri Jan 16 23:44:56 2004
+--- c++/Makefile.in.orig	2005-06-13 00:52:56.000000000 +0200
 +++ c++/Makefile.in
-@@ -149,7 +149,7 @@ LIB_OBJS = \
+@@ -152,7 +152,7 @@ LIB_OBJS = \
  
  ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
  	cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
@@ -11,12 +11,3 @@ $NetBSD: patch-ad,v 1.8 2004/03/08 13:26:03 wiz Exp $
  		-rpath $(INSTALL_PREFIX)$(libdir) \
  		-version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
  
-@@ -184,7 +184,7 @@ mostlyclean ::
- clean :: mostlyclean
- 	-sh -c "if test -n '$x' ; then $(MAKE) clean x=''; fi"
- 	-rm -rf $(MODEL)/SunWS_cache
--	-$(LIBTOOL_CLEAN) rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(LIB_OBJS:$o=.lo) $(OBJS_DEMO)
-+	-$(LIBTOOL_CLEAN) rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(LIB_OBJS:.o=.lo) $(OBJS_DEMO)
- 	-rm -rf .libs
- 
- distclean :: clean