From nobody Wed Apr 19 03:25:21 2023 X-Original-To: dev-commits-src-all@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 4Q1R4f2Zj0z44s9v; Wed, 19 Apr 2023 03:25:22 +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 4Q1R4f1dpDz4PY1; Wed, 19 Apr 2023 03:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681874722; 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=O1LheHhLQabhjJGeDba1Dg8OgwPjMFboYdoY63oW9l0=; b=ymxhEWC0sapGh6b0HTGFUSMmOpOlQyBOu+I9aXyFx0VHsjTlggyYaPtD3IXHeTePJfPZoH 27Fosld4Syo//mrf8p4r55LhvQnxvZIYP/PY7U3QhSJz2oTk3IdSLz4hmlTO2ldnxvzfpn c3J5nkPU/Bv8mMxnOrICibTQKZQb3kBEG8/imtOhxHIllUILdzGTJrTtcTYh8gfEIJzye+ BSY11xLUYb2PQvxDZFyYfwPKHBprliDspBpWS63Oevb+yI14O5i+M7m7LsQ9MIqPLDm5Zw 9ar2n8gdtZSLYgaHtmh33FKENLihYDDLWnZB57oiAlQZ2tNB/id0OsjZ/7z9gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681874722; 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=O1LheHhLQabhjJGeDba1Dg8OgwPjMFboYdoY63oW9l0=; b=RzClqFyvoeB8Rl0J+5W7Yjb6ZSn70Lb4F4XIUZOFp2h4CXw2HAZ9Fylao2b/UqOHLlj7lK Wo9zkD3cG26AMqiXiliD6C5FXV/PW5q95HJk2aHV8G1s1QMCHJQzeQVzrrtw6zkgiASnT0 jiJbGgteMSqjpTZmCcxfPJC0ihlrkFB66nscYOuUVfvRcYAAxsvYr29WEVevDsXtHD88X1 I/2kMmivERqAbsW/YQsgRKDgcJCTLGCizl+3HXLoLl8xh9GrlhdMXdyaBH2RNNGaXeKWoC sruHtgQOvbKddFiBzkpIvRJ/H5RxYsbUiRtdRZpvTRBZJpzFsenhcLxNNNG/JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681874722; a=rsa-sha256; cv=none; b=j/LbtjmlMyOTD4WPluxN/0RrAthL7EKPTRn6NstcrYKGoLxq5DhKB+b/2KABEB5CYGSTE1 wWhaVPE9VCyVZ643EKZO6N1/qoasXIhOLTZ0aFgCTtkDdZxsDcazmNxHBP0PpdasoTgq4i cXai7e5eAzsChFPezmObczHrY1VS9pBjNh+nZ2rbJW47/6gzKQNXz4zb4E6E0iRR+DlMT0 OCs4Qi3YSjpM+FWfeZn2z686xgZf7K1wPlNAtvyahgMbxLzpUp7QG2cXDBRPCPPqupq7IL ME2r0uqGkZAxraf/0YxDSE1V1HyYJkicreEL//jRmIWyArQs8raK/LzzR3w43A== 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 4Q1R4f0bprzf3Z; Wed, 19 Apr 2023 03:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33J3PLOm008336; Wed, 19 Apr 2023 03:25:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33J3PLr1008335; Wed, 19 Apr 2023 03:25:21 GMT (envelope-from git) Date: Wed, 19 Apr 2023 03:25:21 GMT Message-Id: <202304190325.33J3PLr1008335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 901efd8bb9b9 - main - Avoid staging conflict for examples/pf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 901efd8bb9b9efe34085abc2d5ab36d21378b1dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=901efd8bb9b9efe34085abc2d5ab36d21378b1dd commit 901efd8bb9b9efe34085abc2d5ab36d21378b1dd Author: Simon J. Gerraty AuthorDate: 2023-04-19 03:23:23 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-19 03:23:23 +0000 Avoid staging conflict for examples/pf If we are staging, let examples/pf stage its bits. --- share/examples/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/examples/Makefile b/share/examples/Makefile index 7179f1bff1a4..7384cb61c0a5 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -215,6 +215,7 @@ SE_PERFMON= \ .if ${MK_PF} != "no" SE_DIRS+= pf +.if ${MK_STAGING} == "no" SE_PF= \ ackpri \ faq-example1 \ @@ -227,6 +228,7 @@ SE_PF= \ queue4 \ spamd .endif +.endif SE_DIRS+= ppi SE_PPI= \