CVS commit: pkgsrc/textproc/link-grammar

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Apr 16 14:45:15 UTC 2020

Modified Files:
        pkgsrc/textproc/link-grammar: distinfo
Added Files:
        pkgsrc/textproc/link-grammar/patches:
            patch-link-grammar_link-grammar.def patch-link-grammar_utilities.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/link-grammar/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/link-grammar/patches/patch-link-grammar_link-grammar.def \
    pkgsrc/textproc/link-grammar/patches/patch-link-grammar_utilities.c

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

Modified files:

Index: pkgsrc/textproc/link-grammar/distinfo
diff -u pkgsrc/textproc/link-grammar/distinfo:1.9 pkgsrc/textproc/link-grammar/distinfo:1.10
--- pkgsrc/textproc/link-grammar/distinfo:1.9   Mon Mar 30 23:20:20 2020
+++ pkgsrc/textproc/link-grammar/distinfo       Thu Apr 16 14:45:14 2020
@@ -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 @@ SHA512 (link-grammar-5.8.0.tar.gz) = 126
 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

Added files:

Index: pkgsrc/textproc/link-grammar/patches/patch-link-grammar_link-grammar.def
diff -u /dev/null pkgsrc/textproc/link-grammar/patches/patch-link-grammar_link-grammar.def:1.1
--- /dev/null   Thu Apr 16 14:45:15 2020
+++ pkgsrc/textproc/link-grammar/patches/patch-link-grammar_link-grammar.def    Thu Apr 16 14:45:15 2020
@@ -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
Index: pkgsrc/textproc/link-grammar/patches/patch-link-grammar_utilities.c
diff -u /dev/null pkgsrc/textproc/link-grammar/patches/patch-link-grammar_utilities.c:1.1
--- /dev/null   Thu Apr 16 14:45:15 2020
+++ pkgsrc/textproc/link-grammar/patches/patch-link-grammar_utilities.c Thu Apr 16 14:45:15 2020
@@ -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") */