From a919b0ee00a6287c7e29330be52f9bb557503288 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 27 Sep 2015 01:08:16 +0000 Subject: [PATCH 1/1] ncurses 6.0 - patch 20150926 + change makefile rule for removing resulting.map to distclean rather than clean. + add /lib/terminfo to terminfo-dirs in ".deb" test-package. + add note on portability of resizeterm and wresize to manual pages. --- INSTALL | 5 ++++- NEWS | 8 +++++++- VERSION | 2 +- aclocal.m4 | 6 +++--- configure | 2 +- dist.mk | 4 ++-- doc/html/man/captoinfo.1m.html | 2 +- doc/html/man/clear.1.html | 2 +- doc/html/man/curs_attr.3x.html | 2 +- doc/html/man/form.3x.html | 2 +- doc/html/man/infocmp.1m.html | 2 +- doc/html/man/infotocap.1m.html | 2 +- doc/html/man/menu.3x.html | 2 +- doc/html/man/ncurses.3x.html | 2 +- doc/html/man/panel.3x.html | 2 +- doc/html/man/resizeterm.3x.html | 17 ++++++++++++++++- doc/html/man/tabs.1.html | 2 +- doc/html/man/terminfo.5.html | 2 +- doc/html/man/tic.1m.html | 2 +- doc/html/man/toe.1m.html | 2 +- doc/html/man/tput.1.html | 2 +- doc/html/man/tset.1.html | 2 +- doc/html/man/wresize.3x.html | 13 +++++++++++-- man/resizeterm.3x | 15 ++++++++++++++- man/wresize.3x | 10 ++++++++-- package/debian-mingw/changelog | 4 ++-- package/debian-mingw64/changelog | 4 ++-- package/debian/changelog | 4 ++-- package/debian/rules | 1 + package/mingw-ncurses.nsi | 4 ++-- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- 32 files changed, 93 insertions(+), 40 deletions(-) diff --git a/INSTALL b/INSTALL index 0dbed2b4..a0c52571 100644 --- a/INSTALL +++ b/INSTALL @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: INSTALL,v 1.192 2015/08/15 20:11:48 tom Exp $ +-- $Id: INSTALL,v 1.193 2015/09/26 21:34:14 tom Exp $ --------------------------------------------------------------------- How to install Ncurses/Terminfo on your system --------------------------------------------------------------------- @@ -1093,6 +1093,9 @@ SUMMARY OF CONFIGURE OPTIONS: Specify a search-list of terminfo directories which will be compiled into the ncurses library (default: DATADIR/terminfo) + This is a colon-separated list, like the TERMINFO_DIRS environment + variable. + --with-termlib[=XXX] When building the ncurses library, organize this as two parts: the curses library (libncurses) and the low-level terminfo library diff --git a/NEWS b/NEWS index 799089a1..3d411807 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.2496 2015/09/19 23:04:21 tom Exp $ +-- $Id: NEWS,v 1.2499 2015/09/26 21:58:14 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,12 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20150926 + + change makefile rule for removing resulting.map to distclean rather + than clean. + + add /lib/terminfo to terminfo-dirs in ".deb" test-package. + + add note on portability of resizeterm and wresize to manual pages. + 20150919 + clarify in resizeterm.3x how KEY_RESIZE is pushed onto the input stream. diff --git a/VERSION b/VERSION index b4d876be..b6bab4d2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:9 6.0 20150919 +5:0:9 6.0 20150926 diff --git a/aclocal.m4 b/aclocal.m4 index c6aded0c..0ef9ed33 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.767 2015/09/12 20:00:59 tom Exp $ +dnl $Id: aclocal.m4,v 1.768 2015/09/26 21:56:12 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -3228,7 +3228,7 @@ ifelse($1,,,[$1=$LIB_PREFIX]) AC_SUBST(LIB_PREFIX) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LIB_RULES version: 83 updated: 2015/08/05 20:44:28 +dnl CF_LIB_RULES version: 84 updated: 2015/09/26 17:54:46 dnl ------------ dnl Append definitions and rules for the given models to the subdirectory dnl Makefiles, and the recursion rule for the top-level Makefile. If the @@ -3301,7 +3301,7 @@ do resulting.map: $UNALTERED_SYMS sed $cf_sed_options < $UNALTERED_SYMS >\[$]@ -clean:: +distclean:: rm -f resulting.map CF_EOF fi diff --git a/configure b/configure index bbb63faf..7d62d693 100755 --- a/configure +++ b/configure @@ -23555,7 +23555,7 @@ do resulting.map: $UNALTERED_SYMS sed $cf_sed_options < $UNALTERED_SYMS >\$@ -clean:: +distclean:: rm -f resulting.map CF_EOF fi diff --git a/dist.mk b/dist.mk index 05a42b6d..e2d9e33e 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1071 2015/09/19 19:40:14 tom Exp $ +# $Id: dist.mk,v 1.1072 2015/09/26 18:50:05 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 0 -NCURSES_PATCH = 20150919 +NCURSES_PATCH = 20150926 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html index e9c1bf9e..42034c6c 100644 --- a/doc/html/man/captoinfo.1m.html +++ b/doc/html/man/captoinfo.1m.html @@ -205,7 +205,7 @@

SEE ALSO

        infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20150919).
+       This describes ncurses version 6.0 (patch 20150926).
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html index 73244009..5d721fae 100644 --- a/doc/html/man/clear.1.html +++ b/doc/html/man/clear.1.html @@ -71,7 +71,7 @@

SEE ALSO

        tput(1), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20150919).
+       This describes ncurses version 6.0 (patch 20150926).
 
 
 
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index d76dd9b7..e54ee3de 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.40 2015/07/20 23:35:38 tom Exp @
+  * @Id: curs_attr.3x,v 1.41 2015/09/05 21:13:25 tom Exp @
 -->
 
 
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index c724a299..92c44a43 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -245,7 +245,7 @@
        curses(3x) and related pages whose names begin "form_" for
        detailed descriptions of the entry points.
 
-       This describes ncurses version 6.0 (patch 20150919).
+       This describes ncurses version 6.0 (patch 20150926).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 51ad1cae..a7dcd01e 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -487,7 +487,7 @@
 
        http://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.0 (patch 20150919).
+       This describes ncurses version 6.0 (patch 20150926).
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html index 62d2f866..1652113d 100644 --- a/doc/html/man/infotocap.1m.html +++ b/doc/html/man/infotocap.1m.html @@ -94,7 +94,7 @@

SEE ALSO

        curses(3x), tic(1m), infocmp(1m), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20150919).
+       This describes ncurses version 6.0 (patch 20150926).
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html index 2a49c97a..7e1cd5fd 100644 --- a/doc/html/man/menu.3x.html +++ b/doc/html/man/menu.3x.html @@ -227,7 +227,7 @@ curses(3x) and related pages whose names begin "menu_" for detailed descriptions of the entry points. - This describes ncurses version 6.0 (patch 20150919). + This describes ncurses version 6.0 (patch 20150926). diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html index 4436fafe..0b7bac03 100644 --- a/doc/html/man/ncurses.3x.html +++ b/doc/html/man/ncurses.3x.html @@ -63,7 +63,7 @@ sonable optimization. This implementation is "new curses" (ncurses) and is the approved replacement for 4.4BSD clas- sic curses, which has been discontinued. This describes - ncurses version 6.0 (patch 20150919). + ncurses version 6.0 (patch 20150926). The ncurses library emulates the curses library of System V Release 4 UNIX, and XPG4 (X/Open Portability Guide) diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html index f19779b6..ef9fdf9f 100644 --- a/doc/html/man/panel.3x.html +++ b/doc/html/man/panel.3x.html @@ -218,7 +218,7 @@

SEE ALSO

        curses(3x), curs_variables(3x),
 
-       This describes ncurses version 6.0 (patch 20150919).
+       This describes ncurses version 6.0 (patch 20150926).
diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html index ffc68b7d..e1a8c723 100644 --- a/doc/html/man/resizeterm.3x.html +++ b/doc/html/man/resizeterm.3x.html @@ -27,7 +27,7 @@ * authorization. * **************************************************************************** * Author: Thomas E. Dickey 1996-on - * @Id: resizeterm.3x,v 1.20 2015/09/19 22:53:26 tom Exp @ + * @Id: resizeterm.3x,v 1.21 2015/09/26 19:55:32 tom Exp @ --> @@ -143,6 +143,20 @@ WINCH is received, no screen size change may be recorded. + +

PORTABILITY

+       It is possible to resize the screen with SVr4 curses, by
+
+       o   exiting curses with endwin(3x) and
+
+       o   resuming using refresh(3x).
+
+       Doing that clears the screen and is visually distracting.
+
+       This extension of ncurses was introduced in mid-1995.   It
+       was adopted in NetBSD curses (2001) and PDCurses (2003).
+
+

SEE ALSO

        curs_getch(3x), curs_variables(3x), wresize(3x).
@@ -170,6 +184,7 @@
 
 
  • RETURN VALUE
    • 
 
  • NOTES
    • 
+
  • PORTABILITY
    • 
 
  • SEE ALSO
    • 
 
  • AUTHOR
    • 
 
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 86feb2de..b642a9ac 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -168,7 +168,7 @@
 
    SEE ALSO
            tset(1), infocmp(1m), curses(3x), terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20150919).
+       This describes ncurses version 6.0 (patch 20150926).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 46c72b8c..61e4f8fc 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -78,7 +78,7 @@
        nals by giving a set of capabilities which they  have,  by
        specifying how to perform screen operations, and by speci-
        fying padding requirements and  initialization  sequences.
-       This describes ncurses version 6.0 (patch 20150919).
+       This describes ncurses version 6.0 (patch 20150926).
 
        Entries in terminfo consist of a sequence of `,' separated
        fields (embedded commas may be escaped with a backslash or
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index ad9b6d4c..1d38b766 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -408,7 +408,7 @@
        infocmp(1m),    captoinfo(1m),   infotocap(1m),   toe(1m),
        curses(3x), term(5).  terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20150919).
+       This describes ncurses version 6.0 (patch 20150926).
 
 
 
    
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 1443680e..c6e4b0c3 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -122,7 +122,7 @@
        tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
        curses(3x), terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20150919).
+       This describes ncurses version 6.0 (patch 20150926).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index a9be09b6..c8f0dc65 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -338,7 +338,7 @@
 
    SEE ALSO
            clear(1), stty(1), tabs(1), terminfo(5), curs_termcap(3x).
 
-       This describes ncurses version 6.0 (patch 20150919).
+       This describes ncurses version 6.0 (patch 20150926).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index c7077e4d..e8192fa7 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -319,7 +319,7 @@
        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
        terminfo(5), ttys(5), environ(7)
 
-       This describes ncurses version 6.0 (patch 20150919).
+       This describes ncurses version 6.0 (patch 20150926).
 
 
 
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index 8e986cdc..2e6b18eb 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -85,6 +85,14 @@
        dimensions fit within the actual screen dimensions.
 
 
+
    
+
    PORTABILITY
    +       It is not possible to resize windows with SVr4 curses.
+
+       This  extension of ncurses was introduced in mid-1995.  It
+       was adopted in NetBSD curses (2001) and PDCurses (2003).
+
+
 
    
 
    SEE ALSO
            resizeterm(3x).
@@ -106,6 +114,7 @@
 
  • DESCRIPTION
    • 
 
  • RETURN VALUE
    • 
 
  • NOTES
    • 
+
  • PORTABILITY
    • 
 
  • SEE ALSO
    • 
 
  • AUTHOR
    • 
 
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index 4a3dafaf..b88f68f3 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -28,7 +28,7 @@
 .\"
 .\" Author: Thomas E. Dickey 1996-on
 .\"
-.\" $Id: resizeterm.3x,v 1.20 2015/09/19 22:53:26 tom Exp $
+.\" $Id: resizeterm.3x,v 1.21 2015/09/26 19:55:32 tom Exp $
 .TH resizeterm 3X ""
 .de bP
 .IP \(bu 4
@@ -108,6 +108,19 @@ this overrides the library's use of the window size obtained from
 the operating system.
 Thus, even if a SIGWINCH is received,
 no screen size change may be recorded.
+.SH PORTABILITY
+.PP
+It is possible to resize the screen with SVr4 curses,
+by
+.bP
+exiting curses with \fBendwin\fP(3X) and
+.bP
+resuming using \fBrefresh\fP(3X).
+.PP
+Doing that clears the screen and is visually distracting.
+.PP
+This extension of ncurses was introduced in mid-1995.
+It was adopted in NetBSD curses (2001) and PDCurses (2003).
 .SH SEE ALSO
 \fBcurs_getch\fR(3X),
 \fBcurs_variables\fR(3X),
diff --git a/man/wresize.3x b/man/wresize.3x
index 0832450f..4bbfd263 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -28,7 +28,7 @@
 .\"
 .\" Author: Thomas E. Dickey 1996
 .\"
-.\" $Id: wresize.3x,v 1.13 2010/12/04 18:40:45 tom Exp $
+.\" $Id: wresize.3x,v 1.14 2015/09/26 19:57:24 tom Exp $
 .TH wresize 3X ""
 .SH NAME
 \fBwresize\fR \- resize a curses window
@@ -53,6 +53,12 @@ The dimensions are not compared to \fBcurses\fR screen dimensions to
 simplify the logic of \fBresizeterm\fR.
 The caller must ensure that the window's dimensions fit within the
 actual screen dimensions.
+.SH PORTABILITY
+.PP
+It is not possible to resize windows with SVr4 curses.
+.PP
+This extension of ncurses was introduced in mid-1995.
+It was adopted in NetBSD curses (2001) and PDCurses (2003).
 .SH SEE ALSO
 \fBresizeterm\fR(3X).
 .SH AUTHOR
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 6c4b722a..eb558f58 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20150919) unstable; urgency=low
+ncurses6 (6.0+20150926) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 19 Sep 2015 15:40:14 -0400
+ -- Thomas E. Dickey   Sat, 26 Sep 2015 14:50:05 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 6c4b722a..eb558f58 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20150919) unstable; urgency=low
+ncurses6 (6.0+20150926) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 19 Sep 2015 15:40:14 -0400
+ -- Thomas E. Dickey   Sat, 26 Sep 2015 14:50:05 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 9593cd3c..8c141a3e 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20150919) unstable; urgency=low
+ncurses6 (6.0+20150926) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 19 Sep 2015 15:40:14 -0400
+ -- Thomas E. Dickey   Sat, 26 Sep 2015 14:50:05 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/debian/rules b/package/debian/rules
index e77fd692..49978d86 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -78,6 +78,7 @@ configure = \
 		--with-ticlib \
 		--with-trace \
 		--with-cxx-shared \
+		--with-terminfo-dirs=/lib/terminfo:/usr/share/terminfo \
 		--with-versioned-syms \
 		--with-xterm-kbs=DEL \
 		--without-ada \
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 1d4adb31..bddfa257 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.124 2015/09/19 19:40:14 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.125 2015/09/26 18:50:05 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "0"
 !define VERSION_YYYY  "2015"
-!define VERSION_MMDD  "0919"
+!define VERSION_MMDD  "0926"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index bef11172..239d57d4 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.0
-Release: 20150919
+Release: 20150926
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 5a4a4a90..f8e7cbab 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0
-Release: 20150919
+Release: 20150926
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
-- 
2.44.0