Changes 4.7.0:

* Fix: hunspell configuration on Fedora (bugtracker issue 47)
* Fix: 'turn' with adjective: "She turned him green" from wingedtachikoma
* Fix: comma-conjoined modifiers: "It tastes bitter, not sweet."
* Fix: conjoined question words: "When and where is the party?"
* Fix: recognize short, capitalized words (Los, La, etc.).
* Treat colon as synonym for is: "The answer: yes."
* Fix: begin with prepositions: "It all began in Chicago."
* Fix: "What does it come to?" and related.
* Fix: null infinitive: "I'd like to, I want to."
* Fix: "Because I said so."
* Fix: "sure" as preverbal adverb: "It sure is."
* Fix: Gerunds with determiners: "a running of the bulls"
* SJ link for conjoined nouns/noun phrases.
* Sort linkages according to whether fat linkage was used.
* Add flag to enable use of fat linkage during parsing.
  (Fat links now disabled by default).
* Add male/female gender tags to misc nouns.
* Fix: misc optionally transitive verbs: mix, paint, boot
* Fix: word order: "look about fearfully", "look fearfully about", around
* Fix: recognize simple fractions
* Fix: "is" with uncountable nouns: "there is blood on your hands"
* Fix: Roman numeral suffixes e.g. "Henry VIII"
* Fix: regression in dates followed by punctuation. "In the 1950s, ..."
* Fix: verbs drank, drunk are optionally transitive.
* Fix: regression: "all the X", X can be plural or mass.
* Fix: verbs paint, color may be ditranstive: "paint the car bright green"

5 files changed, 56 insertions, 54 deletions

diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index 48e6e1994d7..e73c8b7f30c 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -1,21 +1,19 @@
-# $NetBSD: Makefile,v 1.3 2009/06/30 00:07:23 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.4 2010/11/26 14:43:31 adam Exp $
 
-DISTNAME=	link-grammar-4.3.4
+DISTNAME=	link-grammar-4.7.0
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.abisource.com/downloads/link-grammar/4.3.4/
+MASTER_SITES=	http://www.abisource.com/downloads/link-grammar/${PKGVERSION_NOREV}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.abisource.com/projects/link-grammar/
 COMMENT=	Syntactic parsing library
+LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-MAKE_JOBS_SAFE=		no
-
-GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
+GNU_CONFIGURE=	yes
 
 PKGCONFIG_OVERRIDE+=	link-grammar.pc.in
 
diff --git a/textproc/link-grammar/PLIST b/textproc/link-grammar/PLIST
index 37eb2e9bcf8..fd36b9c984b 100644
--- a/textproc/link-grammar/PLIST
+++ b/textproc/link-grammar/PLIST
@@ -1,31 +1,40 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:22 joerg Exp $
-bin/grammar-parse
+@comment $NetBSD: PLIST,v 1.3 2010/11/26 14:43:31 adam Exp $
 include/link-grammar/link-features.h
 include/link-grammar/link-includes.h
-lib/liblink-grammar-java.la
 lib/liblink-grammar.la
 lib/pkgconfig/link-grammar.pc
-man/man1/grammar-parse.1
+man/man1/link-parser.1
 share/link-grammar/en/4.0.affix
 share/link-grammar/en/4.0.batch
+share/link-grammar/en/4.0.biolg.batch
 share/link-grammar/en/4.0.constituent-knowledge
 share/link-grammar/en/4.0.dict
+share/link-grammar/en/4.0.enwiki.batch
+share/link-grammar/en/4.0.fixes.batch
 share/link-grammar/en/4.0.knowledge
+share/link-grammar/en/4.0.regex
+share/link-grammar/en/4.0.voa.batch
 share/link-grammar/en/tiny.dict
-share/link-grammar/en/words/entities.famous.sing
-share/link-grammar/en/words/entities.given-names.sing
+share/link-grammar/en/words/currency
+share/link-grammar/en/words/currency.p
+share/link-grammar/en/words/entities.given-bisex.sing
+share/link-grammar/en/words/entities.given-female.sing
+share/link-grammar/en/words/entities.given-male.sing
+share/link-grammar/en/words/entities.locations.sing
 share/link-grammar/en/words/entities.national.sing
 share/link-grammar/en/words/entities.organizations.sing
 share/link-grammar/en/words/entities.us-states.sing
-share/link-grammar/en/words/words-medical.adj.2
-share/link-grammar/en/words/words-medical.adj.3
+share/link-grammar/en/words/units.1
+share/link-grammar/en/words/units.1.dot
+share/link-grammar/en/words/units.3
+share/link-grammar/en/words/units.4
+share/link-grammar/en/words/units.4.dot
 share/link-grammar/en/words/words-medical.adv.1
 share/link-grammar/en/words/words-medical.prep.1
-share/link-grammar/en/words/words-medical.v.1.1
-share/link-grammar/en/words/words-medical.v.2.1
 share/link-grammar/en/words/words-medical.v.4.1
 share/link-grammar/en/words/words-medical.v.4.2
 share/link-grammar/en/words/words-medical.v.4.3
+share/link-grammar/en/words/words-medical.v.4.4
 share/link-grammar/en/words/words-medical.v.4.5
 share/link-grammar/en/words/words.adj.1
 share/link-grammar/en/words/words.adj.2
@@ -33,11 +42,15 @@ share/link-grammar/en/words/words.adj.3
 share/link-grammar/en/words/words.adv.1
 share/link-grammar/en/words/words.adv.2
 share/link-grammar/en/words/words.adv.3
+share/link-grammar/en/words/words.adv.4
 share/link-grammar/en/words/words.n.1
+share/link-grammar/en/words/words.n.1.wiki
 share/link-grammar/en/words/words.n.2.s
+share/link-grammar/en/words/words.n.2.s.biolg
+share/link-grammar/en/words/words.n.2.s.wiki
 share/link-grammar/en/words/words.n.2.x
+share/link-grammar/en/words/words.n.2.x.wiki
 share/link-grammar/en/words/words.n.3
-share/link-grammar/en/words/words.n.4
 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
diff --git a/textproc/link-grammar/distinfo b/textproc/link-grammar/distinfo
index ac227d47a8a..d5b602bdd92 100644
--- a/textproc/link-grammar/distinfo
+++ b/textproc/link-grammar/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/04/14 22:24:17 wiz Exp $
+$NetBSD: distinfo,v 1.2 2010/11/26 14:43:31 adam Exp $
 
-SHA1 (link-grammar-4.3.4.tar.gz) = 74fb56cfc97fb9bf5e32ca4138982e2e7c9880f1
-RMD160 (link-grammar-4.3.4.tar.gz) = ae0943f096050b6ace69d56e24c3b062119dc35f
-Size (link-grammar-4.3.4.tar.gz) = 852362 bytes
-SHA1 (patch-aa) = 7c12aab1d326def073313a07247880f3947185e2
-SHA1 (patch-ab) = 17a44ff5afa61d1ec5f6c70ac51f438a420b7a0f
+SHA1 (link-grammar-4.7.0.tar.gz) = 93f7be53389e4925f74e8e7bdb0b8d6c0a80197f
+RMD160 (link-grammar-4.7.0.tar.gz) = 5afaeda0b0c2c2384871a27ca5090fee555b3ad7
+Size (link-grammar-4.7.0.tar.gz) = 1211822 bytes
+SHA1 (patch-aa) = 68ab5c351fbf924bb1ba679a721104199116971a
diff --git a/textproc/link-grammar/patches/patch-aa b/textproc/link-grammar/patches/patch-aa
index f5c1e6d2703..7b05b82825b 100644
--- a/textproc/link-grammar/patches/patch-aa
+++ b/textproc/link-grammar/patches/patch-aa
@@ -1,17 +1,24 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/04/14 22:24:17 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2010/11/26 14:43:31 adam Exp $
 
---- link-grammar/Makefile.am.orig	2008-02-22 00:11:41.000000000 +0000
-+++ link-grammar/Makefile.am
-@@ -22,10 +22,10 @@ liblink_grammar_java_la_LDFLAGS = -versi
- 
- if WITH_BINRELOC
- liblink_grammar_la_LIBADD  = -lpthread
--liblink_grammar_java_la_LIBADD  = -lpthread -llink-grammar
-+liblink_grammar_java_la_LIBADD  = -lpthread liblink-grammar.la
- else
- liblink_grammar_la_LIBADD  = 
--liblink_grammar_java_la_LIBADD  = -llink-grammar
-+liblink_grammar_java_la_LIBADD  = liblink-grammar.la
- endif
+Do not try to regenerate words.
+
+--- data/en/words/Makefile.in.orig	2010-09-12 17:48:17.000000000 +0000
++++ data/en/words/Makefile.in
+@@ -302,7 +302,7 @@ mostlyclean-libtool:
  
- liblink_grammar_la_SOURCES =		\
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-install-wordsDATA: $(words_DATA)
++install-wordsDATA:
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(wordsdir)"
+ 	@list='$(words_DATA)'; for p in $$list; do \
+@@ -354,7 +354,7 @@ distdir: $(DISTFILES)
+ 	done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(DATA)
++all-am: Makefile
+ installdirs:
+ 	for dir in "$(DESTDIR)$(wordsdir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
diff --git a/textproc/link-grammar/patches/patch-ab b/textproc/link-grammar/patches/patch-ab
deleted file mode 100644
index 612a68a686b..00000000000
--- a/textproc/link-grammar/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/04/14 22:24:17 wiz Exp $
-
---- link-grammar/Makefile.in.orig	2008-03-14 15:27:20.000000000 +0000
-+++ link-grammar/Makefile.in
-@@ -223,8 +223,8 @@ liblink_grammar_la_LDFLAGS = -version-in
- liblink_grammar_java_la_LDFLAGS = -version-info @VERSION_INFO@ -export-dynamic -no-undefined -export-symbols $(srcdir)/link-grammar-java.def
- @WITH_BINRELOC_FALSE@liblink_grammar_la_LIBADD = 
- @WITH_BINRELOC_TRUE@liblink_grammar_la_LIBADD = -lpthread
--@WITH_BINRELOC_FALSE@liblink_grammar_java_la_LIBADD = -llink-grammar
--@WITH_BINRELOC_TRUE@liblink_grammar_java_la_LIBADD = -lpthread -llink-grammar
-+@WITH_BINRELOC_FALSE@liblink_grammar_java_la_LIBADD = liblink-grammar.la
-+@WITH_BINRELOC_TRUE@liblink_grammar_java_la_LIBADD = -lpthread liblink-grammar.la
- liblink_grammar_la_SOURCES = \
- 	analyze-linkage.c		\
- 	and.c				\