CVS commit: pkgsrc/devel/ncurses

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/ncurses
From: "Jonathan Perkin" <jperkin%netbsd.org@localhost>
Date: Mon, 6 May 2024 08:24:05 +0000

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May  6 08:24:05 UTC 2024

Modified Files:
        pkgsrc/devel/ncurses: Makefile PLIST buildlink3.mk distinfo
Removed Files:
        pkgsrc/devel/ncurses: Makefile.common

Log Message:
ncurses: Update to 6.5 and overhaul package.

The first half of this commit message describes the pkgsrc changes, the
second half contains the changes in ncurses 6.5 since 6.4.

This combines ncurses and ncursesw into a single package, and ships
combined versions of libncurses and the ncurses/ include directory.
There are no longer separate versions of libncursesw and ncursesw/.

This aligns with what many other operating systems are doing nowadays,
simplifies the package immensely, provides a consistent interface for
other packages to request curses features, improves performance due to
the removal of questionable code in ncursesw's buildlink3.mk, and fixes
bugs - notably the recent python fallout.

Packages that require wide-curses support can use the standardised
"wide" value for USE_CURSES to ensure they are built against the
wide-curses API, while providing the option for NetBSD's builtin curses
to handle that instead, should support be added in the future.

When opting into the wide-curses API, the NCURSES_WIDECHAR define is
used instead of _XOPEN_SOURCE_EXTENDED as the latter cannot be used on
certain operating systems.

A number of other cleanups are included:

 - stop using a custom TERMINFODIR on SunOS
 - remove unused PLIST_SUBST
 - print-PLIST fixes
 - use newer make syntax
 - pkglint cleanups

This package now conflicts with and supersedes ncursesw-[0-9]*.  Removal
of support for devel/ncursesw will come next.

Release Notes

   These notes are for ncurses 6.5, released April 27, 2024.

   This  release  is  designed  to  be source-compatible with ncurses 5.0
   through  6.4; providing extensions to the application binary interface
   (ABI).  Although  the  source  can  still be configured to support the
   ncurses  5  ABI, the reason for the release is to reflect improvements
   to the ncurses 6 ABI and the supporting utility programs.

   There  are,  of  course,  numerous  other improvements, listed in this
   announcement.

   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.4 release.

  Library improvements

    New features

   These are new features:
     * The low-level terminfo and termcap interfaces are used both by the
       higher-level curses library, as well as by many applications.
       The  functions  which  convert  parameterized  terminal capability
       strings  for output to the terminal (tiparm and tparm) analyze the
       capability string to determine which parameters are strings (i.e.,
       addresses), versus numbers (not addresses).
       The  library's analysis of a capability string may differ from the
       calling  application's design if environment variables are used to
       point  to  an  invalid  terminal  database. This is a longstanding
       problem  with  all  implementations  of  terminfo, dating from the
       early 1980s.
       Two  new  functions  address this problem: by providing a function
       which  allows  the  calling  application  to tell ncurses how many
       string-parameters to expect:
          + tiscan_s  helps  applications  check  formatting capabilities
            that would be passed to tiparm_s.
          + tiparm_s provides applications a way to tell ncurses what the
            expected parameters are for a capability.
     * The  ncurses library supports a compile-time feature (enabled with
       the   configure   --enable-check-size   option)  which  simplifies
       initialization  with  terminals  which  do  not  negotiate  window
       (screen)  size.  This is done in setupterm, by providing for using
       ANSI cursor-position report (in user6/user7 terminfo capabilities)
       to  obtain  the  screen  size  if neither environment variables or
       ioctl is used.
       The  ncurses  test-program  with options "-E -T" demonstrates this
       feature.
     * add functions to query tty-flags in SCREEN

   This release drops compatibility with obsolete versions of tack, e.g.,
   pre-1.08

    Other improvements

   These are improvements to existing features:
     * In  addition  to  the  new,  safer function tiparm_s, ncurses adds
       checks to make the older tiparm, tparm and tgoto functions safer:
          + the  terminfo  functions  tiparm  and  tparm  ensure that the
            capability  string  comes from the terminal description which
            ncurses  loads,  rather  than  from  random  data  which  the
            application happens to have.
          + the  tgoto function disallows capabilities which its analysis
            shows will attempt to use string parameters.
          + ncurses  uses  internal functions which correspond to tiparm,
            and  tgoto which ensure that the capability strings which are
            passed  to  these  functions  come  from  the loaded terminal
            description.
     * improve  check  in  lib_tparm.c, ensuring that a char* fits into a
       TPARM_ARG
     * modify  _nc_syserr_abort  to  use _nc_env_access, rather than only
       checking root uid
     * improve thread lock in lib_trace.c
     * modify  flushinp  to  use  file descriptors in SCREEN, rather than
       from TERMINAL, and check if they are for a terminal, like SVr4
     * modify mcprint to use file descriptor in SCREEN, for consistency
     * modify  internal  function  _nc_read_file_entry  to  show relevant
       filename in warnings
     * improve  checks  in  internal  function convert_string for corrupt
       terminfo entry
     * review/improve handling of out-of-memory conditions
     * limit  delays  to 30 seconds, i.e., padding delays in terminfo, as
       well as napms and delay_output functions
     * fix  reallocation  loop  for  vsnprintf  in  _nc_sprintf_string by
       copying the va_list variable
     * modify  delscreen  to  limit  the windows which it creates to just
       those associated with the screen
     * modify  endwin to return an error if it is called again without an
       intervening screen update
     * modify wenclose to handle pads
     * eliminate use of PATH_MAX in lib_trace.c
     * provide for any CCHARW_MAX greater than 1

   These are corrections to existing features:
     * correct loop termination condition in waddnstr and waddnwstr
     * improve  parsing  in  internal  function _nc_msec_cost, allowing a
       single decimal point
     * amend  parameter check for entire string versus specific length in
       winsnstr  and wins_nwstr to match Solaris; make similar correction
       to wins_nwstr
     * correct   internal   function   wadd_wch_literal   when  adding  a
       non-spacing character to a double-width character
     * correct  definition of Charable macro for non-wide ncurses library
       .

  Program improvements

   Several improvements were made to the utility programs. Some were done
   to  make  the  infocmp  option  "-u" option help refactor the terminal
   database.

   infocmp

          + add  limit  checks  for processing extended capabilities with
            the "-u" option
          + correct  initial  alignment of extended capabilities, so that
            the "-u" option can be used for more than two terminal types
          + modify  "-u"  option  to not report cancels for strings which
            were already cancelled in a use'd chunk.
          + correct  an  assignment  "-u"  for  detecting if a boolean is
            unset  in  a base entry and set in a use'd chunk, i.e., if it
            was cancelled.

   tic

          + correct limit-check when dumping tc/use clause via "-I"
          + check  return  value  of  _nc_save_str, in special case where
            extended   capabilities   are   processed  but  the  terminal
            description was not initialized
          + modify  check for multiply defined aliases to report problems
            within  the  current  runtime  rather than for conflicts with
            pre-existing terminal descriptions.
          + disallow  using $TERMINFO or $HOME/.terminfo when "-o" option
            is used

   tput and tset

          + add "-v" option to tput, to show warnings
          + modify reset command to avoid altering clocal if the terminal
            uses a modem
          + modify  reset feature to avoid 1-second sleep if running in a
            pseudo-terminal

    Examples

   Along  with  the  library and utilities, improvements were made to the
   ncurses-examples:
     * modify test_tparm to account for extended capabilities
     * corrected mouse mask in test/testcurs.c
     * modify test/clip_printw.c to optionally test non-wrapped updates
     * modify test/test_mouse.c to use curses api for raw/noraw
     * modify test/clip_printw.c to optionally test non-wrapped updates

   There is one new demo/test programs:

   test/test_endwin.c
          This program shows the return-status from endwin with different
          combinations of endwin (repeated), initscr, newterm.

  Terminal database

   There are several new terminal descriptions:
     * ansi+apparrows
     * contour
     * linux+kbs for terminals which imitate xterm's behavior with Linux
     * rio, rio-direct
     * mostlike
     * ms-vt100-16color, winconsole
     * vt100+noapp,   vt100+noapp+pc,  xterm+app+pc,  xterm+decedit  from
       xterm #389
     * putty+cursor to reflect amending of modified cursor-keys in 2021
     * wezterm

   There  are  many  changes to existing terminal descriptions. Some were
   updates  to  several  descriptions, using the infocmp "-u" option in a
   script  to  determine  which  building-block  entries could be used to
   replace multiple capability settings (and trim redundant information).

   Other changes include:
     * document XF, kxIN and kxOUT
     * add note on sun regarding wscons/cmdtool/shelltool
     * remove DECCOLM+DECSCLM from foot
     * add xterm+focus to foot+base
     * add ecma+strikeout to putty
     * use CSI 3J in vte-2017
     * use oldxterm+sm+1006 in vte-2014
     * modify xgterm to work around line-drawing bug
     * add  xterm  focus  mode 1004 to xterm+focus as fe/fd capabilities,
       like vim.
     * add xterm+focus to alacritty+common
     * add  XR/xr,  to work with vim, and use RV/rv to denote DA2 and its
       response
     * add  XF  flag  to  xterm+focus so that termcap applications can be
       aware of terminals which may support focus in/out
     * use xterm+focus in xterm-p370 and tmux
     * remove xterm+sm+1006 from tmux
     * NetBSD-related fixes for x68k and wsvt25

  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:
          + add   assignment   in  CF_MAN_PAGES  to  fill  in  value  for
            TERMINFO_DIRS in ncurses, terminfo and tic manpages.
          + clarify  interaction  of  -R  option  versus -C, -I and -r in
            infocmp manpage.
          + correct manpage description of panel_hidden.
          + improve  manpage  description  for addch versus unctrl format
            used for non-printable characters.
          + improve  manpages  discussing  file  descriptors in low-level
            functions.
          + improve description of search rules for terminal descriptions
            in terminfo manpage.
          + modify  dist.mk  to  avoid  passing  developer's  comments in
            manpages into the generated html documentation.
          + modify  test-package  "ncurses6-doc"  to use manpage-aliases,
            which  in  turn  required a change to the configure script to
            factor in the extra-suffix option when deriving alias names.
     * New/improved history and portability sections:
          + add  information  about  "ttycap",  termcap's  forerunner, to
            tset.1
          + document   limitations   of   tparm,   and  error-returns  in
            curs_terminfo.3x
          + document   limitations   of   tgoto,   and  error-returns  in
            curs_termcap.3x
     * Other improvements:
          + This  release  has many changes to improve the formatting and
            style of the manpages.
          + Manpages  now use consistent section-naming, page headers and
            footers (including the modification date for each page).
          + Table layout has been revised.

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

  Interesting bug-fixes

   The  changes to tparm, tgoto which improve the design of the low-level
   interfaces are interesting, but are not bug-fixes per se.

  Configuration changes

    Major changes

   These are the major changes (aside from introducing tiparm_s):
     * use wide-character (ncursesw) by default
     * use opaque typedefs by default

   However,  most  of  the  work  on configure scripts was done to reduce
   warnings within the configure script:
     * intrusive warnings from GNU grep regarding fgrep and egrep
     * fatal  errors  in  compile-checks,  arising from recent "Modern C"
       efforts  by  some  developers  which caused longstanding configure
       checks to fail.
       After  repairing  the  configure  script,  none  of  that activity
       affected  ncurses  because stricter warnings are used routinely in
       development.

   Other improvements made to configure checks include
     * use  string-hacks in alloc_entry.c, alloc_type.c and hardscroll.c,
       overlooked due to compiler changes in recent OpenBSD releases
     * revise progs.priv.h to provide for NC_ISATTY reuse
     * configure check for MB_LEN_MAX provides warning as needed
     * trim   a   space  after  some  "-R"  options,  fixing  builds  for
       applications built using clang and ncurses on Solaris
     * work  around  misconfiguration  of  MacPorts  gcc13, which exposes
       invalid  definition  of  MB_LEN_MAX  in  gcc's  fallback  copy  of
       limits.h
     * modified  experimental  Windows  driver  works  with  xterm  mouse
       protocol

    Configuration options

   There are a few new configure options:

   --disable-setuid-environ
          Compile  with  environment  restriction, so certain environment
          variables  are  not  available when running via a setuid/setgid
          application. These are (for example $TERMINFO) those that allow
          the  search  path  for  the  terminfo  or  termcap  entry to be
          customized.

          A  setuid/setgid application inherits its environment variables
          from  the current user, in contrast to sudo which may limit the
          environment variables that ncurses uses.

   --enable-check-size
          Compile-in  feature to detect screensize for terminals which do
          not advertise their screensize, e.g., serial terminals.

   --with-abi-altered=NUM
          Override  the  displayed  (rather  than  compiled-in) ABI. Only
          packagers who have created configurations where the ABI differs
          from ncurses should be interested in this option.

   --with-strip-program=XXX
          When  stripping  executables  during install, use the specified
          program  rather  than  "strip" overriding program chosen by the
          install program for stripping executables.

   These configure options are modified:

   --with-pkg-config-libdir[=DIR]
          The  optional  DIR parameter can now be "auto" to automatically
          use pkg-config's library directory.

          The default is $(libdir).

   --with-xterm-kbs[=XXX]
          The  default  is  "auto"  which  tells  the configure script to
          choose BS or DEL according to platform defaults.

  Portability

   Many  of  the  portability  changes  are implemented via the configure
   script:
     * add/use   configure   check   for   clock_gettime,   to  supersede
       gettimeofday.
     * modify  configure script check for pkg-config library directory to
       take   into   account   an   older   version   0.15.0  which  used
       PKG_CONFIG_PATH but not PKG_CONFIG_LIBDIR
     * allow for MinGW32-/64-bit configurations to use _DEFAULT_SOURCE
     * modify   CF_XOPEN_SOURCE  macro's  amend  default  case  to  avoid
       undefining _XOPEN_SOURCE if _POSIX_C_SOURCE is defined
     * updated configure script macro CF_XOPEN_SOURCE, for uClibc-ng
     * modify version-check for gcc/g++, now works for msys2
     * build-fixes related to configure-options and/or platform:
          + fix for --enable-fvisibility
          + fix for unusual values of --with-rel-version
          + fix for unusual values of --with-abi-version
          + fix for --disable-tcap-names
          + fix for termcap in nc_access.h
     * other configure-script improvements:
          + recent msys2 headers work with _DEFAULT_SOURCE; amend check
          + use  $ac_includes_default in most cases where stdlib.h should
            work
          + use #error consistently vs "make an error"
          + add configure macro for gettimeofday vs inline check

   Here are some of the other portability fixes:
     * modify  configure  scripts/makefiles  to  omit  KEY_RESIZE  if the
       corresponding SIGWINCH feature is disabled
     * increase MB_CUR_MAX to 16, matching glibc's MB_LEN_MAX
     * add BSD erase2 to characters handled by tset/reset
     * use getauxval when available, to improve setuid/setgid checks
     * set dwShareMode in calls to CreateConsoleScreenBuffer
     * use  CreateFile  with "CONIN$", "CONOUT$" rather than GetStdHandle
       to  obtain a handle on the actual console, avoiding redirection in
       the MinGW/Win32 configurations
     * modify  MinGW  driver  to  return KEY_BACKSPACE when an unmodified
       VK_BACK virtual key is entered
     * modify  MinGW  configuration  to provide for running in MSYS/MSYS2
       shells, assuming ConPTY support


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 pkgsrc/devel/ncurses/Makefile
cvs rdiff -u -r1.53 -r0 pkgsrc/devel/ncurses/Makefile.common
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/ncurses/PLIST
cvs rdiff -u -r1.49 -r1.50 pkgsrc/devel/ncurses/buildlink3.mk
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/ncurses/distinfo

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.116 pkgsrc/devel/ncurses/Makefile:1.117
--- pkgsrc/devel/ncurses/Makefile:1.116 Mon May  6 08:00:28 2024
+++ pkgsrc/devel/ncurses/Makefile       Mon May  6 08:24:05 2024
@@ -1,10 +1,101 @@
-# $NetBSD: Makefile,v 1.116 2024/05/06 08:00:28 jperkin Exp $
-
-.include "Makefile.common"
+# $NetBSD: Makefile,v 1.117 2024/05/06 08:24:05 jperkin Exp $
 
+DISTNAME=      ncurses-6.5
+CATEGORIES=    devel
+MASTER_SITES=  ${MASTER_SITE_GNU:=ncurses/}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://invisible-island.net/ncurses/ncurses.html
+LICENSE=       mit
 COMMENT=       CRT screen handling and optimization package
 
-PLIST_SRC=     ${PKGDIR}/PLIST ${WRKDIR}/PLIST.terminfo
+CONFLICTS+=    ncursesw-[0-9]*
+SUPERSEDES+=   ncursesw-[0-9]*
+
+USE_LANGUAGES=         c c++
+USE_LIBTOOL=           yes
+USE_TOOLS+=            gmake pkg-config tbl
+
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-libtool
+CONFIGURE_ARGS+=       --enable-bsdpad
+CONFIGURE_ARGS+=       --enable-widec
+CONFIGURE_ARGS+=       --disable-overwrite
+CONFIGURE_ARGS+=       --disable-lib-suffixes
+CONFIGURE_ARGS+=       --with-cxx-binding
+CONFIGURE_ARGS+=       --enable-pc-files
+CONFIGURE_ARGS+=       --with-pkg-config-libdir=${PREFIX}/lib/pkgconfig
+CONFIGURE_ARGS+=       --without-ada
+CONFIGURE_ARGS+=       --without-gpm
+CONFIGURE_ARGS+=       --with-manpage-format=normal
+CONFIGURE_ARGS+=       --without-manpage-renames
+CONFIGURE_ARGS+=       --with-default-terminfo-dir=${PREFIX}/${TERMINFODIR}
+CONFIGURE_ARGS+=       --with-terminfo-dirs=${PREFIX}/${TERMINFODIR}
+
+# These libraries are renamed as there were apparently issues back in 2016 when
+# they matched the same names as builtin NetBSD libraries.  It would be good to
+# verify that this is still a problem
+#
+CONFIGURE_ARGS+=       --with-form-libname=gnuform
+CONFIGURE_ARGS+=       --with-menu-libname=gnumenu
+CONFIGURE_ARGS+=       --with-panel-libname=gnupanel
+
+CONFIGURE_ARGS.Darwin+=        --disable-mixed-case
+CONFIGURE_ARGS.SunOS+= --disable-const
+
+TERMINFODIR=           share/terminfo
+
+SUBST_CLASSES+=                rpath
+SUBST_FILES.rpath+=    misc/ncurses-config
+SUBST_STAGE.rpath=     post-configure
+SUBST_SED.rpath+=      -e "s|-L\\(.libdir\\)|${COMPILER_RPATH_FLAG}\\1 -L\\1|"
+SUBST_MESSAGE.rpath=   Fixing rpath in ncurses-config.
+
+SUBST_CLASSES+=                setenv
+SUBST_FILES.setenv=    misc/run_tic.in
+SUBST_STAGE.setenv=    pre-configure
+SUBST_VARS.setenv=     SETENV
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${USE_CROSS_COMPILE:U:tl} == yes
+TOOL_DEPENDS+=         ncurses-[0-9]*:../../devel/ncurses
+CONFIGURE_ENV+=                BUILD_CC=${NATIVE_CC:Q}
+CONFIGURE_ENV+=                ac_cv_path_TIC_PATH=${TOOLBASE:Q}/bin/tic
+ALL_ENV+=              TIC_PATH=${TOOLBASE:Q}/bin/tic
+.endif
+
+# If there's no native tbl(1) then the tools infrastructure would pull in
+# groff, causing various circular dependencies.
+.if defined(TOOLS_TBL)
+CONFIGURE_ARGS+=       --with-manpage-tbl
+.else
+USE_TOOLS:=            ${USE_TOOLS:Ntbl}
+CONFIGURE_ARGS+=       --without-manpage-tbl
+.endif
+
+.include "../../mk/compiler.mk"
+
+# Fix build under FreeBSD 10.2
+.if !empty(PKGSRC_COMPILER:Mclang)
+CONFIGURE_ENV+=                ac_cv_c_compiler_gnu=no
+CONFIGURE_ENV+=                ac_cv_cxx_compiler_gnu=no
+.endif
+
+.if ${CC_VERSION:Mgcc-5.*}
+# Inhibit generation of line markers in the output from the preprocessor
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60723
+CPPFLAGS+=     -P
+.endif
+
+# This prevents tic from writing into ~/.terminfo
+INSTALLATION_DIRS+=    ${TERMINFODIR}
+
+# TERMINFODIR entries are generated automatically.
+PLIST_SRC=             ${PKGDIR}/PLIST ${WRKDIR}/PLIST.terminfo
+PRINT_PLIST_AWK+=      /${TERMINFODIR:S|/|\\/|g}/ { next; }
+
+CHECK_WRKREF_SKIP+=    man/man?/*
 
 post-configure:
        cd ${WRKSRC}/man;                                       \
@@ -23,7 +114,7 @@ post-install:
        ${RM} -f ${DESTDIR}${PREFIX}/${TERMINFODIR}/68/hp70092A
 .endif
        ${FIND} ${DESTDIR}${PREFIX}/${TERMINFODIR} -type f -print | ${SORT} | \
-       ${SED} -e "s,^${DESTDIR}${PREFIX}/,," >${WRKDIR}/PLIST.terminfo
+               ${SED} -e "s,^${DESTDIR}${PREFIX}/,," >${WRKDIR}/PLIST.terminfo
        ${RM} -f ${DESTDIR}${PREFIX}/lib/terminfo
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/ncurses/PLIST
diff -u pkgsrc/devel/ncurses/PLIST:1.29 pkgsrc/devel/ncurses/PLIST:1.30
--- pkgsrc/devel/ncurses/PLIST:1.29     Mon May  6 08:00:28 2024
+++ pkgsrc/devel/ncurses/PLIST  Mon May  6 08:24:05 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2024/05/06 08:00:28 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.30 2024/05/06 08:24:05 jperkin Exp $
 bin/captoinfo
 bin/clear
 bin/infocmp
@@ -21,14 +21,12 @@ include/ncurses/eti.h
 include/ncurses/etip.h
 include/ncurses/form.h
 include/ncurses/menu.h
-include/ncurses/nc_tparm.h
 include/ncurses/ncurses.h
 include/ncurses/ncurses_dll.h
 include/ncurses/panel.h
 include/ncurses/term.h
 include/ncurses/term_entry.h
 include/ncurses/termcap.h
-include/ncurses/tic.h
 include/ncurses/unctrl.h
 lib/libgnuform.la
 lib/libgnumenu.la
@@ -53,15 +51,30 @@ man/man1/tput.1
 man/man1/tset.1
 man/man3/BC.3
 man/man3/COLORS.3
+man/man3/COLOR_BLACK.3
+man/man3/COLOR_BLUE.3
+man/man3/COLOR_CYAN.3
+man/man3/COLOR_GREEN.3
+man/man3/COLOR_MAGENTA.3
 man/man3/COLOR_PAIR.3
 man/man3/COLOR_PAIRS.3
+man/man3/COLOR_RED.3
+man/man3/COLOR_WHITE.3
+man/man3/COLOR_YELLOW.3
 man/man3/COLS.3
+man/man3/ERR.3
 man/man3/ESCDELAY.3
+man/man3/FALSE.3
 man/man3/LINES.3
+man/man3/NCURSES_SCREEN_CB.3
+man/man3/NCURSES_WINDOW_CB.3
+man/man3/OK.3
 man/man3/PAIR_NUMBER.3
 man/man3/PC.3
+man/man3/SCREEN.3
 man/man3/SP.3
 man/man3/TABSIZE.3
+man/man3/TRUE.3
 man/man3/TYPE_ALNUM.3
 man/man3/TYPE_ALPHA.3
 man/man3/TYPE_ENUM.3
@@ -70,6 +83,7 @@ man/man3/TYPE_IPV4.3
 man/man3/TYPE_NUMERIC.3
 man/man3/TYPE_REGEXP.3
 man/man3/UP.3
+man/man3/WINDOW.3
 man/man3/_nc_free_and_exit.3
 man/man3/_nc_free_tinfo.3
 man/man3/_nc_freeall.3
@@ -103,6 +117,7 @@ man/man3/attr_get.3
 man/man3/attr_off.3
 man/man3/attr_on.3
 man/man3/attr_set.3
+man/man3/attr_t.3
 man/man3/attroff.3
 man/man3/attron.3
 man/man3/attrset.3
@@ -114,6 +129,7 @@ man/man3/bkgd.3
 man/man3/bkgdset.3
 man/man3/bkgrnd.3
 man/man3/bkgrndset.3
+man/man3/bool.3
 man/man3/boolcodes.3
 man/man3/boolfnames.3
 man/man3/boolnames.3
@@ -126,8 +142,10 @@ man/man3/can_change_color.3
 man/man3/can_change_color_sp.3
 man/man3/cbreak.3
 man/man3/cbreak_sp.3
+man/man3/cchar_t.3
 man/man3/ceiling_panel.3
 man/man3/chgat.3
+man/man3/chtype.3
 man/man3/clear.3
 man/man3/clearok.3
 man/man3/clrtobot.3
@@ -390,16 +408,24 @@ man/man3/instr.3
 man/man3/intrflush.3
 man/man3/intrflush_sp.3
 man/man3/inwstr.3
+man/man3/is_cbreak.3
+man/man3/is_cbreak_sp.3
 man/man3/is_cleared.3
+man/man3/is_echo.3
+man/man3/is_echo_sp.3
 man/man3/is_idcok.3
 man/man3/is_idlok.3
 man/man3/is_immedok.3
 man/man3/is_keypad.3
 man/man3/is_leaveok.3
 man/man3/is_linetouched.3
+man/man3/is_nl.3
+man/man3/is_nl_sp.3
 man/man3/is_nodelay.3
 man/man3/is_notimeout.3
 man/man3/is_pad.3
+man/man3/is_raw.3
+man/man3/is_raw_sp.3
 man/man3/is_scrollok.3
 man/man3/is_subwin.3
 man/man3/is_syncok.3
@@ -727,6 +753,7 @@ man/man3/set_top_row.3
 man/man3/setcchar.3
 man/man3/setscrreg.3
 man/man3/setsyx.3
+man/man3/setterm.3
 man/man3/setupterm.3
 man/man3/show_panel.3
 man/man3/slk_attr.3
@@ -796,6 +823,8 @@ man/man3/tigetstr.3
 man/man3/tigetstr_sp.3
 man/man3/timeout.3
 man/man3/tiparm.3
+man/man3/tiparm_s.3
+man/man3/tiscan_s.3
 man/man3/top_panel.3
 man/man3/top_row.3
 man/man3/touchline.3

Index: pkgsrc/devel/ncurses/buildlink3.mk
diff -u pkgsrc/devel/ncurses/buildlink3.mk:1.49 pkgsrc/devel/ncurses/buildlink3.mk:1.50
--- pkgsrc/devel/ncurses/buildlink3.mk:1.49     Tue Jun 28 11:31:49 2022
+++ pkgsrc/devel/ncurses/buildlink3.mk  Mon May  6 08:24:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.49 2022/06/28 11:31:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.50 2024/05/06 08:24:05 jperkin Exp $
 
 BUILDLINK_TREE+=       ncurses
 
@@ -6,12 +6,21 @@ BUILDLINK_TREE+=      ncurses
 NCURSES_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ncurses+=        ncurses>=5.3nb1
-BUILDLINK_ABI_DEPENDS.ncurses+=        ncurses>=6.3nb1
+BUILDLINK_ABI_DEPENDS.ncurses+=        ncurses>=6.5
 BUILDLINK_PKGSRCDIR.ncurses?=  ../../devel/ncurses
 
+BUILDLINK_INCDIRS.ncurses+=    include/ncurses
 BUILDLINK_LIBNAME.ncurses=     ncurses
 BUILDLINK_LDADD.ncurses?=      ${BUILDLINK_LIBNAME.ncurses:S/^/-l/:S/^-l$//}
 
+# If a package specifies USE_CURSES=wide then we must enable the wide API in
+# the ncurses headers.  Using the NCURSES_WIDECHAR define is much less
+# intrusive than setting _XOPEN_SOURCE_EXTENDED or _XOPEN_SOURCE.
+#
+.if ${USE_CURSES:U:Mwide}
+BUILDLINK_CPPFLAGS.ncurses+=   -DNCURSES_WIDECHAR=1
+.endif
+
 # Many packages expect the ncurses headers and libraries to be usable as
 # <curses.h> and -lcurses and they often only look in include/ rather than
 # some properly written autoconf macros which also try to pick up
@@ -20,21 +29,12 @@ BUILDLINK_LDADD.ncurses?=   ${BUILDLINK_LI
 BUILDLINK_TARGETS+=            buildlink-ncurses-curses-h
 BUILDLINK_TARGETS+=            buildlink-ncurses-ncurses-h
 BUILDLINK_TARGETS+=            buildlink-ncurses-term-h
-BUILDLINK_INCDIRS.ncurses+=    include/ncurses
 
-# Many packages will prefer ncursesw over ncurses if its available (say as
-# a native library), so unless this file is being included by ncursesw
-# don't allow ncursesw to be used by causing linkage failure.
+# Some packages will only enable wide curses support if they specifically
+# find it in libncursesw, so redirect requests for it to libncurses.
 #
-.include "../../mk/bsd.fast.prefs.mk"
-.if ${PKGPATH} == "devel/ncursesw"
-BUILDLINK_TRANSFORM+=          l:curses:${BUILDLINK_LIBNAME.ncurses}
-.elif empty(BUILDLINK_TREE:Mncursesw)
-BUILDLINK_TRANSFORM+=          l:ncursesw:__nonexistent__
 BUILDLINK_TRANSFORM+=          l:curses:${BUILDLINK_LIBNAME.ncurses}
-.else
-BUILDLINK_TRANSFORM+=          l:curses:${BUILDLINK_LIBNAME.ncursesw}
-.endif
+BUILDLINK_TRANSFORM+=          l:ncursesw:${BUILDLINK_LIBNAME.ncurses}
 
 .PHONY: buildlink-ncurses-curses-h buildlink-ncurses-ncurses-h
 .PHONY: buildlink-ncurses-term-h

Index: pkgsrc/devel/ncurses/distinfo
diff -u pkgsrc/devel/ncurses/distinfo:1.52 pkgsrc/devel/ncurses/distinfo:1.53
--- pkgsrc/devel/ncurses/distinfo:1.52  Sun Mar 31 14:13:17 2024
+++ pkgsrc/devel/ncurses/distinfo       Mon May  6 08:24:05 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.52 2024/03/31 14:13:17 js Exp $
+$NetBSD: distinfo,v 1.53 2024/05/06 08:24:05 jperkin Exp $
 
-BLAKE2s (ncurses-6.4.tar.gz) = bf6718282abda300f0a840bcf03b7fe9444b6200a8ab1ffd826d6181282e97ec
-SHA512 (ncurses-6.4.tar.gz) = 1c2efff87a82a57e57b0c60023c87bae93f6718114c8f9dc010d4c21119a2f7576d0225dab5f0a227c2cfc6fb6bdbd62728e407f35fce5bf351bb50cf9e0fd34
-Size (ncurses-6.4.tar.gz) = 3612591 bytes
+BLAKE2s (ncurses-6.5.tar.gz) = 3de912518d0c9a3cb61cca69d2018bfb28b8b2dbb1a3d68cae70fccaf42da751
+SHA512 (ncurses-6.5.tar.gz) = fc5a13409d2a530a1325776dcce3a99127ddc2c03999cfeb0065d0eee2d68456274fb1c7b3cc99c1937bc657d0e7fca97016e147f93c7821b5a4a6837db821e8
+Size (ncurses-6.5.tar.gz) = 3688489 bytes
 SHA1 (patch-misc_run__tic.in) = a6a8dd89da1a2fbbc5fcabfa6d41ce3a41b75722
 SHA1 (patch-ncurses_base_lib_initscr.c) = 3f47c8ce9b98a82aa8db6b6da55810727559d30c
 SHA1 (patch-ncurses_tinfo_lib_raw.c) = 1adea51819538433b681c209f9754a18d0e37ebb

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index