Update to 1.3.975.102

22 files changed, 46 insertions, 52 deletions

diff --git a/japanese/ibus-mozc/Makefile b/japanese/ibus-mozc/Makefile
index 10d3790bfe82..d407f59364c9 100644
--- a/japanese/ibus-mozc/Makefile
+++ b/japanese/ibus-mozc/Makefile
@@ -7,14 +7,13 @@
 
 PKGNAMEPREFIX=	ja-ibus-
 PKGNAMESUFFIX=
-PORTREVISION=	3
 COMMENT=	Mozc engine for IBus
 DATADIR=	${PREFIX}/share/ibus-${PORTNAME}
 
-MASTERDIR=      ${.CURDIR}/../../japanese/mozc-server
+MASTERDIR=	${.CURDIR}/../../japanese/mozc-server
 PKGMESSAGE=	${.CURDIR}/pkg-message
 
-BUILD_MOZC_LIST=        ibus_mozc
+BUILD_MOZC_LIST=	ibus_mozc
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/japanese/mozc-el/pkg-descr b/japanese/mozc-el/pkg-descr
deleted file mode 100644
index 097f107626aa..000000000000
--- a/japanese/mozc-el/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Mozc.el is an Emacs client of Mozc, so you can input
-Japanese via mozc in your tty, bypassing ibus.
-
-WWW: http://code.google.com/p/mozc/
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 0621e14755fe..ffd30e44617e 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mozc
-PORTVERSION=	1.3.931.102
-PORTREVISION?=	1
+PORTVERSION=	1.3.975.102
+PORTREVISION?=	0
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX?=	ja-
diff --git a/japanese/mozc-server/distinfo b/japanese/mozc-server/distinfo
index cf6e7ac12852..78b6bf77bc9c 100644
--- a/japanese/mozc-server/distinfo
+++ b/japanese/mozc-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mozc-1.3.931.102.tar.bz2) = f56a899e1e445e01d0f28fec45a7b3cc3dd9c68e0d6507bca00a8c01ef68c7a0
-SIZE (mozc-1.3.931.102.tar.bz2) = 55891776
+SHA256 (mozc-1.3.975.102.tar.bz2) = 1ee57425c159bc0066645f086472f72aa16567fe5be272f35339c41e9a52d27a
+SIZE (mozc-1.3.975.102.tar.bz2) = 55961505
diff --git a/japanese/mozc-server/files/patch-base_iconv.cc b/japanese/mozc-server/files/patch-base_iconv.cc
index 18723f92dcf2..703c7a1ed994 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.orig	2011-12-24 13:17:13.100092268 +0900
-+++ base/iconv.cc	2011-12-04 16:46:50.884607344 +0900
+--- base/iconv.cc.orig	2012-01-29 13:42:31.196806922 +0900
++++ base/iconv.cc	2012-01-29 13:49:21.142806483 +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_logging.cc b/japanese/mozc-server/files/patch-base_logging.cc
index 5980226c95b1..6b3cbbec55ce 100644
--- a/japanese/mozc-server/files/patch-base_logging.cc
+++ b/japanese/mozc-server/files/patch-base_logging.cc
@@ -1,5 +1,5 @@
---- base/logging.cc.orig	2011-12-24 13:17:13.094097336 +0900
-+++ base/logging.cc	2011-12-04 19:57:28.052770432 +0900
+--- base/logging.cc.orig	2012-01-29 13:42:31.194805201 +0900
++++ base/logging.cc	2012-01-29 13:49:21.256805888 +0900
 @@ -212,7 +212,7 @@
    char buf[512];
    snprintf(buf, sizeof(buf),
diff --git a/japanese/mozc-server/files/patch-base_mutex.h b/japanese/mozc-server/files/patch-base_mutex.h
index 10b5c7bcb181..605f8a2cb6d6 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.orig	2011-12-24 13:17:13.096092253 +0900
-+++ base/mutex.h	2011-12-04 16:46:50.658605855 +0900
+--- base/mutex.h.orig	2012-01-29 13:42:31.195806306 +0900
++++ base/mutex.h	2012-01-29 13:49:20.902806916 +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 e17ea24326cc..9b65593fa83f 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.orig	2011-12-24 13:17:13.098092385 +0900
-+++ base/process.cc	2011-12-04 16:46:51.045606717 +0900
+--- base/process.cc.orig	2012-01-29 13:42:31.198806477 +0900
++++ base/process.cc	2012-01-29 13:49:21.340806019 +0900
 @@ -120,13 +120,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 92bd49aaa1db..d3efc90019fd 100644
--- a/japanese/mozc-server/files/patch-base_util.cc
+++ b/japanese/mozc-server/files/patch-base_util.cc
@@ -1,5 +1,5 @@
---- base/util.cc.orig	2011-12-24 13:17:13.099092285 +0900
-+++ base/util.cc	2011-12-24 13:35:51.531092368 +0900
+--- base/util.cc.orig	2012-01-29 13:42:31.192806902 +0900
++++ base/util.cc	2012-01-29 13:49:21.226806684 +0900
 @@ -2636,9 +2636,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 07c4f7d094f6..710f7dc10cd7 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.orig	2011-12-24 13:17:28.363092915 +0900
-+++ build_mozc.py	2011-12-24 13:35:51.596092253 +0900
+--- build_mozc.py.orig	2012-01-29 13:42:31.525804671 +0900
++++ build_mozc.py	2012-01-29 13:49:21.572805896 +0900
 @@ -70,7 +70,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 717c313d062d..7c16c38901aa 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.orig	2011-12-24 13:17:12.978092858 +0900
-+++ build_tools/mozc_version.py	2011-12-04 16:35:15.156605950 +0900
+--- build_tools/mozc_version.py.orig	2012-01-29 13:42:31.190807067 +0900
++++ build_tools/mozc_version.py	2012-01-29 13:49:15.791805587 +0900
 @@ -56,7 +56,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 61d7b3479164..ae4e6dd7f5ed 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,5 +1,5 @@
---- gui/about_dialog/about_dialog.cc.orig	2011-12-24 13:17:13.116092657 +0900
-+++ gui/about_dialog/about_dialog.cc	2011-12-04 16:44:21.340606780 +0900
+--- gui/about_dialog/about_dialog.cc.orig	2012-01-29 13:42:31.223806652 +0900
++++ gui/about_dialog/about_dialog.cc	2012-01-29 13:49:18.542805785 +0900
 @@ -119,7 +119,11 @@
    SetLabelText(label_terms);
    SetLabelText(label_credits);
diff --git a/japanese/mozc-server/files/patch-gyp_common.gypi b/japanese/mozc-server/files/patch-gyp_common.gypi
index de7a25545243..43171c5fc118 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.orig	2011-12-24 13:17:13.115092509 +0900
-+++ gyp/common.gypi	2011-12-24 13:35:51.371092696 +0900
+--- gyp/common.gypi.orig	2012-01-29 13:42:31.215806054 +0900
++++ gyp/common.gypi	2012-01-29 13:49:19.328805472 +0900
 @@ -50,7 +50,7 @@
      # warning_cflags will be shared with Mac and Linux.
      'warning_cflags': [
@@ -9,7 +9,7 @@
        '-Wno-char-subscripts',
        '-Wno-sign-compare',
        '-Wno-deprecated-declarations',
-@@ -528,6 +528,12 @@
+@@ -568,6 +568,12 @@
            # <unordered_map> and <unordered_set>.
            '-Wno-deprecated',
          ],
diff --git a/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc b/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc
index e8b155f6b6eb..fedb027c5e48 100644
--- a/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc
+++ b/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc
@@ -1,5 +1,5 @@
---- handwriting/zinnia_handwriting.cc.orig	2011-12-24 13:17:13.115092509 +0900
-+++ handwriting/zinnia_handwriting.cc	2011-12-04 22:27:01.145136587 +0900
+--- handwriting/zinnia_handwriting.cc.orig	2012-01-29 13:42:31.214806556 +0900
++++ handwriting/zinnia_handwriting.cc	2012-01-29 13:49:21.926806405 +0900
 @@ -49,10 +49,16 @@
    const char kModelFile[] = "handwriting-light-ja.model";
    return Util::JoinPath(MacUtil::GetResourcesDirectory(), kModelFile);
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 0e0767d63a66..a79988adc47a 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.orig	2011-12-24 13:17:13.114092857 +0900
-+++ ipc/ipc_path_manager.cc	2011-12-04 16:46:51.134605388 +0900
+--- ipc/ipc_path_manager.cc.orig	2012-01-29 13:42:31.212806790 +0900
++++ ipc/ipc_path_manager.cc	2012-01-29 13:49:21.426806055 +0900
 @@ -274,7 +274,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 96a7c3d244dd..57ef3a7cfe7c 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.orig	2011-12-24 13:17:13.113092874 +0900
-+++ ipc/unix_ipc.cc	2011-12-04 16:46:51.120605285 +0900
+--- ipc/unix_ipc.cc.orig	2012-01-29 13:42:31.213805520 +0900
++++ ipc/unix_ipc.cc	2012-01-29 13:49:21.405805900 +0900
 @@ -41,7 +41,7 @@
  #include <sys/time.h>
  #include <sys/types.h>
diff --git a/japanese/mozc-server/files/patch-server_mozc_server.cc b/japanese/mozc-server/files/patch-server_mozc_server.cc
index e8c4f170f124..5fbca69c1175 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.orig	2011-12-24 13:17:12.964092352 +0900
-+++ server/mozc_server.cc	2011-12-04 16:43:55.914606129 +0900
+--- server/mozc_server.cc.orig	2012-01-29 13:42:31.175805998 +0900
++++ server/mozc_server.cc	2012-01-29 13:49:16.896805385 +0900
 @@ -32,6 +32,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 9df474261e88..781b0e2ae7cb 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.orig	2011-12-24 13:17:12.914092543 +0900
-+++ unix/ibus/gen_mozc_xml.py	2011-12-04 16:35:15.333604982 +0900
+--- unix/ibus/gen_mozc_xml.py.orig	2012-01-29 13:42:31.153806065 +0900
++++ unix/ibus/gen_mozc_xml.py	2012-01-29 13:49:15.972806246 +0900
 @@ -39,6 +39,7 @@
  
  import optparse
diff --git a/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc b/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc
index c269c5b95f71..fe065be5702e 100644
--- a/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc
+++ b/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc
@@ -1,6 +1,6 @@
---- unix/ibus/mozc_engine.cc.orig	2011-12-24 13:17:12.915092360 +0900
-+++ unix/ibus/mozc_engine.cc	2012-01-07 13:40:28.811283808 +0900
-@@ -1187,7 +1187,7 @@
+--- unix/ibus/mozc_engine.cc.orig	2012-01-29 13:42:31.155805132 +0900
++++ unix/ibus/mozc_engine.cc	2012-01-29 13:49:15.880806284 +0900
+@@ -1205,7 +1205,7 @@
  
        string selection_text;
        const uint32 selection_start = min(cursor_pos, anchor_pos);
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 190cc3b1d1cf..dfbb43af30ae 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.orig	2011-12-24 13:17:12.914092543 +0900
-+++ unix/ibus/path_util.cc	2011-12-04 16:35:15.354607302 +0900
+--- unix/ibus/path_util.cc.orig	2012-01-29 13:42:31.154805704 +0900
++++ unix/ibus/path_util.cc	2012-01-29 13:49:15.994806248 +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 efcac56f8f25..30a12ae216bb 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.orig	2011-12-24 13:17:12.916092674 +0900
-+++ unix/scim/scim.gyp	2011-12-04 16:39:02.023609368 +0900
+--- unix/scim/scim.gyp.orig	2012-01-29 13:42:31.153806065 +0900
++++ unix/scim/scim.gyp	2012-01-29 13:49:16.076805497 +0900
 @@ -39,7 +39,7 @@
        'gtk+-2.0',
      ],
diff --git a/japanese/scim-mozc/Makefile b/japanese/scim-mozc/Makefile
index 3a7812704e10..b0251263b42a 100644
--- a/japanese/scim-mozc/Makefile
+++ b/japanese/scim-mozc/Makefile
@@ -7,14 +7,13 @@
 
 PKGNAMEPREFIX=  ja-scim-
 PKGNAMESUFFIX=
-PORTREVISION=	1
 COMMENT=	Mozc engine for SCIM
-DATADIR=        ${PREFIX}/share/scim-${PORTNAME}
+DATADIR=	${PREFIX}/share/scim-${PORTNAME}
 
-MASTERDIR=      ${.CURDIR}/../../japanese/mozc-server
-PKGMESSAGE=     ${.CURDIR}/pkg-message
+MASTERDIR=	${.CURDIR}/../../japanese/mozc-server
+PKGMESSAGE=	${.CURDIR}/pkg-message
 
-BUILD_MOZC_LIST=        scim_mozc
+BUILD_MOZC_LIST=	scim_mozc
 
 post-install:
 	@${CAT} ${PKGMESSAGE}