Import of pkgsrc-2015Q3

2015-10-03 03:37:01 -07:00
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
--- a/inputmethod/Chinput/Makefile
+++ b/inputmethod/Chinput/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/06 14:25:10 asau Exp $
+# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:36 joerg Exp $

 DISTNAME=	Chinput-3.0
 PKGREVISION=	3
@@ -9,8 +9,6 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://www.opencjk.org/~yumj/project-chinput.html
 COMMENT=	Chinese input server

-USE_X11BASE=	yes
-
 BUILD_TARGET=	chinput

 INSTALLATION_DIRS=	bin etc
--- a/inputmethod/anthy/Makefile.common
+++ b/inputmethod/anthy/Makefile.common
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.8 2009/08/03 23:30:06 taya Exp $
+# $NetBSD: Makefile.common,v 1.9 2015/06/29 11:06:47 ryoon Exp $
 # used by inputmethod/anthy/Makefile
 # used by inputmethod/anthy-elisp/Makefile

 ANTHY_VERSION=	9100h
 DISTNAME=	anthy-${ANTHY_VERSION}
 CATEGORIES=	inputmethod
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=anthy/37536/}
+MASTER_SITES=	${MASTER_SITE_OSDN:=anthy/37536/}
 DISTFILES=	${DISTNAME}.tar.gz

 DISTINFO_FILE=	${.CURDIR}/../../inputmethod/anthy/distinfo
 PATCHDIR=	${.CURDIR}/../../inputmethod/anthy/patches

-HOMEPAGE=	http://anthy.sourceforge.jp/
+HOMEPAGE=	http://anthy.osdn.jp/
--- a/inputmethod/canna-canuum/Makefile
+++ b/inputmethod/canna-canuum/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2012/10/06 14:25:10 asau Exp $
+# $NetBSD: Makefile,v 1.14 2015/08/18 07:31:10 wiz Exp $

-PKGREVISION=	3
+PKGREVISION=	4
 CANNA_MODULE=	canuum

 .include "../../inputmethod/canna/Makefile.common"
--- a/inputmethod/canna/Makefile.common
+++ b/inputmethod/canna/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2010/05/28 11:06:34 obache Exp $
+# $NetBSD: Makefile.common,v 1.22 2015/06/29 11:06:47 ryoon Exp $
 #
 # Canna common makefile.
 #
@@ -13,10 +13,10 @@ CANNA_VERSION=	3.6pl4
 DISTNAME=	Canna${CANNA_VERSION:S|.||:S|pl|p|}
 PKGNAME=	Canna-${CANNA_MODULE}-${CANNA_VERSION}
 CATEGORIES=	japanese inputmethod
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=canna/6059/}
+MASTER_SITES=	${MASTER_SITE_OSDN:=canna/6059/}

 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
-HOMEPAGE=	http://canna.sourceforge.jp/
+HOMEPAGE=	http://canna.osdn.jp/
 COMMENT=	Kana-Kanji conversion system (${CANNA_MODULE})

 FILESDIR=	${.CURDIR}/../../inputmethod/canna/files
--- a/inputmethod/ibus-m17n/Makefile
+++ b/inputmethod/ibus-m17n/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2015/04/25 14:23:22 tnn Exp $
+# $NetBSD: Makefile,v 1.33 2015/06/30 09:57:37 ryoon Exp $
 #

 DISTNAME=	ibus-m17n-1.3.4
-PKGREVISION=	16
+PKGREVISION=	17
 CATEGORIES=	inputmethod
 MASTER_SITES=	http://ibus.googlecode.com/files/

--- a/inputmethod/ibus-mozc/Makefile
+++ b/inputmethod/ibus-mozc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2015/04/25 14:23:22 tnn Exp $
+# $NetBSD: Makefile,v 1.24 2015/09/23 11:53:27 joerg Exp $

 PKGNAME=	ibus-${DISTNAME}
-PKGREVISION=	1

 INSTALLATION_DIRS+=	libexec share/ibus share/ibus/component \
 			share/ibus-mozc
@@ -11,9 +10,13 @@ DEPENDS+=	mozc-renderer-[0-9]*:../../inputmethod/mozc-renderer
 DEPENDS+=	mozc-server-[0-9]*:../../inputmethod/mozc-server
 DEPENDS+=	mozc-tool-[0-9]*:../../inputmethod/mozc-tool

+# ../../session/key_info_util.cc:43:10: fatal error: 'protocol/commands.pb.h' file not found
+MAKE_JOBS_SAFE=	no
+
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} ${_MAKE_JOBS} \
+			unix/ibus/ibus.gyp:ibus_mozc_lib \
 			unix/ibus/ibus.gyp:ibus_mozc

 do-install:
--- a/inputmethod/ibus-table-chinese/Makefile
+++ b/inputmethod/ibus-table-chinese/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/03/15 18:46:56 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.12 2015/08/10 19:27:48 joerg Exp $
 #

 DISTNAME=	ibus-table-chinese-1.8.2
@@ -16,6 +16,9 @@ USE_TOOLS+=	pkg-config

 BUILD_DEPENDS+=	cmake-fedora>=2.0:../../devel/cmake-fedora

+# iconv: unexpected end of file; the last character is incomplete.
+MAKE_JOBS_SAFE=	noo
+
 .include "../../mk/bsd.prefs.mk"

 # Illegal byte sequence in array30_ExtB.txt
--- a/inputmethod/ibus/Makefile
+++ b/inputmethod/ibus/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.43 2015/04/25 14:23:22 tnn Exp $
+# $NetBSD: Makefile,v 1.44 2015/07/31 13:03:45 ryoon Exp $

-PKGREVISION= 1
 .include "Makefile.common"

 COMMENT=	Intelligent Input Bus
--- a/inputmethod/ibus/Makefile.common
+++ b/inputmethod/ibus/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2015/03/15 20:13:24 hiramatsu Exp $
+# $NetBSD: Makefile.common,v 1.8 2015/07/31 13:03:45 ryoon Exp $
 #
 # used by inputmethod/ibus/Makefile
 # used by inputmethod/ibus-python/Makefile

-DISTNAME=	ibus-1.5.9
+DISTNAME=	ibus-1.5.11
 CATEGORIES=	inputmethod
 MASTER_SITES=	https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/

--- a/inputmethod/ibus/PLIST
+++ b/inputmethod/ibus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2014/07/31 10:03:14 obache Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/07/31 13:03:45 ryoon Exp $
 bin/ibus
 bin/ibus-daemon
 bin/ibus-setup
@@ -92,7 +92,7 @@ share/gtk-doc/html/ibus/ch04.html
 share/gtk-doc/html/ibus/ch05.html
 share/gtk-doc/html/ibus/ch06.html
 share/gtk-doc/html/ibus/home.png
-share/gtk-doc/html/ibus/ibus-IBusEngineSimple.html
+share/gtk-doc/html/ibus/IBusEngineSimple.html
 share/gtk-doc/html/ibus/ibus-IBusKeysyms.html
 share/gtk-doc/html/ibus/ibus-ibusdebug.html
 share/gtk-doc/html/ibus/ibus-ibuserror.html
--- a/inputmethod/ibus/distinfo
+++ b/inputmethod/ibus/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2014/11/03 08:47:15 obache Exp $
+$NetBSD: distinfo,v 1.15 2015/07/31 13:03:45 ryoon Exp $

-SHA1 (ibus-1.5.9.tar.gz) = 6ba4ba4056f7bff252b6d0622914828e947092a7
-RMD160 (ibus-1.5.9.tar.gz) = ddf70028f36a153b6ce53c7b0b801beda5dcc776
-Size (ibus-1.5.9.tar.gz) = 2128459 bytes
+SHA1 (ibus-1.5.11.tar.gz) = b8dbc12cc90c3e7ec036d7098bc661b26630242a
+RMD160 (ibus-1.5.11.tar.gz) = 5a6bbe9dae98d9114402ca82b207c775dee3f94a
+Size (ibus-1.5.11.tar.gz) = 2177026 bytes
 SHA1 (patch-client_gtk2_ibusimcontext.c) = 31e72d06884858476097f04591004ce46b6074c1
 SHA1 (patch-client_gtk3_ibusimcontext.c) = 543192191d14d61ae3e193de6ffda7b099969a1a
--- a/inputmethod/ja-freewnn-lib/Makefile.common
+++ b/inputmethod/ja-freewnn-lib/Makefile.common
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.20 2015/06/13 20:40:30 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.21 2015/06/29 11:06:47 ryoon Exp $
 # used by inputmethod/ja-freewnn-server/Makefile
 # used by inputmethod/ja-freewnn-lib/Makefile

 DISTNAME=	FreeWnn-1.1.1-a023
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE_JP:=freewnn/63271/}   \
+MASTER_SITES=   ${MASTER_SITE_OSDN:=freewnn/63271/}   \
                ftp://ftp.st.ryukoku.ac.jp/pub/japanese-im/FreeWnn/
 CATEGORIES=	inputmethod

 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
-HOMEPAGE=	http://freewnn.sourceforge.jp/
+HOMEPAGE=	http://freewnn.osdn.jp/
 COMMENT=	Japanese/Chinese/Korean input method
 LICENSE=	gnu-gpl-v2

--- a/inputmethod/kasumi/Makefile
+++ b/inputmethod/kasumi/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.27 2015/04/25 14:23:23 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2015/06/29 11:06:47 ryoon Exp $

 DISTNAME=	kasumi-2.5
 PKGREVISION=	20
 CATEGORIES=	inputmethod japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kasumi/41436/}
+MASTER_SITES=	${MASTER_SITE_OSDN:=kasumi/41436/}

 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://kasumi.sourceforge.jp/
+HOMEPAGE=	http://kasumi.osdn.jp/
 COMMENT=	Dictionary management tool for anthy
 LICENSE=	gnu-gpl-v2

--- a/inputmethod/kimera-tomoe-gtk/Makefile
+++ b/inputmethod/kimera-tomoe-gtk/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.25 2015/04/25 14:23:23 tnn Exp $
+# $NetBSD: Makefile,v 1.26 2015/06/29 11:06:47 ryoon Exp $
 #

 DISTNAME=	kimera-tomoe-gtk-0.5
 PKGREVISION=	21
 CATEGORIES=	inputmethod japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kimera/24906/}
+MASTER_SITES=	${MASTER_SITE_OSDN:=kimera/24906/}

 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://kimera.sourceforge.jp/
+HOMEPAGE=	http://kimera.osdn.jp/
 COMMENT=	Kimera helper program for Tomoe
 LICENSE=	gnu-lgpl-v2.1

--- a/inputmethod/kimera/Makefile
+++ b/inputmethod/kimera/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.24 2015/04/25 14:23:23 tnn Exp $
+# $NetBSD: Makefile,v 1.25 2015/06/29 11:06:47 ryoon Exp $
 #

 DISTNAME=	kimera-2.11
 PKGREVISION=	21
 CATEGORIES=	inputmethod japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kimera/37271/}
+MASTER_SITES=	${MASTER_SITE_OSDN:=kimera/37271/}

 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://kimera.sourceforge.jp/
+HOMEPAGE=	http://kimera.osdn.jp/
 COMMENT=	Kanji Input MEthod for RAgamuffins
 LICENSE=	gnu-gpl-v3

--- a/inputmethod/m17n-im-config/Makefile
+++ b/inputmethod/m17n-im-config/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2015/04/25 14:23:23 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2015/06/30 09:57:37 ryoon Exp $
 #

 DISTNAME=	m17n-im-config-0.9.0
-PKGREVISION=	25
+PKGREVISION=	26
 CATEGORIES=	inputmethod devel
 MASTER_SITES=	http://www.m17n.org/m17n-lib-download/

--- a/inputmethod/m17n-im-config/buildlink3.mk
+++ b/inputmethod/m17n-im-config/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2015/04/25 14:23:23 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2015/06/30 10:02:22 ryoon Exp $

 BUILDLINK_TREE+=	m17n-im-config

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	m17n-im-config
 M17N_IM_CONFIG_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.m17n-im-config+=	m17n-im-config>=0.9.0
-BUILDLINK_ABI_DEPENDS.m17n-im-config+=	m17n-im-config>=0.9.0nb25
+BUILDLINK_ABI_DEPENDS.m17n-im-config+=	m17n-im-config>=0.9.0nb26
 BUILDLINK_PKGSRCDIR.m17n-im-config?=	../../inputmethod/m17n-im-config

 .include "../../devel/gettext-lib/buildlink3.mk"
--- a/inputmethod/mozc-elisp/Makefile
+++ b/inputmethod/mozc-elisp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2015/04/25 14:23:23 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2015/07/31 13:07:05 ryoon Exp $
 #

 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
-PKGREVISION=	1
 CATEGORIES=	inputmethod editors

 EMACS_MODULES=	base leim
--- a/inputmethod/mozc-renderer/Makefile
+++ b/inputmethod/mozc-renderer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2015/04/25 14:23:23 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2015/07/31 13:07:05 ryoon Exp $

 PKGNAME=	${DISTNAME:S/mozc-/mozc-renderer-/}
-PKGREVISION=	1

 CONFLICTS+=	ibus-mozc<=1.13.1651.102

--- a/inputmethod/mozc-server/Makefile
+++ b/inputmethod/mozc-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2015/04/25 14:23:23 tnn Exp $
+# $NetBSD: Makefile,v 1.23 2015/07/31 13:07:05 ryoon Exp $

 PKGNAME=	${DISTNAME:S/mozc-/mozc-server-/}
-PKGREVISION=	1

 INSTALLATION_DIRS+=	libexec

--- a/inputmethod/mozc-server/Makefile.common
+++ b/inputmethod/mozc-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2015/02/17 23:55:58 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.19 2015/07/31 13:07:05 ryoon Exp $
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
 # used by inputmethod/mozc-server/Makefile
@@ -7,16 +7,28 @@
 # used by inputmethod/uim-mozc/Makefile
 #

-DISTNAME=	mozc-2.16.2037.102
+DISTNAME=	mozc-2.17.2106.102
 CATEGORIES=	inputmethod
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=	.tar.xz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=google/}
+GITHUB_PROJECT=	mozc
+GITHUB_TAG=	3648b9bf06d5d9b36bed2425640bfd18ae05b588

 MAINTAINER=	ryoon@NetBSD.org
-HOMEPAGE=	http://code.google.com/p/mozc/
+HOMEPAGE=	https://github.com/google/mozc/
 COMMENT=	Japanese inputmethod Mozc engine for IBus
 LICENSE=	modified-bsd

+USAGE_DICT=	usage_dict-rev10.txt
+UIM_MOZC=	uim-mozc-318.0562676
+DISTFILES+=	${DISTNAME}-${GITHUB_TAG}${EXTRACT_SUFX} \
+		${USAGE_DICT} \
+		${UIM_MOZC}.tar.xz
+SITES.${USAGE_DICT}=		${MASTER_SITE_LOCAL}
+SITES.${UIM_MOZC}.tar.xz=	${MASTER_SITE_SOURCEFORGE:=pnsft-aur/}
+
+EXTRACT_USING=	bsdtar
+WRKSRC=		${WRKDIR}/mozc-${GITHUB_TAG}/src
+
 DISTINFO_FILE=	${.CURDIR}/../../inputmethod/mozc-server/distinfo
 PATCHDIR=	${.CURDIR}/../../inputmethod/mozc-server/patches

@@ -66,6 +78,11 @@ OSDEST=		linux

 MOZC_BUILD_MODE=	Release # or Debug

+pre-configure:
+	mkdir -p ${WRKSRC}/third_party/japanese_usage_dictionary
+	cp ${WRKDIR}/${USAGE_DICT} \
+		${WRKSRC}/third_party/japanese_usage_dictionary/usage_dict.txt
+
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		GYP_DEFINES="use_libprotobuf=1" \
--- a/inputmethod/mozc-server/distinfo
+++ b/inputmethod/mozc-server/distinfo
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.13 2015/02/17 23:55:58 ryoon Exp $
+$NetBSD: distinfo,v 1.14 2015/07/31 13:07:05 ryoon Exp $

-SHA1 (mozc-2.16.2037.102.tar.xz) = 74c088a81572588d8e60aaf25d066cc74b6fc989
-RMD160 (mozc-2.16.2037.102.tar.xz) = b26f8f58ef2e2f27e5ce42804c6559cb59d33aa9
-Size (mozc-2.16.2037.102.tar.xz) = 37548784 bytes
-SHA1 (uim-mozc-334.tar.xz) = af86ce7a04b291629bd5dc56d5c1115332954a91
-RMD160 (uim-mozc-334.tar.xz) = b988667237f65e61fabf3935f83f5d21a8059f4e
-Size (uim-mozc-334.tar.xz) = 30544 bytes
+SHA1 (mozc-2.17.2106.102-3648b9bf06d5d9b36bed2425640bfd18ae05b588.tar.gz) = cc9c59329fee015a4149686f103a5554a0e085ff
+RMD160 (mozc-2.17.2106.102-3648b9bf06d5d9b36bed2425640bfd18ae05b588.tar.gz) = b40e1c9b62ef6ee4d953add8ab3beed1ee2c4056
+Size (mozc-2.17.2106.102-3648b9bf06d5d9b36bed2425640bfd18ae05b588.tar.gz) = 59324198 bytes
+SHA1 (uim-mozc-318.0562676.tar.xz) = 5cd298aaac5afd7ff8882453e3e8fa698c2c5aa1
+RMD160 (uim-mozc-318.0562676.tar.xz) = 7b93efa2ed2710d5098b1b6b81c0fd195645857b
+Size (uim-mozc-318.0562676.tar.xz) = 24316 bytes
+SHA1 (usage_dict-rev10.txt) = 174fd3073422deb5f7b3740b1c8ea6d52a077c25
+RMD160 (usage_dict-rev10.txt) = 2c70d0c6c46bff422108e3ce617a6eebc311843d
+Size (usage_dict-rev10.txt) = 219146 bytes
 SHA1 (patch-base_base.gyp) = 437fa7ef6c84448a2a8fb049af773ab9df64dc81
 SHA1 (patch-base_cpu__stats.cc) = cda8bbcbc963d8ed635435375cc80ee5e7ca2191
 SHA1 (patch-base_iconv.cc) = 1bf65dfc6152bf152cbe2714835a61436df2a48b
@@ -26,10 +29,10 @@ SHA1 (patch-gui_base_locale__util.cc) = 7d1e9cf3c2c36590298496471a97b8c32010a30b
 SHA1 (patch-gui_config__dialog_config__dialog.cc) = aae18b7ea36fd5ff5758625875a04634ffdfd68a
 SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = 00a6e4bb2c07e3340e188f108f0285a3aa2aceb9
 SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = 3652713857d03f847108952f2994ee44bfe62608
-SHA1 (patch-gui_gui.gyp) = 70b6d78ca5a482b9e8fa697dbb191cccbdde1c6a
+SHA1 (patch-gui_gui.gyp) = 82377e902935e1fccb79056fa94dd4ad4f8ff29d
 SHA1 (patch-gui_qt__libraries.gypi) = e92be78947dcf66211c80169b864b7c9d057b3db
 SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = 34a7cd2a99a0082f490c3f623c7c6a856c984f8b
-SHA1 (patch-gyp_common.gypi) = c9d93e9ff9c917f759694ed94568d3996e355c6c
+SHA1 (patch-gyp_common.gypi) = 64d8c387f5afbce02b30a42b27ade76f75224f05
 SHA1 (patch-handwriting_handwriting.gyp) = 0261aef287b34f4a3c8424fb1af44720ae00a85c
 SHA1 (patch-handwriting_zinnia.gyp) = d09ac17d17dabdbfdcb7c623193a5c72dbcacfbc
 SHA1 (patch-handwriting_zinnia__handwriting.cc) = dd9363f470bf4a27fed40602f02127cb130042b2
@@ -42,6 +45,5 @@ SHA1 (patch-protobuf_protobuf.gyp) = 35059f0e24a9d47ca5224a892de84890d72acdf4
 SHA1 (patch-session_session.cc) = 0562f8646dc6f68e180d8ae98f00eeb0364fc473
 SHA1 (patch-session_session__converter__interface.h) = 93bda6e51b9a9ac7146aa23ac0aa28bb017a4465
 SHA1 (patch-session_session__test.cc) = a256caec45a45f4eaab0555ecc18cea09c417d95
-SHA1 (patch-third__party_protobuf_post__process__dist.sh) = c54363572de0afc2c49b4ed06bc0eb329e4ad237
 SHA1 (patch-unix_ibus_gen__mozc__xml.py) = 566d567ae4f911766309e035697a23350f24bbf5
 SHA1 (patch-unix_ibus_ibus.gyp) = 2fc9309216270846f7ce33d1854d9d76e65e6e96
--- a/inputmethod/mozc-server/patches/patch-gui_gui.gyp
+++ b/inputmethod/mozc-server/patches/patch-gui_gui.gyp
@@ -1,9 +1,9 @@
-$NetBSD: patch-gui_gui.gyp,v 1.2 2013/09/07 18:42:14 ryoon Exp $
+$NetBSD: patch-gui_gui.gyp,v 1.3 2015/07/31 13:07:05 ryoon Exp $

--- gui/gui.gyp.orig	2013-08-28 05:26:12.000000000 +0000
+--- gui/gui.gyp.orig	2015-06-07 07:16:23.000000000 +0000
 +++ gui/gui.gyp
@@ -387,7 +387,7 @@
-             '../session/session_base.gyp:session_protocol',
+             '../protocol/protocol.gyp:commands_proto',
           ],
         }],
 -        ['use_libzinnia==1 and OS=="linux"', {
--- a/inputmethod/mozc-server/patches/patch-gyp_common.gypi
+++ b/inputmethod/mozc-server/patches/patch-gyp_common.gypi
@@ -1,10 +1,10 @@
-$NetBSD: patch-gyp_common.gypi,v 1.6 2015/02/17 23:55:58 ryoon Exp $
+$NetBSD: patch-gyp_common.gypi,v 1.7 2015/07/31 13:07:05 ryoon Exp $

--- gyp/common.gypi.orig	2015-02-17 14:35:04.000000000 +0000
+--- gyp/common.gypi.orig	2015-06-07 07:16:23.000000000 +0000
 +++ gyp/common.gypi
@@ -158,7 +158,7 @@
         'compiler_host': 'clang',
-         'compiler_host_version_int': 305,  # Clang 3.5 or higher
+         'compiler_host_version_int': 304,  # Clang 3.4 or higher
       }],
 -      ['target_platform=="Linux"', {
 +      ['target_platform=="Linux" or target_platform=="NetBSD"', {
@@ -29,7 +29,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.6 2015/02/17 23:55:58 ryoon Exp $
             'ldflags': [
               '<@(linux_ldflags)',
             ],
-@@ -513,7 +513,7 @@
+@@ -523,7 +523,7 @@
           },
         },
         'conditions': [
@@ -38,7 +38,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.6 2015/02/17 23:55:58 ryoon Exp $
             'cflags': [
               '<@(debug_extra_cflags)',
             ],
-@@ -574,7 +574,7 @@
+@@ -589,7 +589,7 @@
           },
         },
         'conditions': [
@@ -47,7 +47,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.6 2015/02/17 23:55:58 ryoon Exp $
             'cflags': [
               '<@(release_extra_cflags)',
             ],
-@@ -793,6 +793,22 @@
+@@ -814,6 +814,22 @@
           }],
         ],
       }],
--- a/inputmethod/mozc-server/patches/patch-third__party_protobuf_postprocessdist.sh
+++ b/inputmethod/mozc-server/patches/patch-third__party_protobuf_postprocessdist.sh
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_protobuf_post__process__dist.sh,v 1.1 2014/06/15 13:08:34 ryoon Exp $
-
--- third_party/protobuf/post_process_dist.sh.orig	2014-05-21 10:51:38.000000000 +0000
-+++ third_party/protobuf/post_process_dist.sh
-@@ -15,7 +15,7 @@
- #    non-testdata .txt files are converted to Windows-style line endings.
- # 5) Cleans up after itself.
- 
-if [ "$1" == "" ]; then
-+if [ "$1" = "" ]; then
-   echo "USAGE:  $1 DISTFILE" >&2
-   exit 1
- fi
--- a/inputmethod/mozc-tool/Makefile
+++ b/inputmethod/mozc-tool/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2015/04/25 14:23:23 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2015/07/31 13:07:05 ryoon Exp $

 PKGNAME=	${DISTNAME:S/mozc-/mozc-tool-/}
-PKGREVISION=	1

 INSTALLATION_DIRS+=	libexec

--- a/inputmethod/prime-dict/Makefile
+++ b/inputmethod/prime-dict/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2015/03/15 19:42:33 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.8 2015/06/29 11:06:47 ryoon Exp $
 #

 DISTNAME=	prime-dict-1.0.0
 CATEGORIES=	inputmethod
-MASTER_SITES=	http://prime.sourceforge.jp/src/
+MASTER_SITES=	http://prime.osdn.jp/src/

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://taiyaki.org/prime/
--- a/inputmethod/prime-el/Makefile
+++ b/inputmethod/prime-el/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2015/03/15 17:56:15 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.9 2015/06/29 11:06:47 ryoon Exp $
 #

 DISTNAME=	prime-el-1.5.1.3
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=	2
 CATEGORIES=	inputmethod
-MASTER_SITES=	http://prime.sourceforge.jp/src/
+MASTER_SITES=	http://prime.osdn.jp/src/

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://taiyaki.org/prime/emacs/
--- a/inputmethod/prime/Makefile
+++ b/inputmethod/prime/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2015/03/15 17:25:56 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.11 2015/06/29 11:06:47 ryoon Exp $
 #

 DISTNAME=	prime-1.0.0.1
 CATEGORIES=	inputmethod
-MASTER_SITES=	http://prime.sourceforge.jp/src/
+MASTER_SITES=	http://prime.osdn.jp/src/

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://taiyaki.org/prime/
--- a/inputmethod/scim-anthy/Makefile
+++ b/inputmethod/scim-anthy/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.25 2015/04/25 14:23:24 tnn Exp $
+# $NetBSD: Makefile,v 1.26 2015/06/29 11:06:47 ryoon Exp $
 #

 DISTNAME=		scim-anthy-1.2.7
 PKGREVISION=		22
 CATEGORIES=		inputmethod
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/37309/}
+MASTER_SITES=		${MASTER_SITE_OSDN:=scim-imengine/37309/}

 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://scim-imengine.sourceforge.jp/
+HOMEPAGE=		http://osdn.jp/projects/scim-imengine/
 COMMENT=		SCIM IMEngine module for anthy
 LICENSE=		gnu-gpl-v2

--- a/inputmethod/scim-canna/Makefile
+++ b/inputmethod/scim-canna/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.25 2015/04/25 14:23:24 tnn Exp $
+# $NetBSD: Makefile,v 1.26 2015/06/29 11:06:47 ryoon Exp $
 #

 DISTNAME=		scim-canna-1.0.1
 PKGREVISION=		21
 CATEGORIES=		inputmethod
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/29155/}
+MASTER_SITES=		${MASTER_SITE_OSDN:=scim-imengine/29155/}

 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://scim-imengine.sourceforge.jp/
+HOMEPAGE=		http://osdn.jp/projects/scim-imengine/
 COMMENT=		SCIM IMEngine module for Canna
 LICENSE=		gnu-gpl-v2

--- a/inputmethod/scim-m17n/Makefile
+++ b/inputmethod/scim-m17n/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:24 tnn Exp $
+# $NetBSD: Makefile,v 1.29 2015/06/30 09:57:38 ryoon Exp $
 #

 DISTNAME=		scim-m17n-0.2.3
-PKGREVISION=		25
+PKGREVISION=		26
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}

--- a/inputmethod/scim-prime/Makefile
+++ b/inputmethod/scim-prime/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.25 2015/04/25 14:23:25 tnn Exp $
+# $NetBSD: Makefile,v 1.26 2015/06/29 11:06:47 ryoon Exp $
 #

 DISTNAME=		scim-prime-1.0.1
 PKGREVISION=		21
 CATEGORIES=		inputmethod
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/29156/}
+MASTER_SITES=		${MASTER_SITE_OSDN:=scim-imengine/29156/}

 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://scim-imengine.sourceforge.jp/
+HOMEPAGE=		http://osdn.jp/projects/scim-imengine/
 COMMENT=		SCIM IMEngine module for PRIME
 LICENSE=		gnu-gpl-v2

--- a/inputmethod/scim-sinhala/Makefile
+++ b/inputmethod/scim-sinhala/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.24 2015/04/25 14:23:25 tnn Exp $
+# $NetBSD: Makefile,v 1.25 2015/06/29 11:06:48 ryoon Exp $
 #

 DISTNAME=		scim-sinhala-0.1.0
 PKGREVISION=		21
 CATEGORIES=		inputmethod
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/16666/}
+MASTER_SITES=		${MASTER_SITE_OSDN:=scim-imengine/16666/}

 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://scim-imengine.sourceforge.jp/
+HOMEPAGE=		http://osdn.jp/projects/scim-imengine/
 COMMENT=		SCIM IMEngine module for Sinhala
 LICENSE=		gnu-gpl-v2

--- a/inputmethod/scim-skk/Makefile
+++ b/inputmethod/scim-skk/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.24 2015/04/25 14:23:25 tnn Exp $
+# $NetBSD: Makefile,v 1.25 2015/06/29 11:06:48 ryoon Exp $
 #

 DISTNAME=		scim-skk-0.5.2
 PKGREVISION=		21
 CATEGORIES=		inputmethod
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/18121/}
+MASTER_SITES=		${MASTER_SITE_OSDN:=scim-imengine/18121/}

 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://scim-imengine.sourceforge.jp/
+HOMEPAGE=		http://osdn.jp/projects/scim-imengine/
 COMMENT=		SCIM IMEngine module for skk
 LICENSE=		gnu-gpl-v2

--- a/inputmethod/scim-tomoe/Makefile
+++ b/inputmethod/scim-tomoe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/04/25 14:23:25 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2015/06/29 11:06:48 ryoon Exp $
 #

 DISTNAME=		scim-tomoe-0.6.0
@@ -7,7 +7,7 @@ CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tomoe/}

 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://tomoe.sourceforge.jp/
+HOMEPAGE=		http://tomoe.osdn.jp/
 COMMENT=		SCIM IMEngine module for Tomoe
 LICENSE=		gnu-gpl-v2

--- a/inputmethod/skkinput/Makefile
+++ b/inputmethod/skkinput/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2012/10/06 14:25:18 asau Exp $
+# $NetBSD: Makefile,v 1.19 2015/06/29 11:06:48 ryoon Exp $

 DISTNAME=	skkinput-2.06.4
 CATEGORIES=	japanese inputmethod
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=skkinput2/6273/}
+MASTER_SITES=	${MASTER_SITE_OSDN:=skkinput2/6273/}

 MAINTAINER=	uebayasi@NetBSD.org
-HOMEPAGE=	http://skkinput2.sourceforge.jp/
+HOMEPAGE=	http://skkinput2.osdn.jp/
 COMMENT=	X11 frontend for SKK
 LICENSE=	gnu-gpl-v2

--- a/inputmethod/tomoe-gtk/Makefile
+++ b/inputmethod/tomoe-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2015/04/25 14:23:25 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2015/06/29 11:06:48 ryoon Exp $
 #

 DISTNAME=	tomoe-gtk-0.6.0
@@ -7,7 +7,7 @@ CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tomoe/}

 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://tomoe.sourceforge.jp/
+HOMEPAGE=	http://tomoe.osdn.jp/
 COMMENT=	GUI library for tomoe's GTK+ GUI parts
 LICENSE=	gnu-lgpl-v2.1

--- a/inputmethod/tomoe/Makefile
+++ b/inputmethod/tomoe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/03/15 17:47:15 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.10 2015/06/29 11:06:48 ryoon Exp $
 #

 DISTNAME=	tomoe-0.6.0
@@ -7,7 +7,7 @@ CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tomoe/}

 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://tomoe.sourceforge.jp/
+HOMEPAGE=	http://tomoe.osdn.jp/
 COMMENT=	Handwriting recognition engine
 #LICENSE=	gnu-lgpl-v2.1 # AND Creative Commons Attribution-ShareAlike Licence

--- a/inputmethod/uim-mozc/Makefile
+++ b/inputmethod/uim-mozc/Makefile
@@ -1,10 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2015/04/25 14:23:25 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2015/07/31 13:07:05 ryoon Exp $

 PKGNAME=	uim-${DISTNAME}
-PKGREVISION=	1
-
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} uim-mozc-334.tar.xz
-SITES.uim-mozc-334.tar.xz=	${MASTER_SITE_SOURCEFORGE:=pnsft-aur/}

 CONFLICTS+=	ibus-mozc<=1.13.1651.102

@@ -22,8 +18,8 @@ SUBST_FILES.mozc_tool=		scm/mozc-custom.scm
 SUBST_SED.mozc_tool=		-e 's,/usr/lib/mozc/mozc_tool,${PREFIX}/libexec/mozc_tool,g'

 post-extract:
-	mv ${WRKDIR}/uim-mozc-334/uim ${WRKSRC}/unix
-	mv ${WRKDIR}/uim-mozc-334/scm ${WRKSRC}
+	mv ${WRKDIR}/${UIM_MOZC}/uim ${WRKSRC}/unix
+	mv ${WRKDIR}/${UIM_MOZC}/scm ${WRKSRC}

 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
--- a/inputmethod/uim-tomoe-gtk/Makefile
+++ b/inputmethod/uim-tomoe-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2015/04/25 14:23:25 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2015/06/29 11:06:48 ryoon Exp $
 #

 DISTNAME=	uim-tomoe-gtk-0.6.0
@@ -7,7 +7,7 @@ CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tomoe/}

 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://tomoe.sourceforge.jp/
+HOMEPAGE=	http://tomoe.osdn.jp/
 COMMENT=	UIM helper program for Tomoe
 LICENSE=	gnu-lgpl-v2.1

--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.105 2015/04/25 14:23:25 tnn Exp $
+# $NetBSD: Makefile,v 1.108 2015/08/18 07:31:10 wiz Exp $
 #

 .include "../../inputmethod/uim/Makefile.common"

-PKGREVISION=		21
+PKGREVISION=		24
 COMMENT=		Multilingual input method library
 #LICENSE=		See ${WRKSRC}/COPYING

--- a/inputmethod/xcin/Makefile
+++ b/inputmethod/xcin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2015/06/12 10:50:15 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2015/07/04 16:18:37 joerg Exp $

 DISTNAME=	xcin-2.5.3.pre2
 PKGNAME=	xcin-2.5.3rc2
@@ -17,7 +17,6 @@ WRKSRC=			${WRKDIR}/xcin
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		msgfmt pax perl:run
-USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-db-lib=${BDBBASE}/lib