11 files changed, 143 insertions, 38 deletions

diff --git a/textproc/wordnet/Makefile b/textproc/wordnet/Makefile
index 430ebabf06bb..5f9c658dbb6f 100644
--- a/textproc/wordnet/Makefile
+++ b/textproc/wordnet/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	WordNet
-PORTVERSION=	1.7.1
+PORTVERSION=	2.0
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PORTVERSION}/ \
 		ftp://ftp.ims.uni-stuttgart.de/pub/WordNet/${PORTVERSION}/
@@ -24,13 +24,11 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude '*/bin/*' \
 		--exclude '*/lib/irix/*' \
 		--exclude '*/*.[ao]'
 
-TCL_DVER?=	8.3
+TCL_DVER?=	8.4
 TCL_VER=	${TCL_DVER:C/\.//}
 SCRIPTS_ENV+=	TCL_DVER=${TCL_DVER} VER=${PORTVERSION}
 MAKE_ENV+=	TCL_DVER=${TCL_DVER} VER=${PORTVERSION}
 PLIST_SUB+=	TCL_DVER=${TCL_DVER} VER=${PORTVERSION}
-# Parallel build is faster even on a single cpu machine:
-MAKE_ARGS=	-j 2
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 INSTALLS_SHLIB=	yes
diff --git a/textproc/wordnet/distinfo b/textproc/wordnet/distinfo
index 3a7af18c35d3..77a015288edd 100644
--- a/textproc/wordnet/distinfo
+++ b/textproc/wordnet/distinfo
@@ -1 +1,2 @@
-MD5 (WordNet-1.7.1.tar.gz) = 5c8e569339cf7d8e727d884234365508
+MD5 (WordNet-2.0.tar.gz) = 42faaf63f391bb1e13f59ca83490634d
+SIZE (WordNet-2.0.tar.gz) = 12847598
diff --git a/textproc/wordnet/files/patch-ac b/textproc/wordnet/files/patch-ac
index 97c57f010d94..fe4fdae3516d 100644
--- a/textproc/wordnet/files/patch-ac
+++ b/textproc/wordnet/files/patch-ac
@@ -64,5 +64,5 @@
 @@ -295,3 +290,3 @@
        (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
 -   return TCL_OK;
-+   return Tcl_PkgProvide(interp, "Wordnet", "1.7");
++   return Tcl_PkgProvide(interp, "Wordnet", "2.0");
  }
diff --git a/textproc/wordnet/files/patch-ae b/textproc/wordnet/files/patch-ae
index 38d94675e1a8..476f357206f8 100644
--- a/textproc/wordnet/files/patch-ae
+++ b/textproc/wordnet/files/patch-ae
@@ -1,9 +1,37 @@
---- src/lib/search.c	Tue Jun 19 11:02:47 2001
-+++ src/lib/search.c	Tue Oct 30 23:11:26 2001
-@@ -2051,5 +2051,5 @@
-    passed and return bit mask. */
-   
--unsigned int is_defined(char *searchstr, int dbase)
-+unsigned long is_defined(char *searchstr, int dbase)
- {
-     IndexPtr index;
+--- src/lib/search.c	Tue Jul 15 10:41:55 2003
++++ src/lib/search.c	Tue Feb 17 15:59:53 2004
+@@ -331,5 +331,5 @@
+     /* sanity check - make sure starting file offset matches first field */
+     if (synptr->hereiam != loc) {
+-	sprintf(msgbuf, "WordNet library error: no synset at location %d\n",
++	sprintf(msgbuf, "WordNet library error: no synset at location %ld\n",
+ 		loc);
+ 	display_message(msgbuf);
+@@ -464,5 +464,5 @@
+     if (ptrtok) {
+ 	ptrtok = strtok(NULL," \n");
+-	sprintf(tbuf, "");
++	tbuf[0] = '\0';
+ 	while (ptrtok != NULL) {
+ 	    strcat(tbuf,ptrtok);
+@@ -478,5 +478,5 @@
+ 
+     if (keyindexfp) { 		/* we have unique keys */
+-	sprintf(tmpbuf, "%c:%8.8d", partchars[dbase], synptr->hereiam);
++	sprintf(tmpbuf, "%c:%8.8ld", partchars[dbase], synptr->hereiam);
+ 	synptr->key = GetKeyForOffset(tmpbuf);
+     }
+@@ -2350,5 +2350,5 @@
+ 
+     if (offsetflag)		/* print synset offset */
+-	sprintf(tbuf + strlen(tbuf),"{%8.8d} ", synptr->hereiam);
++	sprintf(tbuf + strlen(tbuf),"{%8.8ld} ", synptr->hereiam);
+     if (fileinfoflag) {		/* print lexicographer file information */
+ 	sprintf(tbuf + strlen(tbuf), "<%s> ", lexfiles[synptr->fnum]);
+@@ -2385,5 +2385,5 @@
+ 
+     if (offsetflag)
+-	sprintf(tbuf,"{%8.8d} ", synptr->hereiam);
++	sprintf(tbuf,"{%8.8ld} ", synptr->hereiam);
+     if (fileinfoflag) {
+ 	sprintf(tbuf + strlen(tbuf),"<%s> ", lexfiles[synptr->fnum]);
diff --git a/textproc/wordnet/files/patch-af b/textproc/wordnet/files/patch-af
deleted file mode 100644
index c2f740677509..000000000000
--- a/textproc/wordnet/files/patch-af
+++ /dev/null
@@ -1,7 +0,0 @@
---- include/wn.h	Thu Mar  7 14:59:59 2002
-+++ include/wn.h	Tue Aug 20 11:24:43 2002
-@@ -32,3 +32,3 @@
- /* Set bit for each search type that is valid for the search word
-    passed and return bit mask. */
--extern unsigned int is_defined(char *, int); 
-+extern unsigned long is_defined(char *, int); 
diff --git a/textproc/wordnet/files/patch-ag b/textproc/wordnet/files/patch-ag
index ebcf49f52613..77495e75904c 100644
--- a/textproc/wordnet/files/patch-ag
+++ b/textproc/wordnet/files/patch-ag
@@ -2,6 +2,6 @@
 +++ src/wnb/wnb	Tue Aug 20 11:57:02 2002
 @@ -99,3 +96,3 @@
     if {[lsearch -exact [array names env] WNHOME] == -1} {
--	set resourcedir "/usr/local/WordNet-1.7.1/lib/wnres"
-+	set resourcedir "/usr/local/share/WordNet-1.7.1/wnres"
+-	set resourcedir "/usr/local/WordNet-2.0/lib/wnres"
++	set resourcedir "/usr/local/share/WordNet-2.0/wnres"
     } else {
diff --git a/textproc/wordnet/files/patch-ah b/textproc/wordnet/files/patch-ah
new file mode 100644
index 000000000000..2484129a1df5
--- /dev/null
+++ b/textproc/wordnet/files/patch-ah
@@ -0,0 +1,86 @@
+--- src/lib/morph.c	Tue Jul 15 10:41:55 2003
++++ src/lib/morph.c	Tue Feb 17 15:50:51 2004
+@@ -45,27 +45,28 @@
+ static char msgbuf[256];
+ 
+-#define NUMPREPS	15
+ 
+ static struct {
+     char *str;
+     int strlen;
+-} prepositions[NUMPREPS] = {
+-    "to", 2,
+-    "at", 2,
+-    "of", 2,
+-    "on", 2,
+-    "off", 3,
+-    "in", 2,
+-    "out", 3,
+-    "up", 2,
+-    "down", 4,
+-    "from", 4,
+-    "with", 4,
+-    "into", 4,
+-    "for", 3,
+-    "about", 5,
+-    "between", 7,
++} prepositions[] = {
++    { "to", 2 },
++    { "at", 2 },
++    { "of", 2 },
++    { "on", 2 },
++    { "off", 3 },
++    { "in", 2 },
++    { "out", 3 },
++    { "up", 2 },
++    { "down", 4 },
++    { "from", 4 },
++    { "with", 4 },
++    { "into", 4 },
++    { "for", 3 },
++    { "about", 5 },
++    { "between", 7 }
+ };
+ 
++#define NUMPREPS	sizeof(prepositions)/sizeof(prepositions[0])
++
+ static FILE *exc_fps[NUMPARTS + 1];
+ 
+@@ -207,5 +208,6 @@
+ 		strncpy(word, str + st_idx, end_idx - st_idx);
+ 		word[end_idx - st_idx] = '\0';
+-		if(tmp = morphword(word, pos))
++		tmp = morphword(word, pos);
++		if(tmp)
+ 		    strcat(searchstr,tmp);
+ 		else
+@@ -215,5 +217,6 @@
+ 	    }
+ 	    
+-	    if(tmp = morphword(strcpy(word, str + st_idx), pos)) 
++	    tmp = morphword(strcpy(word, str + st_idx), pos);
++	    if(tmp)
+ 		strcat(searchstr,tmp);
+ 	    else
+@@ -248,6 +251,5 @@
+     char *tmp, tmpbuf[WORDBUF], *end;
+     
+-    sprintf(retval,"");
+-    sprintf(tmpbuf, "");
++    retval[0] = tmpbuf[0] = '\0';
+     end = "";
+     
+@@ -343,5 +345,4 @@
+     static char line[WORDBUF], *beglp, *endlp;
+     char *excline;
+-    int found = 0;
+ 
+     if (exc_fps[pos] == NULL)
+@@ -385,5 +386,6 @@
+     last = strrchr(s, '_');
+     if (rest != last) {		/* more than 2 words */
+-	if (lastwd = morphword(last + 1, NOUN)) {
++	lastwd = morphword(last + 1, NOUN);
++	if (lastwd) {
+ 	    strncpy(end, rest, last - rest + 1);
+ 	    end[last-rest+1] = '\0';
diff --git a/textproc/wordnet/files/src.lib.Makefile b/textproc/wordnet/files/src.lib.Makefile
index fb82288f5c13..e7f80959eb06 100644
--- a/textproc/wordnet/files/src.lib.Makefile
+++ b/textproc/wordnet/files/src.lib.Makefile
@@ -2,13 +2,12 @@ SRCS=		binsrch.c morph.c search.c setutil.c wnglobal.c \
 		wnhelp.c wnrtl.c wnutil.c
 
 CFLAGS+=	-DUNIX -DDEFAULTPATH="\"${PREFIX}/share/WordNet-${VER}\"" \
-		-DDEFAULTBIN="\"${PREFIX}/bin\"" -Werror
+		-DDEFAULTBIN="\"${PREFIX}/bin\""
 
 CFLAGS+=	-I${.CURDIR}/../../include
 
-LIB=		wn1
-SHLIB_MAJOR=	7
-SHLIB_MINOR=	0
+LIB=		wn2
+SHLIB_MAJOR=	0
 NOPROFILE=	True
 
 LIBDIR=		${PREFIX}/lib
diff --git a/textproc/wordnet/files/src.wn.Makefile b/textproc/wordnet/files/src.wn.Makefile
index c527695cfb96..ce24168a5355 100644
--- a/textproc/wordnet/files/src.wn.Makefile
+++ b/textproc/wordnet/files/src.wn.Makefile
@@ -5,7 +5,7 @@ CFLAGS+=	-DUNIX -DDEFAULTPATH="\"${PREFIX}/share/WordNet-${VER}\"" \
 		-DDEFAULTBIN="\"${PREFIX}/bin\""
 
 CFLAGS+=	-I${.CURDIR}/../../include
-LDADD+=		-L../lib -lwn1
+LDADD+=		-L../lib -lwn2
 
 BINDIR=		${PREFIX}/bin
 
diff --git a/textproc/wordnet/files/src.wnb.Makefile b/textproc/wordnet/files/src.wnb.Makefile
index eb9a61a918f5..38baeeb2696c 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.3
+TCL_DVER?=	8.4
 TCL_VER=	${TCL_DVER:S/.//g}
 TCL_INCDIR?=	${PREFIX}/include/tcl${TCL_DVER}
 
@@ -8,15 +8,15 @@ CFLAGS+=	-DUNIX -DDEFAULTPATH="\"${PREFIX}/share/WordNet-${VER}\"" \
 
 CFLAGS+=	-I${.CURDIR}/../../include -I$(TCL_INCDIR)
 
-LDADD=		-L../lib -lwn1 -L${PREFIX}/lib -ltcl${TCL_VER} -ltk${TCL_VER}
+LDADD=		-L../lib -lwn2 -L${PREFIX}/lib -ltcl${TCL_VER} -ltk${TCL_VER}
 
-SHLIB_NAME=	libtclwn1.so.7
+SHLIB_NAME=	libtclwn2.so.0
 SRCS=		stubs.c
 
 all: pkgIndex.tcl
 
 pkgIndex.tcl:
-	echo "package ifneeded Wordnet 1.7 [list load \
+	echo "package ifneeded Wordnet ${VER} [list load \
 		[file join ${PREFIX}/lib ${SHLIB_NAME}] Wordnet]" \
 			> pkgIndex.tcl
 
diff --git a/textproc/wordnet/pkg-plist b/textproc/wordnet/pkg-plist
index c474d5c9c17b..814625ed4cab 100644
--- a/textproc/wordnet/pkg-plist
+++ b/textproc/wordnet/pkg-plist
@@ -8,11 +8,11 @@ include/WordNet-%%VER%%/wnglobal.h
 include/WordNet-%%VER%%/wnhelp.h
 include/WordNet-%%VER%%/wnrtl.h
 include/WordNet-%%VER%%/wntypes.h
-lib/libwn1.a
-lib/libwn1.so.7
-lib/libwn1.so
-lib/libtclwn1.so.7
-lib/libtclwn1.so
+lib/libwn2.a
+lib/libwn2.so.0
+lib/libwn2.so
+lib/libtclwn2.so.0
+lib/libtclwn2.so
 lib/tcl%%TCL_DVER%%/Wordnet/pkgIndex.tcl
 share/WordNet-%%VER%%/adj.exc
 share/WordNet-%%VER%%/adv.exc