Index: head/shells/bash/Makefile =================================================================== --- head/shells/bash/Makefile (revision 546105) +++ head/shells/bash/Makefile (revision 546106) @@ -1,129 +1,130 @@ # Created by: Oliver Eikemeier # $FreeBSD$ PORTNAME= bash PATCHLEVEL= 18 PORTVERSION= 5.0.${PATCHLEVEL:S/^0//g} -PORTREVISION?= 2 +PORTREVISION?= 3 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} .if empty(PKGNAMESUFFIX) CONFLICTS+= bash-static-[0-9]* .else CONFLICTS+= bash-[0-9]* .endif .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 + @${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/bash/files/patch-doc_bash.1 =================================================================== --- head/shells/bash/files/patch-doc_bash.1 (revision 546105) +++ head/shells/bash/files/patch-doc_bash.1 (revision 546106) @@ -1,32 +1,63 @@ --- doc/bash.1.orig 2019-01-02 14:14:30 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. @@ -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 +@@ -10880,10 +10880,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 /etc/profile ++.FN %%LOCALBASE%%/etc/profile + The systemwide initialization file, executed for login shells + .TP + .FN ~/.bash_profile