Update ibus-pinyin to 1.5.0.

* integrates pyzy
* add *.desktop files
* bug fixes

3 files changed, 11 insertions, 31 deletions

diff --git a/inputmethod/ibus-pinyin/Makefile b/inputmethod/ibus-pinyin/Makefile
index 65269592c80..838ee4e1823 100644
--- a/inputmethod/ibus-pinyin/Makefile
+++ b/inputmethod/ibus-pinyin/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2013/10/19 09:07:06 adam Exp $
+# $NetBSD: Makefile,v 1.22 2013/10/23 12:39:55 obache Exp $
 #
 
-DISTNAME=	ibus-pinyin-1.4.0
-PKGREVISION=	6
+DISTNAME=	ibus-pinyin-1.5.0
 CATEGORIES=	inputmethod chinese
 MASTER_SITES=	http://ibus.googlecode.com/files/
-DISTFILES=	${DEFAULT_DISTFILES} ${DBTAR}
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/ibus/
@@ -18,34 +16,18 @@ USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		pkg-config gmake intltool msgfmt
 
-# taken from ${WRKSRC}/data/db/open-phrase/Makefile.in
-DBVER=		1.2.99
-DBTAR=		pinyin-database-${DBVER}.tar.bz2
-
-post-extract:
-	${RUN} cd ${WRKSRC}/data/db/open-phrase;	\
-	mkdir -p db;					\
-	mv ${WRKDIR}/db/main.db db/open-phrase.db;	\
-	touch ${DBTAR} stamp-db
-
 SUBST_CLASSES+=		epython
 SUBST_STAGE.epython=	pre-configure
 SUBST_FILES.epython=	setup/ibus-setup-pinyin.in
 SUBST_SED.epython=	-e 's;exec python;exec ${PYTHONBIN};g'
 
 CONFIGURE_ARGS+=	--localedir=${PREFIX}/${PKGLOCALEDIR}/locale
-CONFIGURE_ARGS+=	--disable-db-android
-CONFIGURE_ARGS+=	--enable-db-open-phrase
 
 .include "options.mk"
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 
-.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
-.  include "../../devel/libuuid/buildlink3.mk"
-.endif
-
 .if (!empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*)) || !empty(PKGSRC_COMPILER:Mclang)
 CONFIGURE_ARGS+=	--disable-boost
 .else
@@ -60,6 +42,7 @@ SUBST_SED.shared_ptr=	-e 's,std::shared_ptr,boost::shared_ptr,g'
 
 .include "../../inputmethod/ibus/bad-env-usage.mk"
 
+.include "../../converters/pyzy/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/inputmethod/ibus-pinyin/PLIST b/inputmethod/ibus-pinyin/PLIST
index 84e89ba3efa..da7a72ed07a 100644
--- a/inputmethod/ibus-pinyin/PLIST
+++ b/inputmethod/ibus-pinyin/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/22 14:02:50 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/10/23 12:39:55 obache Exp $
 libexec/ibus-engine-pinyin
 libexec/ibus-setup-pinyin
-${PLIST.lua}share/ibus-pinyin/base.lua
-share/ibus-pinyin/db/create_index.sql
+share/applications/ibus-setup-bopomofo.desktop
+share/applications/ibus-setup-pinyin.desktop
 share/ibus-pinyin/db/english.db
-share/ibus-pinyin/db/open-phrase.db
 share/ibus-pinyin/icons/chinese.svg
 share/ibus-pinyin/icons/english.svg
 share/ibus-pinyin/icons/full-punct.svg
@@ -24,6 +23,7 @@ share/ibus-pinyin/setup/version.py
 share/ibus-pinyin/setup/version.pyc
 share/ibus-pinyin/setup/version.pyo
 share/ibus/component/pinyin.xml
+share/locale/fr/LC_MESSAGES/ibus-pinyin.mo
 share/locale/ru/LC_MESSAGES/ibus-pinyin.mo
 share/locale/zh_CN/LC_MESSAGES/ibus-pinyin.mo
 share/locale/zh_HK/LC_MESSAGES/ibus-pinyin.mo
diff --git a/inputmethod/ibus-pinyin/distinfo b/inputmethod/ibus-pinyin/distinfo
index d112c795717..2c46b201fd8 100644
--- a/inputmethod/ibus-pinyin/distinfo
+++ b/inputmethod/ibus-pinyin/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.3 2012/04/22 14:02:50 obache Exp $
+$NetBSD: distinfo,v 1.4 2013/10/23 12:39:55 obache Exp $
 
-SHA1 (ibus-pinyin-1.4.0.tar.gz) = 499ceb4d3bec5614f88322b8e7695c04586b63e9
-RMD160 (ibus-pinyin-1.4.0.tar.gz) = b1c540225e2204ebade5cfa527305898807c4dbf
-Size (ibus-pinyin-1.4.0.tar.gz) = 1813003 bytes
-SHA1 (pinyin-database-1.2.99.tar.bz2) = e38a148a772e9909facda66b2d579e17b94cccbe
-RMD160 (pinyin-database-1.2.99.tar.bz2) = 1679567f31c20a235577f02175df38e16a05e7de
-Size (pinyin-database-1.2.99.tar.bz2) = 9977983 bytes
+SHA1 (ibus-pinyin-1.5.0.tar.gz) = 40abf915bb2599189d8fd76f456ce399edfa4184
+RMD160 (ibus-pinyin-1.5.0.tar.gz) = 9137f3e40971bd819fbaaf1715779a538d20a90c
+Size (ibus-pinyin-1.5.0.tar.gz) = 692516 bytes
 SHA1 (patch-src_PYUtil.h) = 93e289e83abaec2fef6cd5a7cf924cd3bb6a20ad