svn commit: r382458 - in head/devel/libedit: . files

[Baptiste Daroussin]

Author: bapt
Date: Sat Mar 28 10:51:13 2015
New Revision: 382458
URL: https://svnweb.freebsd.org/changeset/ports/382458
QAT: https://qat.redports.org/buildarchive/r382458/

Log:
  Update to 3.1-20150325

Modified:
  head/devel/libedit/Makefile
  head/devel/libedit/distinfo
  head/devel/libedit/files/patch-src__chartype.h
  head/devel/libedit/files/patch-src_eln.c
  head/devel/libedit/pkg-plist

Modified: head/devel/libedit/Makefile
==============================================================================
--- head/devel/libedit/Makefile	Sat Mar 28 10:43:52 2015	(r382457)
+++ head/devel/libedit/Makefile	Sat Mar 28 10:51:13 2015	(r382458)
@@ -4,7 +4,6 @@
 PORTNAME=	libedit
 PORTVERSION=	${EDITVERSION}.${EDITDATE}
 DISTVERSION=	${EDITDATE}-${EDITVERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://thrysoee.dk/editline/
 
@@ -15,8 +14,8 @@ LICENSE=	BSD2CLAUSE
 
 USES=		libtool pathfix
 EDITVERSION=	3.1
-EDITDATE=	20141030
-WRKSRC=		${WRKDIR}/${PORTNAME}-20141029-${EDITVERSION}
+EDITDATE=	20150325
+WRKSRC=		${WRKDIR}/${PORTNAME}-${EDITDATE}-${EDITVERSION}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip

Modified: head/devel/libedit/distinfo
==============================================================================
--- head/devel/libedit/distinfo	Sat Mar 28 10:43:52 2015	(r382457)
+++ head/devel/libedit/distinfo	Sat Mar 28 10:51:13 2015	(r382458)
@@ -1,2 +1,2 @@
-SHA256 (libedit-20141030-3.1.tar.gz) = 9701e16570fb8f7fa407b506986652221b701a9dd61defc05bb7d1c61cdf5a40
-SIZE (libedit-20141030-3.1.tar.gz) = 484107
+SHA256 (libedit-20150325-3.1.tar.gz) = c88a5e4af83c5f40dda8455886ac98923a9c33125699742603a88a0253fcc8c5
+SIZE (libedit-20150325-3.1.tar.gz) = 502792

Modified: head/devel/libedit/files/patch-src__chartype.h
==============================================================================
--- head/devel/libedit/files/patch-src__chartype.h	Sat Mar 28 10:43:52 2015	(r382457)
+++ head/devel/libedit/files/patch-src__chartype.h	Sat Mar 28 10:51:13 2015	(r382458)
@@ -1,11 +1,11 @@
---- ./src/chartype.h.orig	2012-03-11 10:54:58.000000000 +0100
-+++ ./src/chartype.h	2014-04-30 18:03:31.469462010 +0200
+--- src/chartype.h.orig	2015-03-25 21:02:28.000000000 +0100
++++ src/chartype.h	2015-03-28 11:37:42.072100000 +0100
 @@ -44,7 +44,7 @@
   * supports non-BMP code points without requiring UTF-16, but nothing
   * seems to actually advertise this properly, despite Unicode 3.1 having
   * been around since 2001... */
--#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__))
-+#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__FreeBSD__) && !defined(__DragonFly__)
+-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__)
++#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
  #ifndef __STDC_ISO_10646__
  /* In many places it is assumed that the first 127 code points are ASCII
   * compatible, so ensure wchar_t indeed does ISO 10646 and not some other

Modified: head/devel/libedit/files/patch-src_eln.c
==============================================================================
--- head/devel/libedit/files/patch-src_eln.c	Sat Mar 28 10:43:52 2015	(r382457)
+++ head/devel/libedit/files/patch-src_eln.c	Sat Mar 28 10:51:13 2015	(r382458)
@@ -1,24 +1,21 @@
---- src/eln.c.orig	2014-06-18 21:06:34.000000000 +0200
-+++ src/eln.c	2015-01-09 08:48:42.000000000 +0100
-@@ -75,10 +75,18 @@ public const char *
+--- src/eln.c.orig	2015-03-25 21:02:28.000000000 +0100
++++ src/eln.c	2015-03-28 11:42:29.913925000 +0100
+@@ -75,12 +75,17 @@ public const char *
  el_gets(EditLine *el, int *nread)
  {
  	const wchar_t *tmp;
 +	int nwread;
 +
 +	*nread = 0;
-+
-+	if (!(el->el_flags & CHARSET_IS_UTF8))
-+		el->el_flags |= IGNORE_EXTCHARS;
+ 
+ 	if (!(el->el_flags & CHARSET_IS_UTF8))
+ 		el->el_flags |= IGNORE_EXTCHARS;
+-	tmp = el_wgets(el, nread);
 +	tmp = el_wgets(el, &nwread);
-+	if (!(el->el_flags & CHARSET_IS_UTF8))
-+		el->el_flags &= ~IGNORE_EXTCHARS;
+ 	if (!(el->el_flags & CHARSET_IS_UTF8))
+ 		el->el_flags &= ~IGNORE_EXTCHARS;
 +	for (int i = 0; i < nwread; i++)
 +		*nread += ct_enc_width(tmp[i]);
- 
--	el->el_flags |= IGNORE_EXTCHARS;
--	tmp = el_wgets(el, nread);
--	el->el_flags &= ~IGNORE_EXTCHARS;
  	return ct_encode_string(tmp, &el->el_lgcyconv);
  }
  

Modified: head/devel/libedit/pkg-plist
==============================================================================
--- head/devel/libedit/pkg-plist	Sat Mar 28 10:43:52 2015	(r382457)
+++ head/devel/libedit/pkg-plist	Sat Mar 28 10:51:13 2015	(r382458)
@@ -3,7 +3,7 @@ include/histedit.h
 lib/libedit.a
 lib/libedit.so
 lib/libedit.so.0
-lib/libedit.so.0.0.52
+lib/libedit.so.0.0.53
 libdata/pkgconfig/libedit.pc
 man/man3/editline.3.gz
 man/man3/el_deletestr.3.gz