svn commit: r430243 - in head/japanese/mozc-server: . files

Hiroki Sato hrs at FreeBSD.org
Sun Jan 1 06:47:02 UTC 2017 

Author: hrs
Date: Sun Jan  1 06:47:00 2017
New Revision: 430243
URL: https://svnweb.freebsd.org/changeset/ports/430243

Log:
  Update to 2.20.2677.102.

Deleted:
  head/japanese/mozc-server/files/extra-patch-src-unix-fcitx-eim.cc
  head/japanese/mozc-server/files/extra-patch-src-unix-fcitx-surrounding_text_util.cc
  head/japanese/mozc-server/files/extra-patch-src-unix_fcitx_fcitx_mozc.cc
  head/japanese/mozc-server/files/patch-src-base-flags.cc
  head/japanese/mozc-server/files/patch-src-base_base.gyp
  head/japanese/mozc-server/files/patch-src-base_logging.cc
  head/japanese/mozc-server/files/patch-src-base_mutex.cc
  head/japanese/mozc-server/files/patch-src-base_process.cc
  head/japanese/mozc-server/files/patch-src-base_system_util.cc
  head/japanese/mozc-server/files/patch-src-build_mozc.py
  head/japanese/mozc-server/files/patch-src-build_tools_util.py
  head/japanese/mozc-server/files/patch-src-gui-qt_libraries.gypi
  head/japanese/mozc-server/files/patch-src-gui_about_dialog_about_dialog.cc
  head/japanese/mozc-server/files/patch-src-gyp_common.gypi
  head/japanese/mozc-server/files/patch-src-ipc_ipc_path_manager.cc
  head/japanese/mozc-server/files/patch-src-ipc_unix_ipc.cc
  head/japanese/mozc-server/files/patch-src-rewriter-calculator-calculator.cc
  head/japanese/mozc-server/files/patch-src-server_mozc_server.cc
  head/japanese/mozc-server/files/patch-src-unix_ibus_gen_mozc_xml.py
  head/japanese/mozc-server/files/patch-src-unix_ibus_ibus.gyp
  head/japanese/mozc-server/files/patch-src-unix_ibus_mozc_engine.cc
  head/japanese/mozc-server/files/patch-src-unix_ibus_path_util.cc
Modified:
  head/japanese/mozc-server/Makefile
  head/japanese/mozc-server/distinfo

Modified: head/japanese/mozc-server/Makefile
==============================================================================
--- head/japanese/mozc-server/Makefile	Sun Jan  1 05:12:29 2017	(r430242)
+++ head/japanese/mozc-server/Makefile	Sun Jan  1 06:47:00 2017	(r430243)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mozc
-PORTVERSION=	2.17.2322.102
-PORTREVISION=	3
+PORTVERSION=	2.20.2677.102.01
+DISTVERSIONPREFIX=	v
 CATEGORIES=	japanese
 
 MAINTAINER=	hrs at FreeBSD.org
@@ -15,15 +15,15 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	ninja:devel/ninja \
 		gyp:devel/py-gyp
 EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_PORTSDIR}
-LIB_DEPENDS=	libprotobuf.so:devel/protobuf \
+LIB_DEPENDS=	libprotobuf.so.11:devel/protobuf \
 		libzinnia.so:japanese/zinnia
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USE_GITHUB=	yes
-GH_TUPLE=	google:${PORTNAME}:9b4c9e0 \
+GH_TUPLE=	hrs-allbsd:${PORTNAME}:${DISTVERSIONPREFIX}${DISTVERSION} \
 		hiroyuki-komatsu:japanese-usage-dictionary:e5b3425:udic
 
-USES=		compiler:c++11-lang pkgconfig iconv:wchar_t gmake \
+USES=		compiler:c++11-lang pkgconfig gmake \
 		tar:bzip2 python:2.7,build shebangfix
 SHEBANG_FILES=	src/build_mozc.py
 BUILD_WRKSRC=	${WRKSRC}/src
@@ -44,10 +44,13 @@ LICENSE_FILE_NAISTL=	${WRKSRC}/src/data/
 LICENSE_DISTFILES_NAISTL=${DISTNAME}${EXTRACT_SUFX}
 .elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
 USE_GNOME=	glib20 gtk20
-USE_QT4=	corelib gui qmake_build moc_build rcc_build uic_build
+USE_QT5=	core gui widgets
 .elif ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
+USES+=		gettext-runtime
 USE_XORG=	xcb
-USE_GNOME=	glib20 gtk20
+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"
 USE_EMACS=	yes
 .elif ${BUILD_MOZC_LIST:Mfcitx_mozc}
@@ -94,8 +97,6 @@ BUILD_MOZC_CMD_BUILD=	${BUILD_MOZC_CMD} 
 BUILD_GYP_CMD=	${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/gyp
 
 post-patch:
-	${REINPLACE_CMD} 's,-liconv,${ICONV_LIB},g' \
-	    ${BUILD_WRKSRC}/gui/qt_libraries.gypi
 	${FIND} ${BUILD_WRKSRC} \( -name '*.gyp' -o -name '*.gypi' \) -exec \
 	    ${REINPLACE_CMD} "s,'python','${PYTHON_CMD}',g" {} \;
 .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
@@ -133,8 +134,8 @@ GYP_DEFINES+=	use_libibus=0 \
 
 MASTER_SITES+=	LOCAL/kuriyama:zipcode
 DISTFILES+= \
-	ken_all-20160428.zip:zipcode \
-	jigyosyo-20160428.zip:zipcode
+	ken_all-20161031.zip:zipcode \
+	jigyosyo-20161031.zip:zipcode
 
 PLIST_FILES+=	bin/mozc \
 		bin/mozc_server \
@@ -146,9 +147,10 @@ post-extract-mozc_server:
 		${UNZIP_NATIVE_CMD} -L -d ${BUILD_WRKSRC}/data/dictionary_oss \
 		    ${DISTDIR}/$$F; \
 	done
-	@cd ${BUILD_WRKSRC}/data/dictionary_oss && \
-	    ${PYTHON_CMD} ${BUILD_WRKSRC}/dictionary/gen_zip_code_seed.py \
-	    --zip_code=ken_all.csv --jigyosyo=jigyosyo.csv \
+	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
@@ -303,15 +305,7 @@ do-install-uim_mozc:
 .endif
 
 # fcitx_mozc
-.if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" || make(makesum)
-PATCH_SITES=	http://download.fcitx-im.org/fcitx-mozc/
-PATCHFILES=	fcitx-mozc-2.17.2313.102.1.patch
-.endif
 .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
-PATCH_DIST_STRIP=-p1
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-unix-fcitx-eim.cc \
-	${PATCHDIR}/extra-patch-src-unix-fcitx-surrounding_text_util.cc
-
 GYP_OPTIONS+=	--noqt
 GYP_DEFINES+=	use_libibus=0 \
 		enable_gtk_renderer=0
@@ -338,11 +332,6 @@ 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} ${BUILD_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
 

Modified: head/japanese/mozc-server/distinfo
==============================================================================
--- head/japanese/mozc-server/distinfo	Sun Jan  1 05:12:29 2017	(r430242)
+++ head/japanese/mozc-server/distinfo	Sun Jan  1 06:47:00 2017	(r430243)
@@ -1,13 +1,11 @@
-TIMESTAMP = 1481723411
-SHA256 (ken_all-20160428.zip) = dd732957ca98dcad8c68aaa89447d77bd9201f26a19241f2531cb3f4ba2296f0
-SIZE (ken_all-20160428.zip) = 1684351
-SHA256 (jigyosyo-20160428.zip) = b95ed393343ed85363e8e7e14725af5e0b0586e60289a386fdba288e0e36f040
-SIZE (jigyosyo-20160428.zip) = 752471
-SHA256 (google-mozc-2.17.2322.102-9b4c9e0_GH0.tar.gz) = b7f57c4bfbff9a7e657de4f8213bac2f8d3cc454076463ddc66e32ebcf7bf795
-SIZE (google-mozc-2.17.2322.102-9b4c9e0_GH0.tar.gz) = 57248995
+TIMESTAMP = 1483252889
+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.01_GH0.tar.gz) = 31e254b21d17c3e070252ae33686e7c3960a05521fac7a60ac7e9bf1a5be1505
+SIZE (hrs-allbsd-mozc-v2.20.2677.102.01_GH0.tar.gz) = 37574885
 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
-SHA256 (fcitx-mozc-2.17.2313.102.1.patch) = 52a7ed450f075eca3f4d468390ef59f9a439e0ac74327639802a7f11caa1a2c2
-SIZE (fcitx-mozc-2.17.2313.102.1.patch) = 140531

More information about the svn-ports-all mailing list