Date: Wed, 19 Sep 2012 10:48:28 +0200 (CEST) From: Niclas Zeising <zeising@daemonic.se> To: FreeBSD-gnats-submit@FreeBSD.org Subject: bin/171767: [PATCH] do not install pf man pages if WITHOUT_PF is set Message-ID: <20120919084828.C312B228F3@tifa.daemonic.se> Resent-Message-ID: <201209190850.q8J8o6Lr084532@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171767
>Category: bin
>Synopsis: [PATCH] do not install pf man pages if WITHOUT_PF is set
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Sep 19 08:50:05 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Niclas Zeising
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD tifa.daemonic.se 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r231776M: Wed Feb 15 22:30:06 CET 2012 root@tifa.daemonic.se:/usr/obj/usr/src/sys/TIFA amd64
>Description:
PF manual pages are installed even though WITHOUT_PF is set in /etc/src.conf
>How-To-Repeat:
>Fix:
Attached patch fixes the issue and only installs pf manuals with WITHOUT_PF is not set.
This probably broke in r240494
--- share.man.diff begins here ---
Index: share/man/man4/Makefile
===================================================================
--- share/man/man4/Makefile (revision 240638)
+++ share/man/man4/Makefile (working copy)
@@ -354,9 +354,9 @@
pcii.4 \
pcm.4 \
pcn.4 \
- pf.4 \
- pflog.4 \
- pfsync.4 \
+ ${_pf.4} \
+ ${_pflog.4} \
+ ${_pfsync.4} \
pim.4 \
polling.4 \
ppbus.4 \
@@ -798,4 +798,10 @@
SUBDIR= man4.${MACHINE_CPUARCH}
.endif
+.if ${MK_PF} != "no"
+_pf.4= pf.4
+_pflog.4= pflog.4
+_pfsync.4= pfsync.4
+.endif
+
.include <bsd.prog.mk>
Index: share/man/man5/Makefile
===================================================================
--- share/man/man5/Makefile (revision 240638)
+++ share/man/man5/Makefile (working copy)
@@ -50,8 +50,6 @@
passwd.5 \
pbm.5 \
periodic.conf.5 \
- pf.conf.5 \
- pf.os.5 \
phones.5 \
portindex.5 \
portsnap.conf.5 \
@@ -91,6 +89,11 @@
MAN+= nandfs.5
.endif
+.if ${MK_PF} != "no"
+MAN+= pf.conf.5 \
+ pf.os.5
+.endif
+
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
_boot.config.5= boot.config.5
.endif
--- share.man.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120919084828.C312B228F3>