From owner-svn-ports-all@freebsd.org Sun Oct 29 11:37:08 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 17D67E612A5; Sun, 29 Oct 2017 11:37:08 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D735176947; Sun, 29 Oct 2017 11:37:07 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9TBb6Qo030001; Sun, 29 Oct 2017 11:37:06 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9TBb6nc030000; Sun, 29 Oct 2017 11:37:06 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201710291137.v9TBb6nc030000@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Sun, 29 Oct 2017 11:37:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453109 - head/shells/bash X-SVN-Group: ports-head X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: head/shells/bash X-SVN-Commit-Revision: 453109 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 11:37:08 -0000 Author: ehaupt Date: Sun Oct 29 11:37:06 2017 New Revision: 453109 URL: https://svnweb.freebsd.org/changeset/ports/453109 Log: Provide an option to enable system-wide rc files. This enables: - System-wide .bashrc file for interactive shells ${PREFIX}/etc/bash.bashrc - System-wide .bash_logout for login shells ${PREFIX}/etc/bash.bash_logout PR: 222973 Submitted by: ilyushkeane@gmail.com Modified: head/shells/bash/Makefile Modified: head/shells/bash/Makefile ============================================================================== --- head/shells/bash/Makefile Sun Oct 29 11:36:56 2017 (r453108) +++ head/shells/bash/Makefile Sun Oct 29 11:37:06 2017 (r453109) @@ -4,7 +4,7 @@ PORTNAME= bash PATCHLEVEL= 12 PORTVERSION= 4.4.${PATCHLEVEL:S/^0//g} -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= shells MASTER_SITES= GNU/${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION:R} @@ -22,10 +22,11 @@ COMMENT= GNU Project's Bourne Again SHell LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= COLONBREAKSWORDS FDESCFS HELP NLS STATIC SYSLOG DOCS +OPTIONS_DEFINE= COLONBREAKSWORDS FDESCFS HELP NLS STATIC SYSBASHRC SYSLOG DOCS COLONBREAKSWORDS_DESC= Colons break words FDESCFS_DESC= Enable use of /dev/fd HELP_DESC= Enable builtin help +SYSBASHRC_DESC= Enable system-wide rc files OPTIONS_DEFAULT= COLONBREAKSWORDS HELP @@ -83,6 +84,11 @@ post-patch: -e "s|/\*.*#define SYSLOG_HISTORY .*\*/|#define SYSLOG_HISTORY|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 \