3 files changed, 28 insertions, 52 deletions

diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile
index f48fa6ebde6f..1a4f91396a42 100644
--- a/chinese/ibus-pinyin/Makefile
+++ b/chinese/ibus-pinyin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ibus-pinyin
-PORTVERSION=	1.2.0.20090915
-PORTREVISION=	3
+PORTVERSION=	1.3.8
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DBTAR}
@@ -26,8 +25,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dependency-tracking
 
 PROJECTHOST=	ibus
-DBVER=		0.1.10.6
-DBTAR=		pinyin-database-${DBVER}.tar.bz2
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -37,8 +34,7 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-extract:
-	${MV} ${WRKDIR}/py.db ${WRKSRC}/engine/
-	${TOUCH} ${WRKSRC}/engine/${DBTAR}
+post-patch:
+	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/chinese/ibus-pinyin/distinfo b/chinese/ibus-pinyin/distinfo
index cb30824ce1f4..8937fb09e3c2 100644
--- a/chinese/ibus-pinyin/distinfo
+++ b/chinese/ibus-pinyin/distinfo
@@ -1,6 +1,3 @@
-MD5 (ibus-pinyin-1.2.0.20090915.tar.gz) = 97b3c95280bec6a56c587d12158139a2
-SHA256 (ibus-pinyin-1.2.0.20090915.tar.gz) = b38b5a72c3917e727b63f3f8f8e7ba9af6dda61a65caf15e61e8a908465b553b
-SIZE (ibus-pinyin-1.2.0.20090915.tar.gz) = 279759
-MD5 (pinyin-database-0.1.10.6.tar.bz2) = ebd8d2381993372bb97a877b549e14a0
-SHA256 (pinyin-database-0.1.10.6.tar.bz2) = f96c0adfd890b1ec5be534a147481900b96ba827910e140f1c76c679632f15fe
-SIZE (pinyin-database-0.1.10.6.tar.bz2) = 12008671
+MD5 (ibus-pinyin-1.3.8.tar.gz) = 3cc746e0abfdcb2f1be3e688a78a3ca5
+SHA256 (ibus-pinyin-1.3.8.tar.gz) = 8ed34465c8a76c0358b9fd268b5a3ebf6c7c0d6e82169bc26c035f50b3d376b1
+SIZE (ibus-pinyin-1.3.8.tar.gz) = 1640724
diff --git a/chinese/ibus-pinyin/pkg-plist b/chinese/ibus-pinyin/pkg-plist
index 301788defe7d..4459e6affb7e 100644
--- a/chinese/ibus-pinyin/pkg-plist
+++ b/chinese/ibus-pinyin/pkg-plist
@@ -1,53 +1,36 @@
+%%NLS%%share/locale/ru/LC_MESSAGES/ibus-pinyin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus-pinyin.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/ibus-pinyin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/ibus-pinyin.mo
 libexec/ibus-engine-pinyin
 libexec/ibus-setup-pinyin
-%%DATADIR%%/engine/factory.py
-%%DATADIR%%/engine/factory.pyc
-%%DATADIR%%/engine/factory.pyo
-%%DATADIR%%/engine/main.py
-%%DATADIR%%/engine/main.pyc
-%%DATADIR%%/engine/main.pyo
-%%DATADIR%%/engine/pinyin.py
-%%DATADIR%%/engine/pinyin.pyc
-%%DATADIR%%/engine/pinyin.pyo
-%%DATADIR%%/engine/py.db
-%%DATADIR%%/engine/pydict.py
-%%DATADIR%%/engine/pydict.pyc
-%%DATADIR%%/engine/pydict.pyo
-%%DATADIR%%/engine/pyparser.py
-%%DATADIR%%/engine/pyparser.pyc
-%%DATADIR%%/engine/pyparser.pyo
-%%DATADIR%%/engine/pysqlitedb.py
-%%DATADIR%%/engine/pysqlitedb.pyc
-%%DATADIR%%/engine/pysqlitedb.pyo
-%%DATADIR%%/engine/pyutil.py
-%%DATADIR%%/engine/pyutil.pyc
-%%DATADIR%%/engine/pyutil.pyo
-%%DATADIR%%/engine/special_phrase
-%%DATADIR%%/engine/special_table
-%%DATADIR%%/engine/specialphrase.py
-%%DATADIR%%/engine/specialphrase.pyc
-%%DATADIR%%/engine/specialphrase.pyo
-%%DATADIR%%/engine/specialtable.py
-%%DATADIR%%/engine/specialtable.pyc
-%%DATADIR%%/engine/specialtable.pyo
+%%DATADIR%%/db/android.db
+%%DATADIR%%/db/create_index.sql
 %%DATADIR%%/icons/chinese.svg
 %%DATADIR%%/icons/english.svg
-%%DATADIR%%/icons/full-letter.svg
 %%DATADIR%%/icons/full-punct.svg
-%%DATADIR%%/icons/half-letter.svg
+%%DATADIR%%/icons/full.svg
 %%DATADIR%%/icons/half-punct.svg
+%%DATADIR%%/icons/half.svg
+%%DATADIR%%/icons/ibus-bopomofo.svg
 %%DATADIR%%/icons/ibus-pinyin.svg
+%%DATADIR%%/icons/simp-chinese.svg
+%%DATADIR%%/icons/trad-chinese.svg
+%%DATADIR%%/phrases.txt
+%%DATADIR%%/setup/ibus-pinyin-preferences.ui
 %%DATADIR%%/setup/main.py
 %%DATADIR%%/setup/main.pyc
 %%DATADIR%%/setup/main.pyo
-%%DATADIR%%/setup/pydict.py
-%%DATADIR%%/setup/pydict.pyc
-%%DATADIR%%/setup/pydict.pyo
-%%DATADIR%%/setup/setup.glade
+%%DATADIR%%/setup/version.py
+%%DATADIR%%/setup/version.pyc
+%%DATADIR%%/setup/version.pyo
 share/ibus/component/pinyin.xml
-%%NLS%%share/locale/ja/LC_MESSAGES/ibus-pinyin.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus-pinyin.mo
+%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN
+%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru
+%%NLS%%@dirrmtry share/locale
 @dirrm %%DATADIR%%/setup
 @dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/engine
+@dirrmtry %%DATADIR%%/db
 @dirrm %%DATADIR%%