Update ibus-table-chinese to 1.4.0.

* Fri Sep 07 2012 Ding-Yi Chen <dchen@redhat.com> - 1.4.0
- Table build scripts has been refactored.
- cmake-fedora is added as submodule.
- Fixed Bug 855250 - Change the default filtering for Quick and Cangjie by
  merging maxiaojun's repository
- Fixed Google Issue 1405: failed to build ibus-table-chinese due to missing db files

6 files changed, 45 insertions, 57 deletions

diff --git a/inputmethod/ibus-table-chinese/Makefile b/inputmethod/ibus-table-chinese/Makefile
index dadb697ba49..fc004da58de 100644
--- a/inputmethod/ibus-table-chinese/Makefile
+++ b/inputmethod/ibus-table-chinese/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2012/02/18 05:34:23 obache Exp $
+# $NetBSD: Makefile,v 1.7 2012/09/10 11:53:40 obache Exp $
 #
 
-DISTNAME=	ibus-table-chinese-1.3.5-Source-Standalone
-PKGNAME=	${DISTNAME:S/-Source-Standalone//}
+DISTNAME=	ibus-table-chinese-1.4.0-Source
+PKGNAME=	${DISTNAME:S/-Source//}
 CATEGORIES=	inputmethod chinese
 MASTER_SITES=	http://ibus.googlecode.com/files/
 
@@ -13,8 +13,6 @@ 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/PLIST b/inputmethod/ibus-table-chinese/PLIST
index fffcc1b1f25..6c7f1c2e2a3 100644
--- a/inputmethod/ibus-table-chinese/PLIST
+++ b/inputmethod/ibus-table-chinese/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2010/12/03 12:14:29 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/09/10 11:53:40 obache Exp $
 share/doc/${PKGNAME}/AUTHORS
 share/doc/${PKGNAME}/COPYING
 share/doc/${PKGNAME}/ChangeLog
 share/doc/${PKGNAME}/README
-share/doc/${PKGNAME}/RELEASE-NOTES.txt
 share/ibus-table/icons/array30-big.png
 share/ibus-table/icons/array30.png
 share/ibus-table/icons/cangjie-big.png
diff --git a/inputmethod/ibus-table-chinese/distinfo b/inputmethod/ibus-table-chinese/distinfo
index b93469315ed..b5ba8f620d7 100644
--- a/inputmethod/ibus-table-chinese/distinfo
+++ b/inputmethod/ibus-table-chinese/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2011/12/04 13:28:00 obache Exp $
+$NetBSD: distinfo,v 1.7 2012/09/10 11:53:40 obache Exp $
 
-SHA1 (ibus-table-chinese-1.3.5-Source-Standalone.tar.gz) = 3da8a4361402b3b5ef08cd0892ed24eb999c0f8e
-RMD160 (ibus-table-chinese-1.3.5-Source-Standalone.tar.gz) = b1ea01bc74006581c6e7dfc40e5477233039060f
-Size (ibus-table-chinese-1.3.5-Source-Standalone.tar.gz) = 10578261 bytes
+SHA1 (ibus-table-chinese-1.4.0-Source.tar.gz) = 4c9ef365abfec34b93bfa033ae36d18de426b049
+RMD160 (ibus-table-chinese-1.4.0-Source.tar.gz) = fbbe6ce10d5f85570151a0cd7a3821c1248d586e
+Size (ibus-table-chinese-1.4.0-Source.tar.gz) = 10553832 bytes
 SHA1 (patch-Modules_DateTimeFormat.cmake) = 7d9cfde41f39efe7ab2f0cf7ffb6d21a4ff4ce2a
 SHA1 (patch-ab) = cd75ce5cbad9610607cfa5f68fec245a139f8b6b
-SHA1 (patch-ac) = 8014baa6a99f704e30eecd67041dfbe7c51630b9
-SHA1 (patch-ad) = ba0b1207f3b146238436436cfeb4bf3a273748ea
+SHA1 (patch-ac) = 6691cde876c3cfa64c1790294a6660b18f986d03
+SHA1 (patch-tables_array_CMakeLists.txt) = 045cd78ca1a16c87d2e6a5ef495f10bfcaf8c494
diff --git a/inputmethod/ibus-table-chinese/patches/patch-ac b/inputmethod/ibus-table-chinese/patches/patch-ac
index aa270f799fd..c1294fdc30f 100644
--- a/inputmethod/ibus-table-chinese/patches/patch-ac
+++ b/inputmethod/ibus-table-chinese/patches/patch-ac
@@ -1,33 +1,15 @@
-$NetBSD: patch-ac,v 1.2 2011/09/01 11:46:07 obache Exp $
+$NetBSD: patch-ac,v 1.3 2012/09/10 11:53:41 obache Exp $
 
 * use more portable codeset names.
 
---- tables/CMakeLists.txt.orig	2010-12-02 23:22:54.000000000 +0000
+--- tables/CMakeLists.txt.orig	2012-09-07 06:23:27.000000000 +0000
 +++ tables/CMakeLists.txt
-@@ -66,7 +66,7 @@ MACRO(CONVERT_ENCODING workDir outputFil
- 	ENDIF(_arg STREQUAL "GENERATE_FREQ")
-     ENDFOREACH(_arg ${ARGN})
- 
--    EXECUTE_PROCESS(COMMAND ${ICONV_CMD} -f ${fromEncoding} -t UTF8 "${outputFile}.tmp"
-+    EXECUTE_PROCESS(COMMAND ${ICONV_CMD} -f ${fromEncoding} -t UTF-8 "${outputFile}.tmp"
- 	COMMAND sed -e "s/\r//"
- 	COMMAND ${AWK_CMD} "{print tolower($0)}"
- 	COMMAND sort
-@@ -91,7 +91,7 @@ ENDMACRO(CONVERT_ENCODING CONVERT_ENCODI
- #
- 
- # Array
--CONVERT_ENCODING(array array30_27489.utf8 UTF16 array30_27489.txt GENERATE_FREQ)
-+CONVERT_ENCODING(array array30_27489.utf8 UTF-16 array30_27489.txt GENERATE_FREQ)
- ADD_CUSTOM_COMMAND(OUTPUT array/array30.txt
-     COMMAND cat array30.head.common array30.head array30_27489.utf8 array30.tail > array30.txt
-     DEPENDS array/array30.head.common
-@@ -102,7 +102,7 @@ ADD_CUSTOM_COMMAND(OUTPUT array/array30.
-     VERBATIM
-     )
- 
--CONVERT_ENCODING(array array30-big.utf8 UTF16 array30_27489.txt array30_ExtB.txt GENERATE_FREQ)
-+CONVERT_ENCODING(array array30-big.utf8 UTF-16 array30_27489.txt array30_ExtB.txt GENERATE_FREQ)
- ADD_CUSTOM_COMMAND(OUTPUT array/array30-big.txt
-     COMMAND cat array30.head.common array30-big.head array30-big.utf8 array30.tail > array30-big.txt
-     DEPENDS array/array30.head.common
+@@ -51,7 +51,7 @@ MACRO(CONVERT_ENCODING outputFile fromEn
+     # Need to strip Unicode BOM (0xfeff)
+     ADD_CUSTOM_COMMAND(OUTPUT ${outputFile}
+ 	COMMAND ${SED_CMD} -e "s/^[\\xff][\\xfe]//" ${inputFile}
+-	| ${ICONV_CMD} -f ${fromEncoding} -t UTF8
++	| ${ICONV_CMD} -f ${fromEncoding} -t UTF-8
+ 	| ${SED_CMD} -e "s/\r//"
+ 	| ${AWK_CMD} "{print tolower($0)}"
+ 	| sort > ${outputFile}
diff --git a/inputmethod/ibus-table-chinese/patches/patch-ad b/inputmethod/ibus-table-chinese/patches/patch-ad
deleted file mode 100644
index 3ef3d757114..00000000000
--- a/inputmethod/ibus-table-chinese/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$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	2011-08-16 04:00:51.000000000 +0000
-+++ Modules/ManageVersion.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}|")
diff --git a/inputmethod/ibus-table-chinese/patches/patch-tables_array_CMakeLists.txt b/inputmethod/ibus-table-chinese/patches/patch-tables_array_CMakeLists.txt
new file mode 100644
index 00000000000..532097a1255
--- /dev/null
+++ b/inputmethod/ibus-table-chinese/patches/patch-tables_array_CMakeLists.txt
@@ -0,0 +1,24 @@
+$NetBSD: patch-tables_array_CMakeLists.txt,v 1.1 2012/09/10 11:53:41 obache Exp $
+
+* use more portable codeset names.
+
+--- tables/array/CMakeLists.txt.orig	2012-09-07 06:23:27.000000000 +0000
++++ tables/array/CMakeLists.txt
+@@ -8,7 +8,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI
+     ${CMAKE_CURRENT_BINARY_DIR}/array30.head @ONLY
+     )
+ 
+-CONVERT_ENCODING(${CMAKE_CURRENT_BINARY_DIR}/array30_27489.utf8 UTF16 array30_27489.txt)
++CONVERT_ENCODING(${CMAKE_CURRENT_BINARY_DIR}/array30_27489.utf8 UTF-16 array30_27489.txt)
+ GENERATE_FREQ(${CMAKE_CURRENT_BINARY_DIR}/array30_27489.freq
+     ${CMAKE_CURRENT_BINARY_DIR}/array30_27489.utf8
+     )
+@@ -27,7 +27,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI
+     ${CMAKE_CURRENT_BINARY_DIR}/array30-big.head @ONLY
+     )
+ 
+-CONVERT_ENCODING(${CMAKE_CURRENT_BINARY_DIR}/array30_ExtB.utf8 UTF16 array30_ExtB.txt)
++CONVERT_ENCODING(${CMAKE_CURRENT_BINARY_DIR}/array30_ExtB.utf8 UTF-16 array30_ExtB.txt)
+ 
+ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/array30-big.utf8
+     COMMAND cat ${CMAKE_CURRENT_BINARY_DIR}/array30_27489.utf8