The branch main has been updated by sjg:
URL:
https://cgit.FreeBSD.org/src/commit/?id=901efd8bb9b9efe34085abc2d5ab36d21378b1dd
commit 901efd8bb9b9efe34085abc2d5ab36d21378b1dd
Author: Simon J. Gerraty <s...@freebsd.org>
AuthorDate: 2023-04-19 03:23:23 +0000
Commit: Simon J. Gerraty <s...@freebsd.org>
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= \
