From owner-freebsd-ports Mon Oct 2 13:40: 6 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 51D2837B66D for ; Mon, 2 Oct 2000 13:40:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id NAA94710; Mon, 2 Oct 2000 13:40:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from privatecube.privatelabs.com (privatecube.privatelabs.com [198.143.31.30]) by hub.freebsd.org (Postfix) with ESMTP id DD8E237B66E for ; Mon, 2 Oct 2000 13:30:51 -0700 (PDT) Received: from misha.privatelabs.com (root@misha.privatelabs.com [198.143.31.6]) by privatecube.privatelabs.com (8.9.3/8.9.2) with ESMTP id PAA10822 for ; Mon, 2 Oct 2000 15:49:49 -0400 Received: (from root@localhost) by misha.privatelabs.com (8.11.0/8.9.3) id e92KUI407459; Mon, 2 Oct 2000 16:30:18 -0400 (EDT) (envelope-from mi) Message-Id: <200010022030.e92KUI407459@misha.privatelabs.com> Date: Mon, 2 Oct 2000 16:30:18 -0400 (EDT) From: root@misha.privatelabs.com Reply-To: mi@aldan.algebra.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/21709: textproc/wordnet MAINTAINER UPGRADE Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 21709 >Category: ports >Synopsis: textproc/wordnet MAINTAINER UPGRADE >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Oct 02 13:40:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Mikhail Teterin >Release: FreeBSD 4.1.1-STABLE i386 >Organization: Virtual Estates, Inc. >Environment: >Description: The included patch fixes a bug documented on the software's site, documents one of the patch-files, bumps up the TCL/TK version in use to 8.3 and adds the WWW field to pkg/DESCR. >How-To-Repeat: >Fix: --- Makefile Mon Oct 2 16:24:44 2000 +++ Makefile Mon Oct 2 15:41:49 2000 @@ -17 +17 @@ -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 +LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 @@ -27 +27 @@ -TCL_DVER= 8.2 +TCL_DVER= 8.3 --- files/src.wnb.Makefile Sun Apr 30 22:40:47 2000 +++ files/src.wnb.Makefile Mon Oct 2 15:54:39 2000 @@ -2 +2 @@ -TCL_DVER?= 8.2 +TCL_DVER?= 8.3 --- patches/patch-official Sun Apr 30 22:40:49 2000 +++ patches/patch-official Mon Oct 2 15:51:33 2000 @@ -0,0 +1,11 @@ +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 + @@ -20,0 +32,21 @@ +@@ -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); --- pkg/DESCR Sun Apr 30 22:40:50 2000 +++ pkg/DESCR Mon Oct 2 15:57:22 2000 @@ -10,0 +11,2 @@ + +WWW: http://www.cogsci.princeton.edu/~wn/ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message