From owner-p4-projects@FreeBSD.ORG  Mon Oct 24 12:15:32 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 38D4716A421; Mon, 24 Oct 2005 12:15:32 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0E24A16A41F
	for <perforce@freebsd.org>; Mon, 24 Oct 2005 12:15:32 +0000 (GMT)
	(envelope-from soc-bushman@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CDB8443D46
	for <perforce@freebsd.org>; Mon, 24 Oct 2005 12:15:31 +0000 (GMT)
	(envelope-from soc-bushman@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9OCFVDO096977
	for <perforce@freebsd.org>; Mon, 24 Oct 2005 12:15:31 GMT
	(envelope-from soc-bushman@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9OCFV1g096974
	for perforce@freebsd.org; Mon, 24 Oct 2005 12:15:31 GMT
	(envelope-from soc-bushman@freebsd.org)
Date: Mon, 24 Oct 2005 12:15:31 GMT
Message-Id: <200510241215.j9OCFV1g096974@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-bushman@freebsd.org using -f
From: soc-bushman <soc-bushman@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 85776 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Oct 2005 12:15:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=85776

Change 85776 by soc-bushman@soc-bushman_stinger on 2005/10/24 12:14:33

	syncrhonized to the main source tree

Affected files ...

.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/Makefile#4 edit

Differences ...

==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/Makefile#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.337 2005/09/28 07:20:46 ru Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.340 2005/10/17 20:47:44 phk Exp $
 
 # XXX MISSING:		mkproto
 SUBDIR=	ac \
@@ -60,6 +60,7 @@
 	inetd \
 	iostat \
 	ip6addrctl \
+	ipfwpcap \
 	IPXrouted \
 	jail \
 	jexec \
@@ -73,6 +74,7 @@
 	lastlogin \
 	${_lpr} \
 	${_lptcontrol} \
+	lmcconfig \
 	${_mailstats} \
 	mailwrapper \
 	${_makemap} \
@@ -148,7 +150,6 @@
 	sa \
 	${_sendmail} \
 	setfmac \
-	setkey \
 	setpmac \
 	${_sicontrol} \
 	sliplogin \
@@ -215,8 +216,8 @@
 _bluetooth=	bluetooth
 .endif
 
-.if !defined(NO_NS_CACHING)
-_cached=	cached
+if !defined(NO_NS_CACHING)
+_cached=       cached
 .endif
 
 .if !defined(NO_CRYPT) && !defined(NO_OPENSSL)