diff --git a/lang/bash/Makefile b/lang/bash/Makefile index 806c53e9..d406d9d7 100644 --- a/lang/bash/Makefile +++ b/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 diff --git a/lang/bash/distinfo b/lang/bash/distinfo index 61c11443..56800ced 100644 --- a/lang/bash/distinfo +++ b/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 diff --git a/lang/bash/files/patch-Makefile.in b/lang/bash/files/patch-Makefile.in new file mode 100644 index 00000000..e21144f8 --- /dev/null +++ b/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' \ diff --git a/lang/bash/files/patch-config-top.h b/lang/bash/files/patch-config-top.h index 894a2e57..3d458d2c 100644 --- a/lang/bash/files/patch-config-top.h +++ b/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 diff --git a/lang/bash/files/patch-doc_Makefile.in b/lang/bash/files/patch-doc_Makefile.in index cb4f3766..bdb9477d 100644 --- a/lang/bash/files/patch-doc_Makefile.in +++ b/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 diff --git a/lang/bash/files/patch-doc_bash.1 b/lang/bash/files/patch-doc_bash.1 index 2ac97835..37b6e073 100644 --- a/lang/bash/files/patch-doc_bash.1 +++ b/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 diff --git a/lang/bash/files/patch-doc_bashref.texi b/lang/bash/files/patch-doc_bashref.texi index 08d80e40..8be950fa 100644 --- a/lang/bash/files/patch-doc_bashref.texi +++ b/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 diff --git a/lang/bash/files/patch-lib_readline_display.c b/lang/bash/files/patch-lib_readline_display.c index b69b0841..f81aba55 100644 --- a/lang/bash/files/patch-lib_readline_display.c +++ b/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. */ diff --git a/lang/bash/files/pkg-message.in b/lang/bash/files/pkg-message.in index 14dfcfe8..e0e63344 100644 --- a/lang/bash/files/pkg-message.in +++ b/lang/bash/files/pkg-message.in @@ -1,5 +1,6 @@ -====================================================================== - +[ +{ type: install + message: <