Changes 5.6:

Hashed-databases are supported for storing terminal descriptions.
Support for magic-cookies such as hpterm was improved.
Support for rpath in shared libraries was revised.
Many bugfixes were made for memory leaks, wide-character support, portability,
  and more.

9 files changed, 84 insertions, 52 deletions

diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 5cd4a8a794f..eccfd1ea901 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2006/11/05 17:49:34 joerg Exp $
+# $NetBSD: Makefile,v 1.75 2007/01/08 11:01:05 adam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	1
 COMMENT=	CRT screen handling and optimization package
 
 INSTALLATION_DIRS=	share/examples
@@ -20,10 +19,10 @@ SUBST_SED.ti+=		-e '/^screen.teraterm|/,/^$$/d'
 post-configure:
 	cd ${WRKSRC}/man;					\
 	for f in *.1m; do					\
-		${MV} -f $${f} `${BASENAME} $${f} .1m`.1; 	\
+		mv -f $${f} `${BASENAME} $${f} .1m`.1; 	\
 	done;							\
 	for f in *.3x; do					\
-		${MV} -f $${f} `${BASENAME} $${f} .3x`.3; 	\
+		mv -f $${f} `${BASENAME} $${f} .3x`.3; 	\
 	done
 
 post-install:
diff --git a/devel/ncurses/Makefile.common b/devel/ncurses/Makefile.common
index 0723156cbe5..8b6c605e928 100644
--- a/devel/ncurses/Makefile.common
+++ b/devel/ncurses/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2006/11/05 17:49:34 joerg Exp $
+# $NetBSD: Makefile.common,v 1.3 2007/01/08 11:01:05 adam Exp $
 
 DISTNAME=	ncurses-${NC_VERS}
-NC_VERS=	5.5
+NC_VERS=	5.6
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=ncurses/} \
 		ftp://dickey.his.com/ncurses/ \
@@ -14,10 +14,9 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		c c++
-USE_LIBTOOL=		YES
+USE_LIBTOOL=		yes
 USE_TOOLS+=		tbl
-
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libtool
 CONFIGURE_ARGS+=	--enable-bsdpad
 CONFIGURE_ARGS+=	--enable-overwrite
@@ -27,6 +26,8 @@ CONFIGURE_ARGS+=	--without-curses-h
 CONFIGURE_ARGS+=	--without-gpm
 CONFIGURE_ARGS+=	--with-manpage-format=normal
 CONFIGURE_ARGS+=	--with-manpage-tbl
+CONFIGURE_ARGS+=	--with-default-terminfo-dir=${PREFIX}/${TERMINFODIR}
+CONFIGURE_ARGS+=	--with-terminfo-dirs=${PREFIX}/${TERMINFODIR}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -40,6 +41,3 @@ TERMINFODIR=	share/terminfo
 .endif
 
 PLIST_SUBST+=	TERMINFODIR=${TERMINFODIR:Q}
-
-CONFIGURE_ARGS+=	--with-default-terminfo-dir=${PREFIX}/${TERMINFODIR}
-CONFIGURE_ARGS+=	--with-terminfo-dirs=${PREFIX}/${TERMINFODIR}
diff --git a/devel/ncurses/PLIST b/devel/ncurses/PLIST
index db26857944e..7b542777b24 100644
--- a/devel/ncurses/PLIST
+++ b/devel/ncurses/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.10 2005/10/20 00:01:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2007/01/08 11:01:05 adam Exp $
 bin/captoinfo
 bin/clear
 bin/infocmp
 bin/infotocap
+bin/ncurses5-config
 bin/reset
 bin/tack
 bin/tic
@@ -304,6 +305,7 @@ man/man3/keypad.3
 man/man3/killchar.3
 man/man3/killwchar.3
 man/man3/leaveok.3
+man/man3/legacy_coding.3
 man/man3/link_field.3
 man/man3/link_fieldtype.3
 man/man3/longname.3
@@ -448,6 +450,7 @@ man/man3/nl.3
 man/man3/nocbreak.3
 man/man3/nodelay.3
 man/man3/noecho.3
+man/man3/nofilter.3
 man/man3/nonl.3
 man/man3/noqiflush.3
 man/man3/noraw.3
@@ -603,6 +606,7 @@ man/man3/update_panels.3
 man/man3/use_default_colors.3
 man/man3/use_env.3
 man/man3/use_extended_names.3
+man/man3/use_legacy_coding.3
 man/man3/vid_attr.3
 man/man3/vid_puts.3
 man/man3/vidattr.3
@@ -894,6 +898,7 @@ ${TERMINFODIR}/a/ansi
 ${TERMINFODIR}/a/ansi+arrows
 ${TERMINFODIR}/a/ansi+csr
 ${TERMINFODIR}/a/ansi+cup
+${TERMINFODIR}/a/ansi+enq
 ${TERMINFODIR}/a/ansi+erase
 ${TERMINFODIR}/a/ansi+idc
 ${TERMINFODIR}/a/ansi+idl
@@ -1594,6 +1599,8 @@ ${TERMINFODIR}/g/gator-t
 ${TERMINFODIR}/g/gigi
 ${TERMINFODIR}/g/glasstty
 ${TERMINFODIR}/g/gnome
+${TERMINFODIR}/g/gnome-256color
+${TERMINFODIR}/g/gnome-fc5
 ${TERMINFODIR}/g/gnome-rh62
 ${TERMINFODIR}/g/gnome-rh72
 ${TERMINFODIR}/g/gnome-rh80
@@ -1763,6 +1770,7 @@ ${TERMINFODIR}/h/hpex2
 ${TERMINFODIR}/h/hpgeneric
 ${TERMINFODIR}/h/hpsub
 ${TERMINFODIR}/h/hpterm
+${TERMINFODIR}/h/hpterm-color
 ${TERMINFODIR}/h/htx11
 ${TERMINFODIR}/h/hurd
 ${TERMINFODIR}/h/hz1000
@@ -1857,6 +1865,7 @@ ${TERMINFODIR}/i/iris40
 ${TERMINFODIR}/j/jaixterm
 ${TERMINFODIR}/j/jaixterm-m
 ${TERMINFODIR}/j/jerq
+${TERMINFODIR}/j/jfbterm
 ${TERMINFODIR}/k/k45
 ${TERMINFODIR}/k/kaypro
 ${TERMINFODIR}/k/kaypro2
@@ -1870,10 +1879,14 @@ ${TERMINFODIR}/k/klone+color
 ${TERMINFODIR}/k/klone+koi8acs
 ${TERMINFODIR}/k/klone+sgr
 ${TERMINFODIR}/k/klone+sgr-dumb
+${TERMINFODIR}/k/klone+sgr8
+${TERMINFODIR}/k/kon
+${TERMINFODIR}/k/kon2
 ${TERMINFODIR}/k/konsole
 ${TERMINFODIR}/k/konsole-16color
 ${TERMINFODIR}/k/konsole-base
 ${TERMINFODIR}/k/konsole-linux
+${TERMINFODIR}/k/konsole-solaris
 ${TERMINFODIR}/k/konsole-vt100
 ${TERMINFODIR}/k/konsole-vt420pc
 ${TERMINFODIR}/k/konsole-xf3x
@@ -1926,6 +1939,7 @@ ${TERMINFODIR}/m/memhp
 ${TERMINFODIR}/m/mgr
 ${TERMINFODIR}/m/mgr-linux
 ${TERMINFODIR}/m/mgr-sun
+${TERMINFODIR}/m/mgt
 ${TERMINFODIR}/m/mgterm
 ${TERMINFODIR}/m/microb
 ${TERMINFODIR}/m/microbee
@@ -2087,6 +2101,7 @@ ${TERMINFODIR}/n/nsterm+c
 ${TERMINFODIR}/n/nsterm+c41
 ${TERMINFODIR}/n/nsterm+mac
 ${TERMINFODIR}/n/nsterm+s
+${TERMINFODIR}/n/nsterm-16color
 ${TERMINFODIR}/n/nsterm-7
 ${TERMINFODIR}/n/nsterm-7-c
 ${TERMINFODIR}/n/nsterm-7-c-s
@@ -2320,6 +2335,8 @@ ${TERMINFODIR}/p/pt505-22
 ${TERMINFODIR}/p/pt505-24
 ${TERMINFODIR}/p/pty
 ${TERMINFODIR}/p/putty
+${TERMINFODIR}/p/putty-256color
+${TERMINFODIR}/p/putty-vt100
 ${TERMINFODIR}/q/qansi
 ${TERMINFODIR}/q/qansi-g
 ${TERMINFODIR}/q/qansi-m
@@ -2382,6 +2399,7 @@ ${TERMINFODIR}/r/rtpc
 ${TERMINFODIR}/r/rxvt
 ${TERMINFODIR}/r/rxvt+pcfkeys
 ${TERMINFODIR}/r/rxvt-16color
+${TERMINFODIR}/r/rxvt-256color
 ${TERMINFODIR}/r/rxvt-basic
 ${TERMINFODIR}/r/rxvt-color
 ${TERMINFODIR}/r/rxvt-cygwin
@@ -2400,6 +2418,14 @@ ${TERMINFODIR}/s/scoansi
 ${TERMINFODIR}/s/scoansi-new
 ${TERMINFODIR}/s/scoansi-old
 ${NOT_SUNOS}${TERMINFODIR}/s/screen
+${TERMINFODIR}/s/screen-16color
+${TERMINFODIR}/s/screen-16color-bce
+${TERMINFODIR}/s/screen-16color-bce-s
+${TERMINFODIR}/s/screen-16color-s
+${TERMINFODIR}/s/screen-256color
+${TERMINFODIR}/s/screen-256color-bce
+${TERMINFODIR}/s/screen-256color-bce-s
+${TERMINFODIR}/s/screen-256color-s
 ${NOT_SUNOS}${TERMINFODIR}/s/screen-bce
 ${NOT_SUNOS}${TERMINFODIR}/s/screen-s
 ${NOT_SUNOS}${TERMINFODIR}/s/screen-w
@@ -2752,6 +2778,7 @@ ${TERMINFODIR}/v/vt-61
 ${TERMINFODIR}/v/vt-utf8
 ${TERMINFODIR}/v/vt100
 ${TERMINFODIR}/v/vt100+
+${TERMINFODIR}/v/vt100+enq
 ${TERMINFODIR}/v/vt100+fnkeys
 ${TERMINFODIR}/v/vt100+keypad
 ${TERMINFODIR}/v/vt100+pfkeys
@@ -2775,6 +2802,7 @@ ${TERMINFODIR}/v/vt100-w-nam
 ${TERMINFODIR}/v/vt100-w-nav
 ${TERMINFODIR}/v/vt100nam
 ${TERMINFODIR}/v/vt102
+${TERMINFODIR}/v/vt102+enq
 ${TERMINFODIR}/v/vt102-nsgr
 ${TERMINFODIR}/v/vt102-w
 ${TERMINFODIR}/v/vt125
@@ -3077,6 +3105,8 @@ ${TERMINFODIR}/x/xerox
 ${TERMINFODIR}/x/xerox-lm
 ${TERMINFODIR}/x/xerox1720
 ${TERMINFODIR}/x/xerox820
+${TERMINFODIR}/x/xfce
+${TERMINFODIR}/x/xiterm
 ${TERMINFODIR}/x/xl83
 ${TERMINFODIR}/x/xnuppc
 ${TERMINFODIR}/x/xnuppc+100x37
@@ -3129,6 +3159,14 @@ ${TERMINFODIR}/x/xnuppc-m-f
 ${TERMINFODIR}/x/xnuppc-m-f2
 ${TERMINFODIR}/x/xtalk
 ${TERMINFODIR}/x/xterm
+${TERMINFODIR}/x/xterm+256color
+${TERMINFODIR}/x/xterm+88color
+${TERMINFODIR}/x/xterm+pcc0
+${TERMINFODIR}/x/xterm+pcc1
+${TERMINFODIR}/x/xterm+pcc2
+${TERMINFODIR}/x/xterm+pcc3
+${TERMINFODIR}/x/xterm+pcf0
+${TERMINFODIR}/x/xterm+pcf2
 ${TERMINFODIR}/x/xterm+pcfkeys
 ${TERMINFODIR}/x/xterm+sl
 ${TERMINFODIR}/x/xterm+sl-twm
@@ -3206,7 +3244,6 @@ ${TERMINFODIR}/z/ztx11
 @dirrm ${TERMINFODIR}/v
 @dirrm ${TERMINFODIR}/u
 @dirrm ${TERMINFODIR}/t
-@unexec ${RMDIR} %D/${TERMINFODIR}/s 2>/dev/null || ${TRUE}
 @dirrm ${TERMINFODIR}/r
 @dirrm ${TERMINFODIR}/q
 @dirrm ${TERMINFODIR}/p
diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo
index 2a05b7a795f..267e2c55219 100644
--- a/devel/ncurses/distinfo
+++ b/devel/ncurses/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.14 2006/10/08 17:16:59 wiz Exp $
+$NetBSD: distinfo,v 1.15 2007/01/08 11:01:05 adam Exp $
 
-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
-SHA1 (patch-ae) = 9ce37cf6ecb018dd5bbdcef023e0bbc81e12784c
+SHA1 (ncurses-5.6.tar.gz) = 4d54d8ad0b90fffa2780a0a45edb6fcb027ef18d
+RMD160 (ncurses-5.6.tar.gz) = 1a878819c43e6426500fd74ccedf0a032ef399d8
+Size (ncurses-5.6.tar.gz) = 2402592 bytes
+SHA1 (patch-aa) = a3a24e73b79ca8611ae4d5616f1c671926ea5a64
+SHA1 (patch-ab) = 39679b18ba817af7ec47a17a62ab3ae6e214b443
+SHA1 (patch-ac) = c8137405a61258a9a4d89ad889839f43c1462210
+SHA1 (patch-ad) = bfb957df138b1567d895882316c96011f44a1c30
+SHA1 (patch-ae) = 5e3396e7dafe0f772780d0c2ad2b9ec752c09a86
diff --git a/devel/ncurses/patches/patch-aa b/devel/ncurses/patches/patch-aa
index b32089ee5e9..af369ce6c6b 100644
--- a/devel/ncurses/patches/patch-aa
+++ b/devel/ncurses/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.14 2005/10/20 00:01:32 wiz Exp $
+$NetBSD: patch-aa,v 1.15 2007/01/08 11:01:05 adam Exp $
 
---- misc/run_tic.in.orig	2005-09-18 01:13:49.000000000 +0200
+--- 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
  # 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 )
+-( test -d "$TERMINFO" && cd $TERMINFO && rm -fr ? 2>/dev/null )
++#( test -d "$TERMINFO" && cd $TERMINFO && rm -fr ? 2>/dev/null )
  
  if test "$ext_funcs" = 1 ; then
  cat <<EOF
diff --git a/devel/ncurses/patches/patch-ab b/devel/ncurses/patches/patch-ab
index 3e2929c0fe2..2b67207a5f3 100644
--- a/devel/ncurses/patches/patch-ab
+++ b/devel/ncurses/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.14 2005/10/20 00:01:32 wiz Exp $
+$NetBSD: patch-ab,v 1.15 2007/01/08 11:01:05 adam Exp $
 
---- mk-1st.awk.orig	2005-06-18 21:15:57.000000000 +0200
+--- mk-1st.awk.orig	2006-10-08 02:14:08.000000000 +0200
 +++ mk-1st.awk
-@@ -303,7 +303,7 @@ END	{
+@@ -308,7 +308,7 @@ END	{
  				}
  				end_name = lib_name;
  				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.14 2005/10/20 00:01:32 wiz Exp $
  				print  ""
  				print  "install \\"
  				print  "install.libs \\"
-@@ -369,7 +369,7 @@ END	{
+@@ -374,7 +374,7 @@ END	{
  			print "mostlyclean::"
  			printf "\t-rm -f $(%s_OBJS)\n", OBJS
  			if ( MODEL == "LIBTOOL" ) {
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.14 2005/10/20 00:01:32 wiz Exp $
  			}
  		}
  		else if ( found == 2 )
-@@ -378,13 +378,13 @@ END	{
+@@ -383,13 +383,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 a06f558bde5..7d48e394c64 100644
--- a/devel/ncurses/patches/patch-ac
+++ b/devel/ncurses/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.13 2005/10/20 00:01:32 wiz Exp $
+$NetBSD: patch-ac,v 1.14 2007/01/08 11:01:05 adam Exp $
 
---- configure.orig	2005-09-24 23:50:50.000000000 +0200
+--- configure.orig	2006-12-17 17:33:38.000000000 +0100
 +++ configure
-@@ -7763,12 +7763,7 @@ case ".$MANPAGE_RENAMES" in #(vi
+@@ -7921,12 +7921,7 @@ case ".$MANPAGE_RENAMES" in #(vi
  .no) #(vi
    ;;
  .|.yes)
diff --git a/devel/ncurses/patches/patch-ad b/devel/ncurses/patches/patch-ad
index c00e0deff8e..818a4bb8552 100644
--- a/devel/ncurses/patches/patch-ad
+++ b/devel/ncurses/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.9 2005/10/20 00:01:32 wiz Exp $
+$NetBSD: patch-ad,v 1.10 2007/01/08 11:01:05 adam Exp $
 
---- c++/Makefile.in.orig	2005-06-13 00:52:56.000000000 +0200
+--- c++/Makefile.in.orig	2006-10-21 19:07:49.000000000 +0200
 +++ c++/Makefile.in
-@@ -152,7 +152,7 @@ LIB_OBJS = \
+@@ -154,7 +154,7 @@ LIB_OBJS = \
  
  ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
  	cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
diff --git a/devel/ncurses/patches/patch-ae b/devel/ncurses/patches/patch-ae
index 1fc882306ba..04b70e371d7 100644
--- a/devel/ncurses/patches/patch-ae
+++ b/devel/ncurses/patches/patch-ae
@@ -1,15 +1,13 @@
-$NetBSD: patch-ae,v 1.7 2006/10/08 17:16:59 wiz Exp $
+$NetBSD: patch-ae,v 1.8 2007/01/08 11:01:05 adam Exp $
 
---- progs/tset.c.orig	2005-09-25 00:43:52.000000000 +0000
-+++ progs/tset.c
-@@ -1024,7 +1024,9 @@ report(const char *name, int which, unsi
-      * Check 'delete' before 'backspace', since the key_backspace value
-      * is ambiguous.
-      */
--    if (newer == 0177)
-+    if (newer == _POSIX_VDISABLE)
-+	(void) fprintf(stderr, "disabled.\n");
-+    else if (newer == 0177)
- 	(void) fprintf(stderr, "delete.\n");
-     else if ((p = key_backspace) != 0
- 	     && newer == (unsigned char) p[0]
+--- 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@
+ 
+ ################################################################################