From nobody Sat Dec 02 00:54:56 2023 X-Original-To: dev-commits-src-branches@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 4Shs0K29Gbz52nSb; Sat, 2 Dec 2023 00:54:57 +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 4Shs0K0RgGz3C96; Sat, 2 Dec 2023 00:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478497; 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=2NV3twhtfz4YOwmsLIRmCZn4viPw6RplA/DvCGGvjMM=; b=sXn55NOsmVSy6M80epQD4emc2Mesf5w99tRpWda4tIBgMSWYGAfwSeatmAJ45lqdVGFJvf +tpLzSv+YoEuS5JWsHTbAf0NCwUOHTafFXR74F9ULfsAEDbq/mRqlNq9atrfifzbeRM7PN leesOhXdiSfBeYXFcXguF+gZrUo2RlKvlILDk7DRKfkW5FLs8YoKl6NpjwrbIp9Ljfc/dw zKxG2YTQHytsnbOztj89CbSV+zCokJN17dTh6C2DmajfIvQNzpM4uaR3cGozMAQa1mdKcd tQCt15UcZbbLglmuGGBIxpX+nsLYsS6PNYOUQfQJYSASonBYDQj4QDvJL5cRlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478497; 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=2NV3twhtfz4YOwmsLIRmCZn4viPw6RplA/DvCGGvjMM=; b=oFXC72s++OcdXOn4i1FfXTeFjFdDBP7k8VSQ1AEWJZEtdpCwrK2LLuGz4De+MEKGgiExaI Bi16NqAiwqeCsmmTTw0oP2W+9S8xcPkcjz3mBer5Ht+3QXlh5bHuwkCcJWM+rJMAa5//Ee 4mHRJaP/WfoDdaohuLMUmenNLmqwyae+1S0BmSJbhkOFznM2LKt0A1qsHUw6U4bNTVcqS9 3YST6Dokc4ty8qL+MLUX9EG8X3zpI+RX6LvDqBTQulNwWuR3wfOFhw1elKoq06fpbw+fGM 7EPoSpQimXHm7s9aptqivKo7MoXZQrvKInEy0v3d+xfCs/kM904enXzJr+tF2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478497; a=rsa-sha256; cv=none; b=J/5kxPct+oRCSjBTOnRQmpey17Nuf1Vk7Mp2/UgvgU2xcdSImk+41IZZkGp0EPSx0a2NyN OKi893ujZiS9eI5dV7Ge5K+CS06L2IN4R+hA+opRZtKkt4BfDG7EWlUUnfmfyySRi2MjtJ me7hUqnV671UXZp0obwnWQQzvtdESYfLbJCNrol94wLmwtvqjl8UVE3i6o1nLCCbHM4uXG 5WIW/gGGTJnQOSVdNoBXeMElVeqth/CcItzoSPN3/jhtioaSDPhNEtghOJGFo94B4s0coa zsDtW/E1uV6m75/vqfPb2PW3I9vS8FOtgTDGIic5hw8gMKguGxIBdyBttc8WVg== 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 4Shs0J6R1ZzwHX; Sat, 2 Dec 2023 00:54:56 +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 3B20suPZ025040; Sat, 2 Dec 2023 00:54:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20suhr025037; Sat, 2 Dec 2023 00:54:56 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:56 GMT Message-Id: <202312020054.3B20suhr025037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 084cbd8c7283 - stable/14 - Sort MK_GNU_DIFF option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 084cbd8c7283952d68f2c40e27e900fe0af5d97e Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=084cbd8c7283952d68f2c40e27e900fe0af5d97e commit 084cbd8c7283952d68f2c40e27e900fe0af5d97e Author: Brooks Davis AuthorDate: 2023-11-09 01:01:44 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:11:32 +0000 Sort MK_GNU_DIFF option Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 (cherry picked from commit 2b3bf27da41f1481b2025445c6adf27f0d50de99) --- tools/build/mk/OptionalObsoleteFiles.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index f3122cfb1981..41464fd75082 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2007,6 +2007,11 @@ OLD_FILES+=usr/tests/usr.bin/dc/inout OLD_DIRS+=usr/tests/usr.bin/dc .endif +.if ${MK_GNU_DIFF} == no +OLD_FILES+=usr/bin/diff3 +OLD_FILES+=usr/share/man/man1/diff3.1.gz +.endif + .if ${MK_GOOGLETEST} == no OLD_FILES+=usr/include/private/gmock/gmock-actions.h OLD_FILES+=usr/include/private/gmock/gmock-cardinalities.h @@ -2162,11 +2167,6 @@ OLD_FILES+=usr/share/man/man3/gpio_pin_tristate.3.gz OLD_FILES+=usr/share/man/man8/gpioctl.8.gz .endif -.if ${MK_GNU_DIFF} == no -OLD_FILES+=usr/bin/diff3 -OLD_FILES+=usr/share/man/man1/diff3.1.gz -.endif - .if ${MK_GSSAPI} == no OLD_FILES+=usr/include/gssapi/gssapi.h OLD_DIRS+=usr/include/gssapi