bash updated

lang/bash/Makefile

@@ -2,18 +2,19 @@
 # $FreeBSD: head/shells/bash/Makefile 499556 2019-04-21 18:27:08Z ehaupt $
 
 PORTNAME=		bash
-PORTVERSION=		5.0.${PATCHLEVEL:S/^0//g}
-PATCHLEVEL=		7
+PORTVERSION=		5.2
+#PORTVERSION=            5.0.${PATCHLEVEL:S/^0//g}
+#PATCHLEVEL=		7
 CATEGORIES=		shells
 MASTER_SITES=		GNU
-DISTNAME=		${PORTNAME}-${PORTVERSION:R}
+#DISTNAME=		${PORTNAME}-${PORTVERSION:R}
 DIST_SUBDIR=		${PORTNAME}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
-PATCH_SITES=		GNU/${PORTNAME}/${DISTNAME}-patches/
-PATCHFILES!=		/usr/bin/jot -s " " -w \
-			${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \
-			${PATCHLEVEL} 1 ${PATCHLEVEL}
+#PATCH_SITES=		GNU/${PORTNAME}/${DISTNAME}-patches/
+#PATCHFILES!=		/usr/bin/jot -s " " -w \
+#			${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \
+#			${PATCHLEVEL} 1 ${PATCHLEVEL}
 
 LIB_DEPENDS+=	libiconv.so:text/libiconv
 LIB_DEPENDS+=	libintl.so:devel/gettext
@@ -21,7 +22,7 @@ LIB_DEPENDS+=	libintl.so:devel/gettext
 MAINTAINER= ehaupt@FreeBSD.org
 COMMENT= GNU Project's Bourne Again SHell
 
-USES=			pathfix gmake
+USES=			pathfix make
 GNU_CONFIGURE=		yes
 
 

lang/bash/distinfo

@@ -1,17 +1,3 @@
-TIMESTAMP = 1555870557
-SHA256 (bash/bash-5.0.tar.gz) = b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d
-SIZE (bash/bash-5.0.tar.gz) = 10135110
-SHA256 (bash/bash50-001) = f2fe9e1f0faddf14ab9bfa88d450a75e5d028fedafad23b88716bd657c737289
-SIZE (bash/bash50-001) = 4133
-SHA256 (bash/bash50-002) = 87e87d3542e598799adb3e7e01c8165bc743e136a400ed0de015845f7ff68707
-SIZE (bash/bash50-002) = 4380
-SHA256 (bash/bash50-003) = 4eebcdc37b13793a232c5f2f498a5fcbf7da0ecb3da2059391c096db620ec85b
-SIZE (bash/bash50-003) = 6434
-SHA256 (bash/bash50-004) = 14447ad832add8ecfafdce5384badd933697b559c4688d6b9e3d36ff36c62f08
-SIZE (bash/bash50-004) = 1664
-SHA256 (bash/bash50-005) = 5bf54dd9bd2c211d2bfb34a49e2c741f2ed5e338767e9ce9f4d41254bf9f8276
-SIZE (bash/bash50-005) = 3732
-SHA256 (bash/bash50-006) = d68529a6ff201b6ff5915318ab12fc16b8a0ebb77fda3308303fcc1e13398420
-SIZE (bash/bash50-006) = 1275
-SHA256 (bash/bash50-007) = 17b41e7ee3673d8887dd25992417a398677533ab8827938aa41fad70df19af9b
-SIZE (bash/bash50-007) = 1640
+TIMESTAMP = 1664566459
+SHA256 (bash/bash-5.2.tar.gz) = a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb
+SIZE (bash/bash-5.2.tar.gz) = 10950833

lang/bash/files/patch-Makefile.in

@@ -0,0 +1,12 @@
+--- Makefile.in.orig	2022-09-27 16:41:33 UTC
++++ Makefile.in
+@@ -846,7 +846,9 @@ install:	.made installdirs
+ 		infodir=$(infodir) htmldir=$(htmldir) DESTDIR=$(DESTDIR) $@ )
+ 	-( cd $(DEFDIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
+ 	-( cd $(PO_DIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++.if !$(STATIC_LD:M-static)
+ 	-( cd $(LOADABLES_DIR) && $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++.endif
+ 
+ install-strip:
+ 	$(MAKE) $(MFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \

lang/bash/files/patch-config-top.h

@@ -1,11 +1,11 @@
---- config-top.h.orig	2016-05-19 18:34:02 UTC
+--- config-top.h.orig	2021-11-05 13:11:12 UTC
 +++ config-top.h
-@@ -74,7 +74,7 @@
+@@ -84,7 +84,7 @@
  #endif
  
  /* Default primary and secondary prompt strings. */
 -#define PPROMPT "\\s-\\v\\$ "
-+#define PPROMPT "[\\u@\\h:\\w]\\$ "
++#define PPROMPT "[\\u@\\h \\w]\\$ "
  #define SPROMPT "> "
  
  /* Undefine this if you don't want the ksh-compatible behavior of reprinting

lang/bash/files/patch-doc_Makefile.in

@@ -1,21 +1,22 @@
---- doc/Makefile.in.orig	2015-12-07 00:55:56 UTC
+--- doc/Makefile.in.orig	2022-09-27 16:41:33 UTC
 +++ doc/Makefile.in
-@@ -175,7 +175,7 @@ pdf: ${PDFFILES}
- bashref.dvi: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
+@@ -175,7 +175,7 @@ bashref.dvi: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
+ 	$(RM) $@
  	${SET_TEXINPUTS} $(TEXI2DVI) $(srcdir)/bashref.texi || { ${RM} $@ ; exit 1; }
  
 -bashref.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
 +bash.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
+ 	$(RM) $@
  	$(MAKEINFO) --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi
  
- # experimental
-@@ -188,9 +188,6 @@ bashref.pdf: $(BASHREF_FILES) $(HSUSER) 
+@@ -188,10 +188,6 @@ bashref.pdf: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
+ #	$(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi
  bashref.html: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
  	$(MAKEINFO) --html --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi
- 
--bash.info: bashref.info
--	${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \
 -
+-bash.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
+-	$(RM) $@
+-	$(MAKEINFO) -o $@ --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi
+ 
  bash.txt: bash.1
  bash.ps: bash.1
- bash.html: bash.1

lang/bash/files/patch-doc_bash.1

@@ -1,4 +1,4 @@
---- doc/bash.1.orig	2019-01-02 14:14:30 UTC
+--- doc/bash.1.orig	2022-09-19 15:36:55 UTC
 +++ doc/bash.1
 @@ -31,9 +31,9 @@
  .\" .ll \\n(LLu
@@ -12,7 +12,34 @@
  .\" .}f
  .\" ..
  .\"
-@@ -2444,7 +2444,7 @@ The value of this parameter is expanded (see
+@@ -204,7 +204,7 @@ library to read command lines when the shell is intera
+ .TP
+ .B \-\-noprofile
+ Do not read either the system-wide startup file
+-.FN /etc/profile
++.FN %%LOCALBASE%%/etc/profile
+ or any of the personal initialization files
+ .IR ~/.bash_profile ,
+ .IR ~/.bash_login ,
+@@ -316,7 +316,7 @@ When
+ .B bash
+ is invoked as an interactive login shell, or as a non-interactive shell
+ with the \fB\-\-login\fP option, it first reads and
+-executes commands from the file \fI/etc/profile\fP, if that
++executes commands from the file \fI%%LOCALBASE%%/etc/profile\fP, if that
+ file exists.
+ After reading that file, it looks for \fI~/.bash_profile\fP,
+ \fI~/.bash_login\fP, and \fI~/.profile\fP, in that order, and reads
+@@ -373,7 +373,7 @@ while conforming to the POSIX standard as well.
+ When invoked as an interactive login shell, or a non-interactive
+ shell with the \fB\-\-login\fP option, it first attempts to
+ read and execute commands from
+-.I /etc/profile
++.I %%LOCALBASE%%/etc/profile
+ and
+ .IR ~/.profile ,
+ in that order.
+@@ -2561,7 +2561,7 @@ The value of this parameter is expanded (see
  .SM
  .B PROMPTING
  below) and used as the primary prompt string.  The default value is
@@ -21,7 +48,7 @@
  .TP
  .B PS2
  The value of this parameter is expanded as with
-@@ -10880,7 +10880,7 @@ http://tiswww.case.edu/~chet/bash/POSIX -- a descripti
+@@ -11661,10 +11661,10 @@ http://tiswww.case.edu/~chet/bash/POSIX -- a descripti
  .SH FILES
  .PD 0
  .TP
@@ -29,4 +56,8 @@
 +.FN %%PREFIX%%/bin/bash
  The \fBbash\fP executable
  .TP
- .FN /etc/profile
+-.FN /etc/profile
++.FN %%LOCALBASE%%/etc/profile
+ The systemwide initialization file, executed for login shells
+ .TP
+ .FN ~/.bash_profile

lang/bash/files/patch-doc_bashref.texi

@@ -1,4 +1,4 @@
---- doc/bashref.texi.orig	2016-09-29 22:30:30 UTC
+--- doc/bashref.texi.orig	2022-09-19 15:41:39 UTC
 +++ doc/bashref.texi
 @@ -1,6 +1,6 @@
  \input texinfo.tex @c -*- texinfo -*-
@@ -17,7 +17,7 @@
  
  This is Edition @value{EDITION}, last updated @value{UPDATED},
  of @cite{The GNU Bash Reference Manual},
-@@ -5443,7 +5443,7 @@ A null directory name may appear as two 
+@@ -6004,7 +6004,7 @@ A null directory name may appear as two adjacent colon
  or trailing colon.
  
  @item PS1

lang/bash/files/patch-lib_readline_display.c

@@ -1,6 +1,6 @@
---- lib/readline/display.c.orig	2018-10-01 01:37:48 UTC
+--- lib/readline/display.c.orig	2022-04-05 14:47:31 UTC
 +++ lib/readline/display.c
-@@ -837,7 +837,10 @@ rl_redisplay (void)
+@@ -953,7 +953,10 @@ rl_redisplay (void)
       the line breaks in the prompt string in expand_prompt, taking invisible
       characters into account, and if lpos exceeds the screen width, we copy
       the data in the loop below. */

lang/bash/files/pkg-message.in

@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 bash requires fdescfs(5) mounted on /dev/fd
 
 If you have not done it yet, please do the following:
@@ -9,5 +10,6 @@ If you have not done it yet, please do the following:
 To make it permanent, you need the following lines in /etc/fstab:
 
 	fdescfs	/dev/fd		fdescfs		rw,late	0	0
-
-======================================================================
+EOM
+}
+]

lang/bash/pkg-plist

@@ -1,5 +1,117 @@
 bin/bash
 bin/bashbug
+include/bash/alias.h
+include/bash/array.h
+include/bash/arrayfunc.h
+include/bash/assoc.h
+include/bash/bashansi.h
+include/bash/bashintl.h
+include/bash/bashjmp.h
+include/bash/bashtypes.h
+include/bash/builtins.h
+include/bash/builtins/bashgetopt.h
+include/bash/builtins/builtext.h
+include/bash/builtins/common.h
+include/bash/builtins/getopt.h
+include/bash/command.h
+include/bash/config-bot.h
+include/bash/config-top.h
+include/bash/config.h
+include/bash/conftypes.h
+include/bash/dispose_cmd.h
+include/bash/error.h
+include/bash/execute_cmd.h
+include/bash/externs.h
+include/bash/general.h
+include/bash/hashlib.h
+include/bash/include/ansi_stdlib.h
+include/bash/include/chartypes.h
+include/bash/include/filecntl.h
+include/bash/include/gettext.h
+include/bash/include/maxpath.h
+include/bash/include/memalloc.h
+include/bash/include/ocache.h
+include/bash/include/posixdir.h
+include/bash/include/posixjmp.h
+include/bash/include/posixstat.h
+include/bash/include/posixtime.h
+include/bash/include/posixwait.h
+include/bash/include/shmbchar.h
+include/bash/include/shmbutil.h
+include/bash/include/shtty.h
+include/bash/include/stat-time.h
+include/bash/include/stdc.h
+include/bash/include/systimes.h
+include/bash/include/typemax.h
+include/bash/include/unionwait.h
+include/bash/jobs.h
+include/bash/make_cmd.h
+include/bash/pathnames.h
+include/bash/quit.h
+include/bash/shell.h
+include/bash/sig.h
+include/bash/siglist.h
+include/bash/signames.h
+include/bash/subst.h
+include/bash/syntax.h
+include/bash/unwind_prot.h
+include/bash/variables.h
+include/bash/version.h
+include/bash/xmalloc.h
+include/bash/y.tab.h
+lib/bash/accept
+lib/bash/basename
+lib/bash/csv
+lib/bash/cut
+lib/bash/dirname
+lib/bash/dsv
+lib/bash/fdflags
+lib/bash/finfo
+lib/bash/getconf
+lib/bash/head
+lib/bash/id
+lib/bash/ln
+lib/bash/loadables.h
+lib/bash/logname
+lib/bash/Makefile.inc
+lib/bash/Makefile.sample
+lib/bash/mkdir
+lib/bash/mkfifo
+lib/bash/mktemp
+lib/bash/mypid
+lib/bash/pathchk
+lib/bash/print
+lib/bash/printenv
+lib/bash/push
+lib/bash/realpath
+lib/bash/rm
+lib/bash/rmdir
+lib/bash/seq
+lib/bash/setpgid
+lib/bash/sleep
+lib/bash/stat
+lib/bash/strftime
+lib/bash/sync
+lib/bash/tee
+lib/bash/truefalse
+lib/bash/tty
+lib/bash/uname
+lib/bash/unlink
+lib/bash/whoami
+lib/pkgconfig/bash.pc
+man/man1/bash.1.gz
+man/man1/bashbug.1.gz
+share/doc/bash/bash.html
+share/doc/bash/bashref.html
+share/doc/bash/CHANGES
+share/doc/bash/COMPAT
+share/doc/bash/FAQ
+share/doc/bash/INTRO
+share/doc/bash/NEWS
+share/doc/bash/POSIX
+share/doc/bash/RBASH
+share/doc/bash/README
+share/info/bash.info
 share/locale/af/LC_MESSAGES/bash.mo
 share/locale/bg/LC_MESSAGES/bash.mo
 share/locale/ca/LC_MESSAGES/bash.mo
@@ -21,6 +133,7 @@ share/locale/hu/LC_MESSAGES/bash.mo
 share/locale/id/LC_MESSAGES/bash.mo
 share/locale/it/LC_MESSAGES/bash.mo
 share/locale/ja/LC_MESSAGES/bash.mo
+share/locale/ko/LC_MESSAGES/bash.mo
 share/locale/lt/LC_MESSAGES/bash.mo
 share/locale/nb/LC_MESSAGES/bash.mo
 share/locale/nl/LC_MESSAGES/bash.mo
@@ -38,6 +151,10 @@ share/locale/uk/LC_MESSAGES/bash.mo
 share/locale/vi/LC_MESSAGES/bash.mo
 share/locale/zh_CN/LC_MESSAGES/bash.mo
 share/locale/zh_TW/LC_MESSAGES/bash.mo
+@dir include/bash/builtins
+@dir include/bash/include
+@dir include/bash
+@dir lib/bash
 @dir share/locale/af/LC_MESSAGES
 @dir share/locale/af
 @dir share/locale/bg/LC_MESSAGES
@@ -80,6 +197,8 @@ share/locale/zh_TW/LC_MESSAGES/bash.mo
 @dir share/locale/it
 @dir share/locale/ja/LC_MESSAGES
 @dir share/locale/ja
+@dir share/locale/ko/LC_MESSAGES
+@dir share/locale/ko
 @dir share/locale/lt/LC_MESSAGES
 @dir share/locale/lt
 @dir share/locale/nb/LC_MESSAGES