From owner-svn-src-head@FreeBSD.ORG  Tue Aug  6 21:30:38 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 ESMTP id 54807B12;
 Tue,  6 Aug 2013 21:30:38 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
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 41E7C2668;
 Tue,  6 Aug 2013 21:30:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r76LUcR1068644;
 Tue, 6 Aug 2013 21:30:38 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r76LUcmx068642;
 Tue, 6 Aug 2013 21:30:38 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201308062130.r76LUcmx068642@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Tue, 6 Aug 2013 21:30:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254010 - head/tools/build/mk
X-SVN-Group: head
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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Aug 2013 21:30:38 -0000

Author: sbruno
Date: Tue Aug  6 21:30:37 2013
New Revision: 254010
URL: http://svnweb.freebsd.org/changeset/base/254010

Log:
  Adjust make knobs to know that WITH_ICONV installs a /usr/bin/iconv
  
  Remove it if the knob isn't tweaked.  Certain ports seem to think that
  if /usr/bin/iconv exists, then libc has built in libiconv things and will
  blow up pretty nicely when built.
  
  Reviewed by:	gjb@
  MFC after:	2 weeks

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Tue Aug  6 21:16:00 2013	(r254009)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Tue Aug  6 21:30:37 2013	(r254010)
@@ -4347,3 +4347,7 @@ OLD_FILES+=usr/bin/svnserve
 OLD_FILES+=usr/bin/svnsync
 OLD_FILES+=usr/bin/svnversion
 .endif
+
+.if ${MK_ICONV} == no
+OLD_FILES+=usr/bin/iconv
+.endif