Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Dec 2019 15:23:36 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r520993 - in head/textproc/link-grammar: . files
Message-ID:  <201912271523.xBRFNaPU055842@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri Dec 27 15:23:35 2019
New Revision: 520993
URL: https://svnweb.freebsd.org/changeset/ports/520993

Log:
  Update to 5.7.0
  
  Use --disable-maintainer-mode instead of invoking autoreconf each time
  Explictly chose which regex engine to use (pcre2)
  Remove the useless DOCS option and targets only used to 2 files

Deleted:
  head/textproc/link-grammar/files/
Modified:
  head/textproc/link-grammar/Makefile
  head/textproc/link-grammar/distinfo
  head/textproc/link-grammar/pkg-plist

Modified: head/textproc/link-grammar/Makefile
==============================================================================
--- head/textproc/link-grammar/Makefile	Fri Dec 27 14:39:45 2019	(r520992)
+++ head/textproc/link-grammar/Makefile	Fri Dec 27 15:23:35 2019	(r520993)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	link-grammar
-DISTVERSION=	5.4.4
-PORTREVISION=	4
+DISTVERSION=	5.7.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
 
@@ -12,24 +11,21 @@ COMMENT=	Grammar checking library
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
-BROKEN=		ld: error: ../link-grammar/.libs/liblink-grammar.so: undefined reference to std::__1::__vector_base_common<true>::__throw_length_error() const
-.endif
-
-BUILD_DEPENDS=	autoconf-archive>=0:devel/autoconf-archive
-
-USES=		autoreconf compiler:c++11-lib dos2unix gmake libtool localbase ncurses \
-		pathfix pkgconfig sqlite  # autoreconf is due to this bug: https://github.com/opencog/link-grammar/issues/649
+USES=		compiler:c++11-lib dos2unix gmake libtool localbase ncurses \
+		pathfix pkgconfig sqlite
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-maintainer-mode \
+		--with-regexlib=pcre2
+
 INSTALL_TARGET=	install-strip
 
+LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
+
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-DOCS=		AUTHORS MAINTAINERS README
-
 OPTIONS_SUB=		yes
-OPTIONS_DEFINE=		DOCS EDITLINE JAVA PERL PYTHON SAT_SOLVER TOKENIZER
+OPTIONS_DEFINE=		EDITLINE JAVA PERL PYTHON SAT_SOLVER
 OPTIONS_DEFAULT=	EDITLINE HUNSPELL SAT_SOLVER
 
 OPTIONS_MULTI=			SPELL
@@ -58,23 +54,9 @@ PYTHON_USES=			python:2.7
 
 SAT_SOLVER_CONFIGURE_ENABLE=	sat-solver
 SAT_SOLVER_DESC=		Use boolean SAT parser
-SAT_SOLVER_CFLAGS=		-I${LOCALBASE}/include/minisat  # see https://github.com/opencog/link-grammar/issues/648
 SAT_SOLVER_LIB_DEPENDS=		libminisat.so:math/minisat
 
-TOKENIZER_CONFIGURE_ENABLE=	regex-tokenizer
-TOKENIZER_DESC=			Use the regex word splitter (a demo)
-TOKENIZER_BROKEN=		Missing headers, see https://github.com/opencog/link-grammar/issues/646
-
-post-extract:
-	@${RM} -r ${STAGEDIR}${PREFIX}/link-grammar/minisat  # remove the bundled code
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblink-grammar.so.${DISTVERSION}  # see https://github.com/opencog/link-grammar/issues/645
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
 
 .include <bsd.port.mk>

Modified: head/textproc/link-grammar/distinfo
==============================================================================
--- head/textproc/link-grammar/distinfo	Fri Dec 27 14:39:45 2019	(r520992)
+++ head/textproc/link-grammar/distinfo	Fri Dec 27 15:23:35 2019	(r520993)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522055236
-SHA256 (link-grammar-5.4.4.tar.gz) = c1533379dba0d81e3a924445216aa98a5bf3be9974586a68b00071b654fa69b9
-SIZE (link-grammar-5.4.4.tar.gz) = 3699283
+TIMESTAMP = 1577458326
+SHA256 (link-grammar-5.7.0.tar.gz) = 2679921766ca3981d8663338405967df701bfaeeb3f7194219db94990cd9612a
+SIZE (link-grammar-5.7.0.tar.gz) = 3801426

Modified: head/textproc/link-grammar/pkg-plist
==============================================================================
--- head/textproc/link-grammar/pkg-plist	Fri Dec 27 14:39:45 2019	(r520992)
+++ head/textproc/link-grammar/pkg-plist	Fri Dec 27 15:23:35 2019	(r520993)
@@ -30,9 +30,6 @@ lib/liblink-grammar.so.%%VERSION%%
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/linkgrammar/linkgrammar.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/linkgrammar/linkgrammar.pyo
 libdata/pkgconfig/link-grammar.pc
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%DATADIR%%/ady/4.0.affix
 %%DATADIR%%/ady/4.0.constituent-knowledge
 %%DATADIR%%/ady/4.0.dict
@@ -48,8 +45,8 @@ libdata/pkgconfig/link-grammar.pc
 %%DATADIR%%/any/4.0.dict
 %%DATADIR%%/any/4.0.knowledge
 %%DATADIR%%/any/4.0.regex
-%%DATADIR%%/any/affix-punc
 %%DATADIR%%/any/README.md
+%%DATADIR%%/any/affix-punc
 %%DATADIR%%/ar/4.0.affix
 %%DATADIR%%/ar/4.0.constituent-knowledge
 %%DATADIR%%/ar/4.0.dict
@@ -84,11 +81,17 @@ libdata/pkgconfig/link-grammar.pc
 %%DATADIR%%/ar/words/words.numbers
 %%DATADIR%%/ar/words/words.prep
 %%DATADIR%%/ar/words/words.years
+%%DATADIR%%/command-help-en.txt
 %%DATADIR%%/de/4.0.affix
 %%DATADIR%%/de/4.0.constituent-knowledge
 %%DATADIR%%/de/4.0.dict
 %%DATADIR%%/de/4.0.knowledge
 %%DATADIR%%/de/4.0.regex
+%%DATADIR%%/demo-sql/4.0.affix
+%%DATADIR%%/demo-sql/4.0.constituent-knowledge
+%%DATADIR%%/demo-sql/4.0.knowledge
+%%DATADIR%%/demo-sql/4.0.regex
+%%DATADIR%%/demo-sql/dict.db
 %%DATADIR%%/en/4.0.affix
 %%DATADIR%%/en/4.0.constituent-knowledge
 %%DATADIR%%/en/4.0.dict
@@ -152,6 +155,10 @@ libdata/pkgconfig/link-grammar.pc
 %%DATADIR%%/en/words/words.v.10.2
 %%DATADIR%%/en/words/words.v.10.3
 %%DATADIR%%/en/words/words.v.10.4
+%%DATADIR%%/en/words/words.v.11.1
+%%DATADIR%%/en/words/words.v.11.2
+%%DATADIR%%/en/words/words.v.11.3
+%%DATADIR%%/en/words/words.v.11.4
 %%DATADIR%%/en/words/words.v.2.1
 %%DATADIR%%/en/words/words.v.2.2
 %%DATADIR%%/en/words/words.v.2.3
@@ -199,6 +206,7 @@ libdata/pkgconfig/link-grammar.pc
 %%DATADIR%%/he/4.0.affix
 %%DATADIR%%/he/4.0.constituent-knowledge
 %%DATADIR%%/he/4.0.dict
+%%DATADIR%%/he/4.0.dict.m4
 %%DATADIR%%/he/4.0.knowledge
 %%DATADIR%%/he/4.0.regex
 %%DATADIR%%/id/4.0.affix



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912271523.xBRFNaPU055842>