From owner-svn-ports-head@FreeBSD.ORG  Sat Apr 18 13:20:53 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9C0A3FC5;
 Sat, 18 Apr 2015 13:20:53 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8A6F8D81;
 Sat, 18 Apr 2015 13:20:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3IDKrr0068003;
 Sat, 18 Apr 2015 13:20:53 GMT (envelope-from koobs@FreeBSD.org)
Received: (from koobs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3IDKrqM067999;
 Sat, 18 Apr 2015 13:20:53 GMT (envelope-from koobs@FreeBSD.org)
Message-Id: <201504181320.t3IDKrqM067999@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: koobs set sender to
 koobs@FreeBSD.org using -f
From: Kubilay Kocak <koobs@FreeBSD.org>
Date: Sat, 18 Apr 2015 13:20:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r384226 - in head/shells/fish: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Apr 2015 13:20:53 -0000

Author: koobs
Date: Sat Apr 18 13:20:52 2015
New Revision: 384226
URL: https://svnweb.freebsd.org/changeset/ports/384226

Log:
  shells/fish: Fix for hangs on FreeBSD 10.1+
  
  Fix for hangs on FreeBSD 10.1+ due to WCHAR_T missing as an alias for
  UCS-4-INTERNAL.
  
  [1] https://github.com/fish-shell/fish-shell/issues/1741
  
  PR:		196661
  Submitted by:	David Adam <zanchey ucc.gu.uwa.edu.au>
  Approved by:	maintainer <freebsd.users gmail com>

Added:
  head/shells/fish/files/patch-env__universal__common.cpp   (contents, props changed)
Modified:
  head/shells/fish/Makefile

Modified: head/shells/fish/Makefile
==============================================================================
--- head/shells/fish/Makefile	Sat Apr 18 12:58:34 2015	(r384225)
+++ head/shells/fish/Makefile	Sat Apr 18 13:20:52 2015	(r384226)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fish
 PORTVERSION=	2.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	shells
 MASTER_SITES=	http://fishshell.com/files/${PORTVERSION}/
 

Added: head/shells/fish/files/patch-env__universal__common.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/shells/fish/files/patch-env__universal__common.cpp	Sat Apr 18 13:20:52 2015	(r384226)
@@ -0,0 +1,14 @@
+# Description: Hangs on freebsd when starting shell
+# Issue ID: https://github.com/fish-shell/fish-shell/issues/1741
+# TODO: Remove after 2.1.2 update
+
+--- env_universal_common.cpp.orig	2015-04-18 11:58:07 UTC
++++ env_universal_common.cpp
+@@ -151,6 +151,7 @@ static const char *iconv_wide_names_4[]=
+ {
+     "wchar_t", "WCHAR_T",
+     "wchar", "WCHAR",
++    "UCS-4-INTERNAL", 
+     "ucs-4", "UCS-4",
+     "ucs4", "UCS4",
+     "utf-32", "UTF-32",