(1) {chinese,korean,japanese}/Wnn (Wnn 4.2) was updated as follows:

  (a) Its name was changed from Wnn to FreeWnn because Wnn6 which is a
      commercial software exits
  (b) Its license was changed to GPL.
  (c) The method to configure was changed from imake to GNU configure.
  (d) Relatively to the original Wnn, the Wnn in the ports tree were
      modified by me a lot. Most of the modifications were adopted
      into FreeWnn.
  (c) Header and library files are installed into
      ${LOCALBASE}/{lib,include} instead of ${X11BASE}/{lib,include}.

(2) FreeWnn is divided into two ports FreeWnn-lib and FreeWnn-server
in chinese, korean and japanese categories. The former is for libwnn
and header files to compile client commands, and the files used in
client commands.  The latter is for a server to convert KANA to KANJI
(Chinese character), and dictionaries and files used by the server.

Notice: I forgot to commit FreeWnn-{lib,server} (^_^;;

1 files changed, 80 insertions, 26 deletions

diff --git a/japanese/FreeWnn-lib/files/patch-aq b/japanese/FreeWnn-lib/files/patch-aq
index d476242347bd..c50f5ac01581 100644
--- a/japanese/FreeWnn-lib/files/patch-aq
+++ b/japanese/FreeWnn-lib/files/patch-aq
@@ -1,26 +1,80 @@
---- Xwnmo/xwnmo/localalloc.c.~1~	Tue Dec  1 15:10:40 1992
-+++ Xwnmo/xwnmo/localalloc.c	Thu Jun 25 12:11:29 1998
-@@ -112,6 +112,7 @@
- {
-     char *ptr;
-     if (size == 0) return(NULL);
-+    size += (sizeof(char *)-(size%sizeof(char *)));
-     if ((ptr = malloc(size)) == NULL) {
- #ifdef ALLOC_DEBUG
- 	print_out1("alloc failed with size = %d", size);
-@@ -134,6 +135,7 @@
- unsigned size;
- {
-     if (size == 0) return(ptr);
-+    size += (sizeof(char *)-(size%sizeof(char *)));
-     if (ptr == NULL) return(Malloc(size));
- #ifdef ALLOC_DEBUG
-     unregister_debug(ptr);
-@@ -153,6 +155,7 @@
- {
-     char *ptr;
-     if (size == 0) return(NULL);
-+    size += (sizeof(char *)-(size%sizeof(char *)));
-     if ((ptr = calloc(num, size)) == NULL) {
- 	return(NULL);
-     }
+--- Wnn/jlib.V3/Makefile.in.orig	Fri Jan 21 01:00:28 2000
++++ Wnn/jlib.V3/Makefile.in	Fri Sep  1 10:21:03 2000
+@@ -51,8 +51,24 @@
+ OBJ3= sstrings.o
+ SRC4= $(WNNETCSRC)/xutoj.c
+ OBJ4= xutoj.o
++LOCAL_RKSRCS= $(WNNROMKANSRC)/rk_bltinfn.c 	$(WNNROMKANSRC)/rk_main.c 	$(WNNROMKANSRC)/rk_modread.c 	$(WNNROMKANSRC)/rk_read.c 	$(WNNROMKANSRC)/rk_vars.c
++
++LOCAL_RKOBJS= $(WNNROMKANSRC)/rk_bltinfn.o 	$(WNNROMKANSRC)/rk_main.o 	$(WNNROMKANSRC)/rk_modread.o 	$(WNNROMKANSRC)/rk_read.o 	$(WNNROMKANSRC)/rk_vars.o
++
++LOCAL_ETCSRCS= $(WNNETCSRC)/msg.c $(WNNETCSRC)/yincoding.c $(WNNETCSRC)/py_table.c $(WNNETCSRC)/zy_table.c $(WNNETCSRC)/strings.c $(WNNETCSRC)/bcopy.c $(WNNETCSRC)/mkdir.c
++
++LOCAL_ETCOBJS= $(WNNJLIBSRC)/msg.o $(WNNJLIBSRC)/yincoding.o $(WNNJLIBSRC)/py_table.o $(WNNJLIBSRC)/zy_table.o $(WNNJLIBSRC)/strings.o $(WNNJLIBSRC)/bcopy.o $(WNNJLIBSRC)/mkdir.o
++
++LOCAL_JLIBSRCS= $(WNNJLIBSRC)/js.c $(WNNJLIBSRC)/wnnerrmsg.c $(WNNJLIBSRC)/jl.c $(WNNJLIBSRC)/getopt.c
++
++LOCAL_JLIBOBJS= $(WNNJLIBSRC)/js.o $(WNNJLIBSRC)/wnnerrmsg.o $(WNNJLIBSRC)/jl.o $(WNNJLIBSRC)/getopt.o
++
+ SRCS= $(SRC1) $(SRC2) $(SRC3) $(SRC4)
+-OBJS= $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4)
++OBJS= $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS) $(LOCAL_JLIBOBJS)
++
++clean::
++	$(RM) -r .libs
++	$(RM) *.lo *.la
+ 
+ all::
+ 
+@@ -60,16 +76,12 @@
+ 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
+-
+-clean::
++	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
+ 
+-all:: libjd.a
++all:: libjd.la
+ 
+-libjd.a: $(OBJS) $(WNNJLIB)
+-	cp $(WNNJLIB) $@
+-	ar rv $@ $(OBJS)
+-	$(RANLIB) $@
++libjd.la: $(OBJS) $(EXTRALIBRARYDEPS)
++	$(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(DESTDIR)$(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
+ 
+ lintlib:: llib-ljd.ln
+ 
+@@ -77,11 +89,10 @@
+ 	$(RM) $@
+ 	$(LINT) $(LINTLIBFLAG)jd $(LINTFLAGS) $(SRCS)
+ 
+-install:: libjd.a
++install:: libjd.la
+ 	@if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
+ 	else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
+-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libjd.a $(DESTDIR)$(WNNLIBDIR)
+-	$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libjd.a
++	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libjd.la $(DESTDIR)$(WNNLIBDIR)
+ 
+ install:: jlib.h
+ 	@if [ -d $(DESTDIR)$(JWNNINCDIR) ]; then set +x; \
+@@ -104,13 +115,13 @@
+ 	done
+ 
+ $(OBJ2) : $(SRC2)
+-	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ3) : $(SRC3)
+-	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ4) : $(SRC4)
+-	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
+ 
+ depend:: .depend
+