svn commit: r435165 - in branches/2017Q1/shells/bash: . files

[Emanuel Haupt]

Author: ehaupt
Date: Wed Mar  1 15:20:14 2017
New Revision: 435165
URL: https://svnweb.freebsd.org/changeset/ports/435165

Log:
  MFH: r435164
  
  Default path includes the string %%LOCALBASE%%. This was intended to be replaced
  with the real value of LOCALBASE by the port Makefile at some point, but it
  isn't at the moment.
  
  Set this value in the Makefile by defining CPPFLAGS accordingly.
  
  PR:             217451
  Submitted by:   Dan McGregor <dan.mcgregor at usask.ca>
  Approved by:	ports-secteam (blanket)

Modified:
  branches/2017Q1/shells/bash/Makefile
  branches/2017Q1/shells/bash/files/patch-config-top.h
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/shells/bash/Makefile
==============================================================================
--- branches/2017Q1/shells/bash/Makefile	Wed Mar  1 15:19:06 2017	(r435164)
+++ branches/2017Q1/shells/bash/Makefile	Wed Mar  1 15:20:14 2017	(r435165)
@@ -4,7 +4,7 @@
 PORTNAME=		bash
 PATCHLEVEL=		12
 PORTVERSION=		4.4.${PATCHLEVEL:S/^0//g}
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES=		shells
 MASTER_SITES=		GNU/${PORTNAME}
 DISTNAME=		${PORTNAME}-${PORTVERSION:R}
@@ -64,6 +64,9 @@ CONFIGURE_ARGS+=	--disable-static-link
 # "enable -f". (Plugins are not supported for bash-static.)
 CFLAGS+=		-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

Modified: branches/2017Q1/shells/bash/files/patch-config-top.h
==============================================================================
--- branches/2017Q1/shells/bash/files/patch-config-top.h	Wed Mar  1 15:19:06 2017	(r435164)
+++ branches/2017Q1/shells/bash/files/patch-config-top.h	Wed Mar  1 15:20:14 2017	(r435165)
@@ -1,19 +1,6 @@
 --- config-top.h.orig	2016-05-19 18:34:02 UTC
 +++ config-top.h
-@@ -63,18 +63,18 @@
- /* The default value of the PATH variable. */
- #ifndef DEFAULT_PATH_VALUE
- #define DEFAULT_PATH_VALUE \
--  "/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:."
-+  "/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin"
- #endif
- 
- /* The value for PATH when invoking `command -p'.  This is only used when
-    the Posix.2 confstr () function, or CS_PATH define are not present. */
- #ifndef STANDARD_UTILS_PATH
- #define STANDARD_UTILS_PATH \
--  "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
-+  "/sbin:/bin:/usr/sbin:/usr/bin:/usr/games"
+@@ -74,7 +74,7 @@
  #endif
  
  /* Default primary and secondary prompt strings. */