bucket_C8/bash

   1 # Buildsheet autogenerated by ravenadm tool -- Do not edit.
   2
   3 NAMEBASE=               bash
   4 VERSION=                5.2.p15
   5 KEYWORDS=               shells
   6 VARIANTS=               standard static
   7 SDESC[standard]=        GNU Bourne Again SHell
   8 SDESC[static]=          Static GNU Bourne Again SHell
   9 HOMEPAGE=               http://www.gnu.org/software/bash/bash.html
  10 CONTACT=                nobody
  11
  12 DOWNLOAD_GROUPS=        main patches
  13 SITES[main]=            GNU/bash
  14 SITES[patches]=         GNU/bash/bash-5.2-patches
  15 DISTFILE[1]=            bash-5.2.tar.gz:main
  16 DISTFILE[2]=            bash52-001:patches
  17 DISTFILE[3]=            bash52-002:patches
  18 DISTFILE[4]=            bash52-003:patches
  19 DISTFILE[5]=            bash52-004:patches
  20 DISTFILE[6]=            bash52-005:patches
  21 DISTFILE[7]=            bash52-006:patches
  22 DISTFILE[8]=            bash52-007:patches
  23 DISTFILE[9]=            bash52-008:patches
  24 DISTFILE[10]=           bash52-009:patches
  25 DISTFILE[11]=           bash52-010:patches
  26 DISTFILE[12]=           bash52-011:patches
  27 DISTFILE[13]=           bash52-012:patches
  28 DISTFILE[14]=           bash52-013:patches
  29 DISTFILE[15]=           bash52-014:patches
  30 DISTFILE[16]=           bash52-015:patches
  31 DIST_SUBDIR=            bash
  32 DF_INDEX=               1
  33 SPKGS[standard]=        complete
  34                         primary
  35                         nls
  36                         docs
  37 SPKGS[static]=          primary
  38
  39 OPTIONS_AVAILABLE=      STATIC NLS NOTSTD
  40 OPTIONS_STANDARD=       STATIC NLS
  41 VOPTS[static]=          STATIC=ON NLS=OFF NOTSTD=ON
  42 OPT_ON[all]=            NLS
  43
  44 BUILD_DEPENDS=          ncurses:dev:standard
  45 RUN_DEPENDS=            ncurses:terminfo:standard
  46
  47 USES=                   bison cpe solaris-funcs
  48
  49 DISTNAME=               bash-5.2
  50
  51 LICENSE=                GPLv3+:primary
  52 LICENSE_TERMS=          primary:{{WRKDIR}}/TERMS
  53 LICENSE_FILE=           GPLv3+:{{WRKSRC}}/COPYING
  54 LICENSE_AWK=            TERMS:"<config.h>"
  55 LICENSE_SOURCE=         TERMS:{{WRKSRC}}/version.c
  56 LICENSE_SCHEME=         solo
  57
  58 CPE_VENDOR=             gnu
  59 INFO_SUBDIR=            .
  60 SOL_FUNCTIONS=          mkdtemp:lib/sh/tmpfile.c
  61
  62 MUST_CONFIGURE=         gnu
  63 CONFIGURE_ARGS=         --enable-readline
  64                         --enable-progcomp
  65                         --enable-process-substitution
  66                         --enable-history
  67                         --enable-help-builtin
  68                         --enable-extended-glob
  69                         --enable-dparen-arithmetic
  70                         --enable-directory-stack
  71                         --enable-debugger
  72                         --enable-cond-regexp
  73                         --enable-alias
  74                         --enable-brace-expansion
  75                         --enable-array-variables
  76                         --without-bash-malloc
  77
  78 INSTALL_REQ_TOOLCHAIN=  yes
  79
  80 CPPFLAGS=               -DDEFAULT_PATH_VALUE='\"{{STANDARD_PATH}}:{{LOCALBASE}}/sbin:{{LOCALBASE}}/bin\"'
  81                         -DSTANDARD_UTILS_PATH='\"{{STANDARD_PATH}}\"'
  82 VAR_OPSYS[freebsd]=     VAR1=-Wl,--export-dynamic
  83 VAR_OPSYS[linux]=       VAR1=-Wl,--export-dynamic
  84 VAR_OPSYS[netbsd]=      VAR1=-Wl,--export-dynamic
  85 VAR_OPSYS[dragonfly]=   VAR1=-Wl,--export-dynamic
  86
  87 [NOTSTD].DESCRIPTION=                   Non-standard designation
  88 [NOTSTD].INFO_OFF=                      primary:bash
  89 [NOTSTD].USES_OFF=                      makeinfo
  90
  91 [STATIC].BUILDRUN_DEPENDS_OFF=          ncurses:primary:standard
  92 [STATIC].CFLAGS_ON=                     -fcommon
  93
  94 [NLS].CONFIGURE_ARGS_ON=                --with-libiconv-prefix={{ICONV_PREFIX}}
  95 [NLS].CONFIGURE_ENABLE_BOTH=            nls
  96 [NLS].USES_ON=                          gettext
  97                                         iconv
  98
  99 post-patch:
 100         # Ensure y.tab.c is regenerated
 101         ${TOUCH} ${WRKSRC}/parse.y
 102         ${RM} ${WRKSRC}/y.tab.c
 103         ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1
 104
 105 post-install-NOTSTD-ON:
 106         ${RM} -r ${STAGEDIR}${STD_DOCDIR}
 107
 108 post-install-STATIC-ON:
 109         # These are not installed when --enable-static-link set
 110         ${RM} -r ${STAGEDIR}${PREFIX}/include
 111         ${RM} -r ${STAGEDIR}${PREFIX}/lib
 112
 113 post-install:
 114         ${LN} -sf bash ${STAGEDIR}${PREFIX}/bin/rbash
 115         ${RM} ${STAGEDIR}${STD_DOCDIR}/CHANGES
 116
 117 post-configure:
 118         ${FIND} ${WRKSRC} -name Makefile -print0 | ${XARGS} -0 \
 119                 ${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|"
 120
 121 post-extract-STATIC-ON:
 122         # force static linking
 123         ${RM} ${LOCALBASE}/lib/libncurses.so
 124
 125 [FILE:310:descriptions/desc.primary]
 126 This is GNU Bash.  Bash is the GNU Project's Bourne Again SHell,
 127 a complete implementation of the POSIX.2 shell spec, but also
 128 with interactive command line editing, job control on architectures
 129 that support it, csh-like features such as history substitution and
 130 brace expansion, and a slew of other features.
 131
 132
 133 [FILE:1509:distinfo]
 134 a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb     10950833 bash/bash-5.2.tar.gz
 135 f42f2fee923bc2209f406a1892772121c467f44533bedfe00a176139da5d310a         1381 bash/bash52-001
 136 45cc5e1b876550eee96f95bffb36c41b6cb7c07d33f671db5634405cd00fd7b8         1328 bash/bash52-002
 137 6a090cdbd334306fceacd0e4a1b9e0b0678efdbbdedbd1f5842035990c8abaff         2157 bash/bash52-003
 138 38827724bba908cf5721bd8d4e595d80f02c05c35f3dd7dbc4cd3c5678a42512         2016 bash/bash52-004
 139 ece0eb544368b3b4359fb8464caa9d89c7a6743c8ed070be1c7d599c3675d357         1515 bash/bash52-005
 140 d1e0566a257d149a0d99d450ce2885123f9995e9c01d0a5ef6df7044a72a468c         8790 bash/bash52-006
 141 2500a3fc21cb08133f06648a017cebfa27f30ea19c8cbe8dfefdf16227cfd490         9072 bash/bash52-007
 142 6b4bd92fd0099d1bab436b941875e99e0cb3c320997587182d6267af1844b1e8         1771 bash/bash52-008
 143 f95a817882eaeb0cb78bce82859a86bbb297a308ced730ebe449cd504211d3cd         1316 bash/bash52-009
 144 c7705e029f752507310ecd7270aef437e8043a9959e4d0c6065a82517996c1cd         2045 bash/bash52-010
 145 831b5f25bf3e88625f3ab315043be7498907c551f86041fa3b914123d79eb6f4         1229 bash/bash52-011
 146 2fb107ce1fb8e93f36997c8b0b2743fc1ca98a454c7cc5a3fcabec533f67d42c         9107 bash/bash52-012
 147 094b4fd81bc488a26febba5d799689b64d52a5505b63e8ee854f48d356bc7ce6         1503 bash/bash52-013
 148 3ef9246f2906ef1e487a0a3f4c647ae1c289cbd8459caa7db5ce118ef136e624         3245 bash/bash52-014
 149 ef73905169db67399a728e238a9413e0d689462cb9b72ab17a05dba51221358a         8088 bash/bash52-015
 150
 151
 152 [FILE:1240:manifests/plist.primary]
 153 @shell bin/bash
 154 @shell bin/rbash
 155 %%NOTSTD-OFF%%share/man/man1/
 156  bash.1.gz
 157  bashbug.1.gz
 158 %%STATIC-OFF%%include/bash/
 159  alias.h
 160  array.h
 161  arrayfunc.h
 162  assoc.h
 163  bashansi.h
 164  bashintl.h
 165  bashjmp.h
 166  bashtypes.h
 167  builtins.h
 168  command.h
 169  config-bot.h
 170  config-top.h
 171  config.h
 172  conftypes.h
 173  dispose_cmd.h
 174  error.h
 175  execute_cmd.h
 176  externs.h
 177  general.h
 178  hashlib.h
 179  jobs.h
 180  make_cmd.h
 181  pathnames.h
 182  quit.h
 183  shell.h
 184  sig.h
 185  siglist.h
 186  signames.h
 187  subst.h
 188  syntax.h
 189  unwind_prot.h
 190  variables.h
 191  version.h
 192  xmalloc.h
 193  y.tab.h
 194 %%STATIC-OFF%%include/bash/builtins/
 195  bashgetopt.h
 196  builtext.h
 197  common.h
 198  getopt.h
 199 %%STATIC-OFF%%include/bash/include/
 200  ansi_stdlib.h
 201  chartypes.h
 202  filecntl.h
 203  gettext.h
 204  maxpath.h
 205  memalloc.h
 206  ocache.h
 207  posixdir.h
 208  posixjmp.h
 209  posixstat.h
 210  posixtime.h
 211  posixwait.h
 212  shmbchar.h
 213  shmbutil.h
 214  shtty.h
 215  stat-time.h
 216  stdc.h
 217  systimes.h
 218  typemax.h
 219  unionwait.h
 220 %%STATIC-OFF%%lib/bash/
 221  Makefile.inc
 222  Makefile.sample
 223  accept
 224  basename
 225  csv
 226  cut
 227  dirname
 228  dsv
 229  fdflags
 230  finfo
 231  getconf
 232  head
 233  id
 234  ln
 235  loadables.h
 236  logname
 237  mkdir
 238  mkfifo
 239  mktemp
 240  mypid
 241  pathchk
 242  print
 243  printenv
 244  push
 245  realpath
 246  rm
 247  rmdir
 248  seq
 249  setpgid
 250  sleep
 251  stat
 252  strftime
 253  sync
 254  tee
 255  truefalse
 256  tty
 257  uname
 258  unlink
 259  whoami
 260 %%STATIC-OFF%%lib/pkgconfig/bash.pc
 261 bin/bashbug
 262
 263
 264 [FILE:1427:manifests/plist.nls]
 265 share/locale/af/LC_MESSAGES/bash.mo
 266 share/locale/bg/LC_MESSAGES/bash.mo
 267 share/locale/ca/LC_MESSAGES/bash.mo
 268 share/locale/cs/LC_MESSAGES/bash.mo
 269 share/locale/da/LC_MESSAGES/bash.mo
 270 share/locale/de/LC_MESSAGES/bash.mo
 271 share/locale/el/LC_MESSAGES/bash.mo
 272 share/locale/en@boldquot/LC_MESSAGES/bash.mo
 273 share/locale/en@quot/LC_MESSAGES/bash.mo
 274 share/locale/eo/LC_MESSAGES/bash.mo
 275 share/locale/es/LC_MESSAGES/bash.mo
 276 share/locale/et/LC_MESSAGES/bash.mo
 277 share/locale/fi/LC_MESSAGES/bash.mo
 278 share/locale/fr/LC_MESSAGES/bash.mo
 279 share/locale/ga/LC_MESSAGES/bash.mo
 280 share/locale/gl/LC_MESSAGES/bash.mo
 281 share/locale/hr/LC_MESSAGES/bash.mo
 282 share/locale/hu/LC_MESSAGES/bash.mo
 283 share/locale/id/LC_MESSAGES/bash.mo
 284 share/locale/it/LC_MESSAGES/bash.mo
 285 share/locale/ja/LC_MESSAGES/bash.mo
 286 share/locale/ko/LC_MESSAGES/bash.mo
 287 share/locale/lt/LC_MESSAGES/bash.mo
 288 share/locale/nb/LC_MESSAGES/bash.mo
 289 share/locale/nl/LC_MESSAGES/bash.mo
 290 share/locale/pl/LC_MESSAGES/bash.mo
 291 share/locale/pt/LC_MESSAGES/bash.mo
 292 share/locale/pt_BR/LC_MESSAGES/bash.mo
 293 share/locale/ro/LC_MESSAGES/bash.mo
 294 share/locale/ru/LC_MESSAGES/bash.mo
 295 share/locale/sk/LC_MESSAGES/bash.mo
 296 share/locale/sl/LC_MESSAGES/bash.mo
 297 share/locale/sr/LC_MESSAGES/bash.mo
 298 share/locale/sv/LC_MESSAGES/bash.mo
 299 share/locale/tr/LC_MESSAGES/bash.mo
 300 share/locale/uk/LC_MESSAGES/bash.mo
 301 share/locale/vi/LC_MESSAGES/bash.mo
 302 share/locale/zh_CN/LC_MESSAGES/bash.mo
 303 share/locale/zh_TW/LC_MESSAGES/bash.mo
 304
 305
 306 [FILE:89:manifests/plist.docs]
 307 share/doc/bash/
 308  COMPAT
 309  FAQ
 310  INTRO
 311  NEWS
 312  POSIX
 313  RBASH
 314  README
 315  bash.html
 316  bashref.html
 317
 318
 319 [FILE:314:patches/patch-config-top.h]
 320 --- config-top.h.orig   2021-11-05 13:11:12 UTC
 321 +++ config-top.h
 322 @@ -84,7 +84,7 @@
 323  #endif
 324
 325  /* Default primary and secondary prompt strings. */
 326 -#define PPROMPT "\\s-\\v\\$ "
 327 +#define PPROMPT "[\\u@\\h \\w]\\$ "
 328  #define SPROMPT "> "
 329
 330  /* Undefine this if you don't want the ksh-compatible behavior of reprinting
 331
 332
 333 [FILE:498:patches/patch-doc_bash.1]
 334 --- doc/bash.1.orig     2022-09-19 15:36:55 UTC
 335 +++ doc/bash.1
 336 @@ -2561,7 +2561,7 @@ The value of this parameter is expanded
 337  .SM
 338  .B PROMPTING
 339  below) and used as the primary prompt string.  The default value is
 340 -``\fB\es\-\ev\e$ \fP''.
 341 +``\fB\eu\@\eh\e$ \fP''.
 342  .TP
 343  .B PS2
 344  The value of this parameter is expanded as with
 345 @@ -11661,7 +11661,7 @@ http://tiswww.case.edu/~chet/bash/POSIX
 346  .SH FILES
 347  .PD 0
 348  .TP
 349 -.FN /bin/bash
 350 +.FN %%PREFIX%%/bin/bash
 351  The \fBbash\fP executable
 352  .TP
 353  .FN /etc/profile
 354
 355
 356 [FILE:944:patches/patch-doc_bashref.texi]
 357 --- doc/bashref.texi.orig       2022-09-19 15:41:39 UTC
 358 +++ doc/bashref.texi
 359 @@ -1,6 +1,6 @@
 360  \input texinfo.tex @c -*- texinfo -*-
 361  @c %**start of header
 362 -@setfilename bashref.info
 363 +@setfilename bash.info
 364  @settitle Bash Reference Manual
 365
 366  @include version.texi
 367 @@ -8,7 +8,7 @@
 368
 369  @copying
 370  This text is a brief description of the features that are present in
 371 -the Bash shell (version @value{VERSION}, @value{UPDATED}).
 372 +the Bash shell (version @value{VERSION}, @value{UPDATED})
 373
 374  This is Edition @value{EDITION}, last updated @value{UPDATED},
 375  of @cite{The GNU Bash Reference Manual},
 376 @@ -6004,7 +6004,7 @@ A null directory name may appear as two
 377  or trailing colon.
 378
 379  @item PS1
 380 -The primary prompt string.  The default value is @samp{\s-\v\$ }.
 381 +The primary prompt string.  The default value is @samp{[\u@@\h \w]\$ }.
 382  @xref{Controlling the Prompt}, for the complete list of escape
 383  sequences that are expanded before @env{PS1} is displayed.
 384
 385
 386
 387 [FILE:226:patches/patch-examples_loadables_fdflags.c]
 388 --- examples/loadables/fdflags.c.orig   2022-07-26 14:16:57 UTC
 389 +++ examples/loadables/fdflags.c
 390 @@ -109,6 +109,8 @@ static const struct
 391
 392  #ifdef O_CLOEXEC
 393    { "cloexec", O_CLOEXEC       },
 394 +#else
 395 +#define O_CLOEXEC 0
 396  #endif
 397  };
 398
 399
 400
 401 [FILE:528:patches/patch-examples_loadables_getconf.c]
 402 $NetBSD: patch-examples_loadables_getconf.c,v 1.1 2022/10/04 12:45:31 kim Exp $
 403
 404 Handle _SC_RTSIG_MAX not being defined (NetBSD 9)
 405
 406 --- examples/loadables/getconf.c.orig   2021-12-03 16:46:22 UTC
 407 +++ examples/loadables/getconf.c
 408 @@ -846,7 +846,9 @@ static const struct conf vars[] =
 409  #ifdef _SC_TRACE_LOG
 410      { "_POSIX_TRACE_LOG", _SC_TRACE_LOG, SYSCONF },
 411  #endif
 412 +#ifdef _SC_RTSIG_MAX
 413      { "RTSIG_MAX", _SC_RTSIG_MAX, SYSCONF },
 414 +#endif
 415  #ifdef _SC_SEM_NSEMS_MAX
 416      { "SEM_NSEMS_MAX", _SC_SEM_NSEMS_MAX, SYSCONF },
 417  #endif
 418
 419
 420 [FILE:533:patches/patch-lib_readline_display.c]
 421 --- lib/readline/display.c.orig 2022-04-05 14:47:31 UTC
 422 +++ lib/readline/display.c
 423 @@ -953,7 +953,10 @@ rl_redisplay (void)
 424       the line breaks in the prompt string in expand_prompt, taking invisible
 425       characters into account, and if lpos exceeds the screen width, we copy
 426       the data in the loop below. */
 427 +  if (local_prompt)
 428    lpos = prompt_physical_chars + modmark;
 429 +  else
 430 +    lpos = 0;
 431
 432  #if defined (HANDLE_MULTIBYTE)
 433    memset (line_state_invisible->wrapped_line, 0, line_state_invisible->wbsize * sizeof (int));
 434
 435
 436 [FILE:266:patches/patch-lib_termcap_ltcap.h]
 437 --- lib/termcap/ltcap.h.orig    2009-01-04 19:32:36 UTC
 438 +++ lib/termcap/ltcap.h
 439 @@ -19,9 +19,7 @@
 440  #ifndef _LTCAP_H_
 441  #define _LTCAP_H_ 1
 442
 443 -#if !defined (__APPLE__)
 444  #  define __private_extern__
 445 -#endif
 446
 447  #ifndef MAX_TGETENT_BUFSIZ
 448  #  define MAX_TGETENT_BUFSIZ 2048
 449
 450
 451 [FILE:656:patches/patch-support_shobj-conf]
 452 --- support/shobj-conf.orig     2021-12-03 15:54:46 UTC
 453 +++ support/shobj-conf
 454 @@ -113,7 +113,7 @@ sunos5*-*gcc*|solaris2*-*gcc*)
 455         SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
 456         ;;
 457
 458 -sunos5*|solaris2*)
 459 +sunos5*)
 460         SHOBJ_CFLAGS='-K pic'
 461         SHOBJ_LD=/usr/ccs/bin/ld
 462         SHOBJ_LDFLAGS='-G -dy -z text -i -h $@'
 463 @@ -123,7 +123,7 @@ sunos5*|solaris2*)
 464         ;;
 465
 466  # All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd.
 467 -linux*-*|gnu*-*|k*bsd*-gnu-*|midnightbsd*|freebsd*|dragonfly*)
 468 +linux*-*|gnu*-*|k*bsd*-gnu-*|midnightbsd*|freebsd*|dragonfly*|solaris*)
 469         SHOBJ_CFLAGS=-fPIC
 470         SHOBJ_LD='${CC}'
 471         SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
 472
 473
 474 [FILE:723:files/special.mk]
 475 # On linux with glibc, we can't build a fully static bash because
 476 # of absurd restrictions put on static linking with nss, dlopen, etc.
 477 # So we build it dynamic but with libtinfo static.  Leaving glibc-based
 478 # libraries like libc, libm, pthread, etc, is okay.
 479
 480 .if ${OPSYS} == Linux
 481 .  if "${PLIST_SUB:MSTATIC-ON=*}" == "STATIC-ON="
 482 CONFIGURE_ARGS:=        ${CONFIGURE_ARGS:N--enable-static-link}
 483 CONFIGURE_ENV+=         ac_cv_func_dlopen=no
 484
 485 TINFOLIBS=              ${LOCALBASE}/lib/libtinfo.a \
 486                         -lpthread
 487
 488 post-configure-opsys:
 489         ${REINPLACE_CMD} -e 's|-ltinfo|${TINFOLIBS}|' ${WRKSRC}/Makefile
 490 .  endif
 491 .endif
 492
 493 # we could have used LDFLAGS_OFF options helper, but it doesn't
 494 # currently exist
 495
 496 .if ${VARIANT} != static
 497 LDFLAGS+=       ${VAR1}
 498 .endif
 499
 500
 501 [FILE:2609:sunos/patch-configure]
 502 --- configure.orig      2020-12-04 14:05:14 UTC
 503 +++ configure
 504 @@ -5009,14 +5009,18 @@ prefer_static=no
 505  if test "$opt_static_link" = yes; then
 506         prefer_static=yes
 507         prefer_shared=no
 508 +       TINFO_LIBRARY=${prefix}/lib/libtinfo.a
 509         # if we're using gcc, add `-static' to LDFLAGS, except on Solaris >= 2
 510         if test -n "$GCC" || test "$ac_cv_c_compiler_gnu" = "yes"; then
 511                 STATIC_LD="-static"
 512                 case "$host_os" in
 513 -               solaris2*|linux*)       ;;
 514 +               linux*) ;;
 515 +               solaris*)       STATIC_LD= ;;
 516                 *)              LDFLAGS="$LDFLAGS -static" ;;   # XXX experimental
 517                 esac
 518         fi
 519 +else
 520 +       TINFO_LIBRARY=-ltinfo
 521  fi
 522
 523  # set the appropriate make variables for building the "build tools"
 524 @@ -5160,13 +5164,13 @@ $as_echo "$ac_cv_lib_termcap_tgetent" >&
 525  if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
 526    bash_cv_termcap_lib=libtermcap
 527  else
 528 -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5
 529 -$as_echo_n "checking for tgetent in -ltinfo... " >&6; }
 530 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in ${TINFO_LIBRARY}" >&5
 531 +$as_echo_n "checking for tgetent in ${TINFO_LIBRARY}... " >&6; }
 532  if ${ac_cv_lib_tinfo_tgetent+:} false; then :
 533    $as_echo_n "(cached) " >&6
 534  else
 535    ac_check_lib_save_LIBS=$LIBS
 536 -LIBS="-ltinfo  $LIBS"
 537 +LIBS="${TINFO_LIBRARY}  $LIBS"
 538  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 539  /* end confdefs.h.  */
 540
 541 @@ -5345,7 +5349,7 @@ elif test $bash_cv_termcap_lib = libterm
 542  TERMCAP_LIB=-ltermcap
 543  TERMCAP_DEP=
 544  elif test $bash_cv_termcap_lib = libtinfo; then
 545 -TERMCAP_LIB=-ltinfo
 546 +TERMCAP_LIB=${TINFO_LIBRARY}
 547  TERMCAP_DEP=
 548  elif test $bash_cv_termcap_lib = libncurses; then
 549  TERMCAP_LIB=-lncurses
 550 @@ -20076,13 +20080,13 @@ $as_echo "$ac_cv_lib_termcap_tgetent" >&
 551  if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
 552    bash_cv_termcap_lib=libtermcap
 553  else
 554 -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5
 555 -$as_echo_n "checking for tgetent in -ltinfo... " >&6; }
 556 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in ${TINFO_LIBRARY}" >&5
 557 +$as_echo_n "checking for tgetent in ${TINFO_LIBRARY}... " >&6; }
 558  if ${ac_cv_lib_tinfo_tgetent+:} false; then :
 559    $as_echo_n "(cached) " >&6
 560  else
 561    ac_check_lib_save_LIBS=$LIBS
 562 -LIBS="-ltinfo  $LIBS"
 563 +LIBS="${TINFO_LIBRARY}  $LIBS"
 564  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 565  /* end confdefs.h.  */
 566
 567 @@ -20261,7 +20265,7 @@ elif test $bash_cv_termcap_lib = libterm
 568  TERMCAP_LIB=-ltermcap
 569  TERMCAP_DEP=
 570  elif test $bash_cv_termcap_lib = libtinfo; then
 571 -TERMCAP_LIB=-ltinfo
 572 +TERMCAP_LIB=${TINFO_LIBRARY}
 573  TERMCAP_DEP=
 574  elif test $bash_cv_termcap_lib = libncurses; then
 575  TERMCAP_LIB=-lncurses
 576