svn commit: r542373 - in head: . shells/bash

[Emanuel Haupt]

Author: ehaupt
Date: Thu Jul 16 17:14:53 2020
New Revision: 542373
URL: https://svnweb.freebsd.org/changeset/ports/542373

Log:
  Cleanly decouple bash from base by reading `profile` from $LOCALBASE/etc/
  instead of from /etc.
  
  Document this change in UPDATING and provide a migration strategy.
  
  PR:		247934 (based on)
  Submitted by:	Michael Osipov <michael.osipov at siemens.com>

Modified:
  head/UPDATING
  head/shells/bash/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Thu Jul 16 16:49:32 2020	(r542372)
+++ head/UPDATING	Thu Jul 16 17:14:53 2020	(r542373)
@@ -6,6 +6,20 @@ You should get into the habit of checking this file fo
 you update your ports collection, before attempting any port upgrades.
 
 
+20200716:
+  AFFECTS: users of shells/bash, shells/bash-static
+  AUTHOR: ehaupt at FreeBSD.org
+
+  In order to cleanly decouple bash from base, bash now reads `profile` from
+  LOCALBASE/etc insead of from /etc. If you are using system wide bash
+  configuration in /etc/profile please migrate to LOCALBASE/etc/profile
+
+  # cp /etc/profile /usr/local/etc/profile
+
+  or create a symlink
+
+  # ln -s /etc/profile /usr/local/etc/
+
 20200713:
   AFFECTS: users of mail/php7[2-4]-imap
   AUTHOR: tz at FreeBSD.org

Modified: head/shells/bash/Makefile
==============================================================================
--- head/shells/bash/Makefile	Thu Jul 16 16:49:32 2020	(r542372)
+++ head/shells/bash/Makefile	Thu Jul 16 17:14:53 2020	(r542373)
@@ -4,7 +4,7 @@
 PORTNAME=		bash
 PATCHLEVEL=		18
 PORTVERSION=		5.0.${PATCHLEVEL:S/^0//g}
-PORTREVISION?=		1
+PORTREVISION?=		2
 CATEGORIES=		shells
 MASTER_SITES=		GNU
 DISTNAME=		${PORTNAME}-${PORTVERSION:R}
@@ -88,6 +88,8 @@ post-patch:
 	    -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} \