Date: Sat, 15 Aug 2020 01:21:01 +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: r544906 - in head: devel/py-gyp japanese/fcitx-mozc japanese/ibus-mozc japanese/mozc-el japanese/mozc-server japanese/uim-mozc Message-ID: <202008150121.07F1L1s3030504@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sat Aug 15 01:21:00 2020 New Revision: 544906 URL: https://svnweb.freebsd.org/changeset/ports/544906 Log: Update japanese/mozc-{server,el,tool} and japanese/{fcitx,ibus,uim}-mozc to 2.23.2815.102.01, and devel/py-gyp to a snapshot as of 20200512. Changes include: - Migration to Python 3. - Update of the zipcode dictionary to 20200430. - Fix of the icon path for fcitx. Modified: head/devel/py-gyp/Makefile head/devel/py-gyp/distinfo head/japanese/fcitx-mozc/Makefile head/japanese/ibus-mozc/Makefile head/japanese/mozc-el/Makefile head/japanese/mozc-server/Makefile head/japanese/mozc-server/distinfo head/japanese/uim-mozc/Makefile Modified: head/devel/py-gyp/Makefile ============================================================================== --- head/devel/py-gyp/Makefile Sat Aug 15 00:52:24 2020 (r544905) +++ head/devel/py-gyp/Makefile Sat Aug 15 01:21:00 2020 (r544906) @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= gyp -PORTVERSION= 20160504 +PORTVERSION= 20200512 CATEGORIES= devel python -MASTER_SITES= LOCAL/hrs PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= ${PORTNAME}-e679e688ba6db12336b79650c27fcf8a5ed21e60 MAINTAINER= hrs@FreeBSD.org COMMENT= Build System That Generates Other Build Systems @@ -14,7 +12,9 @@ COMMENT= Build System That Generates Other Build Syste LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python:2.7 +USES= python:3.5+ +USE_GITHUB= yes +GH_ACCOUNT= hrs-allbsd USE_PYTHON= autoplist distutils NO_ARCH= yes Modified: head/devel/py-gyp/distinfo ============================================================================== --- head/devel/py-gyp/distinfo Sat Aug 15 00:52:24 2020 (r544905) +++ head/devel/py-gyp/distinfo Sat Aug 15 01:21:00 2020 (r544906) @@ -1,2 +1,3 @@ -SHA256 (gyp-e679e688ba6db12336b79650c27fcf8a5ed21e60.tar.gz) = 51fadf46a7a108b0c8f273fb726b113609d7be5394d286716cbf472d1327d18c -SIZE (gyp-e679e688ba6db12336b79650c27fcf8a5ed21e60.tar.gz) = 620920 +TIMESTAMP = 1597418236 +SHA256 (hrs-allbsd-gyp-20200512_GH0.tar.gz) = 22db1aec59725a051b242b99455000f508f4469fab85b18131ac547bb40f9dcd +SIZE (hrs-allbsd-gyp-20200512_GH0.tar.gz) = 628340 Modified: head/japanese/fcitx-mozc/Makefile ============================================================================== --- head/japanese/fcitx-mozc/Makefile Sat Aug 15 00:52:24 2020 (r544905) +++ head/japanese/fcitx-mozc/Makefile Sat Aug 15 01:21:00 2020 (r544906) @@ -5,8 +5,6 @@ PKGNAMEPREFIX= ja-fcitx- COMMENT= Mozc engine for Fcitx -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 DATADIR= ${PREFIX}/share/fcitx/${PORTNAME} MASTERDIR= ${.CURDIR}/../../japanese/mozc-server Modified: head/japanese/ibus-mozc/Makefile ============================================================================== --- head/japanese/ibus-mozc/Makefile Sat Aug 15 00:52:24 2020 (r544905) +++ head/japanese/ibus-mozc/Makefile Sat Aug 15 01:21:00 2020 (r544906) @@ -5,8 +5,6 @@ PKGNAMEPREFIX= ja-ibus- COMMENT= Mozc engine for IBus -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 DATADIR= ${PREFIX}/share/ibus-${PORTNAME} MASTERDIR= ${.CURDIR}/../../japanese/mozc-server Modified: head/japanese/mozc-el/Makefile ============================================================================== --- head/japanese/mozc-el/Makefile Sat Aug 15 00:52:24 2020 (r544905) +++ head/japanese/mozc-el/Makefile Sat Aug 15 01:21:00 2020 (r544906) @@ -1,7 +1,6 @@ # Created by: TAKANO, Yuji # $FreeBSD$ -PORTREVISION= 2 PKGNAMESUFFIX= -el${EMACS_PKGNAMESUFFIX} COMMENT= Emacs input method for Mozc Modified: head/japanese/mozc-server/Makefile ============================================================================== --- head/japanese/mozc-server/Makefile Sat Aug 15 00:52:24 2020 (r544905) +++ head/japanese/mozc-server/Makefile Sat Aug 15 01:21:00 2020 (r544906) @@ -2,16 +2,15 @@ # $FreeBSD$ PORTNAME= mozc -PORTVERSION= 2.23.2815.102.00 +PORTVERSION= 2.23.2815.102.01 DISTVERSIONPREFIX= v -PORTREVISION?= 7 CATEGORIES= japanese MAINTAINER= hrs@FreeBSD.org COMMENT?= Mozc Japanese Input Method, Server BUILD_DEPENDS= ninja:devel/ninja \ - gyp:devel/py-gyp@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}gyp>=20200512:devel/py-gyp@${PY_FLAVOR} EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_PORTSDIR} LIB_DEPENDS= libprotobuf.so:devel/protobuf \ libzinnia.so:japanese/zinnia @@ -27,7 +26,7 @@ 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 + tar:bzip2 python:3.5+,build shebangfix SHEBANG_FILES= src/build_mozc.py BUILD_WRKSRC= ${WRKSRC}/src @@ -106,7 +105,8 @@ post-patch: .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}," \ + ${REINPLACE_CMD} \ + "s,IconName=.*,IconName=${LOCALBASE:Q}/share/fcitx/mozc/icon/mozc.png," \ ${BUILD_WRKSRC}/unix/fcitx/mozc.conf .endif @@ -138,15 +138,15 @@ GYP_DEFINES+= use_libibus=0 \ MASTER_SITES+= LOCAL/kuriyama:zipcode DISTFILES+= \ - ken_all-20181228.zip:zipcode \ - jigyosyo-20181228.zip:zipcode + ken_all-20200430.zip:zipcode \ + jigyosyo-20200430.zip:zipcode PLIST_FILES+= bin/mozc \ bin/mozc_server \ libexec/mozc_emacs_helper SUB_FILES+= mozc -post-extract-mozc_server: +post-patch-mozc_server: @for F in ${DISTFILES:M*\:zipcode:C/\:zipcode//}; do \ ${UNZIP_NATIVE_CMD} -L -d ${BUILD_WRKSRC}/data/dictionary_oss \ ${DISTDIR}/$$F; \ @@ -159,7 +159,7 @@ post-extract-mozc_server: ${MV} ${WRKSRC_udic}/usage_dict.txt \ ${BUILD_WRKSRC}/third_party/japanese_usage_dictionary -post-extract: post-extract-mozc_server +post-patch: post-patch-mozc_server do-build-mozc_server: ${BUILD_MOZC_CMD_BUILD} server/server.gyp:mozc_server @@ -214,8 +214,7 @@ GYP_DEFINES+= use_libibus=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@${PY_FLAVOR} + mozc_tool:japanese/mozc-tool PLIST_FILES+= libexec/mozc_renderer \ libexec/ibus-engine-mozc \ @@ -378,6 +377,7 @@ do-install-fcitx_mozc: CATEGORIES+= elisp RUN_DEPENDS+= mozc_server:japanese/mozc-server +NO_ARCH= yes 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 Modified: head/japanese/mozc-server/distinfo ============================================================================== --- head/japanese/mozc-server/distinfo Sat Aug 15 00:52:24 2020 (r544905) +++ head/japanese/mozc-server/distinfo Sat Aug 15 01:21:00 2020 (r544906) @@ -1,10 +1,10 @@ -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 +TIMESTAMP = 1597425320 +SHA256 (ken_all-20200430.zip) = b60b5becaf5af4315cc1b4204e0a8bbd61b8848beb5b9437f917c22ef7a85e96 +SIZE (ken_all-20200430.zip) = 1690470 +SHA256 (jigyosyo-20200430.zip) = 2f42b3780f1cecdbb8bc295389f349b12f6ec872542f42333bbac971f47e5f27 +SIZE (jigyosyo-20200430.zip) = 767036 +SHA256 (hrs-allbsd-mozc-v2.23.2815.102.01_GH0.tar.gz) = 05da136f52230aa8f7d0b96e8c3aaf4a2367a44bc1026bd4b23d22b46c6687b6 +SIZE (hrs-allbsd-mozc-v2.23.2815.102.01_GH0.tar.gz) = 36712681 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 Modified: head/japanese/uim-mozc/Makefile ============================================================================== --- head/japanese/uim-mozc/Makefile Sat Aug 15 00:52:24 2020 (r544905) +++ head/japanese/uim-mozc/Makefile Sat Aug 15 01:21:00 2020 (r544906) @@ -5,9 +5,6 @@ PKGNAMEPREFIX= ja-uim- COMMENT= Mozc engine for uim -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 - MASTERDIR= ${.CURDIR}/../../japanese/mozc-server FILESDIR= ${.CURDIR}/files DATADIR= ${PREFIX}/share/uim
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008150121.07F1L1s3030504>