diff options
| author | Daichi GOTO <daichi@FreeBSD.org> | 2010-11-06 02:40:39 +0000 |
|---|---|---|
| committer | Daichi GOTO <daichi@FreeBSD.org> | 2010-11-06 02:40:39 +0000 |
| commit | 7e23fbde7be67a8faab903c9d628064f3ca61d69 (patch) | |
| tree | 95dcd7aed4acf1cb1cdb250950b3c62b8b9e17ba | |
| parent | 1bfe979f91e0c8159320de935e5900753e72fb58 (diff) | |
| download | ports-7e23fbde7be67a8faab903c9d628064f3ca61d69.tar.gz ports-7e23fbde7be67a8faab903c9d628064f3ca61d69.zip | |
Notes
72 files changed, 165 insertions, 274 deletions
diff --git a/japanese/ibus-mozc/Makefile b/japanese/ibus-mozc/Makefile index 6f43ed68d4f8..1c55471670bd 100644 --- a/japanese/ibus-mozc/Makefile +++ b/japanese/ibus-mozc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ibus-mozc -PORTVERSION= 0.13.499.102 +PORTVERSION= 0.13.523.102 CATEGORIES= japanese MASTER_SITES= http://people.freebsd.org/~daichi/distfiles/ DISTNAME= mozc-${PORTVERSION} diff --git a/japanese/ibus-mozc/distinfo b/japanese/ibus-mozc/distinfo index 9a74557256a8..e8009e38c3ee 100644 --- a/japanese/ibus-mozc/distinfo +++ b/japanese/ibus-mozc/distinfo @@ -1,3 +1,3 @@ -MD5 (mozc-0.13.499.102.tar.bz2) = 8405e050bc87bf7a38ad2a543498d353 -SHA256 (mozc-0.13.499.102.tar.bz2) = bc39fb757c0f7d40abf2603c2c72b37a2ca4c9614bf1ca12ce8639bced94602c -SIZE (mozc-0.13.499.102.tar.bz2) = 39139600 +MD5 (mozc-0.13.523.102.tar.bz2) = 9783ee33695ce159d9887c0c8aab6de8 +SHA256 (mozc-0.13.523.102.tar.bz2) = e83a6fa874ac27cd5f15c014f22a5c03c749e9009a078fb812d4e127892abbe2 +SIZE (mozc-0.13.523.102.tar.bz2) = 39269824 diff --git a/japanese/ibus-mozc/files/patch-base_iconv.cc b/japanese/ibus-mozc/files/patch-base_iconv.cc index d8a5c8b01083..d7dae90d339f 100644 --- a/japanese/ibus-mozc/files/patch-base_iconv.cc +++ b/japanese/ibus-mozc/files/patch-base_iconv.cc @@ -1,5 +1,5 @@ ---- base/iconv.cc.org 2010-10-16 11:54:05.538175977 +0900 -+++ base/iconv.cc 2010-10-16 11:55:04.017187136 +0900 +--- base/iconv.cc.org 2010-11-06 10:43:30.936188326 +0900 ++++ base/iconv.cc 2010-11-06 11:22:34.282186490 +0900 @@ -52,7 +52,11 @@ size_t olen_org = olen; iconv(ic, 0, &ilen, 0, &olen); // reset iconv state diff --git a/japanese/ibus-mozc/files/patch-base_mutex.h b/japanese/ibus-mozc/files/patch-base_mutex.h index 7dc8acf1d04f..85cf9e037e95 100644 --- a/japanese/ibus-mozc/files/patch-base_mutex.h +++ b/japanese/ibus-mozc/files/patch-base_mutex.h @@ -1,5 +1,5 @@ ---- base/mutex.h.org 2010-10-16 11:55:20.326178921 +0900 -+++ base/mutex.h 2010-10-16 11:55:50.442396765 +0900 +--- base/mutex.h.org 2010-11-06 10:44:01.433194789 +0900 ++++ base/mutex.h 2010-11-06 10:44:28.939186472 +0900 @@ -82,11 +82,11 @@ // PTHREAD_MUTEX_RECURSIVE_NP and PTHREAD_MUTEX_RECURSIVE seem to be // variants. For example, Mac OS X 10.4 had diff --git a/japanese/ibus-mozc/files/patch-base_process.cc b/japanese/ibus-mozc/files/patch-base_process.cc index bb913423d394..2deec58c1720 100644 --- a/japanese/ibus-mozc/files/patch-base_process.cc +++ b/japanese/ibus-mozc/files/patch-base_process.cc @@ -1,5 +1,5 @@ ---- base/process.cc.org 2010-10-16 11:55:55.790185101 +0900 -+++ base/process.cc 2010-10-16 11:56:38.273785950 +0900 +--- base/process.cc.org 2010-11-06 10:44:33.530187843 +0900 ++++ base/process.cc 2010-11-06 10:45:08.765186704 +0900 @@ -194,13 +194,18 @@ return ShellExecuteInSystemDir(L"open", wurl.c_str(), NULL, SW_SHOW); #endif diff --git a/japanese/ibus-mozc/files/patch-base_util.cc b/japanese/ibus-mozc/files/patch-base_util.cc index 120ffbf64f3e..1f5bdabf7ba8 100644 --- a/japanese/ibus-mozc/files/patch-base_util.cc +++ b/japanese/ibus-mozc/files/patch-base_util.cc @@ -1,6 +1,6 @@ ---- base/util.cc.org 2010-10-16 11:56:45.879185798 +0900 -+++ base/util.cc 2010-10-16 11:58:28.386189342 +0900 -@@ -1571,9 +1571,13 @@ +--- base/util.cc.org 2010-11-06 10:45:14.448193623 +0900 ++++ base/util.cc 2010-11-06 10:46:11.717188704 +0900 +@@ -1629,9 +1629,13 @@ return MacUtil::GetServerDirectory(); #endif // OS_MACOSX diff --git a/japanese/ibus-mozc/files/patch-build_mozc.py b/japanese/ibus-mozc/files/patch-build_mozc.py index 956d6d6c6b48..d3504fffc41c 100644 --- a/japanese/ibus-mozc/files/patch-build_mozc.py +++ b/japanese/ibus-mozc/files/patch-build_mozc.py @@ -1,5 +1,5 @@ ---- build_mozc.py.org 2010-10-16 11:58:32.818179161 +0900 -+++ build_mozc.py 2010-10-16 11:58:50.886185011 +0900 +--- build_mozc.py.org 2010-11-06 10:46:16.225188464 +0900 ++++ build_mozc.py 2010-11-06 10:46:35.213186660 +0900 @@ -69,7 +69,7 @@ def IsLinux(): diff --git a/japanese/ibus-mozc/files/patch-build_tools_mozc_version.py b/japanese/ibus-mozc/files/patch-build_tools_mozc_version.py index 14e749ee43e3..df3a35cc7d0a 100644 --- a/japanese/ibus-mozc/files/patch-build_tools_mozc_version.py +++ b/japanese/ibus-mozc/files/patch-build_tools_mozc_version.py @@ -1,5 +1,5 @@ ---- build_tools/mozc_version.py.org 2010-10-16 11:59:00.003180328 +0900 -+++ build_tools/mozc_version.py 2010-10-16 11:59:15.492182701 +0900 +--- build_tools/mozc_version.py.org 2010-11-06 10:46:40.900188220 +0900 ++++ build_tools/mozc_version.py 2010-11-06 10:47:03.466651555 +0900 @@ -55,7 +55,7 @@ def IsLinux(): diff --git a/japanese/ibus-mozc/files/patch-gui_about_dialog_about_dialog.cc b/japanese/ibus-mozc/files/patch-gui_about_dialog_about_dialog.cc index e49936e1936b..3e9ed169b980 100644 --- a/japanese/ibus-mozc/files/patch-gui_about_dialog_about_dialog.cc +++ b/japanese/ibus-mozc/files/patch-gui_about_dialog_about_dialog.cc @@ -1,6 +1,6 @@ ---- gui/about_dialog/about_dialog.cc.org 2010-10-16 11:59:20.527184356 +0900 -+++ gui/about_dialog/about_dialog.cc 2010-10-16 11:59:55.382185760 +0900 -@@ -114,7 +114,11 @@ +--- gui/about_dialog/about_dialog.cc.org 2010-11-06 10:47:08.291193501 +0900 ++++ gui/about_dialog/about_dialog.cc 2010-11-06 10:48:08.940188276 +0900 +@@ -106,7 +106,11 @@ SetLabelText(label_terms); SetLabelText(label_credits); diff --git a/japanese/ibus-mozc/files/patch-gui_about_dialog_version_image_widget.cc b/japanese/ibus-mozc/files/patch-gui_about_dialog_version_image_widget.cc deleted file mode 100644 index 5f96ae273a2d..000000000000 --- a/japanese/ibus-mozc/files/patch-gui_about_dialog_version_image_widget.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- gui/about_dialog/version_image_widget.cc.org 2010-10-16 12:00:02.576178852 +0900 -+++ gui/about_dialog/version_image_widget.cc 2010-10-16 12:00:34.221317549 +0900 -@@ -41,7 +41,11 @@ - void VersionImageWidget::loadImage() { - // Currently the version is always latest. - // TODO(mukai): add the version checking logic -+#ifdef __FreeBSD__ -+ pixmap_.reset(new QPixmap("@@LOCALBASE@@/share/mozc-tool/icons/update_uptodate.png")); -+#else - pixmap_.reset(new QPixmap(":/update_uptodate.png")); -+#endif - } - - void VersionImageWidget::paintEvent(QPaintEvent* paint_event) { diff --git a/japanese/ibus-mozc/files/patch-gyp_common.gypi b/japanese/ibus-mozc/files/patch-gyp_common.gypi index 7857675804f3..75a5ddb8921a 100644 --- a/japanese/ibus-mozc/files/patch-gyp_common.gypi +++ b/japanese/ibus-mozc/files/patch-gyp_common.gypi @@ -1,5 +1,5 @@ ---- gyp/common.gypi.org 2010-10-16 12:00:39.281175157 +0900 -+++ gyp/common.gypi 2010-10-16 12:01:01.287193240 +0900 +--- gyp/common.gypi.org 2010-11-06 10:50:16.532187538 +0900 ++++ gyp/common.gypi 2010-11-06 10:50:37.769189168 +0900 @@ -436,6 +436,12 @@ '-lz', '<@(extra_linux_libs)', diff --git a/japanese/ibus-mozc/files/patch-ipc_ipc_path_manager.cc b/japanese/ibus-mozc/files/patch-ipc_ipc_path_manager.cc index f6bc190c0632..d1e6b742e4a1 100644 --- a/japanese/ibus-mozc/files/patch-ipc_ipc_path_manager.cc +++ b/japanese/ibus-mozc/files/patch-ipc_ipc_path_manager.cc @@ -1,5 +1,5 @@ ---- ipc/ipc_path_manager.cc.org 2010-10-16 12:01:06.246177971 +0900 -+++ ipc/ipc_path_manager.cc 2010-10-16 12:01:26.641179012 +0900 +--- ipc/ipc_path_manager.cc.org 2010-11-06 10:50:41.620188667 +0900 ++++ ipc/ipc_path_manager.cc 2010-11-06 10:51:04.912186952 +0900 @@ -265,7 +265,7 @@ *ipc_name = kIPCPrefix; #endif // OS_WINDOWS diff --git a/japanese/ibus-mozc/files/patch-ipc_unix_ipc.cc b/japanese/ibus-mozc/files/patch-ipc_unix_ipc.cc index c72f23f08ced..a437b149c50b 100644 --- a/japanese/ibus-mozc/files/patch-ipc_unix_ipc.cc +++ b/japanese/ibus-mozc/files/patch-ipc_unix_ipc.cc @@ -1,5 +1,5 @@ ---- ipc/unix_ipc.cc.org 2010-10-16 12:01:47.982178217 +0900 -+++ ipc/unix_ipc.cc 2010-10-16 12:04:36.610176748 +0900 +--- ipc/unix_ipc.cc.org 2010-11-06 10:51:14.204190823 +0900 ++++ ipc/unix_ipc.cc 2010-11-06 10:54:18.096187153 +0900 @@ -41,7 +41,7 @@ #include <sys/time.h> #include <sys/types.h> @@ -24,10 +24,10 @@ -#ifdef OS_LINUX +#if defined(OS_LINUX) && !defined(__FreeBSD__) - // On ARM Linux, we do nothing and just return true since the platform (at - // least the qemu emulator) doesn't support the getsockopt(sock, SOL_SOCKET, - // SO_PEERCRED) system call. -@@ -311,7 +311,7 @@ + struct ucred peer_cred; + int peer_cred_len = sizeof(peer_cred); + if (getsockopt(socket, SOL_SOCKET, SO_PEERCRED, +@@ -303,7 +303,7 @@ address.sun_family = AF_UNIX; ::memcpy(address.sun_path, server_address.data(), server_address_length); address.sun_path[server_address_length] = '\0'; @@ -36,7 +36,7 @@ address.sun_len = SUN_LEN(&address); const size_t sun_len = sizeof(address); #else -@@ -431,21 +431,21 @@ +@@ -423,21 +423,21 @@ SO_REUSEADDR, reinterpret_cast<char *>(&on), sizeof(on)); diff --git a/japanese/ibus-mozc/files/patch-server_mozc_server.cc b/japanese/ibus-mozc/files/patch-server_mozc_server.cc index 02086d954321..4ad2a7be1db7 100644 --- a/japanese/ibus-mozc/files/patch-server_mozc_server.cc +++ b/japanese/ibus-mozc/files/patch-server_mozc_server.cc @@ -1,5 +1,5 @@ ---- server/mozc_server.cc.org 2010-10-16 12:04:43.449185058 +0900 -+++ server/mozc_server.cc 2010-10-16 12:06:18.373180984 +0900 +--- server/mozc_server.cc.org 2010-11-06 10:54:20.721190331 +0900 ++++ server/mozc_server.cc 2010-11-06 10:55:39.283188573 +0900 @@ -30,6 +30,9 @@ #ifdef OS_WINDOWS #include <windows.h> diff --git a/japanese/ibus-mozc/files/patch-unix_ibus_gen_mozc_xml.py b/japanese/ibus-mozc/files/patch-unix_ibus_gen_mozc_xml.py index 2254745c1524..d10874b052ee 100644 --- a/japanese/ibus-mozc/files/patch-unix_ibus_gen_mozc_xml.py +++ b/japanese/ibus-mozc/files/patch-unix_ibus_gen_mozc_xml.py @@ -1,5 +1,5 @@ ---- unix/ibus/gen_mozc_xml.py.org 2010-10-16 12:06:25.692183819 +0900 -+++ unix/ibus/gen_mozc_xml.py 2010-10-16 12:07:20.965178571 +0900 +--- unix/ibus/gen_mozc_xml.py.org 2010-11-06 10:55:42.821186000 +0900 ++++ unix/ibus/gen_mozc_xml.py 2010-11-06 10:56:59.661189967 +0900 @@ -39,6 +39,7 @@ import optparse diff --git a/japanese/ibus-mozc/files/patch-unix_ibus_mozc.xml b/japanese/ibus-mozc/files/patch-unix_ibus_mozc.xml index 777fa44859b3..624ff45d68ab 100644 --- a/japanese/ibus-mozc/files/patch-unix_ibus_mozc.xml +++ b/japanese/ibus-mozc/files/patch-unix_ibus_mozc.xml @@ -1,5 +1,5 @@ ---- unix/ibus/mozc.xml.org 2010-09-25 11:23:23.585335502 +0900 -+++ unix/ibus/mozc.xml 2010-09-25 11:23:48.280337800 +0900 +--- unix/ibus/mozc.xml.org 2010-11-06 10:57:06.006187725 +0900 ++++ unix/ibus/mozc.xml 2010-11-06 10:57:28.462186463 +0900 @@ -0,0 +1,21 @@ +<component> + <name>com.google.IBus.Mozc</name> diff --git a/japanese/ibus-mozc/files/patch-unix_ibus_path_util.cc b/japanese/ibus-mozc/files/patch-unix_ibus_path_util.cc index d797f194af01..532d5c92b0a0 100644 --- a/japanese/ibus-mozc/files/patch-unix_ibus_path_util.cc +++ b/japanese/ibus-mozc/files/patch-unix_ibus_path_util.cc @@ -1,5 +1,5 @@ ---- unix/ibus/path_util.cc.org 2010-10-16 12:07:47.547186060 +0900 -+++ unix/ibus/path_util.cc 2010-10-16 12:08:37.461176526 +0900 +--- unix/ibus/path_util.cc.org 2010-11-06 10:57:33.500187940 +0900 ++++ unix/ibus/path_util.cc 2010-11-06 10:58:12.395186886 +0900 @@ -30,14 +30,22 @@ #include "unix/ibus/path_util.h" diff --git a/japanese/ibus-mozc/files/patch-unix_scim_scim.gyp b/japanese/ibus-mozc/files/patch-unix_scim_scim.gyp index e5595ebfa185..128dc6b98854 100644 --- a/japanese/ibus-mozc/files/patch-unix_scim_scim.gyp +++ b/japanese/ibus-mozc/files/patch-unix_scim_scim.gyp @@ -1,5 +1,5 @@ ---- unix/scim/scim.gyp.org 2010-10-16 12:08:42.286177748 +0900 -+++ unix/scim/scim.gyp 2010-10-16 12:08:59.542185425 +0900 +--- unix/scim/scim.gyp.org 2010-11-06 10:58:16.438187044 +0900 ++++ unix/scim/scim.gyp 2010-11-06 10:58:34.829186459 +0900 @@ -44,7 +44,7 @@ '../../session/session.gyp:session', ], diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index a2a33eab90b2..b3b659de9bc7 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mozc-server -PORTVERSION= 0.13.499.102 +PORTVERSION= 0.13.523.102 CATEGORIES= japanese MASTER_SITES= http://people.freebsd.org/~daichi/distfiles/ DISTNAME= mozc-${PORTVERSION} @@ -43,31 +43,6 @@ BUILD_MODE=Debug BUILD_MODE=Release .endif -.if defined(WITH_DIC_UT) -WITH_DIC_UT_MEISHI=yes -WITH_DIC_UT_JINMEI=yes -.endif - -.if defined(WITH_DIC_UT_FULL) -WITH_DIC_UT_MEISHI=yes -WITH_DIC_UT_JINMEI=yes -WITH_DIC_UT_KAOMOJI=yes -WITH_DIC_UT_JIGYOSHO=yes -WITH_DIC_UT_ZIPCODE=yes -WITH_DIC_UT_EDICTKATAKANAGO=yes -.endif - -.if defined(WITH_DIC_UT_MEISHI) || \ - defined(WITH_DIC_UT_JINMEI) || \ - defined(WITH_DIC_UT_KAOMOJI) || \ - defined(WITH_DIC_UT_JIGYOSHO) || \ - defined(WITH_DIC_UT_ZIPCODE) || \ - defined(WITH_DIC_UT_EDICTKATAKANAGO) -DISTFILES+= mozcdic-ut-devel-20100911.tar.bz2 -MASTER_SITES+= http://www.geocities.jp/ep3797/snapshot/mozc/ -WRKUTDICSRC= ${WRKDIR}/mozcdic-ut-devel-20100911 -.endif - REPLACE_FILES= ${WRKSRC}/build_mozc.py \ ${WRKSRC}/gyp/common.gypi \ ${WRKSRC}/base/util.cc \ @@ -79,30 +54,6 @@ post-patch: ${SED} -i .bak -e "s/@@LOCALBASE@@/${LOCALBASE:S/\//\\\//g}/g" \ $${FILE}; \ done; -.if defined(WITH_DIC_UT_MEISHI) - ${CAT} ${WRKUTDICSRC}/mozcdic-ut-meisi-20100911.txt \ - >> ${WRKSRC}/data/dictionary/dictionary1.txt -.endif -.if defined(WITH_DIC_UT_JINMEI) - ${CAT} ${WRKUTDICSRC}/mozcdic-ut-jinmei-20100911.txt \ - >> ${WRKSRC}/data/dictionary/dictionary1.txt -.endif -.if defined(WITH_DIC_UT_KAOMOJI) - ${CAT} ${WRKUTDICSRC}/mozcdic-ut-kaomoji-20100911.txt \ - >> ${WRKSRC}/data/dictionary/dictionary1.txt -.endif -.if defined(WITH_DIC_UT_JIGYOSHO) - ${CAT} ${WRKUTDICSRC}/mozcdic-ut-jigyosyo-20100911.txt \ - >> ${WRKSRC}/data/dictionary/dictionary1.txt -.endif -.if defined(WITH_DIC_UT_ZIPCODE) - ${CAT} ${WRKUTDICSRC}/mozcdic-ut-zipcode-20100911.txt \ - >> ${WRKSRC}/data/dictionary/dictionary1.txt -.endif -.if defined(WITH_DIC_UT_EDICTKATAKANAGO) - ${CAT} ${WRKUTDICSRC}/mozcdic-ut-edict-katakanago-20100911.txt \ - >> ${WRKSRC}/data/dictionary/dictionary1.txt -.endif do-build: @cd ${WRKSRC}/; \ diff --git a/japanese/mozc-server/distinfo b/japanese/mozc-server/distinfo index 0978ba3f1851..e8009e38c3ee 100644 --- a/japanese/mozc-server/distinfo +++ b/japanese/mozc-server/distinfo @@ -1,6 +1,3 @@ -MD5 (mozc-0.13.499.102.tar.bz2) = 8405e050bc87bf7a38ad2a543498d353 -SHA256 (mozc-0.13.499.102.tar.bz2) = bc39fb757c0f7d40abf2603c2c72b37a2ca4c9614bf1ca12ce8639bced94602c -SIZE (mozc-0.13.499.102.tar.bz2) = 39139600 -MD5 (mozcdic-ut-devel-20100911.tar.bz2) = 2b86fbd1251a65d1b813640c5dd345e3 -SHA256 (mozcdic-ut-devel-20100911.tar.bz2) = 83825af73e6d6691611f4e2e2c92285b4a940bd5fd89d9c07cf108744e788d50 -SIZE (mozcdic-ut-devel-20100911.tar.bz2) = 5563197 +MD5 (mozc-0.13.523.102.tar.bz2) = 9783ee33695ce159d9887c0c8aab6de8 +SHA256 (mozc-0.13.523.102.tar.bz2) = e83a6fa874ac27cd5f15c014f22a5c03c749e9009a078fb812d4e127892abbe2 +SIZE (mozc-0.13.523.102.tar.bz2) = 39269824 diff --git a/japanese/mozc-server/files/patch-base_iconv.cc b/japanese/mozc-server/files/patch-base_iconv.cc index d8a5c8b01083..d7dae90d339f 100644 --- a/japanese/mozc-server/files/patch-base_iconv.cc +++ b/japanese/mozc-server/files/patch-base_iconv.cc @@ -1,5 +1,5 @@ ---- base/iconv.cc.org 2010-10-16 11:54:05.538175977 +0900 -+++ base/iconv.cc 2010-10-16 11:55:04.017187136 +0900 +--- base/iconv.cc.org 2010-11-06 10:43:30.936188326 +0900 ++++ base/iconv.cc 2010-11-06 11:22:34.282186490 +0900 @@ -52,7 +52,11 @@ size_t olen_org = olen; iconv(ic, 0, &ilen, 0, &olen); // reset iconv state diff --git a/japanese/mozc-server/files/patch-base_mutex.h b/japanese/mozc-server/files/patch-base_mutex.h index 7dc8acf1d04f..85cf9e037e95 100644 --- a/japanese/mozc-server/files/patch-base_mutex.h +++ b/japanese/mozc-server/files/patch-base_mutex.h @@ -1,5 +1,5 @@ ---- base/mutex.h.org 2010-10-16 11:55:20.326178921 +0900 -+++ base/mutex.h 2010-10-16 11:55:50.442396765 +0900 +--- base/mutex.h.org 2010-11-06 10:44:01.433194789 +0900 ++++ base/mutex.h 2010-11-06 10:44:28.939186472 +0900 @@ -82,11 +82,11 @@ // PTHREAD_MUTEX_RECURSIVE_NP and PTHREAD_MUTEX_RECURSIVE seem to be // variants. For example, Mac OS X 10.4 had diff --git a/japanese/mozc-server/files/patch-base_process.cc b/japanese/mozc-server/files/patch-base_process.cc index bb913423d394..2deec58c1720 100644 --- a/japanese/mozc-server/files/patch-base_process.cc +++ b/japanese/mozc-server/files/patch-base_process.cc @@ -1,5 +1,5 @@ ---- base/process.cc.org 2010-10-16 11:55:55.790185101 +0900 -+++ base/process.cc 2010-10-16 11:56:38.273785950 +0900 +--- base/process.cc.org 2010-11-06 10:44:33.530187843 +0900 ++++ base/process.cc 2010-11-06 10:45:08.765186704 +0900 @@ -194,13 +194,18 @@ return ShellExecuteInSystemDir(L"open", wurl.c_str(), NULL, SW_SHOW); #endif diff --git a/japanese/mozc-server/files/patch-base_util.cc b/japanese/mozc-server/files/patch-base_util.cc index 120ffbf64f3e..1f5bdabf7ba8 100644 --- a/japanese/mozc-server/files/patch-base_util.cc +++ b/japanese/mozc-server/files/patch-base_util.cc @@ -1,6 +1,6 @@ ---- base/util.cc.org 2010-10-16 11:56:45.879185798 +0900 -+++ base/util.cc 2010-10-16 11:58:28.386189342 +0900 -@@ -1571,9 +1571,13 @@ +--- base/util.cc.org 2010-11-06 10:45:14.448193623 +0900 ++++ base/util.cc 2010-11-06 10:46:11.717188704 +0900 +@@ -1629,9 +1629,13 @@ return MacUtil::GetServerDirectory(); #endif // OS_MACOSX diff --git a/japanese/mozc-server/files/patch-build_mozc.py b/japanese/mozc-server/files/patch-build_mozc.py index 956d6d6c6b48..d3504fffc41c 100644 --- a/japanese/mozc-server/files/patch-build_mozc.py +++ b/japanese/mozc-server/files/patch-build_mozc.py @@ -1,5 +1,5 @@ ---- build_mozc.py.org 2010-10-16 11:58:32.818179161 +0900 -+++ build_mozc.py 2010-10-16 11:58:50.886185011 +0900 +--- build_mozc.py.org 2010-11-06 10:46:16.225188464 +0900 ++++ build_mozc.py 2010-11-06 10:46:35.213186660 +0900 @@ -69,7 +69,7 @@ def IsLinux(): diff --git a/japanese/mozc-server/files/patch-build_tools_mozc_version.py b/japanese/mozc-server/files/patch-build_tools_mozc_version.py index 14e749ee43e3..df3a35cc7d0a 100644 --- a/japanese/mozc-server/files/patch-build_tools_mozc_version.py +++ b/japanese/mozc-server/files/patch-build_tools_mozc_version.py @@ -1,5 +1,5 @@ ---- build_tools/mozc_version.py.org 2010-10-16 11:59:00.003180328 +0900 -+++ build_tools/mozc_version.py 2010-10-16 11:59:15.492182701 +0900 +--- build_tools/mozc_version.py.org 2010-11-06 10:46:40.900188220 +0900 ++++ build_tools/mozc_version.py 2010-11-06 10:47:03.466651555 +0900 @@ -55,7 +55,7 @@ def IsLinux(): diff --git a/japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc b/japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc index e49936e1936b..3e9ed169b980 100644 --- a/japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc +++ b/japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc @@ -1,6 +1,6 @@ ---- gui/about_dialog/about_dialog.cc.org 2010-10-16 11:59:20.527184356 +0900 -+++ gui/about_dialog/about_dialog.cc 2010-10-16 11:59:55.382185760 +0900 -@@ -114,7 +114,11 @@ +--- gui/about_dialog/about_dialog.cc.org 2010-11-06 10:47:08.291193501 +0900 ++++ gui/about_dialog/about_dialog.cc 2010-11-06 10:48:08.940188276 +0900 +@@ -106,7 +106,11 @@ SetLabelText(label_terms); SetLabelText(label_credits); diff --git a/japanese/mozc-server/files/patch-gui_about_dialog_version_image_widget.cc b/japanese/mozc-server/files/patch-gui_about_dialog_version_image_widget.cc deleted file mode 100644 index 5f96ae273a2d..000000000000 --- a/japanese/mozc-server/files/patch-gui_about_dialog_version_image_widget.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- gui/about_dialog/version_image_widget.cc.org 2010-10-16 12:00:02.576178852 +0900 -+++ gui/about_dialog/version_image_widget.cc 2010-10-16 12:00:34.221317549 +0900 -@@ -41,7 +41,11 @@ - void VersionImageWidget::loadImage() { - // Currently the version is always latest. - // TODO(mukai): add the version checking logic -+#ifdef __FreeBSD__ -+ pixmap_.reset(new QPixmap("@@LOCALBASE@@/share/mozc-tool/icons/update_uptodate.png")); -+#else - pixmap_.reset(new QPixmap(":/update_uptodate.png")); -+#endif - } - - void VersionImageWidget::paintEvent(QPaintEvent* paint_event) { diff --git a/japanese/mozc-server/files/patch-gyp_common.gypi b/japanese/mozc-server/files/patch-gyp_common.gypi index 7857675804f3..75a5ddb8921a 100644 --- a/japanese/mozc-server/files/patch-gyp_common.gypi +++ b/japanese/mozc-server/files/patch-gyp_common.gypi @@ -1,5 +1,5 @@ ---- gyp/common.gypi.org 2010-10-16 12:00:39.281175157 +0900 -+++ gyp/common.gypi 2010-10-16 12:01:01.287193240 +0900 +--- gyp/common.gypi.org 2010-11-06 10:50:16.532187538 +0900 ++++ gyp/common.gypi 2010-11-06 10:50:37.769189168 +0900 @@ -436,6 +436,12 @@ '-lz', '<@(extra_linux_libs)', diff --git a/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc b/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc index f6bc190c0632..d1e6b742e4a1 100644 --- a/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc +++ b/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc @@ -1,5 +1,5 @@ ---- ipc/ipc_path_manager.cc.org 2010-10-16 12:01:06.246177971 +0900 -+++ ipc/ipc_path_manager.cc 2010-10-16 12:01:26.641179012 +0900 +--- ipc/ipc_path_manager.cc.org 2010-11-06 10:50:41.620188667 +0900 ++++ ipc/ipc_path_manager.cc 2010-11-06 10:51:04.912186952 +0900 @@ -265,7 +265,7 @@ *ipc_name = kIPCPrefix; #endif // OS_WINDOWS diff --git a/japanese/mozc-server/files/patch-ipc_unix_ipc.cc b/japanese/mozc-server/files/patch-ipc_unix_ipc.cc index c72f23f08ced..a437b149c50b 100644 --- a/japanese/mozc-server/files/patch-ipc_unix_ipc.cc +++ b/japanese/mozc-server/files/patch-ipc_unix_ipc.cc @@ -1,5 +1,5 @@ ---- ipc/unix_ipc.cc.org 2010-10-16 12:01:47.982178217 +0900 -+++ ipc/unix_ipc.cc 2010-10-16 12:04:36.610176748 +0900 +--- ipc/unix_ipc.cc.org 2010-11-06 10:51:14.204190823 +0900 ++++ ipc/unix_ipc.cc 2010-11-06 10:54:18.096187153 +0900 @@ -41,7 +41,7 @@ #include <sys/time.h> #include <sys/types.h> @@ -24,10 +24,10 @@ -#ifdef OS_LINUX +#if defined(OS_LINUX) && !defined(__FreeBSD__) - // On ARM Linux, we do nothing and just return true since the platform (at - // least the qemu emulator) doesn't support the getsockopt(sock, SOL_SOCKET, - // SO_PEERCRED) system call. -@@ -311,7 +311,7 @@ + struct ucred peer_cred; + int peer_cred_len = sizeof(peer_cred); + if (getsockopt(socket, SOL_SOCKET, SO_PEERCRED, +@@ -303,7 +303,7 @@ address.sun_family = AF_UNIX; ::memcpy(address.sun_path, server_address.data(), server_address_length); address.sun_path[server_address_length] = '\0'; @@ -36,7 +36,7 @@ address.sun_len = SUN_LEN(&address); const size_t sun_len = sizeof(address); #else -@@ -431,21 +431,21 @@ +@@ -423,21 +423,21 @@ SO_REUSEADDR, reinterpret_cast<char *>(&on), sizeof(on)); diff --git a/japanese/mozc-server/files/patch-server_mozc_server.cc b/japanese/mozc-server/files/patch-server_mozc_server.cc index 02086d954321..4ad2a7be1db7 100644 --- a/japanese/mozc-server/files/patch-server_mozc_server.cc +++ b/japanese/mozc-server/files/patch-server_mozc_server.cc @@ -1,5 +1,5 @@ ---- server/mozc_server.cc.org 2010-10-16 12:04:43.449185058 +0900 -+++ server/mozc_server.cc 2010-10-16 12:06:18.373180984 +0900 +--- server/mozc_server.cc.org 2010-11-06 10:54:20.721190331 +0900 ++++ server/mozc_server.cc 2010-11-06 10:55:39.283188573 +0900 @@ -30,6 +30,9 @@ #ifdef OS_WINDOWS #include <windows.h> diff --git a/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py b/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py index 2254745c1524..d10874b052ee 100644 --- a/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py +++ b/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py @@ -1,5 +1,5 @@ ---- unix/ibus/gen_mozc_xml.py.org 2010-10-16 12:06:25.692183819 +0900 -+++ unix/ibus/gen_mozc_xml.py 2010-10-16 12:07:20.965178571 +0900 +--- unix/ibus/gen_mozc_xml.py.org 2010-11-06 10:55:42.821186000 +0900 ++++ unix/ibus/gen_mozc_xml.py 2010-11-06 10:56:59.661189967 +0900 @@ -39,6 +39,7 @@ import optparse diff --git a/japanese/mozc-server/files/patch-unix_ibus_mozc.xml b/japanese/mozc-server/files/patch-unix_ibus_mozc.xml index 777fa44859b3..624ff45d68ab 100644 --- a/japanese/mozc-server/files/patch-unix_ibus_mozc.xml +++ b/japanese/mozc-server/files/patch-unix_ibus_mozc.xml @@ -1,5 +1,5 @@ ---- unix/ibus/mozc.xml.org 2010-09-25 11:23:23.585335502 +0900 -+++ unix/ibus/mozc.xml 2010-09-25 11:23:48.280337800 +0900 +--- unix/ibus/mozc.xml.org 2010-11-06 10:57:06.006187725 +0900 ++++ unix/ibus/mozc.xml 2010-11-06 10:57:28.462186463 +0900 @@ -0,0 +1,21 @@ +<component> + <name>com.google.IBus.Mozc</name> diff --git a/japanese/mozc-server/files/patch-unix_ibus_path_util.cc b/japanese/mozc-server/files/patch-unix_ibus_path_util.cc index d797f194af01..532d5c92b0a0 100644 --- a/japanese/mozc-server/files/patch-unix_ibus_path_util.cc +++ b/japanese/mozc-server/files/patch-unix_ibus_path_util.cc @@ -1,5 +1,5 @@ ---- unix/ibus/path_util.cc.org 2010-10-16 12:07:47.547186060 +0900 -+++ unix/ibus/path_util.cc 2010-10-16 12:08:37.461176526 +0900 +--- unix/ibus/path_util.cc.org 2010-11-06 10:57:33.500187940 +0900 ++++ unix/ibus/path_util.cc 2010-11-06 10:58:12.395186886 +0900 @@ -30,14 +30,22 @@ #include "unix/ibus/path_util.h" diff --git a/japanese/mozc-server/files/patch-unix_scim_scim.gyp b/japanese/mozc-server/files/patch-unix_scim_scim.gyp index e5595ebfa185..128dc6b98854 100644 --- a/japanese/mozc-server/files/patch-unix_scim_scim.gyp +++ b/japanese/mozc-server/files/patch-unix_scim_scim.gyp @@ -1,5 +1,5 @@ ---- unix/scim/scim.gyp.org 2010-10-16 12:08:42.286177748 +0900 -+++ unix/scim/scim.gyp 2010-10-16 12:08:59.542185425 +0900 +--- unix/scim/scim.gyp.org 2010-11-06 10:58:16.438187044 +0900 ++++ unix/scim/scim.gyp 2010-11-06 10:58:34.829186459 +0900 @@ -44,7 +44,7 @@ '../../session/session.gyp:session', ], diff --git a/japanese/mozc-tool/Makefile b/japanese/mozc-tool/Makefile index 306360aa07bc..f4f19ce719ed 100644 --- a/japanese/mozc-tool/Makefile +++ b/japanese/mozc-tool/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mozc-tool -PORTVERSION= 0.13.499.102 +PORTVERSION= 0.13.523.102 CATEGORIES= japanese MASTER_SITES= http://people.freebsd.org/~daichi/distfiles/ DISTNAME= mozc-${PORTVERSION} @@ -45,8 +45,7 @@ REPLACE_FILES= ${WRKSRC}/build_mozc.py \ ${WRKSRC}/gyp/common.gypi \ ${WRKSRC}/base/util.cc \ ${WRKSRC}/base/process.cc \ - ${WRKSRC}/gui/about_dialog/about_dialog.cc \ - ${WRKSRC}/gui/about_dialog/version_image_widget.cc + ${WRKSRC}/gui/about_dialog/about_dialog.cc post-patch: @for FILE in ${REPLACE_FILES}; \ diff --git a/japanese/mozc-tool/distinfo b/japanese/mozc-tool/distinfo index 9a74557256a8..e8009e38c3ee 100644 --- a/japanese/mozc-tool/distinfo +++ b/japanese/mozc-tool/distinfo @@ -1,3 +1,3 @@ -MD5 (mozc-0.13.499.102.tar.bz2) = 8405e050bc87bf7a38ad2a543498d353 -SHA256 (mozc-0.13.499.102.tar.bz2) = bc39fb757c0f7d40abf2603c2c72b37a2ca4c9614bf1ca12ce8639bced94602c -SIZE (mozc-0.13.499.102.tar.bz2) = 39139600 +MD5 (mozc-0.13.523.102.tar.bz2) = 9783ee33695ce159d9887c0c8aab6de8 +SHA256 (mozc-0.13.523.102.tar.bz2) = e83a6fa874ac27cd5f15c014f22a5c03c749e9009a078fb812d4e127892abbe2 +SIZE (mozc-0.13.523.102.tar.bz2) = 39269824 diff --git a/japanese/mozc-tool/files/patch-base_iconv.cc b/japanese/mozc-tool/files/patch-base_iconv.cc index d8a5c8b01083..d7dae90d339f 100644 --- a/japanese/mozc-tool/files/patch-base_iconv.cc +++ b/japanese/mozc-tool/files/patch-base_iconv.cc @@ -1,5 +1,5 @@ ---- base/iconv.cc.org 2010-10-16 11:54:05.538175977 +0900 -+++ base/iconv.cc 2010-10-16 11:55:04.017187136 +0900 +--- base/iconv.cc.org 2010-11-06 10:43:30.936188326 +0900 ++++ base/iconv.cc 2010-11-06 11:22:34.282186490 +0900 @@ -52,7 +52,11 @@ size_t olen_org = olen; iconv(ic, 0, &ilen, 0, &olen); // reset iconv state diff --git a/japanese/mozc-tool/files/patch-base_mutex.h b/japanese/mozc-tool/files/patch-base_mutex.h index 7dc8acf1d04f..85cf9e037e95 100644 --- a/japanese/mozc-tool/files/patch-base_mutex.h +++ b/japanese/mozc-tool/files/patch-base_mutex.h @@ -1,5 +1,5 @@ ---- base/mutex.h.org 2010-10-16 11:55:20.326178921 +0900 -+++ base/mutex.h 2010-10-16 11:55:50.442396765 +0900 +--- base/mutex.h.org 2010-11-06 10:44:01.433194789 +0900 ++++ base/mutex.h 2010-11-06 10:44:28.939186472 +0900 @@ -82,11 +82,11 @@ // PTHREAD_MUTEX_RECURSIVE_NP and PTHREAD_MUTEX_RECURSIVE seem to be // variants. For example, Mac OS X 10.4 had diff --git a/japanese/mozc-tool/files/patch-base_process.cc b/japanese/mozc-tool/files/patch-base_process.cc index bb913423d394..2deec58c1720 100644 --- a/japanese/mozc-tool/files/patch-base_process.cc +++ b/japanese/mozc-tool/files/patch-base_process.cc @@ -1,5 +1,5 @@ ---- base/process.cc.org 2010-10-16 11:55:55.790185101 +0900 -+++ base/process.cc 2010-10-16 11:56:38.273785950 +0900 +--- base/process.cc.org 2010-11-06 10:44:33.530187843 +0900 ++++ base/process.cc 2010-11-06 10:45:08.765186704 +0900 @@ -194,13 +194,18 @@ return ShellExecuteInSystemDir(L"open", wurl.c_str(), NULL, SW_SHOW); #endif diff --git a/japanese/mozc-tool/files/patch-base_util.cc b/japanese/mozc-tool/files/patch-base_util.cc index 120ffbf64f3e..1f5bdabf7ba8 100644 --- a/japanese/mozc-tool/files/patch-base_util.cc +++ b/japanese/mozc-tool/files/patch-base_util.cc @@ -1,6 +1,6 @@ ---- base/util.cc.org 2010-10-16 11:56:45.879185798 +0900 -+++ base/util.cc 2010-10-16 11:58:28.386189342 +0900 -@@ -1571,9 +1571,13 @@ +--- base/util.cc.org 2010-11-06 10:45:14.448193623 +0900 ++++ base/util.cc 2010-11-06 10:46:11.717188704 +0900 +@@ -1629,9 +1629,13 @@ return MacUtil::GetServerDirectory(); #endif // OS_MACOSX diff --git a/japanese/mozc-tool/files/patch-build_mozc.py b/japanese/mozc-tool/files/patch-build_mozc.py index 956d6d6c6b48..d3504fffc41c 100644 --- a/japanese/mozc-tool/files/patch-build_mozc.py +++ b/japanese/mozc-tool/files/patch-build_mozc.py @@ -1,5 +1,5 @@ ---- build_mozc.py.org 2010-10-16 11:58:32.818179161 +0900 -+++ build_mozc.py 2010-10-16 11:58:50.886185011 +0900 +--- build_mozc.py.org 2010-11-06 10:46:16.225188464 +0900 ++++ build_mozc.py 2010-11-06 10:46:35.213186660 +0900 @@ -69,7 +69,7 @@ def IsLinux(): diff --git a/japanese/mozc-tool/files/patch-build_tools_mozc_version.py b/japanese/mozc-tool/files/patch-build_tools_mozc_version.py index 14e749ee43e3..df3a35cc7d0a 100644 --- a/japanese/mozc-tool/files/patch-build_tools_mozc_version.py +++ b/japanese/mozc-tool/files/patch-build_tools_mozc_version.py @@ -1,5 +1,5 @@ ---- build_tools/mozc_version.py.org 2010-10-16 11:59:00.003180328 +0900 -+++ build_tools/mozc_version.py 2010-10-16 11:59:15.492182701 +0900 +--- build_tools/mozc_version.py.org 2010-11-06 10:46:40.900188220 +0900 ++++ build_tools/mozc_version.py 2010-11-06 10:47:03.466651555 +0900 @@ -55,7 +55,7 @@ def IsLinux(): diff --git a/japanese/mozc-tool/files/patch-gui_about_dialog_about_dialog.cc b/japanese/mozc-tool/files/patch-gui_about_dialog_about_dialog.cc index e49936e1936b..3e9ed169b980 100644 --- a/japanese/mozc-tool/files/patch-gui_about_dialog_about_dialog.cc +++ b/japanese/mozc-tool/files/patch-gui_about_dialog_about_dialog.cc @@ -1,6 +1,6 @@ ---- gui/about_dialog/about_dialog.cc.org 2010-10-16 11:59:20.527184356 +0900 -+++ gui/about_dialog/about_dialog.cc 2010-10-16 11:59:55.382185760 +0900 -@@ -114,7 +114,11 @@ +--- gui/about_dialog/about_dialog.cc.org 2010-11-06 10:47:08.291193501 +0900 ++++ gui/about_dialog/about_dialog.cc 2010-11-06 10:48:08.940188276 +0900 +@@ -106,7 +106,11 @@ SetLabelText(label_terms); SetLabelText(label_credits); diff --git a/japanese/mozc-tool/files/patch-gui_about_dialog_version_image_widget.cc b/japanese/mozc-tool/files/patch-gui_about_dialog_version_image_widget.cc deleted file mode 100644 index 5f96ae273a2d..000000000000 --- a/japanese/mozc-tool/files/patch-gui_about_dialog_version_image_widget.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- gui/about_dialog/version_image_widget.cc.org 2010-10-16 12:00:02.576178852 +0900 -+++ gui/about_dialog/version_image_widget.cc 2010-10-16 12:00:34.221317549 +0900 -@@ -41,7 +41,11 @@ - void VersionImageWidget::loadImage() { - // Currently the version is always latest. - // TODO(mukai): add the version checking logic -+#ifdef __FreeBSD__ -+ pixmap_.reset(new QPixmap("@@LOCALBASE@@/share/mozc-tool/icons/update_uptodate.png")); -+#else - pixmap_.reset(new QPixmap(":/update_uptodate.png")); -+#endif - } - - void VersionImageWidget::paintEvent(QPaintEvent* paint_event) { diff --git a/japanese/mozc-tool/files/patch-gyp_common.gypi b/japanese/mozc-tool/files/patch-gyp_common.gypi index 7857675804f3..75a5ddb8921a 100644 --- a/japanese/mozc-tool/files/patch-gyp_common.gypi +++ b/japanese/mozc-tool/files/patch-gyp_common.gypi @@ -1,5 +1,5 @@ ---- gyp/common.gypi.org 2010-10-16 12:00:39.281175157 +0900 -+++ gyp/common.gypi 2010-10-16 12:01:01.287193240 +0900 +--- gyp/common.gypi.org 2010-11-06 10:50:16.532187538 +0900 ++++ gyp/common.gypi 2010-11-06 10:50:37.769189168 +0900 @@ -436,6 +436,12 @@ '-lz', '<@(extra_linux_libs)', diff --git a/japanese/mozc-tool/files/patch-ipc_ipc_path_manager.cc b/japanese/mozc-tool/files/patch-ipc_ipc_path_manager.cc index f6bc190c0632..d1e6b742e4a1 100644 --- a/japanese/mozc-tool/files/patch-ipc_ipc_path_manager.cc +++ b/japanese/mozc-tool/files/patch-ipc_ipc_path_manager.cc @@ -1,5 +1,5 @@ ---- ipc/ipc_path_manager.cc.org 2010-10-16 12:01:06.246177971 +0900 -+++ ipc/ipc_path_manager.cc 2010-10-16 12:01:26.641179012 +0900 +--- ipc/ipc_path_manager.cc.org 2010-11-06 10:50:41.620188667 +0900 ++++ ipc/ipc_path_manager.cc 2010-11-06 10:51:04.912186952 +0900 @@ -265,7 +265,7 @@ *ipc_name = kIPCPrefix; #endif // OS_WINDOWS diff --git a/japanese/mozc-tool/files/patch-ipc_unix_ipc.cc b/japanese/mozc-tool/files/patch-ipc_unix_ipc.cc index c72f23f08ced..a437b149c50b 100644 --- a/japanese/mozc-tool/files/patch-ipc_unix_ipc.cc +++ b/japanese/mozc-tool/files/patch-ipc_unix_ipc.cc @@ -1,5 +1,5 @@ ---- ipc/unix_ipc.cc.org 2010-10-16 12:01:47.982178217 +0900 -+++ ipc/unix_ipc.cc 2010-10-16 12:04:36.610176748 +0900 +--- ipc/unix_ipc.cc.org 2010-11-06 10:51:14.204190823 +0900 ++++ ipc/unix_ipc.cc 2010-11-06 10:54:18.096187153 +0900 @@ -41,7 +41,7 @@ #include <sys/time.h> #include <sys/types.h> @@ -24,10 +24,10 @@ -#ifdef OS_LINUX +#if defined(OS_LINUX) && !defined(__FreeBSD__) - // On ARM Linux, we do nothing and just return true since the platform (at - // least the qemu emulator) doesn't support the getsockopt(sock, SOL_SOCKET, - // SO_PEERCRED) system call. -@@ -311,7 +311,7 @@ + struct ucred peer_cred; + int peer_cred_len = sizeof(peer_cred); + if (getsockopt(socket, SOL_SOCKET, SO_PEERCRED, +@@ -303,7 +303,7 @@ address.sun_family = AF_UNIX; ::memcpy(address.sun_path, server_address.data(), server_address_length); address.sun_path[server_address_length] = '\0'; @@ -36,7 +36,7 @@ address.sun_len = SUN_LEN(&address); const size_t sun_len = sizeof(address); #else -@@ -431,21 +431,21 @@ +@@ -423,21 +423,21 @@ SO_REUSEADDR, reinterpret_cast<char *>(&on), sizeof(on)); diff --git a/japanese/mozc-tool/files/patch-server_mozc_server.cc b/japanese/mozc-tool/files/patch-server_mozc_server.cc index 02086d954321..4ad2a7be1db7 100644 --- a/japanese/mozc-tool/files/patch-server_mozc_server.cc +++ b/japanese/mozc-tool/files/patch-server_mozc_server.cc @@ -1,5 +1,5 @@ ---- server/mozc_server.cc.org 2010-10-16 12:04:43.449185058 +0900 -+++ server/mozc_server.cc 2010-10-16 12:06:18.373180984 +0900 +--- server/mozc_server.cc.org 2010-11-06 10:54:20.721190331 +0900 ++++ server/mozc_server.cc 2010-11-06 10:55:39.283188573 +0900 @@ -30,6 +30,9 @@ #ifdef OS_WINDOWS #include <windows.h> diff --git a/japanese/mozc-tool/files/patch-unix_ibus_gen_mozc_xml.py b/japanese/mozc-tool/files/patch-unix_ibus_gen_mozc_xml.py index 2254745c1524..d10874b052ee 100644 --- a/japanese/mozc-tool/files/patch-unix_ibus_gen_mozc_xml.py +++ b/japanese/mozc-tool/files/patch-unix_ibus_gen_mozc_xml.py @@ -1,5 +1,5 @@ ---- unix/ibus/gen_mozc_xml.py.org 2010-10-16 12:06:25.692183819 +0900 -+++ unix/ibus/gen_mozc_xml.py 2010-10-16 12:07:20.965178571 +0900 +--- unix/ibus/gen_mozc_xml.py.org 2010-11-06 10:55:42.821186000 +0900 ++++ unix/ibus/gen_mozc_xml.py 2010-11-06 10:56:59.661189967 +0900 @@ -39,6 +39,7 @@ import optparse diff --git a/japanese/mozc-tool/files/patch-unix_ibus_mozc.xml b/japanese/mozc-tool/files/patch-unix_ibus_mozc.xml index 777fa44859b3..624ff45d68ab 100644 --- a/japanese/mozc-tool/files/patch-unix_ibus_mozc.xml +++ b/japanese/mozc-tool/files/patch-unix_ibus_mozc.xml @@ -1,5 +1,5 @@ ---- unix/ibus/mozc.xml.org 2010-09-25 11:23:23.585335502 +0900 -+++ unix/ibus/mozc.xml 2010-09-25 11:23:48.280337800 +0900 +--- unix/ibus/mozc.xml.org 2010-11-06 10:57:06.006187725 +0900 ++++ unix/ibus/mozc.xml 2010-11-06 10:57:28.462186463 +0900 @@ -0,0 +1,21 @@ +<component> + <name>com.google.IBus.Mozc</name> diff --git a/japanese/mozc-tool/files/patch-unix_ibus_path_util.cc b/japanese/mozc-tool/files/patch-unix_ibus_path_util.cc index d797f194af01..532d5c92b0a0 100644 --- a/japanese/mozc-tool/files/patch-unix_ibus_path_util.cc +++ b/japanese/mozc-tool/files/patch-unix_ibus_path_util.cc @@ -1,5 +1,5 @@ ---- unix/ibus/path_util.cc.org 2010-10-16 12:07:47.547186060 +0900 -+++ unix/ibus/path_util.cc 2010-10-16 12:08:37.461176526 +0900 +--- unix/ibus/path_util.cc.org 2010-11-06 10:57:33.500187940 +0900 ++++ unix/ibus/path_util.cc 2010-11-06 10:58:12.395186886 +0900 @@ -30,14 +30,22 @@ #include "unix/ibus/path_util.h" diff --git a/japanese/mozc-tool/files/patch-unix_scim_scim.gyp b/japanese/mozc-tool/files/patch-unix_scim_scim.gyp index e5595ebfa185..128dc6b98854 100644 --- a/japanese/mozc-tool/files/patch-unix_scim_scim.gyp +++ b/japanese/mozc-tool/files/patch-unix_scim_scim.gyp @@ -1,5 +1,5 @@ ---- unix/scim/scim.gyp.org 2010-10-16 12:08:42.286177748 +0900 -+++ unix/scim/scim.gyp 2010-10-16 12:08:59.542185425 +0900 +--- unix/scim/scim.gyp.org 2010-11-06 10:58:16.438187044 +0900 ++++ unix/scim/scim.gyp 2010-11-06 10:58:34.829186459 +0900 @@ -44,7 +44,7 @@ '../../session/session.gyp:session', ], diff --git a/japanese/scim-mozc/Makefile b/japanese/scim-mozc/Makefile index 6dadd6d83a0d..62877f98a9b0 100644 --- a/japanese/scim-mozc/Makefile +++ b/japanese/scim-mozc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= scim-mozc -PORTVERSION= 0.13.499.102 +PORTVERSION= 0.13.523.102 CATEGORIES= japanese MASTER_SITES= http://people.freebsd.org/~daichi/distfiles/ DISTNAME= mozc-${PORTVERSION} diff --git a/japanese/scim-mozc/distinfo b/japanese/scim-mozc/distinfo index 9a74557256a8..e8009e38c3ee 100644 --- a/japanese/scim-mozc/distinfo +++ b/japanese/scim-mozc/distinfo @@ -1,3 +1,3 @@ -MD5 (mozc-0.13.499.102.tar.bz2) = 8405e050bc87bf7a38ad2a543498d353 -SHA256 (mozc-0.13.499.102.tar.bz2) = bc39fb757c0f7d40abf2603c2c72b37a2ca4c9614bf1ca12ce8639bced94602c -SIZE (mozc-0.13.499.102.tar.bz2) = 39139600 +MD5 (mozc-0.13.523.102.tar.bz2) = 9783ee33695ce159d9887c0c8aab6de8 +SHA256 (mozc-0.13.523.102.tar.bz2) = e83a6fa874ac27cd5f15c014f22a5c03c749e9009a078fb812d4e127892abbe2 +SIZE (mozc-0.13.523.102.tar.bz2) = 39269824 diff --git a/japanese/scim-mozc/files/patch-base_iconv.cc b/japanese/scim-mozc/files/patch-base_iconv.cc index d8a5c8b01083..d7dae90d339f 100644 --- a/japanese/scim-mozc/files/patch-base_iconv.cc +++ b/japanese/scim-mozc/files/patch-base_iconv.cc @@ -1,5 +1,5 @@ ---- base/iconv.cc.org 2010-10-16 11:54:05.538175977 +0900 -+++ base/iconv.cc 2010-10-16 11:55:04.017187136 +0900 +--- base/iconv.cc.org 2010-11-06 10:43:30.936188326 +0900 ++++ base/iconv.cc 2010-11-06 11:22:34.282186490 +0900 @@ -52,7 +52,11 @@ size_t olen_org = olen; iconv(ic, 0, &ilen, 0, &olen); // reset iconv state diff --git a/japanese/scim-mozc/files/patch-base_mutex.h b/japanese/scim-mozc/files/patch-base_mutex.h index 7dc8acf1d04f..85cf9e037e95 100644 --- a/japanese/scim-mozc/files/patch-base_mutex.h +++ b/japanese/scim-mozc/files/patch-base_mutex.h @@ -1,5 +1,5 @@ ---- base/mutex.h.org 2010-10-16 11:55:20.326178921 +0900 -+++ base/mutex.h 2010-10-16 11:55:50.442396765 +0900 +--- base/mutex.h.org 2010-11-06 10:44:01.433194789 +0900 ++++ base/mutex.h 2010-11-06 10:44:28.939186472 +0900 @@ -82,11 +82,11 @@ // PTHREAD_MUTEX_RECURSIVE_NP and PTHREAD_MUTEX_RECURSIVE seem to be // variants. For example, Mac OS X 10.4 had diff --git a/japanese/scim-mozc/files/patch-base_process.cc b/japanese/scim-mozc/files/patch-base_process.cc index bb913423d394..2deec58c1720 100644 --- a/japanese/scim-mozc/files/patch-base_process.cc +++ b/japanese/scim-mozc/files/patch-base_process.cc @@ -1,5 +1,5 @@ ---- base/process.cc.org 2010-10-16 11:55:55.790185101 +0900 -+++ base/process.cc 2010-10-16 11:56:38.273785950 +0900 +--- base/process.cc.org 2010-11-06 10:44:33.530187843 +0900 ++++ base/process.cc 2010-11-06 10:45:08.765186704 +0900 @@ -194,13 +194,18 @@ return ShellExecuteInSystemDir(L"open", wurl.c_str(), NULL, SW_SHOW); #endif diff --git a/japanese/scim-mozc/files/patch-base_util.cc b/japanese/scim-mozc/files/patch-base_util.cc index 120ffbf64f3e..1f5bdabf7ba8 100644 --- a/japanese/scim-mozc/files/patch-base_util.cc +++ b/japanese/scim-mozc/files/patch-base_util.cc @@ -1,6 +1,6 @@ ---- base/util.cc.org 2010-10-16 11:56:45.879185798 +0900 -+++ base/util.cc 2010-10-16 11:58:28.386189342 +0900 -@@ -1571,9 +1571,13 @@ +--- base/util.cc.org 2010-11-06 10:45:14.448193623 +0900 ++++ base/util.cc 2010-11-06 10:46:11.717188704 +0900 +@@ -1629,9 +1629,13 @@ return MacUtil::GetServerDirectory(); #endif // OS_MACOSX diff --git a/japanese/scim-mozc/files/patch-build_mozc.py b/japanese/scim-mozc/files/patch-build_mozc.py index 956d6d6c6b48..d3504fffc41c 100644 --- a/japanese/scim-mozc/files/patch-build_mozc.py +++ b/japanese/scim-mozc/files/patch-build_mozc.py @@ -1,5 +1,5 @@ ---- build_mozc.py.org 2010-10-16 11:58:32.818179161 +0900 -+++ build_mozc.py 2010-10-16 11:58:50.886185011 +0900 +--- build_mozc.py.org 2010-11-06 10:46:16.225188464 +0900 ++++ build_mozc.py 2010-11-06 10:46:35.213186660 +0900 @@ -69,7 +69,7 @@ def IsLinux(): diff --git a/japanese/scim-mozc/files/patch-build_tools_mozc_version.py b/japanese/scim-mozc/files/patch-build_tools_mozc_version.py index 14e749ee43e3..df3a35cc7d0a 100644 --- a/japanese/scim-mozc/files/patch-build_tools_mozc_version.py +++ b/japanese/scim-mozc/files/patch-build_tools_mozc_version.py @@ -1,5 +1,5 @@ ---- build_tools/mozc_version.py.org 2010-10-16 11:59:00.003180328 +0900 -+++ build_tools/mozc_version.py 2010-10-16 11:59:15.492182701 +0900 +--- build_tools/mozc_version.py.org 2010-11-06 10:46:40.900188220 +0900 ++++ build_tools/mozc_version.py 2010-11-06 10:47:03.466651555 +0900 @@ -55,7 +55,7 @@ def IsLinux(): diff --git a/japanese/scim-mozc/files/patch-gui_about_dialog_about_dialog.cc b/japanese/scim-mozc/files/patch-gui_about_dialog_about_dialog.cc index e49936e1936b..3e9ed169b980 100644 --- a/japanese/scim-mozc/files/patch-gui_about_dialog_about_dialog.cc +++ b/japanese/scim-mozc/files/patch-gui_about_dialog_about_dialog.cc @@ -1,6 +1,6 @@ ---- gui/about_dialog/about_dialog.cc.org 2010-10-16 11:59:20.527184356 +0900 -+++ gui/about_dialog/about_dialog.cc 2010-10-16 11:59:55.382185760 +0900 -@@ -114,7 +114,11 @@ +--- gui/about_dialog/about_dialog.cc.org 2010-11-06 10:47:08.291193501 +0900 ++++ gui/about_dialog/about_dialog.cc 2010-11-06 10:48:08.940188276 +0900 +@@ -106,7 +106,11 @@ SetLabelText(label_terms); SetLabelText(label_credits); diff --git a/japanese/scim-mozc/files/patch-gui_about_dialog_version_image_widget.cc b/japanese/scim-mozc/files/patch-gui_about_dialog_version_image_widget.cc deleted file mode 100644 index 5f96ae273a2d..000000000000 --- a/japanese/scim-mozc/files/patch-gui_about_dialog_version_image_widget.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- gui/about_dialog/version_image_widget.cc.org 2010-10-16 12:00:02.576178852 +0900 -+++ gui/about_dialog/version_image_widget.cc 2010-10-16 12:00:34.221317549 +0900 -@@ -41,7 +41,11 @@ - void VersionImageWidget::loadImage() { - // Currently the version is always latest. - // TODO(mukai): add the version checking logic -+#ifdef __FreeBSD__ -+ pixmap_.reset(new QPixmap("@@LOCALBASE@@/share/mozc-tool/icons/update_uptodate.png")); -+#else - pixmap_.reset(new QPixmap(":/update_uptodate.png")); -+#endif - } - - void VersionImageWidget::paintEvent(QPaintEvent* paint_event) { diff --git a/japanese/scim-mozc/files/patch-gyp_common.gypi b/japanese/scim-mozc/files/patch-gyp_common.gypi index 7857675804f3..75a5ddb8921a 100644 --- a/japanese/scim-mozc/files/patch-gyp_common.gypi +++ b/japanese/scim-mozc/files/patch-gyp_common.gypi @@ -1,5 +1,5 @@ ---- gyp/common.gypi.org 2010-10-16 12:00:39.281175157 +0900 -+++ gyp/common.gypi 2010-10-16 12:01:01.287193240 +0900 +--- gyp/common.gypi.org 2010-11-06 10:50:16.532187538 +0900 ++++ gyp/common.gypi 2010-11-06 10:50:37.769189168 +0900 @@ -436,6 +436,12 @@ '-lz', '<@(extra_linux_libs)', diff --git a/japanese/scim-mozc/files/patch-ipc_ipc_path_manager.cc b/japanese/scim-mozc/files/patch-ipc_ipc_path_manager.cc index f6bc190c0632..d1e6b742e4a1 100644 --- a/japanese/scim-mozc/files/patch-ipc_ipc_path_manager.cc +++ b/japanese/scim-mozc/files/patch-ipc_ipc_path_manager.cc @@ -1,5 +1,5 @@ ---- ipc/ipc_path_manager.cc.org 2010-10-16 12:01:06.246177971 +0900 -+++ ipc/ipc_path_manager.cc 2010-10-16 12:01:26.641179012 +0900 +--- ipc/ipc_path_manager.cc.org 2010-11-06 10:50:41.620188667 +0900 ++++ ipc/ipc_path_manager.cc 2010-11-06 10:51:04.912186952 +0900 @@ -265,7 +265,7 @@ *ipc_name = kIPCPrefix; #endif // OS_WINDOWS diff --git a/japanese/scim-mozc/files/patch-ipc_unix_ipc.cc b/japanese/scim-mozc/files/patch-ipc_unix_ipc.cc index c72f23f08ced..a437b149c50b 100644 --- a/japanese/scim-mozc/files/patch-ipc_unix_ipc.cc +++ b/japanese/scim-mozc/files/patch-ipc_unix_ipc.cc @@ -1,5 +1,5 @@ ---- ipc/unix_ipc.cc.org 2010-10-16 12:01:47.982178217 +0900 -+++ ipc/unix_ipc.cc 2010-10-16 12:04:36.610176748 +0900 +--- ipc/unix_ipc.cc.org 2010-11-06 10:51:14.204190823 +0900 ++++ ipc/unix_ipc.cc 2010-11-06 10:54:18.096187153 +0900 @@ -41,7 +41,7 @@ #include <sys/time.h> #include <sys/types.h> @@ -24,10 +24,10 @@ -#ifdef OS_LINUX +#if defined(OS_LINUX) && !defined(__FreeBSD__) - // On ARM Linux, we do nothing and just return true since the platform (at - // least the qemu emulator) doesn't support the getsockopt(sock, SOL_SOCKET, - // SO_PEERCRED) system call. -@@ -311,7 +311,7 @@ + struct ucred peer_cred; + int peer_cred_len = sizeof(peer_cred); + if (getsockopt(socket, SOL_SOCKET, SO_PEERCRED, +@@ -303,7 +303,7 @@ address.sun_family = AF_UNIX; ::memcpy(address.sun_path, server_address.data(), server_address_length); address.sun_path[server_address_length] = '\0'; @@ -36,7 +36,7 @@ address.sun_len = SUN_LEN(&address); const size_t sun_len = sizeof(address); #else -@@ -431,21 +431,21 @@ +@@ -423,21 +423,21 @@ SO_REUSEADDR, reinterpret_cast<char *>(&on), sizeof(on)); diff --git a/japanese/scim-mozc/files/patch-server_mozc_server.cc b/japanese/scim-mozc/files/patch-server_mozc_server.cc index 02086d954321..4ad2a7be1db7 100644 --- a/japanese/scim-mozc/files/patch-server_mozc_server.cc +++ b/japanese/scim-mozc/files/patch-server_mozc_server.cc @@ -1,5 +1,5 @@ ---- server/mozc_server.cc.org 2010-10-16 12:04:43.449185058 +0900 -+++ server/mozc_server.cc 2010-10-16 12:06:18.373180984 +0900 +--- server/mozc_server.cc.org 2010-11-06 10:54:20.721190331 +0900 ++++ server/mozc_server.cc 2010-11-06 10:55:39.283188573 +0900 @@ -30,6 +30,9 @@ #ifdef OS_WINDOWS #include <windows.h> diff --git a/japanese/scim-mozc/files/patch-unix_ibus_gen_mozc_xml.py b/japanese/scim-mozc/files/patch-unix_ibus_gen_mozc_xml.py index 2254745c1524..d10874b052ee 100644 --- a/japanese/scim-mozc/files/patch-unix_ibus_gen_mozc_xml.py +++ b/japanese/scim-mozc/files/patch-unix_ibus_gen_mozc_xml.py @@ -1,5 +1,5 @@ ---- unix/ibus/gen_mozc_xml.py.org 2010-10-16 12:06:25.692183819 +0900 -+++ unix/ibus/gen_mozc_xml.py 2010-10-16 12:07:20.965178571 +0900 +--- unix/ibus/gen_mozc_xml.py.org 2010-11-06 10:55:42.821186000 +0900 ++++ unix/ibus/gen_mozc_xml.py 2010-11-06 10:56:59.661189967 +0900 @@ -39,6 +39,7 @@ import optparse diff --git a/japanese/scim-mozc/files/patch-unix_ibus_mozc.xml b/japanese/scim-mozc/files/patch-unix_ibus_mozc.xml index 777fa44859b3..624ff45d68ab 100644 --- a/japanese/scim-mozc/files/patch-unix_ibus_mozc.xml +++ b/japanese/scim-mozc/files/patch-unix_ibus_mozc.xml @@ -1,5 +1,5 @@ ---- unix/ibus/mozc.xml.org 2010-09-25 11:23:23.585335502 +0900 -+++ unix/ibus/mozc.xml 2010-09-25 11:23:48.280337800 +0900 +--- unix/ibus/mozc.xml.org 2010-11-06 10:57:06.006187725 +0900 ++++ unix/ibus/mozc.xml 2010-11-06 10:57:28.462186463 +0900 @@ -0,0 +1,21 @@ +<component> + <name>com.google.IBus.Mozc</name> diff --git a/japanese/scim-mozc/files/patch-unix_ibus_path_util.cc b/japanese/scim-mozc/files/patch-unix_ibus_path_util.cc index d797f194af01..532d5c92b0a0 100644 --- a/japanese/scim-mozc/files/patch-unix_ibus_path_util.cc +++ b/japanese/scim-mozc/files/patch-unix_ibus_path_util.cc @@ -1,5 +1,5 @@ ---- unix/ibus/path_util.cc.org 2010-10-16 12:07:47.547186060 +0900 -+++ unix/ibus/path_util.cc 2010-10-16 12:08:37.461176526 +0900 +--- unix/ibus/path_util.cc.org 2010-11-06 10:57:33.500187940 +0900 ++++ unix/ibus/path_util.cc 2010-11-06 10:58:12.395186886 +0900 @@ -30,14 +30,22 @@ #include "unix/ibus/path_util.h" diff --git a/japanese/scim-mozc/files/patch-unix_scim_scim.gyp b/japanese/scim-mozc/files/patch-unix_scim_scim.gyp index e5595ebfa185..128dc6b98854 100644 --- a/japanese/scim-mozc/files/patch-unix_scim_scim.gyp +++ b/japanese/scim-mozc/files/patch-unix_scim_scim.gyp @@ -1,5 +1,5 @@ ---- unix/scim/scim.gyp.org 2010-10-16 12:08:42.286177748 +0900 -+++ unix/scim/scim.gyp 2010-10-16 12:08:59.542185425 +0900 +--- unix/scim/scim.gyp.org 2010-11-06 10:58:16.438187044 +0900 ++++ unix/scim/scim.gyp 2010-11-06 10:58:34.829186459 +0900 @@ -44,7 +44,7 @@ '../../session/session.gyp:session', ], |