From owner-svn-src-head@FreeBSD.ORG  Wed Sep 19 09:34:21 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C0D04106564A;
	Wed, 19 Sep 2012 09:34:21 +0000 (UTC)
	(envelope-from zeising@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AAD5E8FC08;
	Wed, 19 Sep 2012 09:34:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8J9YLEW066128;
	Wed, 19 Sep 2012 09:34:21 GMT (envelope-from zeising@svn.freebsd.org)
Received: (from zeising@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8J9YL6h066125;
	Wed, 19 Sep 2012 09:34:21 GMT (envelope-from zeising@svn.freebsd.org)
Message-Id: <201209190934.q8J9YL6h066125@svn.freebsd.org>
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Wed, 19 Sep 2012 09:34:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240689 - in head/share/man: man4 man5
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Sep 2012 09:34:21 -0000

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