- Update to 1.4.0

PR:		ports/164507
Submitted by:	Hiroto Kagotani<hiroto.kagotani@gmail.com> (maintainer)
Approved by:	gabor (mentor)

4 files changed, 34 insertions, 41 deletions

diff --git a/japanese/ibus-skk/Makefile b/japanese/ibus-skk/Makefile
index b0c0daf9aa82..6df92e9d7eba 100644
--- a/japanese/ibus-skk/Makefile
+++ b/japanese/ibus-skk/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	ibus-skk
-PORTVERSION=	1.3.8
+PORTVERSION=	1.4.0
 CATEGORIES=	japanese
 MASTER_SITES=	http://cloud.github.com/downloads/ueno/ibus-skk/
 
 MAINTAINER=	hiroto.kagotani@gmail.com
-COMMENT=	SKK engine for IBus
+COMMENT=	A Japanese SKK input engine for IBus
 
-RUN_DEPENDS=	ibus-daemon:${PORTSDIR}/textproc/ibus \
-		${LOCALBASE}/share/skk/SKK-JISYO.L:${PORTSDIR}/japanese/skk-jisyo
+RUN_DEPENDS=	${LOCALBASE}/share/skk/SKK-JISYO.L:${PORTSDIR}/japanese/skk-jisyo
+LIB_DEPENDS=	skk.0:${PORTSDIR}/japanese/libskk \
+		ibus-1.0.400:${PORTSDIR}/textproc/ibus
 
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
@@ -24,8 +25,23 @@ USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	DATADIRNAME=share
 
+CPPFLAGS+=	-I${LOCALBASE}/include
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/share/skk/SKK-JISYO.L|${LOCALBASE}/share/skk/SKK-JISYO.L|' ${WRKSRC}/src/preferences.c
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO} To display this message again, type ${PKG_INFO} -D ${PKGNAME}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/japanese/ibus-skk/distinfo b/japanese/ibus-skk/distinfo
index c277eaefa4b8..44b02dcfcbd3 100644
--- a/japanese/ibus-skk/distinfo
+++ b/japanese/ibus-skk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ibus-skk-1.3.8.tar.gz) = 67b2574cff2f0c4d7a74a7e80164974600875683d3c909c039c3fedece9144c7
-SIZE (ibus-skk-1.3.8.tar.gz) = 459822
+SHA256 (ibus-skk-1.4.0.tar.gz) = bbf4309215802dddc41bdb7dc0efad91da99957e07f9216193345b149e43b4d9
+SIZE (ibus-skk-1.4.0.tar.gz) = 478964
diff --git a/japanese/ibus-skk/pkg-descr b/japanese/ibus-skk/pkg-descr
index 28b9494db2cc..e171acbd9459 100644
--- a/japanese/ibus-skk/pkg-descr
+++ b/japanese/ibus-skk/pkg-descr
@@ -1,3 +1,9 @@
-SKK engine for IBus.
+ibus-skk -- a Japanese SKK input engine for IBus
+
+ibus-skk is an implementation of the SKK (Simple Kana-Kanji) input
+method on the IBus input method framework. To learn about SKK, see:
+
+http://openlab.jp/skk/
+https://secure.wikimedia.org/wikipedia/ja/wiki/SKK
 
 WWW: http://github.com/ueno/ibus-skk
diff --git a/japanese/ibus-skk/pkg-plist b/japanese/ibus-skk/pkg-plist
index 39d37e75f57f..a5c7a6bdc3c2 100644
--- a/japanese/ibus-skk/pkg-plist
+++ b/japanese/ibus-skk/pkg-plist
@@ -1,38 +1,9 @@
-bin/ibus-skk-convert-jisyo
 libexec/ibus-engine-skk
 libexec/ibus-setup-skk
-share/ibus/component/skk.xml
-%%DATADIR%%/engine/engine.py
-%%DATADIR%%/engine/engine.pyc
-%%DATADIR%%/engine/engine.pyo
-%%DATADIR%%/engine/factory.py
-%%DATADIR%%/engine/factory.pyc
-%%DATADIR%%/engine/factory.pyo
-%%DATADIR%%/engine/kzik.py
-%%DATADIR%%/engine/kzik.pyc
-%%DATADIR%%/engine/kzik.pyo
-%%DATADIR%%/engine/main.py
-%%DATADIR%%/engine/main.pyc
-%%DATADIR%%/engine/main.pyo
-%%DATADIR%%/engine/nicola.py
-%%DATADIR%%/engine/nicola.pyc
-%%DATADIR%%/engine/nicola.pyo
-%%DATADIR%%/engine/skk.py
-%%DATADIR%%/engine/skk.pyc
-%%DATADIR%%/engine/skk.pyo
-%%DATADIR%%/engine/virtkbd.py
-%%DATADIR%%/engine/virtkbd.pyc
-%%DATADIR%%/engine/virtkbd.pyo
-%%DATADIR%%/icons/ibus-skk.svg
-%%DATADIR%%/setup/config.py
-%%DATADIR%%/setup/config.pyc
-%%DATADIR%%/setup/config.pyo
+%%NLS%%share/locale/ja/LC_MESSAGES/ibus-skk.mo
 %%DATADIR%%/setup/ibus-skk-preferences.ui
-%%DATADIR%%/setup/main.py
-%%DATADIR%%/setup/main.pyc
-%%DATADIR%%/setup/main.pyo
-share/locale/ja/LC_MESSAGES/ibus-skk.mo
-@dirrm %%DATADIR%%/engine
-@dirrm %%DATADIR%%/icons
+%%DATADIR%%/icons/ibus-skk.svg
+share/ibus/component/skk.xml
 @dirrm %%DATADIR%%/setup
+@dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%