From owner-svn-src-projects@FreeBSD.ORG  Sun Jan 11 23:19:18 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2EF4A10656F2;
	Sun, 11 Jan 2009 23:19:18 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1E4968FC16;
	Sun, 11 Jan 2009 23:19:18 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BNJH78041375;
	Sun, 11 Jan 2009 23:19:17 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0BNJHxN041374;
	Sun, 11 Jan 2009 23:19:17 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200901112319.n0BNJHxN041374@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sun, 11 Jan 2009 23:19:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187068 - projects/vap7/usr.sbin
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jan 2009 23:19:18 -0000

Author: sam
Date: Sun Jan 11 23:19:17 2009
New Revision: 187068
URL: http://svn.freebsd.org/changeset/base/187068

Log:
  fix mismerge; looks like part of usr.bin/Makefile got integrated

Modified:
  projects/vap7/usr.sbin/Makefile

Modified: projects/vap7/usr.sbin/Makefile
==============================================================================
--- projects/vap7/usr.sbin/Makefile	Sun Jan 11 22:36:45 2009	(r187067)
+++ projects/vap7/usr.sbin/Makefile	Sun Jan 11 23:19:17 2009	(r187068)
@@ -393,23 +393,8 @@ _sysinstall=	sysinstall
 .endif
 
 .if ${MK_TOOLCHAIN} != "no"
-_ar=		ar
-_c89=		c89
-_c99=		c99
-_compile_et=	compile_et
-_ctags=		ctags
-_file2c=	file2c
-_gprof=		gprof
-_indent=	indent
-_lex=		lex
-_mkstr=		mkstr
-_rpcgen=	rpcgen
-_unifdef=	unifdef
-_xlint=		xlint
-_xstr=		xstr
-# XXX maybe under textproc?
-_vgrind=	vgrind
-_yacc=		yacc
+_config=	config
+_crunch=	crunch
 .endif
 
 .if ${MK_USB} != "no"