From owner-svn-ports-all@freebsd.org Wed Mar 1 15:19: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 85B51CF20AF; Wed, 1 Mar 2017 15:19: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 39200DE6; Wed, 1 Mar 2017 15:19:08 +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 v21FJ7OA074892; Wed, 1 Mar 2017 15:19:07 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21FJ7KZ074890; Wed, 1 Mar 2017 15:19:07 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201703011519.v21FJ7KZ074890@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Wed, 1 Mar 2017 15:19:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435164 - in head/shells/bash: . files X-SVN-Group: ports-head 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: Wed, 01 Mar 2017 15:19:08 -0000 Author: ehaupt Date: Wed Mar 1 15:19:06 2017 New Revision: 435164 URL: https://svnweb.freebsd.org/changeset/ports/435164 Log: 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 MFH: 2017Q1 (blanket) Modified: head/shells/bash/Makefile head/shells/bash/files/patch-config-top.h Modified: head/shells/bash/Makefile ============================================================================== --- head/shells/bash/Makefile Wed Mar 1 15:07:51 2017 (r435163) +++ head/shells/bash/Makefile Wed Mar 1 15:19:06 2017 (r435164) @@ -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} @@ -65,6 +65,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: head/shells/bash/files/patch-config-top.h ============================================================================== --- head/shells/bash/files/patch-config-top.h Wed Mar 1 15:07:51 2017 (r435163) +++ head/shells/bash/files/patch-config-top.h Wed Mar 1 15:19:06 2017 (r435164) @@ -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. */