Update to 2.16.2051.102.

- fcitx-mozc has been updated to 2.16.2037.102.2 patch.
- mozc_server_* scripts have been replaced with a single mozc script.

3 files changed, 11 insertions, 39 deletions

diff --git a/japanese/ibus-mozc/Makefile b/japanese/ibus-mozc/Makefile
index ede6e9796659..29b7f9474cb3 100644
--- a/japanese/ibus-mozc/Makefile
+++ b/japanese/ibus-mozc/Makefile
@@ -7,7 +7,9 @@ COMMENT=	Mozc engine for IBus
 DATADIR=	${PREFIX}/share/ibus-${PORTNAME}
 
 MASTERDIR=	${.CURDIR}/../../japanese/mozc-server
-PKGMESSAGE=	${.CURDIR}/pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
+FILESDIR=	${.CURDIR}/files
+SUB_FILES=	pkg-message
 
 BUILD_MOZC_LIST=	ibus_mozc
 
diff --git a/japanese/ibus-mozc/files/pkg-message.in b/japanese/ibus-mozc/files/pkg-message.in
new file mode 100644
index 000000000000..a892668e9c6d
--- /dev/null
+++ b/japanese/ibus-mozc/files/pkg-message.in
@@ -0,0 +1,8 @@
+To activate ibus-mozc, please add the following into ~/.xinitrc,
+~/.xsession, or ~/.kde4/env (for KDE4):
+
+export GTK_IM_MODULE=ibus
+export QT_IM_MODULE=xim
+export XMODIFIERS=@im=ibus
+%%PREFIX%%/bin/mozc start
+ibus-daemon -r --daemonize --xim
diff --git a/japanese/ibus-mozc/pkg-message b/japanese/ibus-mozc/pkg-message
deleted file mode 100644
index 61d4a62b884c..000000000000
--- a/japanese/ibus-mozc/pkg-message
+++ /dev/null
@@ -1,38 +0,0 @@
-ibus-mozc installation finished. To use ibus-mozc, please do the following:
-
-If you are using bash or zsh, please add following lines to your $HOME/.bashrc or
-$HOME/.zshrc:
-
-mozc_server_start
-export XIM=ibus
-export GTK_IM_MODULE=ibus
-export QT_IM_MODULE=xim
-export XMODIFIERS=@im=ibus
-export XIM_PROGRAM="ibus-daemon"
-export XIM_ARGS="-r --daemonize --xim"
-
-If you are using tcsh, please add following lines to your $HOME/.cshrc:
-
-mozc_server_start
-setenv XIM ibus
-setenv GTK_IM_MODULE ibus
-setenv QT_IM_MODULE xim
-setenv XMODIFIERS @im=ibus
-setenv XIM_PROGRAM ibus-daemon
-setenv XIM_ARGS "-r --daemonize --xim"
-
-If you are using KDE4, you may create a shell script in $HOME/.kde4/env, 
-and add following lines:
-
-#!/bin/sh
-mozc_server_start
-export XIM=ibus
-export GTK_IM_MODULE=ibus
-export QT_IM_MODULE=xim
-export XMODIFIERS=@im=ibus
-export XIM_PROGRAM="ibus-daemon"
-export XIM_ARGS="-r --daemonize --xim"
-
-If ibus cannot start or the panel does not appear, please ensure
-that you are using up-to-date python.
-There's a bug in python 2.5, which may prevent the panel from appearing.