pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/textproc/link-grammar
Module Name: pkgsrc
Committed By: ryoon
Date: Sun Oct 15 06:39:25 UTC 2023
Modified Files:
pkgsrc/textproc/link-grammar: Makefile PLIST distinfo
pkgsrc/textproc/link-grammar/patches: patch-configure
Added Files:
pkgsrc/textproc/link-grammar: Makefile.common
pkgsrc/textproc/link-grammar/patches:
patch-link-grammar_parse_extract-links.c
patch-link-grammar_resources.c
Log Message:
link-grammar: Update to 5.12.3
* Split Makefile into Makefile and Makefile.common to use for
upcomming py-link-grammar.
Changelog:
Version 5.12.3 (24 March 2023)
* Assorted Atomese fixes.
* Fix SAT-solver build breaks.
* Add dictionary flag to disable built-in capitlization rules. #1468
Version 5.12.2 (9 March 2023)
* Fix null-pointer deref in Atomese code.
Version 5.12.1 (5 March 2023)
* Assorted enhancements and fixes for the AtomSpace dictionary. #1362
* Fix missing HAVE_THREADS_H, affects Apple Homebrew. #1363
* Fix regex thread-safety issue. #1370
* Disable aspell; it leaks memory. #1373
* Deduplicate linkages when overflow forces random selection. #1378 #1396
* Fix direct dialect settings on connectors. #1382
* Cleanup dictionary backends. #1391 thru #1395
* English dict: paraphrasing fixes. #1398
* Report CPU time usage only for the current thread. #1399
* Extensive performance optimizations for MST dictionaries. #1402
* Remove old broken max-cost computations. #1456
Version 5.12.0 (26 Nov 2022)
* Fix crash when using the Atomese dictionary backend.
* Fix generation tokenization bug when dict has no unknown word token.
* Major Atomese dictionary extensions, including generation support.
* Minor tweaks to `any` uniform random parse tree language.
* Include U+202F NARROW NO-BREAK SPACE as a space character.
* Fix the various regexes so that they're thread-safe! #1354
* Maybe(?) fix FreeBSD missing -lstdthreads #1355
Version 5.11.0 (27 Sept 2022)
* Prototype support for dictionary in the AtomSpace.
* English dict: assorted missing nouns, verbs. #1289
* Performance improvements. #1309
* Fix Windows build break in 5.10.4, 5.10.5 fixed in #1313
* Fix "amy" language #1312
* Fix multilib systems, e.g. elf32-i386 #1314
* Corrected grapheme support for random morpheme sampling. #1315
* Thai language dictionary updates #1322
* Punctuation fixes #1331
* Affixes can now be specified with regexes #1334
* The regex library PCRE2 is required by default.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/textproc/link-grammar/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/link-grammar/Makefile.common
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/link-grammar/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/link-grammar/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/link-grammar/patches/patch-configure
cvs rdiff -u -r0 -r1.1 \
pkgsrc/textproc/link-grammar/patches/patch-link-grammar_parse_extract-links.c \
pkgsrc/textproc/link-grammar/patches/patch-link-grammar_resources.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.21 pkgsrc/textproc/link-grammar/Makefile:1.22
--- pkgsrc/textproc/link-grammar/Makefile:1.21 Mon Aug 14 05:25:24 2023
+++ pkgsrc/textproc/link-grammar/Makefile Sun Oct 15 06:39:25 2023
@@ -1,29 +1,15 @@
-# $NetBSD: Makefile,v 1.21 2023/08/14 05:25:24 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2023/10/15 06:39:25 ryoon Exp $
-DISTNAME= link-grammar-5.10.2
-PKGREVISION= 1
+PKGNAME= ${DISTNAME}
CATEGORIES= textproc
-MASTER_SITES= https://www.abisource.com/downloads/link-grammar/${PKGVERSION_NOREV}/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.abisource.com/projects/link-grammar/
COMMENT= Syntactic parsing library
-LICENSE= modified-bsd AND gnu-lgpl-v2.1
-USE_LANGUAGES= c99 c++
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake pkg-config
-GNU_CONFIGURE= yes
+.include "../../textproc/link-grammar/Makefile.common"
-CONFIGURE_ARGS+= --disable-java-bindings
CONFIGURE_ARGS+= --disable-python-bindings
PKGCONFIG_OVERRIDE+= link-grammar.pc.in
-# Not all currently supported compilers provide this option.
-# The configure script purports to check whether the compiler
-# supports it, but doesn't do so correctly.
-BUILDLINK_TRANSFORM+= rm:-Wformat-signedness
-
-.include "../../devel/argp/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/link-grammar/PLIST
diff -u pkgsrc/textproc/link-grammar/PLIST:1.11 pkgsrc/textproc/link-grammar/PLIST:1.12
--- pkgsrc/textproc/link-grammar/PLIST:1.11 Fri Oct 29 21:11:25 2021
+++ pkgsrc/textproc/link-grammar/PLIST Sun Oct 15 06:39:25 2023
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.11 2021/10/29 21:11:25 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.12 2023/10/15 06:39:25 ryoon Exp $
bin/link-generator
bin/link-parser
include/link-grammar/dict-api.h
+include/link-grammar/dict-atomese.h
include/link-grammar/dict-defines.h
include/link-grammar/dict-structures.h
include/link-grammar/link-features.h
@@ -67,6 +68,9 @@ share/link-grammar/de/4.0.constituent-kn
share/link-grammar/de/4.0.dict
share/link-grammar/de/4.0.knowledge
share/link-grammar/de/4.0.regex
+share/link-grammar/demo-atomese/4.0.affix
+share/link-grammar/demo-atomese/atomese-dict.scm
+share/link-grammar/demo-atomese/storage.dict
share/link-grammar/demo-sql/4.0.affix
share/link-grammar/demo-sql/4.0.constituent-knowledge
share/link-grammar/demo-sql/4.0.knowledge
@@ -130,6 +134,7 @@ share/link-grammar/en/words/words.n.2.x
share/link-grammar/en/words/words.n.3-const
share/link-grammar/en/words/words.n.3-vowel
share/link-grammar/en/words/words.n.3.y
+share/link-grammar/en/words/words.n.4-const
share/link-grammar/en/words/words.n.t
share/link-grammar/en/words/words.v.1.1
share/link-grammar/en/words/words.v.1.2
@@ -467,6 +472,66 @@ share/link-grammar/ru/words/words.96
share/link-grammar/ru/words/words.97
share/link-grammar/ru/words/words.98
share/link-grammar/ru/words/words.99
+share/link-grammar/th/4.0.affix
+share/link-grammar/th/4.0.constituent-knowledge
+share/link-grammar/th/4.0.dialect
+share/link-grammar/th/4.0.dict
+share/link-grammar/th/4.0.knowledge
+share/link-grammar/th/4.0.regex
+share/link-grammar/th/words/words.adj.common
+share/link-grammar/th/words/words.adj.lhs
+share/link-grammar/th/words/words.adv.attrmod
+share/link-grammar/th/words/words.adv.cohesive
+share/link-grammar/th/words/words.adv.common
+share/link-grammar/th/words/words.adv.qf
+share/link-grammar/th/words/words.adverbial.common
+share/link-grammar/th/words/words.any
+share/link-grammar/th/words/words.aux.common
+share/link-grammar/th/words/words.cl.common
+share/link-grammar/th/words/words.cl.noun
+share/link-grammar/th/words/words.cl.verb
+share/link-grammar/th/words/words.conj.common
+share/link-grammar/th/words/words.conj.discont
+share/link-grammar/th/words/words.conj.noun
+share/link-grammar/th/words/words.conj.prep
+share/link-grammar/th/words/words.conj.verb
+share/link-grammar/th/words/words.connector
+share/link-grammar/th/words/words.intj.common
+share/link-grammar/th/words/words.n.attribute
+share/link-grammar/th/words/words.n.common
+share/link-grammar/th/words/words.n.designator
+share/link-grammar/th/words/words.n.prefix
+share/link-grammar/th/words/words.n.proper
+share/link-grammar/th/words/words.n.title
+share/link-grammar/th/words/words.neg.lhs
+share/link-grammar/th/words/words.neg.rhs
+share/link-grammar/th/words/words.nominal.common
+share/link-grammar/th/words/words.num.common
+share/link-grammar/th/words/words.num.movable
+share/link-grammar/th/words/words.num.ordinal
+share/link-grammar/th/words/words.ordmark
+share/link-grammar/th/words/words.part.common
+share/link-grammar/th/words/words.passmark
+share/link-grammar/th/words/words.prep-n.n
+share/link-grammar/th/words/words.prep-n.nv
+share/link-grammar/th/words/words.prep-n.v
+share/link-grammar/th/words/words.prep-v.n
+share/link-grammar/th/words/words.prep-v.nv
+share/link-grammar/th/words/words.prep-v.v
+share/link-grammar/th/words/words.prep.lw
+share/link-grammar/th/words/words.prep.n
+share/link-grammar/th/words/words.prep.nv
+share/link-grammar/th/words/words.prep.v
+share/link-grammar/th/words/words.pro.common
+share/link-grammar/th/words/words.qf.common
+share/link-grammar/th/words/words.qf.lhs
+share/link-grammar/th/words/words.qf.rhs
+share/link-grammar/th/words/words.relpro.common
+share/link-grammar/th/words/words.sclmark
+share/link-grammar/th/words/words.sentsep
+share/link-grammar/th/words/words.v.attribute
+share/link-grammar/th/words/words.v.common
+share/link-grammar/th/words/words.v.evidential
share/link-grammar/tr/4.0.affix
share/link-grammar/tr/4.0.constituent-knowledge
share/link-grammar/tr/4.0.dict
Index: pkgsrc/textproc/link-grammar/distinfo
diff -u pkgsrc/textproc/link-grammar/distinfo:1.17 pkgsrc/textproc/link-grammar/distinfo:1.18
--- pkgsrc/textproc/link-grammar/distinfo:1.17 Fri Oct 29 21:11:25 2021
+++ pkgsrc/textproc/link-grammar/distinfo Sun Oct 15 06:39:25 2023
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.17 2021/10/29 21:11:25 gutteridge Exp $
+$NetBSD: distinfo,v 1.18 2023/10/15 06:39:25 ryoon Exp $
-BLAKE2s (link-grammar-5.10.2.tar.gz) = 53cc356abedb3d13d5076f8998a3459538fa81df5744983d9878f31ffac772c2
-SHA512 (link-grammar-5.10.2.tar.gz) = 71bc881cb628fe1898403024d8e949b2fbf44f5d20445f6fff7bb6038646840556d734434beb7eb43b63f661e18333657deaeb1b8c96b50d5fe3b6ef727565c2
-Size (link-grammar-5.10.2.tar.gz) = 3853934 bytes
+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) = 0131e74f9f51bb380ab91d1cfdba2600fcee131a
+SHA1 (patch-configure) = 1d6c28dbc3f2bc09214cf70e77e2c6b8bbcfc6e7
+SHA1 (patch-link-grammar_parse_extract-links.c) = a4f62310f7d2dca939e17c9a3be55ba2d562b3c3
+SHA1 (patch-link-grammar_resources.c) = 8c9b2c8cfe88e0e7d7d790094fd0c38e0221b362
Index: pkgsrc/textproc/link-grammar/patches/patch-configure
diff -u pkgsrc/textproc/link-grammar/patches/patch-configure:1.4 pkgsrc/textproc/link-grammar/patches/patch-configure:1.5
--- pkgsrc/textproc/link-grammar/patches/patch-configure:1.4 Mon Mar 30 23:20:21 2020
+++ pkgsrc/textproc/link-grammar/patches/patch-configure Sun Oct 15 06:39:25 2023
@@ -1,17 +1,24 @@
-$NetBSD: patch-configure,v 1.4 2020/03/30 23:20:21 gutteridge Exp $
+$NetBSD: patch-configure,v 1.5 2023/10/15 06:39:25 ryoon Exp $
-Fix compiler flag settings.
+* POSIX shell portability.
---- configure.orig 2018-07-27 17:32:48.000000000 +0000
+--- configure.orig 2023-03-24 16:25:36.000000000 +0000
+++ configure
-@@ -17808,8 +17808,8 @@ then
- # But not the NetBSD sh, so use sed instead.
- # CFLAGS="${CFLAGS//-O[[2-9]]} -g"
- # CXXFLAGS="${CXXFLAGS//-O[[2-9]]} -g"
-- CFLAGS=`echo -g ${CFLAGS} |sed "s/-O[2-9]//g"`
-- CXXFLAGS=`echo -g ${CXXFLAGS} |sed "s/-O[2-9]//g"`
-+ CFLAGS="${CFLAGS} -g"
-+ CXXFLAGS="${CXXFLAGS} -g"
- LDFLAGS="-g ${LDFLAGS}"
- $as_echo "#define DEBUG 1" >>confdefs.h
+@@ -17054,7 +17054,7 @@ fi
+ rm -f conftest.l $LEX_OUTPUT_ROOT.c
+ fi
+-(test -z "$LEX" || test "$LEX" == ':') &&
++(test -z "$LEX" || test "$LEX" = ':') &&
+ as_fn_error $? "No flex/lex program found. Please install the \"flex\" or
+ \"btyacc\" package." "$LINENO" 5
+
+@@ -24642,7 +24642,7 @@ else
+ $as_echo
+ fi
+
+-if test "x${ASpellFound}" == "xyes"; then
++if test "x${ASpellFound}" = "xyes"; then
+ $as_echo_n "
+ ----------
+ Caution: Aspell version 0.60.8 and possibly others leak memory!
Added files:
Index: pkgsrc/textproc/link-grammar/Makefile.common
diff -u /dev/null pkgsrc/textproc/link-grammar/Makefile.common:1.1
--- /dev/null Sun Oct 15 06:39:25 2023
+++ pkgsrc/textproc/link-grammar/Makefile.common Sun Oct 15 06:39:25 2023
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile.common,v 1.1 2023/10/15 06:39:25 ryoon Exp $
+#
+# used by textproc/link-grammar/Makefile
+# used by textproc/py-link-grammar/Makefile
+
+DISTNAME= link-grammar-5.12.3
+MASTER_SITES= https://www.abisource.com/downloads/link-grammar/${PKGVERSION_NOREV}/
+
+HOMEPAGE= https://www.abisource.com/projects/link-grammar/
+LICENSE= modified-bsd AND gnu-lgpl-v2.1
+
+DISTINFO_FILE= ${.CURDIR}/../link-grammar/distinfo
+FILESDIR= ${.CURDIR}/../link-grammar/files
+PATCHDIR= ${.CURDIR}/../link-grammar/patches
+
+USE_LANGUAGES= c99 c++
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake pkg-config
+GNU_CONFIGURE= yes
+
+CONFIGURE_ARGS+= --disable-java-bindings
+
+# Not all currently supported compilers provide this option.
+# The configure script purports to check whether the compiler
+# supports it, but doesn't do so correctly.
+BUILDLINK_TRANSFORM+= rm:-Wformat-signedness
+
+.include "../../devel/pcre2/buildlink3.mk"
Index: pkgsrc/textproc/link-grammar/patches/patch-link-grammar_parse_extract-links.c
diff -u /dev/null pkgsrc/textproc/link-grammar/patches/patch-link-grammar_parse_extract-links.c:1.1
--- /dev/null Sun Oct 15 06:39:25 2023
+++ pkgsrc/textproc/link-grammar/patches/patch-link-grammar_parse_extract-links.c Sun Oct 15 06:39:25 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-link-grammar_parse_extract-links.c,v 1.1 2023/10/15 06:39:25 ryoon Exp $
+
+--- link-grammar/parse/extract-links.c.orig 2023-03-16 18:49:51.000000000 +0000
++++ link-grammar/parse/extract-links.c
+@@ -294,7 +294,7 @@ void free_extractor(extractor_t * pex)
+
+ xfree((void *) pex, sizeof(extractor_t));
+
+-#if defined __GNUC__
++#if defined(__GNUC__) && !defined(__NetBSD__)
+ // 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);
Index: pkgsrc/textproc/link-grammar/patches/patch-link-grammar_resources.c
diff -u /dev/null pkgsrc/textproc/link-grammar/patches/patch-link-grammar_resources.c:1.1
--- /dev/null Sun Oct 15 06:39:25 2023
+++ pkgsrc/textproc/link-grammar/patches/patch-link-grammar_resources.c Sun Oct 15 06:39:25 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-link-grammar_resources.c,v 1.1 2023/10/15 06:39:25 ryoon Exp $
+
+--- link-grammar/resources.c.orig 2023-03-05 03:54:59.000000000 +0000
++++ link-grammar/resources.c
+@@ -38,6 +38,10 @@ int getrusage(int who, struct rusage *ru
+ /* Declaration missing from sys/resource.h in sun operating systems (?) */
+ #endif /* __sun__ */
+
++#if !defined(RUSAGE_THREAD) /* At least NetBSD */
++#define RUSAGE_THREAD RUSAGE_SELF
++#endif
++
+ #include "api-structures.h"
+ #include "resources.h"
+ #include "utilities.h"
Home |
Main Index |
Thread Index |
Old Index