SOURCES: WordNet-FHS.patch (NEW), WordNet-typo.patch (NEW), WordNe...

Sun Dec 18 20:07:44 CET 2005

Author: glen                         Date: Sun Dec 18 19:07:44 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 2.1

---- Files affected:
SOURCES:
   WordNet-FHS.patch (NONE -> 1.1)  (NEW), WordNet-typo.patch (NONE -> 1.1)  (NEW), WordNet-shared.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/WordNet-FHS.patch
diff -u /dev/null SOURCES/WordNet-FHS.patch:1.1

--- /dev/null	Sun Dec 18 20:07:44 2005
+++ SOURCES/WordNet-FHS.patch	Sun Dec 18 20:07:39 2005
@@ -0,0 +1,35 @@
+--- WordNet-2.1/dict/Makefile.am~	2005-05-13 21:03:17.000000000 +0300
++++ WordNet-2.1/dict/Makefile.am	2005-12-17 22:29:53.000000000 +0200
+@@ -1,2 +1,2 @@
+-dictdir = $(prefix)/dict
++dictdir = $(datadir)/WordNet/dict
+ dict_DATA = adj.exc adv.exc cntlist cntlist.rev data.adj data.adv data.noun data.verb frames.vrb index.adj index.adv index.noun index.sense index.verb log.grind.2.1 noun.exc sentidx.vrb sents.vrb verb.Framestext verb.exc
+--- WordNet-2.1/include/wn.h~	2005-12-17 22:55:38.000000000 +0200
++++ WordNet-2.1/include/wn.h	2005-12-17 22:55:40.000000000 +0200
+@@ -30,7 +30,7 @@
+ #define CNTLISTFILE     "%s\\cntlist.rev"
+ #else
+ #define DICTDIR         "/dict"
+-#define DEFAULTPATH	"/usr/local/WordNet-2.1/dict"
++#define DEFAULTPATH	"/usr/share/WordNet/dict"
+ #define DATAFILE	"%s/data.%s"
+ #define INDEXFILE	"%s/index.%s"
+ #define SENSEIDXFILE	"%s/index.sense"
+--- WordNet-2.1/src/wnb~	2005-06-07 22:19:22.000000000 +0300
++++ WordNet-2.1/src/wnb	2005-12-17 23:06:27.000000000 +0200
+@@ -103,7 +103,7 @@
+ 
+ if {$tcl_platform(platform) == "unix"} {
+    if {[lsearch -exact [array names env] WNHOME] == -1} {
+-	set resourcedir "/usr/local/WordNet-2.1/lib/wnres"
++	set resourcedir "/usr/share/WordNet/wnres"
+    } else {
+ 	set resourcedir "$env(WNHOME)/lib/wnres"
+    }
+--- WordNet-2.1/lib/wnres/Makefile.am~	2005-06-17 22:15:51.000000000 +0300
++++ WordNet-2.1/lib/wnres/Makefile.am	2005-12-17 23:10:36.000000000 +0200
+@@ -1,3 +1,3 @@
+ EXTRA_DIST = license.txt wn.xbm wnb.man wngloss.man
+-wnresdir = $(prefix)/lib/wnres
++wnresdir = $(datadir)/WordNet/wnres
+ wnres_DATA = license.txt wn.xbm wnb.man wngloss.man

================================================================
Index: SOURCES/WordNet-typo.patch
diff -u /dev/null SOURCES/WordNet-typo.patch:1.1
--- /dev/null	Sun Dec 18 20:07:44 2005
+++ SOURCES/WordNet-typo.patch	Sun Dec 18 20:07:39 2005
@@ -0,0 +1,11 @@
+--- WordNet-2.1/src/stubs.c~	2005-07-06 21:49:05.000000000 +0300
++++ WordNet-2.1/src/stubs.c	2005-12-17 22:20:40.000000000 +0200
+@@ -14,7 +14,7 @@
+ #include <tk.h>
+ #include <wn.h>
+ 
+-static Id = "$Id$";
++static char *Id = "$Id$";
+ 
+ static char resultbuf[SEARCHBUF];
+ 

================================================================
Index: SOURCES/WordNet-shared.patch
diff -u SOURCES/WordNet-shared.patch:1.1 SOURCES/WordNet-shared.patch:1.2
--- SOURCES/WordNet-shared.patch:1.1	Thu Oct 30 13:15:50 2003
+++ SOURCES/WordNet-shared.patch	Sun Dec 18 20:07:39 2005
@@ -1,30 +1,34 @@
-diff -Naur WordNet-1.7.1/src/lib/Makefile WordNet-1.7.1-p/src/lib/Makefile
---- WordNet-1.7.1/src/lib/Makefile	Thu Oct 30 12:17:43 2003
-+++ WordNet-1.7.1-p/src/lib/Makefile	Thu Oct 30 12:18:39 2003
-@@ -7,6 +7,7 @@
- WN_INCDIR = $(WN_ROOT)/include
- 
- WN_FILES = libwn.a
-+WN_SHARED = libwn.so
- SRC = binsrch.c morph.c search.c setutil.c wnglobal.c wnhelp.c wnrtl.c wnutil.c
- OBJ = binsrch.o morph.o search.o setutil.o wnglobal.o wnhelp.o wnrtl.o wnutil.o
- 
-@@ -14,7 +15,7 @@
- LOCAL_CFLAGS = -O -DUNIX
- CFLAGS = -I$(WN_INCDIR) $(LOCAL_CFLAGS) -I../include
- 
--all: $(WN_FILES) 
-+all: $(WN_FILES) $(WN_SHARED)
- 
- install: $(WN_FILES)
- 	@if [ ! -d $(WN_INSTALLDIR) ] ; then \
-@@ -53,6 +54,9 @@
- $(WN_FILES): $(OBJ)
- 	ar rcv $(WN_FILES) $(OBJ); ranlib $(WN_FILES)
- 
-+$(WN_SHARED): $(OBJ)
-+	$(CC) -shared -o $(WN_SHARED) $(OBJ)
-+
- clean:
- 	@rm -f $(WN_FILES) $(OBJ) core *~ "#"*
+--- WordNet-2.1/lib/Makefile.am~	2005-12-17 22:38:12.000000000 +0200
++++ WordNet-2.1/lib/Makefile.am	2005-12-17 22:38:35.000000000 +0200
+@@ -1,5 +1,5 @@
+-lib_LIBRARIES = libWN.a
+-libWN_a_SOURCES = binsrch.c morph.c search.c wnglobal.c wnhelp.c wnrtl.c wnutil.c
+-libWN_a_CPPFLAGS = $(INCLUDES)
++lib_LTLIBRARIES = libWN.la
++libWN_la_SOURCES = binsrch.c morph.c search.c wnglobal.c wnhelp.c wnrtl.c wnutil.c
++libWN_la_CPPFLAGS = $(INCLUDES)
+ INCLUDES = -I$(top_srcdir)/include
+ SUBDIRS = wnres
+--- WordNet-2.1/configure.ac~	2005-07-08 21:19:09.000000000 +0300
++++ WordNet-2.1/configure.ac	2005-12-17 22:40:22.000000000 +0200
+@@ -12,6 +12,7 @@
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
++AC_PROG_LIBTOOL
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+--- WordNet-2.1/configure.ac~	2005-12-17 22:40:37.000000000 +0200
++++ WordNet-2.1/configure.ac	2005-12-17 22:41:01.000000000 +0200
+@@ -10,9 +10,8 @@
+ 
+ # Checks for programs.
+ AC_PROG_CC
+-AC_PROG_RANLIB
+-AC_PROG_INSTALL
+ AC_PROG_LIBTOOL
++AC_PROG_INSTALL
  
+ # Checks for header files.
+ AC_HEADER_STDC
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/WordNet-shared.patch?r1=1.1&r2=1.2&f=u


