From owner-svn-ports-head@FreeBSD.ORG Wed Jan 7 22:44:05 2015 Return-Path: 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 99770566; Wed, 7 Jan 2015 22:44:05 +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 6B7EAC91; Wed, 7 Jan 2015 22:44:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t07Mi5Qp058277; Wed, 7 Jan 2015 22:44:05 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t07Mi4iq058274; Wed, 7 Jan 2015 22:44:04 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201501072244.t07Mi4iq058274@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 7 Jan 2015 22:44:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376504 - in head/devel/libedit: . 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jan 2015 22:44:05 -0000 Author: bapt Date: Wed Jan 7 22:44:04 2015 New Revision: 376504 URL: https://svnweb.freebsd.org/changeset/ports/376504 QAT: https://qat.redports.org/buildarchive/r376504/ Log: Fix Unicode environemnt detection Fix reading unicode lines More work is needed for part of the readline compatibility, this is good enough for the sqlite shell to accept unicode but not for ruby's irb yet Added: head/devel/libedit/files/patch-src_el.c (contents, props changed) head/devel/libedit/files/patch-src_eln.c (contents, props changed) Modified: head/devel/libedit/Makefile Modified: head/devel/libedit/Makefile ============================================================================== --- head/devel/libedit/Makefile Wed Jan 7 22:38:36 2015 (r376503) +++ head/devel/libedit/Makefile Wed Jan 7 22:44:04 2015 (r376504) @@ -4,6 +4,7 @@ PORTNAME= libedit PORTVERSION= ${EDITVERSION}.${EDITDATE} DISTVERSION= ${EDITDATE}-${EDITVERSION} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://thrysoee.dk/editline/ Added: head/devel/libedit/files/patch-src_el.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libedit/files/patch-src_el.c Wed Jan 7 22:44:04 2015 (r376504) @@ -0,0 +1,11 @@ +--- src/el.c.orig 2014-06-18 19:06:35 UTC ++++ src/el.c +@@ -121,7 +121,7 @@ el_init_fd(const char *prog, FILE *fin, + */ + el->el_flags = 0; + #ifdef WIDECHAR +- if (setlocale(LC_CTYPE, NULL) != NULL){ ++ if (setlocale(LC_CTYPE, "") != NULL){ + if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) + el->el_flags |= CHARSET_IS_UTF8; + } Added: head/devel/libedit/files/patch-src_eln.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libedit/files/patch-src_eln.c Wed Jan 7 22:44:04 2015 (r376504) @@ -0,0 +1,16 @@ +--- src/eln.c.orig 2015-01-07 22:26:24 UTC ++++ src/eln.c +@@ -76,9 +76,11 @@ el_gets(EditLine *el, int *nread) + { + const wchar_t *tmp; + +- el->el_flags |= IGNORE_EXTCHARS; ++ if (!(el->el_flags & CHARSET_IS_UTF8)) ++ el->el_flags |= IGNORE_EXTCHARS; + tmp = el_wgets(el, nread); +- el->el_flags &= ~IGNORE_EXTCHARS; ++ if (!(el->el_flags & CHARSET_IS_UTF8)) ++ el->el_flags &= ~IGNORE_EXTCHARS; + return ct_encode_string(tmp, &el->el_lgcyconv); + } +