ports/128717: [PATCH]textproc/link-grammar: update to 4.3.9 (includes security fix)

bf bf2006a at yahoo.com
Sun Nov 9 00:10:53 PST 2008


I should mention that there is a multi-threaded version that has been
available since 4.3.6.  It is disabled by default, because it has received
less testing, but it works for me and it may be useful for others working
with large documents, especially on SMP.  If we choose to enable the 
multi-threaded version by default in the port, we should use something
like the attached patch, instead of the first patch I submitted.

Regards,
         b.


      
-------------- next part --------------
diff -ruN link-grammar.orig/Makefile link-grammar/Makefile
--- link-grammar.orig/Makefile	2008-11-08 23:19:34.872105858 -0500
+++ link-grammar/Makefile	2008-11-09 02:40:00.803068033 -0500
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	link-grammar
-PORTVERSION=	4.2.4
+PORTVERSION=	4.3.9
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
 
@@ -17,12 +17,17 @@
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
+CFLAGS+=	${PTHREAD_CFLAGS}
+CONFIGURE_ARGS+=	--enable-pthreads
 
 DOCS=		AUTHORS LICENSE MAINTAINERS README
+MAN1=		link-parser.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \
+		${WRKSRC}/configure ${WRKSRC}/${PORTNAME}/Makefile.in
 
 .ifndef (NOPORTDOCS)
 post-install:
diff -ruN link-grammar.orig/distinfo link-grammar/distinfo
--- link-grammar.orig/distinfo	2008-11-08 23:19:34.883102507 -0500
+++ link-grammar/distinfo	2008-11-09 02:40:00.804067881 -0500
@@ -1,3 +1,3 @@
-MD5 (link-grammar-4.2.4.tar.gz) = 56ed2a55cc6d2c8ec013b75bd0bcc01b
-SHA256 (link-grammar-4.2.4.tar.gz) = e28cf49636d83c8faf487718c913d8fc9d01a54c1c63dc9cd995f4e669a4a740
-SIZE (link-grammar-4.2.4.tar.gz) = 741007
+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
diff -ruN link-grammar.orig/files/patch-configure link-grammar/files/patch-configure
--- link-grammar.orig/files/patch-configure	1969-12-31 19:00:00.000000000 -0500
+++ link-grammar/files/patch-configure	2008-11-09 02:40:00.803068033 -0500
@@ -0,0 +1,108 @@
+--- 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 -ruN link-grammar.orig/pkg-plist link-grammar/pkg-plist
--- link-grammar.orig/pkg-plist	2008-11-08 23:19:34.884102914 -0500
+++ link-grammar/pkg-plist	2008-11-09 02:40:00.834062754 -0500
@@ -1,4 +1,4 @@
-bin/grammar-parse
+bin/link-parser
 include/link-grammar/link-features.h
 include/link-grammar/link-includes.h
 lib/liblink-grammar.a
@@ -22,16 +22,19 @@
 %%DATADIR%%/en/words/words.adv.1
 %%DATADIR%%/en/words/words.adv.2
 %%DATADIR%%/en/words/words.adv.3
+%%DATADIR%%/en/words/entities.given-bisex.sing
+%%DATADIR%%/en/words/entities.given-female.sing
+%%DATADIR%%/en/words/entities.given-male.sing
+%%DATADIR%%/en/words/entities.locations.sing
+%%DATADIR%%/en/words/entities.national.sing
+%%DATADIR%%/en/words/entities.organizations.sing
+%%DATADIR%%/en/words/entities.us-states.sing
 %%DATADIR%%/en/words/words.n.1
 %%DATADIR%%/en/words/words.n.2.s
 %%DATADIR%%/en/words/words.n.2.x
 %%DATADIR%%/en/words/words.n.3
 %%DATADIR%%/en/words/words.n.4
-%%DATADIR%%/en/words/words.n.c.1
-%%DATADIR%%/en/words/words.n.c.2
-%%DATADIR%%/en/words/words.n.p
 %%DATADIR%%/en/words/words.n.t
-%%DATADIR%%/en/words/words.s
 %%DATADIR%%/en/words/words.v.1.1
 %%DATADIR%%/en/words/words.v.1.2
 %%DATADIR%%/en/words/words.v.1.3
@@ -66,8 +69,23 @@
 %%DATADIR%%/en/words/words.v.8.4
 %%DATADIR%%/en/words/words.v.8.5
 %%DATADIR%%/en/words/words.y
+%%DATADIR%%/en/words/words-medical.adj.2
+%%DATADIR%%/en/words/words-medical.adj.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
+%%DATADIR%%/en/words/words-medical.v.4.5
+%%DATADIR%%/lt/4.0.affix
+%%DATADIR%%/lt/4.0.constituent-knowledge
+%%DATADIR%%/lt/4.0.dict
+%%DATADIR%%/lt/4.0.knowledge
 @dirrm %%DATADIR%%/en/words
 @dirrm %%DATADIR%%/en
+ at dirrm %%DATADIR%%/lt
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/link-grammar


More information about the freebsd-gnome mailing list