From nobody Wed Jan 03 19:16:02 2024 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 4T4zw30lpKz56WF2; Wed, 3 Jan 2024 19:16: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 4T4zw25ZR9z4Bfp; Wed, 3 Jan 2024 19:16:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704309362; 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=7EEKb7g6sDsbZ+LIs0V2wgBgmavejbFQ9YK4Jknl5cQ=; b=bh1clmE+q6+5BL5+IY5WmcUpYhthjRqAh+QveeUCcnrKjf1cuJQx2MWnAlEMietiMx/M9g WwmXE3P+CriYO5EcRekcOfcdhMCyleRoTLDwilC2PxTSGGqXqEJrb6hfL/kj54mbYnvKt9 Agfl/92h2O5a/aCzmtT3CqyWvyi0xuDWGrzUl0uLVjuX69XdGDbHnEnP0Ep10N2wZOlJ1g 8Av1HXc1sxhJoH2dl31BWTBVlbtcr69eb94mLBHlcP4ex0VaqnwXhw3Amomt6ZdzPPnLmD CBTTEnSHleWOTmRcsG9x6A5l/Ns6Pw5GgCSUcDas6Wo2k4cG3BuG9dvKi3t6qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704309362; 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=7EEKb7g6sDsbZ+LIs0V2wgBgmavejbFQ9YK4Jknl5cQ=; b=a+ssItEu3eQ7K+54V5JTzIHbwKO/i1qpCtpXg2/t39whUMt7HKA4rOYiuEXCa8KNH0ztNj 9zW2ArYQHpXuGAFBhTuwsUJUQEi8SHbqzYAwyjOFUGMkaZppJFj3NuNNX98WLV9ZRVcUyu lgaEQgGCkO4hgGH4UaPw11R394X18cJK1QrLlqofsddRRh2x0NFcvv0OMlz168/JONRztU H6E7VPqEanx6WsILLg8UOasOMo/Ocz/qO1Pil2EeOjmS5SUxJw6PQMTh23iv4uyHOdLqar XUh6AtncvJuUlxLFLB1J3Ek3g0u92kUBDAx3kpf8gFSrKBtWfaR9SsnYSHOxdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704309362; a=rsa-sha256; cv=none; b=AIKi793xDTtJJYk1NueWtyeP52c16uR9UC4VstQtATwZxqW/FF9O5qBcRwte+rShSto+dM krmG8FnZNtZWxIVg2Q5yyrDOeoznjTbULBPWpDDCfncRyk5+0OGNsdq1er//KiPqVToBRB rSSXhA64NNG60viO6mz7KznVy+D4EaXKdnh1Hd8Bm/+ADMwLbV+Sx2VZdOAMm9p+LsH4wC 9swT72A1GJRlA3IuZEwzWEzYof2nkr6tP0r6WY5pYFW/L9LsbbFLNjdXZoy2Nk6jEGpn28 w8RBYriZy2N7dlhEVAv31V2x6hNPqBX6Wd3mlylmadESV3GcD0Rk5mDJn9jtFw== 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 4T4zw24Kw1zxn1; Wed, 3 Jan 2024 19:16:02 +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 403JG2Sm087328; Wed, 3 Jan 2024 19:16:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403JG2gJ087325; Wed, 3 Jan 2024 19:16:02 GMT (envelope-from git) Date: Wed, 3 Jan 2024 19:16:02 GMT Message-Id: <202401031916.403JG2gJ087325@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5a4b548ab246 - main - bsd.port.mk: No need to support fmake anymore 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a4b548ab2460be5f456b2e4fe91bfc21d53862b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5a4b548ab2460be5f456b2e4fe91bfc21d53862b commit 5a4b548ab2460be5f456b2e4fe91bfc21d53862b Author: Warner Losh AuthorDate: 2024-01-02 16:38:27 +0000 Commit: Warner Losh CommitDate: 2024-01-03 19:14:07 +0000 bsd.port.mk: No need to support fmake anymore There's no need to support fmake anymore. Always assume we can use bmake's :tA modifier. The ports tree hasn't supported fmake in about a decade anyway. Simplify here. Sponsored by: Netflix Reviewed by: brooks, emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/980 --- share/mk/bsd.port.mk | 4 ---- share/mk/bsd.port.subdir.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk index 3ee3bdc8c42f..2a011ba93152 100644 --- a/share/mk/bsd.port.mk +++ b/share/mk/bsd.port.mk @@ -9,11 +9,7 @@ _PORTSDIR= ${.CURDIR}/${RELPATH} .endif .endfor _PORTSDIR?= /usr/ports -.if defined(.PARSEDIR) PORTSDIR= ${_PORTSDIR:tA} -.else # fmake doesn't have :tA -PORTSDIR!= realpath ${_PORTSDIR} -.endif .endif BSDPORTMK?= ${PORTSDIR}/Mk/bsd.port.mk diff --git a/share/mk/bsd.port.subdir.mk b/share/mk/bsd.port.subdir.mk index 17fd7f973c60..14c0857f04b2 100644 --- a/share/mk/bsd.port.subdir.mk +++ b/share/mk/bsd.port.subdir.mk @@ -9,11 +9,7 @@ _PORTSDIR= ${.CURDIR}/${RELPATH} .endif .endfor _PORTSDIR?= /usr/ports -.if defined(.PARSEDIR) PORTSDIR= ${_PORTSDIR:tA} -.else # fmake doesn't have :tA -PORTSDIR!= realpath ${_PORTSDIR} -.endif .endif BSDPORTSUBDIRMK?= ${PORTSDIR}/Mk/bsd.port.subdir.mk