From owner-svn-src-all@freebsd.org  Tue Feb  2 11:51:20 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5ED22A986C0;
 Tue,  2 Feb 2016 11:51:20 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2946490B;
 Tue,  2 Feb 2016 11:51:20 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u12BpJWV087809;
 Tue, 2 Feb 2016 11:51:19 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u12BpJY7087808;
 Tue, 2 Feb 2016 11:51:19 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201602021151.u12BpJY7087808@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Tue, 2 Feb 2016 11:51:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295147 - head/bin/csh
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2016 11:51:20 -0000

Author: ume
Date: Tue Feb  2 11:51:18 2016
New Revision: 295147
URL: https://svnweb.freebsd.org/changeset/base/295147

Log:
  Make dynamic link of libiconv from ports work again.
  The symbols of libiconv from ports were changed to
  have prefixed.
  Since we have iconv in our libc these days, we don't
  need it on 10.X and later.  However, 9.X still need
  this.
  
  Spotted by:	Yoshihiko Sarumaru
  MFC after:	1 days

Modified:
  head/bin/csh/iconv_stub.c

Modified: head/bin/csh/iconv_stub.c
==============================================================================
--- head/bin/csh/iconv_stub.c	Tue Feb  2 11:36:58 2016	(r295146)
+++ head/bin/csh/iconv_stub.c	Tue Feb  2 11:51:18 2016	(r295147)
@@ -36,9 +36,9 @@
 #undef iconv_close
 
 #define ICONVLIB	"libiconv.so"
-#define ICONV_ENGINE	"iconv"
-#define ICONV_OPEN	"iconv_open"
-#define ICONV_CLOSE	"iconv_close"
+#define ICONV_ENGINE	"libiconv"
+#define ICONV_OPEN	"libiconv_open"
+#define ICONV_CLOSE	"libiconv_close"
 
 typedef iconv_t iconv_open_t(const char *, const char *);