FreeBSD Bugzilla – Attachment 60101 Details for
Bug 90323
[PATCH] textproc/WordNet: update to 2.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
WordNet-2.1.patch
WordNet-2.1.patch (text/plain), 23.74 KB, created by
Cheng-Lung Sung
on 2005-12-13 08:10:09 UTC
(
hide
)
Description:
WordNet-2.1.patch
Filename:
MIME Type:
Creator:
Cheng-Lung Sung
Created:
2005-12-13 08:10:09 UTC
Size:
23.74 KB
patch
obsolete
>Index: Makefile >=================================================================== >RCS file: /home/pcvs/ports/textproc/wordnet/Makefile,v >retrieving revision 1.9 >diff -u -u -r1.9 Makefile >--- Makefile 13 Jul 2005 23:52:55 -0000 1.9 >+++ Makefile 13 Dec 2005 08:03:09 -0000 >@@ -6,10 +6,10 @@ > # > > PORTNAME= WordNet >-PORTVERSION= 2.0 >+PORTVERSION= 2.1 > CATEGORIES= textproc > MASTER_SITES= ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PORTVERSION}/ \ >- http://www.cogsci.princeton.edu/${PORTVERSION}/ \ >+ http://wordnet.princeton.edu/${PORTVERSION}/ \ > ftp://ftp.ims.uni-stuttgart.de/pub/WordNet/${PORTVERSION}/ > > MAINTAINER= mi@aldan.algebra.com >@@ -19,7 +19,7 @@ > > # The vendor packages up a lot of useless precompiled binaries > # for a few platforms with the source code. Do not extract them: >-EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude '*/bin/*' \ >+EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude '*/bin/*' \ > --exclude '*/lib/solaris/*' \ > --exclude '*/lib/linux/*' \ > --exclude '*/lib/irix/*' \ >@@ -33,17 +33,44 @@ > USE_REINPLACE= yes > REINPLACE_ARGS= -i "" > INSTALLS_SHLIB= yes >+HAS_CONFIGURE= yes >+CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl${TCL_DVER} --with-tk=${LOCALBASE}/lib/tk${TCL_DVER} --includedir=${PREFIX}/include/${LOCALPATH} --datadir=${PREFIX}/share/${LOCALPATH} --bindir=${PREFIX}/bin --libdir=${PREFIX}/lib >+LOCALPATH= ${PORTNAME}-${PORTVERSION} >+ >+MAN1= grind.1 \ >+ wn.1 \ >+ wnb.1 \ >+ wnintro.1 >+MAN3= binsrch.3 morph.3 wnintro.3 wnsearch.3 wnutil.3 >+MAN5= cntlist.5 lexnames.5 senseidx.5 wndb.5 wninput.5 wnintro.5 >+MAN7= morphy.7 uniqbeg.7 wngloss.7 wngroups.7 wnintro.7 \ >+ wnlicens.7 wnpkgs.7 wnstats.7 > > post-patch: > ${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' \ >- -e 's,_VER_,${PORTVERSION},g' ${WRKSRC}/include/wnconsts.h \ >- ${WRKSRC}/src/wnb/wnb >+ -e 's,_VER_,${PORTVERSION},g' ${WRKSRC}/include/wn.h \ >+ ${WRKSRC}/src/wnb >+ ${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,g' \ >+ ${WRKSRC}/lib/wnutil.c >+ ${REINPLACE_CMD} -e 's,<tk.h>,<tk${TCL_DVER}/tk.h>,g' \ >+ ${WRKSRC}/src/tkAppInit.c ${WRKSRC}/src/stubs.c > > .include <bsd.port.pre.mk> > >-.for s in 1 3 5 7 >-MAN$s!= ${MAKE} -f ${FILESDIR}/man.Makefile -V MAN$s >-.endfor >-MANCOMPRESSED= maybe >+pre-install: >+.if !defined(NOPORTDOCS) >+ ${REINPLACE_CMD} -e 's,^htmldir = $$(prefix)/doc/html,htmldir = ${DOCSDIR}/html,g' \ >+ ${WRKSRC}/doc/html/Makefile >+ ${REINPLACE_CMD} -e 's,^pdfdir = $$(prefix)/doc/pdf,pdfdir = ${DOCSDIR}/pdf,g' \ >+ ${WRKSRC}/doc/pdf/Makefile >+ ${REINPLACE_CMD} -e 's,^psdir = $$(prefix)/doc/ps,psdir = ${DOCSDIR}/ps,g' \ >+ ${WRKSRC}/doc/ps/Makefile >+.endif >+ ${REINPLACE_CMD} -e 's,^mandir = $${prefix}/man,mandir = ${MANPREFIX}/man,g' \ >+ ${WRKSRC}/doc/man/Makefile >+ ${REINPLACE_CMD} -e 's,^wnresdir = $$(prefix)/lib/wnres,wnresdir = ${DATADIR}/wnres,g' \ >+ ${WRKSRC}/lib/wnres//Makefile >+ ${REINPLACE_CMD} -e 's,^dictdir = $$(prefix)/dict,dictdir = ${DATADIR}/dict,g' \ >+ ${WRKSRC}/dict/Makefile > > .include <bsd.port.post.mk> >Index: distinfo >=================================================================== >RCS file: /home/pcvs/ports/textproc/wordnet/distinfo,v >retrieving revision 1.4 >diff -u -u -r1.4 distinfo >--- distinfo 17 Feb 2004 21:28:23 -0000 1.4 >+++ distinfo 13 Dec 2005 08:03:09 -0000 >@@ -1,2 +1,3 @@ >-MD5 (WordNet-2.0.tar.gz) = 42faaf63f391bb1e13f59ca83490634d >-SIZE (WordNet-2.0.tar.gz) = 12847598 >+MD5 (WordNet-2.1.tar.gz) = 081aa25baaccac602cebb61f6cb949e7 >+SHA256 (WordNet-2.1.tar.gz) = 8ed7ec24377d114c6db326a6f114d6e22afb85cc37f7f1386831b6d8f114784d >+SIZE (WordNet-2.1.tar.gz) = 11441476 >Index: pkg-plist >=================================================================== >RCS file: /home/pcvs/ports/textproc/wordnet/pkg-plist,v >retrieving revision 1.5 >diff -u -u -r1.5 pkg-plist >--- pkg-plist 17 Feb 2004 21:28:23 -0000 1.5 >+++ pkg-plist 13 Dec 2005 08:03:09 -0000 >@@ -1,40 +1,107 @@ >+bin/wishwn > bin/wnb > bin/wn >-include/WordNet-%%VER%%/license.h >-include/WordNet-%%VER%%/setutil.h > include/WordNet-%%VER%%/wn.h >-include/WordNet-%%VER%%/wnconsts.h >-include/WordNet-%%VER%%/wnglobal.h >-include/WordNet-%%VER%%/wnhelp.h >-include/WordNet-%%VER%%/wnrtl.h >-include/WordNet-%%VER%%/wntypes.h >-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 >-share/WordNet-%%VER%%/cntlist >-share/WordNet-%%VER%%/cntlist.rev >-share/WordNet-%%VER%%/data.adj >-share/WordNet-%%VER%%/data.adv >-share/WordNet-%%VER%%/data.noun >-share/WordNet-%%VER%%/data.verb >-share/WordNet-%%VER%%/index.adj >-share/WordNet-%%VER%%/index.adv >-share/WordNet-%%VER%%/index.noun >-share/WordNet-%%VER%%/index.sense >-share/WordNet-%%VER%%/index.verb >-share/WordNet-%%VER%%/lexnames >-share/WordNet-%%VER%%/noun.exc >-share/WordNet-%%VER%%/sentidx.vrb >-share/WordNet-%%VER%%/sents.vrb >-share/WordNet-%%VER%%/verb.exc >-share/WordNet-%%VER%%/wnres/license.txt >-share/WordNet-%%VER%%/wnres/wn.xbm >+lib/libWN.a >+%%DOCSDIR%%/html/binsrch.3WN.html >+%%DOCSDIR%%/html/cntlist.5WN.html >+%%DOCSDIR%%/html/grind.1WN.html >+%%DOCSDIR%%/html/lexnames.5WN.html >+%%DOCSDIR%%/html/morph.3WN.html >+%%DOCSDIR%%/html/morphy.7WN.html >+%%DOCSDIR%%/html/senseidx.5WN.html >+%%DOCSDIR%%/html/uniqbeg.7WN.html >+%%DOCSDIR%%/html/wn.1WN.html >+%%DOCSDIR%%/html/wnb.1WN.html >+%%DOCSDIR%%/html/wndb.5WN.html >+%%DOCSDIR%%/html/wngloss.7WN.html >+%%DOCSDIR%%/html/wngroups.7WN.html >+%%DOCSDIR%%/html/wninput.5WN.html >+%%DOCSDIR%%/html/wnintro.1WN.html >+%%DOCSDIR%%/html/wnintro.3WN.html >+%%DOCSDIR%%/html/wnintro.5WN.html >+%%DOCSDIR%%/html/wnintro.7WN.html >+%%DOCSDIR%%/html/wnlicens.7WN.html >+%%DOCSDIR%%/html/wnpkgs.7WN.html >+%%DOCSDIR%%/html/wnsearch.3WN.html >+%%DOCSDIR%%/html/wnstats.7WN.html >+%%DOCSDIR%%/html/wnutil.3WN.html >+%%DOCSDIR%%/pdf/binsrch.3.pdf >+%%DOCSDIR%%/pdf/cntlist.5.pdf >+%%DOCSDIR%%/pdf/grind.1.pdf >+%%DOCSDIR%%/pdf/lexnames.5.pdf >+%%DOCSDIR%%/pdf/morph.3.pdf >+%%DOCSDIR%%/pdf/morphy.7.pdf >+%%DOCSDIR%%/pdf/senseidx.5.pdf >+%%DOCSDIR%%/pdf/uniqbeg.7.pdf >+%%DOCSDIR%%/pdf/wn.1.pdf >+%%DOCSDIR%%/pdf/wnb.1.pdf >+%%DOCSDIR%%/pdf/wndb.5.pdf >+%%DOCSDIR%%/pdf/wngloss.7.pdf >+%%DOCSDIR%%/pdf/wngroups.7.pdf >+%%DOCSDIR%%/pdf/wninput.5.pdf >+%%DOCSDIR%%/pdf/wnintro.1.pdf >+%%DOCSDIR%%/pdf/wnintro.3.pdf >+%%DOCSDIR%%/pdf/wnintro.5.pdf >+%%DOCSDIR%%/pdf/wnintro.7.pdf >+%%DOCSDIR%%/pdf/wnlicens.7.pdf >+%%DOCSDIR%%/pdf/wnpkgs.7.pdf >+%%DOCSDIR%%/pdf/wnsearch.3.pdf >+%%DOCSDIR%%/pdf/wnstats.7.pdf >+%%DOCSDIR%%/pdf/wnutil.3.pdf >+%%DOCSDIR%%/ps/binsrch.3.ps >+%%DOCSDIR%%/ps/cntlist.5.ps >+%%DOCSDIR%%/ps/grind.1.ps >+%%DOCSDIR%%/ps/lexnames.5.ps >+%%DOCSDIR%%/ps/morph.3.ps >+%%DOCSDIR%%/ps/morphy.7.ps >+%%DOCSDIR%%/ps/senseidx.5.ps >+%%DOCSDIR%%/ps/uniqbeg.7.ps >+%%DOCSDIR%%/ps/wn.1.ps >+%%DOCSDIR%%/ps/wnb.1.ps >+%%DOCSDIR%%/ps/wndb.5.ps >+%%DOCSDIR%%/ps/wngloss.7.ps >+%%DOCSDIR%%/ps/wngroups.7.ps >+%%DOCSDIR%%/ps/wninput.5.ps >+%%DOCSDIR%%/ps/wnintro.1.ps >+%%DOCSDIR%%/ps/wnintro.3.ps >+%%DOCSDIR%%/ps/wnintro.5.ps >+%%DOCSDIR%%/ps/wnintro.7.ps >+%%DOCSDIR%%/ps/wnlicens.7.ps >+%%DOCSDIR%%/ps/wnpkgs.7.ps >+%%DOCSDIR%%/ps/wnsearch.3.ps >+%%DOCSDIR%%/ps/wnstats.7.ps >+%%DOCSDIR%%/ps/wnutil.3.ps >+%%DATADIR%%/wnres/license.txt >+%%DATADIR%%/wnres/wn.xbm >+%%DATADIR%%/wnres/wnb.man >+%%DATADIR%%/wnres/wngloss.man >+%%DATADIR%%/dict/adj.exc >+%%DATADIR%%/dict/adv.exc >+%%DATADIR%%/dict/cntlist >+%%DATADIR%%/dict/cntlist.rev >+%%DATADIR%%/dict/data.adj >+%%DATADIR%%/dict/data.adv >+%%DATADIR%%/dict/data.noun >+%%DATADIR%%/dict/data.verb >+%%DATADIR%%/dict/frames.vrb >+%%DATADIR%%/dict/index.adj >+%%DATADIR%%/dict/index.adv >+%%DATADIR%%/dict/index.noun >+%%DATADIR%%/dict/index.sense >+%%DATADIR%%/dict/index.verb >+%%DATADIR%%/dict/log.grind.2.1 >+%%DATADIR%%/dict/noun.exc >+%%DATADIR%%/dict/sentidx.vrb >+%%DATADIR%%/dict/sents.vrb >+%%DATADIR%%/dict/verb.Framestext >+%%DATADIR%%/dict/verb.exc >+%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/wnres 2>/dev/null || true >+%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/ps 2>/dev/null || true >+%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/pdf 2>/dev/null || true >+%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/html 2>/dev/null || true >+%%PORTDOCS%%@dirrm %%DOCSDIR%% > @dirrm include/WordNet-%%VER%% >-@dirrm lib/tcl%%TCL_DVER%%/Wordnet >-@dirrm share/WordNet-%%VER%%/wnres >-@dirrm share/WordNet-%%VER%% >+@dirrm %%DATADIR%%/wnres >+@dirrm %%DATADIR%%/dict >+@dirrm %%DATADIR%% >Index: files/Makefile >=================================================================== >RCS file: files/Makefile >diff -N files/Makefile >--- files/Makefile 1 May 2000 02:40:45 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,8 +0,0 @@ >-# $FreeBSD: ports/textproc/wordnet/files/Makefile,v 1.1 2000/05/01 02:40:45 steve Exp $ >- >-SUBDIR= include \ >- dict \ >- src \ >- man >- >-.include <bsd.subdir.mk> >Index: files/dict.Makefile >=================================================================== >RCS file: files/dict.Makefile >diff -N files/dict.Makefile >--- files/dict.Makefile 20 Aug 2002 16:05:04 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,23 +0,0 @@ >-WN_INSTALLDIR= ${PREFIX}/share/WordNet-${VER} >-WN_FILES= data.noun data.verb data.adj data.adv index.noun \ >- index.verb index.adj index.adv noun.exc verb.exc \ >- adj.exc adv.exc index.sense cntlist.rev \ >- cntlist lexnames sentidx.vrb sents.vrb >- >-all: $(WN_FILES) >- >-${WN_INSTALLDIR}: >- mkdir -p ${WN_INSTALLDIR} >- >-.for f in ${WN_FILES} >-INSTALLED+= ${WN_INSTALLDIR}/$f >- >-${WN_INSTALLDIR}/$f: $f >- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} \ >- $f ${WN_INSTALLDIR}/$f >-.endfor >- >-install: ${WN_INSTALLDIR} ${INSTALLED} >- >-NOOBJ= noobj >-.include <bsd.prog.mk> >Index: files/include.Makefile >=================================================================== >RCS file: files/include.Makefile >diff -N files/include.Makefile >--- files/include.Makefile 20 Aug 2002 16:05:04 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,17 +0,0 @@ >-WN_INSTALLDIR = ${PREFIX}/include/WordNet-${VER} >- >-WN_FILES= license.h setutil.h wn.h wnconsts.h wnglobal.h \ >- wnhelp.h wnrtl.h wntypes.h >- >-all: $(WN_FILES) >- >-${WN_INSTALLDIR}: >- mkdir -p ${WN_INSTALLDIR} >- >-install: ${WN_INSTALLDIR} >- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ >- ${WN_FILES} ${WN_INSTALLDIR}/ >- >-NOOBJ= noobj >- >-.include <bsd.prog.mk> >Index: files/man.Makefile >=================================================================== >RCS file: files/man.Makefile >diff -N files/man.Makefile >--- files/man.Makefile 31 Oct 2001 05:04:29 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,10 +0,0 @@ >-MANDIR= ${PREFIX}/man/man >- >-MAN1= wn.1 wnb.1 wnintro.1 >-MAN3= binsrch.3 morph.3 wnintro.3 wnsearch.3 wnutil.3 >-MAN5= cntlist.5 lexnames.5 senseidx.5 \ >- wndb.5 wninput.5 wnintro.5 >-MAN7= morphy.7 uniqbeg.7 wngloss.7 wngroups.7 wnintro.7 \ >- wnlicens.7 wnpkgs.7 wnstats.7 >- >-.include <bsd.prog.mk> >Index: files/patch-aa >=================================================================== >RCS file: files/patch-aa >diff -N files/patch-aa >--- files/patch-aa 20 Aug 2002 16:05:04 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,15 +0,0 @@ >---- include/wnconsts.h Fri Feb 27 13:54:53 1998 >-+++ include/wnconsts.h Sat Feb 26 16:11:51 2000 >-@@ -15,6 +15,10 @@ >- /* Platform specific path and filename specifications */ >- >- #ifdef UNIX >- #define DICTDIR "/dict" >--#define DEFAULTPATH "/usr/local/WordNet-_VER_/dict" >--#define DEFAULTBIN "/usr/local/WordNet-_VER_/bin" >-+#ifndef DEFAULTPATH >-+#define DEFAULTPATH "/usr/local/share/WordNet-_VER_" >-+#endif >-+#ifndef DEFAULTBIN >-+#define DEFAULTBIN "/usr/local/bin" >-+#endif >Index: files/patch-ab >=================================================================== >RCS file: files/patch-ab >diff -N files/patch-ab >--- files/patch-ab 1 May 2000 02:40:49 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,7 +0,0 @@ >---- src/lib/wnutil.c Thu Feb 19 12:15:09 1998 >-+++ src/lib/wnutil.c Sat Feb 26 16:14:08 2000 >-@@ -10,3 +10,3 @@ >- #ifdef UNIX >--#include <malloc.h> >-+#include <stdlib.h> >- #endif >Index: files/patch-ac >=================================================================== >RCS file: files/patch-ac >diff -N files/patch-ac >--- files/patch-ac 17 Feb 2004 21:28:23 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,68 +0,0 @@ >---- src/wnb/stubs.c Fri Nov 14 17:01:44 1997 >-+++ src/wnb/stubs.c Sat Feb 26 20:09:19 2000 >-@@ -24,3 +24,2 @@ >- #include <tcl.h> >--#include <tk.h> >- #include <wn.h> >-@@ -37,5 +36,4 @@ >- int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp, >-- int argc, char *argv[]) { >-+ int argc, Tcl_Obj *objv[]) { >- unsigned int bitfield; >-- static char bitfieldstr[32]; >- char *morph; >-@@ -43,9 +41,10 @@ >- if (argc != 3) { >-- interp -> result = >-- "usage: findvalidsearches searchword partofspeechnum"; >-+ Tcl_WrongNumArgs(interp, 1, objv, >-+ "findvalidsearches searchword partofspeechnum"); >- return TCL_ERROR; >- } >-- pos = atoi (argv[2]); >-- bitfield = is_defined (argv[1], pos); >-- if ((morph = morphstr (argv[1], pos)) != NULL) { >-+ if (Tcl_GetIntFromObj(interp, objv[2], &pos) != TCL_OK) >-+ return TCL_ERROR; >-+ bitfield = is_defined (Tcl_GetString(objv[1]), pos); >-+ if ((morph = morphstr (Tcl_GetString(objv[1]), pos)) != NULL) { >- do { >-@@ -54,4 +53,3 @@ >- } >-- sprintf (bitfieldstr, "%u", bitfield); >-- interp -> result = bitfieldstr; >-+ Tcl_SetObjResult(interp, Tcl_NewIntObj(bitfield)); >- return TCL_OK; >-@@ -67,14 +65,11 @@ >- int wn_bit (ClientData clientData, Tcl_Interp *interp, >-- int argc, char *argv[]) { >-- unsigned int bitfield; >-- static char bitfieldstr[32]; >-+ int argc, Tcl_Obj *objv[]) { >- int whichbit; >- if (argc != 2) { >-- interp -> result = "usage: bit bitnum"; >-+ Tcl_WrongNumArgs(interp, 1, objv, "bitnum"); >- return TCL_ERROR; >- } >-- whichbit = atoi (argv[1]); >-- bitfield = bit (whichbit); >-- sprintf (bitfieldstr, "%u", bitfield); >-- interp -> result = bitfieldstr; >-+ if (Tcl_GetIntFromObj(interp, objv[1], &whichbit) != TCL_OK) >-+ return TCL_ERROR; >-+ Tcl_SetObjResult(interp, Tcl_NewIntObj(bit(whichbit))); >- return TCL_OK; >-@@ -275,5 +270,5 @@ >- wninit (); >-- Tcl_CreateCommand (interp, "findvalidsearches", (void *) >-+ Tcl_CreateObjCommand (interp, "findvalidsearches", (void *) >- wn_findvalidsearches, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); >-- Tcl_CreateCommand (interp, "bit", (void *) wn_bit, (ClientData) NULL, >-+ Tcl_CreateObjCommand (interp, "bit", (void *) wn_bit, (ClientData) NULL, >- (Tcl_CmdDeleteProc *) NULL); >-@@ -295,3 +290,3 @@ >- (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); >-- return TCL_OK; >-+ return Tcl_PkgProvide(interp, "Wordnet", "2.0"); >- } >Index: files/patch-ad >=================================================================== >RCS file: files/patch-ad >diff -N files/patch-ad >--- files/patch-ad 1 May 2000 02:40:49 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,9 +0,0 @@ >---- src/wnb/wnb Sun Feb 22 12:49:56 1998 >-+++ src/wnb/wnb Sat Feb 26 19:52:42 2000 >-@@ -629,2 +626,6 @@ >- -text "Based upon an earlier X Window version by\nBrian Gustafson."] \ >-+ [label .aboutbox.top.right.textmi \ >-+ -anchor w \ >-+ -justify left \ >-+ -text "Tuned for Tcl8.x and ported to FreeBSD by\nMikhail Teterin."] \ >- [label .aboutbox.top.right.text5 \ >Index: files/patch-ae >=================================================================== >RCS file: files/patch-ae >diff -N files/patch-ae >--- files/patch-ae 17 Feb 2004 21:28:23 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,37 +0,0 @@ >---- 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]); >Index: files/patch-ag >=================================================================== >RCS file: files/patch-ag >diff -N files/patch-ag >--- files/patch-ag 17 Feb 2004 21:28:23 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,7 +0,0 @@ >---- src/wnb/wnb Tue Aug 20 11:54:54 2002 >-+++ 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-2.0/lib/wnres" >-+ set resourcedir "/usr/local/share/WordNet-2.0/wnres" >- } else { >Index: files/patch-ah >=================================================================== >RCS file: files/patch-ah >diff -N files/patch-ah >--- files/patch-ah 17 Feb 2004 21:28:23 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,86 +0,0 @@ >---- 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'; >Index: files/patch-include-wn.h >=================================================================== >RCS file: files/patch-include-wn.h >diff -N files/patch-include-wn.h >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ files/patch-include-wn.h 13 Dec 2005 08:03:09 -0000 >@@ -0,0 +1,13 @@ >+--- include/wn.h.orig Thu Jul 7 02:48:44 2005 >++++ include/wn.h Fri Oct 14 13:31:18 2005 >+@@ -30,7 +30,9 @@ >+ #define CNTLISTFILE "%s\\cntlist.rev" >+ #else >+ #define DICTDIR "/dict" >+-#define DEFAULTPATH "/usr/local/WordNet-2.1/dict" >++#ifndef DEFAULTPATH >++#define DEFAULTPATH "/usr/local/share/WordNet-_VER_" >++#endif >+ #define DATAFILE "%s/data.%s" >+ #define INDEXFILE "%s/index.%s" >+ #define SENSEIDXFILE "%s/index.sense" >Index: files/src.Makefile >=================================================================== >RCS file: files/src.Makefile >diff -N files/src.Makefile >--- files/src.Makefile 1 May 2000 02:40:46 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,3 +0,0 @@ >-SUBDIR= lib wn wnb >- >-.include <bsd.subdir.mk> >Index: files/src.lib.Makefile >=================================================================== >RCS file: files/src.lib.Makefile >diff -N files/src.lib.Makefile >--- files/src.lib.Makefile 17 Feb 2004 21:28:23 -0000 1.4 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,15 +0,0 @@ >-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\"" >- >-CFLAGS+= -I${.CURDIR}/../../include >- >-LIB= wn2 >-SHLIB_MAJOR= 0 >-NOPROFILE= True >- >-LIBDIR= ${PREFIX}/lib >- >-.include <bsd.lib.mk> >Index: files/src.wn.Makefile >=================================================================== >RCS file: files/src.wn.Makefile >diff -N files/src.wn.Makefile >--- files/src.wn.Makefile 17 Feb 2004 21:28:23 -0000 1.4 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,12 +0,0 @@ >-PROG= wn >-NOMAN= True # man pages installed separately >- >-CFLAGS+= -DUNIX -DDEFAULTPATH="\"${PREFIX}/share/WordNet-${VER}\"" \ >- -DDEFAULTBIN="\"${PREFIX}/bin\"" >- >-CFLAGS+= -I${.CURDIR}/../../include >-LDADD+= -L../lib -lwn2 >- >-BINDIR= ${PREFIX}/bin >- >-.include <bsd.prog.mk> >Index: files/src.wnb.Makefile >=================================================================== >RCS file: files/src.wnb.Makefile >diff -N files/src.wnb.Makefile >--- files/src.wnb.Makefile 17 Feb 2004 21:28:23 -0000 1.6 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,38 +0,0 @@ >-PREFIX?= /usr/local >-TCL_DVER?= 8.4 >-TCL_VER= ${TCL_DVER:S/.//g} >-TCL_INCDIR?= ${PREFIX}/include/tcl${TCL_DVER} >- >-CFLAGS+= -DUNIX -DDEFAULTPATH="\"${PREFIX}/share/WordNet-${VER}\"" \ >- -DDEFAULTBIN="\"${PREFIX}/bin\"" >- >-CFLAGS+= -I${.CURDIR}/../../include -I$(TCL_INCDIR) >- >-LDADD= -L../lib -lwn2 -L${PREFIX}/lib -ltcl${TCL_VER} -ltk${TCL_VER} >- >-SHLIB_NAME= libtclwn2.so.0 >-SRCS= stubs.c >- >-all: pkgIndex.tcl >- >-pkgIndex.tcl: >- echo "package ifneeded Wordnet ${VER} [list load \ >- [file join ${PREFIX}/lib ${SHLIB_NAME}] Wordnet]" \ >- > pkgIndex.tcl >- >-LIBDIR= ${PREFIX}/lib >-RESDIR= ${PREFIX}/share/WordNet-${VER}/wnres >- >-${LIBDIR} ${RESDIR} ${LIBDIR}/tcl${TCL_DVER}/Wordnet: >- mkdir -p ${.TARGET} >- >-beforeinstall: ${LIBDIR} ${RESDIR} ${LIBDIR}/tcl${TCL_DVER}/Wordnet >- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ >- pkgIndex.tcl ${LIBDIR}/tcl${TCL_DVER}/Wordnet >- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ >- ${.CURDIR}/../lib/wnres/license.txt \ >- ${.CURDIR}/../lib/wnres/*.xbm ${RESDIR} >- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 755 \ >- wnb ${PREFIX}/bin >- >-.include <bsd.lib.mk> >Index: scripts/configure >=================================================================== >RCS file: scripts/configure >diff -N scripts/configure >--- scripts/configure 20 Aug 2002 16:05:05 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,23 +0,0 @@ >-#!/bin/sh >-for mf in ${FILESDIR}/*Makefile ; do \ >- dir=${WRKSRC}/`basename $mf | sed -e s%Makefile%% -e 's%\.%/%g'` ; \ >- test -f ${dir}Makefile.orig && continue >- mv ${dir}Makefile ${dir}Makefile.orig ; \ >- cp -p $mf ${dir}Makefile ; \ >-done >- >-patch -d ${WRKSRC}/src/wnb -p << EOPATCH >-Configuring the wnb script to call the right wish-binary directly >---- wnb Sun Feb 22 12:49:56 1998 >-+++ wnb Sat Feb 26 17:41:06 2000 >-@@ -1,6 +1,3 @@ >--#!/bin/sh >--# the following line is evaluated by sh but ignored by tcl \\ >--wishwn "\$0" "\$@" & >--# the following line is evaluated by sh but ignored by tcl \\ >--exec true >--# the preceding lines make this script self-executing on unix systems >-+#!${PREFIX}/bin/wish${TCL_DVER} >-+ >-+package require Wordnet >-EOPATCH
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=60101">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 90323
: 60101