[pkgsrc/trunk]: pkgsrc/textproc/link-grammar link-grammar: fix macOS and SunO...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/31ddb4c51797
branches:  trunk
changeset: 429126:31ddb4c51797
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Thu Apr 16 14:45:14 2020 +0000

description:
link-grammar: fix macOS and SunOS builds

A vestigial reference to removed functionality was causing a failure to
link on macOS and SunOS. Separately, an expectation about the presence
of strtod_l(3) was causing a build failure on SunOS.

diffstat:

 textproc/link-grammar/distinfo                                    |   4 ++-
 textproc/link-grammar/patches/patch-link-grammar_link-grammar.def |  13 ++++++++
 textproc/link-grammar/patches/patch-link-grammar_utilities.c      |  15 ++++++++++
 3 files changed, 31 insertions(+), 1 deletions(-)

diffs (51 lines):

diff -r e9eb2850667c -r 31ddb4c51797 textproc/link-grammar/distinfo
--- a/textproc/link-grammar/distinfo    Thu Apr 16 14:27:38 2020 +0000
+++ b/textproc/link-grammar/distinfo    Thu Apr 16 14:45:14 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2020/03/30 23:20:20 gutteridge Exp $
+$NetBSD: distinfo,v 1.10 2020/04/16 14:45:14 gutteridge Exp $
 
 SHA1 (link-grammar-5.8.0.tar.gz) = 8a874ea7214cf635d2edb064bdaf368577c08efa
 RMD160 (link-grammar-5.8.0.tar.gz) = ef8b6eca527754afc12991f84f04f8f966e575bc
@@ -6,3 +6,5 @@
 Size (link-grammar-5.8.0.tar.gz) = 3782125 bytes
 SHA1 (patch-aa) = 3be918c26b639442b56efab2e9416974f31969c5
 SHA1 (patch-configure) = 0131e74f9f51bb380ab91d1cfdba2600fcee131a
+SHA1 (patch-link-grammar_link-grammar.def) = 1df6fefa9828c969d71277202158b2aebc5760f7
+SHA1 (patch-link-grammar_utilities.c) = 973109d4da35bd10b9e827d4eace66963aea40a6
diff -r e9eb2850667c -r 31ddb4c51797 textproc/link-grammar/patches/patch-link-grammar_link-grammar.def
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/link-grammar/patches/patch-link-grammar_link-grammar.def Thu Apr 16 14:45:14 2020 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-link-grammar_link-grammar.def,v 1.1 2020/04/16 14:45:15 gutteridge Exp $
+
+Fix build on macOS and SunOS.
+https://github.com/opencog/link-grammar/pull/1092
+
+--- link-grammar/link-grammar.def.orig 2020-02-29 01:44:12.000000000 +0000
++++ link-grammar/link-grammar.def
+@@ -118,5 +118,4 @@ lg_error_clearall
+ lg_error_flush
+ lg_exp_stringify
+ prt_error
+-regex_tokenizer_test
+ utf8_strwidth
diff -r e9eb2850667c -r 31ddb4c51797 textproc/link-grammar/patches/patch-link-grammar_utilities.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/link-grammar/patches/patch-link-grammar_utilities.c      Thu Apr 16 14:45:14 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-link-grammar_utilities.c,v 1.1 2020/04/16 14:45:15 gutteridge Exp $
+
+Fix SunOS build.
+
+--- link-grammar/utilities.c.orig      2020-02-29 01:44:12.000000000 +0000
++++ link-grammar/utilities.c
+@@ -757,7 +757,7 @@ bool strtodC(const char *s, float *r)
+ {
+       char *err;
+ 
+-#ifdef HAVE_LOCALE_T
++#if defined(HAVE_LOCALE_T) && !defined(__sun__)
+       double val = strtod_l(s, &err, get_C_LC_NUMERIC());
+ #else
+       /* dictionary_setup_locale() invokes setlocale(LC_NUMERIC, "C") */