From owner-svn-src-head@freebsd.org  Sat Jul 15 09:04:24 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CE8CCDBE0DB;
 Sat, 15 Jul 2017 09:04:24 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9C17D69EB1;
 Sat, 15 Jul 2017 09:04:24 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6F94N4C058658;
 Sat, 15 Jul 2017 09:04:23 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6F94NYG058657;
 Sat, 15 Jul 2017 09:04:23 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <201707150904.v6F94NYG058657@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
 manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Sat, 15 Jul 2017 09:04:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321008 - head/etc/rc.d
X-SVN-Group: head
X-SVN-Commit-Author: manu
X-SVN-Commit-Paths: head/etc/rc.d
X-SVN-Commit-Revision: 321008
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Jul 2017 09:04:24 -0000

Author: manu
Date: Sat Jul 15 09:04:23 2017
New Revision: 321008
URL: https://svnweb.freebsd.org/changeset/base/321008

Log:
  etc/rc.d: Only install ipfw_netflow is MK_IPFW and MK_NETGRAPH is defined
  
  While here only install ipfw rc script if MK_IPFW is defined.
  
  Reported by:	ngie

Modified:
  head/etc/rc.d/Makefile

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Sat Jul 15 08:27:23 2017	(r321007)
+++ head/etc/rc.d/Makefile	Sat Jul 15 09:04:23 2017	(r321008)
@@ -47,7 +47,6 @@ FILES=	DAEMON \
 	ip6addrctl \
 	ipfilter \
 	ipfs \
-	ipfw \
 	ipmon \
 	ipnat \
 	ipsec \
@@ -204,6 +203,13 @@ HASTPACKAGE=	hast
 
 .if ${MK_INETD} != "no"
 FILES+=		inetd
+.endif
+
+.if ${MK_IPFW} != "no"
+FILES+=		ipfw
+.if ${MK_NETGRAPH} != "no"
+FILES+=		ipfw_netflow
+.endif
 .endif
 
 .if ${MK_ISCSI} != "no"