From owner-svn-src-all@FreeBSD.ORG  Tue Aug 23 19:29:12 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB1401065672;
	Tue, 23 Aug 2011 19:29:12 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3FDAA8FC1F;
	Tue, 23 Aug 2011 19:29:12 +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 p7NJTCRQ016434;
	Tue, 23 Aug 2011 19:29:12 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7NJTCc4016432;
	Tue, 23 Aug 2011 19:29:12 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201108231929.p7NJTCc4016432@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 23 Aug 2011 19:29:12 +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: r225120 - head/etc/rc.d
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Aug 2011 19:29:12 -0000

Author: delphij
Date: Tue Aug 23 19:29:11 2011
New Revision: 225120
URL: http://svn.freebsd.org/changeset/base/225120

Log:
  Honor WITHOUT_IPX when installing etc/rc.d/ipxrouted.
  
  MFC after:	1 week
  Approved by:	re (kib)

Modified:
  head/etc/rc.d/Makefile

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Tue Aug 23 14:37:42 2011	(r225119)
+++ head/etc/rc.d/Makefile	Tue Aug 23 19:29:11 2011	(r225120)
@@ -16,7 +16,7 @@ FILES=	DAEMON FILESYSTEMS LOGIN NETWORKI
 	hostapd hostid hostid_save hostname \
 	inetd initrandom \
 	ip6addrctl ipfilter ipfs ipfw ipmon \
-	ipnat ipsec ipxrouted \
+	ipnat ipsec \
 	jail \
 	kadmind kerberos keyserv kld kldxref kpasswdd \
 	ldconfig local localpkg lockd lpd \
@@ -42,6 +42,10 @@ FILES=	DAEMON FILESYSTEMS LOGIN NETWORKI
 	ypset ypupdated ypxfrd \
 	zfs zvol
 
+.if ${MK_IPX} != "no"
+FILES+=	ipxrouted
+.endif
+
 .if ${MK_OFED} != "no"
 FILES+= opensm
 .endif