Index: head/japanese/fcitx-mozc/Makefile =================================================================== --- head/japanese/fcitx-mozc/Makefile (revision 494681) +++ head/japanese/fcitx-mozc/Makefile (revision 494682) @@ -1,16 +1,15 @@ # Created by: Daichi GOTO # $FreeBSD$ -PORTREVISION= 15 PKGNAMEPREFIX= ja-fcitx- COMMENT= Mozc engine for Fcitx DATADIR= ${PREFIX}/share/fcitx/${PORTNAME} MASTERDIR= ${.CURDIR}/../../japanese/mozc-server FILESDIR= ${.CURDIR}/files SUB_FILES= pkg-message BUILD_MOZC_LIST= fcitx_mozc .include "${MASTERDIR}/Makefile" Index: head/japanese/ibus-mozc/Makefile =================================================================== --- head/japanese/ibus-mozc/Makefile (revision 494681) +++ head/japanese/ibus-mozc/Makefile (revision 494682) @@ -1,16 +1,15 @@ # Created by: Daichi GOTO # $FreeBSD$ -PORTREVISION= 15 PKGNAMEPREFIX= ja-ibus- COMMENT= Mozc engine for IBus DATADIR= ${PREFIX}/share/ibus-${PORTNAME} MASTERDIR= ${.CURDIR}/../../japanese/mozc-server FILESDIR= ${.CURDIR}/files SUB_FILES= pkg-message BUILD_MOZC_LIST= ibus_mozc .include "${MASTERDIR}/Makefile" Index: head/japanese/mozc-el/Makefile =================================================================== --- head/japanese/mozc-el/Makefile (revision 494681) +++ head/japanese/mozc-el/Makefile (revision 494682) @@ -1,14 +1,13 @@ # Created by: TAKANO, Yuji # $FreeBSD$ -PORTREVISION= 3 PKGNAMESUFFIX= -el${EMACS_PKGNAMESUFFIX} COMMENT= Emacs input method for Mozc MASTERDIR= ${.CURDIR}/../../japanese/mozc-server PKGMESSAGE= ${.CURDIR}/pkg-message BUILD_MOZC_LIST=mozc_el .include "${MASTERDIR}/Makefile" Index: head/japanese/mozc-server/Makefile =================================================================== --- head/japanese/mozc-server/Makefile (revision 494681) +++ head/japanese/mozc-server/Makefile (revision 494682) @@ -1,407 +1,411 @@ # Created by: Daichi GOTO # $FreeBSD$ PORTNAME= mozc -PORTVERSION= 2.20.2677.102.02 +PORTVERSION= 2.23.2815.102.00 DISTVERSIONPREFIX= v -PORTREVISION?= 14 CATEGORIES= japanese MAINTAINER= hrs@FreeBSD.org COMMENT?= Mozc Japanese Input Method, Server LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ninja:devel/ninja \ - gyp:devel/py-gyp + gyp:devel/py-gyp@${PY_FLAVOR} EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_PORTSDIR} LIB_DEPENDS= libprotobuf.so:devel/protobuf \ libzinnia.so:japanese/zinnia RUN_DEPENDS= xdg-open:devel/xdg-utils BROKEN_powerpc= fails to compile: segfault BROKEN_powerpc64= fails to install: gyp: Call to 'which clang' returned exit status 1 while in client/client.gyp BROKEN_sparc64= fails to compile: segfault USE_GITHUB= yes GH_ACCOUNT= hrs-allbsd GH_TUPLE= hiroyuki-komatsu:japanese-usage-dictionary:e5b3425:udic USES= compiler:c++11-lang pkgconfig gmake \ tar:bzip2 python:2.7,build shebangfix SHEBANG_FILES= src/build_mozc.py BUILD_WRKSRC= ${WRKSRC}/src BUILD_MOZC_LIST?= mozc_server .if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server" PKGNAMEPREFIX= ja- PKGNAMESUFFIX= -server LICENSE= BSD3CLAUSE NAISTL LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE LICENSE_DISTFILES_BSD3CLAUSE= ${DISTNAME}${EXTRACT_SUFX} LICENSE_NAME_NAISTL= Nara Institute of Science and Technology License LICENSE_PERMS_NAISTL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_FILE_NAISTL= ${WRKSRC}/src/data/dictionary_oss/README.txt LICENSE_DISTFILES_NAISTL=${DISTNAME}${EXTRACT_SUFX} .elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool" -USES+= qt:5 +USES+= qt:5 gnome USE_GNOME= glib20 gtk20 USE_QT= buildtools core gui widgets .elif ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" -USES+= gettext-runtime +USES+= gettext-runtime gnome USE_XORG= xcb USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 .elif ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el" USES+= emacs .elif ${BUILD_MOZC_LIST:Mfcitx_mozc} USES+= gettext-tools .endif # Use GCC only when the stock clang does not have libc++.so. .if exists(/usr/bin/clang) && exists(/usr/lib/libc++.so) _CCTYPE= clang .else USE_GCC= yes _CCTYPE= gcc .endif .include GYP_DEFINES= use_libprotobuf=1 \ channel_dev=0 \ enable_unittest=0 \ compiler_host='${_CCTYPE}' \ compiler_target='${_CCTYPE}' \ use_libzinnia=1 \ zinnia_model_file='${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model' \ ibus_mozc_icon_path='${LOCALBASE}/share/ibus-mozc/icons/product_icon.png' \ ibus_mozc_path='${PREFIX}/libexec/ibus-engine-mozc' BUILD_MODE= Release BUILD_CMD= ${SETENV} ${MAKE_ENV} PATH=/bin:/usr/bin:${PATH} ${MAKE_CMD} BUILD_MOZC_CMD= cd ${BUILD_WRKSRC} && \ ${SETENV} BUILD_COMMAND="${BUILD_WRKSRC}/mozcmake" \ PATH="${PATH}" \ GYP_DEFINES="${GYP_DEFINES}" \ PYTHONPATH=${PYTHON_SITELIBDIR}/gyp \ CC_host="${CC}" \ CC_target="${CC}" \ CXX_host="${CXX}" \ CXX_target="${CXX}" \ LD_host="${CXX}" \ AR_host="${AR}" \ ${MAKE_ENV} \ ${PYTHON_CMD} build_mozc.py BUILD_MOZC_CMD_BUILD= ${BUILD_MOZC_CMD} build -c ${BUILD_MODE} ${_MAKE_JOBS} BUILD_GYP_CMD= ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/gyp +post-extract: # XXX: do not activate fcitx5 + ${RM} -r ${WRKSRC}/src/unix/fcitx5 post-patch: ${FIND} ${BUILD_WRKSRC} \( -name '*.gyp' -o -name '*.gypi' \) -exec \ ${REINPLACE_CMD} "s,'python','${PYTHON_CMD}',g" {} \; .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" ${REINPLACE_CMD} 's,/po/mo},%po}mo,g' \ ${BUILD_WRKSRC}/unix/fcitx/gen_fcitx_mozc_i18n.sh ${REINPLACE_CMD} "s,/usr,${LOCALBASE:Q}," \ ${BUILD_WRKSRC}/unix/fcitx/mozc.conf .endif .if !${BUILD_MOZC_LIST:Mmozc_el} ${BUILD_WRKSRC}/mozcmake: ${PRINTF} "%s\n\n%s\n" "#!/bin/sh" 'exec ${BUILD_CMD} "$$@"' \ > ${BUILD_WRKSRC}/mozcmake ${CHMOD} +x ${BUILD_WRKSRC}/mozcmake post-configure: ${BUILD_WRKSRC}/mozcmake ${BUILD_MOZC_CMD} gyp \ --gypdir=${LOCALBASE}/bin \ --server_dir="${PREFIX}/bin" \ --tool_dir="${PREFIX}/libexec" \ --renderer_dir="${PREFIX}/libexec" \ --localbase="${LOCALBASE}" \ --ldflags="${LDFLAGS} -fstack-protector -L${LOCALBASE}/lib" \ --cflags="${CFLAGS:Q}" \ --cflags_cc="${CXXFLAGS:Q}" \ --include_dirs="${LOCALBASE}/include" \ ${GYP_OPTIONS} .endif # mozc_server .if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server" || make(makesum) GYP_OPTIONS+= --noqt GYP_DEFINES+= use_libibus=0 \ enable_gtk_renderer=0 MASTER_SITES+= LOCAL/kuriyama:zipcode DISTFILES+= \ - ken_all-20161031.zip:zipcode \ - jigyosyo-20161031.zip:zipcode + ken_all-20181228.zip:zipcode \ + jigyosyo-20181228.zip:zipcode PLIST_FILES+= bin/mozc \ bin/mozc_server \ libexec/mozc_emacs_helper SUB_FILES+= mozc post-extract-mozc_server: @for F in ${DISTFILES:M*\:zipcode:C/\:zipcode//}; do \ ${UNZIP_NATIVE_CMD} -L -d ${BUILD_WRKSRC}/data/dictionary_oss \ ${DISTDIR}/$$F; \ done cd ${BUILD_WRKSRC}/data/dictionary_oss && \ ${SETENV} PYTHONPATH=${BUILD_WRKSRC} \ ${PYTHON_CMD} ${BUILD_WRKSRC}/dictionary/gen_zip_code_seed.py \ --zip_code=ken_all.csv --jigyosyo=jigyosyo.csv \ >> dictionary09.txt ${MV} ${WRKSRC_udic}/usage_dict.txt \ ${BUILD_WRKSRC}/third_party/japanese_usage_dictionary post-extract: post-extract-mozc_server do-build-mozc_server: ${BUILD_MOZC_CMD_BUILD} server/server.gyp:mozc_server ${BUILD_MOZC_CMD_BUILD} unix/emacs/emacs.gyp:mozc_emacs_helper do-install-mozc_server: ${INSTALL_PROGRAM} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_server \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_emacs_helper \ ${STAGEDIR}${PREFIX}/libexec ${INSTALL_SCRIPT} \ ${WRKDIR}/mozc ${STAGEDIR}/${PREFIX}/bin .endif # mozc_tool .if ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool" GYP_DEFINES+= use_libibus=0 \ enable_gtk_renderer=1 RUN_DEPENDS+= ${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model:japanese/tegaki-zinnia-japanese PLIST_FILES+= libexec/mozc_tool \ bin/mozc_tool \ %%DATADIR%%/icons/product_logo.png \ %%DATADIR%%/icons/update_uptodate.png SUB_FILES+= mozc_tool do-build-mozc_tool: ${BUILD_MOZC_CMD_BUILD} gui/gui.gyp:mozc_tool do-install-mozc_tool: ${INSTALL_PROGRAM} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_tool \ ${STAGEDIR}${PREFIX}/libexec ${INSTALL_SCRIPT} ${WRKDIR}/mozc_tool ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR}/icons ${INSTALL_DATA} \ ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \ ${STAGEDIR}${DATADIR}/icons/product_logo.png ${INSTALL_DATA} \ ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \ ${STAGEDIR}${DATADIR}/icons/update_uptodate.png .endif # ibus_mozc .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" GYP_OPTIONS+= --noqt GYP_DEFINES+= use_libibus=1 \ enable_gtk_renderer=1 LIB_DEPENDS+= libibus-1.0.so:textproc/ibus RUN_DEPENDS+= mozc_server:japanese/mozc-server \ mozc_tool:japanese/mozc-tool \ - ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify + ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify@${PY_FLAVOR} PLIST_FILES+= libexec/mozc_renderer \ libexec/ibus-engine-mozc \ %%DATADIR%%/icons/alpha_full.png \ %%DATADIR%%/icons/alpha_half.png \ %%DATADIR%%/icons/dictionary.png \ %%DATADIR%%/icons/direct.png \ %%DATADIR%%/icons/hiragana.png \ %%DATADIR%%/icons/katakana_full.png \ %%DATADIR%%/icons/katakana_half.png \ %%DATADIR%%/icons/product_icon.png \ %%DATADIR%%/icons/properties.png \ %%DATADIR%%/icons/tool.png \ share/ibus/component/mozc.xml PLIST_DIRS+= %%DATADIR%%/icons ${DATADIR_REL} do-build-ibus_mozc: ${BUILD_MOZC_CMD_BUILD} \ unix/ibus/ibus.gyp:ibus_mozc \ renderer/renderer.gyp:mozc_renderer do-install-ibus_mozc: ${INSTALL_PROGRAM} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_renderer \ ${STAGEDIR}${PREFIX}/libexec/mozc_renderer ${INSTALL_PROGRAM} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/ibus_mozc \ ${STAGEDIR}${PREFIX}/libexec/ibus-engine-mozc ${MKDIR} ${STAGEDIR}${PREFIX}/share/ibus/component ${INSTALL_DATA} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/gen/unix/ibus/mozc.xml \ ${STAGEDIR}${PREFIX}/share/ibus/component/mozc.xml @${MKDIR} ${STAGEDIR}${DATADIR}/icons .for F in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \ ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool ${INSTALL_DATA} \ ${BUILD_WRKSRC}/data/images/unix/${F}.png \ ${STAGEDIR}${DATADIR}/icons/${F:S/^ui-//}.png .endfor ${INSTALL_DATA} \ ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \ ${STAGEDIR}${DATADIR}/icons/product_icon.png .endif # uim_mozc .if ${BUILD_MOZC_LIST:Muim_mozc} == "uim_mozc" || make(makesum) GH_TUPLE+= e-kato:macuim:v0.6.16.2.1:MU LIB_DEPENDS+= libuim.so:textproc/uim RUN_DEPENDS+= mozc_server:japanese/mozc-server \ mozc_tool:japanese/mozc-tool EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-unix-uim-mozc.cc \ - ${PATCHDIR}/extra-patch-src-unix-uim-uim.gyp + ${PATCHDIR}/extra-patch-src-unix-uim-uim.gyp \ + ${PATCHDIR}/extra-patch-src-unix-uim-key_translator.h \ + ${PATCHDIR}/extra-patch-src-unix-uim-key_translator.cc PLIST_FILES+= lib/uim/plugin/libuim-mozc.so \ %%DATADIR%%/mozc.scm \ %%DATADIR%%/mozc-custom.scm \ %%DATADIR%%/mozc-key-custom.scm \ %%DATADIR%%/pixmaps/mozc.png \ - "@postexec ${LOCALBASE}/bin/uim-module-manager --register mozc" \ + "@postexec ${SETENV} MOZC_NOLOG=true ${LOCALBASE}/bin/uim-module-manager --register mozc" \ "@preunexec ${LOCALBASE}/bin/uim-module-manager --unregister mozc" GYP_OPTIONS+= --noqt GYP_DEFINES+= use_libibus=0 \ enable_gtk_renderer=0 post-extract-uim_mozc: ${MV} ${WRKSRC_MU}/Mozc/uim ${BUILD_WRKSRC}/unix ${REINPLACE_CMD} -e "s,/usr/lib/mozc,${LOCALBASE}/libexec," \ ${WRKSRC_MU}/Mozc/scm/mozc-custom.scm post-extract: post-extract-uim_mozc do-build-uim_mozc: ${BUILD_MOZC_CMD_BUILD} \ unix/uim/uim.gyp:uim-mozc do-install-uim_mozc: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/uim/plugin ${INSTALL_PROGRAM} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/libuim-mozc.so \ ${STAGEDIR}${PREFIX}/lib/uim/plugin ${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC_MU}/Mozc/scm && \ ${INSTALL_DATA} mozc.scm mozc-custom.scm mozc-key-custom.scm \ ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DATADIR}/pixmaps ${INSTALL_DATA} \ ${BUILD_WRKSRC}/data/images/product_icon_32bpp-128.png \ ${STAGEDIR}${DATADIR}/pixmaps/mozc.png .endif # fcitx_mozc .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" -GYP_OPTIONS+= --noqt --use_fcitx +GYP_OPTIONS+= --noqt GYP_DEFINES+= use_libibus=0 \ - enable_gtk_renderer=0 + enable_gtk_renderer=0 \ + use_fcitx="YES" LIB_DEPENDS+= libfcitx-core.so:chinese/fcitx RUN_DEPENDS+= mozc_server:japanese/mozc-server \ mozc_tool:japanese/mozc-tool PLIST_FILES+= lib/fcitx/fcitx-mozc.so \ share/fcitx/addon/fcitx-mozc.conf \ share/fcitx/inputmethod/mozc.conf \ %%DATADIR%%/icon/mozc.png \ %%DATADIR%%/icon/mozc-alpha_full.png \ %%DATADIR%%/icon/mozc-alpha_half.png \ %%DATADIR%%/icon/mozc-direct.png \ %%DATADIR%%/icon/mozc-hiragana.png \ %%DATADIR%%/icon/mozc-katakana_full.png \ %%DATADIR%%/icon/mozc-katakana_half.png \ %%DATADIR%%/icon/mozc-dictionary.png \ %%DATADIR%%/icon/mozc-properties.png \ %%DATADIR%%/icon/mozc-tool.png \ share/locale/ja/LC_MESSAGES/fcitx-mozc.mo \ share/locale/zh_CN/LC_MESSAGES/fcitx-mozc.mo \ share/locale/zh_TW/LC_MESSAGES/fcitx-mozc.mo PLIST_DIRS+= %%DATADIR%%/icon ${DATADIR_REL} do-build-fcitx_mozc: ${BUILD_MOZC_CMD_BUILD} unix/fcitx/fcitx.gyp:fcitx-mozc do-install-fcitx_mozc: @${MKDIR} \ ${STAGEDIR}${PREFIX}/lib/fcitx \ ${STAGEDIR}${PREFIX}/share/fcitx/addon \ ${STAGEDIR}${PREFIX}/share/fcitx/inputmethod ${INSTALL_LIB} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/fcitx-mozc.so \ ${STAGEDIR}${PREFIX}/lib/fcitx/fcitx-mozc.so ${INSTALL_DATA} \ ${BUILD_WRKSRC}/unix/fcitx/fcitx-mozc.conf \ ${STAGEDIR}${PREFIX}/share/fcitx/addon/fcitx-mozc.conf ${INSTALL_DATA} \ ${BUILD_WRKSRC}/unix/fcitx/mozc.conf \ ${STAGEDIR}${PREFIX}/share/fcitx/inputmethod/mozc.conf @${MKDIR} ${STAGEDIR}${DATADIR}/icon .for F in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \ ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool ${INSTALL_DATA} \ ${BUILD_WRKSRC}/data/images/unix/${F}.png \ ${STAGEDIR}${DATADIR}/icon/${F:S,^ui-,mozc-,}.png .endfor ${INSTALL_DATA} \ ${BUILD_WRKSRC}/data/images/product_icon_32bpp-128.png \ ${STAGEDIR}${DATADIR}/icon/mozc.png .for L in ja zh_CN zh_TW ${INSTALL_DATA} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/gen/unix/fcitx/po/${L}.mo \ ${STAGEDIR}${PREFIX}/share/locale/${L}/LC_MESSAGES/fcitx-mozc.mo .endfor .endif # mozc_el .if ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el" CATEGORIES+= elisp RUN_DEPENDS+= mozc_server:japanese/mozc-server PLIST_FILES+= ${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.elc \ ${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el.gz \ ${EMACS_VERSION_SITE_LISPDIR}/mozc/leim-list.el PLIST_DIRS+= ${EMACS_VERSION_SITE_LISPDIR}/mozc post-patch-mozc_el: ${REINPLACE_CMD} "s,%%PREFIX%%,${PREFIX}," \ ${BUILD_WRKSRC}/unix/emacs/mozc.el post-patch: post-patch-mozc_el do-build-mozc_el: cd ${BUILD_WRKSRC}/unix/emacs && \ ${EMACS_CMD} -batch -q -no-site-file -no-init-file \ -f batch-byte-compile mozc.el && \ ${GZIP_CMD} mozc.el do-install-mozc_el: @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc ${INSTALL_DATA} \ ${BUILD_WRKSRC}/unix/emacs/mozc.el.gz \ ${BUILD_WRKSRC}/unix/emacs/mozc.elc \ ${FILESDIR}/leim-list.el \ ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc/ .endif do-build: ${BUILD_MOZC_LIST:S/^/do-build-/} do-install: ${BUILD_MOZC_LIST:S/^/do-install-/} .include Index: head/japanese/mozc-server/distinfo =================================================================== --- head/japanese/mozc-server/distinfo (revision 494681) +++ head/japanese/mozc-server/distinfo (revision 494682) @@ -1,11 +1,11 @@ -TIMESTAMP = 1483299024 -SHA256 (ken_all-20161031.zip) = a363eefa9867c497b12bf5a603f64426af7bd938733c2925dd2747150d2cdd42 -SIZE (ken_all-20161031.zip) = 1685061 -SHA256 (jigyosyo-20161031.zip) = 1a8d9cf30421a5bdfbccb6e3d9fc4f141895821ac0275425a60ad858e38c2a43 -SIZE (jigyosyo-20161031.zip) = 754418 -SHA256 (hrs-allbsd-mozc-v2.20.2677.102.02_GH0.tar.gz) = 55fff5f29aae002a0e0ed445a039c543174313e57f78a040f86b2793976e24f0 -SIZE (hrs-allbsd-mozc-v2.20.2677.102.02_GH0.tar.gz) = 37575296 +TIMESTAMP = 1551724666 +SHA256 (ken_all-20181228.zip) = 814257c9c93d4393bedb4025542a4b54def16fd6e88268b03e29fe6d19ba10da +SIZE (ken_all-20181228.zip) = 1687342 +SHA256 (jigyosyo-20181228.zip) = 9d3b7a11c1b851c70a41f4dc6cf3bffd800f3cf254bcad1d65ea0829fc67bb5d +SIZE (jigyosyo-20181228.zip) = 763205 +SHA256 (hrs-allbsd-mozc-v2.23.2815.102.00_GH0.tar.gz) = 9e9415c4dcd261308177592d944a5e6d72fc75cef8e28384072966a1ba4446fc +SIZE (hrs-allbsd-mozc-v2.23.2815.102.00_GH0.tar.gz) = 36711684 SHA256 (hiroyuki-komatsu-japanese-usage-dictionary-e5b3425_GH0.tar.gz) = 2af954cd844c6a3113449d7dca37e36b769ecb2b49d3a54318a3bdee1a75af56 SIZE (hiroyuki-komatsu-japanese-usage-dictionary-e5b3425_GH0.tar.gz) = 71050 SHA256 (e-kato-macuim-v0.6.16.2.1_GH0.tar.gz) = ae999a2f02379bd049484a22684c37be5eb1f4db9763fa79885c4981502336e9 SIZE (e-kato-macuim-v0.6.16.2.1_GH0.tar.gz) = 324549 Index: head/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.cc =================================================================== --- head/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.cc (nonexistent) +++ head/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.cc (revision 494682) @@ -0,0 +1,33 @@ +--- src/unix/uim/key_translator.cc.orig 2019-03-04 19:32:08.940982000 +0900 ++++ src/unix/uim/key_translator.cc 2019-03-04 19:32:33.285357000 +0900 +@@ -368,25 +368,25 @@ + + void KeyTranslator::Init() { + for (int i = 0; i < arraysize(special_key_map); ++i) { +- CHECK(special_key_map_.insert(make_pair(special_key_map[i].from, ++ CHECK(special_key_map_.insert(std::make_pair(special_key_map[i].from, + special_key_map[i].to)).second); + } + for (int i = 0; i < arraysize(modifier_key_map); ++i) { +- CHECK(modifier_key_map_.insert(make_pair(modifier_key_map[i].from, ++ CHECK(modifier_key_map_.insert(std::make_pair(modifier_key_map[i].from, + modifier_key_map[i].to)).second); + } + for (int i = 0; i < arraysize(modifier_mask_map); ++i) { +- CHECK(modifier_mask_map_.insert(make_pair(modifier_mask_map[i].from, ++ CHECK(modifier_mask_map_.insert(std::make_pair(modifier_mask_map[i].from, + modifier_mask_map[i].to)).second); + } + for (int i = 0; i < arraysize(kana_map_jp); ++i) { + CHECK(kana_map_jp_.insert( +- make_pair(kana_map_jp[i].code, make_pair( ++ std::make_pair(kana_map_jp[i].code, std::make_pair( + kana_map_jp[i].no_shift, kana_map_jp[i].shift))).second); + } + for (int i = 0; i < arraysize(kana_map_us); ++i) { + CHECK(kana_map_us_.insert( +- make_pair(kana_map_us[i].code, make_pair( ++ std::make_pair(kana_map_us[i].code, std::make_pair( + kana_map_us[i].no_shift, kana_map_us[i].shift))).second); + } + } Property changes on: head/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.h =================================================================== --- head/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.h (nonexistent) +++ head/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.h (revision 494682) @@ -0,0 +1,13 @@ +--- src/unix/uim/key_translator.h.orig 2015-07-15 10:04:31.000000000 +0900 ++++ src/unix/uim/key_translator.h 2019-03-04 19:28:03.722916000 +0900 +@@ -62,8 +62,8 @@ + + private: + typedef hash_map SpecialKeyMap; +- typedef map ModifierKeyMap; +- typedef map > KanaMap; ++ typedef std::map ModifierKeyMap; ++ typedef std::map > KanaMap; + + // Returns true iff key is modifier key such as SHIFT, ALT, or CAPSLOCK. + bool IsModifierKey(unsigned int keyval, Property changes on: head/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc =================================================================== --- head/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc (revision 494681) +++ head/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc (revision 494682) @@ -1,19 +1,28 @@ ---- src/unix/uim/mozc.cc.orig 2016-05-11 00:39:29.009401000 +0900 -+++ src/unix/uim/mozc.cc 2016-05-11 00:40:58.320083000 +0900 +--- src/unix/uim/mozc.cc.orig 2015-07-15 10:04:31.000000000 +0900 ++++ src/unix/uim/mozc.cc 2019-03-04 19:35:14.711403000 +0900 @@ -48,6 +48,7 @@ # include "plugin.h" #endif +#include "base/init_mozc.h" #include "base/port.h" #include "base/util.h" #include "protocol/config.pb.h" +@@ -902,7 +903,7 @@ + int i; + + for (i = 0; key_tab[i].key; i++) +- key_map.insert(make_pair(key_tab[i].str, key_tab[i].key)); ++ key_map.insert(std::make_pair(key_tab[i].str, key_tab[i].key)); + } + + static uim_lisp @@ -1196,7 +1197,7 @@ argv[0] = (char *)name; argv[1] = NULL; - InitGoogle((const char *)argv[0], &argc, (char ***)&argv, true); + mozc::InitMozc((const char *)argv[0], &argc, (char ***)&argv, true); mozc::uim::install_keymap(); } Index: head/japanese/mozc-server/files/patch-src-base-init_mozc.cc =================================================================== --- head/japanese/mozc-server/files/patch-src-base-init_mozc.cc (nonexistent) +++ head/japanese/mozc-server/files/patch-src-base-init_mozc.cc (revision 494682) @@ -0,0 +1,21 @@ +--- src/base/init_mozc.cc.orig 2019-03-04 18:35:55 UTC ++++ src/base/init_mozc.cc +@@ -35,6 +35,7 @@ + #endif // OS_WIN + + #include ++#include + + #include "base/file_util.h" + #include "base/flags.h" +@@ -94,7 +95,9 @@ void InitMozc(const char *arg0, int *argc, char ***arg + mozc_flags::ParseCommandLineFlags(argc, argv, remove_flags); + + const string program_name = *argc > 0 ? (*argv)[0] : "UNKNOWN"; +- Logging::InitLogStream(GetLogFilePathFromProgramName(program_name)); ++ const char *nolog = getenv("MOZC_NOLOG"); ++ if (nolog == NULL) ++ Logging::InitLogStream(GetLogFilePathFromProgramName(program_name)); + + } + Property changes on: head/japanese/mozc-server/files/patch-src-base-init_mozc.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/japanese/mozc-server/files/patch-src-unix_emacs_mozc.el =================================================================== --- head/japanese/mozc-server/files/patch-src-unix_emacs_mozc.el (revision 494681) +++ head/japanese/mozc-server/files/patch-src-unix_emacs_mozc.el (revision 494682) @@ -1,43 +1,43 @@ ---- src/unix/emacs/mozc.el.orig 2015-02-15 04:18:31.000000000 +0900 -+++ src/unix/emacs/mozc.el 2015-02-19 04:01:46.000000000 +0900 -@@ -1538,7 +1538,7 @@ +--- src/unix/emacs/mozc.el.orig 2019-03-04 18:35:55 UTC ++++ src/unix/emacs/mozc.el +@@ -1540,7 +1540,7 @@ Return the new value of `mozc-session-seq'." ;;;; Communication with Mozc server through the helper process -(defvar mozc-helper-program-name "mozc_emacs_helper" +(defvar mozc-helper-program-name "%%PREFIX%%/libexec/mozc_emacs_helper" "Helper program's name or path to the helper program. The helper program helps Emacs communicate with Mozc server, which doesn't understand S-expression.") -@@ -1973,12 +1973,12 @@ +@@ -1975,12 +1975,12 @@ INPUT-METHOD is not used." "Deactivate function `mozc-mode' via LEIM." (mozc-mode nil)) -(defcustom mozc-leim-title "[Mozc]" - "Mode line string shown when function `mozc-mode' is enabled. -This indicator is not shown when you don't use LEIM." - :type '(choice (const :tag "No indicator" nil) - (string :tag "Show an indicator")) - :group 'mozc) +;;(defcustom mozc-leim-title "[Mozc]" +;; "Mode line string shown when function `mozc-mode' is enabled. +;;This indicator is not shown when you don't use LEIM." +;; :type '(choice (const :tag "No indicator" nil) +;; (string :tag "Show an indicator")) +;; :group 'mozc) (defun mozc-leim-register-input-method () "Register function `mozc-mode' as an input method of LEIM. -@@ -1994,10 +1994,10 @@ +@@ -1996,10 +1996,10 @@ Do nothing if LEIM is not available." ;; Register mozc-mode as an input method after the init file has been read ;; so the user has a chance to specify `mozc-leim-title' in the init file ;; after loading this file. -(add-hook 'emacs-startup-hook #'mozc-leim-register-input-method) +;;(add-hook 'emacs-startup-hook #'mozc-leim-register-input-method) ;; In the case that `emacs-startup-hook' has already been run, especially ;; when the user loads this file interactively, register immediately. -(mozc-leim-register-input-method) +;;(mozc-leim-register-input-method) Index: head/japanese/mozc-tool/Makefile =================================================================== --- head/japanese/mozc-tool/Makefile (revision 494681) +++ head/japanese/mozc-tool/Makefile (revision 494682) @@ -1,13 +1,12 @@ # Created by: Daichi GOTO # $FreeBSD$ -PORTREVISION= 15 PKGNAMESUFFIX= -tool COMMENT= Mozc tool for IBus, SCIM, and others DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} MASTERDIR= ${.CURDIR}/../../japanese/mozc-server BUILD_MOZC_LIST= mozc_tool .include "${MASTERDIR}/Makefile" Index: head/japanese/uim-mozc/Makefile =================================================================== --- head/japanese/uim-mozc/Makefile (revision 494681) +++ head/japanese/uim-mozc/Makefile (revision 494682) @@ -1,16 +1,15 @@ # Created by: Koichiro IWAO # $FreeBSD$ -PORTREVISION= 15 PKGNAMEPREFIX= ja-uim- COMMENT= Mozc engine for uim MASTERDIR= ${.CURDIR}/../../japanese/mozc-server FILESDIR= ${.CURDIR}/files DATADIR= ${PREFIX}/share/uim SUB_FILES= pkg-message BUILD_MOZC_LIST=uim_mozc .include "${MASTERDIR}/Makefile"