pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/ncurses



Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 19 12:09:20 UTC 2023

Modified Files:
        pkgsrc/devel/ncurses: Makefile Makefile.common builtin.mk distinfo
Removed Files:
        pkgsrc/devel/ncurses/patches: patch-misc_terminfo.src

Log Message:
ncurses: update to 6.4.

   The   most  important  bug-fixes/improvements  dealt  with  robustness
   issues.  The  release notes also mention some other bug-fixes, but are
   focused  on  new  features and improvements to existing features since
   ncurses 6.3 release.

  Library improvements

    New features

   There are no new features in this release.

    Other improvements

   These are improvements to existing features:
     * modify  delscreen  to  more  effectively delete all windows on the
       given screen.
     * modify  wnoutrefresh  to  call  pnoutrefresh if its parameter is a
       pad,  rather than treating it as an error, and modify new_panel to
       permit its window-parameter to be a pad
     * modify  curses_trace()  to  show  the trace-mask as symbols, e.g.,
       TRACE_ORDINARY, DEBUG_LEVEL(3).
     * improve  checks  for valid mouse events when an intermediate mouse
       state is not part of the mousemask specified by the caller
     * allow extended-color number in opts parameter of wattr_on.
     * improve _tracecchar_t2 formatting of base+combining character.
     * trim  out some unwanted linker options from ncurses*config and .pc
       files seen in Fedora 36+.
     * improve shell-scripts with shellcheck
     * improve use of "trap" in shell scripts, using a script.
     * modify make-tar.sh scripts to make timestamps more predictable.

   These are corrections to existing features:
     * modify  misc/gen-pkgconfig.in  to  allow  for  the  case where the
       library  directory  does  not  yet  exist, since this is processed
       before doing an install
     * set trailing null on string passed from winsnstr to wins_nwstr.
     * modify  waddch_literal  to  allow  for double-width base character
       when merging a combining character

  Program improvements

   Several improvements were made to the utility programs:

   infocmp

          + rewrite  canonical_name  function of infocmp to ensure buffer
            size
          + improve  readability  of  long parameterized expressions with
            the  infocmp  "-f"  option  by  allowing  split before a "%p"
            marker.
          + modify   verbose-option   of  infocmp,  tic,  toe  to  enable
            debug-tracing if that is configured.

   tabs
          limit tab-stop values to max-columns

   tic
          add   consistency   check   in   tic  for  u6/u7/u8/u9  and  NQ
          capabilities.

   tput
          corrected use of original tty-modes in init/reset subcommands

    Examples

   Along  with  the  library and utilities, improvements were made to the
   ncurses-examples.  Most  of  this  activity  aimed  at  improving  the
   test-packages:
     * add  minimal  -h  (usage)  and  -V  (version)  getopt logic to all
       ncurses-examples programs.
     * fix an error in "@" command in test/ncurses.c F-menu
     * add curses_trace to ifdef's for START_TRACE in test/test.priv.h
     * improve pthread-configuration for test/worm.c
     * add setlocale call to several test-programs.
     * workaround  in  test/picsmap.c  for  use of floating point for rgb
       values by ImageMagick 6.9.11, which appears to use the wrong upper
       limit.
     * use  static libraries for AdaCurses test-package for Mageia, since
       no gprbuild package is available.
     * install  Ada95  sample  programs  in  libexecdir, adding a wrapper
       script to invoke those.
     * install  ncurses-examples programs in libexecdir, adding a wrapper
       script to invoke those.

   There are other new demo/test programs and reusable examples:

   test/combine
          demonstrate combining characters

   test/test_delwin
          demonstrate deleting a window

   test/test_mouse
          observe  mouse  events  in  the  raw terminal or parsed ncurses
          modes

   test/test_unget_wch
          demonstrate the unget_wch and unget functions

  Terminal database

   There are several new terminal descriptions:
     * mosh
     * mosh-256color
     * teken-16color
     * teken-sc
     * teken-vt
     * xgterm

   There  are  many  changes to existing terminal descriptions. Some were
   updates to several descriptions:
     * make description-fields distinct
     * fix errata in description fields
     * add/use several building-blocks:
          + aixterm+sl
          + ansi+cpr
          + apollo+vt132
          + decid+cpr
          + ncr260vp+sl
          + wyse+sl
          + x10term+sl
          + xterm+acs
          + xterm+alt47

   while  others  affected specific descriptions. These were retested, to
   take into account changes by their developers:
     * kitty
     * teken

   while  these are specific fixes based on reviewing documentation, user
   reports, or warnings from tic:

   att610+cvis0
          amended note as per documentation for att610, att620, att730

   kon, kon2, jfbterm
          revise to undo "linux2.6" change to smacs/rmacs/enacs

   st-0.6
          add dim, ecma+strikeout

   foot+base
          add xterm+sl-alt

   dec+sl
          correct dsl in dec+sl

   mintty and tmux
          correct setal in mintty/tmux entries, add to vte-2018

   nsterm
          modify nsterm to use xterm+alt1049

   putty
          modify putty to use xterm+alt1049

   vte-2018
          add blink and setal

   A few entries use extensions (user-defined terminal capabilities):
     * use  ansi+enq  and  decid+cpr in cases where the terminal probably
       supported the u6-u9 extension
     * remove u6-u9 from teken-2018
     * use  NQ  to flag entries where the terminal does not support query
       and response
     * add/use bracketed+paste to help identify terminals supporting this
       xterm feature
     * modify  samples  for xterm mouse 1002/1003 modes to use 1006 mode,
       and also provide for focus in/out responses
     * xterm  patch  #371 supports DEC-compatible status-line. add dec+sl
       to  xterm-new, per xterm #371, add xterm-p371, add xterm-p370, for
       use  in  older  terminals, and set "xterm-new" to "xterm-p370" (to
       ease adoption).

  Documentation

   As usual, this release
     * improves documentation by describing new features,
     * attempts  to  improve the description of features which users have
       found confusing
     * fills  in overlooked descriptions of features which were described
       in the NEWS file but treated sketchily in manual pages.

   In  addition  to  providing  background  information  to explain these
   features   and   show   how   they  evolved,  there  are  corrections,
   clarifications, etc.:
     * Corrections:
          + remove a stray '/' from description of %g in terminfo(5).
          + correct/improve  font-formatting in curs_getch.3x, as well as
            other manual pages.
     * New/improved history and portability sections:
          + add portability notes for delscreen and delwin in manual.
          + improve curs_slk.3x discussion of extensions and portability
     * Other improvements:
          + improve  curs_bkgd.3x,  explaining  that  bkgdset  can affect
            results for bkgd
          + add note on portable memory-leak checking in curs_memleaks.3x
          + expanded description in resizeterm.3x
          + add  section  on  releasing  memory  to  curs_termcap.3x  and
            curs_terminfo.3x manpages.
          + add  clarification  of  the  scope  of  dynamic  variables in
            terminfo(5).
          + improve formatting of ncurses-intro.html and hackguide.html
          + improve curs_clear.3x links to other pages
          + update  ncurses-howto,  making documentation fixes along with
            corrections to example programs.
          + use  newer  version  1.36 of gnathtml for generating Ada html
            files.
          + update external links in Ada95.html

   There  are  no new manual pages (all of the manual page updates are to
   existing pages).

  Interesting bug-fixes

   While  there  were  many bugs fixed during development of ncurses 6.4,
   only  a  few  (the  reason  for  this release) were both important and
   interesting. Most of the bug-fixes were for local issues which did not
   affect  compatibility across releases. Since those are detailed in the
   NEWS file no elaboration is needed here.

   The  interesting  bugs were those dealing with memory leaks and buffer
   overflows.  Although  the utilities are designed for text files (which
   they do properly), some choose to test them with non-text files.
     * Text  files  contain  no  embedded  nulls.  Also,  they end with a
       newline.  Feeding tic non-text files exposed a few cases where the
       program  did  not  check  for  those  issues. As a result, further
       processing  of the input found limit-checks whose assumptions were
       invalid.
     * Fixing  the limit-checks (first) found a problem with tic managing
       the  list  of  strings  in  a terminal description. In merging two
       terminal  descriptions  (i.e.,  the  "use="  feature), tic was not
       allocating  a  complete copy. A quick repair for that introduced a
       memory leak.
     * The  checks  for non-text files are improved (i.e., embedded nulls
       in  the  input  file  will  cause  tic  to  reject  it rather than
       attempting to process it).
     * The string allocations in tic are likewise improved.

  Configuration changes

    Major changes

   There  are  no  major  changes.  No  new  options  were added. Several
   improvements were made to configure checks.

    Configuration options

   There are a few new/modified configure options:

   --with-abi-version
          add ABI 7 defaults to configure script.

   --with-caps
          add   warning   in  configure  script  if  file  specified  for
          "--with-caps" does not exist.

   --with-manpage-format
          bzip2 and xz compression are now supported

   --with-xterm-kbs
          add    check/warning    in    configure    script   if   option
          "--with-xterm-kbs" is missing or inconsistent

  Portability

   Many  of  the  portability  changes  are implemented via the configure
   script:
     * amend  configure option's auto-search to account for systems where
       none of the directories known to pkg-config exist
     * corrected regex needed for older pkg-config used in Solaris 10
     * improve  handling of --with-pkg-config-libdir option, allowing for
       the case where either $PKG_CONFIG_LIBDIR or the option value has a
       colon-separated list of directories
     * if   the   --with-pkg-config-libdir   option  is  not  given,  use
       ${libdir}/pkgconfig as a default
     * improve search-path check for pkg-config, e.g., for Debian testing
       which installs pkg-config with architecture-prefixes.
     * build-fix for cross-compiling to MingW, conditionally add -lssp
     * improve configure check for getttynam
     * fixes to build with dietlibc:
          + add configure check for fpathconf
          + add   configure   check   for  math  sine/cosine,  needed  in
            test/tclock, and eliminate pow() from test/hanoi
          + use wcsnlen as an alternative to wmemchr if it is not found
     * modify  configure macro CF_BUILD_CC to check if the build-compiler
       works,  rather  than that it is different from the cross-compiler,
       e.g.,  to  accommodate  a  compiler  which  can be used for either
       purpose with different flags
     * modify  configure/scripts  to work around interference by GNU grep
       3.8

   Here are some of the other portability fixes:
     * change  man_db.renames  to  template,  to  handle  ncurses*-config
       script with the --extra-suffix configure option.
     * update   CF_XOPEN_SOURCE  macro,  adding  variants  "gnueabi"  and
       "gnueabihf" to get _DEFAULT_SOURCE special case, as well as adding
       GNU  libc  suffixes for "abi64", "abin32", "x32" to distinguish it
       from other libc flavors.
     * work  around  musl's  nonstandard  use  of  feature test macros by
       adding  a  definition  for NCURSES_WIDECHAR to the generated ".pc"
       and *-config files.
     * use  "command  -v"  rather than "type" in Ada95/gen/Makefile.in to
       fix a portability issue.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/devel/ncurses/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/ncurses/Makefile.common \
    pkgsrc/devel/ncurses/distinfo
cvs rdiff -u -r1.43 -r1.44 pkgsrc/devel/ncurses/builtin.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/devel/ncurses/patches/patch-misc_terminfo.src

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ncurses/Makefile
diff -u pkgsrc/devel/ncurses/Makefile:1.114 pkgsrc/devel/ncurses/Makefile:1.115
--- pkgsrc/devel/ncurses/Makefile:1.114 Tue Jun 28 11:31:49 2022
+++ pkgsrc/devel/ncurses/Makefile       Thu Jan 19 12:09:20 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.114 2022/06/28 11:31:49 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2023/01/19 12:09:20 wiz Exp $
 
-PKGREVISION= 1
 .include "Makefile.common"
 
 COMMENT=       CRT screen handling and optimization package

Index: pkgsrc/devel/ncurses/Makefile.common
diff -u pkgsrc/devel/ncurses/Makefile.common:1.50 pkgsrc/devel/ncurses/Makefile.common:1.51
--- pkgsrc/devel/ncurses/Makefile.common:1.50   Mon Jul 25 21:47:53 2022
+++ pkgsrc/devel/ncurses/Makefile.common        Thu Jan 19 12:09:20 2023
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.50 2022/07/25 21:47:53 wiz Exp $
+# $NetBSD: Makefile.common,v 1.51 2023/01/19 12:09:20 wiz Exp $
 #
 # used by devel/ncurses/Makefile
 # used by devel/ncursesw/Makefile
 
 DISTNAME=      ncurses-${NC_VERS}
-NC_VERS=       6.3
+NC_VERS=       6.4
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=ncurses/}
 MASTER_SITES+= ftp://dickey.his.com/ncurses/
@@ -50,7 +50,7 @@ SUBST_VARS.setenv=    SETENV
 
 CONFIGURE_ARGS.Darwin+=        --disable-mixed-case
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if ${USE_CROSS_COMPILE:U:tl} == yes
 TOOL_DEPENDS+=         ncurses-${NC_VERS}:../../devel/ncurses
 CONFIGURE_ENV+=                BUILD_CC=${NATIVE_CC:Q}
 CONFIGURE_ENV+=                ac_cv_path_TIC_PATH=${PREFIX}/bin/tic
Index: pkgsrc/devel/ncurses/distinfo
diff -u pkgsrc/devel/ncurses/distinfo:1.50 pkgsrc/devel/ncurses/distinfo:1.51
--- pkgsrc/devel/ncurses/distinfo:1.50  Tue Nov 16 15:19:59 2021
+++ pkgsrc/devel/ncurses/distinfo       Thu Jan 19 12:09:20 2023
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.50 2021/11/16 15:19:59 wiz Exp $
+$NetBSD: distinfo,v 1.51 2023/01/19 12:09:20 wiz Exp $
 
-BLAKE2s (ncurses-6.3.tar.gz) = 01d40dd10a5592a332b38c90344e5e42e7475f53bee3bd4e50f5de90e4623e67
-SHA512 (ncurses-6.3.tar.gz) = 5373f228cba6b7869210384a607a2d7faecfcbfef6dbfcd7c513f4e84fbd8bcad53ac7db2e7e84b95582248c1039dcfc7c4db205a618f7da22a166db482f0105
-Size (ncurses-6.3.tar.gz) = 3583550 bytes
+BLAKE2s (ncurses-6.4.tar.gz) = bf6718282abda300f0a840bcf03b7fe9444b6200a8ab1ffd826d6181282e97ec
+SHA512 (ncurses-6.4.tar.gz) = 1c2efff87a82a57e57b0c60023c87bae93f6718114c8f9dc010d4c21119a2f7576d0225dab5f0a227c2cfc6fb6bdbd62728e407f35fce5bf351bb50cf9e0fd34
+Size (ncurses-6.4.tar.gz) = 3612591 bytes
 SHA1 (patch-misc_run__tic.in) = a6a8dd89da1a2fbbc5fcabfa6d41ce3a41b75722
-SHA1 (patch-misc_terminfo.src) = fde0f1fc8d0d83cc400b314f6e077b99e975c44c

Index: pkgsrc/devel/ncurses/builtin.mk
diff -u pkgsrc/devel/ncurses/builtin.mk:1.43 pkgsrc/devel/ncurses/builtin.mk:1.44
--- pkgsrc/devel/ncurses/builtin.mk:1.43        Tue Nov 16 15:19:59 2021
+++ pkgsrc/devel/ncurses/builtin.mk     Thu Jan 19 12:09:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.43 2021/11/16 15:19:59 wiz Exp $
+# $NetBSD: builtin.mk,v 1.44 2023/01/19 12:09:20 wiz Exp $
 
 BUILTIN_PKG:=  ncurses
 
@@ -27,8 +27,8 @@ BUILTIN_FIND_FILES.NCURSES_PC=                /usr/lib
 IS_BUILTIN.ncurses=    no
 .  if empty(H_NCURSES:M__nonexistent__) && \
       empty(H_NCURSES:M${LOCALBASE}/*) && \
-      (!empty(BUILTIN_LIB_FOUND.ncurses:M[yY][eE][sS]) || \
-       !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]))
+      (${BUILTIN_LIB_FOUND.ncurses:U:tl} == yes || \
+       ${BUILTIN_LIB_FOUND.curses:U:tl} == yes)
 IS_BUILTIN.ncurses=    yes
 .  endif
 .endif
@@ -39,7 +39,7 @@ MAKEVARS+=            IS_BUILTIN.ncurses
 ### a package name to represent the built-in package.
 ###
 .if !defined(BUILTIN_PKG.ncurses) && \
-    !empty(IS_BUILTIN.ncurses:M[yY][eE][sS]) && \
+    ${IS_BUILTIN.ncurses:tl} == yes && \
     empty(H_NCURSES:M__nonexistent__)
 BUILTIN_VERSION.ncurses!=                                              \
        ${AWK} '/\#define[      ]*NCURSES_VERSION[      ]/ {            \
@@ -62,10 +62,10 @@ USE_BUILTIN.ncurses=        no
 .  else
 USE_BUILTIN.ncurses=   ${IS_BUILTIN.ncurses}
 .    if defined(BUILTIN_PKG.ncurses) && \
-        !empty(IS_BUILTIN.ncurses:M[yY][eE][sS])
+        ${IS_BUILTIN.ncurses:tl} == yes
 USE_BUILTIN.ncurses=   yes
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.ncurses}
-.        if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
+.        if ${USE_BUILTIN.ncurses:tl} == yes
 USE_BUILTIN.ncurses!=                                                  \
        if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.ncurses:Q}; then \
                ${ECHO} yes;                                            \
@@ -102,14 +102,14 @@ MAKEVARS+=                USE_BUILTIN.ncurses
 
 # If USE_NCURSES is set to yes, the use of an ncurses implementation
 # is forced.
-.if defined(USE_NCURSES) && !empty(USE_NCURSES:M[yY][eE][sS])
-.  if !empty(IS_BUILTIN.ncurses:M[nN][oO])
+.if defined(USE_NCURSES) && ${USE_NCURSES:U:tl} == yes
+.  if ${IS_BUILTIN.ncurses:tl} == no
 USE_BUILTIN.ncurses=   no
 .  endif
 .endif
 # If it is set to chgat, a curses implementation with chgat(3) support
 # is considered good enough.
-.if defined(USE_NCURSES) && empty(USE_NCURSES:M[yY][eE][sS])
+.if defined(USE_NCURSES) && ${USE_NCURSES:U:tl} != yes
 .  if ${USE_NCURSES:U} == chgat && ${H_CURSES:U} == __nonexistent__
 USE_BUILTIN.ncurses=   no
 .  endif
@@ -121,7 +121,7 @@ USE_BUILTIN.ncurses=        no
 
 # if terminfo is needed and we don't have it, use pkgsrc ncurses
 .if defined(USE_TERMINFO)
-.  if !empty(BUILTIN_LIB_FOUND.terminfo:M[nN][oO])
+.  if ${BUILTIN_LIB_FOUND.terminfo:U:tl} == no
 USE_BUILTIN.ncurses=   no
 .  endif
 .endif
@@ -129,9 +129,9 @@ USE_BUILTIN.ncurses=        no
 # Define BUILTIN_LIBNAME.ncurses to be the base name of the built-in
 # ncurses library.
 #
-.if !empty(BUILTIN_LIB_FOUND.ncurses:M[yY][eE][sS])
+.if ${BUILTIN_LIB_FOUND.ncurses:U:tl} == yes
 BUILTIN_LIBNAME.ncurses=       ncurses
-.elif !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
+.elif ${BUILTIN_LIB_FOUND.curses:U:tl} == yes
 BUILTIN_LIBNAME.ncurses=       curses
 .endif
 #
@@ -140,7 +140,7 @@ BUILTIN_LIBNAME.ncurses=    curses
 # turn "-lncurses" into "-lcurses".
 #
 .if (${OPSYS} == "Interix") && \
-    !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
+    ${BUILTIN_LIB_FOUND.curses:U:tl} == yes
 BUILTIN_LIBNAME.ncurses=       curses
 .endif
 
@@ -149,9 +149,9 @@ BUILTIN_LIBNAME.ncurses=    curses
 ### solely to determine whether a built-in implementation exists.
 ###
 CHECK_BUILTIN.ncurses?=        no
-.if !empty(CHECK_BUILTIN.ncurses:M[nN][oO])
+.if ${CHECK_BUILTIN.ncurses:tl} == no
 
-.  if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
+.  if ${USE_BUILTIN.ncurses:tl} == yes
 BUILDLINK_LIBNAME.ncurses=     ${BUILTIN_LIBNAME.ncurses}
 BUILDLINK_TRANSFORM+=          l:ncurses:${BUILTIN_LIBNAME.ncurses}
 BUILDLINK_TARGETS+=            buildlink-curses-ncurses-h



Home | Main Index | Thread Index | Old Index