From owner-freebsd-bugs@FreeBSD.ORG Wed Sep 19 08:50:07 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 74ACC106566B for ; Wed, 19 Sep 2012 08:50:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2E6C08FC17 for ; Wed, 19 Sep 2012 08:50:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8J8o69j084533 for ; Wed, 19 Sep 2012 08:50:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8J8o6Lr084532; Wed, 19 Sep 2012 08:50:06 GMT (envelope-from gnats) Resent-Date: Wed, 19 Sep 2012 08:50:06 GMT Resent-Message-Id: <201209190850.q8J8o6Lr084532@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Niclas Zeising Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E652F106566C for ; Wed, 19 Sep 2012 08:48:33 +0000 (UTC) (envelope-from zeising@daemonic.se) Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3]) by mx1.freebsd.org (Postfix) with ESMTP id 407758FC15 for ; Wed, 19 Sep 2012 08:48:33 +0000 (UTC) Received: from mail.lysator.liu.se (localhost [127.0.0.1]) by mail.lysator.liu.se (Postfix) with ESMTP id 8ADAF40008 for ; Wed, 19 Sep 2012 10:48:32 +0200 (CEST) Received: by mail.lysator.liu.se (Postfix, from userid 1004) id 801DF40019; Wed, 19 Sep 2012 10:48:32 +0200 (CEST) Received: from mx.daemonic.se (mx.daemonic.se [IPv6:2001:470:dca9:0:1::3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.lysator.liu.se (Postfix) with ESMTPSA id 0112B40008 for ; Wed, 19 Sep 2012 10:48:31 +0200 (CEST) Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) by mx.daemonic.se (Postfix) with ESMTPS id 3XMF8v5CxRz8gtM for ; Wed, 19 Sep 2012 10:48:31 +0200 (CEST) Received: from mx.daemonic.se ([IPv6:2001:470:dca9:0:1::3]) (using TLS with cipher CAMELLIA256-SHA) by mailscanner.daemonic.se (mailscanner.daemonic.se [2001:470:dca9:0:1::6]) (amavisd-new, port 10025) with ESMTPS id BPGU3LQlCd-O for ; Wed, 19 Sep 2012 10:48:29 +0200 (CEST) Received: from mail.daemonic.se (mail.daemonic.se [10.1.0.4]) by mx.daemonic.se (Postfix) with ESMTPS id 3XMF8s2LXLz8gtL for ; Wed, 19 Sep 2012 10:48:29 +0200 (CEST) Received: from tifa.daemonic.se (tifa.daemonic.se [IPv6:2001:470:dca9:1::6]) by mail.daemonic.se (Postfix) with ESMTPSA id 3XMF8s1n6Xz9Ctj for ; Wed, 19 Sep 2012 10:48:29 +0200 (CEST) Received: by tifa.daemonic.se (Postfix, from userid 1001) id C312B228F3; Wed, 19 Sep 2012 10:48:28 +0200 (CEST) Message-Id: <20120919084828.C312B228F3@tifa.daemonic.se> Date: Wed, 19 Sep 2012 10:48:28 +0200 (CEST) From: Niclas Zeising To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: bin/171767: [PATCH] do not install pf man pages if WITHOUT_PF is set X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Niclas Zeising List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Sep 2012 08:50:07 -0000 >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 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: