[pkgsrc/trunk]: pkgsrc/devel/editline FreeBSD's wchar_t seems to be able to h...

[rodent <rodent%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/58671d400b96
branches:  trunk
changeset: 651939:58671d400b96
user:      rodent <rodent%pkgsrc.org@localhost>
date:      Sun May 17 21:19:12 2015 +0000

description:
FreeBSD's wchar_t seems to be able to handle the ISO 10646 chacters too.
This will unbreak the build of a few packages on FreeBSD, notably mysql*.
Defuzz patches.

diffstat:

 devel/editline/distinfo                     |   7 ++++---
 devel/editline/patches/patch-Makefile.am    |   4 ++--
 devel/editline/patches/patch-ab             |   4 ++--
 devel/editline/patches/patch-src_chartype.h |  15 +++++++++++++++
 4 files changed, 23 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r d9703cd3fc11 -r 58671d400b96 devel/editline/distinfo
--- a/devel/editline/distinfo   Sun May 17 20:23:34 2015 +0000
+++ b/devel/editline/distinfo   Sun May 17 21:19:12 2015 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2015/05/07 14:07:49 ryoon Exp $
+$NetBSD: distinfo,v 1.8 2015/05/17 21:19:12 rodent Exp $
 
 SHA1 (libedit-20150325-3.1.tar.gz) = c5bf50b433ea35f9fc883400cde674556c44af30
 RMD160 (libedit-20150325-3.1.tar.gz) = 76fb284ada78215c17d886b2c0ea13c6b3b79329
 Size (libedit-20150325-3.1.tar.gz) = 502792 bytes
-SHA1 (patch-Makefile.am) = 84afbcecba38a483ceb0447e5c31789d37415369
-SHA1 (patch-ab) = fe77807ef3277b52c8cb32c5f32eaac41119ffc7
+SHA1 (patch-Makefile.am) = c9c49476fcff0da3363874795fcf4b6ebd0f59de
+SHA1 (patch-ab) = 834c9bf151c1fc46ded350eafa19fe91088b2ffa
 SHA1 (patch-ac) = 666403d5ef03fea39081d7a657aefaa91746f788
+SHA1 (patch-src_chartype.h) = 1fef9f7d41970cd9e1c9e1641346341a7313c05b
diff -r d9703cd3fc11 -r 58671d400b96 devel/editline/patches/patch-Makefile.am
--- a/devel/editline/patches/patch-Makefile.am  Sun May 17 20:23:34 2015 +0000
+++ b/devel/editline/patches/patch-Makefile.am  Sun May 17 21:19:12 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile.am,v 1.3 2015/02/15 02:03:38 rodent Exp $
+$NetBSD: patch-Makefile.am,v 1.4 2015/05/17 21:19:12 rodent Exp $
 
 * Create history.h symlink like NetBSD base libedit.
 
---- Makefile.am.orig   2014-02-13 22:09:28.000000000 +0000
+--- Makefile.am.orig   2015-03-25 20:02:28.000000000 +0000
 +++ Makefile.am
 @@ -11,3 +11,6 @@ SUBDIRS = src $(EXAMPLES_DIR) doc
  EXTRA_DIST = libedit.pc.in
diff -r d9703cd3fc11 -r 58671d400b96 devel/editline/patches/patch-ab
--- a/devel/editline/patches/patch-ab   Sun May 17 20:23:34 2015 +0000
+++ b/devel/editline/patches/patch-ab   Sun May 17 21:19:12 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2014/05/19 10:40:40 jperkin Exp $
+$NetBSD: patch-ab,v 1.3 2015/05/17 21:19:12 rodent Exp $
 
 Check for #pragma weak
 
---- acinclude.m4.orig  2010-04-24 18:26:59.000000000 +0000
+--- acinclude.m4.orig  2015-03-25 20:02:28.000000000 +0000
 +++ acinclude.m4
 @@ -65,6 +65,25 @@ AC_DEFUN([EL_GETPW_R_DRAFT],
        [AC_MSG_RESULT(no)])
diff -r d9703cd3fc11 -r 58671d400b96 devel/editline/patches/patch-src_chartype.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/editline/patches/patch-src_chartype.h       Sun May 17 21:19:12 2015 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_chartype.h,v 1.3 2015/05/17 21:19:12 rodent Exp $
+
+Pretty sure FreeBSD can handle this too.
+
+--- src/chartype.h.orig        2015-03-25 20:02:28.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__)
+ #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