locale_t is surprisingly used by locale.h, so pick a different name.

5 files changed, 78 insertions, 3 deletions

diff --git a/inputmethod/xcin/distinfo b/inputmethod/xcin/distinfo
index 582a9e086c0..84891cf160b 100644
--- a/inputmethod/xcin/distinfo
+++ b/inputmethod/xcin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2009/11/24 11:23:34 obache Exp $
+$NetBSD: distinfo,v 1.8 2013/04/30 22:23:07 joerg Exp $
 
 SHA1 (xcin-2.5.3.pre2.tar.gz) = 27e4c47e09c44e92e3a3afc9e08134e1485f6795
 RMD160 (xcin-2.5.3.pre2.tar.gz) = f1fb83d1e21a0f5dbb80c5eafdaa6c7f313ea865
@@ -12,4 +12,7 @@ SHA1 (patch-af) = 23dde43647de72fb6492a51016379db88f37cdd2
 SHA1 (patch-ag) = 009aff61710ad0da4492e366f35fa565b0abc32c
 SHA1 (patch-ah) = 0bc13a5e03157cc788228162d7f212d5741c29bf
 SHA1 (patch-ai) = 324cd99f69bd226846dc65f100c523c056fc13c6
-SHA1 (patch-aj) = 074e2893c3c06253034ce4d1e85679e71edd483e
+SHA1 (patch-aj) = d7b9adac4d08fcee744f80aaece059bdd96ab23c
+SHA1 (patch-src_include_xcintool.h) = 77a36ce6d4bd40433afad66813ab455e879997f3
+SHA1 (patch-src_xcin__main.c) = d19a256c60c93da4c9162e5f6d0b3fdbb7922138
+SHA1 (patch-src_xim.c) = 11bb79b228f9eda729f4f6a543efcdcf74538112
diff --git a/inputmethod/xcin/patches/patch-aj b/inputmethod/xcin/patches/patch-aj
index 0fd032fce96..0f77e5981a9 100644
--- a/inputmethod/xcin/patches/patch-aj
+++ b/inputmethod/xcin/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2009/11/24 11:23:34 obache Exp $
+$NetBSD: patch-aj,v 1.2 2013/04/30 22:23:07 joerg Exp $
 
 for process jyutping.cin.
 
@@ -19,3 +19,12 @@ for process jyutping.cin.
  	return 0;
  
      cmd[0] = '\0';
+@@ -233,7 +233,7 @@ print_usage(void)
+ }
+ 
+ static void
+-cin2tab_setlocale(locale_t *locale)
++cin2tab_setlocale(xcin_locale_t *locale)
+ {
+     char loc_return[128], enc_return[128];
+     int ret;
diff --git a/inputmethod/xcin/patches/patch-src_include_xcintool.h b/inputmethod/xcin/patches/patch-src_include_xcintool.h
new file mode 100644
index 00000000000..e190d93ad19
--- /dev/null
+++ b/inputmethod/xcin/patches/patch-src_include_xcintool.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_include_xcintool.h,v 1.1 2013/04/30 22:23:07 joerg Exp $
+
+--- src/include/xcintool.h.orig	2013-04-30 11:13:51.000000000 +0000
++++ src/include/xcintool.h
+@@ -202,12 +202,12 @@ typedef struct {
+     char *lc_messages;
+     char *encoding;
+     int encid, locid;
+-} locale_t;
++} xcin_locale_t;
+ 
+ typedef struct {
+     int argc;			/* Command line arguement list */
+     char **argv;
+-    locale_t locale;            /* Locale name. */
++    xcin_locale_t locale;            /* Locale name. */
+     char *usrhome;		/* User home directory. */
+     char *default_dir;          /* Default module directory. */
+     char *user_dir;             /* User data directory. */
diff --git a/inputmethod/xcin/patches/patch-src_xcin__main.c b/inputmethod/xcin/patches/patch-src_xcin__main.c
new file mode 100644
index 00000000000..6541e333864
--- /dev/null
+++ b/inputmethod/xcin/patches/patch-src_xcin__main.c
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_xcin__main.c,v 1.1 2013/04/30 22:23:07 joerg Exp $
+
+--- src/xcin_main.c.orig	2013-04-30 11:14:44.000000000 +0000
++++ src/xcin_main.c
+@@ -56,7 +56,7 @@ void xim_init(xccore_t *xccore);
+ static void
+ xcin_setlocale(void)
+ {
+-    locale_t *locale = &(xcin_core.xcin_rc.locale);
++    xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
+     char loc_return[128], enc_return[128];
+ 
+     set_perr("xcin");
+@@ -324,7 +324,7 @@ read_core_config_locale(void)
+     char *cmd[2], value[256], *s, loc_buf[64], *loc_name=NULL;
+     char *fmt = N_("%s:\n\tlocale section \"%s\": %s: value not specified.\n");
+     xcin_rc_t *xrc = &(xcin_core.xcin_rc);
+-    locale_t *locale = &(xcin_core.xcin_rc.locale);
++    xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
+ /*
+  *  Determine the true locale setting name.
+  */
+@@ -401,7 +401,7 @@ read_core_config_IM(void)
+     char *cmd[2], value[256], *s, *s1, objname[100], objenc[100];
+     char *fmt = N_("%s:\n\tIM section \"%s\": %s: value not specified.\n");
+     xcin_rc_t *xrc = &(xcin_core.xcin_rc);
+-    locale_t *locale = &(xcin_core.xcin_rc.locale);
++    xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
+     int setkey;
+ /*
+  *  Go to each CINPUT sub-node and read important keywords.
diff --git a/inputmethod/xcin/patches/patch-src_xim.c b/inputmethod/xcin/patches/patch-src_xim.c
new file mode 100644
index 00000000000..bc5e9cdb0c4
--- /dev/null
+++ b/inputmethod/xcin/patches/patch-src_xim.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_xim.c,v 1.1 2013/04/30 22:23:07 joerg Exp $
+
+--- src/xim.c.orig	2013-04-30 11:14:40.000000000 +0000
++++ src/xim.c
+@@ -1029,7 +1029,7 @@ xim_init(xccore_t *core)
+     XIMTriggerKeys on_keys;
+     XIMEncodings encodings;
+     Window mainwin;
+-    locale_t *locale;
++    xcin_locale_t *locale;
+     int i;
+ 
+     transport_type = TRANSPORT_X;