Redo previous build fix for emacs23 in saner way.

5 files changed, 44 insertions, 4 deletions

diff --git a/inputmethod/tc/PLIST b/inputmethod/tc/PLIST
index f5a8f9346a9..ffd343c7e1f 100644
--- a/inputmethod/tc/PLIST
+++ b/inputmethod/tc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/07/16 16:43:11 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/07/16 22:51:50 uebayasi Exp $
 bin/tcinput
 ${EMACS_INFOPREFIX}/tc.info
 ${EMACS_LISPPREFIX}/tc/eelll.el
@@ -14,10 +14,11 @@ ${EMACS_LISPPREFIX}/tc/tc-image.el
 ${EMACS_LISPPREFIX}/tc/tc-inst.el
 ${EMACS_LISPPREFIX}/tc/tc-inst.elc
 ${EMACS_LISPPREFIX}/tc/tc-is18.el
-${FOR_emacs23}${EMACS_LISPPREFIX}/tc/tc-is18.elc
+@comment ${FOR_emacs23}${EMACS_LISPPREFIX}/tc/tc-is18.elc
 ${EMACS_LISPPREFIX}/tc/tc-is19.el
 ${EMACS_LISPPREFIX}/tc/tc-is20.el
-${NOTFOR_emacs23}${EMACS_LISPPREFIX}/tc/tc-is20.elc
+${EMACS_LISPPREFIX}/tc/tc-is20.elc
+@comment ${NOTFOR_emacs23}${EMACS_LISPPREFIX}/tc/tc-is20.elc
 ${EMACS_LISPPREFIX}/tc/tc-ja-alnum.el
 ${EMACS_LISPPREFIX}/tc/tc-ja-alnum.elc
 ${EMACS_LISPPREFIX}/tc/tc-jiscode.el
diff --git a/inputmethod/tc/distinfo b/inputmethod/tc/distinfo
index 88a84966a3f..3e37dce5984 100644
--- a/inputmethod/tc/distinfo
+++ b/inputmethod/tc/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 21:00:35 agc Exp $
+$NetBSD: distinfo,v 1.5 2009/07/16 22:51:50 uebayasi Exp $
 
 SHA1 (tc-2.3.1.tar.gz) = 7eb55134581b83692ea6deb10c227232d0c8df4d
 RMD160 (tc-2.3.1.tar.gz) = 4364a4e14c710e68d714146da3545d928b87bf52
 Size (tc-2.3.1.tar.gz) = 798831 bytes
+SHA1 (patch-aa) = 016ccc19211b9b87e81a3fa743f69e607cf643fa
+SHA1 (patch-ab) = 9708d7db6da3ed1b7c0c74a6e1eda288570ba0e7
+SHA1 (patch-ac) = f9cb2f43a2d94b653ffd5f207290b5d9252c83bc
diff --git a/inputmethod/tc/patches/patch-aa b/inputmethod/tc/patches/patch-aa
new file mode 100644
index 00000000000..cc87a2c0bab
--- /dev/null
+++ b/inputmethod/tc/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2009/07/16 22:51:50 uebayasi Exp $
+
+--- acinclude.m4.orig	2002-03-25 09:15:51.000000000 +0900
++++ acinclude.m4
+@@ -50,7 +50,7 @@ mule1)
+ 	ELC_FILES="tc-is18.elc"
+ 	NO_COMPILE_EL_FILES="tc-sysdep.el tc-is19.el tc-is20.el"
+ 	;;
+-mule4|mule5)
++mule4|mule5|mule6)
+ 	EL_FILES="tc-is20.el"
+ 	ELC_FILES="tc-is20.elc"
+ 	NO_COMPILE_EL_FILES="tc-sysdep.el tc-is18.el tc-is19.el"
diff --git a/inputmethod/tc/patches/patch-ab b/inputmethod/tc/patches/patch-ab
new file mode 100644
index 00000000000..3a1048ab341
--- /dev/null
+++ b/inputmethod/tc/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2009/07/16 22:51:50 uebayasi Exp $
+
+--- configure.orig	2009-07-17 07:47:52.000000000 +0900
++++ configure
+@@ -1227,7 +1227,7 @@ mule1)
+ 	ELC_FILES="tc-is18.elc"
+ 	NO_COMPILE_EL_FILES="tc-sysdep.el tc-is19.el tc-is20.el"
+ 	;;
+-mule4|mule5)
++mule4|mule5|mule6)
+ 	EL_FILES="tc-is20.el"
+ 	ELC_FILES="tc-is20.elc"
+ 	NO_COMPILE_EL_FILES="tc-sysdep.el tc-is18.el tc-is19.el"
diff --git a/inputmethod/tc/patches/patch-ac b/inputmethod/tc/patches/patch-ac
new file mode 100644
index 00000000000..99b443b9db2
--- /dev/null
+++ b/inputmethod/tc/patches/patch-ac
@@ -0,0 +1,10 @@
+$NetBSD: patch-ac,v 1.1 2009/07/16 22:51:50 uebayasi Exp $
+
+--- lisp/guess.orig	2002-03-25 09:16:05.000000000 +0900
++++ lisp/guess
+@@ -13,4 +13,5 @@
+     ((string-match "^3.[0-9]" mule-version) "mule3")
+     ((string-match "^4.[0-9]" mule-version) "mule4")
+     ((string-match "^5.[0-9]" mule-version) "mule5")
++    ((string-match "^6.[0-9]" mule-version) "mule6")
+     (t "mule1"))))