Changes 5.4:

* Interface changes
* New features and improvements: library, programs
* Major bug fixes
(See ANNOUNCE for details)

5 files changed, 182 insertions, 45 deletions

diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index cd372572cc2..4044b588559 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.56 2004/02/02 13:02:49 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2004/03/03 13:36:09 adam Exp $
 
-DISTNAME=		ncurses-${NC_VERS}
-NC_VERS=		5.3
-PKGREVISION=		2
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNU:=ncurses/} \
-			ftp://dickey.his.com/ncurses/ \
-			ftp://dickey.his.com/ncurses/${NC_VERS}/
+DISTNAME=	ncurses-${NC_VERS}
+NC_VERS=	5.4
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNU:=ncurses/} \
+		ftp://dickey.his.com/ncurses/ \
+		ftp://dickey.his.com/ncurses/${NC_VERS}/
 
-MAINTAINER=		jlam@NetBSD.org
-HOMEPAGE=		http://dickey.his.com/ncurses/ncurses.html
-COMMENT=		CRT screen handling and optimization package
+MAINTAINER=	jlam@NetBSD.org
+HOMEPAGE=	http://dickey.his.com/ncurses/ncurses.html
+COMMENT=	CRT screen handling and optimization package
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/devel/ncurses/PLIST b/devel/ncurses/PLIST
index 201e7a193e2..fe9c693963e 100644
--- a/devel/ncurses/PLIST
+++ b/devel/ncurses/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/20 08:49:27 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/03 13:36:09 adam Exp $
 bin/captoinfo
 bin/clear
 bin/infocmp
@@ -29,27 +29,27 @@ lib/libform.a
 lib/libform.la
 lib/libform.so
 lib/libform.so.5
-lib/libform.so.5.3
+lib/libform.so.5.4
 lib/libmenu.a
 lib/libmenu.la
 lib/libmenu.so
 lib/libmenu.so.5
-lib/libmenu.so.5.3
+lib/libmenu.so.5.4
 lib/libncurses++.a
 lib/libncurses++.la
 lib/libncurses++.so
 lib/libncurses++.so.5
-lib/libncurses++.so.5.3
+lib/libncurses++.so.5.4
 lib/libncurses.a
 lib/libncurses.la
 lib/libncurses.so
 lib/libncurses.so.5
-lib/libncurses.so.5.3
+lib/libncurses.so.5.4
 lib/libpanel.a
 lib/libpanel.la
 lib/libpanel.so
 lib/libpanel.so.5
-lib/libpanel.so.5.3
+lib/libpanel.so.5.4
 man/man1/captoinfo.1
 man/man1/clear.1
 man/man1/infocmp.1
@@ -248,23 +248,15 @@ man/man3/free_item.3
 man/man3/free_menu.3
 man/man3/get_wch.3
 man/man3/get_wstr.3
-man/man3/getbegx.3
-man/man3/getbegy.3
 man/man3/getbegyx.3
 man/man3/getbkgd.3
 man/man3/getbkgrnd.3
 man/man3/getcchar.3
 man/man3/getch.3
-man/man3/getcurx.3
-man/man3/getcury.3
-man/man3/getmaxx.3
-man/man3/getmaxy.3
 man/man3/getmaxyx.3
 man/man3/getmouse.3
 man/man3/getn_wstr.3
 man/man3/getnstr.3
-man/man3/getparx.3
-man/man3/getpary.3
 man/man3/getparyx.3
 man/man3/getstr.3
 man/man3/getsyx.3
@@ -317,6 +309,7 @@ man/man3/item_opts_on.3
 man/man3/item_userptr.3
 man/man3/item_value.3
 man/man3/item_visible.3
+man/man3/key_defined.3
 man/man3/key_name.3
 man/man3/keybound.3
 man/man3/keyname.3
@@ -1263,6 +1256,7 @@ ${TERMINFODIR}/c/cyb110
 ${TERMINFODIR}/c/cyb83
 ${TERMINFODIR}/c/cygwin
 ${TERMINFODIR}/c/cygwinB19
+${TERMINFODIR}/c/cygwinDBG
 ${TERMINFODIR}/d/d132
 ${TERMINFODIR}/d/d2
 ${TERMINFODIR}/d/d2-dg
@@ -1458,6 +1452,7 @@ ${TERMINFODIR}/d/dec-vt220
 ${TERMINFODIR}/d/dec-vt330
 ${TERMINFODIR}/d/dec-vt340
 ${TERMINFODIR}/d/dec-vt400
+${TERMINFODIR}/d/decansi
 ${TERMINFODIR}/d/decpro
 ${TERMINFODIR}/d/decwriter
 ${TERMINFODIR}/d/delta
@@ -1501,6 +1496,9 @@ ${TERMINFODIR}/d/diablo630
 ${TERMINFODIR}/d/dialogue
 ${TERMINFODIR}/d/dialogue80
 ${TERMINFODIR}/d/digilog
+${TERMINFODIR}/d/djgpp
+${TERMINFODIR}/d/djgpp203
+${TERMINFODIR}/d/djgpp204
 ${TERMINFODIR}/d/dku7003
 ${TERMINFODIR}/d/dku7003-dumb
 ${TERMINFODIR}/d/dku7102
@@ -1554,6 +1552,7 @@ ${TERMINFODIR}/e/elks-glasstty
 ${TERMINFODIR}/e/elks-vt52
 ${TERMINFODIR}/e/emots
 ${TERMINFODIR}/e/emu
+${TERMINFODIR}/e/emx-base
 ${TERMINFODIR}/e/env230
 ${TERMINFODIR}/e/envision230
 ${TERMINFODIR}/e/ep40
@@ -1606,6 +1605,8 @@ ${TERMINFODIR}/g/glasstty
 ${TERMINFODIR}/g/gnome
 ${TERMINFODIR}/g/gnome-rh62
 ${TERMINFODIR}/g/gnome-rh72
+${TERMINFODIR}/g/gnome-rh80
+${TERMINFODIR}/g/gnome-rh90
 ${TERMINFODIR}/g/go-225
 ${TERMINFODIR}/g/go140
 ${TERMINFODIR}/g/go140w
@@ -1844,6 +1845,8 @@ ${TERMINFODIR}/i/ims950
 ${TERMINFODIR}/i/ims950-b
 ${TERMINFODIR}/i/ims950-rv
 ${TERMINFODIR}/i/infoton
+${TERMINFODIR}/i/interix
+${TERMINFODIR}/i/interix-nti
 ${TERMINFODIR}/i/intertec
 ${TERMINFODIR}/i/intertube
 ${TERMINFODIR}/i/intertube2
@@ -1903,6 +1906,7 @@ ${TERMINFODIR}/l/linux-koi8r
 ${TERMINFODIR}/l/linux-lat
 ${TERMINFODIR}/l/linux-m
 ${TERMINFODIR}/l/linux-nic
+${TERMINFODIR}/l/linux-vt
 ${TERMINFODIR}/l/lisa
 ${TERMINFODIR}/l/lisaterm
 ${TERMINFODIR}/l/lisaterm-w
@@ -1967,7 +1971,10 @@ ${TERMINFODIR}/m/modgraph
 ${TERMINFODIR}/m/modgraph2
 ${TERMINFODIR}/m/modgraph48
 ${TERMINFODIR}/m/mono-emx
+${TERMINFODIR}/m/mouse-sun
+${TERMINFODIR}/m/ms-vt-utf8
 ${TERMINFODIR}/m/ms-vt100
+${TERMINFODIR}/m/ms-vt100+
 ${TERMINFODIR}/m/ms-vt100-color
 ${TERMINFODIR}/m/msk227
 ${TERMINFODIR}/m/msk22714
@@ -1978,6 +1985,8 @@ ${TERMINFODIR}/m/mskermit227am
 ${TERMINFODIR}/m/mt-70
 ${TERMINFODIR}/m/mt4520-rv
 ${TERMINFODIR}/m/mt70
+${TERMINFODIR}/m/mterm
+${TERMINFODIR}/m/mterm-ansi
 ${TERMINFODIR}/m/mvterm
 ${TERMINFODIR}/n/nansi.sys
 ${TERMINFODIR}/n/nansi.sysk
@@ -2111,6 +2120,24 @@ ${TERMINFODIR}/n/nsterm-m-s-acs
 ${TERMINFODIR}/n/nsterm-s
 ${TERMINFODIR}/n/nsterm-s-7
 ${TERMINFODIR}/n/nsterm-s-acs
+${TERMINFODIR}/n/ntconsole
+${TERMINFODIR}/n/ntconsole-100
+${TERMINFODIR}/n/ntconsole-100-nti
+${TERMINFODIR}/n/ntconsole-25
+${TERMINFODIR}/n/ntconsole-25-nti
+${TERMINFODIR}/n/ntconsole-25-w
+${TERMINFODIR}/n/ntconsole-25-w-vt
+${TERMINFODIR}/n/ntconsole-35
+${TERMINFODIR}/n/ntconsole-35-nti
+${TERMINFODIR}/n/ntconsole-35-w
+${TERMINFODIR}/n/ntconsole-50
+${TERMINFODIR}/n/ntconsole-50-nti
+${TERMINFODIR}/n/ntconsole-50-w
+${TERMINFODIR}/n/ntconsole-60
+${TERMINFODIR}/n/ntconsole-60-nti
+${TERMINFODIR}/n/ntconsole-60-w
+${TERMINFODIR}/n/ntconsole-w
+${TERMINFODIR}/n/ntconsole-w-vt
 ${TERMINFODIR}/n/nwe501
 ${TERMINFODIR}/n/nwe501-a
 ${TERMINFODIR}/n/nwe501-o
@@ -2148,6 +2175,25 @@ ${TERMINFODIR}/o/oldibmpc3
 ${TERMINFODIR}/o/oldpc3
 ${TERMINFODIR}/o/oldsun
 ${TERMINFODIR}/o/omron
+${TERMINFODIR}/o/opennt
+${TERMINFODIR}/o/opennt-100
+${TERMINFODIR}/o/opennt-100-nti
+${TERMINFODIR}/o/opennt-25
+${TERMINFODIR}/o/opennt-25-nti
+${TERMINFODIR}/o/opennt-25-w
+${TERMINFODIR}/o/opennt-25-w-vt
+${TERMINFODIR}/o/opennt-35
+${TERMINFODIR}/o/opennt-35-nti
+${TERMINFODIR}/o/opennt-35-w
+${TERMINFODIR}/o/opennt-50
+${TERMINFODIR}/o/opennt-50-nti
+${TERMINFODIR}/o/opennt-50-w
+${TERMINFODIR}/o/opennt-60
+${TERMINFODIR}/o/opennt-60-nti
+${TERMINFODIR}/o/opennt-60-w
+${TERMINFODIR}/o/opennt-nti
+${TERMINFODIR}/o/opennt-w
+${TERMINFODIR}/o/opennt-w-vt
 ${TERMINFODIR}/o/opus3n1+
 ${TERMINFODIR}/o/origibmpc3
 ${TERMINFODIR}/o/origpc3
@@ -2342,6 +2388,10 @@ ${TERMINFODIR}/r/rtpc
 ${TERMINFODIR}/r/rxvt
 ${TERMINFODIR}/r/rxvt-16color
 ${TERMINFODIR}/r/rxvt-basic
+${TERMINFODIR}/r/rxvt-color
+${TERMINFODIR}/r/rxvt-cygwin
+${TERMINFODIR}/r/rxvt-cygwin-native
+${TERMINFODIR}/r/rxvt-xpm
 ${TERMINFODIR}/s/s4
 ${TERMINFODIR}/s/sb1
 ${TERMINFODIR}/s/sb2
@@ -2357,6 +2407,9 @@ ${TERMINFODIR}/s/scoansi-old
 ${NOT_SUNOS}${TERMINFODIR}/s/screen
 ${NOT_SUNOS}${TERMINFODIR}/s/screen-w
 ${NOT_SUNOS}${TERMINFODIR}/s/screen.teraterm
+${TERMINFODIR}/s/screen-bce
+${TERMINFODIR}/s/screen-s
+${TERMINFODIR}/s/screen.linux
 ${TERMINFODIR}/s/screen.xterm-r6
 ${TERMINFODIR}/s/screen.xterm-xfree86
 ${TERMINFODIR}/s/screen2
@@ -2387,6 +2440,7 @@ ${TERMINFODIR}/s/sun-nic
 ${TERMINFODIR}/s/sun-s
 ${TERMINFODIR}/s/sun-s-e
 ${TERMINFODIR}/s/sun-ss5
+${TERMINFODIR}/s/sun-type4
 ${TERMINFODIR}/s/sun1
 ${TERMINFODIR}/s/sun2
 ${TERMINFODIR}/s/sune
@@ -2481,6 +2535,7 @@ ${TERMINFODIR}/t/ti928
 ${TERMINFODIR}/t/ti928-8
 ${TERMINFODIR}/t/ti931
 ${TERMINFODIR}/t/ti_ansi
+${TERMINFODIR}/t/tkterm
 ${TERMINFODIR}/t/tn1200
 ${TERMINFODIR}/t/tn300
 ${TERMINFODIR}/t/trs16
@@ -2494,6 +2549,7 @@ ${TERMINFODIR}/t/ts100
 ${TERMINFODIR}/t/ts100-ctxt
 ${TERMINFODIR}/t/ts100-sp
 ${TERMINFODIR}/t/ts1p
+${TERMINFODIR}/t/tt
 ${TERMINFODIR}/t/tt505-22
 ${TERMINFODIR}/t/tty33
 ${TERMINFODIR}/t/tty35
@@ -2527,21 +2583,92 @@ ${TERMINFODIR}/t/tty5620-24
 ${TERMINFODIR}/t/tty5620-34
 ${TERMINFODIR}/t/tty5620-s
 ${TERMINFODIR}/t/ttydmd
-${TERMINFODIR}/t/tvi-2p
 ${TERMINFODIR}/t/tvi803
 ${TERMINFODIR}/t/tvi9065
 ${TERMINFODIR}/t/tvi910
 ${TERMINFODIR}/t/tvi910+
 ${TERMINFODIR}/t/tvi912
-${TERMINFODIR}/t/tvi912-2p
 ${TERMINFODIR}/t/tvi912b
+${TERMINFODIR}/t/tvi912b+2p
+${TERMINFODIR}/t/tvi912b+dim
+${TERMINFODIR}/t/tvi912b+mc
+${TERMINFODIR}/t/tvi912b+printer
+${TERMINFODIR}/t/tvi912b+vb
+${TERMINFODIR}/t/tvi912b-2p
+${TERMINFODIR}/t/tvi912b-2p-mc
+${TERMINFODIR}/t/tvi912b-2p-p
+${TERMINFODIR}/t/tvi912b-2p-unk
+${TERMINFODIR}/t/tvi912b-mc
+${TERMINFODIR}/t/tvi912b-mc-2p
+${TERMINFODIR}/t/tvi912b-mc-vb
+${TERMINFODIR}/t/tvi912b-p
+${TERMINFODIR}/t/tvi912b-p-2p
+${TERMINFODIR}/t/tvi912b-p-vb
+${TERMINFODIR}/t/tvi912b-unk
+${TERMINFODIR}/t/tvi912b-unk-2p
+${TERMINFODIR}/t/tvi912b-unk-vb
+${TERMINFODIR}/t/tvi912b-vb
+${TERMINFODIR}/t/tvi912b-vb-mc
+${TERMINFODIR}/t/tvi912b-vb-p
+${TERMINFODIR}/t/tvi912b-vb-unk
 ${TERMINFODIR}/t/tvi912c
+${TERMINFODIR}/t/tvi912c-2p
+${TERMINFODIR}/t/tvi912c-2p-mc
+${TERMINFODIR}/t/tvi912c-2p-p
+${TERMINFODIR}/t/tvi912c-2p-unk
+${TERMINFODIR}/t/tvi912c-mc
+${TERMINFODIR}/t/tvi912c-mc-2p
+${TERMINFODIR}/t/tvi912c-mc-vb
+${TERMINFODIR}/t/tvi912c-p
+${TERMINFODIR}/t/tvi912c-p-2p
+${TERMINFODIR}/t/tvi912c-p-vb
+${TERMINFODIR}/t/tvi912c-unk
+${TERMINFODIR}/t/tvi912c-unk-2p
+${TERMINFODIR}/t/tvi912c-unk-vb
+${TERMINFODIR}/t/tvi912c-vb
+${TERMINFODIR}/t/tvi912c-vb-mc
+${TERMINFODIR}/t/tvi912c-vb-p
+${TERMINFODIR}/t/tvi912c-vb-unk
 ${TERMINFODIR}/t/tvi912cc
 ${TERMINFODIR}/t/tvi914
 ${TERMINFODIR}/t/tvi920
-${TERMINFODIR}/t/tvi920-2p
 ${TERMINFODIR}/t/tvi920b
+${TERMINFODIR}/t/tvi920b+fn
+${TERMINFODIR}/t/tvi920b-2p
+${TERMINFODIR}/t/tvi920b-2p-mc
+${TERMINFODIR}/t/tvi920b-2p-p
+${TERMINFODIR}/t/tvi920b-2p-unk
+${TERMINFODIR}/t/tvi920b-mc
+${TERMINFODIR}/t/tvi920b-mc-2p
+${TERMINFODIR}/t/tvi920b-mc-vb
+${TERMINFODIR}/t/tvi920b-p
+${TERMINFODIR}/t/tvi920b-p-2p
+${TERMINFODIR}/t/tvi920b-p-vb
+${TERMINFODIR}/t/tvi920b-unk
+${TERMINFODIR}/t/tvi920b-unk-2p
+${TERMINFODIR}/t/tvi920b-unk-vb
+${TERMINFODIR}/t/tvi920b-vb
+${TERMINFODIR}/t/tvi920b-vb-mc
+${TERMINFODIR}/t/tvi920b-vb-p
+${TERMINFODIR}/t/tvi920b-vb-unk
 ${TERMINFODIR}/t/tvi920c
+${TERMINFODIR}/t/tvi920c-2p
+${TERMINFODIR}/t/tvi920c-2p-mc
+${TERMINFODIR}/t/tvi920c-2p-p
+${TERMINFODIR}/t/tvi920c-2p-unk
+${TERMINFODIR}/t/tvi920c-mc
+${TERMINFODIR}/t/tvi920c-mc-2p
+${TERMINFODIR}/t/tvi920c-mc-vb
+${TERMINFODIR}/t/tvi920c-p
+${TERMINFODIR}/t/tvi920c-p-2p
+${TERMINFODIR}/t/tvi920c-p-vb
+${TERMINFODIR}/t/tvi920c-unk
+${TERMINFODIR}/t/tvi920c-unk-2p
+${TERMINFODIR}/t/tvi920c-unk-vb
+${TERMINFODIR}/t/tvi920c-vb
+${TERMINFODIR}/t/tvi920c-vb-mc
+${TERMINFODIR}/t/tvi920c-vb-p
+${TERMINFODIR}/t/tvi920c-vb-unk
 ${TERMINFODIR}/t/tvi921
 ${TERMINFODIR}/t/tvi924
 ${TERMINFODIR}/t/tvi925
@@ -2572,6 +2699,7 @@ ${TERMINFODIR}/u/uniterm49
 ${TERMINFODIR}/u/unixpc
 ${TERMINFODIR}/u/unknown
 ${TERMINFODIR}/u/uts30
+${TERMINFODIR}/u/uwin
 ${TERMINFODIR}/v/v200-nam
 ${TERMINFODIR}/v/v320n
 ${TERMINFODIR}/v/v3220
@@ -2624,7 +2752,12 @@ ${TERMINFODIR}/v/vs100
 ${TERMINFODIR}/v/vs100-x10
 ${TERMINFODIR}/v/vsc
 ${TERMINFODIR}/v/vt-61
+${TERMINFODIR}/v/vt-utf8
 ${TERMINFODIR}/v/vt100
+${TERMINFODIR}/v/vt100+
+${TERMINFODIR}/v/vt100+fnkeys
+${TERMINFODIR}/v/vt100+keypad
+${TERMINFODIR}/v/vt100+pfkeys
 ${TERMINFODIR}/v/vt100-am
 ${TERMINFODIR}/v/vt100-bm
 ${TERMINFODIR}/v/vt100-bm-o
@@ -2656,6 +2789,7 @@ ${TERMINFODIR}/v/vt200-js
 ${TERMINFODIR}/v/vt200-old
 ${TERMINFODIR}/v/vt200-w
 ${TERMINFODIR}/v/vt220
+${TERMINFODIR}/v/vt220+keypad
 ${TERMINFODIR}/v/vt220-8
 ${TERMINFODIR}/v/vt220-8bit
 ${TERMINFODIR}/v/vt220-js
@@ -2692,6 +2826,7 @@ ${TERMINFODIR}/v/vt520
 ${TERMINFODIR}/v/vt525
 ${TERMINFODIR}/v/vt61
 ${TERMINFODIR}/v/vt61.5
+${TERMINFODIR}/v/vtnt
 ${TERMINFODIR}/v/vv100
 ${TERMINFODIR}/w/wren
 ${TERMINFODIR}/w/wrenw
@@ -2998,6 +3133,8 @@ ${TERMINFODIR}/x/xtalk
 ${TERMINFODIR}/x/xterm
 ${TERMINFODIR}/x/xterm+sl
 ${TERMINFODIR}/x/xterm+sl-twm
+${TERMINFODIR}/x/xterm-1002
+${TERMINFODIR}/x/xterm-1003
 ${TERMINFODIR}/x/xterm-16color
 ${TERMINFODIR}/x/xterm-24
 ${TERMINFODIR}/x/xterm-256color
@@ -3022,6 +3159,7 @@ ${TERMINFODIR}/x/xterm-xf86-v32
 ${TERMINFODIR}/x/xterm-xf86-v33
 ${TERMINFODIR}/x/xterm-xf86-v333
 ${TERMINFODIR}/x/xterm-xf86-v40
+${TERMINFODIR}/x/xterm-xf86-v43
 ${TERMINFODIR}/x/xterm-xfree86
 ${TERMINFODIR}/x/xterm-xi
 ${TERMINFODIR}/x/xterm1
diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo
index 844ba62b534..15aea7dfa8b 100644
--- a/devel/ncurses/distinfo
+++ b/devel/ncurses/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2003/12/20 08:49:27 reed Exp $
+$NetBSD: distinfo,v 1.10 2004/03/03 13:36:09 adam Exp $
 
-SHA1 (ncurses-5.3.tar.gz) = d52cfa70ffe5535c3e3d9185b084ba41445ad102
-Size (ncurses-5.3.tar.gz) = 2067718 bytes
-SHA1 (patch-aa) = 141a7c8cb500f3a12d2d0648ae36ccdb43e0280e
-SHA1 (patch-ac) = d8a58856cc12b761d6cc21cbacbba9c90af82114
+SHA1 (ncurses-5.4.tar.gz) = c0dfaf2c4d383915f898a97c8caeace8a0a2c8b7
+Size (ncurses-5.4.tar.gz) = 2154022 bytes
+SHA1 (patch-aa) = 436c8b4ad94efa1144a0506f05b23a8a36af37fa
+SHA1 (patch-ac) = a27f115e6d3654ac0b57667435be48d9c798ea0f
diff --git a/devel/ncurses/patches/patch-aa b/devel/ncurses/patches/patch-aa
index b9eca1d05de..eee0a5f0fe7 100644
--- a/devel/ncurses/patches/patch-aa
+++ b/devel/ncurses/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2002/09/01 18:36:36 tron Exp $
+$NetBSD: patch-aa,v 1.13 2004/03/03 13:36:09 adam Exp $
 
---- misc/run_tic.in.orig	Tue Oct 10 00:57:35 2000
-+++ misc/run_tic.in	Sun Sep  1 20:19:08 2002
-@@ -81,7 +81,7 @@
+--- misc/run_tic.in.orig	2003-09-06 22:31:44.000000000 +0000
++++ misc/run_tic.in
+@@ -91,7 +91,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,13 +11,13 @@ $NetBSD: patch-aa,v 1.12 2002/09/01 18:36:36 tron Exp $
  
  # 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).
-@@ -112,6 +112,9 @@
- 	echo '? tic could not build '$TERMINFO
+@@ -123,6 +123,9 @@ else
  	exit 1
  fi
-+
+ 
 +# For NetBSD pkgsrc, don't bother with setting a symbolic link.
 +exit 0
- 
++
  # Make a symbolic link to provide compatibility with applications that expect
  # 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
diff --git a/devel/ncurses/patches/patch-ac b/devel/ncurses/patches/patch-ac
index 6094d3fed34..63f21c05661 100644
--- a/devel/ncurses/patches/patch-ac
+++ b/devel/ncurses/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.11 2003/03/30 20:35:00 jschauma Exp $
+$NetBSD: patch-ac,v 1.12 2004/03/03 13:36:09 adam Exp $
 
---- configure.orig	Sun Mar 30 15:21:38 2003
-+++ configure	Sun Mar 30 15:21:47 2003
-@@ -5031,12 +5031,7 @@
+--- configure.orig	2004-02-01 01:03:42.000000000 +0000
++++ configure
+@@ -5537,12 +5537,7 @@ case ".$MANPAGE_RENAMES" in #(vi
  .no) #(vi
    ;;
  .|.yes)