From nobody Sun Nov 23 10:19:20 2025 X-Original-To: dev-commits-ports-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 4dDlLK45Ckz6Gh0Q for ; Sun, 23 Nov 2025 10:19:21 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDlLJ2Dg3z3Lq6 for ; Sun, 23 Nov 2025 10:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763893161; 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=I9DKWXcZFlf7Xa2Wxh751eSWuqCQp0RnMFeJvHJfTWM=; b=CZZYWWw/RujB1enfDw0cZvZKnhEy0SeFDMYU14CLxXhl8IEAtYX6uWzLVky2+7SngbOdtS hKpvHUeC6yQJqLS40v9xmZgecMuGEeh13Q/+5QrZOo1Hv7+wTK2YHjy+VBADBQHkLqGx6E K297lzJZGtkqY/RuARLRZDkwrxP9PZc8z3D5SasMBPSKRH5Dx5gb/DCMY8VlGiDXOYu7Ki 6RdlaYMGAQxlCLVa+sv1e1P8Tqdwg8oO2Dvr7uhPpAwEWKt6yCe0LsJhn292Z91YTW5uGV z+2+k75WLj9XI+CeCBBOnjr4LBwJTfeeujVJNSjaGg7h7rBS3bYn2EcpKVqx3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763893160; 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=I9DKWXcZFlf7Xa2Wxh751eSWuqCQp0RnMFeJvHJfTWM=; b=NgGpbOAcMgRhg1TSCV74tJg3MJE5gKMSuliCVnyuEkA0mDeWpA7AqomvmAj0gVl5qjO0b5 2x+qgNUr5FSEC4kUtQTBm2JI+qPHdUlp5wN0GQRj9yzl5oSuew2ZT+O81GzekouUAOZWcG AS1lqXIJPEL+IpnF/FqKrP/9vi1feWacKHIfFamF7gAyXTZAZVAV9ZGaVE3BFPh9SSeLaj qz72cwG7sBqPQpKEbaZL62RZZovltCgT88anncFVPiqAWSp9DE8Mdo0fZBuUkNzQ3uua6e 8TbW8ISHT24LJUh7Z8ujHopw9hxFXYF4aTVoSwiMzEaYbqGznPnGVm3RVsSvbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763893160; a=rsa-sha256; cv=none; b=YQuFYT0TOTYduuWD4nwPmJSTl6/3kYY+FOvwBi2V5r2lXyexhCDDnEXShr6YBgWq+sXvMO dy11fHJ6fO8a1nQS8fZjU8/Z5zYBhZjk0FHI94SZa+rdSpTkUsaZBHHTLA/y3jQB06JSjV JY8ZfTc+3sgaBRCSWZ+lh7nPempBthcsLZ427yNBEJE6sUL/y8e+pQxSjq3wjLecWNArsy +bi02ti6JRQlBQJtRPAMgQLtGOX0uIyaugiWOkVpx2j+ojgLa6AC6uLJs2STQOk6hg1jDW KQ9xcygHvqqm4KHBLTgGMaOi9SFmQ3ycjkDjfr0FnuF83h83mW2VCIE7JxQ19Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDlLJ1GFwz87M for ; Sun, 23 Nov 2025 10:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 386ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 10:19:20 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mathieu Arnold Subject: git: 07264510f82f - main - Mk: move bsd.local.mk to .sample List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07264510f82f6843178ab7e6901db3cfd29f8ca9 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 10:19:20 +0000 Message-Id: <6922dfa8.386ca.744f1c83@gitrepo.freebsd.org> The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=07264510f82f6843178ab7e6901db3cfd29f8ca9 commit 07264510f82f6843178ab7e6901db3cfd29f8ca9 Author: Mathieu Arnold AuthorDate: 2025-11-23 10:14:45 +0000 Commit: Mathieu Arnold 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"