4 files changed, 37 insertions, 3 deletions

diff --git a/textproc/wordnet/Makefile b/textproc/wordnet/Makefile
index 83644b3064b2..521dbdb0c36d 100644
--- a/textproc/wordnet/Makefile
+++ b/textproc/wordnet/Makefile
@@ -14,7 +14,7 @@ DISTFILES=	wn16.unix.tar.gz
 
 MAINTAINER=	mi@aldan.algebra.com
 
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
+LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
 
 MAN1=		wn.1 wnb.1 wnintro.1
 MAN3=		binsrch.3 morph.3 wnintro.3 wnsearch.3 wnutil.3
@@ -24,7 +24,7 @@ MAN7=		morphy.7 uniqbeg.7 wngloss.7 wngroups.7 wnintro.7 \
 		wnlicens.7 wnpkgs.7 wnstats.7
 MANCOMPRESSED=	maybe
 
-TCL_DVER=	8.2
+TCL_DVER=	8.3
 SCRIPTS_ENV+=	TCL_DVER=${TCL_DVER}
 MAKE_ENV+=	TCL_DVER=${TCL_DVER}
 PLIST_SUB+=	TCL_DVER=${TCL_DVER}
diff --git a/textproc/wordnet/files/patch-official b/textproc/wordnet/files/patch-official
index faca2552fe9b..1701ab0ccb2a 100644
--- a/textproc/wordnet/files/patch-official
+++ b/textproc/wordnet/files/patch-official
@@ -1,3 +1,14 @@
+This patch mostly contains the differences between the search.c as in
+the released version 1.6 vs. the later version found in
+	ftp://ftp.cogsci.princeton.edu/pub/wordnet/bugfixes/
+
+I also modified the groupexc function to fix the problem documented in
+	ftp://ftp.cogsci.princeton.edu/pub/wordnet/README.bugs
+(buf[8] vs. buf[9]  -- point 5 at  the bottom) and modified  it to avoid
+allocating 1Kb from the stack  and needlessly strcpy the argument given.
+Nothing  gets written  into the  string anyway,  and we  can examine  it
+without making a duplicate copy. -mi
+
 --- src/lib/search.c	Fri Nov  7 11:27:45 1997
 +++ src/lib/search.c	Fri Aug  7 12:57:08 1998
 @@ -19,3 +19,3 @@
@@ -18,6 +29,27 @@
 -			getsearchsense(cursyn, synptr->pto[i]));
 +			cursyn->wnsns[synptr->pto[i] - 1]);
  		printsynset(prefix, cursyn, tbuf, DEFOFF, synptr->pto[i],
+@@ -1405,16 +1405,15 @@
+     
+ static int groupexc(unsigned long off1, unsigned long off2)
+ {
+-    char buf[8], *p, linebuf[1024];
++    char buf[9], *p, *line;
+ 
+     sprintf(buf, "%8.8lu", (off1 < off2 ? off1 : off2));
+ 
+     if ((p = bin_search(buf, cousinexcfp)) != NULL) {
+ 	sprintf(buf, "%8.8lu", (off2 > off1 ? off2 : off1));
+-	strcpy(linebuf, p + 9); /* don't copy key */
+-	linebuf[strlen(linebuf) - 1] = '\0'; /* strip off newline */
+-	p = strtok(linebuf, " ");
+-	while (p && strcmp(p, buf))
++	line = p + 9; /* ignore the key */
++	p = strtok(line, " ");
++	while (p && strncmp(p, buf, 8))
+ 	    p = strtok(NULL, " ");
+     }
+     return(p ? 1 : 0);
 @@ -1775,2 +1780,8 @@
  	wnresults.numforms++;
 +
diff --git a/textproc/wordnet/files/src.wnb.Makefile b/textproc/wordnet/files/src.wnb.Makefile
index 3089aa4ea538..dd30a1c61a8a 100644
--- a/textproc/wordnet/files/src.wnb.Makefile
+++ b/textproc/wordnet/files/src.wnb.Makefile
@@ -1,5 +1,5 @@
 PREFIX?=	/usr/local
-TCL_DVER?=	8.2
+TCL_DVER?=	8.3
 TCL_VER=	${TCL_DVER:S/.//g}
 TCL_INCDIR?=	${PREFIX}/include/tcl${TCL_DVER}
 
diff --git a/textproc/wordnet/pkg-descr b/textproc/wordnet/pkg-descr
index a7cf251ca800..08e67edb2291 100644
--- a/textproc/wordnet/pkg-descr
+++ b/textproc/wordnet/pkg-descr
@@ -8,3 +8,5 @@ synonyms.  Not only  is the  system  valuable to  the casual  user as  a
 powerful thesaurus and dictionary, but also  to the researcher as one of
 the few freely available, lexical databases. WordNet is available via an
 on-line interface and also as easy-to-compile C source code for Unix.
+
+WWW: http://www.cogsci.princeton.edu/~wn/