From nobody Tue Nov 14 16:52:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SVC514l2lz51Vn5; Tue, 14 Nov 2023 16:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SVC513BwBz4L7H; Tue, 14 Nov 2023 16:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699980725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fzB49KVMeAsU69xhtYH4EKJpf6V/HxTP8zbfjWeez8g=; b=MeyCE8elTerBN1qLuwLhGeC6fbDl23XGn5sd8FdZSezaBfLL1ZV7GpnN3DLgERcGwQYDxv llC1ALORRJGfRNo2Dj06vBFk3nSo4ED93omO/SHZje02sRDEu4f6LrJRVs04IO3An8CR2F OQ/HKtQ04O9AfhzHXLsO8h+pHESwG6eVtCsS55qlfCufH9x5kqfeo8V/mAEf68jK1a5pjx OPITS78bJMNb5Wo0XPLiKo32raaxzrFFUaGqNnO5lVr01pZLJLlWN56kgQvJVKVwYmcEYx kTYdzLrZTa9P2wJbxeSxixhurU6iw7LXftGN8DXDZFLmkZ9ZcRZrBeGC0FwsSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699980725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fzB49KVMeAsU69xhtYH4EKJpf6V/HxTP8zbfjWeez8g=; b=EwCym2UtfjE2OTNijwGIHZ7ngiu1VIknpXhYlGK6yC8YkQ91fISYo2Rl8TLn8SZEucLBEm POYxleEVOj4qrXeKLKSs+qFf6Gw3m/NqsdiDBshf1VXMatNLqo3Nh0cx5+dF+EkU7dawbH 2Luo0EtmYVtzC2hjrYRrnk+w1DWip4jE7lsnSwL1D+uQeDpe1d1DalBttef5b0ztd+K+dF mZH311VkcUUSymrFee2UsgQRTLmxA7VTvIKTP4BMKgmMFMj2YFN2XqTw4XwPzy2ZHmFij/ amuxoeOBOZjutpylLevBAZN8GqAkyWNXMQHJxGrrIsZFiCtnVDsWAtQ5OYbXtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699980725; a=rsa-sha256; cv=none; b=fjq0kDhcgU6KqFWRr4zXIslVU2RBgWn3+4iTpiGxh0crllZHuCMI16CztlVE4/+DG3LN9T l2C2iiTvXTbRyWxUJXHINyeO0uXLJjIuO4z9N9Dv2Lf41atWZCKU4jbs2NJEGfMq7PG9yn N4XAXlkIerY9tmbPBNoQCRHLA6Ggf5zDulTwSOls7djnAMDKOVpf3hE7dyPzQMKdlYunUn 9gFSbPRN6K23WTsKKu0sQmesAtQuSKFuYYIuUjoOPGplZz4/su9ZSpi1LseFsQBhcIOzIE 07QsPamTrlxfJIgPJ6Rkn+Ulmwr+ew2t1YflzSSiftK3wjO3JehrrWsmbSnvyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SVC512HsczwnS; Tue, 14 Nov 2023 16:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AEGq5gS016044; Tue, 14 Nov 2023 16:52:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AEGq5Z1016041; Tue, 14 Nov 2023 16:52:05 GMT (envelope-from git) Date: Tue, 14 Nov 2023 16:52:05 GMT Message-Id: <202311141652.3AEGq5Z1016041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 4cd0f014a128 - main - OptionalObsoleteFiles.inc: document block order List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4cd0f014a1285c1b57e583b260282ca433a8ccdd Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=4cd0f014a1285c1b57e583b260282ca433a8ccdd commit 4cd0f014a1285c1b57e583b260282ca433a8ccdd Author: Brooks Davis AuthorDate: 2023-11-13 23:13:03 +0000 Commit: Brooks Davis CommitDate: 2023-11-14 16:50:52 +0000 OptionalObsoleteFiles.inc: document block order Options should be in sort(1) order by primary option (usually, but not always, first in the if statement). Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 --- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 7cefc3c816c5..aaf1dbda5710 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3,6 +3,8 @@ # This file adds support for the WITHOUT_* and WITH_* knobs in src.conf(5) to # the check-old* and delete-old* targets. # +# Blocks should be in sort(1) order by primary option. +# .if ${MK_ACCT} == no OLD_FILES+=etc/rc.d/accounting