From 1026149f5aece43e945e2f028eb22237ca0f3822 Mon Sep 17 00:00:00 2001
From: roy <roy>
Date: Wed, 7 Dec 2011 16:05:59 +0000
Subject: [PATCH] --- yaml --- r: 1389569 b:
 refs/heads/joyent/feature/dash/trunk c:
 4396f06eefd1d13c2a6768d903da071c28ec4793 h: refs/heads/trunk i:   1389567:
 d111af600e75607c46a8862659e6b6801c191183

---
 [refs]                                        |  2 +-
 .../dash/trunk/inputmethod/canna/distinfo     |  5 ++--
 .../trunk/inputmethod/canna/patches/patch-an  | 11 ++++++-
 .../trunk/inputmethod/canna/patches/patch-ap  | 30 +++++++++++++++++++
 4 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 branches/joyent/feature/dash/trunk/inputmethod/canna/patches/patch-ap

diff --git a/[refs] b/[refs]
index 8c53223828444..01ca609b188b7 100644
--- a/[refs]
+++ b/[refs]
@@ -16,7 +16,7 @@ refs/heads/joyent/feature/backports/2014Q4: 3232a64a5168ce852618c5f73f53cd7e3882
 "refs/heads/pkgsrc_2014Q3": 99948a6fafef34026404ddbbe23c1d65973ab443
 refs/heads/joyent/feature/cwrapper/trunk: e3a9d739ecda0f585205935a72cfc8d522e47786
 refs/heads/joyent/feature/cwrappers/trunk: 2e5d2f04ece2ca36ca032ddb92ac03c5d5edef99
-refs/heads/joyent/feature/dash/trunk: 61a21abe11d4fc36db0eb111b4ef69a3c5509585
+refs/heads/joyent/feature/dash/trunk: 4396f06eefd1d13c2a6768d903da071c28ec4793
 "refs/heads/pkgsrc_2013Q4": c7c4560209d65ff7b93176c84a1586fd8a5a3dde
 "refs/heads/pkgsrc_2013Q3": a694d11d96f9e0a87fc683c6a4a9a4d5dcbf79f8
 "refs/heads/pkgsrc_2013Q2": cb4803fea21e7329909054eb3b7741fed41fe969
diff --git a/branches/joyent/feature/dash/trunk/inputmethod/canna/distinfo b/branches/joyent/feature/dash/trunk/inputmethod/canna/distinfo
index 906076b10884e..96d408a61e5ec 100644
--- a/branches/joyent/feature/dash/trunk/inputmethod/canna/distinfo
+++ b/branches/joyent/feature/dash/trunk/inputmethod/canna/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2008/09/18 12:33:44 taca Exp $
+$NetBSD: distinfo,v 1.10 2011/12/07 16:05:59 roy Exp $
 
 SHA1 (Canna36p4.tar.gz) = 4edc22e2e4e5c6db42daa2083fabb53aa1ae8168
 RMD160 (Canna36p4.tar.gz) = 7f8bb7f5d87e6b939ff2b84edf58072c75a5d09d
@@ -16,5 +16,6 @@ SHA1 (patch-aj) = 30d19c8ef9c1129e5214cb9a8a1d8b2b636b0361
 SHA1 (patch-ak) = 18b408344b8b617142ced8804990e87b7ae27f56
 SHA1 (patch-al) = f6025d6fb7a3247ef44b0a50ae13b67ef3dad2d9
 SHA1 (patch-am) = 756aed6fc81a9d75a55d123c8dc00c0932b8df7f
-SHA1 (patch-an) = d639f774bf9ef440458bfc716b211a1dcc95a823
+SHA1 (patch-an) = ef892b0837e7b3b5b569a7a9a518df2379c43f1c
 SHA1 (patch-ao) = c577319f50df6624333726cd62b48d869989d881
+SHA1 (patch-ap) = 3f514037c4d67b2e18b27285370fe2ea84d977cc
diff --git a/branches/joyent/feature/dash/trunk/inputmethod/canna/patches/patch-an b/branches/joyent/feature/dash/trunk/inputmethod/canna/patches/patch-an
index 6d593e8514071..d19339a2063a7 100644
--- a/branches/joyent/feature/dash/trunk/inputmethod/canna/patches/patch-an
+++ b/branches/joyent/feature/dash/trunk/inputmethod/canna/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1 2005/12/30 15:16:21 joerg Exp $
+$NetBSD: patch-an,v 1.2 2011/12/07 16:05:59 roy Exp $
 
 --- canuum/canna.c.orig	2005-12-30 14:56:11.000000000 +0000
 +++ canuum/canna.c
@@ -11,3 +11,12 @@ $NetBSD: patch-an,v 1.1 2005/12/30 15:16:21 joerg Exp $
  static int maxmodelen;
  static int maxwidth = 0;
  
+@@ -1268,7 +1266,7 @@
+   cannakeyentry(key_end,   CANNA_KEY_End);
+ #endif
+ 
+-  resetterm();
++  reset_shell_mode();
+ #endif
+ 
+   if (terminalname = malloc(strlen(term) + 1)) {
diff --git a/branches/joyent/feature/dash/trunk/inputmethod/canna/patches/patch-ap b/branches/joyent/feature/dash/trunk/inputmethod/canna/patches/patch-ap
new file mode 100644
index 0000000000000..b3273be54aa2f
--- /dev/null
+++ b/branches/joyent/feature/dash/trunk/inputmethod/canna/patches/patch-ap
@@ -0,0 +1,30 @@
+$NetBSD: patch-ap,v 1.1 2011/12/07 16:05:59 roy Exp $
+
+--- canuum/termio.c.orig	2011-12-07 13:20:41.000000000 +0000
++++ canuum/termio.c		2011-12-07 15:58:50.000000000 +0000
+@@ -175,7 +175,6 @@
+ void
+ closeTermData ()
+ {
+-  resetterm ();
+   reset_shell_mode ();
+ }
+ 
+@@ -195,7 +194,7 @@
+ set_scroll_region (start, end)
+      int start, end;
+ {
+-  tputs (tparm (change_scroll_region, start, end), 1, putchar);
++  tputs (tparm (change_scroll_region, start, end, 0, 0, 0, 0, 0, 0, 0), 1, putchar);
+ }
+ 
+ void
+@@ -223,7 +222,7 @@
+ throw_cur_raw (col, row)
+      int col, row;
+ {
+-  tputs (tparm (cursor_address, row, col), 1, putchar);
++  tputs (tparm (cursor_address, row, col, 0, 0, 0, 0, 0, 0, 0), 1, putchar);
+ }
+ 
+ void