Update ibus-table-chinese to 1.3.4.

(no summarized changes).

7 files changed, 56 insertions, 16 deletions

diff --git a/inputmethod/ibus-table-chinese/Makefile b/inputmethod/ibus-table-chinese/Makefile
index f3411b8d1f7..657b63a4618 100644
--- a/inputmethod/ibus-table-chinese/Makefile
+++ b/inputmethod/ibus-table-chinese/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/12/06 05:16:14 obache Exp $
+# $NetBSD: Makefile,v 1.4 2011/09/01 11:46:06 obache Exp $
 #
 
-DISTNAME=	ibus-table-chinese-1.3.0.20101206-Source
-PKGNAME=	${DISTNAME:S/-Source//}
+DISTNAME=	ibus-table-chinese-1.3.4-Source-Standalone
+PKGNAME=	${DISTNAME:S/-Source-Standalone//}
 CATEGORIES=	inputmethod chinese
 MASTER_SITES=	http://ibus.googlecode.com/files/
 
@@ -13,6 +13,8 @@ LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-Standalone//}
+
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
diff --git a/inputmethod/ibus-table-chinese/distinfo b/inputmethod/ibus-table-chinese/distinfo
index e4c2b2140e6..dcd39c8adb6 100644
--- a/inputmethod/ibus-table-chinese/distinfo
+++ b/inputmethod/ibus-table-chinese/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.4 2011/01/24 08:40:39 obache Exp $
+$NetBSD: distinfo,v 1.5 2011/09/01 11:46:06 obache Exp $
 
-SHA1 (ibus-table-chinese-1.3.0.20101206-Source.tar.gz) = 8e21e6b11d9102ba23a8b268436d0301323258fe
-RMD160 (ibus-table-chinese-1.3.0.20101206-Source.tar.gz) = 7c175fe19d76fb8e0a6092f83af045f8325fc842
-Size (ibus-table-chinese-1.3.0.20101206-Source.tar.gz) = 10521276 bytes
-SHA1 (patch-ab) = 17180e36a68b4c54ec2388adfb43f781762dec04
-SHA1 (patch-ac) = 565bbc4a117e753571c66404949b4ec54559594a
-SHA1 (patch-ad) = c69dcb80258663776302c7bb1c841f1f16792591
+SHA1 (ibus-table-chinese-1.3.4-Source-Standalone.tar.gz) = 9a2576f412a3cd5943dbb04e4690a6e9e5a20126
+RMD160 (ibus-table-chinese-1.3.4-Source-Standalone.tar.gz) = 73a854d5bb30d8e08e8e70b9566b0542df90b887
+Size (ibus-table-chinese-1.3.4-Source-Standalone.tar.gz) = 10575940 bytes
+SHA1 (patch-Modules_DateTimeFormat.cmake) = 7d9cfde41f39efe7ab2f0cf7ffb6d21a4ff4ce2a
+SHA1 (patch-Modules_ManageEnvironment.cmake) = 71f19e6231da98b3b3e272e3bb6b7273b2827dd5
+SHA1 (patch-ab) = cd75ce5cbad9610607cfa5f68fec245a139f8b6b
+SHA1 (patch-ac) = 8014baa6a99f704e30eecd67041dfbe7c51630b9
+SHA1 (patch-ad) = ba0b1207f3b146238436436cfeb4bf3a273748ea
diff --git a/inputmethod/ibus-table-chinese/patches/patch-Modules_DateTimeFormat.cmake b/inputmethod/ibus-table-chinese/patches/patch-Modules_DateTimeFormat.cmake
new file mode 100644
index 00000000000..4ecf7623414
--- /dev/null
+++ b/inputmethod/ibus-table-chinese/patches/patch-Modules_DateTimeFormat.cmake
@@ -0,0 +1,15 @@
+$NetBSD: patch-Modules_DateTimeFormat.cmake,v 1.1 2011/09/01 11:46:06 obache Exp $
+
+* -u is the POSIX standard way.
+
+--- Modules/DateTimeFormat.cmake.orig	2011-08-03 00:21:35.000000000 +0000
++++ Modules/DateTimeFormat.cmake
+@@ -28,7 +28,7 @@ IF(NOT DEFINED _DATE_TIME_FORMAT_CMAKE_)
+ 	IF(_locale)
+ 	    SET(ENV{LC_ALL} ${_locale})
+ 	ENDIF(_locale)
+-	COMMAND_OUTPUT_TO_VARIABLE(${date_var} date --utc "${format}")
++	COMMAND_OUTPUT_TO_VARIABLE(${date_var} date -u "${format}")
+     ENDMACRO(TODAY date_var format)
+ 
+     TODAY(TODAY_CHANGELOG "+%a %b %d %Y" "C")
diff --git a/inputmethod/ibus-table-chinese/patches/patch-Modules_ManageEnvironment.cmake b/inputmethod/ibus-table-chinese/patches/patch-Modules_ManageEnvironment.cmake
new file mode 100644
index 00000000000..4dbba040f45
--- /dev/null
+++ b/inputmethod/ibus-table-chinese/patches/patch-Modules_ManageEnvironment.cmake
@@ -0,0 +1,17 @@
+$NetBSD: patch-Modules_ManageEnvironment.cmake,v 1.1 2011/09/01 11:46:06 obache Exp $
+
+* allow to overwrite PREFIX.
+
+--- Modules/ManageEnvironment.cmake.orig	2011-08-10 06:19:16.000000000 +0000
++++ Modules/ManageEnvironment.cmake
+@@ -137,7 +137,9 @@ IF(NOT DEFINED _MANAGE_ENVIRONMENT_CMAKE
+     ####################################################################
+     # CMake Variables
+     #
+-    SET(CMAKE_INSTALL_PREFIX "/usr")
++    IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
++	SET(CMAKE_INSTALL_PREFIX "/usr")
++    ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
+     SET_COMPILE_ENV(CMAKE_INSTALL_PREFIX "/usr"
+ 	DISPLAY PATH "Install dir prefix")
+     SET_COMPILE_ENV(BIN_DIR  "${CMAKE_INSTALL_PREFIX}/bin"
diff --git a/inputmethod/ibus-table-chinese/patches/patch-ab b/inputmethod/ibus-table-chinese/patches/patch-ab
index 36a8a6bfda2..67c047a9b7f 100644
--- a/inputmethod/ibus-table-chinese/patches/patch-ab
+++ b/inputmethod/ibus-table-chinese/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2010/12/03 12:14:29 obache Exp $
+$NetBSD: patch-ab,v 1.2 2011/09/01 11:46:07 obache Exp $
+
+* portability fix
 
 --- tables/wubi-haifeng/convertTable.sh.orig	2010-12-02 23:22:54.000000000 +0000
 +++ tables/wubi-haifeng/convertTable.sh
diff --git a/inputmethod/ibus-table-chinese/patches/patch-ac b/inputmethod/ibus-table-chinese/patches/patch-ac
index 60842413c04..aa270f799fd 100644
--- a/inputmethod/ibus-table-chinese/patches/patch-ac
+++ b/inputmethod/ibus-table-chinese/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2010/12/03 12:14:29 obache Exp $
+$NetBSD: patch-ac,v 1.2 2011/09/01 11:46:07 obache Exp $
+
+* use more portable codeset names.
 
 --- tables/CMakeLists.txt.orig	2010-12-02 23:22:54.000000000 +0000
 +++ tables/CMakeLists.txt
diff --git a/inputmethod/ibus-table-chinese/patches/patch-ad b/inputmethod/ibus-table-chinese/patches/patch-ad
index a56cbdf094d..3ef3d757114 100644
--- a/inputmethod/ibus-table-chinese/patches/patch-ad
+++ b/inputmethod/ibus-table-chinese/patches/patch-ad
@@ -1,15 +1,15 @@
-$NetBSD: patch-ad,v 1.1 2011/01/24 08:40:39 obache Exp $
+$NetBSD: patch-ad,v 1.2 2011/09/01 11:46:07 obache Exp $
 
 "-m" option for grep is not portable.
 
---- Modules/ManageVersion.cmake.orig	2010-12-06 00:55:50.000000000 +0000
+--- Modules/ManageVersion.cmake.orig	2011-08-16 04:00:51.000000000 +0000
 +++ Modules/ManageVersion.cmake
-@@ -31,7 +31,7 @@ IF(NOT DEFINED _MANAGE_VERSION_CMAKE_)
+@@ -44,7 +44,7 @@ IF(NOT DEFINED _MANAGE_VERSION_CMAKE_)
      INCLUDE(ManageVariable)
  
      MACRO(LOAD_RELEASE_FILE releaseFile)
 -	COMMAND_OUTPUT_TO_VARIABLE(_grep_line grep -F "[Changes]" -n -m 1 ${releaseFile})
 +	COMMAND_OUTPUT_TO_VARIABLE(_grep_line grep -F "[Changes]" -n  ${releaseFile})
+ 
  	SET(RELEASE_FILE ${releaseFile})
  	#MESSAGE("_grep_line=|${_grep_line}|")
- 	IF("${_grep_line}" STREQUAL "")