Update ibus-table to 1.8.8.

many fixes and improvements.

4 files changed, 23 insertions, 31 deletions

diff --git a/inputmethod/ibus-table/Makefile b/inputmethod/ibus-table/Makefile
index bef9231340c..64a95028a84 100644
--- a/inputmethod/ibus-table/Makefile
+++ b/inputmethod/ibus-table/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2014/05/09 07:37:09 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2014/08/24 06:41:32 obache Exp $
 
-DISTNAME=	ibus-table-1.5.0
-PKGREVISION=	1
+DISTNAME=	ibus-table-1.8.8
 CATEGORIES=	inputmethod
-MASTER_SITES=	http://ibus.googlecode.com/files/
+MASTER_SITES=	https://github.com/kaio/ibus-table/releases/download/${PKGVERSION_NOREV}/
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/ibus/
@@ -24,8 +23,9 @@ SUBST_FILES.prefix=	engine/tabcreatedb.py
 SUBST_SED.prefix=	-e 's|/usr/share|${PREFIX}/share|g'
 
 REPLACE_PYTHON+=	engine/tabcreatedb.py
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 1.5.0
+PYTHON_VERSIONS_INCOMPATIBLE=	26 27
 
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/ibus-table/PLIST b/inputmethod/ibus-table/PLIST
index 847fed3b4c6..c43f8715181 100644
--- a/inputmethod/ibus-table/PLIST
+++ b/inputmethod/ibus-table/PLIST
@@ -1,8 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2013/10/23 12:43:49 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/08/24 06:41:32 obache Exp $
 bin/ibus-table-createdb
 lib/pkgconfig/ibus-table.pc
 libexec/ibus-engine-table
+libexec/ibus-setup-table
+man/man1/ibus-table-createdb.1
+share/applications/ibus-setup-table.desktop
 share/ibus-table/data/pinyin_table.txt.bz2
+share/ibus-table/engine/chinese_variants.py
+share/ibus-table/engine/chinese_variants.pyc
+share/ibus-table/engine/chinese_variants.pyo
 share/ibus-table/engine/factory.py
 share/ibus-table/engine/factory.pyc
 share/ibus-table/engine/factory.pyo
@@ -12,9 +18,6 @@ share/ibus-table/engine/main.pyo
 share/ibus-table/engine/tabcreatedb.py
 share/ibus-table/engine/tabcreatedb.pyc
 share/ibus-table/engine/tabcreatedb.pyo
-share/ibus-table/engine/tabdict.py
-share/ibus-table/engine/tabdict.pyc
-share/ibus-table/engine/tabdict.pyo
 share/ibus-table/engine/table.py
 share/ibus-table/engine/table.pyc
 share/ibus-table/engine/table.pyo
@@ -39,6 +42,13 @@ share/ibus-table/icons/scb-mode.svg
 share/ibus-table/icons/tab-mode.svg
 share/ibus-table/icons/tc-mode.svg
 share/ibus-table/icons/tcb-mode.svg
+share/ibus-table/setup/main.py
+share/ibus-table/setup/main.pyc
+share/ibus-table/setup/main.pyo
+share/ibus-table/setup/version.py
+share/ibus-table/setup/version.pyc
+share/ibus-table/setup/version.pyo
+share/ibus-table/setup/ibus-table-preferences.ui
 share/ibus-table/tables/template.txt
 share/ibus/component/table.xml
 share/locale/de/LC_MESSAGES/ibus-table.mo
diff --git a/inputmethod/ibus-table/distinfo b/inputmethod/ibus-table/distinfo
index 5a7aee572c9..e2e8c8c02e6 100644
--- a/inputmethod/ibus-table/distinfo
+++ b/inputmethod/ibus-table/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2013/12/28 09:02:31 obache Exp $
+$NetBSD: distinfo,v 1.4 2014/08/24 06:41:32 obache Exp $
 
-SHA1 (ibus-table-1.5.0.tar.gz) = 3e474e52d963927fac1056112c1b92dfd47e5cbd
-RMD160 (ibus-table-1.5.0.tar.gz) = 4c9b00679a0a448839fd59d3439be36fc1083705
-Size (ibus-table-1.5.0.tar.gz) = 432844 bytes
-SHA1 (patch-engine_tabsqlitedb.py) = c360974f0dfb327f6bd18cce0c8bec4fe5dd806b
+SHA1 (ibus-table-1.8.8.tar.gz) = 02d8ff3428b6fccec7311160319be12a15385ade
+RMD160 (ibus-table-1.8.8.tar.gz) = d9bed26a8e14824d614b94f6ed863cc7b3c384bd
+Size (ibus-table-1.8.8.tar.gz) = 529204 bytes
diff --git a/inputmethod/ibus-table/patches/patch-engine_tabsqlitedb.py b/inputmethod/ibus-table/patches/patch-engine_tabsqlitedb.py
deleted file mode 100644
index 390367398f8..00000000000
--- a/inputmethod/ibus-table/patches/patch-engine_tabsqlitedb.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-engine_tabsqlitedb.py,v 1.1 2013/12/28 09:02:31 obache Exp $
-
-* \U is not usable with UCS2.
-
---- engine/tabsqlitedb.py.orig	2013-01-15 21:46:47.000000000 +0000
-+++ engine/tabsqlitedb.py
-@@ -499,10 +499,6 @@ class tabsqlitedb:
-                                             + u'\u4E00-\u9FCB'
-                                             + u'\u3400-\u4DB5'
-                                             + u'\uF900-\uFaFF'
--                                            + u'\U00020000-\U0002A6D6'
--                                            + u'\U0002A700-\U0002B734'
--                                            + u'\U0002B740-\U0002B81D'
--                                            + u'\U0002F800-\U0002FA1D'
-                                             + u']+',
-                                             phrase))
-             # first whether in gb2312