Update to 4.7.4.

PR:		ports/155457
Submitted by:	Olivier Duchateau <duchateau.olivier@gmail.com>

5 files changed, 25 insertions, 29 deletions

diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index 020cd4ee318f..c5aa296b1c2d 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -6,22 +6,28 @@
 #
 
 PORTNAME=	link-grammar
-PORTVERSION=	4.5.10
+PORTVERSION=	4.7.4
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A grammar checking library
 
-USE_GNOME=	gnomehack gnometarget ltverhack
+LIB_DEPENDS=	pspell.16:${PORTSDIR}/textproc/aspell
+
+USE_GNOME=	gnomehack ltverhack pkgconfig
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_DOS2UNIX=	yes
 USE_CSTD=	gnu99
 CFLAGS+=	${PTHREAD_CFLAGS}
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-pthreads \
-		--disable-java-bindings
+		--disable-java-bindings \
+		--disable-hunspell \
+		--enable-aspell
 MAKE_JOBS_UNSAFE=	yes
 
 DOCS=		AUTHORS LICENSE MAINTAINERS README
diff --git a/textproc/link-grammar/distinfo b/textproc/link-grammar/distinfo
index ad951d8ab893..0745fe728528 100644
--- a/textproc/link-grammar/distinfo
+++ b/textproc/link-grammar/distinfo
@@ -1,3 +1,2 @@
-MD5 (link-grammar-4.5.10.tar.gz) = dccbc17df807e6e57119fc7b17e7d962
-SHA256 (link-grammar-4.5.10.tar.gz) = e9de45d537310fd8b8d5d775bd91f0330563e66ff315327eb3208662f2f4e036
-SIZE (link-grammar-4.5.10.tar.gz) = 1069973
+SHA256 (link-grammar-4.7.4.tar.gz) = 272eccb95a66bdaae57e6daa281c00bc9ddf615e624e94b7e6dc686ba10c242d
+SIZE (link-grammar-4.7.4.tar.gz) = 1215549
diff --git a/textproc/link-grammar/files/patch-configure b/textproc/link-grammar/files/patch-configure
index 213f036e2251..5fc25ea7afd6 100644
--- a/textproc/link-grammar/files/patch-configure
+++ b/textproc/link-grammar/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	2009-08-29 09:38:25.000000000 -0400
-+++ configure	2009-08-29 09:38:47.000000000 -0400
-@@ -16831,7 +16831,7 @@
- # needed to get fileno, strdup, etc. and so it needs to be manually
- # enabled again.
+--- configure.orig	2011-06-24 12:07:18.000000000 -0500
++++ configure	2011-06-24 12:07:32.000000000 -0500
+@@ -17167,7 +17167,7 @@
+ 	# LDFLAGS="${LDFLAGS} -L/usr/lib/mingw -lmingwex -lcrtdll -lmsvcrt -lc -Wl,--allow-multiple-definition"
+ else
+ 	# Else standard Linux/*BSD environment.
+-	CFLAGS="${CFLAGS} -std=c99 -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE"
++	#CFLAGS="${CFLAGS} -std=c99 -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE"
+ fi
  
--CFLAGS="${CFLAGS} -std=c99 -D_BSD_SOURCE -D_SVID_SOURCE -D_POSIX_C_SOURCE -D_GNU_SOURCE"
-+#CFLAGS="${CFLAGS} -std=c99 -D_BSD_SOURCE -D_SVID_SOURCE -D_POSIX_C_SOURCE -D_GNU_SOURCE"
  
- # Check whether --enable-debug was given.
- if test "${enable_debug+set}" = set; then
diff --git a/textproc/link-grammar/files/patch-data__en__4.0.affix b/textproc/link-grammar/files/patch-data__en__4.0.affix
deleted file mode 100644
index 4fe84d317f62..000000000000
--- a/textproc/link-grammar/files/patch-data__en__4.0.affix
+++ /dev/null
@@ -1,12 +0,0 @@
---- data/en/4.0.affix.orig	2009-08-29 12:22:29.000000000 -0400
-+++ data/en/4.0.affix	2009-08-29 12:23:50.000000000 -0400
-@@ -19,6 +19,8 @@
- † †† ‡ § ¶ © № "#": LPUNC+;
- 
- /en/words/units.1: UNITS+;
--/en/words/units.2: UNITS+;
-+/en/words/units.1.dot: UNITS+;
- /en/words/units.3: UNITS+;
-+/en/words/units.4: UNITS+;
-+/en/words/units.4.dot: UNITS+;
- 
diff --git a/textproc/link-grammar/pkg-plist b/textproc/link-grammar/pkg-plist
index 1578f3beba6b..059cfd6a5e19 100644
--- a/textproc/link-grammar/pkg-plist
+++ b/textproc/link-grammar/pkg-plist
@@ -42,6 +42,7 @@ libdata/pkgconfig/link-grammar.pc
 %%DATADIR%%/en/words/words-medical.v.4.1
 %%DATADIR%%/en/words/words-medical.v.4.2
 %%DATADIR%%/en/words/words-medical.v.4.3
+%%DATADIR%%/en/words/words-medical.v.4.4
 %%DATADIR%%/en/words/words-medical.v.4.5
 %%DATADIR%%/en/words/words.adj.1
 %%DATADIR%%/en/words/words.adj.2
@@ -49,13 +50,15 @@ libdata/pkgconfig/link-grammar.pc
 %%DATADIR%%/en/words/words.adv.1
 %%DATADIR%%/en/words/words.adv.2
 %%DATADIR%%/en/words/words.adv.3
+%%DATADIR%%/en/words/words.adv.4
 %%DATADIR%%/en/words/words.n.1
+%%DATADIR%%/en/words/words.n.1.wiki
 %%DATADIR%%/en/words/words.n.2.s
 %%DATADIR%%/en/words/words.n.2.s.biolg
+%%DATADIR%%/en/words/words.n.2.s.wiki
 %%DATADIR%%/en/words/words.n.2.x
+%%DATADIR%%/en/words/words.n.2.x.wiki
 %%DATADIR%%/en/words/words.n.3
-%%DATADIR%%/en/words/words.n.4
-%%DATADIR%%/en/words/words.n.4.biolg
 %%DATADIR%%/en/words/words.n.t
 %%DATADIR%%/en/words/words.v.1.1
 %%DATADIR%%/en/words/words.v.1.2