* PKGREVISION = 2

* To compile with ja-freewnn-lib-1.11alpha22, small patches
  added for mainly with adding include directive:
  ---
  +#include <unistd.h>
  +#include <stdlib.h>
  +#include <stdio.h>
  +#include <string.h>
  ----
  the patches are listed below.
    patch-cmd_kinput2.c
    patch-lib_Canna.c
    patch-lib_ConvCtrl.c
    patch-lib_KIProto.c
    patch-lib_XimpProto.c
    patch-lib_ctext.c
    patch-lib_wnnlib.c

11 files changed, 189 insertions, 19 deletions

diff --git a/inputmethod/kinput2/Makefile b/inputmethod/kinput2/Makefile
index aadb5c6a67d..2aff591d4b9 100644
--- a/inputmethod/kinput2/Makefile
+++ b/inputmethod/kinput2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2010/07/11 02:58:16 obache Exp $
+# $NetBSD: Makefile,v 1.21 2011/09/13 07:28:48 mef Exp $
 
 DISTNAME=	kinput2-v3.1
 PKGNAME=	kinput2-3.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/x11/kinput2/
 
@@ -29,5 +29,6 @@ do-configure:
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/kinput2/distinfo b/inputmethod/kinput2/distinfo
index 18bf1881dcb..cb99c1dc3b1 100644
--- a/inputmethod/kinput2/distinfo
+++ b/inputmethod/kinput2/distinfo
@@ -1,8 +1,16 @@
-$NetBSD: distinfo,v 1.5 2010/02/15 13:41:17 obache Exp $
+$NetBSD: distinfo,v 1.6 2011/09/13 07:28:48 mef Exp $
 
 SHA1 (kinput2-v3.1.tar.gz) = 48050f70e7c0cc67193ea260f8d7f6e822a02ca3
 RMD160 (kinput2-v3.1.tar.gz) = c56684769859bbee5f8238cd1af061796ff931e8
 Size (kinput2-v3.1.tar.gz) = 512177 bytes
-SHA1 (patch-aa) = debe271517550c47610a7ac128432e6e567fb6d7
+SHA1 (patch-Imakefile) = 2ec731b5ff7ef4cac3497c60b179e0f1ce0a4a05
+SHA1 (patch-aa) = 3eaca25000c756d71fcafbb09a8ad8fd15142437
 SHA1 (patch-ab) = a084421f399e753f25040fd0cba6d43a391fc15b
-SHA1 (patch-ac) = cd71af4a86102c1aedb84f64cda29ad5df2b7789
+SHA1 (patch-ac) = 83d74ddffa6ddb870b3de1755a94e1258e06f793
+SHA1 (patch-cmd_kinput2.c) = 5f8bcada8ee247d536d6cbb1ac0404de4e55b90d
+SHA1 (patch-lib_Canna.c) = 75af9e02e84281c02c7d36bc237e6c05afbb8c80
+SHA1 (patch-lib_ConvCtrl.c) = bd5dcd286bf1f1ac8153a2f51c54930d4173de56
+SHA1 (patch-lib_KIProto.c) = 8545746a50b85986cd2a727667d30ca054860962
+SHA1 (patch-lib_XimpProto.c) = 9931af45d19aea41916b1cdec933d0fea34769a6
+SHA1 (patch-lib_ctext.c) = 97093817ebf73ddc1d9ddcfb068b0c96c93e1f8e
+SHA1 (patch-lib_wnnlib.c) = 0b5e66372294f27dcbaf0b4a53da50a739b362f3
diff --git a/inputmethod/kinput2/patches/patch-aa b/inputmethod/kinput2/patches/patch-aa
index a8fa31c9a66..a19f8d1c63d 100644
--- a/inputmethod/kinput2/patches/patch-aa
+++ b/inputmethod/kinput2/patches/patch-aa
@@ -1,12 +1,18 @@
-$NetBSD: patch-aa,v 1.2 2010/02/15 13:41:18 obache Exp $
+$NetBSD: patch-aa,v 1.3 2011/09/13 07:28:48 mef Exp $
 
 --- include/wnnlib.h.orig	2002-10-03 09:35:27.000000000 +0000
 +++ include/wnnlib.h
-@@ -28,6 +28,7 @@
- #ifndef _wnnlib_h
- #define _wnnlib_h
- 
-+#include	<config.h>
- #include	<commonhd.h>
- #include	<jllib.h>
- #include	<wnnerror.h>
+@@ -107,11 +107,11 @@ typedef struct {
+ #ifdef __STDC__
+ extern struct wnn_buf *jcOpen(char *server, char *envname,
+ 				int override, char *rcfile,
+-				void (*error)(), int (*confirm)(),
++				int (*error)(const char *), int (*confirm)(const char *),
+ 				int timeout);
+ extern struct wnn_buf *jcOpen2(char *server, char *envname,
+ 				int override, char *rcfile4, char *rcfile6,
+-				void (*error)(), int (*confirm)(),
++				int (*error)(const char *), int (*confirm)(const char *),
+ 				int timeout);
+ extern int jcClose(struct wnn_buf *wnn);
+ extern int jcIsConnect(struct wnn_buf *wnn);
diff --git a/inputmethod/kinput2/patches/patch-ac b/inputmethod/kinput2/patches/patch-ac
index 2e77a1640e4..662d781018b 100644
--- a/inputmethod/kinput2/patches/patch-ac
+++ b/inputmethod/kinput2/patches/patch-ac
@@ -1,10 +1,18 @@
-$NetBSD: patch-ac,v 1.2 2010/02/15 13:41:18 obache Exp $
+$NetBSD: patch-ac,v 1.3 2011/09/13 07:28:48 mef Exp $
 
 Avoid to conflict with getline(3) in IEEE Std 1003.1-2008.
 
 --- lib/cconv.c.orig	2002-10-03 09:35:28.000000000 +0000
 +++ lib/cconv.c
-@@ -790,7 +790,7 @@ static wchar *promptsave(wchar *);
+@@ -604,6 +604,7 @@ static char	*rcsid = "$Id: cconv.c,v 10.
+ #endif
+ 
+ #include	<stdio.h>
++#include	<stdlib.h>
+ #include	<X11/Xlib.h>
+ #include	<X11/keysym.h>
+ #include	<X11/Xutil.h>
+@@ -790,7 +791,7 @@ static wchar *promptsave(wchar *);
  static int parseLine(uchar *, uchar **, int);
  static FILE *openfile(char *);
  static int doinclude(uchar *, Files *, void (*)());
@@ -13,7 +21,7 @@ Avoid to conflict with getline(3) in IEEE Std 1003.1-2008.
  static int readRuleFile(ccRule, char *);
  static int registMode(ccRule, int, uchar **);
  static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *,
-@@ -1035,8 +1035,8 @@ void (*efunc)();
+@@ -1035,8 +1036,8 @@ void (*efunc)();
  	return 0;
  }
  
@@ -24,7 +32,7 @@ Avoid to conflict with getline(3) in IEEE Std 1003.1-2008.
  uchar *line;
  int linesize;
  Files *files;
-@@ -1100,7 +1100,7 @@ char *file;
+@@ -1100,7 +1101,7 @@ char *file;
  	rule->nmode = 0;
  	rule->initialmode = -1;
  
@@ -33,7 +41,7 @@ Avoid to conflict with getline(3) in IEEE Std 1003.1-2008.
  		(void)Strcpy(tmp, line);
  		if ((argc = parseLine(tmp, argv, 20)) == 0)
  			continue;
-@@ -1269,7 +1269,7 @@ uchar **av;
+@@ -1269,7 +1270,7 @@ uchar **av;
  	cdbuf.cdbuf = NULL;
  
  	/* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */
@@ -42,3 +50,12 @@ Avoid to conflict with getline(3) in IEEE Std 1003.1-2008.
  		/* '#' $B$G;O$^$k9T$O%3%a%s%H(B */
  		if (*line == '\0' || *line == '\n' || *line == '#')
  			continue;
+@@ -1282,7 +1283,7 @@ uchar **av;
+ 			}
+ 
+ 			/* $B%k!<%k$N%9%H%"(B */
+-			cdp->key = inkey;
++			cdp->key = (ulong *) inkey;
+ 			cdp->mask = modmask;
+ 			cdp->context = *context ? wstrsave(srec, wrev(context)) : 0;
+ 			cdp->result = *result ? wstrsave(srec, result) : 0;
diff --git a/inputmethod/kinput2/patches/patch-cmd_kinput2.c b/inputmethod/kinput2/patches/patch-cmd_kinput2.c
new file mode 100644
index 00000000000..2f8b7a08514
--- /dev/null
+++ b/inputmethod/kinput2/patches/patch-cmd_kinput2.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-cmd_kinput2.c,v 1.1 2011/09/13 07:28:48 mef Exp $
+
+To compile with ja-freewnn-lib-1.11alpah22
+
+--- cmd/kinput2.c.orig	2002-10-03 09:35:26.000000000 +0000
++++ cmd/kinput2.c
+@@ -26,6 +26,8 @@ static char	*rcsid = "$Id: kinput2.c,v 1
+ 
+ #include <stdio.h>
+ #include <signal.h>
++#include <unistd.h>
++#include <stdlib.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Shell.h>
diff --git a/inputmethod/kinput2/patches/patch-lib_Canna.c b/inputmethod/kinput2/patches/patch-lib_Canna.c
new file mode 100644
index 00000000000..1e3793f4851
--- /dev/null
+++ b/inputmethod/kinput2/patches/patch-lib_Canna.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_Canna.c,v 1.1 2011/09/13 07:28:48 mef Exp $
+
+To compile with ja-freewnn-lib-1.11alpah22
+
+--- lib/Canna.c.orig	2002-10-03 09:35:27.000000000 +0000
++++ lib/Canna.c
+@@ -58,6 +58,7 @@ static char *rcsid = "$Id: Canna.c,v 1.5
+ #if XtSpecificationRelease > 4
+ #include <X11/Xfuncs.h>
+ #endif
++#include <stdlib.h>
+ #include "CannaP.h"
+ #include "DebugPrint.h"
+ 
diff --git a/inputmethod/kinput2/patches/patch-lib_ConvCtrl.c b/inputmethod/kinput2/patches/patch-lib_ConvCtrl.c
new file mode 100644
index 00000000000..ae91236c551
--- /dev/null
+++ b/inputmethod/kinput2/patches/patch-lib_ConvCtrl.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_ConvCtrl.c,v 1.1 2011/09/13 07:28:48 mef Exp $
+
+To compile with ja-freewnn-lib-1.11alpah22
+
+--- lib/ConvCtrl.c.orig	2002-10-03 09:35:27.000000000 +0000
++++ lib/ConvCtrl.c
+@@ -21,6 +21,7 @@ static char *rcsid = "$Id: ConvCtrl.c,v 
+ #include <X11/IntrinsicP.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Xmu/CharSet.h>
++#include <stdio.h>
+ #include "ConvCtrlP.h"
+ #include "InputConv.h"
+ #include "ConvDisp.h"
diff --git a/inputmethod/kinput2/patches/patch-lib_KIProto.c b/inputmethod/kinput2/patches/patch-lib_KIProto.c
new file mode 100644
index 00000000000..55b6885c52b
--- /dev/null
+++ b/inputmethod/kinput2/patches/patch-lib_KIProto.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_KIProto.c,v 1.1 2011/09/13 07:28:48 mef Exp $
+
+To compile with ja-freewnn-lib-1.11alpah22
+
+--- lib/KIProto.c.orig	2002-10-03 09:35:28.000000000 +0000
++++ lib/KIProto.c
+@@ -23,6 +23,7 @@ static char *rcsid = "$Id: KIProto.c,v 1
+ #include <X11/Xatom.h>
+ #include <X11/Xmu/Atoms.h>
+ #include <X11/Xmu/CharSet.h>
++#include <stdio.h>
+ #include "KIProtoP.h"
+ #include "ConvMgr.h"
+ #include "OverConv.h"
diff --git a/inputmethod/kinput2/patches/patch-lib_XimpProto.c b/inputmethod/kinput2/patches/patch-lib_XimpProto.c
new file mode 100644
index 00000000000..b3b29f21173
--- /dev/null
+++ b/inputmethod/kinput2/patches/patch-lib_XimpProto.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_XimpProto.c,v 1.1 2011/09/13 07:28:48 mef Exp $
+
+To compile with ja-freewnn-lib-1.11alpah22
+
+--- lib/XimpProto.c.orig	2002-10-03 09:35:28.000000000 +0000
++++ lib/XimpProto.c
+@@ -28,6 +28,7 @@ static char *rcsid = "$Id: XimpProto.c,v
+ #include <X11/Xatom.h>
+ #include <X11/Xmu/Atoms.h>
+ #include <X11/Xmu/CharSet.h>
++#include <stdio.h>
+ #include "XIMProto.h"
+ #include "XimpProtoP.h"
+ #include "ConvMgr.h"
diff --git a/inputmethod/kinput2/patches/patch-lib_ctext.c b/inputmethod/kinput2/patches/patch-lib_ctext.c
new file mode 100644
index 00000000000..48d2681c392
--- /dev/null
+++ b/inputmethod/kinput2/patches/patch-lib_ctext.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_ctext.c,v 1.1 2011/09/13 07:28:48 mef Exp $
+
+To compile with ja-freewnn-lib-1.11alpah22
+
+--- lib/ctext.c.orig	2002-10-03 09:35:28.000000000 +0000
++++ lib/ctext.c
+@@ -72,4 +72,6 @@ static char *rcsid = "$Id: ctext.c,v 2.6
+ #endif
+ 
++#include <string.h>
++
+ typedef unsigned short	wchar;
+ 
diff --git a/inputmethod/kinput2/patches/patch-lib_wnnlib.c b/inputmethod/kinput2/patches/patch-lib_wnnlib.c
new file mode 100644
index 00000000000..31a5b968c06
--- /dev/null
+++ b/inputmethod/kinput2/patches/patch-lib_wnnlib.c
@@ -0,0 +1,54 @@
+$NetBSD: patch-lib_wnnlib.c,v 1.1 2011/09/13 07:28:48 mef Exp $
+
+To compile with ja-freewnn-lib-1.11alpah22
+
+--- lib/wnnlib.c.orig	2002-10-03 18:35:28.000000000 +0900
++++ lib/wnnlib.c	2011-05-08 23:37:11.000000000 +0900
+@@ -282,7 +282,7 @@
+  *
+  * struct wnn_buf jcOpen(char *servername, char *envname,
+  *			 char *rcfilename, int override,
+- *			 void (*errmsgfunc)(), int (*confirmfunc)(),
++ *			 int (*errmsgfunc)(const char *), int (*confirmfunc)(const char *),
+  *			 int timeout)
+  *	jl_open $B$"$k$$$O(B jl_open_lang $B$KBP1~$7$?(B wnnlib $B$N%$%s%?%U%'!<(B
+  *	$B%9$G!"$3$N4X?t$NCf$G<B:]$K(B jl_open $B$"$k$$$O(B jl_open_lang $B$r8F(B
+@@ -581,6 +581,7 @@
+ #include	"wnnlib.h"
+ #include	"WStr.h"
+ #include	<string.h>
++#include	<stdlib.h>
+ #include	<pwd.h>
+ #include	<X11/Xos.h>
+ 
+@@ -1367,7 +1368,7 @@
+ 
+ 	/* $BJQ49J8;zNs$ND9$5$N%A%'%C%/(B */
+ 	clp = buf->clauseInfo + cl;
+-	len = jl_kanji_len(buf->wnn, cl);
++	len = jl_kanji_len(buf->wnn, cl, -1);
+ 	diff = len - ((clp + 1)->dispp - clp->dispp);
+ 	newlen = (buf->displayEnd - buf->displayBuf) + diff;
+ 	if (newlen > buf->bufferSize) {
+@@ -3449,8 +3450,8 @@
+ char *envname;
+ int override;
+ char *rcfile;
+-void (*errmsg)();
+-int (*confirm)();
++int (*errmsg)(const char *);
++int (*confirm)(const char *);
+ int timeout;
+ {
+     return jcOpen2(server, envname, override, rcfile, rcfile, errmsg, confirm, timeout);
+@@ -3463,8 +3464,8 @@
+ int override;
+ char *rcfile4;		/* wnnenvrc for Wnn4 */
+ char *rcfile6;		/* wnnenvrc for Wnn6 */
+-void (*errmsg)();
+-int (*confirm)();
++int (*errmsg)(const char *);
++int (*confirm)(const char *);
+ int timeout;
+ {
+     struct wnn_buf *wnnbuf;