bucket_C8/bash

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