From owner-freebsd-current@freebsd.org  Sun Oct 25 13:11:00 2020
Return-Path: <owner-freebsd-current@freebsd.org>
Delivered-To: freebsd-current@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8E2E944EB01
 for <freebsd-current@mailman.nyi.freebsd.org>;
 Sun, 25 Oct 2020 13:11:00 +0000 (UTC) (envelope-from se@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "smtp.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CJyyX2Xcvz42sM;
 Sun, 25 Oct 2020 13:11:00 +0000 (UTC) (envelope-from se@freebsd.org)
Received: from Stefans-MBP-WLAN.fritz.box
 (p200300cd5f0bbc0059aab49e04a56e55.dip0.t-ipconnect.de
 [IPv6:2003:cd:5f0b:bc00:59aa:b49e:4a5:6e55])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client did not present a certificate)
 (Authenticated sender: se/mail)
 by smtp.freebsd.org (Postfix) with ESMTPSA id E049E17F56;
 Sun, 25 Oct 2020 13:10:59 +0000 (UTC) (envelope-from se@freebsd.org)
To: FreeBSD CURRENT <freebsd-current@freebsd.org>
From: Stefan Esser <se@freebsd.org>
Subject: [REVIEW] replace literal uses of /usr/local with a macro [D26942]
Message-ID: <2b938572-dfbb-4597-0095-8490bb3745ee@freebsd.org>
Date: Sun, 25 Oct 2020 14:10:58 +0100
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0)
 Gecko/20100101 Thunderbird/78.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 8bit
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Oct 2020 13:11:00 -0000

I have created

	https://reviews.freebsd.org/D26942

as a suggested patch to remove nearly 20 literal uses of /usr/local
in the base system.

This requires to add an include of paths.h to some of the source files
(.c or .h), but none of these includes is leaked to /usr/include and
they are thus only visible during the build.

I have built the world with this patch applied and the resulting
binaries are unchanged.

The definition of _PATH_LOCALBASE in paths.h could at a later time
be derived from the value of LOCALBASE (in src/Makefile.inc1 or
overridden my the user in src.conf), but this is a change that
should be discussed separately from this review.

Please comment on this patch, the decision to not touch contrib
sources and which follow-up steps to perform next (e.g. similar
changes to shell scripts or configuration files).