25 files changed, 122 insertions, 557 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index f88eb6f1ef7b..95b7edf8ebc1 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -162,7 +162,6 @@
     SUBDIR += ming
     SUBDIR += monafonts
     SUBDIR += monafonts-ttf
-    SUBDIR += mozc-additions
     SUBDIR += mozc-el
     SUBDIR += mozc-server
     SUBDIR += mozc-tool
diff --git a/japanese/fcitx-mozc/Makefile b/japanese/fcitx-mozc/Makefile
index 5c450c1a00c6..a1a43690e51b 100644
--- a/japanese/fcitx-mozc/Makefile
+++ b/japanese/fcitx-mozc/Makefile
@@ -7,7 +7,9 @@ COMMENT=	Mozc engine for Fcitx
 DATADIR=	${PREFIX}/share/fcitx/${PORTNAME}
 
 MASTERDIR=	${.CURDIR}/../../japanese/mozc-server
-PKGMESSAGE=	${.CURDIR}/pkg-message
+FILESDIR=	${.CURDIR}/files
+SUB_FILES=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 BUILD_MOZC_LIST=	fcitx_mozc
 
diff --git a/japanese/fcitx-mozc/files/pkg-message.in b/japanese/fcitx-mozc/files/pkg-message.in
new file mode 100644
index 000000000000..e76eb3120804
--- /dev/null
+++ b/japanese/fcitx-mozc/files/pkg-message.in
@@ -0,0 +1,8 @@
+To activate fcitx-mozc, please add the following into ~/.xinitrc,
+~/.xsession, or ~/.kde4/env (for KDE4):
+
+export GTK_IM_MODULE=fcitx
+export QT_IM_MODULE=xim
+export XMODIFIERS=@im=fcitx
+%%PREFIX%%/bin/mozc start
+fcitx -r -d
diff --git a/japanese/fcitx-mozc/pkg-message b/japanese/fcitx-mozc/pkg-message
deleted file mode 100644
index d34f647d6130..000000000000
--- a/japanese/fcitx-mozc/pkg-message
+++ /dev/null
@@ -1,31 +0,0 @@
-fcitx-mozc installation finished. To use fcitx-mozc, please do the following:
-
-If you are using bash or zsh, please add following lines to your $HOME/.bashrc or
-$HOME/.zshrc:
-
-export GTK_IM_MODULE=xim
-export QT_IM_MODULE=xim
-export XMODIFIERS=@im=fcitx
-mozc_server_start
-fcitx
-
-If you are using tcsh, please add following lines to your $HOME/.cshrc:
-
-setenv GTK_IM_MODULE xim
-setenv QT_IM_MODULE xim
-setenv XMODIFIERS @im=fcitx
-mozc_server_start
-fcitx
-
-If you are using KDE4, you may create a shell script in $HOME/.kde4/env, 
-and add following lines:
-
-#!/bin/sh
-export GTK_IM_MODULE=xim
-export QT_IM_MODULE=xim
-export XMODIFIERS=@im=fcitx
-mozc_server_start
-fcitx
-
-You can replace the `xim` above with `fcitx` if you built fcitx with
-the corresponding IM module.
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.
diff --git a/japanese/mozc-additions/Makefile b/japanese/mozc-additions/Makefile
deleted file mode 100644
index 4a590f778179..000000000000
--- a/japanese/mozc-additions/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Created by: Daichi GOTO <daichi@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	mozc-additions
-PORTVERSION=	1.15
-CATEGORIES=	japanese
-MASTER_SITES=	# empty
-PKGNAMEPREFIX?=	ja-
-DISTFILES=	# empty
-
-MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Additional tools and images for Mozc Japanese Input Method
-
-NO_BUILD=	yes
-PLIST_FILES=	bin/ibus-daemon_restart \
-		bin/ibus-daemon_start \
-		bin/ibus-daemon_stop \
-		bin/mozc_server_restart \
-		bin/mozc_server_start \
-		bin/mozc_server_stop \
-		bin/mozc_tool_character_palette \
-		bin/mozc_tool_config \
-		bin/mozc_tool_dictionary \
-		bin/mozc_tool_hand_writing \
-		bin/mozc_tool_word_register
-
-do-install:
-	${INSTALL_SCRIPT} ${PLIST_FILES:S,bin/,${FILESDIR}/,} \
-	    ${STAGEDIR}${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/japanese/mozc-additions/files/ibus-daemon_restart b/japanese/mozc-additions/files/ibus-daemon_restart
deleted file mode 100644
index d93a7c97d6ab..000000000000
--- a/japanese/mozc-additions/files/ibus-daemon_restart
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp>
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-# 1. Redistributions of source code must retain the above copyright 
-#    notice, this list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright 
-#    notice, this list of conditions and the following disclaimer in the 
-#    documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-# author: Daichi GOTO (daichi@ongs.co.jp)
-# first edition: Sat May 29 19:37:53 JST 2010
-# last modified: Sat Jun 12 10:33:41 JST 2010
-
-# ibus-daemon_restart
-
-# usage
-#    ibus-daemon_restart
-
-ibus-daemon_stop
-ibus-daemon_start
diff --git a/japanese/mozc-additions/files/ibus-daemon_start b/japanese/mozc-additions/files/ibus-daemon_start
deleted file mode 100644
index 473afc6a5411..000000000000
--- a/japanese/mozc-additions/files/ibus-daemon_start
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp>
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-# 1. Redistributions of source code must retain the above copyright 
-#    notice, this list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright 
-#    notice, this list of conditions and the following disclaimer in the 
-#    documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-# author: Daichi GOTO (daichi@ongs.co.jp)
-# first edition: Sat May 29 19:37:53 JST 2010
-# last modified: Sat Jun 26 11:07:59 JST 2010
-
-# ibus-daemon_start
-
-# usage
-#    ibus-daemon_start
-
-mozc_server_restart
-exec ibus-daemon -r --daemonize --xim
diff --git a/japanese/mozc-additions/files/ibus-daemon_stop b/japanese/mozc-additions/files/ibus-daemon_stop
deleted file mode 100644
index 40426371cea3..000000000000
--- a/japanese/mozc-additions/files/ibus-daemon_stop
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp>
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-# 1. Redistributions of source code must retain the above copyright 
-#    notice, this list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright 
-#    notice, this list of conditions and the following disclaimer in the 
-#    documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-# author: Daichi GOTO (daichi@ongs.co.jp)
-# first edition: Sat May 29 19:37:53 JST 2010
-# last modified: Sat Jun 26 11:06:17 JST 2010
-
-# ibus-daemon_stop
-
-# usage
-#    ibus-daemon_stop
-
-exec pkill -U $(id -u) ibus-daemon
diff --git a/japanese/mozc-additions/files/mozc_server_restart b/japanese/mozc-additions/files/mozc_server_restart
deleted file mode 100644
index f02aa0576179..000000000000
--- a/japanese/mozc-additions/files/mozc_server_restart
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp>
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-# 1. Redistributions of source code must retain the above copyright 
-#    notice, this list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright 
-#    notice, this list of conditions and the following disclaimer in the 
-#    documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-# author: Daichi GOTO (daichi@ongs.co.jp)
-# first edition: Sat May 29 19:37:53 JST 2010
-# last modified: Sat May 29 19:38:14 JST 2010
-
-# mozc_server_restart
-
-# usage
-#    mozc_server_restart
-
-mozc_server_stop
-mozc_server_start
diff --git a/japanese/mozc-additions/files/mozc_server_start b/japanese/mozc-additions/files/mozc_server_start
deleted file mode 100644
index 9882c54f8e65..000000000000
--- a/japanese/mozc-additions/files/mozc_server_start
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp>
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-# 1. Redistributions of source code must retain the above copyright 
-#    notice, this list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright 
-#    notice, this list of conditions and the following disclaimer in the 
-#    documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-# author: Daichi GOTO (daichi@ongs.co.jp)
-# first edition: Sat May 29 19:37:53 JST 2010
-# last modified: Sat Jun 26 11:51:20 JST 2010
-
-# mozc_server_start
-
-# usage
-#    mozc_server_start
-
-if [ -z "$(pgrep -U $(id -u) mozc_server)" ]
-then
-    rm -f ${HOME}/.mozc/.session.ipc ${HOME}/.mozc/.server.lock
-    daemon mozc_server
-fi
diff --git a/japanese/mozc-additions/files/mozc_server_stop b/japanese/mozc-additions/files/mozc_server_stop
deleted file mode 100644
index 6b615760e193..000000000000
--- a/japanese/mozc-additions/files/mozc_server_stop
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp>
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-# 1. Redistributions of source code must retain the above copyright 
-#    notice, this list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright 
-#    notice, this list of conditions and the following disclaimer in the 
-#    documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-# author: Daichi GOTO (daichi@ongs.co.jp)
-# first edition: Sat May 29 19:37:53 JST 2010
-# last modified: Sat May 29 19:38:14 JST 2010
-
-# mozc_server_stop
-
-# usage
-#    mozc_server_stop
-
-pkill -U $(id -u) mozc_server
-rm -f ${HOME}/.mozc/.session.ipc ${HOME}/.mozc/.server.lock
diff --git a/japanese/mozc-additions/files/mozc_tool_character_palette b/japanese/mozc-additions/files/mozc_tool_character_palette
deleted file mode 100644
index 8b69fa5b5bd3..000000000000
--- a/japanese/mozc-additions/files/mozc_tool_character_palette
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-# Copyright (c) 2011 Daichi GOTO <daichi@ongs.co.jp>
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-# 1. Redistributions of source code must retain the above copyright 
-#    notice, this list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright 
-#    notice, this list of conditions and the following disclaimer in the 
-#    documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-# author: Daichi GOTO (daichi@ongs.co.jp)
-# first edition: Sat May 29 19:37:53 JST 2010
-# last modified: Sun Dec  4 21:17:02 JST 2011
-
-# mozc_tool_character_palette
-
-# usage
-#    mozc_tool_character_palette
-
-exec mozc_tool --mode=character_palette
diff --git a/japanese/mozc-additions/files/mozc_tool_config b/japanese/mozc-additions/files/mozc_tool_config
deleted file mode 100644
index c4fe8bd60195..000000000000
--- a/japanese/mozc-additions/files/mozc_tool_config
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp>
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-# 1. Redistributions of source code must retain the above copyright 
-#    notice, this list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright 
-#    notice, this list of conditions and the following disclaimer in the 
-#    documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-# author: Daichi GOTO (daichi@ongs.co.jp)
-# first edition: Sat May 29 19:37:53 JST 2010
-# last modified: Sat Jun 26 11:51:32 JST 2010
-
-# mozc_tool_config
-
-# usage
-#    mozc_tool_config
-
-exec mozc_tool --mode=config_dialog
diff --git a/japanese/mozc-additions/files/mozc_tool_dictionary b/japanese/mozc-additions/files/mozc_tool_dictionary
deleted file mode 100644
index cd9bc7bf2fbf..000000000000
--- a/japanese/mozc-additions/files/mozc_tool_dictionary
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp>
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-# 1. Redistributions of source code must retain the above copyright 
-#    notice, this list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright 
-#    notice, this list of conditions and the following disclaimer in the 
-#    documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-# author: Daichi GOTO (daichi@ongs.co.jp)
-# first edition: Sat May 29 19:37:53 JST 2010
-# last modified: Sat Jun 26 11:51:47 JST 2010
- 
-# mozc_tool_dictionary
-
-# usage
-#    mozc_tool_dictionary
-
-exec mozc_tool --mode=dictionary_tool
diff --git a/japanese/mozc-additions/files/mozc_tool_hand_writing b/japanese/mozc-additions/files/mozc_tool_hand_writing
deleted file mode 100644
index cc13b03bcb41..000000000000
--- a/japanese/mozc-additions/files/mozc_tool_hand_writing
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-# Copyright (c) 2011 Daichi GOTO <daichi@ongs.co.jp>
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-# 1. Redistributions of source code must retain the above copyright 
-#    notice, this list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright 
-#    notice, this list of conditions and the following disclaimer in the 
-#    documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-# author: Daichi GOTO (daichi@ongs.co.jp)
-# first edition: Sat May 29 19:37:53 JST 2010
-# last modified: Sun Dec  4 21:18:20 JST 2011
-
-# mozc_tool_hand_writing
-
-# usage
-#    mozc_tool_hand_writing
-
-exec mozc_tool --mode=hand_writing
diff --git a/japanese/mozc-additions/files/mozc_tool_word_register b/japanese/mozc-additions/files/mozc_tool_word_register
deleted file mode 100644
index cc87d7cb4a54..000000000000
--- a/japanese/mozc-additions/files/mozc_tool_word_register
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-# Copyright (c) 2011 Daichi GOTO <daichi@ongs.co.jp>
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-# 1. Redistributions of source code must retain the above copyright 
-#    notice, this list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright 
-#    notice, this list of conditions and the following disclaimer in the 
-#    documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-# author: Daichi GOTO (daichi@ongs.co.jp)
-# first edition: Sat May 29 19:37:53 JST 2010
-# last modified: Sun Dec  4 21:16:19 JST 2011
-
-# mozc_tool_word_register
-
-# usage
-#    mozc_tool_word_register
-
-exec mozc_tool --mode=word_register_dialog
diff --git a/japanese/mozc-additions/pkg-descr b/japanese/mozc-additions/pkg-descr
deleted file mode 100644
index 3af160754469..000000000000
--- a/japanese/mozc-additions/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Additional tools and images for Mozc Japanese Input Method.
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 63b7653ac79c..0700f76ed9dc 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mozc
-PORTVERSION=	1.15.1868.102
-PORTREVISION=	2
+PORTVERSION=	2.16.2051.102
 CATEGORIES=	japanese
 MASTER_SITES=	LOCAL/hrs
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -138,8 +137,10 @@ DISTFILES+= \
 
 EXTRACT_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
 
-PLIST_FILES+=	bin/mozc_server \
+PLIST_FILES+=	bin/mozc \
+		bin/mozc_server \
 		bin/mozc_emacs_helper
+SUB_FILES+=	mozc
 
 post-extract-mozc_server:
 	@for F in jigyosyo-20130628.lzh ken_all-20130628.lzh; do \
@@ -161,6 +162,8 @@ do-install-mozc_server:
 	    ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_server \
 	    ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_emacs_helper \
 	    ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} \
+	    ${WRKDIR}/mozc ${STAGEDIR}/${PREFIX}/bin
 .endif
 
 # mozc_tool
@@ -202,7 +205,6 @@ GYP_DEFINES+=	use_libibus=1 \
 LIB_DEPENDS+=	libibus-1.0.so:${PORTSDIR}/textproc/ibus
 RUN_DEPENDS+=	mozc_server:${PORTSDIR}/japanese/mozc-server \
 		mozc_tool:${PORTSDIR}/japanese/mozc-tool \
-		mozc_server_start:${PORTSDIR}/japanese/mozc-additions \
 		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify
 
 PLIST_FILES+=	bin/mozc_renderer \
@@ -251,13 +253,13 @@ do-install-ibus_mozc:
 # fcitx_mozc
 .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" || make(makesum)
 PATCH_SITES=	http://download.fcitx-im.org/fcitx-mozc/
-PATCHFILES=	fcitx-mozc-1.15.1834.102.1.patch
+PATCHFILES=	fcitx-mozc-2.16.2037.102.2.patch
 .endif
 .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
 PATCH_DIST_STRIP=-p2
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-unix-fcitx-eim.cc \
-		${FILESDIR}/extra-patch-unix-fcitx-mozc_response_parser.cc \
-		${FILESDIR}/extra-patch-unix-fcitx-surrounding_text_util.cc
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-unix-fcitx-eim.cc \
+		${PATCHDIR}/extra-patch-unix-fcitx-mozc_response_parser.cc \
+		${PATCHDIR}/extra-patch-unix-fcitx-surrounding_text_util.cc
 
 GYP_OPTIONS+=	--noqt
 GYP_DEFINES+=	use_libibus=0 \
@@ -265,8 +267,7 @@ GYP_DEFINES+=	use_libibus=0 \
 
 LIB_DEPENDS+=	libfcitx-core.so:${PORTSDIR}/chinese/fcitx
 RUN_DEPENDS+=	mozc_server:${PORTSDIR}/japanese/mozc-server \
-		mozc_tool:${PORTSDIR}/japanese/mozc-tool \
-		mozc_server_start:${PORTSDIR}/japanese/mozc-additions
+		mozc_tool:${PORTSDIR}/japanese/mozc-tool
 
 PLIST_FILES+=	lib/fcitx/fcitx-mozc.so \
 		share/fcitx/addon/fcitx-mozc.conf \
@@ -286,6 +287,11 @@ PLIST_FILES+=	lib/fcitx/fcitx-mozc.so \
 		share/locale/zh_TW/LC_MESSAGES/fcitx-mozc.mo
 PLIST_DIRS+=	%%DATADIR%%/icon ${DATADIR_REL}
 
+post-extract-fcitx_mozc:
+	${RM} ${WRKSRC}/unix/fcitx/fcitx.gyp
+
+post-extract: post-extract-fcitx_mozc
+
 do-build-fcitx_mozc:
 	${BUILD_MOZC_CMD_BUILD} unix/fcitx/fcitx.gyp:fcitx-mozc
 
@@ -323,8 +329,7 @@ do-install-fcitx_mozc:
 # mozc_el
 .if ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el"
 CATEGORIES+=	elisp
-RUN_DEPENDS+=	mozc_server:${PORTSDIR}/japanese/mozc-server \
-		mozc_server_start:${PORTSDIR}/japanese/mozc-additions
+RUN_DEPENDS+=	mozc_server:${PORTSDIR}/japanese/mozc-server
 
 PLIST_FILES+=	${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el \
 		${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.elc \
diff --git a/japanese/mozc-server/distinfo b/japanese/mozc-server/distinfo
index 08e851f3fe46..b4127b3e2a52 100644
--- a/japanese/mozc-server/distinfo
+++ b/japanese/mozc-server/distinfo
@@ -1,8 +1,8 @@
-SHA256 (mozc-1.15.1868.102.tar.bz2) = c4935d6e2413dfe4683bc6b402a1911e60d942b94159ad66cc7754e643e45bf1
-SIZE (mozc-1.15.1868.102.tar.bz2) = 71791752
+SHA256 (mozc-2.16.2051.102.tar.bz2) = 11877306031afee3bbe39e2208340d27df21c90605c1cf48fe788ffa5cf249aa
+SIZE (mozc-2.16.2051.102.tar.bz2) = 36135991
 SHA256 (ken_all-20130628.lzh) = 78630e7f8b396603cde066c4a6d598c9af94bb97f415a68148dd3144dea18871
 SIZE (ken_all-20130628.lzh) = 1735995
 SHA256 (jigyosyo-20130628.lzh) = d7b796d8643457d883de4a33cb3edf7455f11d778ea74d07b450ea10f3339cf7
 SIZE (jigyosyo-20130628.lzh) = 823590
-SHA256 (fcitx-mozc-1.15.1834.102.1.patch) = fd1291cedfb0e14810f243b69244eab9a2468efcba024072edff839f03c12112
-SIZE (fcitx-mozc-1.15.1834.102.1.patch) = 140485
+SHA256 (fcitx-mozc-2.16.2037.102.2.patch) = ff175f3e0301c33f750780765ea264887827d00bc7a59fc8b55ae514ba449a1e
+SIZE (fcitx-mozc-2.16.2037.102.2.patch) = 140421
diff --git a/japanese/mozc-server/files/mozc.in b/japanese/mozc-server/files/mozc.in
new file mode 100644
index 000000000000..ccc05c882ea3
--- /dev/null
+++ b/japanese/mozc-server/files/mozc.in
@@ -0,0 +1,68 @@
+#!/bin/sh
+# $FreeBSD$
+: ${MOZCDIR:="${HOME}/.mozc"}
+
+# Mozc does not run by priviledged user.  Ignore silently.
+case $(id -u) in
+0)	exit 0 ;;
+esac
+
+mkdir -m 0700 -p "${MOZCDIR}"
+chmod 0700 "${MOZCDIR}"
+
+cleanup_lock()
+{
+	rm -f "${MOZCDIR}/.session.ipc" \
+	    "${MOZCDIR}/.server.lock" \
+	    "${MOZCDIR}/mozc_server.pid"
+}
+check_lock()
+{
+	if [ -r "${MOZCDIR}/.server.lock" ]; then
+		pid=$(cat "${MOZCDIR}/mozc_server.pid")
+		printf "mozc_server is running (PID=%s).\n" "$pid" \
+		    > /dev/stderr
+		false
+	fi
+}
+start_cmd()
+{
+	daemon -c -f -p "${MOZCDIR}/mozc_server.pid" \
+	    "%%PREFIX%%/bin/mozc_server"
+}
+stop_server()
+{
+	if [ -r "${MOZCDIR}/mozc_server.pid" ]; then
+		pkill -F "${MOZCDIR}/mozc_server.pid"
+	fi
+	for p in $(pgrep -U $(id -u) mozc_server); do
+		kill $p
+	done
+}
+
+case $1 in
+start)
+	check_lock || exit 1
+	start_cmd
+;;
+forcestart|restart)
+	stop_server
+	cleanup_lock
+	start_cmd
+;;
+stop|forcestop)
+	stop_server
+	cleanup_lock
+;;
+status)
+	pid=$(pgrep -U $(id -u) mozc_server)
+	case $pid in
+	[0-9]*)	echo $pid && exit 0 ;;
+	*)	exit 1 ;;
+	esac
+;;
+*)
+	echo "$0 [start|stop|restart|forcestart|forcestop|status]"
+	exit 1
+;;
+esac
diff --git a/japanese/mozc-server/files/mozc_tool.in b/japanese/mozc-server/files/mozc_tool.in
index e420a3b936ae..3fb7f8979b71 100644
--- a/japanese/mozc-server/files/mozc_tool.in
+++ b/japanese/mozc-server/files/mozc_tool.in
@@ -15,6 +15,6 @@ EOT
 	exit 1
 ;;
 *)
-	exec %%PREFIX%%/libexec/mozc_tool "$@"
+	exec %%PREFIX%%/libexec/mozc_tool --mode="$1"
 ;;
 esac
diff --git a/japanese/mozc-server/files/patch-gyp_common.gypi b/japanese/mozc-server/files/patch-gyp_common.gypi
index d09791839b99..9bfd1d793e18 100644
--- a/japanese/mozc-server/files/patch-gyp_common.gypi
+++ b/japanese/mozc-server/files/patch-gyp_common.gypi
@@ -1,18 +1,18 @@
---- gyp/common.gypi.orig	2014-08-31 03:36:19.000000000 +0900
-+++ gyp/common.gypi	2014-09-17 04:33:49.000000000 +0900
-@@ -171,9 +171,9 @@
+--- gyp/common.gypi.orig	2015-02-15 04:18:51.000000000 +0900
++++ gyp/common.gypi	2015-02-15 04:52:49.000000000 +0900
+@@ -161,9 +161,9 @@
        ['target_platform=="Linux"', {
          # enable_gtk_renderer represents if mozc_renderer is supported on Linux
          # or not.
--        'compiler_target': 'gcc',
+-        'compiler_target': 'clang',
 +        'compiler_target': '<(compiler_target)',
-         'compiler_target_version_int': 406,  # GCC 4.6 or higher
--        'compiler_host': 'gcc',
+         'compiler_target_version_int': 305,  # Clang 3.5 or higher
+-        'compiler_host': 'clang',
 +        'compiler_host': '<(compiler_host)',
-         'compiler_host_version_int': 406,  # GCC 4.6 or higher
+         'compiler_host_version_int': 305,  # Clang 3.5 or higher
          'enable_gtk_renderer%': 1,
        }, {  # else
-@@ -631,17 +631,20 @@
+@@ -621,17 +621,20 @@
            ['compiler_target=="clang"', {
              'cflags': [
                '-Wtype-limits',
@@ -36,7 +36,7 @@
              ],
            }],
          ],
-@@ -651,17 +654,20 @@
+@@ -641,17 +644,20 @@
            ['compiler_host=="clang"', {
              'cflags': [
                '-Wtype-limits',
@@ -60,7 +60,7 @@
              ],
            }],
          ],
-@@ -759,16 +765,27 @@
+@@ -744,16 +750,27 @@
        ['OS=="linux"', {
          'defines': [
            'OS_LINUX',