From owner-svn-src-stable-10@FreeBSD.ORG  Wed Jan 22 10:35:31 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2F34F11A;
 Wed, 22 Jan 2014 10:35:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 19A0B18E5;
 Wed, 22 Jan 2014 10:35:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0MAZUmB086816;
 Wed, 22 Jan 2014 10:35:30 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0MAZUCh086815;
 Wed, 22 Jan 2014 10:35:30 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201401221035.s0MAZUCh086815@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 22 Jan 2014 10:35:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r261021 - stable/10/usr.sbin/ndiscvt
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Jan 2014 10:35:31 -0000

Author: glebius
Date: Wed Jan 22 10:35:30 2014
New Revision: 261021
URL: http://svnweb.freebsd.org/changeset/base/261021

Log:
  Merge r259855:  We have in base iconv.
  
  PR:		185135

Modified:
  stable/10/usr.sbin/ndiscvt/ndisgen.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/ndiscvt/ndisgen.sh
==============================================================================
--- stable/10/usr.sbin/ndiscvt/ndisgen.sh	Wed Jan 22 10:31:56 2014	(r261020)
+++ stable/10/usr.sbin/ndiscvt/ndisgen.sh	Wed Jan 22 10:35:30 2014	(r261021)
@@ -493,7 +493,7 @@ convert_driver () {
 	return
 }
 
-ICONVPATH=/usr/local/bin/iconv
+ICONVPATH=/usr/bin/iconv
 NDISCVT=/usr/sbin/ndiscvt
 STUBPATH=/usr/share/misc
 STUBFILE=windrv_stub.c