Update to 4.5.4.

PR:		ports/130970 (4.4.2 version)
Submitted by:	bf <bf2006a@yahoo.com>

4 files changed, 19 insertions, 117 deletions

diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index d5ecddfb6b12..4ff2fe8651cc 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	link-grammar
-PORTVERSION=	4.3.9
+PORTVERSION=	4.5.4
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
 
@@ -18,7 +18,8 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 CFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ARGS=	--enable-pthreads
+CONFIGURE_ARGS=	--enable-pthreads \
+		--disable-java-bindings
 
 DOCS=		AUTHORS LICENSE MAINTAINERS README
 MAN1=		link-parser.1
diff --git a/textproc/link-grammar/distinfo b/textproc/link-grammar/distinfo
index 3d363966181b..fb9920c67074 100644
--- a/textproc/link-grammar/distinfo
+++ b/textproc/link-grammar/distinfo
@@ -1,3 +1,3 @@
-MD5 (link-grammar-4.3.9.tar.gz) = 26f30ce65dcf75948d0aa5cce6e59f0d
-SHA256 (link-grammar-4.3.9.tar.gz) = 991a3254150ca08ff0262df3831bd135e9f5e2764c6f035d8ea0a5be1a67884e
-SIZE (link-grammar-4.3.9.tar.gz) = 949560
+MD5 (link-grammar-4.5.4.tar.gz) = fd03003e51a446f255947206d7011d18
+SHA256 (link-grammar-4.5.4.tar.gz) = 798fd2a889b9efb5b840d4ae6b05c00cec52eb6943a777c7ae8c52edb2d3ca04
+SIZE (link-grammar-4.5.4.tar.gz) = 1027484
diff --git a/textproc/link-grammar/files/patch-configure b/textproc/link-grammar/files/patch-configure
deleted file mode 100644
index 21f125accce4..000000000000
--- a/textproc/link-grammar/files/patch-configure
+++ /dev/null
@@ -1,108 +0,0 @@
---- configure.orig	2008-11-08 23:56:57.447655264 -0500
-+++ configure	2008-11-09 00:02:16.823022804 -0500
-@@ -21721,104 +21721,7 @@
-   { echo "$as_me:$LINENO: result: $link_cc_flag" >&5
- echo "${ECHO_T}$link_cc_flag" >&6; }
- 
--
--
--
--
--JNI_GUESS=" \
--   -I/usr/include/classpath/ \
--   -I/opt/jdk1.5/include/ \
--   -I/opt/jdk1.5/include/linux \
--   -I/usr/lib/jvm/java-1.5.0-sun-1.5.0.15/include \
--   -I/usr/lib/jvm/java-1.5.0-sun-1.5.0.15/include/linux \
--   -I/usr/lib/jvm/java-6-sun/include/ \
--   -I/usr/lib/jvm/java-6-sun/include/linux \
--   -I/c/java/jdk1.6.0/include/ \
--   -I/c/java/jdk1.6.0/include/win32/ \
--   -I/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/JavaVM.framework/Headers/ \
--   -I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/JavaVM.framework/Headers/ "
--
--{ echo "$as_me:$LINENO: checking for jni.h" >&5
--echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <jni.h>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  { echo "$as_me:$LINENO: result: yes, will build java libs" >&5
--echo "${ECHO_T}yes, will build java libs" >&6; }
--        JNIfound=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
--       SAVE_CPPFLAGS=${CPPFLAGS}
--       CPPFLAGS="${CPPFLAGS} ${JNI_GUESS}"
--       { echo "$as_me:$LINENO: WARNING: Can't find jni.h header in standard locations, trying again with ${CPPFLAGS}" >&5
--echo "$as_me: WARNING: Can't find jni.h header in standard locations, trying again with ${CPPFLAGS}" >&2;}
--       cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <jni.h>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  { echo "$as_me:$LINENO: result: yes, will build java libs" >&5
--echo "${ECHO_T}yes, will build java libs" >&6; }
--               JNIfound=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--   { echo "$as_me:$LINENO: WARNING: cannot find jni.h header, needed for Java bindings support." >&5
--echo "$as_me: WARNING: cannot find jni.h header, needed for Java bindings support." >&2;}
--                CPPFLAGS=${SAVE_CPPFLAGS}
--                JNIfound=no
--fi
--
--rm -f conftest.err conftest.$ac_ext
--
--fi
--
--rm -f conftest.err conftest.$ac_ext
--
-+JNIfound=no
- 
- # Hmm .. there seems to be a missing pkgconfig for ordinary java ...
- # There's libgcj-4.2.pc  and libgcj8.pc but nothing for ordinary java??
diff --git a/textproc/link-grammar/pkg-plist b/textproc/link-grammar/pkg-plist
index 556e81cb7f1a..5577bc3fe9c1 100644
--- a/textproc/link-grammar/pkg-plist
+++ b/textproc/link-grammar/pkg-plist
@@ -10,12 +10,19 @@ libdata/pkgconfig/link-grammar.pc
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/de/4.0.affix
+%%DATADIR%%/de/4.0.dict
 %%DATADIR%%/en/4.0.affix
 %%DATADIR%%/en/4.0.batch
+%%DATADIR%%/en/4.0.biolg.batch
 %%DATADIR%%/en/4.0.constituent-knowledge
 %%DATADIR%%/en/4.0.dict
+%%DATADIR%%/en/4.0.fixes.batch
 %%DATADIR%%/en/4.0.knowledge
+%%DATADIR%%/en/4.0.regex
 %%DATADIR%%/en/tiny.dict
+%%DATADIR%%/en/words/currency
+%%DATADIR%%/en/words/currency.p
 %%DATADIR%%/en/words/entities.given-bisex.sing
 %%DATADIR%%/en/words/entities.given-female.sing
 %%DATADIR%%/en/words/entities.given-male.sing
@@ -23,12 +30,11 @@ libdata/pkgconfig/link-grammar.pc
 %%DATADIR%%/en/words/entities.national.sing
 %%DATADIR%%/en/words/entities.organizations.sing
 %%DATADIR%%/en/words/entities.us-states.sing
-%%DATADIR%%/en/words/words-medical.adj.2
-%%DATADIR%%/en/words/words-medical.adj.3
+%%DATADIR%%/en/words/units.1
+%%DATADIR%%/en/words/units.2
+%%DATADIR%%/en/words/units.3
 %%DATADIR%%/en/words/words-medical.adv.1
 %%DATADIR%%/en/words/words-medical.prep.1
-%%DATADIR%%/en/words/words-medical.v.1.1
-%%DATADIR%%/en/words/words-medical.v.2.1
 %%DATADIR%%/en/words/words-medical.v.4.1
 %%DATADIR%%/en/words/words-medical.v.4.2
 %%DATADIR%%/en/words/words-medical.v.4.3
@@ -41,9 +47,11 @@ libdata/pkgconfig/link-grammar.pc
 %%DATADIR%%/en/words/words.adv.3
 %%DATADIR%%/en/words/words.n.1
 %%DATADIR%%/en/words/words.n.2.s
+%%DATADIR%%/en/words/words.n.2.s.biolg
 %%DATADIR%%/en/words/words.n.2.x
 %%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
@@ -86,6 +94,7 @@ libdata/pkgconfig/link-grammar.pc
 @dirrm %%DATADIR%%/lt
 @dirrm %%DATADIR%%/en/words
 @dirrm %%DATADIR%%/en
+@dirrm %%DATADIR%%/de
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/link-grammar