Date: Sun, 23 Nov 2025 10:19:20 +0000 From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 07264510f82f - main - Mk: move bsd.local.mk to .sample Message-ID: <6922dfa8.386ca.744f1c83@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=07264510f82f6843178ab7e6901db3cfd29f8ca9 commit 07264510f82f6843178ab7e6901db3cfd29f8ca9 Author: Mathieu Arnold <mat@FreeBSD.org> AuthorDate: 2025-11-23 10:14:45 +0000 Commit: Mathieu Arnold <mat@FreeBSD.org> CommitDate: 2025-11-23 10:14:45 +0000 Mk: move bsd.local.mk to .sample This allows people to modify it without the it being tracked and showing as modified. PR: 275745 --- Mk/{bsd.local.mk => bsd.local.mk.sample} | 4 +++- Mk/bsd.port.mk | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Mk/bsd.local.mk b/Mk/bsd.local.mk.sample similarity index 76% rename from Mk/bsd.local.mk rename to Mk/bsd.local.mk.sample index 3a3c544d6380..77d6a5f7354e 100644 --- a/Mk/bsd.local.mk +++ b/Mk/bsd.local.mk.sample @@ -1,4 +1,6 @@ -# bsd.local.mk - Sandbox for local modification to ports framework. +# bsd.local.mk.local - Sandbox for local modification to ports framework. +# +# To use this feature, copy this file to Mk/bsd.local.mk, and modify as required # .if !defined(_POSTMKINCLUDED) && !defined(Local_Pre_Include) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index ad654761fcfb..eb71d0f7f7f8 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1386,7 +1386,7 @@ PREFIX?= ${LOCALBASE} PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg . if defined(USE_LOCAL_MK) -.include "${PORTSDIR}/Mk/bsd.local.mk" +.sinclude "${PORTSDIR}/Mk/bsd.local.mk" . endif . for odir in ${OVERLAYS} .sinclude "${odir}/Mk/bsd.overlay.mk" @@ -1936,7 +1936,7 @@ PKGPREDEINSTALL?= ${PKGDIR}/pkg-pre-deinstall PKGPOSTDEINSTALL?= ${PKGDIR}/pkg-post-deinstall . if defined(USE_LOCAL_MK) -.include "${PORTSDIR}/Mk/bsd.local.mk" +.sinclude "${PORTSDIR}/Mk/bsd.local.mk" . endif . for odir in ${OVERLAYS} .sinclude "${odir}/Mk/bsd.overlay.mk"home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6922dfa8.386ca.744f1c83>