diff options
Diffstat (limited to 'inputmethod/kinput2')
| -rw-r--r-- | inputmethod/kinput2/Makefile | 9 | ||||
| -rw-r--r-- | inputmethod/kinput2/distinfo | 14 | ||||
| -rw-r--r-- | inputmethod/kinput2/options.mk | 4 | ||||
| -rw-r--r-- | inputmethod/kinput2/patches/patch-aa | 10 | ||||
| -rw-r--r-- | inputmethod/kinput2/patches/patch-ab | 4 | ||||
| -rw-r--r-- | inputmethod/kinput2/patches/patch-ac | 12 |
6 files changed, 27 insertions, 26 deletions
diff --git a/inputmethod/kinput2/Makefile b/inputmethod/kinput2/Makefile index fb566bc307c..7e6ee819023 100644 --- a/inputmethod/kinput2/Makefile +++ b/inputmethod/kinput2/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.18 2008/11/10 17:21:36 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2010/02/15 13:41:17 obache Exp $ -DISTNAME= kinput2-v3 -PKGNAME= kinput2-3.0 -PKGREVISION= 3 +DISTNAME= kinput2-v3.1 +PKGNAME= kinput2-3.1 CATEGORIES= japanese inputmethod -MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/version-3/ +MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/ MAINTAINER= tech-pkg-ja@jp.NetBSD.org COMMENT= Input server of Japanese text diff --git a/inputmethod/kinput2/distinfo b/inputmethod/kinput2/distinfo index cbd39d2e3c9..18bf1881dcb 100644 --- a/inputmethod/kinput2/distinfo +++ b/inputmethod/kinput2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2010/01/09 11:50:36 obache Exp $ +$NetBSD: distinfo,v 1.5 2010/02/15 13:41:17 obache Exp $ -SHA1 (kinput2-v3.tar.gz) = a9e2be1fe4da4c5f4921a1d753f58d20f1ef3693 -RMD160 (kinput2-v3.tar.gz) = 8c8a72a693edc52882be392ef91e7ad9a5c2a7e6 -Size (kinput2-v3.tar.gz) = 462281 bytes -SHA1 (patch-aa) = c41b2baa5de117c031c266afbff0e947340ab708 -SHA1 (patch-ab) = b2372ee1f50cc828eae4e8c6ca6d7bc6de11964b -SHA1 (patch-ac) = 318e4fd8404bc19080f6879a2895ba36aca89c15 +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-ab) = a084421f399e753f25040fd0cba6d43a391fc15b +SHA1 (patch-ac) = cd71af4a86102c1aedb84f64cda29ad5df2b7789 diff --git a/inputmethod/kinput2/options.mk b/inputmethod/kinput2/options.mk index a0e2600d293..ee3db7cf7b9 100644 --- a/inputmethod/kinput2/options.mk +++ b/inputmethod/kinput2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2005/12/01 18:58:39 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2010/02/15 13:41:17 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.kinput2 PKG_OPTIONS_NONEMPTY_SETS= inputmethod @@ -29,7 +29,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST-freewnn .endif .if !empty(PKG_OPTIONS:Msj3) -.include "../../inputmethod/sj3-lib/buildlink3.mk" +.include "../../inputmethod/sj3-client/buildlink3.mk" KINPUT2_DEFS+= -DUseSj3 KINPUT2_DEFS+= -Dport_SJ3SRC=${BUILDLINK_PREFIX.sj3-lib}/include KINPUT2_DEFS+= -Dport_SJ3LIB="${LDFLAGS} -lsj3lib" diff --git a/inputmethod/kinput2/patches/patch-aa b/inputmethod/kinput2/patches/patch-aa index c3189656c37..a8fa31c9a66 100644 --- a/inputmethod/kinput2/patches/patch-aa +++ b/inputmethod/kinput2/patches/patch-aa @@ -1,10 +1,12 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:26 seb Exp $ +$NetBSD: patch-aa,v 1.2 2010/02/15 13:41:18 obache Exp $ ---- include/wnnlib.h.orig Thu May 27 08:55:22 1999 -+++ include/wnnlib.h Fri Sep 3 09:34:09 1999 -@@ -29,4 +29,5 @@ +--- 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> diff --git a/inputmethod/kinput2/patches/patch-ab b/inputmethod/kinput2/patches/patch-ab index 026ead304f3..319772f011a 100644 --- a/inputmethod/kinput2/patches/patch-ab +++ b/inputmethod/kinput2/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.1 2004/09/18 07:59:57 uebayasi Exp $ +$NetBSD: patch-ab,v 1.2 2010/02/15 13:41:18 obache Exp $ ---- sj3def/Imakefile.orig 1999-05-27 08:55:31.000000000 +0900 +--- sj3def/Imakefile.orig 2002-10-03 09:35:31.000000000 +0000 +++ sj3def/Imakefile @@ -24,7 +24,7 @@ SjdefTarget(sjrc) SjdefTarget(sjrk) diff --git a/inputmethod/kinput2/patches/patch-ac b/inputmethod/kinput2/patches/patch-ac index bc0e2bcf5a1..2e77a1640e4 100644 --- a/inputmethod/kinput2/patches/patch-ac +++ b/inputmethod/kinput2/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.1 2010/01/09 11:50:36 obache Exp $ +$NetBSD: patch-ac,v 1.2 2010/02/15 13:41:18 obache Exp $ Avoid to conflict with getline(3) in IEEE Std 1003.1-2008. ---- lib/cconv.c.orig 1999-05-26 23:55:25.000000000 +0000 +--- lib/cconv.c.orig 2002-10-03 09:35:28.000000000 +0000 +++ lib/cconv.c -@@ -767,7 +767,7 @@ static wchar *promptsave(wchar *); +@@ -790,7 +790,7 @@ static wchar *promptsave(wchar *); static int parseLine(uchar *, uchar **, int); static FILE *openfile(char *); static int doinclude(uchar *, Files *, void (*)()); @@ -13,7 +13,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 *, -@@ -1012,8 +1012,8 @@ void (*efunc)(); +@@ -1035,8 +1035,8 @@ void (*efunc)(); return 0; } @@ -24,7 +24,7 @@ Avoid to conflict with getline(3) in IEEE Std 1003.1-2008. uchar *line; int linesize; Files *files; -@@ -1077,7 +1077,7 @@ char *file; +@@ -1100,7 +1100,7 @@ char *file; rule->nmode = 0; rule->initialmode = -1; @@ -33,7 +33,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; -@@ -1246,7 +1246,7 @@ uchar **av; +@@ -1269,7 +1269,7 @@ uchar **av; cdbuf.cdbuf = NULL; /* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */ |