CVS commit: pkgsrc/textproc/link-grammar

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Feb 26 18:02:24 UTC 2021

Modified Files:
        pkgsrc/textproc/link-grammar: Makefile distinfo
Added Files:
        pkgsrc/textproc/link-grammar/patches:
            patch-link-grammar_dict-common_regex-morph.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/link-grammar/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/link-grammar/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/link-grammar/patches/patch-link-grammar_dict-common_regex-morph.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/Makefile
diff -u pkgsrc/textproc/link-grammar/Makefile:1.16 pkgsrc/textproc/link-grammar/Makefile:1.17
--- pkgsrc/textproc/link-grammar/Makefile:1.16  Wed Jan 20 00:55:58 2021
+++ pkgsrc/textproc/link-grammar/Makefile       Fri Feb 26 18:02:24 2021
@@ -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}/
 

Index: pkgsrc/textproc/link-grammar/distinfo
diff -u pkgsrc/textproc/link-grammar/distinfo:1.12 pkgsrc/textproc/link-grammar/distinfo:1.13
--- pkgsrc/textproc/link-grammar/distinfo:1.12  Wed Jan 20 00:55:58 2021
+++ pkgsrc/textproc/link-grammar/distinfo       Fri Feb 26 18:02:24 2021
@@ -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) = 0ef
 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

Added files:

Index: pkgsrc/textproc/link-grammar/patches/patch-link-grammar_dict-common_regex-morph.c
diff -u /dev/null pkgsrc/textproc/link-grammar/patches/patch-link-grammar_dict-common_regex-morph.c:1.1
--- /dev/null   Fri Feb 26 18:02:24 2021
+++ pkgsrc/textproc/link-grammar/patches/patch-link-grammar_dict-common_regex-morph.c   Fri Feb 26 18:02:24 2021
@@ -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)