updated

shell/bash/Makefile

@@ -0,0 +1,76 @@
+# Created by: Oliver Eikemeier
+# $FreeBSD: head/shells/bash/Makefile 499556 2019-04-21 18:27:08Z ehaupt $
+
+PORTNAME=		bash
+PORTVERSION=		5.2
+#PORTVERSION=            5.0.${PATCHLEVEL:S/^0//g}
+#PATCHLEVEL=		7
+CATEGORIES=		shells
+MASTER_SITES=		GNU
+#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}
+
+LIB_DEPENDS+=	libiconv.so:text/libiconv
+LIB_DEPENDS+=	libintl.so:devel/gettext
+
+MAINTAINER= ehaupt@FreeBSD.org
+COMMENT= GNU Project's Bourne Again SHell
+
+USES=			pathfix
+GNU_CONFIGURE=		yes
+
+
+CONFIGURE_ARGS+= --with-libiconv-prefix=${ICONV_PREFIX}
+CONFIGURE_ARGS+= --with-libintl-prefix=${LOCALBASE}
+
+CONFIGURE_ARGS+= --enable-help-builtin
+CONFIGURE_ARGS+= --without-bash-malloc
+CONFIGURE_ARGS+= --disable-rpath
+CONFIGURE_ARGS+= --enable-disabled-builtins
+
+CONFIGURE_ARGS+= --enable-xpg-echo-default
+CONFIGURE_ARGS+= --enable-array-variables
+CONFIGURE_ARGS+= --enable-alias
+CONFIGURE_ARGS+= --enable-select
+CONFIGURE_ARGS+= --enable-progcomp
+CONFIGURE_ARGS+= --enable-multibyte
+CONFIGURE_ARGS+= --enable-process-substitution
+CONFIGURE_ARGS+= --enable-directory-stack
+CONFIGURE_ARGS+= --enable-dparen-arithmetic
+CONFIGURE_ARGS+= --enable-job-control
+CONFIGURE_ARGS+= --enable-net-redirections
+CONFIGURE_ARGS+= --enable-arith-for-command
+CONFIGURE_ARGS+= --enable-net-redirections
+CONFIGURE_ARGS+= --enable-bang-history
+CONFIGURE_ARGS+= --enable-brace-expansion
+CONFIGURE_ARGS+= --enable-command-timing
+CONFIGURE_ARGS+= --enable-cond-command
+CONFIGURE_ARGS+= --enable-cond-regexp
+
+CONFIGURE_ARGS+= --mandir=${PREFIX}/man
+CONFIGURE_ARGS+= --infodir=${PREFIX}/info
+
+
+CONFIGURE_ARGS+= --disable-static-link
+LDFLAGS+= -Wl,-export-dynamic
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+INFO=			bash
+
+
+STANDARD_PATH=	/sbin:/bin:/usr/sbin:/usr/bin
+CPPFLAGS+= -DDEFAULT_PATH_VALUE='\"${STANDARD_PATH}:${LOCALBASE}/sbin:${LOCALBASE}/bin\"'
+CPPFLAGS+= -DSTANDARD_UTILS_PATH='\"${STANDARD_PATH}\"'
+
+#post-patch:
+#	${TOUCH} ${WRKSRC}/parse.y
+#	${RM} ${WRKSRC}/y.tab.c
+
+.include <bsd.port.mk>

shell/bash/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1664566459
+SHA256 (bash/bash-5.2.tar.gz) = a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb
+SIZE (bash/bash-5.2.tar.gz) = 10950833

shell/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' \

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

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

shell/bash/files/patch-doc_Makefile.in

@@ -0,0 +1,22 @@
+--- doc/Makefile.in.orig	2022-09-27 16:41:33 UTC
++++ doc/Makefile.in
+@@ -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
+ 
+@@ -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_FILES) $(HSUSER) $(RLUSER)
+-	$(RM) $@
+-	$(MAKEINFO) -o $@ --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi
+ 
+ bash.txt: bash.1
+ bash.ps: bash.1

shell/bash/files/patch-doc_bash.1

@@ -0,0 +1,63 @@
+--- doc/bash.1.orig	2022-09-19 15:36:55 UTC
++++ doc/bash.1
+@@ -31,9 +31,9 @@
+ .\" .ll \\n(LLu
+ .\" .in \\n()Ru+\\n(INu+\\n()Iu
+ .\" .ti \\n(INu
+-.\" .ie !\\n()Iu+\\n()Ru-\w\\*(]Xu-3p \{\\*(]X
++.\" .ie !\\n()Iu+\\n()Ru-\w\\*(]Xu-3p \{\\*(]X
+ .\" .br\}
+-.\" .el \\*(]X\h|\\n()Iu+\\n()Ru\c
++.\" .el \\*(]X\h|\\n()Iu+\\n()Ru\c
+ .\" .}f
+ .\" ..
+ .\"
+@@ -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
+-``\fB\es\-\ev\e$ \fP''.
++``\fB\eu\@\eh\e$ \fP''.
+ .TP
+ .B PS2
+ The value of this parameter is expanded as with
+@@ -11661,10 +11661,10 @@ http://tiswww.case.edu/~chet/bash/POSIX -- a descripti
+ .SH FILES
+ .PD 0
+ .TP
+-.FN /bin/bash
++.FN %%PREFIX%%/bin/bash
+ The \fBbash\fP executable
+ .TP
+-.FN /etc/profile
++.FN %%LOCALBASE%%/etc/profile
+ The systemwide initialization file, executed for login shells
+ .TP
+ .FN ~/.bash_profile

shell/bash/files/patch-doc_bashref.texi

@@ -0,0 +1,28 @@
+--- doc/bashref.texi.orig	2022-09-19 15:41:39 UTC
++++ doc/bashref.texi
+@@ -1,6 +1,6 @@
+ \input texinfo.tex @c -*- texinfo -*-
+ @c %**start of header
+-@setfilename bashref.info
++@setfilename bash.info
+ @settitle Bash Reference Manual
+ 
+ @include version.texi
+@@ -8,7 +8,7 @@
+ 
+ @copying
+ This text is a brief description of the features that are present in
+-the Bash shell (version @value{VERSION}, @value{UPDATED}).
++the Bash shell (version @value{VERSION}, @value{UPDATED})
+ 
+ This is Edition @value{EDITION}, last updated @value{UPDATED},
+ of @cite{The GNU Bash Reference Manual},
+@@ -6004,7 +6004,7 @@ A null directory name may appear as two adjacent colon
+ or trailing colon.
+ 
+ @item PS1
+-The primary prompt string.  The default value is @samp{\s-\v\$ }.
++The primary prompt string.  The default value is @samp{[\u@@\h \w]\$ }.
+ @xref{Controlling the Prompt}, for the complete list of escape
+ sequences that are expanded before @env{PS1} is displayed.
+ 

shell/bash/files/patch-lib_readline_display.c

@@ -0,0 +1,13 @@
+--- lib/readline/display.c.orig	2022-04-05 14:47:31 UTC
++++ lib/readline/display.c
+@@ -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. */
++  if (local_prompt)
+   lpos = prompt_physical_chars + modmark;
++  else
++    lpos = 0;
+ 
+ #if defined (HANDLE_MULTIBYTE)
+   memset (line_state_invisible->wrapped_line, 0, line_state_invisible->wbsize * sizeof (int));

shell/bash/files/pkg-message.in

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

shell/bash/pkg-descr

@@ -0,0 +1,7 @@
+This is GNU Bash.  Bash is the GNU Project's Bourne Again SHell,
+a complete implementation of the POSIX.2 shell spec, but also
+with interactive command line editing, job control on architectures
+that support it, csh-like features such as history substitution and
+brace expansion, and a slew of other features.
+
+WWW: https://www.gnu.org/software/bash/

shell/bash/pkg-plist

@@ -0,0 +1,236 @@
+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
+share/locale/cs/LC_MESSAGES/bash.mo
+share/locale/da/LC_MESSAGES/bash.mo
+share/locale/de/LC_MESSAGES/bash.mo
+share/locale/el/LC_MESSAGES/bash.mo
+share/locale/en@boldquot/LC_MESSAGES/bash.mo
+share/locale/en@quot/LC_MESSAGES/bash.mo
+share/locale/eo/LC_MESSAGES/bash.mo
+share/locale/es/LC_MESSAGES/bash.mo
+share/locale/et/LC_MESSAGES/bash.mo
+share/locale/fi/LC_MESSAGES/bash.mo
+share/locale/fr/LC_MESSAGES/bash.mo
+share/locale/ga/LC_MESSAGES/bash.mo
+share/locale/gl/LC_MESSAGES/bash.mo
+share/locale/hr/LC_MESSAGES/bash.mo
+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
+share/locale/pl/LC_MESSAGES/bash.mo
+share/locale/pt_BR/LC_MESSAGES/bash.mo
+share/locale/pt/LC_MESSAGES/bash.mo
+share/locale/ro/LC_MESSAGES/bash.mo
+share/locale/ru/LC_MESSAGES/bash.mo
+share/locale/sk/LC_MESSAGES/bash.mo
+share/locale/sl/LC_MESSAGES/bash.mo
+share/locale/sr/LC_MESSAGES/bash.mo
+share/locale/sv/LC_MESSAGES/bash.mo
+share/locale/tr/LC_MESSAGES/bash.mo
+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
+@dir share/locale/bg
+@dir share/locale/ca/LC_MESSAGES
+@dir share/locale/ca
+@dir share/locale/cs/LC_MESSAGES
+@dir share/locale/cs
+@dir share/locale/da/LC_MESSAGES
+@dir share/locale/da
+@dir share/locale/de/LC_MESSAGES
+@dir share/locale/de
+@dir share/locale/el/LC_MESSAGES
+@dir share/locale/el
+@dir share/locale/en@boldquot/LC_MESSAGES
+@dir share/locale/en@boldquot
+@dir share/locale/en@quot/LC_MESSAGES
+@dir share/locale/en@quot
+@dir share/locale/eo/LC_MESSAGES
+@dir share/locale/eo
+@dir share/locale/es/LC_MESSAGES
+@dir share/locale/es
+@dir share/locale/et/LC_MESSAGES
+@dir share/locale/et
+@dir share/locale/fi/LC_MESSAGES
+@dir share/locale/fi
+@dir share/locale/fr/LC_MESSAGES
+@dir share/locale/fr
+@dir share/locale/ga/LC_MESSAGES
+@dir share/locale/ga
+@dir share/locale/gl/LC_MESSAGES
+@dir share/locale/gl
+@dir share/locale/hr/LC_MESSAGES
+@dir share/locale/hr
+@dir share/locale/hu/LC_MESSAGES
+@dir share/locale/hu
+@dir share/locale/id/LC_MESSAGES
+@dir share/locale/id
+@dir share/locale/it/LC_MESSAGES
+@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
+@dir share/locale/nb
+@dir share/locale/nl/LC_MESSAGES
+@dir share/locale/nl
+@dir share/locale/pl/LC_MESSAGES
+@dir share/locale/pl
+@dir share/locale/pt/LC_MESSAGES
+@dir share/locale/pt
+@dir share/locale/pt_BR/LC_MESSAGES
+@dir share/locale/pt_BR
+@dir share/locale/ro/LC_MESSAGES
+@dir share/locale/ro
+@dir share/locale/ru/LC_MESSAGES
+@dir share/locale/ru
+@dir share/locale/sk/LC_MESSAGES
+@dir share/locale/sk
+@dir share/locale/sl/LC_MESSAGES
+@dir share/locale/sl
+@dir share/locale/sr/LC_MESSAGES
+@dir share/locale/sr
+@dir share/locale/sv/LC_MESSAGES
+@dir share/locale/sv
+@dir share/locale/tr/LC_MESSAGES
+@dir share/locale/tr
+@dir share/locale/uk/LC_MESSAGES
+@dir share/locale/uk
+@dir share/locale/vi/LC_MESSAGES
+@dir share/locale/vi
+@dir share/locale/zh_CN/LC_MESSAGES
+@dir share/locale/zh_CN
+@dir share/locale/zh_TW/LC_MESSAGES
+@dir share/locale/zh_TW
+@dir share/locale