From nobody Tue Nov 14 16:52:02 2023 X-Original-To: dev-commits-src-main@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 4SVC4z1cTPz51Vmy; Tue, 14 Nov 2023 16:52:03 +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 4SVC4z142Jz4L0L; Tue, 14 Nov 2023 16:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699980723; 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=AZVjpZ9NKDBNCrvOQRrg04C2wj0vSgL1jWeBibZOeyo=; b=x3CcOOdCQMkikuDUMQYGl4yEh6iZ7I5zWotEYFd81a7+G4rAJg/GEC4IPzTye9TJXEMWmH zKlhNXQ00JUDA4fUJ+Pwpb2JjyY2HN8ggbqkvm1J7rZjslSevTm4BRswcSnMt6lIHTrd1q 9Ef3NsajZ4jbWNDrwfusWEtxpKFTJGb/6qdSGZxA4GKrYRtUhjK59GxjjDlQjKhEFNIFmC v9pbpdZOMkBl3v7S0Av4Ax8jZ7ClcOxh+xQpdCDjRJIYupmRqn4Eloz2OhkpfSNkUTCpra urmQ64x+s4iCFYgoOoPAXoAWY2G9nkLQGS9nwkEodkJY3Ez4ro25fihX8KJE4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699980723; 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=AZVjpZ9NKDBNCrvOQRrg04C2wj0vSgL1jWeBibZOeyo=; b=LD7nkWNCpB6rvXcwOjfmT4pWwFu3x2q0L/C1kGxWMb65sAytmRJknxn5/xY4UMGuIv56YH rG+ExWacFTFJg7MhsFU9x0C2kb0WI6kWapWuNqzWNSdVNwTqFsqSlTx/sOz7qjwGO9qkjB PTBdJ00nfZJL8Fe6A7gwY43ucP0v5ZFn+NJsJV0+43epVx9qbOyMxI3EbNPwz/bgDWLJ7s vQkBsAvIwN1TwerZQt6Ruo1xNUxU8kXi3iJ8O3+2SIonBARpYkXj9pW39HdfRXyLrbhkpI qLn/IOFosP+wOCQJSemKVEsSfHEYGnw7FONmQTW4M0+y3g+br44ZugMYFBcrng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699980723; a=rsa-sha256; cv=none; b=L0ekXkLD16dpkf/tNwgyd/f7pz1wilsNbXOAiZwx80q/3YFv4LOELXDhB4M0nX73rdfsTW 4GpxbsUBMYHeiEGZZPbLIN5BD4D6KTPmWHj7qTHz/HPguhXp80bso/bjj+YqNkLFnFBq8m 11im1qO1mLrkar7ONaPh6UM60DSsT4E9OTVVRZbkOFW1hfNQ4LdCnNVtcwZL3hO2vqyrNB Z76tBtr42a4dM9TSXmiO8iCB38L5BQh6yLbPhZiB2elnHcHy/XtlaEtufvOZwV4NN7SFbn UvUodpI8RuvQnk/W7feGXyCu5Sh7u+Dqx/xvBaCR8KW1s40Pq8gmZo/ixzFjQw== 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 4SVC4z08hpzwZK; Tue, 14 Nov 2023 16:52:03 +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 3AEGq26i015968; Tue, 14 Nov 2023 16:52:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AEGq2ca015965; Tue, 14 Nov 2023 16:52:02 GMT (envelope-from git) Date: Tue, 14 Nov 2023 16:52:02 GMT Message-Id: <202311141652.3AEGq2ca015965@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: 2b3bf27da41f - main - Sort MK_GNU_DIFF option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 2b3bf27da41f1481b2025445c6adf27f0d50de99 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=2b3bf27da41f1481b2025445c6adf27f0d50de99 commit 2b3bf27da41f1481b2025445c6adf27f0d50de99 Author: Brooks Davis AuthorDate: 2023-11-09 01:01:44 +0000 Commit: Brooks Davis CommitDate: 2023-11-14 16:49:59 +0000 Sort MK_GNU_DIFF option Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 --- 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 99e6ea1c8be3..c76313d173aa 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1993,6 +1993,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 @@ -2148,11 +2153,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