diff options
author | ryoon <ryoon@pkgsrc.org> | 2013-01-26 20:33:59 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2013-01-26 20:33:59 +0000 |
commit | c305d3797e9caaccced28747afda3ea38f435e98 (patch) | |
tree | 10e0574e4385914cee38ba74629bb98226e1a4e0 | |
parent | 780e819469970de9e46f4a6a33030b6ce8dfbcaa (diff) | |
download | pkgsrc-c305d3797e9caaccced28747afda3ea38f435e98.tar.gz |
Bump PKGREVISIONs.
Fix build on NetBSD/i386.
The patch is provided from tsutsui@.
-rw-r--r-- | inputmethod/ibus-mozc/Makefile | 3 | ||||
-rw-r--r-- | inputmethod/ibus-mozc/distinfo | 4 | ||||
-rw-r--r-- | inputmethod/ibus-mozc/patches/patch-base_mutex.h | 16 | ||||
-rw-r--r-- | inputmethod/mozc-server/Makefile | 3 | ||||
-rw-r--r-- | inputmethod/mozc-tool/Makefile | 3 |
5 files changed, 22 insertions, 7 deletions
diff --git a/inputmethod/ibus-mozc/Makefile b/inputmethod/ibus-mozc/Makefile index cc03c2ea1c1..d20ecbb2b85 100644 --- a/inputmethod/ibus-mozc/Makefile +++ b/inputmethod/ibus-mozc/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2013/01/22 11:28:11 ryoon Exp $ +# $NetBSD: Makefile,v 1.3 2013/01/26 20:33:59 ryoon Exp $ # PKGNAME= ibus-${DISTNAME} +PKGREVISION= 1 INSTALLATION_DIRS+= libexec share/ibus share/icons share/ibus/component \ share/ibus-mozc diff --git a/inputmethod/ibus-mozc/distinfo b/inputmethod/ibus-mozc/distinfo index 7618ad44a9f..583f5b83269 100644 --- a/inputmethod/ibus-mozc/distinfo +++ b/inputmethod/ibus-mozc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2013/01/18 11:36:39 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2013/01/26 20:33:59 ryoon Exp $ SHA1 (mozc-1.6.1187.102.tar.bz2) = 341e0edd1f5c8593b8936792975a4856e1c9c89e RMD160 (mozc-1.6.1187.102.tar.bz2) = 4997cba2b8db9d14ec085142947c92fc789f79cb @@ -11,7 +11,7 @@ SHA1 (patch-base_crash__report__util.cc) = b745c0ac69e06a222df8398af425e9d697f6c SHA1 (patch-base_iconv.cc) = 1bf65dfc6152bf152cbe2714835a61436df2a48b SHA1 (patch-base_logging.cc) = fff656a611dc4eec91dfac7b035cc0fc628e3706 SHA1 (patch-base_mutex.cc) = 48e5f3e7eacabd6d5a1aceec3e63e1c952be556e -SHA1 (patch-base_mutex.h) = bf77404ad2d105ef975fc0f9c4086d8dcdc428ea +SHA1 (patch-base_mutex.h) = e8e1d6b1e83aae1c4de2a4b25d11f82f107df32a SHA1 (patch-base_password__manager.cc) = cb11b9b707ab0c361c969eefd4d7c805c0b4b06a SHA1 (patch-base_process.cc) = cf7e086d35d1bd0c640ceda6b39a9e12103979e8 SHA1 (patch-base_run__level.cc) = 738b263a334977038629d24bef96b365c42fca57 diff --git a/inputmethod/ibus-mozc/patches/patch-base_mutex.h b/inputmethod/ibus-mozc/patches/patch-base_mutex.h index 021cab29e61..368bdb1bb3a 100644 --- a/inputmethod/ibus-mozc/patches/patch-base_mutex.h +++ b/inputmethod/ibus-mozc/patches/patch-base_mutex.h @@ -1,14 +1,26 @@ -$NetBSD: patch-base_mutex.h,v 1.1 2013/01/18 11:36:40 ryoon Exp $ +$NetBSD: patch-base_mutex.h,v 1.2 2013/01/26 20:33:59 ryoon Exp $ +* First chunk, NetBSD ILP32 ports seem to require larger mutex array size. * I am not sure. --- base/mutex.h.orig 2012-08-31 05:37:06.000000000 +0000 +++ base/mutex.h +@@ -46,8 +46,8 @@ namespace mozc { + // To remove dependencies against plafrom specific headers such as + // <Windows.h> or <pthread.h>, we use an array of pointers as an opaque buffer + // where platform specific mutex structure will be placed. +-#if defined(OS_MACOSX) +-// Mac requires relatively large buffer for pthread mutex object. ++#if defined(OS_MACOSX) || defined(OS_NETBSD) ++// Mac and NetBSD requires relatively large buffer for pthread mutex object. + #define MOZC_MUTEX_PTR_ARRAYSIZE 11 + #define MOZC_RW_MUTEX_PTR_ARRAYSIZE 32 + #else @@ -56,6 +56,10 @@ namespace mozc { #define MOZC_RW_MUTEX_PTR_ARRAYSIZE 10 #endif -+#if defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(OS_NETBSD) +#define PTHREAD_MUTEX_RECURSIVE_VALUE PTHREAD_MUTEX_RECURSIVE +#endif + diff --git a/inputmethod/mozc-server/Makefile b/inputmethod/mozc-server/Makefile index 7ca93bd6cf1..98a6e195f0e 100644 --- a/inputmethod/mozc-server/Makefile +++ b/inputmethod/mozc-server/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2013/01/22 11:15:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.3 2013/01/26 20:33:59 ryoon Exp $ # PKGNAME= ${DISTNAME:S/mozc-/mozc-server-/} +PKGREVISION= 1 INSTALLATION_DIRS+= libexec diff --git a/inputmethod/mozc-tool/Makefile b/inputmethod/mozc-tool/Makefile index cc861fdf4d6..cd36cc695d7 100644 --- a/inputmethod/mozc-tool/Makefile +++ b/inputmethod/mozc-tool/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2013/01/22 11:15:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.3 2013/01/26 20:33:59 ryoon Exp $ # PKGNAME= ${DISTNAME:S/mozc-/mozc-tool-/} +PKGREVISION= 1 INSTALLATION_DIRS+= libexec |