vendor/ncurses/6.2-20200215vendor/ncurses

16 files changed, 60 insertions, 33 deletions

diff --git a/misc/Makefile.in b/misc/Makefile.in
index dbe7ff255d92..1d83da8fab5c 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -1,6 +1,7 @@
-# $Id: Makefile.in,v 1.72 2019/02/02 19:44:52 tom Exp $
+# $Id: Makefile.in,v 1.73 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.                #
+# Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+# Copyright 1998-2016,2017 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 "Software"), #
diff --git a/misc/chkdef.cmd b/misc/chkdef.cmd
index fa91dce54c22..a80230dff4ab 100644
--- a/misc/chkdef.cmd
+++ b/misc/chkdef.cmd
@@ -1,5 +1,6 @@
 /****************************************************************************

- * Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *

+ * Copyright 2020 Thomas E. Dickey                                          *

+ * Copyright 1998,2006 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 +28,7 @@
  ****************************************************************************/

 

 /*

- * $Id: chkdef.cmd,v 1.3 2006/04/22 23:14:50 tom Exp $

+ * $Id: chkdef.cmd,v 1.4 2020/02/02 23:34:34 tom Exp $

  *

  * Author:  Juan Jose Garcia Ripoll <worm@arrakis.es>.

  * Webpage: http://www.arrakis.es/~worm/

diff --git a/misc/cleantic.cmd b/misc/cleantic.cmd
index 6859de3053de..b09ba57f6e57 100644
--- a/misc/cleantic.cmd
+++ b/misc/cleantic.cmd
@@ -1,5 +1,6 @@
 /****************************************************************************

- * Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *

+ * Copyright 2020 Thomas E. Dickey                                          *

+ * Copyright 1998,2006 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 +28,7 @@
  ****************************************************************************/

 

 /*

- * $Id: cleantic.cmd,v 1.4 2006/04/22 23:14:50 tom Exp $

+ * $Id: cleantic.cmd,v 1.5 2020/02/02 23:34:34 tom Exp $

  *

  * Author:  Juan Jose Garcia Ripoll <worm@arrakis.es>.

  * Webpage: http://www.arrakis.es/~worm/

diff --git a/misc/cmpdef.cmd b/misc/cmpdef.cmd
index 5bb8f6c4ce1c..cd22f2d2fef6 100644
--- a/misc/cmpdef.cmd
+++ b/misc/cmpdef.cmd
@@ -1,5 +1,6 @@
 /****************************************************************************

- * Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *

+ * Copyright 2020 Thomas E. Dickey                                          *

+ * Copyright 1998,2006 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 +28,7 @@
  ****************************************************************************/

 

 /*

- * $Id: cmpdef.cmd,v 1.3 2006/04/22 23:14:50 tom Exp $

+ * $Id: cmpdef.cmd,v 1.4 2020/02/02 23:34:34 tom Exp $

  *

  * Author:  Juan Jose Garcia Ripoll <worm@arrakis.es>.

  * Webpage: http://www.arrakis.es/~worm/

diff --git a/misc/csort b/misc/csort
index 42faaf3a1976..24554196a04d 100755
--- a/misc/csort
+++ b/misc/csort
@@ -1,7 +1,8 @@
 #!/bin/sh
-# $Id: csort,v 1.2 2002/10/19 21:42:09 tom Exp $
+# $Id: csort,v 1.3 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 2002 Free Software Foundation, Inc.                          #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2002 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 "Software"), #
diff --git a/misc/emx.src b/misc/emx.src
index 07a5d2d734e6..901c7b501c92 100644
--- a/misc/emx.src
+++ b/misc/emx.src
@@ -1,5 +1,6 @@
 ##############################################################################
-# Copyright (c) 1998-2006,2020 Free Software Foundation, Inc.                #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 1998-2003,2006 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 "Software"), #
@@ -25,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: emx.src,v 1.11 2020/01/18 19:04:22 tom Exp $
+# $Id: emx.src,v 1.12 2020/02/02 23:34:34 tom Exp $
 # This is a reformatted copy of the terminfo source for OS/2 EMX from
 # Juan Jose Garcia Ripoll <worm@arrakis.es>.
 # http://www.arrakis.es/~worm/
diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index 0c0506371f73..8f00b824b9e4 100644
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,7 +1,8 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.42 2019/12/25 23:09:13 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.44 2020/02/12 00:09:26 tom Exp $
 ##############################################################################
-# Copyright (c) 2009-2018,2019 Free Software Foundation, Inc.                #
+# Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+# Copyright 2009-2015,2018 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 "Software"), #
@@ -125,6 +126,15 @@ then
 	NEED_TINFO=yes
 fi
 
+# The "URL" feature came in pkg-config 0.17
+USEURL=""
+CFGVER=`pkg-config --version 2>/dev/null |head -n 1 | awk -F. '/0.[0-9][0-9]/{print $2;}'`
+# A missing version should simply fail, but some packagers insist on building
+# packages on machines which do not actually have the tools they depend on at
+# runtime.
+[ -z "$CFGVER" ] && CFGVER=30
+[ $CFGVER -ge 17 ] || USEURL="#"
+
 for name in @PC_MODULES_TO_MAKE@
 do
 	name="${name}"
@@ -178,7 +188,7 @@ version=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
 Name: ${name}${suffix}
 Description: $desc
 Version: \${version}
-URL: https://invisible-island.net/ncurses
+${USEURL}URL: https://invisible-island.net/ncurses
 Requires.private: $reqs
 Libs: $lib_flags $LIBS
 Libs.private: @LIBS@ $main_libs
diff --git a/misc/gen_edit.sh b/misc/gen_edit.sh
index 3460afcdf9bb..dadf00357114 100755
--- a/misc/gen_edit.sh
+++ b/misc/gen_edit.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 ##############################################################################
-# Copyright (c) 2004-2011,2012 Free Software Foundation, Inc.                #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2004-2011,2012 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 "Software"), #
@@ -29,7 +30,7 @@
 #
 # Author: Thomas E. Dickey
 #
-# $Id: gen_edit.sh,v 1.5 2012/04/01 15:04:37 tom Exp $
+# $Id: gen_edit.sh,v 1.6 2020/02/02 23:34:34 tom Exp $
 # Generate a sed-script for converting the terminfo.src to the form which will
 # be installed.
 #
diff --git a/misc/magic b/misc/magic
index d7c600e796ed..0fab0049a4f0 100644
--- a/misc/magic
+++ b/misc/magic
@@ -1,6 +1,7 @@
-# $Id: magic,v 1.2 2018/01/05 01:42:08 tom Exp $
+# $Id: magic,v 1.3 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 2015-2017,2018 Free Software Foundation, Inc.                #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2015,2018 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 "Software"), #
diff --git a/misc/makedef.cmd b/misc/makedef.cmd
index 68a35692cd43..12baeca86861 100644
--- a/misc/makedef.cmd
+++ b/misc/makedef.cmd
@@ -1,5 +1,6 @@
 /****************************************************************************

- * Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *

+ * Copyright 2020 Thomas E. Dickey                                          *

+ * Copyright 1998,2006 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 +28,7 @@
  ****************************************************************************/

 

 /*

- * $Id: makedef.cmd,v 1.5 2006/04/22 23:14:50 tom Exp $

+ * $Id: makedef.cmd,v 1.6 2020/02/02 23:34:34 tom Exp $

  *

  * Author:  Juan Jose Garcia Ripoll <worm@arrakis.es>.

  * Webpage: http://www.arrakis.es/~worm/

diff --git a/misc/makellib b/misc/makellib
index 046040734bca..06e50f253d9f 100755
--- a/misc/makellib
+++ b/misc/makellib
@@ -1,6 +1,7 @@
 #!/bin/sh
 ##############################################################################
-# Copyright (c) 1998,2000 Free Software Foundation, Inc.                     #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 1998,2000 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 "Software"), #
@@ -29,7 +30,7 @@
 #
 # Author: Thomas E. Dickey 1996,1997,2000
 #
-# $Id: makellib,v 1.8 2000/10/28 21:37:10 tom Exp $
+# $Id: makellib,v 1.9 2020/02/02 23:34:34 tom Exp $
 # System-dependent wrapper for 'lint' that creates a lint-library via the
 # following method (XXX is the name of the library):
 #	a.  If the file llib-lXXX doesn't exist, create it using the make-rule
diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index 9028fc5e10c1..7f8ba697d118 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,7 +1,8 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.42 2019/12/25 00:54:55 tom Exp $
+# $Id: ncurses-config.in,v 1.43 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 2006-2018,2019 Free Software Foundation, Inc.                #
+# Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+# Copyright 2006-2015,2017 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 "Software"), #
diff --git a/misc/ncurses.supp b/misc/ncurses.supp
index bca582c0540f..29511ea7f7b4 100644
--- a/misc/ncurses.supp
+++ b/misc/ncurses.supp
@@ -1,6 +1,7 @@
-# $Id: ncurses.supp,v 1.7 2008/09/20 18:43:42 tom Exp $
+# $Id: ncurses.supp,v 1.8 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 2008 Free Software Foundation, Inc.                          #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2008 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 "Software"), #
diff --git a/misc/run_tic.in b/misc/run_tic.in
index 6d019decd9d5..b335b48e2a0d 100644
--- a/misc/run_tic.in
+++ b/misc/run_tic.in
@@ -1,7 +1,8 @@
 #!@SHELL@
-# $Id: run_tic.in,v 1.36 2019/06/30 16:29:23 tom Exp $
+# $Id: run_tic.in,v 1.38 2020/02/15 15:30:53 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2017,2019 Free Software Foundation, Inc.                #
+# Copyright 2019,2020 Thomas E. Dickey                                       #
+# Copyright 2000-2012,2017 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 "Software"), #
@@ -144,6 +145,7 @@ Running $TIC_PATH to install $TERMINFO ...
 	document, and install the terminfo without the -x option.
 
 EOF
+$TIC_PATH -V
 if ( $TIC_PATH -x -s -o "$TERMINFO" $source )
 then
 	echo "** built new $TERMINFO"
@@ -163,6 +165,7 @@ Running $TIC_PATH to install $TERMINFO ...
 	document, and install the terminfo without the -x option.
 
 EOF
+$TIC_PATH -V
 if ( $TIC_PATH -s -o "$TERMINFO" $source )
 then
 	echo "** built new $TERMINFO"
diff --git a/misc/shlib b/misc/shlib
index f0eb2afcf9cc..8772d4f4a9e0 100755
--- a/misc/shlib
+++ b/misc/shlib
@@ -1,6 +1,7 @@
 #!/bin/sh
 ##############################################################################
-# Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.                #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 1998-2005,2007 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 "Software"), #
@@ -29,7 +30,7 @@
 #
 # Author: Thomas E. Dickey <dickey@clark.net> 1996
 #
-# $Id: shlib,v 1.12 2007/01/13 17:09:52 tom Exp $
+# $Id: shlib,v 1.13 2020/02/02 23:34:34 tom Exp $
 # Use this script as a wrapper when running executables linked to shared
 # libraries on systems that use the $LD_LIBRARY_PATH variable and don't embed
 # the soname's path within the linked executable (such as IRIX), e.g,
diff --git a/misc/tdlint b/misc/tdlint
index 4a5a05cfb2ff..71b0d89b6d4d 100755
--- a/misc/tdlint
+++ b/misc/tdlint
@@ -1,6 +1,7 @@
 #!/bin/sh
 ##############################################################################
-# Copyright (c) 1998,2000 Free Software Foundation, Inc.                     #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 1998,2000 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 "Software"), #
@@ -29,7 +30,7 @@
 #
 # Author: Thomas E. Dickey <dickey@clark.net> 1996
 #
-# $Id: tdlint,v 1.6 2000/10/28 20:53:36 tom Exp $
+# $Id: tdlint,v 1.7 2020/02/02 23:34:34 tom Exp $
 #
 # Lint-script that allows user's own lint libraries, in addition to the ones
 # installed in the system.