From zeising@daemonic.se  Wed Sep 19 08:48:34 2012
Return-Path: <zeising@daemonic.se>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E652F106566C
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>;
	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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <zeising@daemonic.se>
Reply-To: Niclas Zeising <zeising@daemonic.se>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] do not install pf man pages if WITHOUT_PF is set
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>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:    zeising
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 19 08:50:05 UTC 2012
>Closed-Date:    Wed Sep 19 09:34:47 UTC 2012
>Last-Modified:  Wed Sep 19 09:40:09 UTC 2012
>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:
State-Changed-From-To: open->closed 
State-Changed-By: zeising 
State-Changed-When: Wed Sep 19 09:34:45 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171767 
Responsible-Changed-From-To: freebsd-bugs->zeising 
Responsible-Changed-By: zeising 
Responsible-Changed-When: Wed Sep 19 09:35:12 UTC 2012 
Responsible-Changed-Why:  
Take since I closed it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171767 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/171767: commit references a PR
Date: Wed, 19 Sep 2012 09:34:53 +0000 (UTC)

 Author: zeising (doc,ports committer)
 Date: Wed Sep 19 09:34:21 2012
 New Revision: 240689
 URL: http://svn.freebsd.org/changeset/base/240689
 
 Log:
   Do not install pf related man pages if WITHOUT_PF is set.
   
   PR:		bin/171767
   Submitted by:	zeising
   Approved by:	joel (mentor), glebius
 
 Modified:
   head/share/man/man4/Makefile
   head/share/man/man5/Makefile
 
 Modified: head/share/man/man4/Makefile
 ==============================================================================
 --- head/share/man/man4/Makefile	Wed Sep 19 06:20:25 2012	(r240688)
 +++ head/share/man/man4/Makefile	Wed Sep 19 09:34:21 2012	(r240689)
 @@ -1,6 +1,8 @@
  #	@(#)Makefile	8.1 (Berkeley) 6/18/93
  # $FreeBSD$
  
 +.include <bsd.own.mk>
 +
  MAN=	aac.4 \
  	acpi.4 \
  	${_acpi_asus.4} \
 @@ -354,9 +356,9 @@ MAN=	aac.4 \
  	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 +800,10 @@ _nvram2env.4=	nvram2env.4
  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>
 
 Modified: head/share/man/man5/Makefile
 ==============================================================================
 --- head/share/man/man5/Makefile	Wed Sep 19 06:20:25 2012	(r240688)
 +++ head/share/man/man5/Makefile	Wed Sep 19 09:34:21 2012	(r240689)
 @@ -50,8 +50,6 @@ MAN=	acct.5 \
  	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+=	hesiod.conf.5 
  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
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
