CVS commit: pkgsrc/textproc/link-grammar

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Dec 11 16:32:19 UTC 2023

Modified Files:
        pkgsrc/textproc/link-grammar: Makefile.common distinfo
        pkgsrc/textproc/link-grammar/patches:
            patch-link-grammar_parse_extract-links.c

Log Message:
link-grammar: SunOS build fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/link-grammar/Makefile.common
cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/link-grammar/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/link-grammar/patches/patch-link-grammar_parse_extract-links.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.common
diff -u pkgsrc/textproc/link-grammar/Makefile.common:1.1 pkgsrc/textproc/link-grammar/Makefile.common:1.2
--- pkgsrc/textproc/link-grammar/Makefile.common:1.1    Sun Oct 15 06:39:25 2023
+++ pkgsrc/textproc/link-grammar/Makefile.common        Mon Dec 11 16:32:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2023/10/15 06:39:25 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.2 2023/12/11 16:32:19 jperkin Exp $
 #
 # used by textproc/link-grammar/Makefile
 # used by textproc/py-link-grammar/Makefile
@@ -25,4 +25,6 @@ CONFIGURE_ARGS+=      --disable-java-bindings
 # supports it, but doesn't do so correctly.
 BUILDLINK_TRANSFORM+=  rm:-Wformat-signedness
 
+CPPFLAGS.SunOS+=       -D__EXTENSIONS__
+
 .include "../../devel/pcre2/buildlink3.mk"

Index: pkgsrc/textproc/link-grammar/distinfo
diff -u pkgsrc/textproc/link-grammar/distinfo:1.18 pkgsrc/textproc/link-grammar/distinfo:1.19
--- pkgsrc/textproc/link-grammar/distinfo:1.18  Sun Oct 15 06:39:25 2023
+++ pkgsrc/textproc/link-grammar/distinfo       Mon Dec 11 16:32:19 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2023/10/15 06:39:25 ryoon Exp $
+$NetBSD: distinfo,v 1.19 2023/12/11 16:32:19 jperkin Exp $
 
 BLAKE2s (link-grammar-5.12.3.tar.gz) = 1c08aa63dbed6663544b35888366b1ceb577954e7a5852b9514e7fc2dfc20a95
 SHA512 (link-grammar-5.12.3.tar.gz) = e0fdb78ec03042119011afea005a62829317fd0bc20afcd94e3f234c9c5252ed9c57d717b75368ac4a63dd8493bd86f551870299925f3b9b95b11915f48d8abe
 Size (link-grammar-5.12.3.tar.gz) = 4704751 bytes
 SHA1 (patch-aa) = 3be918c26b639442b56efab2e9416974f31969c5
 SHA1 (patch-configure) = 1d6c28dbc3f2bc09214cf70e77e2c6b8bbcfc6e7
-SHA1 (patch-link-grammar_parse_extract-links.c) = a4f62310f7d2dca939e17c9a3be55ba2d562b3c3
+SHA1 (patch-link-grammar_parse_extract-links.c) = 36d45b0c80db537d8c28a5dc4a4348a9044ef3a0
 SHA1 (patch-link-grammar_resources.c) = 8c9b2c8cfe88e0e7d7d790094fd0c38e0221b362

Index: pkgsrc/textproc/link-grammar/patches/patch-link-grammar_parse_extract-links.c
diff -u pkgsrc/textproc/link-grammar/patches/patch-link-grammar_parse_extract-links.c:1.1 pkgsrc/textproc/link-grammar/patches/patch-link-grammar_parse_extract-links.c:1.2
--- pkgsrc/textproc/link-grammar/patches/patch-link-grammar_parse_extract-links.c:1.1   Sun Oct 15 06:39:25 2023
+++ pkgsrc/textproc/link-grammar/patches/patch-link-grammar_parse_extract-links.c       Mon Dec 11 16:32:19 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-link-grammar_parse_extract-links.c,v 1.1 2023/10/15 06:39:25 ryoon Exp $
+$NetBSD: patch-link-grammar_parse_extract-links.c,v 1.2 2023/12/11 16:32:19 jperkin Exp $
+
+__GNUC__ does not imply malloc_trim() support.
 
 --- link-grammar/parse/extract-links.c.orig    2023-03-16 18:49:51.000000000 +0000
 +++ link-grammar/parse/extract-links.c
@@ -7,7 +9,7 @@ $NetBSD: patch-link-grammar_parse_extrac
        xfree((void *) pex, sizeof(extractor_t));
  
 -#if defined __GNUC__
-+#if defined(__GNUC__) && !defined(__NetBSD__)
++#if defined(__GNUC__) && !defined(__NetBSD__) && !defined(__sun)
        // malloc_trim() is a gnu extension.  An alternative would be
        // to call madvise(MADV_DONTNEED) but this is more complicated.
        if (trim) malloc_trim(0);