Date: Sat, 14 Feb 2015 22:12:21 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379025 - in head: . japanese japanese/fcitx-mozc japanese/fcitx-mozc/files japanese/ibus-mozc japanese/ibus-mozc/files japanese/mozc-additions japanese/mozc-server japanese/mozc-server... Message-ID: <201502142212.t1EMCLBU013712@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sat Feb 14 22:12:20 2015 New Revision: 379025 URL: https://svnweb.freebsd.org/changeset/ports/379025 QAT: https://qat.redports.org/buildarchive/r379025/ Log: 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. Added: head/japanese/fcitx-mozc/files/ head/japanese/fcitx-mozc/files/pkg-message.in (contents, props changed) head/japanese/ibus-mozc/files/ head/japanese/ibus-mozc/files/pkg-message.in - copied, changed from r377375, head/japanese/ibus-mozc/pkg-message head/japanese/mozc-server/files/mozc.in (contents, props changed) Deleted: head/japanese/fcitx-mozc/pkg-message head/japanese/ibus-mozc/pkg-message head/japanese/mozc-additions/ Modified: head/MOVED head/japanese/Makefile head/japanese/fcitx-mozc/Makefile head/japanese/ibus-mozc/Makefile head/japanese/mozc-server/Makefile head/japanese/mozc-server/distinfo head/japanese/mozc-server/files/mozc_tool.in head/japanese/mozc-server/files/patch-gyp_common.gypi Modified: head/MOVED ============================================================================== --- head/MOVED Sat Feb 14 22:10:05 2015 (r379024) +++ head/MOVED Sat Feb 14 22:12:20 2015 (r379025) @@ -7424,3 +7424,4 @@ devel/py-pylib|devel/py-py|2015-02-11|Re sysutils/brebis|sysutils/backupchecker|2015-02-12|Renamed to backupchecker sysutils/rsyslog7-devel|sysutils/rsyslog7|2015-02-13|Has expired: EoL, use sysutils/rsyslog7 sysutils/rsyslog8-devel|sysutils/rsyslog8|2015-02-13|Has expired: EoL, use sysutils/rsyslog8 +japanese/mozc-additions||2015-02-15|Obsoleted by mozc script in japanese/mozc-server Modified: head/japanese/Makefile ============================================================================== --- head/japanese/Makefile Sat Feb 14 22:10:05 2015 (r379024) +++ head/japanese/Makefile Sat Feb 14 22:12:20 2015 (r379025) @@ -162,7 +162,6 @@ SUBDIR += ming SUBDIR += monafonts SUBDIR += monafonts-ttf - SUBDIR += mozc-additions SUBDIR += mozc-el SUBDIR += mozc-server SUBDIR += mozc-tool Modified: head/japanese/fcitx-mozc/Makefile ============================================================================== --- head/japanese/fcitx-mozc/Makefile Sat Feb 14 22:10:05 2015 (r379024) +++ head/japanese/fcitx-mozc/Makefile Sat Feb 14 22:12:20 2015 (r379025) @@ -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 Added: head/japanese/fcitx-mozc/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/fcitx-mozc/files/pkg-message.in Sat Feb 14 22:12:20 2015 (r379025) @@ -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 Modified: head/japanese/ibus-mozc/Makefile ============================================================================== --- head/japanese/ibus-mozc/Makefile Sat Feb 14 22:10:05 2015 (r379024) +++ head/japanese/ibus-mozc/Makefile Sat Feb 14 22:12:20 2015 (r379025) @@ -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 Copied and modified: head/japanese/ibus-mozc/files/pkg-message.in (from r377375, head/japanese/ibus-mozc/pkg-message) ============================================================================== --- head/japanese/ibus-mozc/pkg-message Mon Jan 19 00:57:30 2015 (r377375, copy source) +++ head/japanese/ibus-mozc/files/pkg-message.in Sat Feb 14 22:12:20 2015 (r379025) @@ -1,38 +1,8 @@ -ibus-mozc installation finished. To use ibus-mozc, please do the following: +To activate ibus-mozc, please add the following into ~/.xinitrc, +~/.xsession, or ~/.kde4/env (for KDE4): -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. +%%PREFIX%%/bin/mozc start +ibus-daemon -r --daemonize --xim Modified: head/japanese/mozc-server/Makefile ============================================================================== --- head/japanese/mozc-server/Makefile Sat Feb 14 22:10:05 2015 (r379024) +++ head/japanese/mozc-server/Makefile Sat Feb 14 22:12:20 2015 (r379025) @@ -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 \ Modified: head/japanese/mozc-server/distinfo ============================================================================== --- head/japanese/mozc-server/distinfo Sat Feb 14 22:10:05 2015 (r379024) +++ head/japanese/mozc-server/distinfo Sat Feb 14 22:12:20 2015 (r379025) @@ -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 Added: head/japanese/mozc-server/files/mozc.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-server/files/mozc.in Sat Feb 14 22:12:20 2015 (r379025) @@ -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 Modified: head/japanese/mozc-server/files/mozc_tool.in ============================================================================== --- head/japanese/mozc-server/files/mozc_tool.in Sat Feb 14 22:10:05 2015 (r379024) +++ head/japanese/mozc-server/files/mozc_tool.in Sat Feb 14 22:12:20 2015 (r379025) @@ -15,6 +15,6 @@ EOT exit 1 ;; *) - exec %%PREFIX%%/libexec/mozc_tool "$@" + exec %%PREFIX%%/libexec/mozc_tool --mode="$1" ;; esac Modified: head/japanese/mozc-server/files/patch-gyp_common.gypi ============================================================================== --- head/japanese/mozc-server/files/patch-gyp_common.gypi Sat Feb 14 22:10:05 2015 (r379024) +++ head/japanese/mozc-server/files/patch-gyp_common.gypi Sat Feb 14 22:12:20 2015 (r379025) @@ -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',
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502142212.t1EMCLBU013712>