The branch main has been updated by imp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=5a4b548ab2460be5f456b2e4fe91bfc21d53862b

commit 5a4b548ab2460be5f456b2e4fe91bfc21d53862b
Author:     Warner Losh <[email protected]>
AuthorDate: 2024-01-02 16:38:27 +0000
Commit:     Warner Losh <[email protected]>
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

Reply via email to