Update ncurses to 5.0. From the release notes:

   We decided to release ncurses as a new whole number release (5.0)
   because it incorporates several interface changes, including some that
   would invalidate existing shared libraries. These are the highlights
   from the change-log since ncurses 4.2 release.

   Interface changes:
     * The principal source of changes to the interface comes from the
       release of X/Open Curses in 1997. Earlier versions of ncurses (4.0
       and before) were based on a draft version of the specification.
       The release version adds parameters to some functions to support
       the evolving internationalization of curses. These summarize the
       impact:
          + modified several prototypes to correspond with 1997 version
            of X/Open Curses (affects ABI since developers have used
            attr_get).
          + corrected prototypes for slk_* functions, using chtype rather
            than attr_t.
          + the slk_attr_{set,off,on} functions need an additional void*
            parameter according to XSI.
          + correct macros for wattr_set, wattr_get, separate wattrset
            macro from these to preserve behavior that allows attributes
            to be combined with color pair numbers.
          + reviewed/updated curses.h, term.h against X/Open Curses Issue
            4 Version 2. This includes making some parameters
            NCURSES_CONST rather than const, e.g., in termcap.h.
          + reviewed/corrected macros in curses.h as per XSI document.
          + add set_a_attributes and set_pglen_inch to terminfo
            structure, as per XSI and Solaris 2.5.
     * The newest version of the X/Open Curses is implemented on Solaris
       and other vendor's systems. It adds new features to the terminfo
       descriptions:
          + implement tparm %l format.
          + implement tparm printf-style width and precision for %s, %d,
            %x, %o as per XSI.
     * We made additional changes to reduce impact by future interface
       changes:
          + rename key_names[] array to _nc_key_names since it is not
            part of the curses interface.
          + move macro winch to a function, to hide details of struct
            ldat
     * modify configure script to embed ABI in shared libraries for HP-UX
       10.x (detailed request by Tim Mooney).
     * modify configuration of shared libraries on Digital Unix so that
       versioning is embedded in the library, rather than implied by
       links (patch by Tim Mooney).

   New features:
     * enable sigwinch handler by default.
     * turn on hashmap scrolling code by default
     * improved support for termcap applications
          + modify tput to accept termcap names as an alternative to
            terminfo names.
          + provide support for termcap PC variable by copying it from
            terminfo data and using it as the padding character in tputs.
          + provide support for termcap ospeed variable by copying it
            from the internal cur_term member, and using ospeed as the
            baudrate reference for the delay_output and tputs functions.
          + change name-comparisons in lib_termcap to compare no more
            than 2 characters.
          + add configure option --enable-tcap-names, which essentially
            allows users to define new capabilities as in termcap.
     * add mouse support to ncurses menus.
     * add mouse and dll support for OS/2 EMX
     * modify terminfo parsing to accept octal and hexadecimal constants
     * add configure option --enable-no-padding, to allow environment
       variable $NCURSES_NO_PADDING to eliminate non-mandatory padding,
       thereby making terminal emulators (e.g., for vt100) a little more
       efficient.
     * modify lib_color.c to eliminate dependency on orig_colors and
       orig_pair, since SVr4 curses does not require these either, but
       uses them when they are available.
     * add -f option to infocmp and tic, which formats the terminfo
       if/then/else/endif so that they are readable (with newlines and
       tabs).
     * modify tic to compile into %'char' form in preference to
       %{number}, since that is a little more efficient.

   Major bug fixes:
     * modify lib_tstp.c to block SIGTTOU when handling SIGTSTP, fixes a
       problem where ncurses applications which were run via a shell
       script would hang when given a ^Z. Also, check if the terminal's
       process group is consistent, i.e., a shell has not taken ownership
       of it, before deciding to save the current terminal settings in
       the SIGTSTP handler.
     * suppress sc/rc capabilities from terminal description if they
       appear in smcup/rmcup. This affects only scrolling optimization,
       to fix a problem reported by several people with xterm's alternate
       screen, though the problem is more general.
     * modify relative_move and tputs to avoid an interaction with the
       BSD-style padding. The relative_move function could produce a
       string to replace on the screen which began with a numeric
       character, which was then interpreted by tputs as padding.
     * modify setupterm so that cancelled strings are treated the same as
       absent strings, cancelled and absent booleans false (does not
       affect tic, infocmp).
     * modify lib_vidattr.c to allow for terminal types (e.g.,
       xterm-color) which may reset all attributes in the 'op'
       capability, so that colors are set before turning on bold and
       other attributes, but still after turning attributes off.
     * use 'access()' to check if ncurses library should be permitted to
       open or modify files with fopen/open/link/unlink/remove calls, in
       case the calling application is running in setuid mode.
     * correction to doupdate, for case where terminal does not support
       insert/delete character. The logic did not check that there was a
       difference in alignment of changes to old/new screens before
       repainting the whole non-blank portion of the line. Modified to
       fall through into logic that reduces by the portion which does not
       differ.

18 files changed, 608 insertions, 341 deletions

diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 631617fe758..8ddfed15e92 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,36 +1,52 @@
-# $NetBSD: Makefile,v 1.27 1999/09/24 00:39:13 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2000/01/15 18:39:28 jlam Exp $
 
-DISTNAME=		ncurses-4.2
+DISTNAME=		ncurses-5.0
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=ncurses/} \
 			ftp://ftp.clark.net/pub/dickey/ncurses/
 
 MAINTAINER=		jlam@netbsd.org
-HOMEPAGE=		http://www.gnu.org/software/ncurses/ncurses.html
+HOMEPAGE=		http://www.clark.net/pub/dickey/ncurses/ncurses.html
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-CONFIGURE_ARGS+=	--with-normal --without-debug --enable-bsdpad
+CONFIGURE_ARGS+=	--with-normal --enable-bsdpad \
+			--without-shared --without-debug --without-profile \
+			--without-gpm --without-ada \
+			--with-manpage-format=normal
 MAKE_ENV+=		NCURSES_MAJOR="${NCURSES_MAJOR}" \
 			NCURSES_MINOR="${NCURSES_MINOR}"
 
 # Define these here so they can be conveniently changed when ncurses
 # is integrated into the NetBSD source tree.
 #
-NCURSES_MAJOR=		4
-NCURSES_MINOR=		2
-
-post-patch:
-	${LN} -sf curses.h ${WRKSRC}/include/ncurses.h
-	( cd ${WRKSRC}/man ; ${RM} -f clear.1 tput.1 tset.1 )
-	( cd ${WRKSRC}/man ; for i in *.1m ; do \
-	  ${SED} -e '/#include/s/curses.h/ncurses.h/' \
-		<$$i >`basename $$i .1m`.1; \
-	  ${RM} -f $$i; done )
-	( cd ${WRKSRC}/man ; for i in *.3x ; do \
-	  ${SED} -e '/#include/s/curses.h/ncurses.h/' \
-		<$$i >`basename $$i .3x`.3; \
-	  ${RM} -f $$i; done )
+NCURSES_MAJOR=		5
+NCURSES_MINOR=		0
+
+# The following installed headers directly reference <curses.h> and must be
+# altered to reference <ncurses.h> instead.
+#
+CURSES_INCLUDES=	c++/cursesw.h form/form.h include/unctrl.h \
+			menu/menu.h panel/panel.h
+SED_NCURSES=		'/\#[ 	]*include/s/curses.h/ncurses.h/'
+
+post-configure:
+	cd ${WRKSRC};							\
+	${LN} -sf curses.h include/ncurses.h;				\
+	for file in ${CURSES_INCLUDES}; do				\
+		${SED} -e ${SED_NCURSES} <$${file} >$${file}.tmp;	\
+		${MV} -f $${file}.tmp $${file};				\
+	done
+	cd ${WRKSRC}/man;						\
+	${RM} -f clear.1 tput.1 tset.1;					\
+	for file in *.1m; do						\
+		${SED} -e ${SED_NCURSES} <$${file} >`basename $${file} .1m`.1; \
+		${RM} -f $${file};					\
+	done;								\
+	for file in *.3x; do						\
+		${SED} -e ${SED_NCURSES} <$${file} >`basename $${file} .3x`.3; \
+		${RM} -f $${file};					\
+	done
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/c++/demo.cc \
diff --git a/devel/ncurses/files/md5 b/devel/ncurses/files/md5
index 5f1b6238954..5da17d2c5db 100644
--- a/devel/ncurses/files/md5
+++ b/devel/ncurses/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/07/06 07:51:04 jlam Exp $
+$NetBSD: md5,v 1.5 2000/01/15 18:39:29 jlam Exp $
 
-MD5 (ncurses-4.2.tar.gz) = 7926ed3ef7090f72c0a45da1f59400bf
+MD5 (ncurses-5.0.tar.gz) = 0fa25059bc5e1e947f3109a3a168e976
diff --git a/devel/ncurses/files/patch-sum b/devel/ncurses/files/patch-sum
index 37005537826..51b51f167cd 100644
--- a/devel/ncurses/files/patch-sum
+++ b/devel/ncurses/files/patch-sum
@@ -1,15 +1,10 @@
-$NetBSD: patch-sum,v 1.4 1999/09/24 00:39:13 jlam Exp $
+$NetBSD: patch-sum,v 1.5 2000/01/15 18:39:29 jlam Exp $
 
-MD5 (patch-aa) = a6827fdf571e7aefa149b94accb44b4a
-MD5 (patch-ab) = a6ae37871c4b82f9b6a8af5beaf74352
-MD5 (patch-ac) = 546d83d15d2279277a6c77e754dbb93a
-MD5 (patch-ad) = 8f9e20face0c55074e54bf7176252a7d
-MD5 (patch-ae) = dad6ffedeff83e83afadeac434fa9972
-MD5 (patch-af) = 0ba3fe9b0477d8685e0f5bc56bad7220
-MD5 (patch-ag) = 5ef845ba624a0c0baef232e4d55b0f1f
-MD5 (patch-ah) = e6a3861102bbfc130fb4c2ee35c6e3a2
-MD5 (patch-ai) = 3401ca1e14d53edb6b0d33ac199a7a86
-MD5 (patch-aj) = f357ce3e57468cecd3f4dd3994bcbaf2
-MD5 (patch-ak) = daff9fdb31fa1c1eacdcf21d893ff49b
-MD5 (patch-al) = fd24f510fe2e5372142f314493e0fd37
-MD5 (patch-am) = b98afdbc5071a3fb154eba8adf201f2b
+MD5 (patch-aa) = 4939ee98209226437b82c811de8979a4
+MD5 (patch-ab) = 954b4610801ccad8c61084bf3559bf5b
+MD5 (patch-ac) = 27e6894380f88aa55c860bdb259e334c
+MD5 (patch-ad) = e0d8bfb17f84b62290773412ce0633b2
+MD5 (patch-ae) = 5e59f99002985e98baa30cce9dd78c79
+MD5 (patch-af) = 4c16a0e085a0a5ff21ac0745ec1dd37a
+MD5 (patch-ag) = 0a0eab3bdd57760a113fc41eda19d44c
+MD5 (patch-ah) = a552ff5733c78b485153d6f66a5e0d60
diff --git a/devel/ncurses/patches/patch-aa b/devel/ncurses/patches/patch-aa
index df661cd2ba5..12fc6df9e1b 100644
--- a/devel/ncurses/patches/patch-aa
+++ b/devel/ncurses/patches/patch-aa
@@ -1,47 +1,75 @@
-$NetBSD: patch-aa,v 1.7 1999/07/06 07:51:04 jlam Exp $
+$NetBSD: patch-aa,v 1.8 2000/01/15 18:39:29 jlam Exp $
 
---- progs/Makefile.in.orig	Wed Feb 11 07:14:03 1998
-+++ progs/Makefile.in	Tue Jun 29 08:59:34 1999
-@@ -84,7 +84,7 @@
- CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
- 
- LD		= @LD@
--LINK		= $(CC)
-+LINK		= $(LIBTOOL) --mode=link $(CC)
- LDFLAGS		= @EXTRA_LDFLAGS@ \
- 		@PROG_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ @EXTRA_LIBS@
- 
-@@ -102,7 +102,7 @@
- AUTO_SRC = \
- 	termsort.c
- 
--PROGS = tic$x toe$x infocmp$x clear$x tput$x tset$x
-+PROGS = tic$x toe$x infocmp$x
- 
- TESTPROGS = mvcur$x tctest$x hardscroll$x hashmap$x
- 
-@@ -122,21 +122,15 @@
- uninstall.libs:
- 
- install.progs: $(PROGS) $(INSTALL_PREFIX)$(bindir)
--	$(INSTALL_PROGRAM) tic$x     $(INSTALL_PREFIX)$(bindir)/tic$x
--	$(INSTALL_PROGRAM) toe$x     $(INSTALL_PREFIX)$(bindir)/toe$x
--	$(INSTALL_PROGRAM) infocmp$x $(INSTALL_PREFIX)$(bindir)/infocmp$x
--	$(INSTALL_PROGRAM) clear$x   $(INSTALL_PREFIX)$(bindir)/clear$x
--	$(INSTALL_PROGRAM) tput$x    $(INSTALL_PREFIX)$(bindir)/tput$x
--	$(INSTALL_PROGRAM) tset$x    $(INSTALL_PREFIX)$(bindir)/tset$x
-+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) tic$x     $(INSTALL_PREFIX)$(bindir)/tic$x
-+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) toe$x     $(INSTALL_PREFIX)$(bindir)/toe$x
-+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) infocmp$x $(INSTALL_PREFIX)$(bindir)/infocmp$x
- 	@echo "linking captoinfo to tic"
- 	-@rm -f $(INSTALL_PREFIX)$(bindir)/captoinfo$x
- 	(cd $(INSTALL_PREFIX)$(bindir) && $(LN_S) tic$x captoinfo$x)
- 	@echo "linking infotocap to tic"
- 	-@rm -f $(INSTALL_PREFIX)$(bindir)/infotocap$x
- 	(cd $(INSTALL_PREFIX)$(bindir) && $(LN_S) tic$x infotocap$x)
--	@echo "linking reset to tset"
--	-@rm -f $(INSTALL_PREFIX)$(bindir)/reset$x
--	(cd $(INSTALL_PREFIX)$(bindir) && $(LN_S) tset$x reset$x)
- 
- uninstall.progs:
- 	-@rm -f $(INSTALL_PREFIX)$(bindir)/tic$x
+--- c++/Makefile.in.orig	Sat Oct 23 16:13:02 1999
++++ c++/Makefile.in	Sat Jan 15 11:24:46 2000
+@@ -74,13 +74,13 @@
+ REL_VERSION     = @cf_cv_rel_version@
+ ABI_VERSION	= @cf_cv_abi_version@
+ 
+-LINK		= @LINK_PROGS@ $(CXX) @CXXLDFLAGS@
++LINK		= @LINK_PROGS@ --cplusplus $(CXX) @CXXLDFLAGS@
+ 
+ LIBROOT	= ncurses++
+-LIBNAME	= @LIB_PREFIX@$(LIBROOT).a
++LIBNAME	= @LIB_PREFIX@$(LIBROOT).la
+ 
+-LDFLAGS		= @EXTRA_LDFLAGS@ -L../lib -L$(libdir) \
+-	-l$(LIBROOT) \
++LDFLAGS		= @EXTRA_LDFLAGS@ -L$(libdir) \
++	$(LIBNAME) \
+ 	@TEST_ARGS@ @LDFLAGS@ \
+ 	@LD_MODEL@ @LIBS@ @EXTRA_LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
+ 
+@@ -94,7 +94,7 @@
+ AUTO_SRC	= \
+ 		etip.h
+ 
+-all:		$(AUTO_SRC) ../lib/$(LIBNAME) demo$x
++all:		$(AUTO_SRC) $(LIBNAME) demo$x
+ 
+ sources :	$(AUTO_SRC)
+ 
+@@ -111,9 +111,8 @@
+ 	$(MODEL)/cursesapp.o \
+ 	$(MODEL)/cursesmain.o
+ 
+-../lib/$(LIBNAME) : $(LIB_OBJS)
+-	$(AR) $(AR_OPTS) $@ $?
+-	$(RANLIB) $@
++$(LIBNAME) : $(LIB_OBJS)
++	cd ../lib && $(LINK) -o lib$(LIBROOT).la $(LIB_OBJS:.o=.lo) -rpath $(INSTALL_PREFIX)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR)
+ 
+ OBJS_DEMO = $(MODEL)/demo.o
+ 
+@@ -121,7 +120,7 @@
+ 	$(cursesf_h) $(cursesm_h) $(cursesapp_h)
+ 
+ demo$x:	$(OBJS_DEMO) \
+-	../lib/$(LIBNAME)  \
++	$(LIBNAME)  \
+ 	@TEST_DEPS@
+ 	@ECHO_LINK@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
+ 
+@@ -133,18 +132,18 @@
+ 	$(srcdir)/../mkinstalldirs $@
+ 
+ install \
+-install.libs:: ../lib/$(LIBNAME) $(INSTALL_PREFIX)$(libdir)
+-	$(INSTALL) ../lib/$(LIBNAME) $(INSTALL_PREFIX)$(libdir)/$(LIBNAME)
++install.libs:: $(LIBNAME) $(INSTALL_PREFIX)$(libdir)
++	$(LIBTOOL) $(INSTALL_DATA) $(LIBNAME) $(INSTALL_PREFIX)$(libdir)/$(LIBNAME)
+ 
+ uninstall \
+ uninstall.libs::
+-	-rm -f $(INSTALL_PREFIX)$(libdir)/$(LIBNAME)
++	-$(LIBTOOL) rm -f $(INSTALL_PREFIX)$(libdir)/$(LIBNAME)
+ 
+ mostlyclean ::
+ 	-rm -f core tags TAGS *~ *.ln *.atac trace
+ 
+ clean :: mostlyclean
+-	-rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO)
++	-rm -f demo$x $(AUTO_SRC) $(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO)
+ 
+ distclean :: clean
+ 	-rm -f Makefile
diff --git a/devel/ncurses/patches/patch-ab b/devel/ncurses/patches/patch-ab
index 33037c6b923..63a088ae5af 100644
--- a/devel/ncurses/patches/patch-ab
+++ b/devel/ncurses/patches/patch-ab
@@ -1,44 +1,45 @@
-$NetBSD: patch-ab,v 1.7 1999/09/24 00:39:13 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2000/01/15 18:39:29 jlam Exp $
 
---- configure.orig	Thu Feb 12 18:46:01 1998
-+++ configure	Thu Sep 23 16:45:08 1999
-@@ -1628,6 +1628,7 @@
-     test -z "$cf_dir" && cf_dir=/usr/man
-     cf_rename=""
-     cf_format=no
-+    if false; then	# install unformatted man pages
-     for cf_name in $cf_dir/*/date.[01]* $cf_dir/*/date
-     do
-        cf_test=`echo $cf_name | sed -e 's/*//'`
-@@ -1641,6 +1642,8 @@
- 	  break
-        fi
-     done
-+    else cf_form=cat
-+    fi
-     if test "$cf_form" != "unknown" ; then
-        break
-     fi
-@@ -2103,7 +2106,7 @@
+--- configure.orig	Sat Oct 23 20:33:18 1999
++++ configure	Sat Jan 15 11:24:46 2000
+@@ -2461,7 +2461,7 @@
  
  	
  	case $DFT_LWR_MODEL in
 -	normal)  DFT_DEP_SUFFIX='.a'   ;;
-+	normal)  DFT_DEP_SUFFIX='.la'   ;;
++	normal)  DFT_DEP_SUFFIX='.la'  ;;
  	debug)   DFT_DEP_SUFFIX='_g.a' ;;
  	profile) DFT_DEP_SUFFIX='_p.a' ;;
  	shared)
-@@ -5310,7 +5313,8 @@
+@@ -2581,6 +2581,9 @@
+ 
+ 	cf_cv_rm_so_locs=no
+ 
++LINK_PROGS='$(LIBTOOL)'
++LINK_TESTS='$(LIBTOOL)'
++
+ 	case $cf_cv_system_name in
+ 	hpux10.*)
+ 		# (tested with gcc 2.7.2 -- I don't have c89)
+@@ -6440,7 +6443,7 @@
+ ### could override this.
+ if test "$with_termlib" = yes ; then
+ 	TEST_DEPS="${LIB_PREFIX}${TINFO_NAME}${DFT_DEP_SUFFIX}"
+-	TEST_ARGS="-l${TINFO_NAME}${DFT_ARG_SUFFIX}"
++	TEST_ARGS="${LIB_PREFIX}${TINFO_NAME}${DFT_DEP_SUFFIX}"
+ fi
+ PROG_DEPS="$TEST_DEPS"
+ PROG_ARGS="$TEST_ARGS"
+@@ -6454,7 +6457,7 @@
  
  # dependencies and linker-arguments for test-programs
  TEST_DEPS="${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_DEPS"
 -TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS"
 +TEST_ARGS="${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_ARGS"
-+
  
  # dependencies and linker-arguments for utility-programs
  PROG_ARGS="$TEST_ARGS"
-@@ -5353,16 +5357,16 @@
+@@ -6497,16 +6500,17 @@
  EOF
  
  			TEST_DEPS="${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS"
@@ -50,44 +51,36 @@ $NetBSD: patch-ab,v 1.7 1999/09/24 00:39:13 jlam Exp $
  echo "$ac_t""$cf_cv_src_modules" 1>&6
 -TEST_ARGS="-L${LIB_DIR} -L\$(libdir) $TEST_ARGS"
 -
--
  
+-
 -PROG_ARGS="-L${LIB_DIR} -L\$(libdir) $PROG_ARGS"
 +# Put $(libdir) last so we ensure programs are linked against newly-built
 +# versions of libraries.
++#
 +TEST_ARGS="$TEST_ARGS -L\$(libdir)"
 +PROG_ARGS="$PROG_ARGS -L\$(libdir)"
  
  
  SRC_SUBDIRS="man include"
-@@ -5371,7 +5375,7 @@
- 	SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
- done
- SRC_SUBDIRS="$SRC_SUBDIRS misc test"
--test $cf_cxx_library != no && SRC_SUBDIRS="$SRC_SUBDIRS c++"
-+test "X$cf_with_cxx" != Xno && SRC_SUBDIRS="$SRC_SUBDIRS c++"
- 
- ADA_SUBDIRS=
- if test "$ac_cv_prog_gnat_correct" = yes && test -d $srcdir/Ada95; then
-@@ -5888,7 +5892,7 @@
+@@ -7048,7 +7052,7 @@
  			
  	
  	case $cf_item in
 -	normal)  cf_suffix='.a'   ;;
-+	normal)  cf_suffix='.la'   ;;
++	normal)  cf_suffix='.la'  ;;
  	debug)   cf_suffix='_g.a' ;;
  	profile) cf_suffix='_p.a' ;;
  	shared)
-@@ -5931,7 +5935,7 @@
+@@ -7098,7 +7102,7 @@
  			
  	
  	case $cf_item in
 -	normal)  cf_suffix='.a'   ;;
-+	normal)  cf_suffix='.la'   ;;
++	normal)  cf_suffix='.la'  ;;
  	debug)   cf_suffix='_g.a' ;;
  	profile) cf_suffix='_p.a' ;;
  	shared)
-@@ -6120,7 +6124,7 @@
+@@ -7296,7 +7300,7 @@
  		for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
  		do
  			echo "	@ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f `basename $i`) ; ../headers.sh \$(INSTALL_DATA) \$(INSTALL_PREFIX)\$(includedir) \$(srcdir) $i" >>$cf_dir/Makefile
diff --git a/devel/ncurses/patches/patch-ac b/devel/ncurses/patches/patch-ac
index d975762e31c..d302489e04b 100644
--- a/devel/ncurses/patches/patch-ac
+++ b/devel/ncurses/patches/patch-ac
@@ -1,12 +1,13 @@
-$NetBSD: patch-ac,v 1.3 1999/07/06 07:51:04 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2000/01/15 18:39:30 jlam Exp $
 
---- misc/run_tic.sh.orig	Wed Feb 11 07:13:50 1998
-+++ misc/run_tic.sh	Tue Jun 29 19:03:00 1999
-@@ -120,6 +120,7 @@
- # to find terminfo under /usr/lib.  That is, we'll _try_ to do that.  Not
- # all systems support symbolic links, and those that do provide a variety
- # of options for 'test'.
-+exit 0 # don't do this
- if test "$TICDIR" != "$TERMINFO" ; then
- 	( rm -f $TICDIR 2>/dev/null )
- 	if ( cd $TICDIR 2>/dev/null )
+--- man/Makefile.in.orig	Wed Feb 11 07:13:49 1998
++++ man/Makefile.in	Sat Jan 15 11:24:46 2000
+@@ -63,7 +63,7 @@
+ # We compose terminfo.5 from the real sources...
+ CAPLIST=$(srcdir)/../include/Caps
+ terminfo.5: $(srcdir)/terminfo.head $(CAPLIST) $(srcdir)/terminfo.tail Makefile $(srcdir)/MKterminfo.sh
+-	sh $(srcdir)/MKterminfo.sh $(srcdir)/terminfo.head $(CAPLIST) $(srcdir)/terminfo.tail >terminfo.5
++	sh $(srcdir)/MKterminfo.sh $(srcdir)/terminfo.head $(CAPLIST) $(srcdir)/terminfo.tail | tbl >terminfo.5
+ 
+ mostlyclean :
+ 	-rm -f core tags TAGS *~ *.ln *.atac trace
diff --git a/devel/ncurses/patches/patch-ad b/devel/ncurses/patches/patch-ad
index 697e7b314b7..17ca8dfeb0d 100644
--- a/devel/ncurses/patches/patch-ad
+++ b/devel/ncurses/patches/patch-ad
@@ -1,13 +1,12 @@
-$NetBSD: patch-ad,v 1.2 1999/07/06 07:51:04 jlam Exp $
+$NetBSD: patch-ad,v 1.3 2000/01/15 18:39:30 jlam Exp $
 
---- man/Makefile.in.orig	Wed Feb 11 07:13:49 1998
-+++ man/Makefile.in	Tue Jun 29 09:07:25 1999
-@@ -63,7 +63,7 @@
- # We compose terminfo.5 from the real sources...
- CAPLIST=$(srcdir)/../include/Caps
- terminfo.5: $(srcdir)/terminfo.head $(CAPLIST) $(srcdir)/terminfo.tail Makefile $(srcdir)/MKterminfo.sh
--	sh $(srcdir)/MKterminfo.sh $(srcdir)/terminfo.head $(CAPLIST) $(srcdir)/terminfo.tail >terminfo.5
-+	sh $(srcdir)/MKterminfo.sh $(srcdir)/terminfo.head $(CAPLIST) $(srcdir)/terminfo.tail | tbl >terminfo.5
- 
- mostlyclean :
- 	-rm -f core tags TAGS *~ *.ln *.atac trace
+--- misc/run_tic.sh.orig	Sat May 30 20:29:34 1998
++++ misc/run_tic.sh	Sat Jan 15 11:24:46 2000
+@@ -130,6 +130,7 @@
+ # to find terminfo under /usr/lib.  That is, we'll _try_ to do that.  Not
+ # all systems support symbolic links, and those that do provide a variety
+ # of options for 'test'.
++exit 0 # don't do this
+ if test "$TICDIR" != "$TERMINFO" ; then
+ 	( rm -f $TICDIR 2>/dev/null )
+ 	if ( cd $TICDIR 2>/dev/null )
diff --git a/devel/ncurses/patches/patch-ae b/devel/ncurses/patches/patch-ae
index 7d9451c1b6f..7e08eaec24e 100644
--- a/devel/ncurses/patches/patch-ae
+++ b/devel/ncurses/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 1999/07/06 07:51:05 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2000/01/15 18:39:30 jlam Exp $
 
---- mk-1st.awk.orig	Wed Feb 11 07:13:53 1998
-+++ mk-1st.awk	Fri Jul  2 02:58:54 1999
-@@ -187,10 +187,17 @@
+--- mk-1st.awk.orig	Sat May  9 17:54:02 1998
++++ mk-1st.awk	Sat Jan 15 11:24:46 2000
+@@ -208,10 +208,16 @@
  			}
  			else
  			{
@@ -17,12 +17,11 @@ $NetBSD: patch-ae,v 1.1 1999/07/06 07:51:05 jlam Exp $
  				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
 -				printf "\t$(AR) $(AR_OPTS) $@ $?\n"
 -				printf "\t$(RANLIB) $@\n"
-+				printf "\tcd ../lib && $(LIBTOOL) %s --mode=link $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(INSTALL_PREFIX)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR)\n", cplusplus, compile, lib_name, OBJS
-+
++				printf "\tcd ../lib && $(LIBTOOL) %s $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(INSTALL_PREFIX)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR)\n", cplusplus, compile, lib_name, OBJS
  				if ( target == "vxworks" )
  				{
  					printf "\t$(LD) $(LD_OPTS) $? -o $(@:.a=.o)\n"
-@@ -199,15 +206,8 @@
+@@ -220,15 +226,8 @@
  				print  "install \\"
  				print  "install.libs \\"
  				printf "install.%s :: $(INSTALL_PREFIX)$(libdir) ../lib/%s\n", name, lib_name
@@ -36,7 +35,30 @@ $NetBSD: patch-ae,v 1.1 1999/07/06 07:51:05 jlam Exp $
 -				}
 -				printf "\t$(RANLIB) $(INSTALL_PREFIX)$(libdir)/%s\n", lib_name
 +				printf "\t@echo installing ../lib/%s in $(INSTALL_PREFIX)$(libdir)\n", lib_name
-+				printf "\tcd ../lib && $(LIBTOOL) %s --mode=install $(INSTALL_DATA) %s $(INSTALL_PREFIX)$(libdir)\n", cplusplus, lib_name
++				printf "\tcd ../lib && $(LIBTOOL) %s $(INSTALL_DATA) %s $(INSTALL_PREFIX)$(libdir)\n", cplusplus, lib_name
  				if ( target == "vxworks" )
  				{
  					printf "\t@echo installing ../lib/lib%s.o as $(INSTALL_PREFIX)$(libdir)/lib%s.o\n", name, name
+@@ -239,12 +238,7 @@
+ 				print  "uninstall.libs \\"
+ 				printf "uninstall.%s ::\n", name
+ 				printf "\t@echo uninstalling $(INSTALL_PREFIX)$(libdir)/%s \n", lib_name
+-				printf "\t-@rm -f $(INSTALL_PREFIX)$(libdir)/%s\n", lib_name
+-				if ( overwrite == "yes" && lib_name == "libncurses.a" )
+-				{
+-					printf "\t@echo linking libcurses.a to libncurses.a \n"
+-					printf "\t-@rm -f $(INSTALL_PREFIX)$(libdir)/libcurses.a \n"
+-				}
++				printf "\t-@$(LIBTOOL) rm -f $(INSTALL_PREFIX)$(libdir)/%s\n", lib_name
+ 				if ( target == "vxworks" )
+ 				{
+ 					printf "\t@echo uninstalling $(INSTALL_PREFIX)$(libdir)/lib%s.o\n", name
+@@ -253,7 +247,7 @@
+ 			}
+ 			print ""
+ 			print "clean ::"
+-			printf "\t-rm -f ../lib/%s\n", lib_name
++			printf "\t-cd ../lib && $(LIBTOOL) rm -f %s\n", lib_name
+ 			print ""
+ 			print "mostlyclean::"
+ 			printf "\t-rm -f $(%s_OBJS)\n", OBJS
diff --git a/devel/ncurses/patches/patch-af b/devel/ncurses/patches/patch-af
index a7cee3dbbcb..9e45b688ac7 100644
--- a/devel/ncurses/patches/patch-af
+++ b/devel/ncurses/patches/patch-af
@@ -1,35 +1,16 @@
-$NetBSD: patch-af,v 1.2 1999/09/24 00:39:13 jlam Exp $
+$NetBSD: patch-af,v 1.3 2000/01/15 18:39:31 jlam Exp $
 
---- mk-2nd.awk.orig	Wed Feb 11 07:13:53 1998
-+++ mk-2nd.awk	Thu Sep 23 17:24:17 1999
-@@ -74,9 +74,11 @@
- 			if ( $1 != "" ) {
- 				print  ""
- 				if ( $2 == "c++" ) {
-+					cplusplus="--cplusplus"
- 					compile="CXX"
- 					suffix=".cc"
- 				} else {
-+					cplusplus=""
- 					compile="CC"
- 					suffix=".c"
- 				}
-@@ -89,10 +91,14 @@
- 					atsign="@"
- 					printf "\t@echo 'compiling %s (%s)'\n", $1, model
- 				}
--				if ( $3 == "." || srcdir == "." )
--					printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c ../%s/%s%s", atsign, model, compile, MODEL, name, $1, suffix
--				else
+--- mk-2nd.awk.orig	Sat Oct 17 17:54:21 1998
++++ mk-2nd.awk	Sat Jan 15 11:24:46 2000
+@@ -93,9 +93,9 @@
+ 					dir = $3 "/"
+ 					sub("^\\$\\(srcdir\\)/","",dir);
+ 					sub("^\\./","",dir);
+-					printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c ../%s/%s%s%s", atsign, model, compile, MODEL, name, dir, $1, suffix
++					printf "\t%scd ../%s; $(LIBTOOL) $(%s) $(CFLAGS_%s) -c ../%s/%s%s%s", atsign, model, compile, MODEL, name, dir, $1, suffix
+ 				} else
 -					printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c %s/%s%s", atsign, model, compile, MODEL, $3, $1, suffix
-+				if ( $3 == "." || srcdir == "." ) {
-+					libprefix="../"
-+					dirname=name
-+				} else {
-+					libprefix=""
-+					dirname=$3
-+				}
-+				printf "\t%scd ../%s; $(LIBTOOL) %s --mode=compile $(%s) $(CFLAGS_%s) -c %s%s/%s%s", atsign, model, cplusplus, compile, MODEL, libprefix, dirname, $1, suffix
++					printf "\t%scd ../%s; $(LIBTOOL) $(%s) $(CFLAGS_%s) -c %s/%s%s", atsign, model, compile, MODEL, $3, $1, suffix
  			} else {
  				printf "%s", $1
  				for (n = 2; n <= NF; n++) printf " %s", $n
diff --git a/devel/ncurses/patches/patch-ag b/devel/ncurses/patches/patch-ag
index 974fa4a47f3..5906493e2e7 100644
--- a/devel/ncurses/patches/patch-ag
+++ b/devel/ncurses/patches/patch-ag
@@ -1,13 +1,52 @@
-$NetBSD: patch-ag,v 1.1 1999/07/06 07:51:05 jlam Exp $
+$NetBSD: patch-ag,v 1.2 2000/01/15 18:39:31 jlam Exp $
 
---- test/Makefile.in.orig	Wed Feb 11 07:14:05 1998
-+++ test/Makefile.in	Tue Jun 29 05:10:01 1999
-@@ -65,7 +65,7 @@
- MATH_LIB	= @MATH_LIB@
+--- progs/Makefile.in.orig	Sat May 30 20:07:33 1998
++++ progs/Makefile.in	Sat Jan 15 11:24:46 2000
+@@ -102,7 +102,7 @@
+ AUTO_SRC = \
+ 	termsort.c
  
- LD		= @LD@
--LINK		= $(CC)
-+LINK		= $(LIBTOOL) --mode=link $(CC)
+-PROGS = tic$x toe$x infocmp$x clear$x tput$x tset$x
++PROGS = tic$x toe$x infocmp$x
  
- LDFLAGS		= @LD_MODEL@ @TEST_ARGS@ @LIBS@ @EXTRA_LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@
+ TESTPROGS = mvcur$x tctest$x hardscroll$x hashmap$x
  
+@@ -122,32 +122,22 @@
+ uninstall.libs:
+ 
+ install.progs: $(PROGS) $(INSTALL_PREFIX)$(bindir)
+-	$(INSTALL_PROGRAM) tic$x     $(INSTALL_PREFIX)$(bindir)/tic$x
+-	$(INSTALL_PROGRAM) toe$x     $(INSTALL_PREFIX)$(bindir)/toe$x
+-	$(INSTALL_PROGRAM) infocmp$x $(INSTALL_PREFIX)$(bindir)/infocmp$x
+-	$(INSTALL_PROGRAM) clear$x   $(INSTALL_PREFIX)$(bindir)/clear$x
+-	$(INSTALL_PROGRAM) tput$x    $(INSTALL_PREFIX)$(bindir)/tput$x
+-	$(INSTALL_PROGRAM) tset$x    $(INSTALL_PREFIX)$(bindir)/tset$x
++	$(LIBTOOL) $(INSTALL_PROGRAM) tic$x     $(INSTALL_PREFIX)$(bindir)/tic$x
++	$(LIBTOOL) $(INSTALL_PROGRAM) toe$x     $(INSTALL_PREFIX)$(bindir)/toe$x
++	$(LIBTOOL) $(INSTALL_PROGRAM) infocmp$x $(INSTALL_PREFIX)$(bindir)/infocmp$x
+ 	@echo "linking captoinfo to tic"
+ 	-@rm -f $(INSTALL_PREFIX)$(bindir)/captoinfo$x
+ 	(cd $(INSTALL_PREFIX)$(bindir) && $(LN_S) tic$x captoinfo$x)
+ 	@echo "linking infotocap to tic"
+ 	-@rm -f $(INSTALL_PREFIX)$(bindir)/infotocap$x
+ 	(cd $(INSTALL_PREFIX)$(bindir) && $(LN_S) tic$x infotocap$x)
+-	@echo "linking reset to tset"
+-	-@rm -f $(INSTALL_PREFIX)$(bindir)/reset$x
+-	(cd $(INSTALL_PREFIX)$(bindir) && $(LN_S) tset$x reset$x)
+ 
+ uninstall.progs:
+-	-@rm -f $(INSTALL_PREFIX)$(bindir)/tic$x
+-	-@rm -f $(INSTALL_PREFIX)$(bindir)/toe$x
+-	-@rm -f $(INSTALL_PREFIX)$(bindir)/infocmp$x
+-	-@rm -f $(INSTALL_PREFIX)$(bindir)/clear$x
+-	-@rm -f $(INSTALL_PREFIX)$(bindir)/tput$x
+-	-@rm -f $(INSTALL_PREFIX)$(bindir)/tset$x
++	-@$(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/tic$x
++	-@$(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/toe$x
++	-@$(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/infocmp$x
+ 	-@rm -f $(INSTALL_PREFIX)$(bindir)/captoinfo$x
+ 	-@rm -f $(INSTALL_PREFIX)$(bindir)/infotocap$x
+-	-@rm -f $(INSTALL_PREFIX)$(bindir)/reset$x
+ 
+ $(INSTALL_PREFIX)$(bindir) :
+ 	$(srcdir)/../mkinstalldirs $@
diff --git a/devel/ncurses/patches/patch-ah b/devel/ncurses/patches/patch-ah
index b00013d0c6f..59e1ee18b48 100644
--- a/devel/ncurses/patches/patch-ah
+++ b/devel/ncurses/patches/patch-ah
@@ -1,13 +1,42 @@
-$NetBSD: patch-ah,v 1.1 1999/07/06 07:51:05 jlam Exp $
+$NetBSD: patch-ah,v 1.2 2000/01/15 18:39:31 jlam Exp $
 
---- form/form.h.orig	Wed Feb 11 07:13:43 1998
-+++ form/form.h	Fri Jul  2 02:46:17 1999
-@@ -33,7 +33,7 @@
- #ifndef FORM_H
- #define FORM_H
+--- tack/Makefile.in.orig	Sat Sep 18 19:33:48 1999
++++ tack/Makefile.in	Sat Jan 15 11:25:18 2000
+@@ -26,11 +26,13 @@
+ libdir		= @libdir@
+ includedir	= @includedir@
+ datadir		= @datadir@
++mandir		= @mandir@
  
--#include <curses.h>
-+#include <ncurses.h>
- #include <eti.h>
+ ticdir		= $(datadir)/terminfo
  
- #ifdef __cplusplus
+ INSTALL		= @INSTALL@
+ INSTALL_PROGRAM	= @INSTALL_PROGRAM@
++INSTALL_DATA	= @INSTALL_DATA@
+ 
+ AWK		= @AWK@
+ LN_S		= @LN_S@
+@@ -51,7 +53,7 @@
+ CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
+ 
+ LD		= @LD@
+-LINK		= $(CC)
++LINK		= @LINK_PROGS@ $(CC)
+ LDFLAGS		= @EXTRA_LDFLAGS@ \
+ 		@PROG_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ @EXTRA_LIBS@
+ 
+@@ -84,10 +86,12 @@
+ uninstall.libs:
+ 
+ install.tack: $(PROGS) $(INSTALL_PREFIX)$(bindir)
+-	$(INSTALL_PROGRAM) tack$x    $(INSTALL_PREFIX)$(bindir)/tack$x
++	$(LIBTOOL) $(INSTALL_PROGRAM) tack$x    $(INSTALL_PREFIX)$(bindir)/tack$x
++	$(INSTALL_DATA) tack.1 $(INSTALL_PREFIX)$(mandir)/man1/tack.1
+ 
+ uninstall.tack:
+-	-@rm -f $(INSTALL_PREFIX)$(bindir)/tack$x
++	-@$(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/tack$x
++	-@rm -f $(INSTALL_PREFIX)$(mandir)/man1/tack.1
+ 
+ $(INSTALL_PREFIX)$(bindir) :
+ 	$(srcdir)/../mkinstalldirs $@
diff --git a/devel/ncurses/patches/patch-ai b/devel/ncurses/patches/patch-ai
deleted file mode 100644
index bf1c07bba0c..00000000000
--- a/devel/ncurses/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/07/06 07:51:06 jlam Exp $
-
---- include/unctrl.h.in.orig	Wed Feb 11 07:13:45 1998
-+++ include/unctrl.h.in	Fri Jul  2 02:48:21 1999
-@@ -51,7 +51,7 @@
- extern "C" {
- #endif
- 
--#include <curses.h>
-+#include <ncurses.h>
- 
- #undef unctrl
- extern NCURSES_CONST char *unctrl(chtype);
diff --git a/devel/ncurses/patches/patch-aj b/devel/ncurses/patches/patch-aj
deleted file mode 100644
index 46ffbe25913..00000000000
--- a/devel/ncurses/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 1999/07/06 07:51:06 jlam Exp $
-
---- menu/menu.h.orig	Wed Feb 11 07:13:50 1998
-+++ menu/menu.h	Fri Jul  2 02:46:52 1999
-@@ -33,7 +33,7 @@
- #ifndef ETI_MENU
- #define ETI_MENU
- 
--#include <curses.h>
-+#include <ncurses.h>
- #include <eti.h>
- 
- #ifdef __cplusplus
diff --git a/devel/ncurses/patches/patch-ak b/devel/ncurses/patches/patch-ak
deleted file mode 100644
index b7390ffafd4..00000000000
--- a/devel/ncurses/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 1999/07/06 07:51:06 jlam Exp $
-
---- panel/panel.h.orig	Wed Feb 11 07:14:01 1998
-+++ panel/panel.h	Fri Jul  2 02:47:22 1999
-@@ -36,7 +36,7 @@
- #ifndef _PANEL_H
- #define _PANEL_H
- 
--#include <curses.h>
-+#include <ncurses.h>
- 
- typedef struct panel
- {
diff --git a/devel/ncurses/patches/patch-al b/devel/ncurses/patches/patch-al
deleted file mode 100644
index c9595935eee..00000000000
--- a/devel/ncurses/patches/patch-al
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-al,v 1.1 1999/09/24 00:39:13 jlam Exp $
-
---- c++/Makefile.in.orig	Mon Mar  2 07:00:25 1998
-+++ c++/Makefile.in	Thu Sep 23 18:25:59 1999
-@@ -73,10 +73,9 @@
- LINK		= $(CXX)
- 
- LIBROOT	= ncurses++
--LIBNAME	= ../lib/lib$(LIBROOT).a
-+LIBNAME	= lib$(LIBROOT).la
- 
--LDFLAGS		= @EXTRA_LDFLAGS@ -L../lib -L$(libdir) \
--	-l$(LIBROOT) \
-+LDFLAGS		= @EXTRA_LDFLAGS@ ../lib/$(LIBNAME) \
- 	@TEST_ARGS@ @LDFLAGS@ \
- 	@LD_MODEL@ @LIBS@ @EXTRA_LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
- 
-@@ -90,7 +89,7 @@
- AUTO_SRC	= \
- 		etip.h
- 
--all:		$(AUTO_SRC) $(LIBNAME) demo
-+all:		$(AUTO_SRC) ../lib/$(LIBNAME) demo
- 
- sources :	$(AUTO_SRC)
- 
-@@ -106,9 +105,8 @@
- 	$(MODEL)/cursesapp.o \
- 	$(MODEL)/cursesmain.o
- 
--$(LIBNAME) : $(LIB_OBJS)
--	$(AR) $(AR_OPTS) $@ $?
--	$(RANLIB) $@
-+../lib/$(LIBNAME) : $(LIB_OBJS)
-+	cd ../lib && $(LIBTOOL) --cplusplus --mode=link $(LINK) -o $(LIBNAME) $(LIB_OBJS:.o=.lo) -rpath $(INSTALL_PREFIX)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR)
- 
- OBJS_DEMO = $(MODEL)/demo.o
- 
-@@ -116,9 +114,9 @@
- 	$(cursesf_h) $(cursesm_h) $(cursesapp_h)
- 
- demo:	$(OBJS_DEMO) \
--	$(LIBNAME)  \
-+	../lib/$(LIBNAME)  \
- 	@TEST_DEPS@
--	@ECHO_LINK@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
-+	@ECHO_LINK@ $(LIBTOOL) --cplusplus --mode=link $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
- 
- etip.h:	$(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
- 	cp $(srcdir)/etip.h.in $@
-@@ -128,8 +126,9 @@
- 	$(srcdir)/../mkinstalldirs $@
- 
- install \
--install.libs:: $(LIBNAME) $(INSTALL_PREFIX)$(libdir)
--	$(INSTALL) $(LIBNAME) $(INSTALL_PREFIX)$(libdir)/$(LIBNAME)
-+install.libs:: ../lib/$(LIBNAME) $(INSTALL_PREFIX)$(libdir)
-+	cd ../lib && $(LIBTOOL) --cplusplus --mode=install $(INSTALL_DATA) $(LIBNAME) $(INSTALL_PREFIX)$(libdir)
-+
- 
- uninstall \
- uninstall.libs::
-@@ -139,7 +138,7 @@
- 	-rm -f core tags TAGS *~ *.ln *.atac trace
- 
- clean :: mostlyclean
--	-rm -f demo $(AUTO_SRC) $(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO)
-+	-rm -f demo $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO)
- 
- distclean :: clean
- 	-rm -f Makefile
diff --git a/devel/ncurses/patches/patch-am b/devel/ncurses/patches/patch-am
deleted file mode 100644
index f159e15c5c7..00000000000
--- a/devel/ncurses/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 1999/09/24 00:39:13 jlam Exp $
-
---- c++/cursesw.h.orig	Tue Jan 20 11:53:50 1998
-+++ c++/cursesw.h	Thu Sep 23 12:00:14 1999
-@@ -18,7 +18,7 @@
- #endif
- 
- extern "C" {
--#  include   <curses.h>
-+#  include   <ncurses.h>
- }
- 
- /* SCO 3.2v4 curses.h includes term.h, which defines lines as a macro.
diff --git a/devel/ncurses/pkg/DESCR b/devel/ncurses/pkg/DESCR
index 7a9752c51d2..729741b871d 100644
--- a/devel/ncurses/pkg/DESCR
+++ b/devel/ncurses/pkg/DESCR
@@ -1,5 +1,5 @@
-       The curses library routines give the user a terminal-inde-
-       pendent method of updating character screens with  reason-
-       able  optimization.  This implementation is ``new curses''
-       (ncurses) and is the approved replacement for 4.4BSD clas-
-       sic curses, which is being discontinued.
+The ncurses (new curses) library is a free software emulation of
+curses in System V Release 4.0, and more. It uses terminfo format,
+supports pads and color and multiple highlights and forms characters
+and function-key mapping, and has all the other SYSV-curses
+enhancements over BSD curses.
diff --git a/devel/ncurses/pkg/PLIST b/devel/ncurses/pkg/PLIST
index 209455cb473..a068b8efc87 100644
--- a/devel/ncurses/pkg/PLIST
+++ b/devel/ncurses/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.10 1999/09/24 00:39:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2000/01/15 18:39:36 jlam Exp $
 bin/captoinfo
 bin/infocmp
 bin/infotocap
+bin/tack
 bin/tic
 bin/toe
 include/cursesapp.h
@@ -14,23 +15,24 @@ include/eti.h
 include/etip.h
 include/form.h
 include/menu.h
-include/panel.h
 include/ncurses.h
+include/panel.h
 include/term.h
 include/termcap.h
 include/unctrl.h
 lib/libform.a
-lib/libform.so.4.2
+lib/libform.so.5.0
 lib/libmenu.a
-lib/libmenu.so.4.2
+lib/libmenu.so.5.0
 lib/libncurses++.a
-lib/libncurses++.so.4.2
+lib/libncurses++.so.5.0
 lib/libncurses.a
-lib/libncurses.so.4.2
+lib/libncurses.so.5.0
 lib/libpanel.a
-lib/libpanel.so.4.2
+lib/libpanel.so.5.0
 man/man1/captoinfo.1
 man/man1/infocmp.1
+man/man1/tack.1
 man/man1/tic.1
 man/man1/toe.1
 man/man3/curs_addch.3
@@ -64,7 +66,7 @@ man/man3/curs_print.3
 man/man3/curs_printw.3
 man/man3/curs_refresh.3
 man/man3/curs_scanw.3
-man/man3/curs_scr_dmp.3
+man/man3/curs_scr_dump.3
 man/man3/curs_scroll.3
 man/man3/curs_slk.3
 man/man3/curs_termattrs.3
@@ -98,6 +100,7 @@ man/man3/form_post.3
 man/man3/form_requestname.3
 man/man3/form_userptr.3
 man/man3/form_win.3
+man/man3/keybound.3
 man/man3/keyok.3
 man/man3/menu.3
 man/man3/menu_attribs.3
@@ -150,8 +153,13 @@ share/terminfo/5/5410-w
 share/terminfo/5/5620
 share/terminfo/5/5630-24
 share/terminfo/5/5630DMD-24
+share/terminfo/6/6053
+share/terminfo/6/6053-dg
+share/terminfo/6/605x
+share/terminfo/6/605x-dg
 share/terminfo/6/630-lm
 share/terminfo/6/630MTG-24
+share/terminfo/7/70092
 share/terminfo/7/730MTG-24
 share/terminfo/7/730MTG-41
 share/terminfo/7/730MTG-41r
@@ -160,6 +168,8 @@ share/terminfo/7/730MTGr-24
 share/terminfo/8/8510
 share/terminfo/9/955-hb
 share/terminfo/9/955-w
+share/terminfo/N/NCR260VT300WPP
+share/terminfo/N/NCRVT100WPP
 share/terminfo/P/P12
 share/terminfo/P/P12-M
 share/terminfo/P/P12-M-W
@@ -255,6 +265,7 @@ share/terminfo/a/adm42
 share/terminfo/a/adm42-ns
 share/terminfo/a/adm5
 share/terminfo/a/aepro
+share/terminfo/a/aixterm
 share/terminfo/a/aixterm-m
 share/terminfo/a/aixterm-m-old
 share/terminfo/a/aj
@@ -284,6 +295,7 @@ share/terminfo/a/altos7pc
 share/terminfo/a/ambas
 share/terminfo/a/ambassador
 share/terminfo/a/amiga
+share/terminfo/a/amiga-8bit
 share/terminfo/a/amiga-h
 share/terminfo/a/amp219
 share/terminfo/a/amp219w
@@ -351,6 +363,10 @@ share/terminfo/a/appleII
 share/terminfo/a/appleIIc
 share/terminfo/a/appleIIe
 share/terminfo/a/appleIIgs
+share/terminfo/a/arm100
+share/terminfo/a/arm100-am
+share/terminfo/a/arm100-w
+share/terminfo/a/arm100-wam
 share/terminfo/a/at386
 share/terminfo/a/atari
 share/terminfo/a/att2300
@@ -430,6 +446,7 @@ share/terminfo/a/att620-w
 share/terminfo/a/att630
 share/terminfo/a/att630-24
 share/terminfo/a/att6386
+share/terminfo/a/att700
 share/terminfo/a/att730
 share/terminfo/a/att730-24
 share/terminfo/a/att730-41
@@ -483,8 +500,10 @@ share/terminfo/b/bh4
 share/terminfo/b/bitgraph
 share/terminfo/b/blit
 share/terminfo/b/bobcat
-share/terminfo/b/bsdos
-share/terminfo/b/bsdos-bold
+share/terminfo/b/bsdos-pc
+share/terminfo/b/bsdos-pc-nobold
+share/terminfo/b/bsdos-ppc
+share/terminfo/b/bsdos-sparc
 share/terminfo/c/c100
 share/terminfo/c/c100-1p
 share/terminfo/c/c100-4p
@@ -595,6 +614,8 @@ share/terminfo/c/contel321
 share/terminfo/c/cops
 share/terminfo/c/cops-10
 share/terminfo/c/cops10
+share/terminfo/c/crt
+share/terminfo/c/crt-vt220
 share/terminfo/c/cs10
 share/terminfo/c/cs10-w
 share/terminfo/c/ct82
@@ -604,7 +625,156 @@ share/terminfo/c/cx
 share/terminfo/c/cx100
 share/terminfo/c/cyb110
 share/terminfo/c/cyb83
+share/terminfo/c/cygwin
 share/terminfo/d/d132
+share/terminfo/d/d2
+share/terminfo/d/d2-dg
+share/terminfo/d/d200
+share/terminfo/d/d200-dg
+share/terminfo/d/d210
+share/terminfo/d/d210-dg
+share/terminfo/d/d211
+share/terminfo/d/d211-7b
+share/terminfo/d/d211-dg
+share/terminfo/d/d214
+share/terminfo/d/d214-dg
+share/terminfo/d/d215
+share/terminfo/d/d215-7b
+share/terminfo/d/d215-dg
+share/terminfo/d/d216+
+share/terminfo/d/d216+25
+share/terminfo/d/d216+dg
+share/terminfo/d/d216-dg
+share/terminfo/d/d216-unix
+share/terminfo/d/d216-unix-25
+share/terminfo/d/d216e+
+share/terminfo/d/d216e+dg
+share/terminfo/d/d216e-dg
+share/terminfo/d/d216e-unix
+share/terminfo/d/d217-dg
+share/terminfo/d/d217-unix
+share/terminfo/d/d217-unix-25
+share/terminfo/d/d220
+share/terminfo/d/d220-7b
+share/terminfo/d/d220-dg
+share/terminfo/d/d230
+share/terminfo/d/d230-dg
+share/terminfo/d/d230c
+share/terminfo/d/d230c-dg
+share/terminfo/d/d400
+share/terminfo/d/d400-dg
+share/terminfo/d/d410
+share/terminfo/d/d410-7b
+share/terminfo/d/d410-7b-w
+share/terminfo/d/d410-dg
+share/terminfo/d/d410-w
+share/terminfo/d/d411
+share/terminfo/d/d411-7b
+share/terminfo/d/d411-7b-w
+share/terminfo/d/d411-dg
+share/terminfo/d/d411-w
+share/terminfo/d/d412+
+share/terminfo/d/d412+25
+share/terminfo/d/d412+dg
+share/terminfo/d/d412+s
+share/terminfo/d/d412+sr
+share/terminfo/d/d412+w
+share/terminfo/d/d412-dg
+share/terminfo/d/d412-unix
+share/terminfo/d/d412-unix-25
+share/terminfo/d/d412-unix-s
+share/terminfo/d/d412-unix-sr
+share/terminfo/d/d412-unix-w
+share/terminfo/d/d413-dg
+share/terminfo/d/d413-unix
+share/terminfo/d/d413-unix-25
+share/terminfo/d/d413-unix-s
+share/terminfo/d/d413-unix-sr
+share/terminfo/d/d413-unix-w
+share/terminfo/d/d414-unix
+share/terminfo/d/d414-unix-25
+share/terminfo/d/d414-unix-s
+share/terminfo/d/d414-unix-sr
+share/terminfo/d/d414-unix-w
+share/terminfo/d/d430-dg
+share/terminfo/d/d430-dg-ccc
+share/terminfo/d/d430-unix
+share/terminfo/d/d430-unix-25
+share/terminfo/d/d430-unix-25-ccc
+share/terminfo/d/d430-unix-ccc
+share/terminfo/d/d430-unix-s
+share/terminfo/d/d430-unix-s-ccc
+share/terminfo/d/d430-unix-sr
+share/terminfo/d/d430-unix-sr-ccc
+share/terminfo/d/d430-unix-w
+share/terminfo/d/d430-unix-w-ccc
+share/terminfo/d/d430c-dg
+share/terminfo/d/d430c-dg-ccc
+share/terminfo/d/d430c-unix
+share/terminfo/d/d430c-unix-25
+share/terminfo/d/d430c-unix-25-ccc
+share/terminfo/d/d430c-unix-ccc
+share/terminfo/d/d430c-unix-s
+share/terminfo/d/d430c-unix-s-ccc
+share/terminfo/d/d430c-unix-sr
+share/terminfo/d/d430c-unix-sr-ccc
+share/terminfo/d/d430c-unix-w
+share/terminfo/d/d430c-unix-w-ccc
+share/terminfo/d/d450
+share/terminfo/d/d450-dg
+share/terminfo/d/d460
+share/terminfo/d/d460-7b
+share/terminfo/d/d460-7b-w
+share/terminfo/d/d460-dg
+share/terminfo/d/d460-w
+share/terminfo/d/d461
+share/terminfo/d/d461-7b
+share/terminfo/d/d461-7b-w
+share/terminfo/d/d461-dg
+share/terminfo/d/d461-w
+share/terminfo/d/d462+
+share/terminfo/d/d462+25
+share/terminfo/d/d462+dg
+share/terminfo/d/d462+s
+share/terminfo/d/d462+sr
+share/terminfo/d/d462+w
+share/terminfo/d/d462-dg
+share/terminfo/d/d462-unix
+share/terminfo/d/d462-unix-25
+share/terminfo/d/d462-unix-s
+share/terminfo/d/d462-unix-sr
+share/terminfo/d/d462-unix-w
+share/terminfo/d/d462e-dg
+share/terminfo/d/d463-dg
+share/terminfo/d/d463-unix
+share/terminfo/d/d463-unix-25
+share/terminfo/d/d463-unix-s
+share/terminfo/d/d463-unix-sr
+share/terminfo/d/d463-unix-w
+share/terminfo/d/d464-unix
+share/terminfo/d/d464-unix-25
+share/terminfo/d/d464-unix-s
+share/terminfo/d/d464-unix-sr
+share/terminfo/d/d464-unix-w
+share/terminfo/d/d470
+share/terminfo/d/d470-7b
+share/terminfo/d/d470-dg
+share/terminfo/d/d470c
+share/terminfo/d/d470c-7b
+share/terminfo/d/d470c-dg
+share/terminfo/d/d555
+share/terminfo/d/d555-7b
+share/terminfo/d/d555-7b-w
+share/terminfo/d/d555-dg
+share/terminfo/d/d555-w
+share/terminfo/d/d577
+share/terminfo/d/d577-7b
+share/terminfo/d/d577-7b-w
+share/terminfo/d/d577-dg
+share/terminfo/d/d577-w
+share/terminfo/d/d578
+share/terminfo/d/d578-7b
+share/terminfo/d/d578-dg
 share/terminfo/d/d80
 share/terminfo/d/d800
 share/terminfo/d/datagraphix
@@ -622,7 +792,12 @@ share/terminfo/d/dec-vt400
 share/terminfo/d/decpro
 share/terminfo/d/decwriter
 share/terminfo/d/delta
+share/terminfo/d/dg+ccc
+share/terminfo/d/dg+color
+share/terminfo/d/dg+color8
+share/terminfo/d/dg+fixed
 share/terminfo/d/dg-ansi
+share/terminfo/d/dg-generic
 share/terminfo/d/dg100
 share/terminfo/d/dg200
 share/terminfo/d/dg210
@@ -630,7 +805,17 @@ share/terminfo/d/dg211
 share/terminfo/d/dg450
 share/terminfo/d/dg460-ansi
 share/terminfo/d/dg6053
+share/terminfo/d/dg6053-old
+share/terminfo/d/dg605x
 share/terminfo/d/dg6134
+share/terminfo/d/dgkeys+11
+share/terminfo/d/dgkeys+15
+share/terminfo/d/dgkeys+7b
+share/terminfo/d/dgkeys+8b
+share/terminfo/d/dgmode+color
+share/terminfo/d/dgmode+color8
+share/terminfo/d/dgunix+ccc
+share/terminfo/d/dgunix+fixed
 share/terminfo/d/diablo
 share/terminfo/d/diablo-lm
 share/terminfo/d/diablo1620
@@ -809,6 +994,7 @@ share/terminfo/h/heathkit
 share/terminfo/h/heathkit-a
 share/terminfo/h/hft
 share/terminfo/h/hft-c
+share/terminfo/h/hft-c-old
 share/terminfo/h/hirez100
 share/terminfo/h/hirez100-w
 share/terminfo/h/hmod1
@@ -915,7 +1101,6 @@ share/terminfo/h/hz1552-rv
 share/terminfo/h/hz2000
 share/terminfo/i/i100
 share/terminfo/i/i3101
-share/terminfo/i/i3151
 share/terminfo/i/i3164
 share/terminfo/i/i400
 share/terminfo/i/ibcs2
@@ -925,6 +1110,8 @@ share/terminfo/i/ibm-system1
 share/terminfo/i/ibm3101
 share/terminfo/i/ibm3151
 share/terminfo/i/ibm3161
+share/terminfo/i/ibm3161-C
+share/terminfo/i/ibm3162
 share/terminfo/i/ibm3163
 share/terminfo/i/ibm3164
 share/terminfo/i/ibm327x
@@ -935,13 +1122,18 @@ share/terminfo/i/ibm5151
 share/terminfo/i/ibm5154
 share/terminfo/i/ibm5154-c
 share/terminfo/i/ibm6153
+share/terminfo/i/ibm6153-40
+share/terminfo/i/ibm6153-90
 share/terminfo/i/ibm6154
 share/terminfo/i/ibm6154-c
 share/terminfo/i/ibm6155
+share/terminfo/i/ibm8503
+share/terminfo/i/ibm8507
 share/terminfo/i/ibm8512
 share/terminfo/i/ibm8513
 share/terminfo/i/ibm8514
 share/terminfo/i/ibm8514-c
+share/terminfo/i/ibm8604
 share/terminfo/i/ibmaed
 share/terminfo/i/ibmapa16
 share/terminfo/i/ibmapa8
@@ -950,7 +1142,6 @@ share/terminfo/i/ibmapa8c-c
 share/terminfo/i/ibmega
 share/terminfo/i/ibmega-c
 share/terminfo/i/ibmmono
-share/terminfo/i/ibmmpel
 share/terminfo/i/ibmmpel-c
 share/terminfo/i/ibmpc
 share/terminfo/i/ibmpc3
@@ -960,6 +1151,9 @@ share/terminfo/i/ibmpcx
 share/terminfo/i/ibmvga
 share/terminfo/i/ibmvga-c
 share/terminfo/i/ibmx
+share/terminfo/i/icl6402
+share/terminfo/i/icl6404
+share/terminfo/i/icl6404-w
 share/terminfo/i/ifmr
 share/terminfo/i/ims-ansi
 share/terminfo/i/ims950
@@ -978,13 +1172,18 @@ share/terminfo/i/iq120
 share/terminfo/i/iq140
 share/terminfo/i/iris-ansi
 share/terminfo/i/iris-ansi-ap
+share/terminfo/i/iris-ansi-net
 share/terminfo/i/iris-color
 share/terminfo/i/iris40
+share/terminfo/j/jaixterm
 share/terminfo/j/jaixterm-m
 share/terminfo/j/jerq
 share/terminfo/k/k45
 share/terminfo/k/kaypro
 share/terminfo/k/kaypro2
+share/terminfo/k/kds6402
+share/terminfo/k/kds7372
+share/terminfo/k/kds7372-w
 share/terminfo/k/kermit
 share/terminfo/k/kermit-am
 share/terminfo/k/klone+acs
@@ -1003,6 +1202,7 @@ share/terminfo/l/linux-c
 share/terminfo/l/linux-c-nc
 share/terminfo/l/linux-koi8
 share/terminfo/l/linux-koi8r
+share/terminfo/l/linux-lat
 share/terminfo/l/linux-m
 share/terminfo/l/linux-nic
 share/terminfo/l/lisa
@@ -1017,6 +1217,8 @@ share/terminfo/l/luna68k
 share/terminfo/m/m2-nam
 share/terminfo/m/mac
 share/terminfo/m/mac-w
+share/terminfo/m/mach
+share/terminfo/m/mach-bold
 share/terminfo/m/macintosh
 share/terminfo/m/macterminal-w
 share/terminfo/m/mai
@@ -1051,6 +1253,9 @@ share/terminfo/m/mimeii
 share/terminfo/m/minitel
 share/terminfo/m/minitel-2
 share/terminfo/m/minitel-2-nam
+share/terminfo/m/minitel1
+share/terminfo/m/minitel1b
+share/terminfo/m/minitel1b-80
 share/terminfo/m/minix
 share/terminfo/m/minix-old
 share/terminfo/m/minix-old-am
@@ -1062,6 +1267,7 @@ share/terminfo/m/modgraph
 share/terminfo/m/modgraph2
 share/terminfo/m/modgraph48
 share/terminfo/m/mono-emx
+share/terminfo/m/ms-vt100
 share/terminfo/m/msk227
 share/terminfo/m/msk22714
 share/terminfo/m/msk227am
@@ -1075,10 +1281,64 @@ share/terminfo/n/nansi.sys
 share/terminfo/n/nansi.sysk
 share/terminfo/n/nansisys
 share/terminfo/n/nansisysk
+share/terminfo/n/ncr160vppp
+share/terminfo/n/ncr160vpwpp
+share/terminfo/n/ncr160vt100an
+share/terminfo/n/ncr160vt100pp
+share/terminfo/n/ncr160vt100wan
+share/terminfo/n/ncr160vt100wpp
+share/terminfo/n/ncr160vt200an
+share/terminfo/n/ncr160vt200pp
+share/terminfo/n/ncr160vt200wan
+share/terminfo/n/ncr160vt200wpp
+share/terminfo/n/ncr160vt300an
+share/terminfo/n/ncr160vt300pp
+share/terminfo/n/ncr160vt300wan
+share/terminfo/n/ncr160vt300wpp
+share/terminfo/n/ncr160wy50+pp
+share/terminfo/n/ncr160wy50+wpp
+share/terminfo/n/ncr160wy60pp
+share/terminfo/n/ncr160wy60wpp
+share/terminfo/n/ncr260intan
+share/terminfo/n/ncr260intpp
+share/terminfo/n/ncr260intwan
+share/terminfo/n/ncr260intwpp
+share/terminfo/n/ncr260vppp
+share/terminfo/n/ncr260vpwpp
+share/terminfo/n/ncr260vt100an
+share/terminfo/n/ncr260vt100pp
+share/terminfo/n/ncr260vt100wan
+share/terminfo/n/ncr260vt100wpp
+share/terminfo/n/ncr260vt200an
+share/terminfo/n/ncr260vt200pp
+share/terminfo/n/ncr260vt200wan
+share/terminfo/n/ncr260vt200wpp
+share/terminfo/n/ncr260vt300an
+share/terminfo/n/ncr260vt300pp
+share/terminfo/n/ncr260vt300wan
+share/terminfo/n/ncr260vt300wpp
+share/terminfo/n/ncr260wy325pp
+share/terminfo/n/ncr260wy325wpp
+share/terminfo/n/ncr260wy350pp
+share/terminfo/n/ncr260wy350wpp
+share/terminfo/n/ncr260wy50+pp
+share/terminfo/n/ncr260wy50+wpp
+share/terminfo/n/ncr260wy60pp
+share/terminfo/n/ncr260wy60wpp
 share/terminfo/n/ncr7900
 share/terminfo/n/ncr7900i
 share/terminfo/n/ncr7900iv
 share/terminfo/n/ncr7901
+share/terminfo/n/ncrvt100an
+share/terminfo/n/ncrvt100pp
+share/terminfo/n/ncrvt100wan
+share/terminfo/n/ncrvt100wpp
+share/terminfo/n/ncsa
+share/terminfo/n/ncsa-m
+share/terminfo/n/ncsa-m-ns
+share/terminfo/n/ncsa-ns
+share/terminfo/n/ncsa-vt220
+share/terminfo/n/ncsa-vt220-8
 share/terminfo/n/nec
 share/terminfo/n/nec5520
 share/terminfo/n/newhp
@@ -1138,6 +1398,7 @@ share/terminfo/n/nwp517-w
 share/terminfo/n/nwp518
 share/terminfo/n/nwp518-a
 share/terminfo/n/nwp518-o
+share/terminfo/n/nxterm
 share/terminfo/o/o31
 share/terminfo/o/o4112-nd
 share/terminfo/o/o85h
@@ -1145,6 +1406,7 @@ share/terminfo/o/oabm85h
 share/terminfo/o/oblit
 share/terminfo/o/oc100
 share/terminfo/o/oconcept
+share/terminfo/o/ofcons
 share/terminfo/o/ojerq
 share/terminfo/o/oldibmpc3
 share/terminfo/o/oldpc3
@@ -1281,6 +1543,7 @@ share/terminfo/q/qdcons
 share/terminfo/q/qdss
 share/terminfo/q/qnx
 share/terminfo/q/qnx4
+share/terminfo/q/qnxt2
 share/terminfo/q/qume
 share/terminfo/q/qume5
 share/terminfo/q/qvt101
@@ -1311,6 +1574,8 @@ share/terminfo/r/rbcomm
 share/terminfo/r/rbcomm-nam
 share/terminfo/r/rbcomm-w
 share/terminfo/r/rca
+share/terminfo/r/rcons
+share/terminfo/r/rcons-color
 share/terminfo/r/rebus3180
 share/terminfo/r/regent
 share/terminfo/r/regent100
@@ -1325,7 +1590,6 @@ share/terminfo/r/rt6221-w
 share/terminfo/r/rtpc
 share/terminfo/r/rxvt
 share/terminfo/r/rxvt-basic
-share/terminfo/s/s
 share/terminfo/s/s4
 share/terminfo/s/sb1
 share/terminfo/s/sb2
@@ -1432,6 +1696,7 @@ share/terminfo/t/tek4207-s
 share/terminfo/t/tek4404
 share/terminfo/t/teleray
 share/terminfo/t/teletec
+share/terminfo/t/teraterm
 share/terminfo/t/terminet
 share/terminfo/t/terminet1200
 share/terminfo/t/terminet300
@@ -1654,7 +1919,11 @@ share/terminfo/v/vt61.5
 share/terminfo/w/wren
 share/terminfo/w/wrenw
 share/terminfo/w/wsiris
+share/terminfo/w/wsvt25
+share/terminfo/w/wsvt25m
 share/terminfo/w/wy-75ap
+share/terminfo/w/wy-99fgt
+share/terminfo/w/wy-99fgta
 share/terminfo/w/wy100
 share/terminfo/w/wy100q
 share/terminfo/w/wy120
@@ -1752,6 +2021,8 @@ share/terminfo/w/wy60-42
 share/terminfo/w/wy60-42-w
 share/terminfo/w/wy60-43
 share/terminfo/w/wy60-43-w
+share/terminfo/w/wy60-AT
+share/terminfo/w/wy60-PC
 share/terminfo/w/wy60-vb
 share/terminfo/w/wy60-w
 share/terminfo/w/wy60-w-vb
@@ -1766,6 +2037,12 @@ share/terminfo/w/wy85
 share/terminfo/w/wy85-vb
 share/terminfo/w/wy85-w
 share/terminfo/w/wy85-wvb
+share/terminfo/w/wy99-ansi
+share/terminfo/w/wy99a-ansi
+share/terminfo/w/wy99f
+share/terminfo/w/wy99fa
+share/terminfo/w/wy99fgt
+share/terminfo/w/wy99fgta
 share/terminfo/w/wy99gt
 share/terminfo/w/wy99gt-25
 share/terminfo/w/wy99gt-25-w
@@ -1853,6 +2130,8 @@ share/terminfo/w/wyse60-42
 share/terminfo/w/wyse60-42-w
 share/terminfo/w/wyse60-43
 share/terminfo/w/wyse60-43-w
+share/terminfo/w/wyse60-AT
+share/terminfo/w/wyse60-PC
 share/terminfo/w/wyse60-vb
 share/terminfo/w/wyse60-w
 share/terminfo/w/wyse60-wvb
@@ -1891,8 +2170,11 @@ share/terminfo/x/xterm
 share/terminfo/x/xterm+sl
 share/terminfo/x/xterm+sl-twm
 share/terminfo/x/xterm-16color
+share/terminfo/x/xterm-24
 share/terminfo/x/xterm-8bit
 share/terminfo/x/xterm-bold
+share/terminfo/x/xterm-color
+share/terminfo/x/xterm-new
 share/terminfo/x/xterm-nic
 share/terminfo/x/xterm-old
 share/terminfo/x/xterm-pcolor
@@ -1901,9 +2183,13 @@ share/terminfo/x/xterm-r6
 share/terminfo/x/xterm-sun
 share/terminfo/x/xterm-xf86-v32
 share/terminfo/x/xterm-xf86-v33
+share/terminfo/x/xterm-xf86-v333
 share/terminfo/x/xterm-xf86-v40
+share/terminfo/x/xterm-xfree86
 share/terminfo/x/xterm-xi
 share/terminfo/x/xterm1
+share/terminfo/x/xtermc
+share/terminfo/x/xtermm
 share/terminfo/x/xterms
 share/terminfo/x/xterms-sun
 share/terminfo/x/xwsh
@@ -1966,6 +2252,7 @@ share/terminfo/z/ztx11
 @dirrm share/terminfo/a
 @dirrm share/terminfo/X
 @dirrm share/terminfo/P
+@dirrm share/terminfo/N
 @dirrm share/terminfo/9
 @dirrm share/terminfo/8
 @dirrm share/terminfo/7