diff options
| author | ryoon <ryoon@pkgsrc.org> | 2021-02-26 18:02:24 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2021-02-26 18:02:24 +0000 |
| commit | fa08bbeb65ac2e4fed40db10ee2fb639490f29a6 (patch) | |
| tree | 42712080f27b7924f0d3bb7d82ff909c417a7a7d /textproc | |
| parent | deb65f853f2a98359e7737fe1a73abc28f09e2ab (diff) | |
| download | pkgsrc-fa08bbeb65ac2e4fed40db10ee2fb639490f29a6.tar.gz | |
link-grammar: Fix runtime error on NetBSD 9.99.80 after 2021-02-26
* Pass REG_GNU to regcomp(3) for GNU extensions,
suggested by christos@. Thank you.
* Fix PR 56024.
* Bump PKGREVISION for binary change.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/link-grammar/Makefile | 3 | ||||
| -rw-r--r-- | textproc/link-grammar/distinfo | 3 | ||||
| -rw-r--r-- | textproc/link-grammar/patches/patch-link-grammar_dict-common_regex-morph.c | 19 |
3 files changed, 23 insertions, 2 deletions
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile index 3cc9430a475..5f9f3c9c2d6 100644 --- a/textproc/link-grammar/Makefile +++ b/textproc/link-grammar/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2021/01/20 00:55:58 gutteridge Exp $ +# $NetBSD: Makefile,v 1.17 2021/02/26 18:02:24 ryoon Exp $ DISTNAME= link-grammar-5.8.1 +PKGREVISION= 1 CATEGORIES= textproc MASTER_SITES= https://www.abisource.com/downloads/link-grammar/${PKGVERSION_NOREV}/ diff --git a/textproc/link-grammar/distinfo b/textproc/link-grammar/distinfo index 18c99078a9c..c55e7e5c757 100644 --- a/textproc/link-grammar/distinfo +++ b/textproc/link-grammar/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2021/01/20 00:55:58 gutteridge Exp $ +$NetBSD: distinfo,v 1.13 2021/02/26 18:02:24 ryoon Exp $ SHA1 (link-grammar-5.8.1.tar.gz) = 115376fe13fe63245d49efc69171668aa2f4bce5 RMD160 (link-grammar-5.8.1.tar.gz) = 968e0ab2cf20aeef9332bce5e17f94ec0dc9c1f7 @@ -6,3 +6,4 @@ SHA512 (link-grammar-5.8.1.tar.gz) = 0ef99d3ccb3d922a946f1f73b8b81cee9ece156886d Size (link-grammar-5.8.1.tar.gz) = 3791847 bytes SHA1 (patch-aa) = 3be918c26b639442b56efab2e9416974f31969c5 SHA1 (patch-configure) = 0131e74f9f51bb380ab91d1cfdba2600fcee131a +SHA1 (patch-link-grammar_dict-common_regex-morph.c) = 664db3a9b552fcec0917198a3694cacedc9552b0 diff --git a/textproc/link-grammar/patches/patch-link-grammar_dict-common_regex-morph.c b/textproc/link-grammar/patches/patch-link-grammar_dict-common_regex-morph.c new file mode 100644 index 00000000000..a1662f3e59c --- /dev/null +++ b/textproc/link-grammar/patches/patch-link-grammar_dict-common_regex-morph.c @@ -0,0 +1,19 @@ +$NetBSD: patch-link-grammar_dict-common_regex-morph.c,v 1.1 2021/02/26 18:02:24 ryoon Exp $ + +* regex of NetBSD after 2021-02-26 requires REG_GNU flag to process + GNU extensions. + +--- link-grammar/dict-common/regex-morph.c.orig 2020-08-20 23:59:00.000000000 +0000 ++++ link-grammar/dict-common/regex-morph.c +@@ -100,7 +100,11 @@ int compile_regexs(Regex_node *rn, Dicti + #ifndef REG_ENHANCED + #define REG_ENHANCED 0 + #endif ++# if defined(REG_GNU) ++ rc = regcomp(re, rn->pattern, REG_NOSUB|REG_EXTENDED|REG_ENHANCED|REG_GNU); ++# else + rc = regcomp(re, rn->pattern, REG_NOSUB|REG_EXTENDED|REG_ENHANCED); ++# endif + #endif + + if (rc) |