From owner-svn-ports-all@FreeBSD.ORG Tue Mar 31 07:08:20 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D2A3BA3F; Tue, 31 Mar 2015 07:08:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B9688177; Tue, 31 Mar 2015 07:08:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2V78Kvr011714; Tue, 31 Mar 2015 07:08:20 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2V781rP011596; Tue, 31 Mar 2015 07:08:01 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201503310708.t2V781rP011596@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 31 Mar 2015 07:08:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382798 - in head: chinese chinese/brise chinese/fcitx chinese/fcitx-chewing chinese/fcitx-chewing/files chinese/fcitx-cloudpinyin chinese/fcitx-cloudpinyin/files chinese/fcitx-configto... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Mar 2015 07:08:20 -0000 Author: delphij Date: Tue Mar 31 07:08:00 2015 New Revision: 382798 URL: https://svnweb.freebsd.org/changeset/ports/382798 QAT: https://qat.redports.org/buildarchive/r382798/ Log: Major update to libpinyin, fcitx and their add ons: - New port: chinese/brise Rime schema repository - Update chinese/fcitx to 4.2.8.5. - Update chinese/fcitx-chewing to 0.2.2. - Update chinese/fcitx-cloudpinyin to 0.3.4. - Update chinese/fcitx-configtool to 0.4.8. - Update chinese/fcitx-libpinyin to 0.3.1. - Update chinese/fcitx-rime to 0.3.1. - Update chinese/fcitx-sunpinyin to 0.4.1. - Update chinese/fcitx-table-extra to 0.3.7. - Add LICENSE and update website (mainly move off Google Code) for various ports. - Update chinese/libpinyin to 1.1.0. - Update chinese/librime to 1.1. - Update chinese/opencc to 0.4.3. - Update japanese/fcitx-anthy to 0.2.1. - New port: japanese/fcitx-skk SKK support for Fcitx - Update korean/fcitx-hangul to 0.3.0. - Update textproc/fcitx-m17n to 0.2.3. PR: ports/198743 Submitted by: maintainer, hiroto.kagotani@gmail.com, delphij Added: head/chinese/brise/ head/chinese/brise/Makefile (contents, props changed) head/chinese/brise/distinfo (contents, props changed) head/chinese/brise/pkg-descr (contents, props changed) head/chinese/brise/pkg-plist (contents, props changed) head/chinese/fcitx-chewing/files/ head/chinese/fcitx-chewing/files/patch-data__CMakeLists.txt (contents, props changed) head/chinese/fcitx-configtool/files/patch-CMakeLists.txt (contents, props changed) head/chinese/fcitx-libpinyin/files/patch-dictmanager__CMakeLists.txt (contents, props changed) head/chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt (contents, props changed) head/chinese/fcitx-rime/files/patch-data__CMakeLists.txt - copied, changed from r382787, head/chinese/fcitx-rime/files/patch-data_CMakeLists.txt head/chinese/fcitx-table-extra/files/ head/chinese/fcitx-table-extra/files/patch-tables__CMakeLists.txt (contents, props changed) head/chinese/fcitx/files/patch-cmake__FcitxConfig.cmake (contents, props changed) head/chinese/fcitx/files/patch-cmake__FcitxMacro.cmake (contents, props changed) head/chinese/fcitx/files/patch-data__script__fcitx4-config.in (contents, props changed) head/chinese/fcitx/files/patch-tools__cli__CMakeLists.txt (contents, props changed) head/chinese/fcitx/files/patch-tools__gui__quickphrase-editor__CMakeLists.txt (contents, props changed) head/chinese/fcitx/files/patch-tools__gui__wrapper__CMakeLists.txt (contents, props changed) head/chinese/libpinyin/files/patch-data_Makefile.in (contents, props changed) head/chinese/libpinyin/files/patch-libpinyin.pc.in (contents, props changed) head/chinese/opencc/files/patch-src_utils.c (contents, props changed) head/japanese/fcitx-skk/ head/japanese/fcitx-skk/Makefile (contents, props changed) head/japanese/fcitx-skk/distinfo (contents, props changed) head/japanese/fcitx-skk/files/ head/japanese/fcitx-skk/files/patch-gui__CMakeLists.txt (contents, props changed) head/japanese/fcitx-skk/files/patch-src__CMakeLists.txt (contents, props changed) head/japanese/fcitx-skk/pkg-descr (contents, props changed) head/japanese/fcitx-skk/pkg-plist (contents, props changed) head/korean/fcitx-hangul/files/ head/korean/fcitx-hangul/files/patch-data__CMakeLists.txt (contents, props changed) head/textproc/fcitx-m17n/files/ head/textproc/fcitx-m17n/files/patch-im__CMakeLists.txt (contents, props changed) Deleted: head/chinese/fcitx-configtool/files/patch-gtk3_CMakeLists.txt head/chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt head/chinese/fcitx-libpinyin/files/patch-CMakeLists.txt head/chinese/fcitx-rime/files/patch-data_CMakeLists.txt head/chinese/fcitx/files/patch-cmake_modules_FindLibkvm.cmake head/chinese/fcitx/files/patch-doc_man_CMakeLists.txt head/chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt head/chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt head/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxclient.c head/chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt head/chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt head/chinese/libpinyin/files/patch-configure head/chinese/libpinyin/files/patch-src_pinyin_internal.h Modified: head/chinese/Makefile head/chinese/fcitx-chewing/Makefile head/chinese/fcitx-chewing/distinfo head/chinese/fcitx-chewing/pkg-descr head/chinese/fcitx-chewing/pkg-plist head/chinese/fcitx-cloudpinyin/Makefile head/chinese/fcitx-cloudpinyin/distinfo head/chinese/fcitx-cloudpinyin/files/patch-CMakeLists.txt head/chinese/fcitx-cloudpinyin/pkg-descr head/chinese/fcitx-cloudpinyin/pkg-plist head/chinese/fcitx-configtool/Makefile head/chinese/fcitx-configtool/distinfo head/chinese/fcitx-configtool/pkg-descr head/chinese/fcitx-configtool/pkg-plist head/chinese/fcitx-googlepinyin/Makefile head/chinese/fcitx-googlepinyin/pkg-descr head/chinese/fcitx-libpinyin/Makefile head/chinese/fcitx-libpinyin/distinfo head/chinese/fcitx-libpinyin/pkg-descr head/chinese/fcitx-libpinyin/pkg-plist head/chinese/fcitx-rime/Makefile head/chinese/fcitx-rime/distinfo head/chinese/fcitx-rime/pkg-descr head/chinese/fcitx-rime/pkg-plist head/chinese/fcitx-sunpinyin/Makefile head/chinese/fcitx-sunpinyin/distinfo head/chinese/fcitx-sunpinyin/pkg-descr head/chinese/fcitx-sunpinyin/pkg-plist head/chinese/fcitx-table-extra/Makefile head/chinese/fcitx-table-extra/distinfo head/chinese/fcitx-table-extra/pkg-descr head/chinese/fcitx-table-extra/pkg-plist head/chinese/fcitx-ui-light/Makefile head/chinese/fcitx-ui-light/pkg-descr head/chinese/fcitx/Makefile head/chinese/fcitx/distinfo head/chinese/fcitx/files/patch-CMakeLists.txt head/chinese/fcitx/pkg-descr head/chinese/fcitx/pkg-plist head/chinese/libgooglepinyin/Makefile head/chinese/libgooglepinyin/pkg-descr head/chinese/libpinyin/Makefile head/chinese/libpinyin/distinfo head/chinese/libpinyin/pkg-descr head/chinese/libpinyin/pkg-plist head/chinese/librime/Makefile head/chinese/librime/distinfo head/chinese/librime/files/patch-CMakeLists.txt head/chinese/librime/pkg-descr head/chinese/librime/pkg-plist head/chinese/opencc/Makefile head/chinese/opencc/distinfo head/chinese/opencc/pkg-descr head/japanese/Makefile head/japanese/fcitx-anthy/Makefile head/japanese/fcitx-anthy/distinfo head/japanese/fcitx-anthy/pkg-descr head/japanese/fcitx-anthy/pkg-plist head/korean/fcitx-hangul/Makefile head/korean/fcitx-hangul/distinfo head/korean/fcitx-hangul/pkg-descr head/korean/fcitx-hangul/pkg-plist head/textproc/fcitx-m17n/Makefile head/textproc/fcitx-m17n/distinfo head/textproc/fcitx-m17n/pkg-descr head/textproc/fcitx-m17n/pkg-plist Modified: head/chinese/Makefile ============================================================================== --- head/chinese/Makefile Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/Makefile Tue Mar 31 07:08:00 2015 (r382798) @@ -16,6 +16,7 @@ SUBDIR += bg5ps SUBDIR += big5width SUBDIR += bitchx + SUBDIR += brise SUBDIR += bsdconv-opencc SUBDIR += bug5 SUBDIR += c2t Added: head/chinese/brise/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/brise/Makefile Tue Mar 31 07:08:00 2015 (r382798) @@ -0,0 +1,20 @@ +# $FreeBSD$ + +PORTNAME= brise +PORTVERSION= 0.32 +CATEGORIES= chinese textproc +MASTER_SITES= http://github.com/lotem/brise/archive/brise-${DISTVERSION}.tar.gz?dummy=/ +DISTNAME= ${PORTNAME}-brise-${DISTVERSION} + +MAINTAINER= hiroto.kagotani@gmail.com +COMMENT= Rime Schema Repository + +LICENSE= GPLv3 + +BUILD_DEPENDS= rime_deployer:${PORTSDIR}/chinese/librime + +USES= gmake + +MAKE_ARGS+= RIME_DATA_DIR=${DATADIR} + +.include Added: head/chinese/brise/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/brise/distinfo Tue Mar 31 07:08:00 2015 (r382798) @@ -0,0 +1,2 @@ +SHA256 (brise-brise-0.32.tar.gz) = b1e9fc2a5967d7994ccca1b0aaeee7f1fe0ab5f9c16325c0650a610df5ce93c0 +SIZE (brise-brise-0.32.tar.gz) = 6695914 Added: head/chinese/brise/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/brise/pkg-descr Tue Mar 31 07:08:00 2015 (r382798) @@ -0,0 +1,3 @@ +Rime Schema Repository. + +WWW: https://rime.github.io/ Added: head/chinese/brise/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/brise/pkg-plist Tue Mar 31 07:08:00 2015 (r382798) @@ -0,0 +1,55 @@ +%%DATADIR%%/bopomofo.schema.yaml +%%DATADIR%%/bopomofo_tw.schema.yaml +%%DATADIR%%/cangjie5.dict.yaml +%%DATADIR%%/cangjie5.prism.bin +%%DATADIR%%/cangjie5.reverse.bin +%%DATADIR%%/cangjie5.schema.yaml +%%DATADIR%%/cangjie5.table.bin +%%DATADIR%%/cangjie5_express.schema.yaml +%%DATADIR%%/combo_pinyin.schema.yaml +%%DATADIR%%/default.yaml +%%DATADIR%%/double_pinyin.schema.yaml +%%DATADIR%%/double_pinyin_abc.schema.yaml +%%DATADIR%%/double_pinyin_flypy.schema.yaml +%%DATADIR%%/double_pinyin_mspy.schema.yaml +%%DATADIR%%/emoji.dict.yaml +%%DATADIR%%/emoji.schema.yaml +%%DATADIR%%/essay.kct +%%DATADIR%%/ipa_xsampa.dict.yaml +%%DATADIR%%/ipa_xsampa.schema.yaml +%%DATADIR%%/jyutping.dict.yaml +%%DATADIR%%/jyutping.schema.yaml +%%DATADIR%%/luna_pinyin.dict.yaml +%%DATADIR%%/luna_pinyin.prism.bin +%%DATADIR%%/luna_pinyin.reverse.bin +%%DATADIR%%/luna_pinyin.schema.yaml +%%DATADIR%%/luna_pinyin.table.bin +%%DATADIR%%/luna_pinyin_fluency.prism.bin +%%DATADIR%%/luna_pinyin_fluency.schema.yaml +%%DATADIR%%/luna_pinyin_simp.prism.bin +%%DATADIR%%/luna_pinyin_simp.schema.yaml +%%DATADIR%%/luna_pinyin_tw.prism.bin +%%DATADIR%%/luna_pinyin_tw.schema.yaml +%%DATADIR%%/pinyin_simp.dict.yaml +%%DATADIR%%/pinyin_simp.schema.yaml +%%DATADIR%%/quick5.dict.yaml +%%DATADIR%%/quick5.schema.yaml +%%DATADIR%%/sampheng.schema.yaml +%%DATADIR%%/soutzoe.dict.yaml +%%DATADIR%%/soutzoe.schema.yaml +%%DATADIR%%/stroke.dict.yaml +%%DATADIR%%/stroke.prism.bin +%%DATADIR%%/stroke.reverse.bin +%%DATADIR%%/stroke.schema.yaml +%%DATADIR%%/stroke.table.bin +%%DATADIR%%/symbols.yaml +%%DATADIR%%/terra_pinyin.dict.yaml +%%DATADIR%%/terra_pinyin.schema.yaml +%%DATADIR%%/wubi86.dict.yaml +%%DATADIR%%/wubi86.schema.yaml +%%DATADIR%%/wubi_pinyin.schema.yaml +%%DATADIR%%/wugniu.schema.yaml +%%DATADIR%%/wugniu_lopha.dict.yaml +%%DATADIR%%/wugniu_lopha.schema.yaml +%%DATADIR%%/zyenpheng.dict.yaml +%%DATADIR%%/zyenpheng.schema.yaml Modified: head/chinese/fcitx-chewing/Makefile ============================================================================== --- head/chinese/fcitx-chewing/Makefile Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-chewing/Makefile Tue Mar 31 07:08:00 2015 (r382798) @@ -2,20 +2,20 @@ # $FreeBSD$ PORTNAME= fcitx-chewing -PORTVERSION= 0.1.3 -PORTREVISION= 1 +PORTVERSION= 0.2.2 CATEGORIES= chinese -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} -PROJECTHOST= fcitx +MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/ DIST_SUBDIR= fcitx MAINTAINER= lichray@gmail.com COMMENT= Chewing support for Fcitx +LICENSE= GPLv2 + LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \ libchewing.so:${PORTSDIR}/chinese/libchewing USES= tar:xz cmake gettext pkgconfig -USE_GNOME= intltool +INSTALLS_ICONS= yes .include Modified: head/chinese/fcitx-chewing/distinfo ============================================================================== --- head/chinese/fcitx-chewing/distinfo Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-chewing/distinfo Tue Mar 31 07:08:00 2015 (r382798) @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx-chewing-0.1.3.tar.xz) = d9cdac1469ffe7e60f1d13f11257708361fdc4bfea487a8162b5a22aa23d775c -SIZE (fcitx/fcitx-chewing-0.1.3.tar.xz) = 15160 +SHA256 (fcitx/fcitx-chewing-0.2.2.tar.xz) = fa278ee9d2c20f7ae0a3093a3e490553798186bd67dc1e83f2723bd15b47a450 +SIZE (fcitx/fcitx-chewing-0.2.2.tar.xz) = 19684 Added: head/chinese/fcitx-chewing/files/patch-data__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/fcitx-chewing/files/patch-data__CMakeLists.txt Tue Mar 31 07:08:00 2015 (r382798) @@ -0,0 +1,12 @@ +--- ./data/CMakeLists.txt.orig 2013-06-04 03:02:38.000000000 +0900 ++++ ./data/CMakeLists.txt 2014-03-19 14:07:16.000000000 +0900 +@@ -1,5 +1,5 @@ +-install(FILES chewing.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/imicon/) ++install(FILES chewing.png DESTINATION share/fcitx/imicon/) + install(FILES chewing.png DESTINATION share/icons/hicolor/48x48/apps/ RENAME fcitx-chewing.png) +-install(FILES default/chewing.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/default) +-install(FILES dark/chewing.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/dark) +-install(FILES classic/chewing.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/classic) ++install(FILES default/chewing.png DESTINATION share/fcitx/skin/default) ++install(FILES dark/chewing.png DESTINATION share/fcitx/skin/dark) ++install(FILES classic/chewing.png DESTINATION share/fcitx/skin/classic) Modified: head/chinese/fcitx-chewing/pkg-descr ============================================================================== --- head/chinese/fcitx-chewing/pkg-descr Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-chewing/pkg-descr Tue Mar 31 07:08:00 2015 (r382798) @@ -1,4 +1,4 @@ fcitx-chewing provides Chewing, an intelligent phonetic input method engine, as a back-end to the Fcitx IM framework. -WWW: http://code.google.com/p/fcitx/ +WWW: https://fcitx-im.org/wiki/Fcitx Modified: head/chinese/fcitx-chewing/pkg-plist ============================================================================== --- head/chinese/fcitx-chewing/pkg-plist Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-chewing/pkg-plist Tue Mar 31 07:08:00 2015 (r382798) @@ -1,9 +1,13 @@ lib/fcitx/fcitx-chewing.so share/fcitx/addon/fcitx-chewing.conf share/fcitx/configdesc/fcitx-chewing.desc +share/fcitx/imicon/chewing.png share/fcitx/inputmethod/chewing.conf share/fcitx/skin/classic/chewing.png share/fcitx/skin/dark/chewing.png share/fcitx/skin/default/chewing.png +share/icons/hicolor/48x48/apps/fcitx-chewing.png +share/locale/de/LC_MESSAGES/fcitx-chewing.mo +share/locale/ja/LC_MESSAGES/fcitx-chewing.mo share/locale/zh_CN/LC_MESSAGES/fcitx-chewing.mo share/locale/zh_TW/LC_MESSAGES/fcitx-chewing.mo Modified: head/chinese/fcitx-cloudpinyin/Makefile ============================================================================== --- head/chinese/fcitx-cloudpinyin/Makefile Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-cloudpinyin/Makefile Tue Mar 31 07:08:00 2015 (r382798) @@ -2,21 +2,19 @@ # $FreeBSD$ PORTNAME= fcitx-cloudpinyin -PORTVERSION= 0.3.0 -PORTREVISION= 1 +PORTVERSION= 0.3.4 CATEGORIES= chinese -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/ DIST_SUBDIR= fcitx MAINTAINER= lichray@gmail.com COMMENT= Cloud-based Pinyin module for Fcitx +LICENSE= GPLv2 + LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \ libcurl.so:${PORTSDIR}/ftp/curl USES= tar:xz cmake gettext pkgconfig -USE_GNOME= intltool - -PROJECTHOST= fcitx .include Modified: head/chinese/fcitx-cloudpinyin/distinfo ============================================================================== --- head/chinese/fcitx-cloudpinyin/distinfo Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-cloudpinyin/distinfo Tue Mar 31 07:08:00 2015 (r382798) @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx-cloudpinyin-0.3.0.tar.xz) = a68f27d9785bb1e31610424acb81faa933bfe9b7e93140c9895cd34987547b84 -SIZE (fcitx/fcitx-cloudpinyin-0.3.0.tar.xz) = 19344 +SHA256 (fcitx/fcitx-cloudpinyin-0.3.4.tar.xz) = c131e8cfd4d171f7749c2934f13092dcdffcf3d4ff1cefde7ed67daed74b7d90 +SIZE (fcitx/fcitx-cloudpinyin-0.3.4.tar.xz) = 20796 Modified: head/chinese/fcitx-cloudpinyin/files/patch-CMakeLists.txt ============================================================================== --- head/chinese/fcitx-cloudpinyin/files/patch-CMakeLists.txt Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-cloudpinyin/files/patch-CMakeLists.txt Tue Mar 31 07:08:00 2015 (r382798) @@ -2,7 +2,6 @@ +++ CMakeLists.txt 2012-09-19 15:10:32.000000000 +0800 @@ -33,4 +33,3 @@ - add_subdirectory(src) add_subdirectory(po) + add_subdirectory(src) -add_subdirectory(test) -\ No newline at end of file Modified: head/chinese/fcitx-cloudpinyin/pkg-descr ============================================================================== --- head/chinese/fcitx-cloudpinyin/pkg-descr Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-cloudpinyin/pkg-descr Tue Mar 31 07:08:00 2015 (r382798) @@ -2,4 +2,4 @@ fcitx-cloudpinyin is not an input method from the cloud-based Pinyin services (Sogou, QQ, Baidu, Google) to any Pinyin IMEs in Fcitx. -WWW: http://code.google.com/p/fcitx/ +WWW: https://fcitx-im.org/wiki/Fcitx Modified: head/chinese/fcitx-cloudpinyin/pkg-plist ============================================================================== --- head/chinese/fcitx-cloudpinyin/pkg-plist Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-cloudpinyin/pkg-plist Tue Mar 31 07:08:00 2015 (r382798) @@ -1,5 +1,7 @@ lib/fcitx/fcitx-cloudpinyin.so share/fcitx/addon/fcitx-cloudpinyin.conf share/fcitx/configdesc/fcitx-cloudpinyin.desc +share/locale/de/LC_MESSAGES/fcitx-cloudpinyin.mo +share/locale/ja/LC_MESSAGES/fcitx-cloudpinyin.mo share/locale/zh_CN/LC_MESSAGES/fcitx-cloudpinyin.mo share/locale/zh_TW/LC_MESSAGES/fcitx-cloudpinyin.mo Modified: head/chinese/fcitx-configtool/Makefile ============================================================================== --- head/chinese/fcitx-configtool/Makefile Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-configtool/Makefile Tue Mar 31 07:08:00 2015 (r382798) @@ -2,21 +2,23 @@ # $FreeBSD$ PORTNAME= fcitx-configtool -PORTVERSION= 0.4.5.2 +PORTVERSION= 0.4.8 CATEGORIES= chinese x11 -MASTER_SITES= GOOGLE_CODE -PROJECTHOST= fcitx +MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/ DIST_SUBDIR= fcitx MAINTAINER= lichray@gmail.com COMMENT= Fcitx IM framework configuration tool +LICENSE= GPLv2 + BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx USE_GNOME= intltool USES= cmake gettext pkgconfig tar:xz +LDFLAGS+= -lintl OPTIONS_SINGLE= UI UI_DESC= Gtk version to use Modified: head/chinese/fcitx-configtool/distinfo ============================================================================== --- head/chinese/fcitx-configtool/distinfo Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-configtool/distinfo Tue Mar 31 07:08:00 2015 (r382798) @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx-configtool-0.4.5.2.tar.xz) = 3882ad86e7e5651dd6661dc19ecd24fa9e07a9a2c6a3d00a9184d71c87347f34 -SIZE (fcitx/fcitx-configtool-0.4.5.2.tar.xz) = 42560 +SHA256 (fcitx/fcitx-configtool-0.4.8.tar.xz) = 0ebc06d9d325fed096e9cb61fe53b82000d2de0e9aefe5945ba8f0aa2ca851ed +SIZE (fcitx/fcitx-configtool-0.4.8.tar.xz) = 47196 Added: head/chinese/fcitx-configtool/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/fcitx-configtool/files/patch-CMakeLists.txt Tue Mar 31 07:08:00 2015 (r382798) @@ -0,0 +1,13 @@ +--- ./CMakeLists.txt.orig 2013-10-27 08:45:38.000000000 +0900 ++++ ./CMakeLists.txt 2014-03-18 14:40:07.000000000 +0900 +@@ -27,8 +27,8 @@ + "${PROJECT_SOURCE_DIR}/cmake/fcitx-extract-glade.sh" glade) + + add_definitions("-D_GNU_SOURCE") +-set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-local-typedefs -Wno-unused-parameter -fvisibility=hidden ${CMAKE_C_FLAGS}") +-set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-local-typedefs -Wno-unused-parameter -fvisibility=hidden ${CMAKE_CXX_FLAGS}") ++set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_C_FLAGS}") ++set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_CXX_FLAGS}") + set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}") + set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}") + Modified: head/chinese/fcitx-configtool/pkg-descr ============================================================================== --- head/chinese/fcitx-configtool/pkg-descr Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-configtool/pkg-descr Tue Mar 31 07:08:00 2015 (r382798) @@ -1,4 +1,4 @@ Fcitx is a flexible input method framework. It comes with a script, fcitx-configtool, which looks for this configure tool and invokes it. -WWW: http://code.google.com/p/fcitx/ +WWW: https://fcitx-im.org/wiki/Fcitx Modified: head/chinese/fcitx-configtool/pkg-plist ============================================================================== --- head/chinese/fcitx-configtool/pkg-plist Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-configtool/pkg-plist Tue Mar 31 07:08:00 2015 (r382798) @@ -1,4 +1,6 @@ %%GTK2%%bin/fcitx-config-gtk %%GTK3%%bin/fcitx-config-gtk3 +share/locale/de/LC_MESSAGES/fcitx-configtool.mo +share/locale/ja/LC_MESSAGES/fcitx-configtool.mo share/locale/zh_CN/LC_MESSAGES/fcitx-configtool.mo share/locale/zh_TW/LC_MESSAGES/fcitx-configtool.mo Modified: head/chinese/fcitx-googlepinyin/Makefile ============================================================================== --- head/chinese/fcitx-googlepinyin/Makefile Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-googlepinyin/Makefile Tue Mar 31 07:08:00 2015 (r382798) @@ -10,11 +10,14 @@ DIST_SUBDIR= fcitx MAINTAINER= lichray@gmail.com COMMENT= Libgooglepinyin support for Fcitx +LICENSE= GPLv3 + LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \ libgooglepinyin.so:${PORTSDIR}/chinese/libgooglepinyin USES= tar:xz cmake gettext pkgconfig iconv USE_GNOME= intltool +INSTALLS_ICONS= yes PROJECTHOST= fcitx Modified: head/chinese/fcitx-googlepinyin/pkg-descr ============================================================================== --- head/chinese/fcitx-googlepinyin/pkg-descr Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-googlepinyin/pkg-descr Tue Mar 31 07:08:00 2015 (r382798) @@ -1,4 +1,4 @@ fcitx-googlepinyin provides libgooglepinyin, a fork of Google Pinyin IME on Android, as a back-end to the Fcitx IM framework. -WWW: http://code.google.com/p/fcitx/ +WWW: https://fcitx-im.org/wiki/Fcitx Modified: head/chinese/fcitx-libpinyin/Makefile ============================================================================== --- head/chinese/fcitx-libpinyin/Makefile Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-libpinyin/Makefile Tue Mar 31 07:08:00 2015 (r382798) @@ -2,29 +2,45 @@ # $FreeBSD$ PORTNAME= fcitx-libpinyin -PORTVERSION= 0.2.1 +PORTVERSION= 0.3.1 CATEGORIES= chinese -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ - http://cloud.github.com/downloads/fcitx/fcitx-libpinyin/:libpinyin -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} model.text.${MDVER}.tar.gz:libpinyin +MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/:body \ + http://download.fcitx-im.org/data/:data +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:body \ + model.text.${_MODEL_VER}.tar.gz:data DIST_SUBDIR= fcitx EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= lichray@gmail.com -COMMENT= The libpinyin support for Fcitx +COMMENT= Libpinyin support for Fcitx + +LICENSE= GPLv2 LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \ libpinyin.so:${PORTSDIR}/chinese/libpinyin -USE_LDCONFIG= ${PREFIX}/lib/fcitx/ USES= tar:xz cmake gettext pkgconfig -USE_GNOME= intltool INSTALLS_ICONS= yes -post-patch: - @${LN} -s ${_DISTDIR}/model.text.${MDVER}.tar.gz ${WRKSRC}/data +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +_MODEL_VER= 20130308 -PROJECTHOST= fcitx -MDVER= 20120921 +OPTIONS_DEFINE= QT4 +OPTIONS_DEFAULT=QT4 +QT4_DESC= Enable Qt4 for dictmanager + +.include + +.if ${PORT_OPTIONS:MQT4} +USE_QT4= qmake_build moc_build rcc_build uic_build gui webkit +USE_LDCONFIG= ${PREFIX}/lib/fcitx/qt +PLIST_SUB+= QT4="" +.else +CMAKE_ARGS+= -DENABLE_QT=OFF +PLIST_SUB+= QT4="@comment " +.endif + +post-patch: + @${CP} ${_DISTDIR}/model.text.${_MODEL_VER}.tar.gz ${WRKSRC}/data/. .include Modified: head/chinese/fcitx-libpinyin/distinfo ============================================================================== --- head/chinese/fcitx-libpinyin/distinfo Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-libpinyin/distinfo Tue Mar 31 07:08:00 2015 (r382798) @@ -1,4 +1,4 @@ -SHA256 (fcitx/fcitx-libpinyin-0.2.1.tar.xz) = 6a5c9f7c7009a893b4beba85d6ee361253ca1211ce954da0e752c01a528c8c09 -SIZE (fcitx/fcitx-libpinyin-0.2.1.tar.xz) = 24468 -SHA256 (fcitx/model.text.20120921.tar.gz) = 84f086a8eb56a4a8ddab7d95ce1b386dfe292561a3271132e3aa6e85ba4ed339 -SIZE (fcitx/model.text.20120921.tar.gz) = 9980454 +SHA256 (fcitx/fcitx-libpinyin-0.3.1.tar.xz) = 11112c29579af01c38b5af6069c6433c22ee538ebaad55577e5737d3e4fa9158 +SIZE (fcitx/fcitx-libpinyin-0.3.1.tar.xz) = 41520 +SHA256 (fcitx/model.text.20130308.tar.gz) = 4595b5832ec1f81e93a37ec5841a57898c68f6024ef0593b8de127d1e3571a69 +SIZE (fcitx/model.text.20130308.tar.gz) = 15100062 Added: head/chinese/fcitx-libpinyin/files/patch-dictmanager__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/fcitx-libpinyin/files/patch-dictmanager__CMakeLists.txt Tue Mar 31 07:08:00 2015 (r382798) @@ -0,0 +1,11 @@ +--- ./dictmanager/CMakeLists.txt.orig 2013-07-16 05:34:05.000000000 +0900 ++++ ./dictmanager/CMakeLists.txt 2014-03-19 15:52:24.000000000 +0900 +@@ -60,6 +60,7 @@ + ${FCITX_QT_LIBRARIES} + ${FCITX4_FCITX_UTILS_LIBRARIES} + ${FCITX4_FCITX_CONFIG_LIBRARIES} ++${LIBINTL_LIBRARIES} + ) + +-install(TARGETS fcitx-libpinyin-dictmanager DESTINATION ${FCITX4_ADDON_INSTALL_DIR}/qt) ++install(TARGETS fcitx-libpinyin-dictmanager DESTINATION ${FCITX4_ADDON_INSTALL_DESTDIR}/qt) Added: head/chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt Tue Mar 31 07:08:00 2015 (r382798) @@ -0,0 +1,10 @@ +--- ./src/CMakeLists.txt.orig 2013-07-16 05:34:05.000000000 +0900 ++++ ./src/CMakeLists.txt 2014-03-19 15:51:24.000000000 +0900 +@@ -22,6 +22,7 @@ + ) + + add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/share/locale\" ) ++add_definitions( -D_WITH_GETLINE ) + + fcitx_add_addon_full(libpinyin DESC + SOURCES ${fcitx_libpinyin_sources} Modified: head/chinese/fcitx-libpinyin/pkg-descr ============================================================================== --- head/chinese/fcitx-libpinyin/pkg-descr Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-libpinyin/pkg-descr Tue Mar 31 07:08:00 2015 (r382798) @@ -1,4 +1,4 @@ fcitx-libpinyin provides libpinyin, a Chinese pinyin input method algorithm collection, as a back-end to the Fcitx IM framework. -WWW: http://code.google.com/p/fcitx/ +WWW: https://fcitx-im.org/wiki/Fcitx Modified: head/chinese/fcitx-libpinyin/pkg-plist ============================================================================== --- head/chinese/fcitx-libpinyin/pkg-plist Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-libpinyin/pkg-plist Tue Mar 31 07:08:00 2015 (r382798) @@ -1,14 +1,34 @@ lib/fcitx/fcitx-libpinyin.so +%%QT4%%lib/fcitx/qt/libfcitx-libpinyin-dictmanager.so share/fcitx/addon/fcitx-libpinyin.conf share/fcitx/configdesc/fcitx-libpinyin.desc +share/fcitx/imicon/bopomofo.png +share/fcitx/imicon/pinyin-libpinyin.png +share/fcitx/imicon/shuangpin-libpinyin.png share/fcitx/inputmethod/pinyin-libpinyin.conf share/fcitx/inputmethod/shuangpin-libpinyin.conf share/fcitx/inputmethod/zhuyin-libpinyin.conf +share/fcitx/libpinyin/zhuyin_data/art.bin share/fcitx/libpinyin/zhuyin_data/bigram.db +share/fcitx/libpinyin/zhuyin_data/culture.bin +share/fcitx/libpinyin/zhuyin_data/economy.bin share/fcitx/libpinyin/zhuyin_data/gb_char.bin share/fcitx/libpinyin/zhuyin_data/gbk_char.bin +share/fcitx/libpinyin/zhuyin_data/geology.bin +share/fcitx/libpinyin/zhuyin_data/history.bin +share/fcitx/libpinyin/zhuyin_data/life.bin +share/fcitx/libpinyin/zhuyin_data/merged.bin +share/fcitx/libpinyin/zhuyin_data/nature.bin share/fcitx/libpinyin/zhuyin_data/phrase_index.bin share/fcitx/libpinyin/zhuyin_data/pinyin_index.bin +share/fcitx/libpinyin/zhuyin_data/scitech.bin +share/fcitx/libpinyin/zhuyin_data/society.bin +share/fcitx/libpinyin/zhuyin_data/sport.bin +share/fcitx/libpinyin/zhuyin_data/table.conf share/icons/hicolor/48x48/status/fcitx-bopomofo.png +share/icons/hicolor/48x48/status/fcitx-pinyin-libpinyin.png +share/icons/hicolor/48x48/status/fcitx-shuangpin-libpinyin.png +share/locale/de/LC_MESSAGES/fcitx-libpinyin.mo +share/locale/ja/LC_MESSAGES/fcitx-libpinyin.mo share/locale/zh_CN/LC_MESSAGES/fcitx-libpinyin.mo share/locale/zh_TW/LC_MESSAGES/fcitx-libpinyin.mo Modified: head/chinese/fcitx-rime/Makefile ============================================================================== --- head/chinese/fcitx-rime/Makefile Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-rime/Makefile Tue Mar 31 07:08:00 2015 (r382798) @@ -2,23 +2,23 @@ # $FreeBSD$ PORTNAME= fcitx-rime -PORTVERSION= 0.1.2 -PORTREVISION= 1 +PORTVERSION= 0.3.1 CATEGORIES= chinese -MASTER_SITES= GOOGLE_CODE +MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/ DIST_SUBDIR= fcitx MAINTAINER= lichray@gmail.com COMMENT= RIME support for Fcitx +LICENSE= GPLv2 + LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \ librime.so:${PORTSDIR}/chinese/librime +RUN_DEPENDS= ${LOCALBASE}/share/brise/default.yaml:${PORTSDIR}/chinese/brise -USE_LDCONFIG= ${PREFIX}/lib/fcitx/ USES= tar:xz cmake gettext -USE_GNOME= intltool INSTALLS_ICONS= yes -PROJECTHOST= fcitx +CMAKE_ARGS+= -DBRISE_DIR=${LOCALBASE}/share/brise .include Modified: head/chinese/fcitx-rime/distinfo ============================================================================== --- head/chinese/fcitx-rime/distinfo Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-rime/distinfo Tue Mar 31 07:08:00 2015 (r382798) @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx-rime-0.1.2.tar.xz) = 528472c13adb050543ba0402077d2e2b37258cb494f7d7900411cfd8c1ad9048 -SIZE (fcitx/fcitx-rime-0.1.2.tar.xz) = 7356 +SHA256 (fcitx/fcitx-rime-0.3.1.tar.xz) = 3ca74de4d20e8fd0e67eb4ccae8af3790bb1f557f183c2af32cb45f371e8521d +SIZE (fcitx/fcitx-rime-0.3.1.tar.xz) = 39648 Copied and modified: head/chinese/fcitx-rime/files/patch-data__CMakeLists.txt (from r382787, head/chinese/fcitx-rime/files/patch-data_CMakeLists.txt) ============================================================================== --- head/chinese/fcitx-rime/files/patch-data_CMakeLists.txt Mon Mar 30 23:25:33 2015 (r382787, copy source) +++ head/chinese/fcitx-rime/files/patch-data__CMakeLists.txt Tue Mar 31 07:08:00 2015 (r382798) @@ -1,7 +1,20 @@ ---- data/CMakeLists.txt~ 2012-10-04 07:34:39.000000000 -0500 -+++ data/CMakeLists.txt 2012-10-15 21:46:56.932232905 -0500 -@@ -2,3 +2,4 @@ install(FILES zhung.png RENAME rime.png - install(FILES zhung.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/dark) - install(FILES zhung.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/classic) - install(FILES zhung.png RENAME fcitx-rime.png DESTINATION share/icons/hicolor/48x48/apps) -+install(FILES zhung.png RENAME rime.png DESTINATION share/fcitx/imicon) +--- ./data/CMakeLists.txt.orig 2013-11-10 22:11:24.000000000 +0900 ++++ ./data/CMakeLists.txt 2014-03-20 00:20:01.000000000 +0900 +@@ -1,8 +1,8 @@ + # for im icon +-install(FILES rime.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/imicon) ++install(FILES rime.png RENAME rime.png DESTINATION share/fcitx/imicon) + + # for skin +-install(DIRECTORY default DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin) ++install(DIRECTORY default DESTINATION share/fcitx/skin) + + # with prefix + foreach(svg rime rime-deploy rime-sync) +@@ -14,4 +14,4 @@ + foreach(svg rime-im rime-latin rime-disable) + install(FILES ${svg}.png DESTINATION share/icons/hicolor/48x48/apps) + install(FILES ${svg}.svg DESTINATION share/icons/hicolor/scalable/status) +-endforeach() +\ No newline at end of file ++endforeach() Modified: head/chinese/fcitx-rime/pkg-descr ============================================================================== --- head/chinese/fcitx-rime/pkg-descr Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-rime/pkg-descr Tue Mar 31 07:08:00 2015 (r382798) @@ -1,4 +1,4 @@ fcitx-rime provides RIME, a dialect-friendly intelligent Chinese input method engine, as a back-end to the Fcitx IM framework. -WWW: http://code.google.com/p/fcitx/ +WWW: https://fcitx-im.org/wiki/Fcitx Modified: head/chinese/fcitx-rime/pkg-plist ============================================================================== --- head/chinese/fcitx-rime/pkg-plist Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-rime/pkg-plist Tue Mar 31 07:08:00 2015 (r382798) @@ -2,7 +2,28 @@ lib/fcitx/fcitx-rime.so share/fcitx/addon/fcitx-rime.conf share/fcitx/imicon/rime.png share/fcitx/inputmethod/rime.conf -share/fcitx/skin/classic/rime.png -share/fcitx/skin/dark/rime.png -share/fcitx/skin/default/rime.png +share/fcitx/skin/default/rime-deploy.png +share/fcitx/skin/default/rime-disable.png +share/fcitx/skin/default/rime-im-cangjie5.png +share/fcitx/skin/default/rime-im-luna_pinyin.png +share/fcitx/skin/default/rime-im-luna_pinyin_simp.png +share/fcitx/skin/default/rime-im.png +share/fcitx/skin/default/rime-latin.png +share/fcitx/skin/default/rime-sync.png +share/icons/hicolor/48x48/apps/fcitx-rime-deploy.png +share/icons/hicolor/48x48/apps/fcitx-rime-sync.png share/icons/hicolor/48x48/apps/fcitx-rime.png +share/icons/hicolor/48x48/apps/rime-disable.png +share/icons/hicolor/48x48/apps/rime-im.png +share/icons/hicolor/48x48/apps/rime-latin.png +share/icons/hicolor/scalable/status/fcitx-rime-deploy.svg +share/icons/hicolor/scalable/status/fcitx-rime-sync.svg +share/icons/hicolor/scalable/status/fcitx-rime.svg +share/icons/hicolor/scalable/status/rime-disable.svg +share/icons/hicolor/scalable/status/rime-im.svg +share/icons/hicolor/scalable/status/rime-latin.svg +share/locale/de/LC_MESSAGES/fcitx-rime.mo +share/locale/ja/LC_MESSAGES/fcitx-rime.mo +share/locale/vi/LC_MESSAGES/fcitx-rime.mo +share/locale/zh_CN/LC_MESSAGES/fcitx-rime.mo +share/locale/zh_TW/LC_MESSAGES/fcitx-rime.mo Modified: head/chinese/fcitx-sunpinyin/Makefile ============================================================================== --- head/chinese/fcitx-sunpinyin/Makefile Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-sunpinyin/Makefile Tue Mar 31 07:08:00 2015 (r382798) @@ -2,22 +2,20 @@ # $FreeBSD$ PORTNAME= fcitx-sunpinyin -PORTVERSION= 0.3.9 +PORTVERSION= 0.4.1 CATEGORIES= chinese -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/ DIST_SUBDIR= fcitx -MAINTAINER= ports@FreeBSD.org +MAINTAINER= lichray@gmail.com COMMENT= SunPinyin support for Fcitx -LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx -BUILD_DEPENDS= zh-sunpinyin>=2.0.4.r2:${PORTSDIR}/chinese/sunpinyin -RUN_DEPENDS= zh-sunpinyin>=2.0.4.r2:${PORTSDIR}/chinese/sunpinyin +LICENSE= GPLv2 + +LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \ + libsunpinyin.so:${PORTSDIR}/chinese/sunpinyin USES= cmake gettext pkgconfig tar:xz -USE_GNOME= intltool INSTALLS_ICONS= yes -PROJECTHOST= fcitx - .include Modified: head/chinese/fcitx-sunpinyin/distinfo ============================================================================== --- head/chinese/fcitx-sunpinyin/distinfo Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-sunpinyin/distinfo Tue Mar 31 07:08:00 2015 (r382798) @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx-sunpinyin-0.3.9.tar.xz) = 7bf5f70c3653b5aebbbde96fd731ecbbce74cfd4d211620a5156b2700a63e47e -SIZE (fcitx/fcitx-sunpinyin-0.3.9.tar.xz) = 41268 +SHA256 (fcitx/fcitx-sunpinyin-0.4.1.tar.xz) = 7bd0c61a3c821719760bff72c3c114b28e277b87f54dcb61d83e3548b1eb6777 +SIZE (fcitx/fcitx-sunpinyin-0.4.1.tar.xz) = 41076 Modified: head/chinese/fcitx-sunpinyin/pkg-descr ============================================================================== --- head/chinese/fcitx-sunpinyin/pkg-descr Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-sunpinyin/pkg-descr Tue Mar 31 07:08:00 2015 (r382798) @@ -1,4 +1,4 @@ fcitx-sunpinyin provides SunPinyin, a statistical language model based input method engine, as a back-end to the Fcitx IM framework. -WWW: http://code.google.com/p/fcitx/ +WWW: https://fcitx-im.org/wiki/Fcitx Modified: head/chinese/fcitx-sunpinyin/pkg-plist ============================================================================== --- head/chinese/fcitx-sunpinyin/pkg-plist Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-sunpinyin/pkg-plist Tue Mar 31 07:08:00 2015 (r382798) @@ -12,5 +12,7 @@ share/icons/hicolor/22x22/apps/fcitx-sun share/icons/hicolor/24x24/apps/fcitx-sunpinyin.png share/icons/hicolor/32x32/apps/fcitx-sunpinyin.png share/icons/hicolor/48x48/apps/fcitx-sunpinyin.png +share/locale/de/LC_MESSAGES/fcitx-sunpinyin.mo +share/locale/ja/LC_MESSAGES/fcitx-sunpinyin.mo share/locale/zh_CN/LC_MESSAGES/fcitx-sunpinyin.mo share/locale/zh_TW/LC_MESSAGES/fcitx-sunpinyin.mo Modified: head/chinese/fcitx-table-extra/Makefile ============================================================================== --- head/chinese/fcitx-table-extra/Makefile Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-table-extra/Makefile Tue Mar 31 07:08:00 2015 (r382798) @@ -2,21 +2,20 @@ # $FreeBSD$ PORTNAME= fcitx-table-extra -PORTVERSION= 0.3.3 +PORTVERSION= 0.3.7 CATEGORIES= chinese -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/ DIST_SUBDIR= fcitx MAINTAINER= lichray@gmail.com COMMENT= Table-based input methods for Fcitx +LICENSE= GPLv2 + LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx USES= tar:xz cmake gettext -USE_GNOME= intltool INSTALLS_ICONS= yes STRIP= -PROJECTHOST= fcitx - .include Modified: head/chinese/fcitx-table-extra/distinfo ============================================================================== --- head/chinese/fcitx-table-extra/distinfo Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-table-extra/distinfo Tue Mar 31 07:08:00 2015 (r382798) @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx-table-extra-0.3.3.tar.xz) = ae2bbf9146dfdeafb6220c9a738ddc1f0437da2c5f2da0d578ba4970bc74767d -SIZE (fcitx/fcitx-table-extra-0.3.3.tar.xz) = 3350592 +SHA256 (fcitx/fcitx-table-extra-0.3.7.tar.xz) = 8933570ecd803a4f4fe932c983004e669d81b2f08c3bcaa532151545a42e659e +SIZE (fcitx/fcitx-table-extra-0.3.7.tar.xz) = 3704164 Added: head/chinese/fcitx-table-extra/files/patch-tables__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/fcitx-table-extra/files/patch-tables__CMakeLists.txt Tue Mar 31 07:08:00 2015 (r382798) @@ -0,0 +1,10 @@ +--- ./tables/CMakeLists.txt.orig 2013-09-02 08:32:18.000000000 +0900 ++++ ./tables/CMakeLists.txt 2014-03-20 12:40:01.000000000 +0900 +@@ -22,5 +22,5 @@ + endforeach() + add_custom_target(table_data ALL DEPENDS ${MB_FILE}) + +-install(FILES ${CONF_FILE} DESTINATION ${FCITX4_PREFIX}/share/fcitx/table) +-install(FILES ${MB_FILE} DESTINATION ${FCITX4_PREFIX}/share/fcitx/table) ++install(FILES ${CONF_FILE} DESTINATION share/fcitx/table) ++install(FILES ${MB_FILE} DESTINATION share/fcitx/table) Modified: head/chinese/fcitx-table-extra/pkg-descr ============================================================================== --- head/chinese/fcitx-table-extra/pkg-descr Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-table-extra/pkg-descr Tue Mar 31 07:08:00 2015 (r382798) @@ -1,4 +1,4 @@ fcitx-table-extra provides Boshiamy, Zhengma, Cangjie, and Quick input methods driven by the fcitx-table IM engine. -WWW: http://code.google.com/p/fcitx/ +WWW: https://fcitx-im.org/wiki/Fcitx Modified: head/chinese/fcitx-table-extra/pkg-plist ============================================================================== --- head/chinese/fcitx-table-extra/pkg-plist Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-table-extra/pkg-plist Tue Mar 31 07:08:00 2015 (r382798) @@ -10,6 +10,7 @@ share/fcitx/imicon/quick3.png share/fcitx/imicon/quick5.png share/fcitx/imicon/scj6.png share/fcitx/imicon/stroke5.png +share/fcitx/imicon/t9.png share/fcitx/imicon/wu.png share/fcitx/imicon/zhengma.png share/fcitx/table/array30-big.conf @@ -42,6 +43,8 @@ share/fcitx/table/scj6.conf share/fcitx/table/scj6.mb share/fcitx/table/stroke5.conf share/fcitx/table/stroke5.mb +share/fcitx/table/t9.conf +share/fcitx/table/t9.mb share/fcitx/table/wu.conf share/fcitx/table/wu.mb share/fcitx/table/wubi-large.conf @@ -50,19 +53,22 @@ share/fcitx/table/zhengma-large.conf share/fcitx/table/zhengma-large.mb share/fcitx/table/zhengma.conf share/fcitx/table/zhengma.mb +share/icons/hicolor/48x48/apps/fcitx-cantonese.png share/icons/hicolor/48x48/apps/fcitx-cantonhk.png share/icons/hicolor/48x48/apps/fcitx-jyutping.png share/icons/hicolor/48x48/apps/fcitx-quick-classic.png share/icons/hicolor/48x48/apps/fcitx-quick3.png share/icons/hicolor/48x48/apps/fcitx-quick5.png share/icons/hicolor/48x48/apps/fcitx-scj6.png +share/icons/hicolor/48x48/apps/fcitx-stroke5.png share/icons/hicolor/48x48/apps/fcitx-wu.png -share/icons/hicolor/48x48/apps/fcitx-zhengma.png share/icons/hicolor/64x64/apps/fcitx-array30-big.png share/icons/hicolor/64x64/apps/fcitx-array30.png share/icons/hicolor/64x64/apps/fcitx-boshiamy.png -share/icons/hicolor/64x64/apps/fcitx-cantonese.png share/icons/hicolor/64x64/apps/fcitx-easy-big.png -share/icons/hicolor/64x64/apps/fcitx-stroke5.png +share/icons/hicolor/64x64/apps/fcitx-t9.png +share/icons/hicolor/64x64/apps/fcitx-zhengma.png +share/locale/de/LC_MESSAGES/fcitx-table-extra.mo +share/locale/ja/LC_MESSAGES/fcitx-table-extra.mo share/locale/zh_CN/LC_MESSAGES/fcitx-table-extra.mo share/locale/zh_TW/LC_MESSAGES/fcitx-table-extra.mo Modified: head/chinese/fcitx-ui-light/Makefile ============================================================================== --- head/chinese/fcitx-ui-light/Makefile Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-ui-light/Makefile Tue Mar 31 07:08:00 2015 (r382798) @@ -5,12 +5,14 @@ PORTNAME= fcitx-ui-light PORTVERSION= 0.1.3 PORTREVISION= 1 CATEGORIES= chinese -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/ DIST_SUBDIR= fcitx MAINTAINER= lichray@gmail.com COMMENT= Alternative light weight UI for Fcitx +LICENSE= GPLv2 + LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig @@ -18,6 +20,4 @@ USE_XORG= x11 xft xpm USES= tar:bzip2 cmake gettext pkgconfig USE_GNOME= intltool -PROJECTHOST= fcitx - .include Modified: head/chinese/fcitx-ui-light/pkg-descr ============================================================================== --- head/chinese/fcitx-ui-light/pkg-descr Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx-ui-light/pkg-descr Tue Mar 31 07:08:00 2015 (r382798) @@ -1,4 +1,4 @@ fcitx-ui-light is a very light weight UI for Fcitx, only using Xpm and Xft, like go back to 3.6.x times. -WWW: http://code.google.com/p/fcitx/ +WWW: https://fcitx-im.org/wiki/Fcitx Modified: head/chinese/fcitx/Makefile ============================================================================== --- head/chinese/fcitx/Makefile Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx/Makefile Tue Mar 31 07:08:00 2015 (r382798) @@ -2,12 +2,16 @@ # $FreeBSD$ PORTNAME= fcitx -PORTVERSION= 4.2.6.1 -PORTREVISION= 5 +PORTVERSION= 4.2.8.5 CATEGORIES= chinese x11 -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - pinyin.tar.gz table.tar.gz en_dict-${_DICT_VER}.tar.gz +MASTER_SITES= http://download.fcitx-im.org/fcitx/:fcitx \ + http://download.fcitx-im.org/data/:data +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:fcitx \ + en_dict-${_DICT_VER}.tar.gz:data \ + pinyin.tar.gz:data \ + py_stroke-${_PYSTROKE_VER}.tar.gz:data \ + py_table-${_PYTABLE_VER}.tar.gz:data \ + table.tar.gz:data DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -17,8 +21,7 @@ COMMENT= Flexible Input Method Framework LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ - libdbus-1.so:${PORTSDIR}/devel/dbus \ +LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libicuuc.so:${PORTSDIR}/devel/icu RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils @@ -30,12 +33,13 @@ CONFLICTS= zh-scim-fcitx-3.* USE_GNOME= pango intltool libxml2 introspection USE_XORG= x11 xext xkbfile USE_LDCONFIG= yes -USES= tar:xz cmake desktop-file-utils gettext iconv pathfix pkgconfig shared-mime-info +USES= tar:xz cmake desktop-file-utils execinfo gettext iconv \ + pathfix pkgconfig shared-mime-info INSTALLS_ICONS= yes LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} OPTIONS_DEFINE= GTK2 GTK3 QT4 OPENCC TPUNC DOCS -OPTIONS_DEFAULT=GTK2 +OPTIONS_DEFAULT=GTK2 QT4 GTK2_DESC= Enable Gtk2 IM module GTK3_DESC= Enable Gtk3 IM module @@ -45,7 +49,14 @@ TPUNC_DESC= Use traditional quotation ma .include -CMAKE_ARGS+= -DENABLE_XDGAUTOSTART=OFF -DFORCE_ENCHANT=ON +CMAKE_ARGS+= -DENABLE_XDGAUTOSTART=OFF -DFORCE_ENCHANT=ON \ + -DDATADIR=${DATADIR} \ + -DDOCSDIR=${DOCSDIR} \ + -DGOBJECT_INTROSPECTION_GIRDIR=${PREFIX}/share/gir-1.0 \ + -DGOBJECT_INTROSPECTION_TYPELIBDIR=${PREFIX}/lib/girepository-1.0 \ + -DMANPREFIX=${MANPREFIX} \ + -DPREFIX=${PREFIX} \ + -DQT_PLUGINS_DIR=${PREFIX}/lib/qt4/plugins .if ${PORT_OPTIONS:MGTK2} USE_GNOME+= gtk20 @@ -68,10 +79,11 @@ SUB_LIST+= GTK3_IM=xim .endif .if ${PORT_OPTIONS:MQT4} -USE_QT4= qmake_build moc_build rcc_build uic_build dbus gui inputmethods -CMAKE_ARGS+= -DENABLE_QT_IM_MODULE=ON +USE_QT4+= qmake_build moc_build rcc_build uic_build dbus gui inputmethods +USE_LDCONFIG+= ${PREFIX}/lib/fcitx/qt PLIST_SUB+= QT4="" .else +CMAKE_ARGS+= -DENABLE_QT=OFF -DENABLE_QT_IM_MODULE=OFF -DENABLE_QT_GUI=OFF PLIST_SUB+= QT4="@comment " .endif @@ -89,14 +101,18 @@ EXTRA_PATCHES+= ${FILESDIR}/tpunc-data_p CMAKE_ARGS+= -DENABLE_DEBUG=ON .endif -DOCS_EXTRA_PATCHES= ${FILESDIR}/nodocs-doc_CMakeLists.txt +DOCS_EXTRA_PATCHES_OFF= ${FILESDIR}/nodocs-doc_CMakeLists.txt -_DICT_VER= 20120815 +_DICT_VER= 20121020 +_PYSTROKE_VER= 20121124 +_PYTABLE_VER= 20121124 post-patch: - @${CP} ${_DISTDIR}/pinyin.tar.gz ${WRKSRC}/data - @${CP} ${_DISTDIR}/table.tar.gz ${WRKSRC}/data/table - @${CP} ${_DISTDIR}/en_dict-${_DICT_VER}.tar.gz ${WRKSRC}/data + @${CP} ${_DISTDIR}/en_dict-${_DICT_VER}.tar.gz ${WRKSRC}/src/module/spell/dict/. + @${CP} ${_DISTDIR}/pinyin.tar.gz ${WRKSRC}/src/im/pinyin/data/. + @${CP} ${_DISTDIR}/py_stroke-${_PYSTROKE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data/. + @${CP} ${_DISTDIR}/py_table-${_PYTABLE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data/. + @${CP} ${_DISTDIR}/table.tar.gz ${WRKSRC}/src/im/table/data/. .if ${OSVERSION} < 800067 # getline() is GNU extension which FreeBSD only recently adopted EXTRA_PATCHES+= ${FILESDIR}/getline-src_lib_fcitx-utils_utils.c \ Modified: head/chinese/fcitx/distinfo ============================================================================== --- head/chinese/fcitx/distinfo Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx/distinfo Tue Mar 31 07:08:00 2015 (r382798) @@ -1,8 +1,12 @@ -SHA256 (fcitx/fcitx-4.2.6.1.tar.xz) = b3b1fa548163701ca6009fa71362668eb973bffa8067f039d7cbe643e4769ab1 -SIZE (fcitx/fcitx-4.2.6.1.tar.xz) = 1442744 +SHA256 (fcitx/fcitx-4.2.8.5.tar.xz) = 6a7dda9177ec2443049f95f5db65aff34e906cb24030a973aaf9d0485833bc78 +SIZE (fcitx/fcitx-4.2.8.5.tar.xz) = 1662736 +SHA256 (fcitx/en_dict-20121020.tar.gz) = c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb +SIZE (fcitx/en_dict-20121020.tar.gz) = 630491 SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1 SIZE (fcitx/pinyin.tar.gz) = 1608886 +SHA256 (fcitx/py_stroke-20121124.tar.gz) = 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248 +SIZE (fcitx/py_stroke-20121124.tar.gz) = 445601 +SHA256 (fcitx/py_table-20121124.tar.gz) = 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04 +SIZE (fcitx/py_table-20121124.tar.gz) = 186822 SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7 SIZE (fcitx/table.tar.gz) = 4144686 -SHA256 (fcitx/en_dict-20120815.tar.gz) = a73c989eae586a681a0e64bd7e8a43d45fc6dfbfd45b98e4b83f715a87639945 -SIZE (fcitx/en_dict-20120815.tar.gz) = 679983 Modified: head/chinese/fcitx/files/patch-CMakeLists.txt ============================================================================== --- head/chinese/fcitx/files/patch-CMakeLists.txt Tue Mar 31 06:50:29 2015 (r382797) +++ head/chinese/fcitx/files/patch-CMakeLists.txt Tue Mar 31 07:08:00 2015 (r382798) @@ -1,11 +1,44 @@ ---- CMakeLists.txt~ 2011-10-02 05:43:11.000000000 -0500 -+++ CMakeLists.txt 2011-11-09 07:51:31.801020675 -0600 -@@ -93,7 +93,7 @@ if (ENABLE_OPENCC) - endif (ENABLE_OPENCC) +--- ./CMakeLists.txt.orig 2013-09-28 17:33:14.000000000 +0900 ++++ ./CMakeLists.txt 2014-03-19 13:45:08.000000000 +0900 +@@ -207,16 +207,21 @@ + set(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "sys config directory [default=PREFIX/etc/]") + endif() - if(ENABLE_DEBUG) -- set(_DEBUG) -+ set(_DEBUG ON) - endif(ENABLE_DEBUG) +-set(includedir "${CMAKE_INSTALL_PREFIX}/include") +-set(libdir ${LIB_INSTALL_DIR}) +-set(pkgconfdir ${LIBDATA_INSTALL_DIR}/pkgconfig) +-set(mandir ${MAN_INSTALL_DIR}) ++set(includedir "${PREFIX}/include") ++set(libdir ${PREFIX}/lib) ++set(pkgconfdir ${PREFIX}/libdata/pkgconfig) ++set(mandir ${MANPREFIX}/man) + set(addondir ${libdir}/${package} ) +-set(pkgdatadir ${prefix}/share/${package}) ++set(addondestdir "\${PREFIX}/lib/${package}" ) ++set(pkgdatadir ${DATADIR}) ++set(pkgdatadestdir "\${DATADIR}") + set(configdescdir ${pkgdatadir}/configdesc) ++set(configdescdestdir ${pkgdatadestdir}/configdesc) + set(addonconfigdir ${pkgdatadir}/addon) ++set(addonconfigdestdir ${pkgdatadestdir}/addon) + set(imconfigdir ${pkgdatadir}/inputmethod) +-set(localedir ${CMAKE_INSTALL_PREFIX}/share/locale) ++set(imconfigdestdir ${pkgdatadestdir}/inputmethod) ++set(localedir ${PREFIX}/share/locale) - set(package fcitx) + list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir) + list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir) +@@ -229,9 +234,13 @@ + + # For FcitxMacro + set(FCITX4_ADDON_INSTALL_DIR ${addondir}) ++set(FCITX4_ADDON_INSTALL_DESTDIR ${addondestdir}) + set(FCITX4_CONFIGDESC_INSTALL_DIR ${configdescdir}) ++set(FCITX4_CONFIGDESC_INSTALL_DESTDIR ${configdescdir}) + set(FCITX4_ADDON_CONFIG_INSTALL_DIR ${addonconfigdir}) ++set(FCITX4_ADDON_CONFIG_INSTALL_DESTDIR ${addonconfigdir}) + set(FCITX4_INPUTMETHOD_CONFIG_INSTALL_DIR ${imconfigdir}) ++set(FCITX4_INPUTMETHOD_CONFIG_INSTALL_DESTDIR ${imconfigdir}) + set(FCITX4_PACKAGE_NAME ${package}) + + function(_RESOLVE_LIBRARY_PATH _FILE_NAME _LIBRARY_PATH) Added: head/chinese/fcitx/files/patch-cmake__FcitxConfig.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/fcitx/files/patch-cmake__FcitxConfig.cmake Tue Mar 31 07:08:00 2015 (r382798) @@ -0,0 +1,16 @@ +--- ./cmake/FcitxConfig.cmake.orig 2013-09-28 17:33:14.000000000 +0900 ++++ ./cmake/FcitxConfig.cmake 2014-03-19 13:45:08.000000000 +0900 +@@ -76,9 +76,13 @@ + IF(FCITX4_FCITXCONFIG_EXECUTABLE) + message(STATUS "fcitx4-config found ${FCITX4_FCITXCONFIG_EXECUTABLE}") + EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --addondir OUTPUT_VARIABLE FCITX4_ADDON_INSTALL_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) ++ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --addondestdir OUTPUT_VARIABLE FCITX4_ADDON_INSTALL_DESTDIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --imconfigdir OUTPUT_VARIABLE FCITX4_INPUTMETHOD_CONFIG_INSTALL_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) ++ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --imconfigdestdir OUTPUT_VARIABLE FCITX4_INPUTMETHOD_CONFIG_INSTALL_DESTDIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --configdescdir OUTPUT_VARIABLE FCITX4_CONFIGDESC_INSTALL_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) ++ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --configdescdestdir OUTPUT_VARIABLE FCITX4_CONFIGDESC_INSTALL_DESTDIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --addonconfigdir OUTPUT_VARIABLE FCITX4_ADDON_CONFIG_INSTALL_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) ++ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --addonconfigdestdir OUTPUT_VARIABLE FCITX4_ADDON_CONFIG_INSTALL_DESTDIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --package OUTPUT_VARIABLE FCITX4_PACKAGE_NAME ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --version OUTPUT_VARIABLE FCITX4_VERSION ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --prefix OUTPUT_VARIABLE FCITX4_PREFIX ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) Added: head/chinese/fcitx/files/patch-cmake__FcitxMacro.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/fcitx/files/patch-cmake__FcitxMacro.cmake Tue Mar 31 07:08:00 2015 (r382798) @@ -0,0 +1,51 @@ +--- ./cmake/FcitxMacro.cmake.orig 2013-09-28 17:33:14.000000000 +0900 ++++ ./cmake/FcitxMacro.cmake 2014-03-19 13:46:27.000000000 +0900 +@@ -366,10 +366,10 @@ + add_custom_target("${target_name}" ALL) + + __fcitx_addon_config_file("${target_name}" "${FCITX_ADDON_CONF_SRC}" +- "${FCITX4_ADDON_CONFIG_INSTALL_DIR}") ++ "${FCITX4_ADDON_CONFIG_INSTALL_DESTDIR}") + foreach(im_config ${FCITX_ADDON_IM_CONFIG}) + __fcitx_addon_config_file("${target_name}" "${im_config}" +- "${FCITX4_INPUTMETHOD_CONFIG_INSTALL_DIR}") ++ "${FCITX4_INPUTMETHOD_CONFIG_INSTALL_DESTDIR}") + endforeach() + __fcitx_add_addon_lib("${FCITX_ADDON_LIB_NAME}" ${FCITX_ADDON_SOURCES}) + if(FCITX_ADDON_LINK_LIBS) +@@ -393,7 +393,7 @@ + set_target_properties("${lib_name}" PROPERTIES PREFIX "" + COMPILE_FLAGS "-fvisibility=hidden") + add_dependencies("${lib_name}" fcitx-scan-addons.target) +- install(TARGETS "${lib_name}" DESTINATION "${FCITX4_ADDON_INSTALL_DIR}") ++ install(TARGETS "${lib_name}" DESTINATION "${FCITX4_ADDON_INSTALL_DESTDIR}") *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***