Mon Feb 15 13:41:18 2010 UTC ()
Update kinput2 to 3.1.

Major changes from version 3.0 to 3.1:

* Kinput2 now supports ATOK.  The source code is kindly contributed
  by Justsystem Corporation.  Thanks!
  To compile for Atok, define symbol `UseAtok' in Kinput2.conf.

* Minimum support of Wnn7 is implemented.

* Two IC attributes, XNPreeditState and XNResetState both of which
  are introduced by X11R6, are supported.

* Kinput2's `egg'-emulation is improved.

* A workaround for bugs in some Xlib implementations has been added.

* Previously, when kinput2 cannot connect to jserver, kinput2 seems
  to be frozen (actually it keeps retrying).  Now kinput2 beeps and
  ends conversion in such a case.  The next time you start conversion,
  it tries to connect again.


(obache)
diff -r1.18 -r1.19 pkgsrc/inputmethod/kinput2/Makefile
diff -r1.4 -r1.5 pkgsrc/inputmethod/kinput2/distinfo
diff -r1.1 -r1.2 pkgsrc/inputmethod/kinput2/options.mk
diff -r1.1 -r1.2 pkgsrc/inputmethod/kinput2/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/inputmethod/kinput2/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/inputmethod/kinput2/patches/patch-ac
cvs diff -r1.18 -r1.19 pkgsrc/inputmethod/kinput2/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/kinput2/Makefile 2008/11/10 17:21:36 1.18
+++ pkgsrc/inputmethod/kinput2/Makefile 2010/02/15 13:41:17 1.19
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.18 2008/11/10 17:21:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2010/02/15 13:41:17 obache Exp $
2 2
3DISTNAME= kinput2-v3 3DISTNAME= kinput2-v3.1
4PKGNAME= kinput2-3.0 4PKGNAME= kinput2-3.1
5PKGREVISION= 3 
6CATEGORIES= japanese inputmethod 5CATEGORIES= japanese inputmethod
7MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/version-3/ 6MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/
8 7
9MAINTAINER= tech-pkg-ja@jp.NetBSD.org 8MAINTAINER= tech-pkg-ja@jp.NetBSD.org
10COMMENT= Input server of Japanese text 9COMMENT= Input server of Japanese text
11 10
12PKG_DESTDIR_SUPPORT= user-destdir 11PKG_DESTDIR_SUPPORT= user-destdir
13 12
14MAKE_JOBS_SAFE= NO 13MAKE_JOBS_SAFE= NO
15USE_IMAKE= YES 14USE_IMAKE= YES
16 15
17PLIST_SRC= ${PKGDIR}/PLIST-common 16PLIST_SRC= ${PKGDIR}/PLIST-common
18 17
19.include "options.mk" 18.include "options.mk"
20 19
cvs diff -r1.4 -r1.5 pkgsrc/inputmethod/kinput2/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/kinput2/distinfo 2010/01/09 11:50:36 1.4
+++ pkgsrc/inputmethod/kinput2/distinfo 2010/02/15 13:41:17 1.5
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.4 2010/01/09 11:50:36 obache Exp $ 1$NetBSD: distinfo,v 1.5 2010/02/15 13:41:17 obache Exp $
2 2
3SHA1 (kinput2-v3.tar.gz) = a9e2be1fe4da4c5f4921a1d753f58d20f1ef3693 3SHA1 (kinput2-v3.1.tar.gz) = 48050f70e7c0cc67193ea260f8d7f6e822a02ca3
4RMD160 (kinput2-v3.tar.gz) = 8c8a72a693edc52882be392ef91e7ad9a5c2a7e6 4RMD160 (kinput2-v3.1.tar.gz) = c56684769859bbee5f8238cd1af061796ff931e8
5Size (kinput2-v3.tar.gz) = 462281 bytes 5Size (kinput2-v3.1.tar.gz) = 512177 bytes
6SHA1 (patch-aa) = c41b2baa5de117c031c266afbff0e947340ab708 6SHA1 (patch-aa) = debe271517550c47610a7ac128432e6e567fb6d7
7SHA1 (patch-ab) = b2372ee1f50cc828eae4e8c6ca6d7bc6de11964b 7SHA1 (patch-ab) = a084421f399e753f25040fd0cba6d43a391fc15b
8SHA1 (patch-ac) = 318e4fd8404bc19080f6879a2895ba36aca89c15 8SHA1 (patch-ac) = cd71af4a86102c1aedb84f64cda29ad5df2b7789
cvs diff -r1.1 -r1.2 pkgsrc/inputmethod/kinput2/options.mk (expand / switch to unified diff)

--- pkgsrc/inputmethod/kinput2/options.mk 2005/12/01 18:58:39 1.1
+++ pkgsrc/inputmethod/kinput2/options.mk 2010/02/15 13:41:17 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.1 2005/12/01 18:58:39 wiz Exp $ 1# $NetBSD: options.mk,v 1.2 2010/02/15 13:41:17 obache Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.kinput2 3PKG_OPTIONS_VAR= PKG_OPTIONS.kinput2
4PKG_OPTIONS_NONEMPTY_SETS= inputmethod 4PKG_OPTIONS_NONEMPTY_SETS= inputmethod
5PKG_OPTIONS_SET.inputmethod= canna wnn4 sj3 5PKG_OPTIONS_SET.inputmethod= canna wnn4 sj3
6PKG_SUGGESTED_OPTIONS= canna wnn4 sj3 6PKG_SUGGESTED_OPTIONS= canna wnn4 sj3
7#PKG_OPTIONS_SET.inputmethod+= wnn6 7#PKG_OPTIONS_SET.inputmethod+= wnn6
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11.if !empty(PKG_OPTIONS:Mcanna) 11.if !empty(PKG_OPTIONS:Mcanna)
12.include "../../inputmethod/canna-lib/buildlink3.mk" 12.include "../../inputmethod/canna-lib/buildlink3.mk"
13KINPUT2_DEFS+= -DUseCanna 13KINPUT2_DEFS+= -DUseCanna
14KINPUT2_DEFS+= -Dport_CANNASRC=${BUILDLINK_PREFIX.Canna-lib}/include 14KINPUT2_DEFS+= -Dport_CANNASRC=${BUILDLINK_PREFIX.Canna-lib}/include
@@ -19,19 +19,19 @@ KINPUT2_DEFS+= -Dport_CANNALIB="${LDFLAG @@ -19,19 +19,19 @@ KINPUT2_DEFS+= -Dport_CANNALIB="${LDFLAG
19#DEPENDS+= 19#DEPENDS+=
20#KINPUT2_DEFS+= -DUseWnn -DUseWnn6 -Dport_WNNINCDIR=${LOCALBASE}/include/wnn \ 20#KINPUT2_DEFS+= -DUseWnn -DUseWnn6 -Dport_WNNINCDIR=${LOCALBASE}/include/wnn \
21# -Dport_WNNLIB="${LDFLAGS} -lwnn6 -lcrypt" 21# -Dport_WNNLIB="${LDFLAGS} -lwnn6 -lcrypt"
22#.elif !empty(PKG_OPTIONS:Mwnn4) 22#.elif !empty(PKG_OPTIONS:Mwnn4)
23.if !empty(PKG_OPTIONS:Mwnn4) 23.if !empty(PKG_OPTIONS:Mwnn4)
24.include "../../inputmethod/ja-freewnn-lib/buildlink3.mk" 24.include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
25KINPUT2_DEFS+= -DUseWnn 25KINPUT2_DEFS+= -DUseWnn
26KINPUT2_DEFS+= -Dport_WNNINCDIR=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn 26KINPUT2_DEFS+= -Dport_WNNINCDIR=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn
27KINPUT2_DEFS+= -Dport_WNNLIB="${LDFLAGS} -lwnn -lcrypt" 27KINPUT2_DEFS+= -Dport_WNNLIB="${LDFLAGS} -lwnn -lcrypt"
28PLIST_SRC+= ${PKGDIR}/PLIST-freewnn 28PLIST_SRC+= ${PKGDIR}/PLIST-freewnn
29.endif 29.endif
30 30
31.if !empty(PKG_OPTIONS:Msj3) 31.if !empty(PKG_OPTIONS:Msj3)
32.include "../../inputmethod/sj3-lib/buildlink3.mk" 32.include "../../inputmethod/sj3-client/buildlink3.mk"
33KINPUT2_DEFS+= -DUseSj3 33KINPUT2_DEFS+= -DUseSj3
34KINPUT2_DEFS+= -Dport_SJ3SRC=${BUILDLINK_PREFIX.sj3-lib}/include 34KINPUT2_DEFS+= -Dport_SJ3SRC=${BUILDLINK_PREFIX.sj3-lib}/include
35KINPUT2_DEFS+= -Dport_SJ3LIB="${LDFLAGS} -lsj3lib" 35KINPUT2_DEFS+= -Dport_SJ3LIB="${LDFLAGS} -lsj3lib"
36PLIST_SRC+= ${PKGDIR}/PLIST-sj3 36PLIST_SRC+= ${PKGDIR}/PLIST-sj3
37.endif 37.endif
cvs diff -r1.1 -r1.2 pkgsrc/inputmethod/kinput2/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/inputmethod/kinput2/patches/patch-aa 2002/05/31 13:01:26 1.1
+++ pkgsrc/inputmethod/kinput2/patches/patch-aa 2010/02/15 13:41:18 1.2
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1$NetBSD: patch-aa,v 1.1 2002/05/31 13:01:26 seb Exp $ 1$NetBSD: patch-aa,v 1.2 2010/02/15 13:41:18 obache Exp $
2 2
3--- include/wnnlib.h.orig Thu May 27 08:55:22 1999 3--- include/wnnlib.h.orig 2002-10-03 09:35:27.000000000 +0000
4+++ include/wnnlib.h Fri Sep 3 09:34:09 1999 4+++ include/wnnlib.h
5@@ -29,4 +29,5 @@ 5@@ -28,6 +28,7 @@
 6 #ifndef _wnnlib_h
6 #define _wnnlib_h 7 #define _wnnlib_h
7  8
8+#include <config.h> 9+#include <config.h>
9 #include <commonhd.h> 10 #include <commonhd.h>
10 #include <jllib.h> 11 #include <jllib.h>
 12 #include <wnnerror.h>
cvs diff -r1.1 -r1.2 pkgsrc/inputmethod/kinput2/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/inputmethod/kinput2/patches/patch-ab 2004/09/18 07:59:57 1.1
+++ pkgsrc/inputmethod/kinput2/patches/patch-ab 2010/02/15 13:41:18 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ab,v 1.1 2004/09/18 07:59:57 uebayasi Exp $ 1$NetBSD: patch-ab,v 1.2 2010/02/15 13:41:18 obache Exp $
2 2
3--- sj3def/Imakefile.orig 1999-05-27 08:55:31.000000000 +0900 3--- sj3def/Imakefile.orig 2002-10-03 09:35:31.000000000 +0000
4+++ sj3def/Imakefile 4+++ sj3def/Imakefile
5@@ -24,7 +24,7 @@ SjdefTarget(sjrc) 5@@ -24,7 +24,7 @@ SjdefTarget(sjrc)
6 SjdefTarget(sjrk) 6 SjdefTarget(sjrk)
7 SjdefTarget(sjsb) 7 SjdefTarget(sjsb)
8 SjdefTarget(sjzh) 8 SjdefTarget(sjzh)
9-SingleProgramTarget(jcode,$(OBJS),$(XLIB),) 9-SingleProgramTarget(jcode,$(OBJS),$(XLIB),)
10+SingleProgramTarget(jcode,$(OBJS),$(SJ3LIB),) 10+SingleProgramTarget(jcode,$(OBJS),$(SJ3LIB),)
11 MakeDirectories(install,$(SJ3DEF_DIR)) 11 MakeDirectories(install,$(SJ3DEF_DIR))
12 InstallMultipleFlags($(SJ3DEF_FILES),$(SJ3DEF_DIR),$(INSTDATFLAGS)) 12 InstallMultipleFlags($(SJ3DEF_FILES),$(SJ3DEF_DIR),$(INSTDATFLAGS))
13  13
cvs diff -r1.1 -r1.2 pkgsrc/inputmethod/kinput2/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/inputmethod/kinput2/patches/patch-ac 2010/01/09 11:50:36 1.1
+++ pkgsrc/inputmethod/kinput2/patches/patch-ac 2010/02/15 13:41:18 1.2
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1$NetBSD: patch-ac,v 1.1 2010/01/09 11:50:36 obache Exp $ 1$NetBSD: patch-ac,v 1.2 2010/02/15 13:41:18 obache Exp $
2 2
3Avoid to conflict with getline(3) in IEEE Std 1003.1-2008. 3Avoid to conflict with getline(3) in IEEE Std 1003.1-2008.
4 4
5--- lib/cconv.c.orig 1999-05-26 23:55:25.000000000 +0000 5--- lib/cconv.c.orig 2002-10-03 09:35:28.000000000 +0000
6+++ lib/cconv.c 6+++ lib/cconv.c
7@@ -767,7 +767,7 @@ static wchar *promptsave(wchar *); 7@@ -790,7 +790,7 @@ static wchar *promptsave(wchar *);
8 static int parseLine(uchar *, uchar **, int); 8 static int parseLine(uchar *, uchar **, int);
9 static FILE *openfile(char *); 9 static FILE *openfile(char *);
10 static int doinclude(uchar *, Files *, void (*)()); 10 static int doinclude(uchar *, Files *, void (*)());
11-static uchar *getline(uchar *, int, Files *, void (*)()); 11-static uchar *getline(uchar *, int, Files *, void (*)());
12+static uchar *get_line(uchar *, int, Files *, void (*)()); 12+static uchar *get_line(uchar *, int, Files *, void (*)());
13 static int readRuleFile(ccRule, char *); 13 static int readRuleFile(ccRule, char *);
14 static int registMode(ccRule, int, uchar **); 14 static int registMode(ccRule, int, uchar **);
15 static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *, 15 static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *,
16@@ -1012,8 +1012,8 @@ void (*efunc)(); 16@@ -1035,8 +1035,8 @@ void (*efunc)();
17 return 0; 17 return 0;
18 } 18 }
19  19
20-/* getline -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */ 20-/* getline -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
21-static uchar *getline(line, linesize, files, efunc) 21-static uchar *getline(line, linesize, files, efunc)
22+/* get_line -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */ 22+/* get_line -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
23+static uchar *get_line(line, linesize, files, efunc) 23+static uchar *get_line(line, linesize, files, efunc)
24 uchar *line; 24 uchar *line;
25 int linesize; 25 int linesize;
26 Files *files; 26 Files *files;
27@@ -1077,7 +1077,7 @@ char *file; 27@@ -1100,7 +1100,7 @@ char *file;
28 rule->nmode = 0; 28 rule->nmode = 0;
29 rule->initialmode = -1; 29 rule->initialmode = -1;
30  30
31- while (getline(line, sizeof(line), &files, efunc)) { 31- while (getline(line, sizeof(line), &files, efunc)) {
32+ while (get_line(line, sizeof(line), &files, efunc)) { 32+ while (get_line(line, sizeof(line), &files, efunc)) {
33 (void)Strcpy(tmp, line); 33 (void)Strcpy(tmp, line);
34 if ((argc = parseLine(tmp, argv, 20)) == 0) 34 if ((argc = parseLine(tmp, argv, 20)) == 0)
35 continue; 35 continue;
36@@ -1246,7 +1246,7 @@ uchar **av; 36@@ -1269,7 +1269,7 @@ uchar **av;
37 cdbuf.cdbuf = NULL; 37 cdbuf.cdbuf = NULL;
38  38
39 /* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */ 39 /* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */
40- while (getline(line, sizeof(line), files, efunc)) { 40- while (getline(line, sizeof(line), files, efunc)) {
41+ while (get_line(line, sizeof(line), files, efunc)) { 41+ while (get_line(line, sizeof(line), files, efunc)) {
42 /* '#' $B$G;O$^$k9T$O%3%a%s%H(B */ 42 /* '#' $B$G;O$^$k9T$O%3%a%s%H(B */
43 if (*line == '\0' || *line == '\n' || *line == '#') 43 if (*line == '\0' || *line == '\n' || *line == '#')
44 continue; 44 continue;