Index: head/shells/Makefile =================================================================== --- head/shells/Makefile (revision 567268) +++ head/shells/Makefile (revision 567269) @@ -1,65 +1,66 @@ # $FreeBSD$ # COMMENT = Shells SUBDIR += 44bsd-csh SUBDIR += ammonite SUBDIR += anongitssh SUBDIR += antibody SUBDIR += ast-ksh SUBDIR += bash SUBDIR += bash-completion SUBDIR += bash-static + SUBDIR += bashc SUBDIR += bicon SUBDIR += ch SUBDIR += dash SUBDIR += elvish SUBDIR += envy SUBDIR += es SUBDIR += esh SUBDIR += fd SUBDIR += fish SUBDIR += git-prompt.zsh SUBDIR += heirloom-sh SUBDIR += ibsh SUBDIR += ion SUBDIR += jailkit SUBDIR += klish SUBDIR += ksh2020 SUBDIR += ksh93 SUBDIR += ksh93-devel SUBDIR += mksh SUBDIR += nologinmsg SUBDIR += ohmyzsh SUBDIR += oksh SUBDIR += p5-Bash-Completion SUBDIR += p5-Shell-Perl SUBDIR += p5-Term-Bash-Completion-Generator SUBDIR += p5-Term-ShellUI SUBDIR += pdksh SUBDIR += pear-PHP_Shell SUBDIR += psh SUBDIR += rc SUBDIR += rubygem-shellwords SUBDIR += rush SUBDIR += sash SUBDIR += scponly SUBDIR += starship SUBDIR += switchBashZsh SUBDIR += tcsh_nls SUBDIR += tcshrc SUBDIR += v7sh SUBDIR += viewglob SUBDIR += vshnu SUBDIR += wcd SUBDIR += xonsh SUBDIR += yash SUBDIR += zsh SUBDIR += zsh-antigen SUBDIR += zsh-autosuggestions SUBDIR += zsh-completions SUBDIR += zsh-navigation-tools SUBDIR += zsh-syntax-highlighting .include Index: head/shells/bash/Makefile =================================================================== --- head/shells/bash/Makefile (revision 567268) +++ head/shells/bash/Makefile (revision 567269) @@ -1,132 +1,133 @@ # Created by: Oliver Eikemeier # $FreeBSD$ PORTNAME= bash PATCHLEVEL= 4 PORTVERSION= 5.1.${PATCHLEVEL:S/^0//g} PORTREVISION?= 1 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} MAINTAINER= ehaupt@FreeBSD.org COMMENT= GNU Project's Bourne Again SHell LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING OPTIONS_DEFINE= FDESCFS PORTS_READLINE HELP NLS STATIC SYSBASHRC \ SYSLOG DOCS FDESCFS_DESC= Enable use of /dev/fd HELP_DESC= Enable builtin help PORTS_READLINE_DESC= libreadline from ports instead of bundled one SYSBASHRC_DESC= Enable system-wide rc files OPTIONS_DEFAULT= HELP PORTS_READLINE USES= bison cpe iconv makeinfo pathfix localbase GNU_CONFIGURE= yes OPTIONS_SUB= yes CPE_VENDOR= gnu FDESCFS_CONFIGURE_ENV_OFF= bash_cv_dev_fd=absent FDESCFS_SUB_FILES= pkg-message HELP_CONFIGURE_ENABLE= help-builtin NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext PORTS_READLINE_CONFIGURE_WITH= installed-readline PORTS_READLINE_USES= readline INFO= bash PORTDOCS= FAQ INTRO CHANGES COMPAT NEWS POSIX RBASH README \ bash.html bashref.html CONFIGURE_ARGS+= --without-bash-malloc \ --disable-rpath \ --enable-disabled-builtins \ --with-libiconv-prefix=${ICONV_PREFIX} MAKE_ARGS+= TERMCAP_LIB=-lncursesw .if empty(PKGNAMESUFFIX) -CONFLICTS+= bash-static-[0-9]* +CONFLICTS+= bash-static-[0-9]* .else -CONFLICTS+= bash-[0-9]* +CONFLICTS+= bash-[0-9]* .endif +CONFLICTS+= bashc .include .if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:tl} != "no") CONFIGURE_ARGS+= --enable-static-link LLD_UNSAFE= yes .else CONFIGURE_ARGS+= --disable-static-link # Bash symbols must be exported in order to link runtime plugins, i.e., # "enable -f". (Plugins are not supported for bash-static.) LDFLAGS+= -Wl,-export-dynamic .endif STANDARD_PATH= /sbin:/bin:/usr/sbin:/usr/bin CPPFLAGS+= -DDEFAULT_PATH_VALUE='\"${STANDARD_PATH}:${LOCALBASE}/sbin:${LOCALBASE}/bin\"' \ -DSTANDARD_UTILS_PATH='\"${STANDARD_PATH}\"' post-patch: # Ensure y.tab.c is regenerated ${TOUCH} ${WRKSRC}/parse.y ${RM} ${WRKSRC}/y.tab.c @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/doc/bash.1 .if ${PORT_OPTIONS:MSYSLOG} @${REINPLACE_CMD} \ -e "s|/\*.*#define SYSLOG_HISTORY .*\*/|#define SYSLOG_HISTORY|g" \ -e "s|/\*.*#define SYSLOG_SHOPT .*\*/|#define SYSLOG_SHOPT 1|g" \ ${WRKSRC}/config-top.h .endif @${REINPLACE_CMD} -e "s|\(/etc/profile\)|${LOCALBASE}\1|" \ ${WRKSRC}/pathnames.h.in post-patch-SYSBASHRC-on: @${REINPLACE_CMD} \ -e "s|.*\(#define SYS_BASH.*\)\(/etc/.*\"\).*|\1${PREFIX}\2|" \ ${WRKSRC}/config-top.h post-configure: @${FIND} ${WRKSRC} -name Makefile -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" pre-build: @${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build post-install: ${LN} -sf bash ${STAGEDIR}${PREFIX}/bin/rbash @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/FAQ \ ${WRKSRC}/doc/INTRO ${STAGEDIR}${DOCSDIR} for d in ${PORTDOCS:NFAQ:NINTRO:N*html}; do \ ${INSTALL_DATA} ${WRKSRC}/$${d} ${STAGEDIR}${DOCSDIR}; \ done regress: build cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} test ckp: ${MAKE} -DPATCH_DEBUG clean patch # requires ftp/ncftp3 cklatest: @${ECHO} -n "Currently at: " @${MAKE} -V PATCHLEVEL -ncftpls \ ${PATCH_SITES:Mftp*:Ox:[1]} \ | fgrep -v .sig | ${TAIL} .include Index: head/shells/bashc/Makefile =================================================================== --- head/shells/bashc/Makefile (nonexistent) +++ head/shells/bashc/Makefile (revision 567269) @@ -0,0 +1,103 @@ +# Created by: Igor Pokrovsky +# $FreeBSD$ + +PORTNAME= bashc +PORTVERSION= 5.0.9 +CATEGORIES= shells + +MAINTAINER= ip@unixway.org +COMMENT= GNU Bourne Again shell extended with two-panel file manager + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= bison cpe gmake iconv localbase makeinfo pathfix +GNU_CONFIGURE= yes +OPTIONS_SUB= yes +CPE_VENDOR= gnu + +USE_GITHUB= yes +GH_ACCOUNT= sergev +GH_PROJECT= bash-commander +GH_TAGNAME= f707afab3e299d9b9e557923d355e14d2fe1291a + +OPTIONS_DEFINE= DOCS FDESCFS HELP NLS STATIC SYSBASHRC SYSLOG +FDESCFS_DESC= Enable use of /dev/fd +HELP_DESC= Enable builtin help +SYSBASHRC_DESC= Enable system-wide rc files + +OPTIONS_DEFAULT= HELP + +FDESCFS_CONFIGURE_ENV_OFF= bash_cv_dev_fd=absent + +HELP_CONFIGURE_ENABLE= help-builtin +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext + +INFO= bash + +PORTDOCS= CHANGES COMPAT FAQ INTRO NEWS POSIX RBASH README bash.html \ + bashref.html +DOCSDIR= ${PREFIX}/share/doc/bash +SUB_FILES= pkg-message + +CONFIGURE_ARGS+= --disable-rpath \ + --enable-disabled-builtins \ + --with-libiconv-prefix=${ICONV_PREFIX} \ + --without-bash-malloc + +CONFLICTS+= bash-[0-9]* bash-static-[0-9]* + +.include + +.if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:tl} != "no") +CONFIGURE_ARGS+= --enable-static-link +LLD_UNSAFE= yes +.else +CONFIGURE_ARGS+= --disable-static-link +# Bash symbols must be exported in order to link runtime plugins, i.e., +# "enable -f". (Plugins are not supported for bash-static.) +LDFLAGS+= -Wl,-export-dynamic +.endif +STANDARD_PATH= /sbin:/bin:/usr/sbin:/usr/bin +CPPFLAGS+= -DDEFAULT_PATH_VALUE='\"${STANDARD_PATH}:${LOCALBASE}/sbin:${LOCALBASE}/bin\"' \ + -DSTANDARD_UTILS_PATH='\"${STANDARD_PATH}\"' + +post-patch: +# Ensure y.tab.c is regenerated + ${TOUCH} ${WRKSRC}/parse.y + ${RM} ${WRKSRC}/y.tab.c + @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1 +.if ${PORT_OPTIONS:MSYSLOG} + @${REINPLACE_CMD} \ + -e "s|/\*.*#define SYSLOG_HISTORY .*\*/|#define SYSLOG_HISTORY|g" \ + -e "s|/\*.*#define SYSLOG_SHOPT .*\*/|#define SYSLOG_SHOPT 1|g" \ + ${WRKSRC}/config-top.h +.endif + +post-patch-SYSBASHRC-on: + @${REINPLACE_CMD} \ + -e "s|.*\(#define SYS_BASH.*\)\(/etc/.*\"\).*|\1${PREFIX}\2|" \ + ${WRKSRC}/config-top.h + +post-configure: + @${FIND} ${WRKSRC} -name Makefile -print0 | ${XARGS} -0 \ + ${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" + +pre-build: + @${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build + +post-install: + ${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/rbash + ${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/bash + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/FAQ \ + ${WRKSRC}/doc/INTRO ${STAGEDIR}${DOCSDIR} + for d in ${PORTDOCS:NFAQ:NINTRO:N*html}; do \ + ${INSTALL_DATA} ${WRKSRC}/$${d} ${STAGEDIR}${DOCSDIR}; \ + done + +regress: build + cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} test + +.include Property changes on: head/shells/bashc/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/shells/bashc/distinfo =================================================================== --- head/shells/bashc/distinfo (nonexistent) +++ head/shells/bashc/distinfo (revision 567269) @@ -0,0 +1,3 @@ +TIMESTAMP = 1613744521 +SHA256 (sergev-bash-commander-5.0.9-f707afab3e299d9b9e557923d355e14d2fe1291a_GH0.tar.gz) = a32b8770a9b68420baa4bb05dbe84120c12835ad28dc82f8ec745bbce6d2acb8 +SIZE (sergev-bash-commander-5.0.9-f707afab3e299d9b9e557923d355e14d2fe1291a_GH0.tar.gz) = 10112494 Property changes on: head/shells/bashc/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/shells/bashc/files/patch-Makefile.in =================================================================== --- head/shells/bashc/files/patch-Makefile.in (nonexistent) +++ head/shells/bashc/files/patch-Makefile.in (revision 567269) @@ -0,0 +1,13 @@ +--- Makefile.in.orig 2021-02-19 17:35:54 UTC ++++ Makefile.in +@@ -774,8 +774,8 @@ pathnames.h: Makefile $(srcdir)/pathnames.h.in + @${RM} pathnames.tmp + + # comment out for distribution +-#$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4 $(srcdir)/config.h.in +-# cd $(srcdir) && autoconf ++$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4 $(srcdir)/config.h.in ++ cd $(srcdir) && autoconf + + # for chet + reconfig: force Property changes on: head/shells/bashc/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/shells/bashc/files/patch-config-top.h =================================================================== --- head/shells/bashc/files/patch-config-top.h (nonexistent) +++ head/shells/bashc/files/patch-config-top.h (revision 567269) @@ -0,0 +1,11 @@ +--- config-top.h.orig 2019-08-29 22:16:15 UTC ++++ config-top.h +@@ -78,7 +78,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 Property changes on: head/shells/bashc/files/patch-config-top.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/shells/bashc/files/patch-doc_bash.1 =================================================================== --- head/shells/bashc/files/patch-doc_bash.1 (nonexistent) +++ head/shells/bashc/files/patch-doc_bash.1 (revision 567269) @@ -0,0 +1,32 @@ +--- doc/bash.1.orig 2019-08-29 22:16:15 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 + .\" .. + .\" +@@ -2444,7 +2444,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 +@@ -10880,7 +10880,7 @@ http://tiswww.case.edu/~chet/bash/POSIX -- a descripti + .SH FILES + .PD 0 + .TP +-.FN /bin/bash ++.FN /usr/local/bin/bash + The \fBbash\fP executable + .TP + .FN /etc/profile Property changes on: head/shells/bashc/files/patch-doc_bash.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/shells/bashc/files/patch-doc_bashref.texi =================================================================== --- head/shells/bashc/files/patch-doc_bashref.texi (nonexistent) +++ head/shells/bashc/files/patch-doc_bashref.texi (revision 567269) @@ -0,0 +1,28 @@ +--- doc/bashref.texi.orig 2019-08-29 22:16:15 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}, +@@ -5598,7 +5598,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. + Property changes on: head/shells/bashc/files/patch-doc_bashref.texi ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/shells/bashc/files/patch-lib_readline_display.c =================================================================== --- head/shells/bashc/files/patch-lib_readline_display.c (nonexistent) +++ head/shells/bashc/files/patch-lib_readline_display.c (revision 567269) @@ -0,0 +1,13 @@ +--- lib/readline/display.c.orig 2018-10-01 01:37:48 UTC ++++ lib/readline/display.c +@@ -837,7 +837,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)); Property changes on: head/shells/bashc/files/patch-lib_readline_display.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/shells/bashc/files/pkg-message.in =================================================================== --- head/shells/bashc/files/pkg-message.in (nonexistent) +++ head/shells/bashc/files/pkg-message.in (revision 567269) @@ -0,0 +1,15 @@ +[ +{ type: install + message: <