CVS commit: pkgsrc/devel/editline

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Mar 22 22:32:12 UTC 2020

Modified Files:
        pkgsrc/devel/editline: Makefile PLIST distinfo
        pkgsrc/devel/editline/patches: patch-ab patch-src_chartype.h

Log Message:
editline: update to 20191231 snapshot

Please see src/lib/libedit in the NetBSD repository for the changes.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/editline/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/editline/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/editline/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/editline/patches/patch-ab \
    pkgsrc/devel/editline/patches/patch-src_chartype.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/editline/Makefile
diff -u pkgsrc/devel/editline/Makefile:1.7 pkgsrc/devel/editline/Makefile:1.8
--- pkgsrc/devel/editline/Makefile:1.7  Sun Jan 26 17:30:56 2020
+++ pkgsrc/devel/editline/Makefile      Sun Mar 22 22:32:11 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2020/01/26 17:30:56 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2020/03/22 22:32:11 tnn Exp $
 #
 
-DISTNAME=              libedit-20150325-3.1
-PKGNAME=               editline-3.1.20150325
+DISTNAME=              libedit-20191231-3.1
+PKGNAME=               editline-3.1.20191231
 CATEGORIES=            devel
 MASTER_SITES=          http://thrysoee.dk/editline/
 

Index: pkgsrc/devel/editline/PLIST
diff -u pkgsrc/devel/editline/PLIST:1.2 pkgsrc/devel/editline/PLIST:1.3
--- pkgsrc/devel/editline/PLIST:1.2     Mon Jul 15 15:14:29 2013
+++ pkgsrc/devel/editline/PLIST Sun Mar 22 22:32:11 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/07/15 15:14:29 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/03/22 22:32:11 tnn Exp $
 include/editline/history.h
 include/editline/readline.h
 include/histedit.h
@@ -10,10 +10,8 @@ man/man3/el_end.3
 man/man3/el_get.3
 man/man3/el_getc.3
 man/man3/el_gets.3
-man/man3/el_history.3
-man/man3/el_history_end.3
-man/man3/el_history_init.3
 man/man3/el_init.3
+man/man3/el_init_fd.3
 man/man3/el_insertstr.3
 man/man3/el_line.3
 man/man3/el_parse.3
@@ -22,9 +20,30 @@ man/man3/el_reset.3
 man/man3/el_resize.3
 man/man3/el_set.3
 man/man3/el_source.3
-man/man3/el_tok_end.3
-man/man3/el_tok_init.3
-man/man3/el_tok_line.3
-man/man3/el_tok_reset.3
-man/man3/el_tok_str.3
+man/man3/el_wdeletestr.3
+man/man3/el_wget.3
+man/man3/el_wgetc.3
+man/man3/el_wgets.3
+man/man3/el_winsertstr.3
+man/man3/el_wline.3
+man/man3/el_wparse.3
+man/man3/el_wpush.3
+man/man3/el_wset.3
+man/man3/history.3
+man/man3/history_end.3
+man/man3/history_init.3
+man/man3/history_w.3
+man/man3/history_wend.3
+man/man3/history_winit.3
+man/man3/tok_end.3
+man/man3/tok_init.3
+man/man3/tok_line.3
+man/man3/tok_reset.3
+man/man3/tok_str.3
+man/man3/tok_wend.3
+man/man3/tok_winit.3
+man/man3/tok_wline.3
+man/man3/tok_wreset.3
+man/man3/tok_wstr.3
 man/man5/editrc.5
+man/man7/editline.7

Index: pkgsrc/devel/editline/distinfo
diff -u pkgsrc/devel/editline/distinfo:1.9 pkgsrc/devel/editline/distinfo:1.10
--- pkgsrc/devel/editline/distinfo:1.9  Tue Nov  3 03:27:24 2015
+++ pkgsrc/devel/editline/distinfo      Sun Mar 22 22:32:11 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 03:27:24 agc Exp $
+$NetBSD: distinfo,v 1.10 2020/03/22 22:32:11 tnn Exp $
 
-SHA1 (libedit-20150325-3.1.tar.gz) = c5bf50b433ea35f9fc883400cde674556c44af30
-RMD160 (libedit-20150325-3.1.tar.gz) = 76fb284ada78215c17d886b2c0ea13c6b3b79329
-SHA512 (libedit-20150325-3.1.tar.gz) = 03221f3de844a7768764b3ebf80bc3110a13699f452609ba351c134e4225fc7d9e826522c672e925a7f6183094b3f3dbf489f197ddd44e6b1ea5fed762aed07d
-Size (libedit-20150325-3.1.tar.gz) = 502792 bytes
+SHA1 (libedit-20191231-3.1.tar.gz) = 44891b6ceb0429fec0a118a1245c605410571d7d
+RMD160 (libedit-20191231-3.1.tar.gz) = a0e32d4bbb896b6f7e6567902e4205f2e435cd26
+SHA512 (libedit-20191231-3.1.tar.gz) = 1df2eced98e8db1bb0af940678c154d87e3b11dd21e65a903682367f5feace5112f9a543b8e0cb04bbfeaaf73729f808db2d9c302637fc063e81c0a37777ac2c
+Size (libedit-20191231-3.1.tar.gz) = 516801 bytes
 SHA1 (patch-Makefile.am) = c9c49476fcff0da3363874795fcf4b6ebd0f59de
-SHA1 (patch-ab) = 834c9bf151c1fc46ded350eafa19fe91088b2ffa
+SHA1 (patch-ab) = 18297f76965ecd56834c94f6c9f780d3e05a44d8
 SHA1 (patch-ac) = 666403d5ef03fea39081d7a657aefaa91746f788
-SHA1 (patch-src_chartype.h) = 1fef9f7d41970cd9e1c9e1641346341a7313c05b
+SHA1 (patch-src_chartype.h) = ec6ff8c8417464b54cffcbf8752f07a599067685

Index: pkgsrc/devel/editline/patches/patch-ab
diff -u pkgsrc/devel/editline/patches/patch-ab:1.3 pkgsrc/devel/editline/patches/patch-ab:1.4
--- pkgsrc/devel/editline/patches/patch-ab:1.3  Sun May 17 21:19:12 2015
+++ pkgsrc/devel/editline/patches/patch-ab      Sun Mar 22 22:32:12 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2015/05/17 21:19:12 rodent Exp $
+$NetBSD: patch-ab,v 1.4 2020/03/22 22:32:12 tnn Exp $
 
 Check for #pragma weak
 
---- acinclude.m4.orig  2015-03-25 20:02:28.000000000 +0000
+--- acinclude.m4.orig  2018-05-25 17:50:44.000000000 +0000
 +++ acinclude.m4
 @@ -65,6 +65,25 @@ AC_DEFUN([EL_GETPW_R_DRAFT],
        [AC_MSG_RESULT(no)])
@@ -29,4 +29,4 @@ Check for #pragma weak
 +])
  
  dnl
- dnl use option --enable-widec to turn on use of wide-character support
+ dnl deprecate option --enable-widec to turn on use of wide-character support
Index: pkgsrc/devel/editline/patches/patch-src_chartype.h
diff -u pkgsrc/devel/editline/patches/patch-src_chartype.h:1.3 pkgsrc/devel/editline/patches/patch-src_chartype.h:1.4
--- pkgsrc/devel/editline/patches/patch-src_chartype.h:1.3      Sun May 17 21:19:12 2015
+++ pkgsrc/devel/editline/patches/patch-src_chartype.h  Sun Mar 22 22:32:12 2020
@@ -1,15 +1,16 @@
-$NetBSD: patch-src_chartype.h,v 1.3 2015/05/17 21:19:12 rodent Exp $
+$NetBSD: patch-src_chartype.h,v 1.4 2020/03/22 22:32:12 tnn Exp $
 
 Pretty sure FreeBSD can handle this too.
 
---- src/chartype.h.orig        2015-03-25 20:02:28.000000000 +0000
+--- src/chartype.h.orig        2019-10-25 20:12:05.000000000 +0000
 +++ src/chartype.h
-@@ -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__)) && !defined(__OpenBSD__)
-+#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
+@@ -38,7 +38,8 @@
+       !(defined(__APPLE__) && defined(__MACH__)) && \
+       !defined(__OpenBSD__) && \
+       !defined(__FreeBSD__) && \
+-      !defined(__DragonFly__)
++      !defined(__DragonFly__) && \
++      !defined(__FreeBSD__)
  #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