From 0de8912c1c0746eb37b733e9e6fdf852aab9506a Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 24 Mar 2019 01:47:18 +0000 Subject: [PATCH 1/1] ncurses 6.1 - patch 20190323 + move macro for is_linetouched() inside NCURSES_NOMACROS ifndef. + corrected prototypes in several manpages using script to extract those in compilable form. + use _nc_copy_termtype2() rather than direct assignment in setupterm, in case it is called repeatedly using fallback terminfo descriptions (report/patch by Werner Fink). --- NEWS | 10 +++++++++- VERSION | 2 +- dist.mk | 4 ++-- doc/html/ada/funcs/T.htm | 2 +- doc/html/man/adacurses6-config.1.html | 2 +- doc/html/man/captoinfo.1m.html | 2 +- doc/html/man/clear.1.html | 2 +- doc/html/man/curs_getcchar.3x.html | 6 +++--- doc/html/man/curs_legacy.3x.html | 22 ++++++++++----------- doc/html/man/curs_sp_funcs.3x.html | 28 +++++++++++++-------------- doc/html/man/curs_termcap.3x.html | 6 +++--- doc/html/man/curs_util.3x.html | 10 +++++----- 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/mitem_current.3x.html | 4 ++-- doc/html/man/ncurses.3x.html | 2 +- doc/html/man/ncurses6-config.1.html | 2 +- doc/html/man/panel.3x.html | 8 ++++---- doc/html/man/tabs.1.html | 2 +- doc/html/man/term_variables.3x.html | 22 ++++++++++----------- 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 +- include/curses.h.in | 16 +++++++-------- man/curs_getcchar.3x | 6 +++--- man/curs_legacy.3x | 22 ++++++++++----------- man/curs_sp_funcs.3x | 28 +++++++++++++-------------- man/curs_termcap.3x | 6 +++--- man/curs_util.3x | 10 +++++----- man/mitem_current.3x | 4 ++-- man/panel.3x | 6 +++--- man/term_variables.3x | 22 ++++++++++----------- ncurses/base/lib_screen.c | 10 +++++----- ncurses/curses.priv.h | 9 ++++++++- ncurses/tinfo/lib_setup.c | 6 +++--- ncurses/tinfo/read_entry.c | 4 ++-- ncurses/tinfo/write_entry.c | 6 +++--- ncurses/trace/lib_trace.c | 6 +++--- package/debian-mingw/changelog | 4 ++-- package/debian-mingw64/changelog | 4 ++-- package/debian/changelog | 4 ++-- package/mingw-ncurses.nsi | 4 ++-- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- 49 files changed, 176 insertions(+), 161 deletions(-) diff --git a/NEWS b/NEWS index b96ce872..3ea3d12c 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.3293 2019/03/17 01:23:23 tom Exp $ +-- $Id: NEWS,v 1.3297 2019/03/23 23:06:12 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,14 @@ 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. +20190323 + + move macro for is_linetouched() inside NCURSES_NOMACROS ifndef. + + corrected prototypes in several manpages using script to extract + those in compilable form. + + use _nc_copy_termtype2() rather than direct assignment in setupterm, + in case it is called repeatedly using fallback terminfo descriptions + (report/patch by Werner Fink). + 20190317 + regenerate llib-* files. + modify tic to also use new function for user-defined capability info. diff --git a/VERSION b/VERSION index 305c6abf..d20f2d3d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.1 20190317 +5:0:10 6.1 20190323 diff --git a/dist.mk b/dist.mk index 0ec73474..7a6e1225 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.1274 2019/03/17 01:23:23 tom Exp $ +# $Id: dist.mk,v 1.1275 2019/03/23 16:13:26 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 = 1 -NCURSES_PATCH = 20190317 +NCURSES_PATCH = 20190323 # 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/ada/funcs/T.htm b/doc/html/ada/funcs/T.htm index 098d0da7..782d38b7 100644 --- a/doc/html/ada/funcs/T.htm +++ b/doc/html/ada/funcs/T.htm @@ -20,8 +20,8 @@
  • tgetnum
  • tgetstr - terminal_interface-curses-termcap.adb:108
  • tgetstr - terminal_interface-curses-termcap.adb:129 -
  • TGoto
  • tgoto +
  • TGoto
  • tigetflag
  • tigetstr - terminal_interface-curses-terminfo.adb:87
  • tigetstr - terminal_interface-curses-terminfo.adb:108 diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html index dbce5ea2..b49bded6 100644 --- a/doc/html/man/adacurses6-config.1.html +++ b/doc/html/man/adacurses6-config.1.html @@ -125,7 +125,7 @@

    SEE ALSO

            curses(3x)
 
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 63fc205f..ed7f186c 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -190,7 +190,7 @@

    SEE ALSO

            infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).

    AUTHOR

    diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 98cdf798..2fcfef5b 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -148,7 +148,7 @@

    SEE ALSO

            tput(1), terminfo(5)
 
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).
 
 
 
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index 34732d19..b3e87044 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -65,7 +65,7 @@
                const wchar_t *wch,
                const attr_t attrs,
                short color_pair,
-               void *opts );
+               const void *opts );

    DESCRIPTION

    diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index 174d4692..1fea4909 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -52,15 +52,15 @@

    SYNOPSIS

            #include <curses.h>
 
-       int getattrs(WINDOW *win);
-       int getbegx(WINDOW *win);
-       int getbegy(WINDOW *win);
-       int getcurx(WINDOW *win);
-       int getcury(WINDOW *win);
-       int getmaxx(WINDOW *win);
-       int getmaxy(WINDOW *win);
-       int getparx(WINDOW *win);
-       int getpary(WINDOW *win);
+       int getattrs(const WINDOW *win);
+       int getbegx(const WINDOW *win);
+       int getbegy(const WINDOW *win);
+       int getcurx(const WINDOW *win);
+       int getcury(const WINDOW *win);
+       int getmaxx(const WINDOW *win);
+       int getmaxy(const WINDOW *win);
+       int getparx(const WINDOW *win);
+       int getpary(const WINDOW *win);

    DESCRIPTION

    diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index d60089aa..2a05fe5e 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -59,7 +59,7 @@
        extern char * BC;
        extern short ospeed;
 
-       int tgetent(const char *bp, const char *name);
+       int tgetent(char *bp, const char *name);
        int tgetflag(const char *id);
        int tgetnum(const char *id);
        char *tgetstr(const char *id, char **area);
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index ae045189..fe24e490 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -55,10 +55,10 @@

    SYNOPSIS

            #include <curses.h>
 
-       char *unctrl(chtype c);
+       const char *unctrl(chtype c);
        wchar_t *wunctrl(cchar_t *c);
-       char *keyname(int c);
-       char *key_name(wchar_t w);
+       const char *keyname(int c);
+       const char *key_name(wchar_t w);
        void filter(void);
        void nofilter(void);
        void use_env(bool f);
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 5ea4dba6..9882803a 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -246,7 +246,7 @@
        curses(3x)  and  related  pages  whose names begin "form_" for detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index c08cc38f..170819a0 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -481,7 +481,7 @@
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).

    AUTHOR

    diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 79463f31..9227b1f9 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -85,7 +85,7 @@

    SEE ALSO

            curses(3x), tic(1m), infocmp(1m), terminfo(5)
 
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).

    AUTHOR

    diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 6ec5aef6..f02b450f 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -221,7 +221,7 @@
        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).
 
 
 
diff --git a/doc/html/man/mitem_current.3x.html b/doc/html/man/mitem_current.3x.html
index 628ee48c..3f628021 100644
--- a/doc/html/man/mitem_current.3x.html
+++ b/doc/html/man/mitem_current.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_current.3x,v 1.15 2019/01/20 20:32:23 tom Exp @
+  * @Id: mitem_current.3x,v 1.16 2019/03/23 21:47:36 tom Exp @
 -->
 
 
@@ -52,7 +52,7 @@

    SYNOPSIS

            #include <menu.h>
-       int set_current_item(MENU *menu, const ITEM *item);
+       int set_current_item(MENU *menu, ITEM *item);
        ITEM *current_item(const MENU *menu);
        int set_top_row(MENU *menu, int row);
        int top_row(const MENU *menu);
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 630a7805..8ec662d6 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -59,7 +59,7 @@
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (ncurses)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).
 
        The  ncurses  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index c44673f1..d89bedbc 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -112,7 +112,7 @@

    SEE ALSO

            curses(3x)
 
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 89014ecd..d541bd51 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -58,7 +58,7 @@
        int bottom_panel(PANEL *pan);
        int top_panel(PANEL *pan);
        int show_panel(PANEL *pan);
-       void update_panels();
+       void update_panels(void);
        int hide_panel(PANEL *pan);
        WINDOW *panel_window(const PANEL *pan);
        int replace_panel(PANEL *pan, WINDOW *window);
@@ -204,7 +204,7 @@

    SEE ALSO

            curses(3x), curs_variables(3x),
 
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).

    AUTHOR

    diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index f4c96b0d..8f50d22d 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -170,7 +170,7 @@

    SEE ALSO

            tset(1), infocmp(1m), curses(3x), terminfo(5).
 
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).
 
 
 
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
index 021db2f7..42b31cee 100644
--- a/doc/html/man/term_variables.3x.html
+++ b/doc/html/man/term_variables.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -63,17 +63,17 @@
 
        char ttytype[];
 
-       NCURSES_CONST char * const * boolcodes;
-       NCURSES_CONST char * const * boolfnames;
-       NCURSES_CONST char * const * boolnames;
+       NCURSES_CONST char * const boolcodes[];
+       NCURSES_CONST char * const boolfnames[];
+       NCURSES_CONST char * const boolnames[];
 
-       NCURSES_CONST char * const * numcodes;
-       NCURSES_CONST char * const * numfnames;
-       NCURSES_CONST char * const * numnames;
+       NCURSES_CONST char * const numcodes[];
+       NCURSES_CONST char * const numfnames[];
+       NCURSES_CONST char * const numnames[];
 
-       NCURSES_CONST char * const * strcodes;
-       NCURSES_CONST char * const * strfnames;
-       NCURSES_CONST char * const * strnames;
+       NCURSES_CONST char * const strcodes[];
+       NCURSES_CONST char * const strfnames[];
+       NCURSES_CONST char * const strnames[];

    DESCRIPTION

    diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 44775fa0..89ced522 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -74,7 +74,7 @@
        Terminfo describes terminals by giving a set of capabilities which they
        have, by specifying how to perform screen operations, and by specifying
        padding  requirements  and  initialization  sequences.   This describes
-       ncurses version 6.1 (patch 20190316).
+       ncurses version 6.1 (patch 20190323).

    Terminfo Entry Syntax

    diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 7bc0446e..7d26a1b0 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -364,7 +364,7 @@
        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
        term(5).  terminfo(5).
 
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).

    AUTHOR

    diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index b9d9470a..8e750e6a 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -113,7 +113,7 @@
        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
        minfo(5).
 
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 97941dab..3241e5b3 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -522,7 +522,7 @@

    SEE ALSO

            clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
 
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 0bcb79d8..ed8f849b 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -389,7 +389,7 @@
        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
        ttys(5), environ(7)
 
-       This describes ncurses version 6.1 (patch 20190316).
+       This describes ncurses version 6.1 (patch 20190323).
 
 
 
diff --git a/include/curses.h.in b/include/curses.h.in
index d487d488..743ff98c 100644
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 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            *
@@ -32,7 +32,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.263 2018/06/09 20:16:32 tom Exp $ */
+/* $Id: curses.h.in,v 1.264 2019/03/23 23:06:46 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -891,12 +891,6 @@ extern NCURSES_EXPORT(char *) tparm_varargs (const char *, ...);	/* special */
 
 extern NCURSES_EXPORT(char *) tiparm (const char *, ...);		/* special */
 
-/*
- * X/Open says this returns a bool; SVr4 also checked for out-of-range line.
- * The macro provides compatibility:
- */
-#define is_linetouched(w,l) ((!(w) || ((l) > getmaxy(w)) || ((l) < 0)) ? ERR : (is_linetouched)((w),(l)))
-
 /*
  * These functions are not in X/Open, but we use them in macro definitions:
  */
@@ -1432,6 +1426,12 @@ NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list);
 #endif
 #endif
 
+/*
+ * X/Open says this returns a bool; SVr4 also checked for out-of-range line.
+ * The macro provides compatibility:
+ */
+#define is_linetouched(w,l) ((!(w) || ((l) > getmaxy(w)) || ((l) < 0)) ? ERR : (is_linetouched)((w),(l)))
+
 #endif /* NCURSES_NOMACROS */
 
 /*
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index e70e0952..01fc5f67 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 2001-2015,2017 Free Software Foundation, Inc.              *
+.\" Copyright (c) 2001-2017,2019 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            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.19 2017/11/18 23:47:37 tom Exp $
+.\" $Id: curs_getcchar.3x,v 1.21 2019/03/24 00:59:45 tom Exp $
 .TH curs_getcchar 3X ""
 .de bP
 .ie n  .IP \(bu 4
@@ -60,7 +60,7 @@
 .br
 .B "        short \fIcolor_pair\fP,"
 .br
-.B "        void *\fIopts\fP );"
+.B "        const void *\fIopts\fP );"
 .SH DESCRIPTION
 .SS getcchar
 .PP
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index 998abd08..9851b9de 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 2007-2015,2017 Free Software Foundation, Inc.              *
+.\" Copyright (c) 2007-2017,2019 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            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_legacy.3x,v 1.8 2017/11/21 00:45:48 tom Exp $
+.\" $Id: curs_legacy.3x,v 1.9 2019/03/23 21:51:12 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -37,23 +37,23 @@ curs_legacy \- get \fBcurses\fP cursor and window coordinates, attributes
 .SH SYNOPSIS
 \fB#include \fP
 .sp
-\fBint getattrs(WINDOW *win);\fP
+\fBint getattrs(const WINDOW *win);\fP
 .br
-\fBint getbegx(WINDOW *win);\fP
+\fBint getbegx(const WINDOW *win);\fP
 .br
-\fBint getbegy(WINDOW *win);\fP
+\fBint getbegy(const WINDOW *win);\fP
 .br
-\fBint getcurx(WINDOW *win);\fP
+\fBint getcurx(const WINDOW *win);\fP
 .br
-\fBint getcury(WINDOW *win);\fP
+\fBint getcury(const WINDOW *win);\fP
 .br
-\fBint getmaxx(WINDOW *win);\fP
+\fBint getmaxx(const WINDOW *win);\fP
 .br
-\fBint getmaxy(WINDOW *win);\fP
+\fBint getmaxy(const WINDOW *win);\fP
 .br
-\fBint getparx(WINDOW *win);\fP
+\fBint getparx(const WINDOW *win);\fP
 .br
-\fBint getpary(WINDOW *win);\fP
+\fBint getpary(const WINDOW *win);\fP
 .br
 .SH DESCRIPTION
 These legacy functions are simpler to use than the X/Open Curses functions:
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index 2c518618..b20234ae 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 2010-2017,2018 Free Software Foundation, Inc.              *
+.\" Copyright (c) 2010-2018,2019 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            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.10 2018/04/07 20:58:41 tom Exp $
+.\" $Id: curs_sp_funcs.3x,v 1.15 2019/03/24 01:45:40 tom Exp $
 .TH curs_sp_funcs 3X ""
 .na
 .hy 0
@@ -68,7 +68,7 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .br
 \fBint endwin_sp(SCREEN*);\fR
 .br
-\fBint erasechar_sp(SCREEN*);\fR
+\fBchar erasechar_sp(SCREEN*);\fR
 .br
 \fBint extended_color_content_sp(SCREEN *, int, int *, int *, int *);\fR
 .br
@@ -76,7 +76,7 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .br
 \fBint extended_slk_color_sp(SCREEN*, int);\fR
 .br
-\fBint filter_sp(SCREEN*);\fR
+\fBvoid filter_sp(SCREEN*);\fR
 .br
 \fBint find_pair_sp(SCREEN*, int, int);\fR
 .br
@@ -92,7 +92,7 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .br
 \fBWINDOW* getwin_sp(SCREEN*, FILE*);\fR
 .br
-\fBint halfdelay_sp(SCREEN*);\fR
+\fBint halfdelay_sp(SCREEN*, int);\fR
 .br
 \fBbool has_colors_sp(SCREEN*);\fR
 .br
@@ -154,7 +154,7 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .br
 \fBint noecho_sp(SCREEN*);\fR
 .br
-\fBint nofilter_sp(SCREEN*);\fR
+\fBvoid nofilter_sp(SCREEN*);\fR
 .br
 \fBint nonl_sp(SCREEN*);\fR
 .br
@@ -204,7 +204,7 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .br
 \fBint slk_attrset_sp(SCREEN*, const chtype);\fR
 .br
-\fBint slk_attr_sp(SCREEN*);\fR
+\fBattr_t slk_attr_sp(SCREEN*);\fR
 .br
 \fBint slk_clear_sp(SCREEN*);\fR
 .br
@@ -212,7 +212,7 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .br
 \fBint slk_init_sp(SCREEN*, int);\fR
 .br
-\fBint slk_label_sp(SCREEN*, int);\fR
+\fBchar* slk_label_sp(SCREEN*, int);\fR
 .br
 \fBint slk_noutrefresh_sp(SCREEN*);\fR
 .br
@@ -246,7 +246,7 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .br
 \fBvoid use_env_sp(SCREEN*, bool);\fR
 .br
-\fBvoid use_tioctl_sp (SCREEN *, bool)\fR
+\fBvoid use_tioctl_sp(SCREEN *, bool);\fR
 .br
 \fBint use_legacy_coding_sp(SCREEN*, int);\fR
 .br
@@ -262,19 +262,19 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .sp
 \fB#include \fR
 .sp
-\fBint new_form_sp(SCREEN*, FIELD **);\fR
+\fBFORM* new_form_sp(SCREEN*, FIELD **);\fR
 .sp
 \fB#include \fR
 .sp
-\fBint new_menu_sp(SCREEN*, ITEM **);\fR
+\fBMENU* new_menu_sp(SCREEN*, ITEM **);\fR
 .sp
 \fB#include \fR
 .sp
-\fBint ceiling_panel(SCREEN*);\fR
+\fBPANEL* ceiling_panel(SCREEN*);\fR
 .br
 \fBPANEL* ground_panel(SCREEN*);\fR
 .br
-\fBint update_panels_sp(SCREEN*);\fR
+\fBvoid update_panels_sp(SCREEN*);\fR
 .sp
 \fB#include \fR
 .sp
@@ -282,7 +282,7 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .br
 \fBint putp_sp(SCREEN*, const char *);\fR
 .br
-\fBint tgetflag_sp(SCREEN*, char *, const char *);\fR
+\fBint tgetflag_sp(SCREEN*, const char *);\fR
 .br
 \fBint tgetent_sp(SCREEN*, char *, const char *);\fR
 .br
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 34d02f2e..ce12d584 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2018,2019 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            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.40 2018/07/28 21:14:06 tom Exp $
+.\" $Id: curs_termcap.3x,v 1.41 2019/03/23 21:51:12 tom Exp $
 .TH curs_termcap 3X ""
 .de bP
 .ie n  .IP \(bu 4
@@ -61,7 +61,7 @@
 .br
 \fBextern @NCURSES_OSPEED@ ospeed;\fR
 .sp
-\fBint tgetent(const char *bp, const char *name);\fR
+\fBint tgetent(char *bp, const char *name);\fR
 .br
 \fBint tgetflag(const char *id);\fR
 .br
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 969f54fa..cd071b96 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2018,2019 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            *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.54 2018/07/28 22:08:59 tom Exp $
+.\" $Id: curs_util.3x,v 1.55 2019/03/23 21:51:12 tom Exp $
 .TH curs_util 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -57,13 +57,13 @@
 .SH SYNOPSIS
 \fB#include \fR
 .sp
-\fBchar *unctrl(chtype c);\fR
+\fBconst char *unctrl(chtype c);\fR
 .br
 \fBwchar_t *wunctrl(cchar_t *c);\fR
 .br
-\fBchar *keyname(int c);\fR
+\fBconst char *keyname(int c);\fR
 .br
-\fBchar *key_name(wchar_t w);\fR
+\fBconst char *key_name(wchar_t w);\fR
 .br
 \fBvoid filter(void);\fR
 .br
diff --git a/man/mitem_current.3x b/man/mitem_current.3x
index a231cabe..00a876ab 100644
--- a/man/mitem_current.3x
+++ b/man/mitem_current.3x
@@ -27,14 +27,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_current.3x,v 1.15 2019/01/20 20:32:23 tom Exp $
+.\" $Id: mitem_current.3x,v 1.16 2019/03/23 21:47:36 tom Exp $
 .TH mitem_current 3X ""
 .SH NAME
 \fBmitem_current\fR \- set and get current_menu_item
 .SH SYNOPSIS
 \fB#include \fR
 .br
-int set_current_item(MENU *menu, const ITEM *item);
+int set_current_item(MENU *menu, ITEM *item);
 .br
 ITEM *current_item(const MENU *menu);
 .br
diff --git a/man/panel.3x b/man/panel.3x
index 608d7e4c..63babe69 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2018,2019 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            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.26 2018/07/28 22:56:56 tom Exp $
+.\" $Id: panel.3x,v 1.27 2019/03/23 19:23:01 tom Exp $
 .TH panel 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -47,7 +47,7 @@ panel \- panel stack extension for curses
 .br
 \fBint show_panel(PANEL *pan);\fR
 .br
-\fBvoid update_panels();\fR
+\fBvoid update_panels(void);\fR
 .br
 \fBint hide_panel(PANEL *pan);\fR
 .br
diff --git a/man/term_variables.3x b/man/term_variables.3x
index 2644e15a..d336b136 100644
--- a/man/term_variables.3x
+++ b/man/term_variables.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 2011-2015,2017 Free Software Foundation, Inc.              *
+.\" Copyright (c) 2011-2017,2019 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            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term_variables.3x,v 1.9 2017/04/14 08:33:25 tom Exp $
+.\" $Id: term_variables.3x,v 1.10 2019/03/23 21:51:12 tom Exp $
 .TH term_variables 3X ""
 .ds n 5
 .ie \n(.g .ds `` \(lq
@@ -66,23 +66,23 @@
 .sp
 \fBchar ttytype[];\fR
 .sp
-\fBNCURSES_CONST char * const * boolcodes;\fR
+\fBNCURSES_CONST char * const boolcodes[];\fR
 .br
-\fBNCURSES_CONST char * const * boolfnames;\fR
+\fBNCURSES_CONST char * const boolfnames[];\fR
 .br
-\fBNCURSES_CONST char * const * boolnames;\fR
+\fBNCURSES_CONST char * const boolnames[];\fR
 .sp
-\fBNCURSES_CONST char * const * numcodes;\fR
+\fBNCURSES_CONST char * const numcodes[];\fR
 .br
-\fBNCURSES_CONST char * const * numfnames;\fR
+\fBNCURSES_CONST char * const numfnames[];\fR
 .br
-\fBNCURSES_CONST char * const * numnames;\fR
+\fBNCURSES_CONST char * const numnames[];\fR
 .sp
-\fBNCURSES_CONST char * const * strcodes;\fR
+\fBNCURSES_CONST char * const strcodes[];\fR
 .br
-\fBNCURSES_CONST char * const * strfnames;\fR
+\fBNCURSES_CONST char * const strfnames[];\fR
 .br
-\fBNCURSES_CONST char * const * strnames;\fR
+\fBNCURSES_CONST char * const strnames[];\fR
 .br
 .fi
 .SH DESCRIPTION
diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index 310af5c9..dba29809 100644
--- a/ncurses/base/lib_screen.c
+++ b/ncurses/base/lib_screen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 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            *
@@ -41,7 +41,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_screen.c,v 1.93 2018/01/14 17:39:47 tom Exp $")
+MODULE_ID("$Id: lib_screen.c,v 1.94 2019/03/23 23:47:16 tom Exp $")
 
 #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
 
@@ -948,7 +948,7 @@ NCURSES_SP_NAME(scr_restore) (NCURSES_SP_DCLx const char *file)
     T((T_CALLED("scr_restore(%p,%s)"), (void *) SP_PARM, _nc_visbuf(file)));
 
     if (_nc_access(file, R_OK) >= 0
-	&& (fp = fopen(file, "rb")) != 0) {
+	&& (fp = fopen(file, BIN_R)) != 0) {
 	delwin(NewScreen(SP_PARM));
 	NewScreen(SP_PARM) = getwin(fp);
 #if !USE_REENTRANT
@@ -979,7 +979,7 @@ scr_dump(const char *file)
     T((T_CALLED("scr_dump(%s)"), _nc_visbuf(file)));
 
     if (_nc_access(file, W_OK) < 0
-	|| (fp = fopen(file, "wb")) == 0) {
+	|| (fp = fopen(file, BIN_W)) == 0) {
 	result = ERR;
     } else {
 	(void) putwin(newscr, fp);
@@ -1006,7 +1006,7 @@ NCURSES_SP_NAME(scr_init) (NCURSES_SP_DCLx const char *file)
 	FILE *fp = 0;
 
 	if (_nc_access(file, R_OK) >= 0
-	    && (fp = fopen(file, "rb")) != 0) {
+	    && (fp = fopen(file, BIN_R)) != 0) {
 	    delwin(CurScreen(SP_PARM));
 	    CurScreen(SP_PARM) = getwin(fp);
 #if !USE_REENTRANT
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index b35f8215..ec9826e8 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.618 2019/03/09 23:43:24 tom Exp $
+ * $Id: curses.priv.h,v 1.619 2019/03/23 23:45:56 tom Exp $
  *
  *	curses.priv.h
  *
@@ -239,6 +239,13 @@ extern NCURSES_EXPORT(void *) _nc_memmove (void *, const void *, size_t);
 #define S_ISREG(mode) ((mode & S_IFMT) == S_IFREG)
 #endif
 
+/*
+ * POSIX ignores the "b", which c89 specified.  Some very old systems do not
+ * accept it.
+ */
+#define BIN_R	"rb"
+#define BIN_W	"wb"
+
 /*
  * Scroll hints are useless when hashmap is used
  */
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index b43aa952..3d99d9da 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 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            *
@@ -48,7 +48,7 @@
 #include 
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.197 2018/11/24 22:13:16 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.199 2019/03/23 23:42:20 tom Exp $")
 
 /****************************************************************************
  *
@@ -758,7 +758,7 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 
 	    if (fallback) {
 		T(("found fallback entry"));
-		TerminalType(termp) = *fallback;
+		_nc_copy_termtype2(&(TerminalType(termp)), fallback);
 		status = TGETENT_YES;
 	    }
 	}
diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index d4257982..4468bb80 100644
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -41,7 +41,7 @@
 
 #include 
 
-MODULE_ID("$Id: read_entry.c,v 1.153 2019/01/23 00:02:04 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.154 2019/03/23 23:47:16 tom Exp $")
 
 #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
 
@@ -552,7 +552,7 @@ _nc_read_file_entry(const char *const filename, TERMTYPE2 *ptr)
     int code;
 
     if (_nc_access(filename, R_OK) < 0
-	|| (fp = fopen(filename, "rb")) == 0) {
+	|| (fp = fopen(filename, BIN_R)) == 0) {
 	TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno));
 	code = TGETENT_NO;
     } else {
diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index 444cf01e..3d3e36aa 100644
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -50,7 +50,7 @@
 #define TRACE_NUM(n)		/* nothing */
 #endif
 
-MODULE_ID("$Id: write_entry.c,v 1.111 2019/01/20 02:54:14 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.113 2019/03/23 23:47:16 tom Exp $")
 
 static int total_written;
 static int total_parts;
@@ -70,7 +70,7 @@ write_file(char *filename, TERMTYPE2 *tp)
 	_nc_warning("entry is larger than %u bytes", limit);
     } else {
 	FILE *fp = ((_nc_access(filename, W_OK) == 0)
-		    ? fopen(filename, "wb")
+		    ? fopen(filename, BIN_W)
 		    : 0);
 	size_t actual;
 
@@ -466,7 +466,7 @@ _nc_write_entry(TERMTYPE2 *const tp)
 
 	check_writeable(ptr[0]);
 	_nc_SPRINTF(linkname, _nc_SLIMIT(sizeof(linkname))
-		    LEAF_FMT "/%s", ptr[0], ptr);
+		    LEAF_FMT "/%.*s", ptr[0], (int) sizeof(linkname) - 3, ptr);
 
 	if (strcmp(filename, linkname) == 0) {
 	    _nc_warning("self-synonym ignored");
diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index eda50085..717c7da1 100644
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -47,7 +47,7 @@
 
 #include 
 
-MODULE_ID("$Id: lib_trace.c,v 1.91 2019/01/21 14:51:38 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.92 2019/03/23 23:47:16 tom Exp $")
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
@@ -98,7 +98,7 @@ trace(const unsigned int tracelevel)
     if ((MyFP == 0) && tracelevel) {
 	MyInit = TRUE;
 	if (MyFD >= 0) {
-	    MyFP = fdopen(MyFD, "wb");
+	    MyFP = fdopen(MyFD, BIN_W);
 	} else {
 	    if (MyPath[0] == '\0') {
 		size_t size = sizeof(MyPath) - 12;
@@ -115,7 +115,7 @@ trace(const unsigned int tracelevel)
 	    }
 	    if (_nc_access(MyPath, W_OK) < 0
 		|| (MyFD = open(MyPath, O_CREAT | O_EXCL | O_RDWR, 0600)) < 0
-		|| (MyFP = fdopen(MyFD, "wb")) == 0) {
+		|| (MyFP = fdopen(MyFD, BIN_W)) == 0) {
 		;		/* EMPTY */
 	    }
 	}
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 48542d5e..3e8494e7 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190317) unstable; urgency=low
+ncurses6 (6.1+20190323) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 16 Mar 2019 21:23:16 -0400
+ -- Thomas E. Dickey   Sat, 23 Mar 2019 12:13:26 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 48542d5e..3e8494e7 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190317) unstable; urgency=low
+ncurses6 (6.1+20190323) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 16 Mar 2019 21:23:16 -0400
+ -- Thomas E. Dickey   Sat, 23 Mar 2019 12:13:26 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index be79bcbf..c4d7cf65 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190317) unstable; urgency=low
+ncurses6 (6.1+20190323) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 16 Mar 2019 21:23:16 -0400
+ -- Thomas E. Dickey   Sat, 23 Mar 2019 12:13:26 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 1cabf0e5..176d64ec 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.320 2019/03/17 01:23:23 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.321 2019/03/23 16:13:26 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "1"
 !define VERSION_YYYY  "2019"
-!define VERSION_MMDD  "0317"
+!define VERSION_MMDD  "0323"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 56352d4b..83ce2873 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.1
-Release: 20190317
+Release: 20190323
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 783d9281..bed6dd3d 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1
-Release: 20190317
+Release: 20190323
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 6bc6e3cb..319696fe 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.1
-Release: 20190317
+Release: 20190323
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
-- 
2.44.0