(inputmethod/tc) New. Almost the same as tc-git, but w/ release tag.
authorMakoto Fujiwara (CF-SX2) <makoto@ki.nu>
Sun, 29 Jul 2018 02:21:21 +0000 (11:21 +0900)
committerMakoto Fujiwara (CF-SX2) <makoto@ki.nu>
Sun, 29 Jul 2018 02:23:51 +0000 (11:23 +0900)
24 files changed:
tc/DESCR [new file with mode: 0644]
tc/MESSAGE [new file with mode: 0644]
tc/Makefile [new file with mode: 0644]
tc/PLIST [new file with mode: 0644]
tc/TODO [new file with mode: 0644]
tc/distinfo [new file with mode: 0644]
tc/options.mk [new file with mode: 0644]
tc/patches/patch-BATCH-SORT [new file with mode: 0644]
tc/patches/patch-bushu-util_bushu2canna [new file with mode: 0644]
tc/patches/patch-bushu-util_where [new file with mode: 0644]
tc/patches/patch-configure.ac [new file with mode: 0644]
tc/patches/patch-doc_Makefile.am [new file with mode: 0644]
tc/patches/patch-etc_Makefile.am [new file with mode: 0644]
tc/patches/patch-etc_Makefile.in [new file with mode: 0644]
tc/patches/patch-etc_bushu.rev [new file with mode: 0644]
tc/patches/patch-etc_mk-bdic [new file with mode: 0644]
tc/patches/patch-lisp_Makefile.am [new file with mode: 0644]
tc/patches/patch-lisp_Makefile.in [new file with mode: 0644]
tc/patches/patch-lisp_eelll.el [new file with mode: 0644]
tc/patches/patch-lisp_tc-pre-base.in [new file with mode: 0644]
tc/patches/patch-lisp_tc-recover.el [new file with mode: 0644]
tc/patches/patch-lisp_tc-sysdep.el [new file with mode: 0644]
tc/patches/patch-mazegaki_Makefile.am [new file with mode: 0644]
tc/patches/patch-mazegaki_mkcertain.pl [new file with mode: 0644]

diff --git a/tc/DESCR b/tc/DESCR
new file mode 100644 (file)
index 0000000..3eb11a4
--- /dev/null
+++ b/tc/DESCR
@@ -0,0 +1,8 @@
+TC2 provides T-Code and TUT-Code input methods for Emacs users. T-Code
+and TUT-Code are called "Kanji Direct Input Method", and designed to be
+more efficient Japanese input method than Kana-Kanji translation.
+
+For more infomation, please look into these web sites.
+  T-Code   -> http://openlab.ring.gr.jp/tcode/index.html
+           -> http://groups.google.com/group/tcode
+  TUT-Code -> http://www.crew.sfc.keio.ac.jp/~chk/
diff --git a/tc/MESSAGE b/tc/MESSAGE
new file mode 100644 (file)
index 0000000..77d5f52
--- /dev/null
@@ -0,0 +1,16 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.2 2014/02/24 10:00:01 makoto Exp $
+;; (1) README file in Japanese is at ${PREFIX}/share/tc/README.euc.
+;;     Please note the email address mentioned is obsolete now.
+;; (2) setup file may be at ~/.tc and the sample is at
+;;    ${PREFIX}/share/examples/tc/sample.tc
+;;
+;; (3) You may have following line in Emacs init file.
+   (set-language-environment 'Japanese) ;; afraid of obsolete for recent
+   (require 'tc-setup)
+;; (4) You may need LANG environment set to ja_JP.UTF-8 on invocation
+;;     of emacs (check if merge-by-bushu (77) works or not).
+;; (5)  use C-\ to toggle Japanese/Alphanumeric input
+;; (6) Info at M-x info RET mT-code RET
+;; (7) The personal setting may be at the value of tcode-data-directory.
+===========================================================================
diff --git a/tc/Makefile b/tc/Makefile
new file mode 100644 (file)
index 0000000..da800de
--- /dev/null
@@ -0,0 +1,97 @@
+# $NetBSD: Makefile,v 1.7 2014/02/23 15:34:48 makoto Exp $
+
+DISTNAME=              tc-2.99.3
+PKGNAME=               ${EMACS_PKGNAME_PREFIX}${DISTNAME}
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=makoto-fujiwara/}
+CATEGORIES=            inputmethod
+
+MAINTAINER=            makoto@ki.nu
+HOMEPAGE=              http://openlab.ring.gr.jp/tcode/index.html
+COMMENT=               2-stroke non associative direct input for Kanji
+# tc is in GPL2, kw is unknown for the moment
+LICENSE=               gnu-gpl-v2
+
+INSTALLATION_DIRS=     ${EMACS_INFOPREFIX} \
+                       ${EMACS_LISPPREFIX}/${DISTNAME} \
+                       share/examples/tc
+
+EMACS_MODULES=         base
+
+# Instead of USE_TOOLS+=, avoid to conflict with autoconf
+USE_TOOLS=             aclocal automake autoconf gmake makeinfo
+GNU_CONFIGURE=         YES
+BUILD_DEPENDS+=                web2c-[0-9]*:../../print/web2c
+
+CONFIGURE_ARGS+=       ${CONFIGURE_ARGS.${EMACS_FLAVOR}}
+
+MAKEFLAGS+=            EMACS=${EMACS_BIN}
+MESSAGE_SUBST+=                LISPDIR=${EMACS_LISPPREFIX}
+INFO_FILES=            YES
+
+# fatal: unable to access 'http://github.com/kanchoku/tc.git/': SSL certificate problem: unable to get local issuer certificate
+# Add "-c http.sslVerify=false" to git command or,
+#PKGSRC_SETENV=                GIT_SSL_NO_VERIFY=true
+## With some condition, it pauses waiting for interaction:
+## Saving file /WRKOBJDIR/wip/tc-git/work/tc/etc/bushu.rev...
+
+#  For the target in etc/Makefile ->  bushu.expand bushu.index2: bushu.rev $(BATCH_SORT)
+MAKE_JOBS_SAFE=                no
+
+CONFIGURE_ARGS.emacs=  --with-lispdir=${EMACS_LISPPREFIX}/${DISTNAME}
+CONFIGURE_ARGS.emacs+= --datadir=${PREFIX}/share
+
+#.include "options.mk"
+PLIST_SUBST+=          DISTNAME=${DISTNAME}
+
+REPLACE_PERL+=         bushu-util/bushu2canna
+REPLACE_PERL+=         bushu-util/where
+REPLACE_PERL+=         mazegaki/mkcertain.pl
+
+# fix hardcoded PATH, interim solution, upstream fix may differ.
+# This edit should be applied before byte compile
+SUBST_CLASSES+=                tc-pre
+SUBST_MESSAGE.tc-pre=  Replacing tc-pre.el PATH /usr/loca/share to ${PREFIX}/share
+SUBST_STAGE.tc-pre=    pre-configure
+SUBST_FILES.tc-pre+=   lisp/tc-pre.el
+SUBST_SED.tc-pre+=     -e s\|/usr/local/share\|${PREFIX}/share\|g
+
+SUBST_CLASSES+=                texinfo
+SUBST_MESSAGE.texinfo= Fix problem: /usr/pkgsrc/wip/tc-git/work/tc/doc/-I does not exist!
+SUBST_STAGE.texinfo=   post-configure
+SUBST_FILES.texinfo=   doc/Makefile
+SUBST_SED.texinfo=     -e '/$$(MAKEINFO) $$(AM_MAKEINFOFLAGS) $$(MAKEINFOFLAGS) -I $$(srcdir)/s/-I $$(srcdir)/ -I. tc.texinfo ; echo disable following line /'
+
+# string-to-int to string-to-number
+SUBST_CLASSES+=                s2i
+SUBST_MESSAGE.s2i=     string-to-int is an obsolete function; use `string-to-number' instead
+SUBST_STAGE.s2i=       post-patch
+SUBST_FILES.s2i=       lisp/eelll.el lisp/tc-is22.el lisp/tc-is20.el lisp/tc-is19.el lisp/tc-pre.el
+SUBST_SED.s2i=         -e s/string-to-int/string-to-number/g
+
+.include "options.mk"
+
+pre-configure:
+               ( cd ${WRKSRC} && \
+               aclocal ;\
+               automake --add-missing; \
+               autoconf ; \
+               )
+# To avoid byte-compile error 'Invalid syntax ?', convert EUC-JP to UTF-8
+# Just one file is to be converted now,
+.if !empty(EMACS_TYPE:Memacs25) || \
+    !empty(EMACS_TYPE:Memacs26)
+post-patch:
+       (cd ${WRKSRC}/lisp; \
+       for i in tc-bushu.el;  \
+       do ${MV} $$i $$i.bak; \
+       iconv -f euc-jp -t utf-8 < $$i.bak >$$i ; \
+       done )
+.endif
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/README                ${DESTDIR}${PREFIX}/share/tc/README.euc
+       ${INSTALL_DATA} ${WRKSRC}/doc/manual.pdf        ${DESTDIR}${PREFIX}/share/tc
+       ${INSTALL_DATA} ${WRKSRC}/doc/sample.tc         ${DESTDIR}${PREFIX}/share/examples/tc
+
+.include "../../wip/emacs-git/modules.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/tc/PLIST b/tc/PLIST
new file mode 100644 (file)
index 0000000..4501222
--- /dev/null
+++ b/tc/PLIST
@@ -0,0 +1,95 @@
+@comment $NetBSD: PLIST,v 1.1 2013/01/22 13:54:21 makoto Exp $
+bin/tcinput
+info/tc.info
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/eelll.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/eelll.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-bitmap.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-bushu.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-bushu.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-complete.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-complete.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-help.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-help.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-image.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-image.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-inst.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-inst.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is18.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is18.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is19.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is19.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is20.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is20.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is22.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is22.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-ja-alnum.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-ja-alnum.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-jiscode.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-jiscode.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-mazegaki.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-mazegaki.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-mkmzdic.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-mkmzdic.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-pre.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-pre.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-setup.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-setup.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-stat.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-stat.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-sysdep.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-tbl.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-tbl.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-util.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-util.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/try-etbl.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/try-etbl.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/try-tbl.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/try-tbl.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-ltbl.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-ltbl.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-rtbl.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-rtbl.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-tbl.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-tbl.elc
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tutc-tbl.el
+${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tutc-tbl.elc
+share/examples/tc/sample.tc
+share/tc/EELLLTXT
+share/tc/EELLLTXT.tut
+share/tc/README.euc
+share/tc/bushu.expand
+share/tc/bushu.index2
+share/tc/bushu.rev
+share/tc/bushu2canna
+share/tc/ccdef.tcode
+share/tc/greece.maz
+share/tc/init.el
+share/tc/itaiji.maz
+share/tc/jukujiku.maz
+share/tc/load-path.el
+share/tc/manual.pdf
+share/tc/mazegaki.dic
+share/tc/mkcertain.pl
+share/tc/order.txt
+share/tc/parts.txt
+share/tc/pd_kihon.yom
+share/tc/skk-startup.el
+share/tc/symbol.rev
+share/tc/t1200.dat
+share/tc/t1353.dat
+share/tc/t225.dat
+share/tc/t300.dat
+share/tc/t400.dat
+share/tc/t450.dat
+share/tc/t575.dat
+share/tc/t675.dat
+share/tc/t900.dat
+share/tc/tc-bitmap-8x16
+share/tc/tc-ki2.el
+share/tc/tc-skki.el
+share/tc/tchars.txt
+share/tc/tcode.txt
+share/tc/want.txt
+share/tc/where
diff --git a/tc/TODO b/tc/TODO
new file mode 100644 (file)
index 0000000..b6b241f
--- /dev/null
+++ b/tc/TODO
@@ -0,0 +1,8 @@
+- Upstream code includes only upto emacs 24 (?)
+  .. it is kind of beyond packaging 
+  .. and may ignore for the moment.
+  
+- Which tc-is??.el is byte-compiled depends on emacs version
+  (incremental search needs by-version caring).
+  So fix PLIST variation on emacsen 20/21/22/23/24
+  .. meaning that working emacs version detection is necessary.
diff --git a/tc/distinfo b/tc/distinfo
new file mode 100644 (file)
index 0000000..4da9945
--- /dev/null
@@ -0,0 +1,23 @@
+$NetBSD: distinfo,v 1.9 2014/10/08 03:57:37 makoto Exp $
+
+SHA1 (tc-2.99.3.tar.gz) = 7212a46febc7eb5ef1beb44a950d7179bfb3696b
+RMD160 (tc-2.99.3.tar.gz) = bde546dc95bad875c62c57222e6733a75cf5215b
+SHA512 (tc-2.99.3.tar.gz) = 274cc5eb6a385cef6ae755af931a47acd56553e9be9a81345ade6d2d3dfae5ff864ab6fc4b27cb02fb7c08f014052c68f5dea93db299feadc95b5999b0afbd1e
+Size (tc-2.99.3.tar.gz) = 1115797 bytes
+SHA1 (patch-BATCH-SORT) = fed628d0f512638934ca16b4b7d0906d4be650c9
+SHA1 (patch-bushu-util_bushu2canna) = 9573de81b6f9ef7a225fc954b618f7905e648821
+SHA1 (patch-bushu-util_where) = 07bd3faf178ef57b9cc0afae20f56dbf83cc1d6d
+SHA1 (patch-configure.ac) = 4174e3674e2cc7dbb6daf5de56fa76f24273edf9
+SHA1 (patch-doc_Makefile.am) = fa69f7e5a4a49ad38479929549740f1c9e1a37fb
+SHA1 (patch-etc_Makefile.am) = 6deba811aa9aaa72feb9029c674277b4ad3ecb1b
+SHA1 (patch-etc_Makefile.in) = 7d4fa3c402ac7875ef147a1e37143cd0b94dd5cd
+SHA1 (patch-etc_bushu.rev) = 53259ef27da2b3e57ff9834957c8ee9b2fe4f833
+SHA1 (patch-etc_mk-bdic) = 37a5ed85e1bff4b06ac35ae2e3208fac977233ef
+SHA1 (patch-lisp_Makefile.am) = b80c93ae0ed60e8816a7cae452f5d300d9964781
+SHA1 (patch-lisp_Makefile.in) = 1bf559a29f2b186fa274fc5d7ce4289e6f6c3ba8
+SHA1 (patch-lisp_eelll.el) = c0fbebc9bfd444eadf5ff183978f618d961bbd8e
+SHA1 (patch-lisp_tc-pre-base.in) = 9b057ed2639f5badce5c1ee8ba20ad3229ff5108
+SHA1 (patch-lisp_tc-recover.el) = 8426353463fb59723597604e1cbbda30c635ee5a
+SHA1 (patch-lisp_tc-sysdep.el) = 28ad243d0d77ddb8e2325807e06a8df181508658
+SHA1 (patch-mazegaki_Makefile.am) = ee718aa68c9947f1a923dcad4211314ae219b0ce
+SHA1 (patch-mazegaki_mkcertain.pl) = d2b525316863aee93d2072b094adc45aba0fc55a
diff --git a/tc/options.mk b/tc/options.mk
new file mode 100644 (file)
index 0000000..31d9995
--- /dev/null
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2013/01/22 13:54:22 makoto Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.tc
+PKG_SUPPORTED_OPTIONS= enable-symbol-rev
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Menable-symbol-rev)
+# enable symbol.rev to be included in bushu.rev
+# This will get, for example,  upper arrow with UE(up) + YA(arrow)
+CONFIGURE_ARGS+=       --enable-symbol-rev
+.endif
diff --git a/tc/patches/patch-BATCH-SORT b/tc/patches/patch-BATCH-SORT
new file mode 100644 (file)
index 0000000..b7217dd
--- /dev/null
@@ -0,0 +1,54 @@
+$NetBSD: patch-BATCH-SORT,v 1.2 2013/12/15 14:21:09 makoto Exp $
+
+New file for the function batch-sort-file,
+for sorting data file in Emacs internal code order
+from shell batch execution.
+
+--- BATCH-SORT.orig    2012-04-12 23:11:23.000000000 +0900
++++ BATCH-SORT 2012-04-12 23:16:56.000000000 +0900
+@@ -0,0 +1,45 @@
++;;;  -*- emacs-lisp -*-
++;;; BATCH-SORT --- 
++
++;; Copyright (C) 2010,2012  Makoto Fujiwara
++
++;; Author: Makoto Fujiwara <makoto@ki.nu>
++;; Keywords: 
++
++;; This program is free software; you can redistribute it and/or modify
++;; it under the terms of the GNU General Public License as published by
++;; the Free Software Foundation, either version 3 of the License, or
++;; (at your option) any later version.
++
++;; This program is distributed in the hope that it will be useful,
++;; but WITHOUT ANY WARRANTY; without even the implied warranty of
++;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++;; GNU General Public License for more details.
++
++;; You should have received a copy of the GNU General Public License
++;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++;;; Commentary:
++
++;;; Code:
++(provide 'batch-sort-file)
++
++(load-file "../lisp/tc-recover.el") ; only for this compile
++(defun batch-sort-file ( )
++  "Just sort file, important thing is: done by emacs internal code order"
++   (interactive)
++   (set 'in_file                            (car command-line-args-left))
++   (set 'out_file                          (cadr command-line-args-left))
++   (set 'in_file_coding_system        (car (cddr command-line-args-left)))
++   (set 'out_file_coding_system  (car (cdr (cddr command-line-args-left))))
++   (message (concat 
++      " *** sorting `" in_file  " " in_file_coding_system 
++      "' to `"         out_file " " out_file_coding_system 
++      "' by internal code order"))
++   (setq coding-system-for-read (coding-system-from-name in_file_coding_system))
++   (insert-file-contents in_file)
++   (sort-lines nil (point-min) (point-max))
++   (setq coding-system-for-write (coding-system-from-name out_file_coding_system))
++   (write-file out_file)
++   )
++;;; BATCH-SORT ends here
diff --git a/tc/patches/patch-bushu-util_bushu2canna b/tc/patches/patch-bushu-util_bushu2canna
new file mode 100644 (file)
index 0000000..e9deb08
--- /dev/null
@@ -0,0 +1,12 @@
+$NetBSD: patch-bushu-util_bushu2canna,v 1.1 2013/01/22 13:54:22 makoto Exp $
+
+Interpreter fix
+
+--- bushu-util/bushu2canna.orig        2011-04-14 13:36:56.000000000 +0000
++++ bushu-util/bushu2canna
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl5
++#!@PERL@
+ $target = "bushu.select";
+ $target = shift if @ARGV;
diff --git a/tc/patches/patch-bushu-util_where b/tc/patches/patch-bushu-util_where
new file mode 100644 (file)
index 0000000..41aba07
--- /dev/null
@@ -0,0 +1,12 @@
+$NetBSD: patch-bushu-util_where,v 1.1 2013/01/22 13:54:22 makoto Exp $
+
+Interpreter fix
+
+--- bushu-util/where.orig      2011-04-14 13:36:56.000000000 +0000
++++ bushu-util/where
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl5
++#!@PERL@
+ require 5.000;
diff --git a/tc/patches/patch-configure.ac b/tc/patches/patch-configure.ac
new file mode 100644 (file)
index 0000000..b8d9452
--- /dev/null
@@ -0,0 +1,33 @@
+$NetBSD: patch-configure.ac,v 1.1 2013/01/22 13:54:22 makoto Exp $
+
+Add --enable-symbol-rev for configure (by mef@)
+
+--- configure.ac.orig  2011-04-16 11:35:11.000000000 +0900
++++ configure.ac       2011-04-16 16:51:55.000000000 +0900
+@@ -35,6 +35,18 @@
+   --with-lispdir=DIR      Emacs Lisp files in DIR,
+ lispdir=${withval})
++SYMBOLREV=no
++AC_ARG_ENABLE(symbol-rev,
++[AS_HELP_STRING([--enable-symbol-rev],
++                [Includes symbol.rev in bushu.rev Default: none])],
++if test "${enableval}" = "yes"; then
++  SYMBOLREV=yes
++else
++  SYMBOLREV=no
++fi
++)
++  AC_MSG_RESULT(checking symbol-rev .. ${SYMBOLREV})
++
+ dnl AC_ARG_WITH(makeinfo,dnl
+ dnl   --with-makeinfo         Specify how to build info files,
+ dnl  [ MAKEINFO="$withval" ])
+@@ -63,6 +75,7 @@
+ AC_SUBST(EMACS_PACKAGE_DIR)
+ AC_SUBST(MAKEINFO)
+ AC_SUBST(EMACS)
++AC_SUBST(SYMBOLREV)
+ AC_SUBST(INSTALL)
+ AC_SUBST(INSTALLINFO)
+ INSTALL_SCRIPT=$INSTALL
diff --git a/tc/patches/patch-doc_Makefile.am b/tc/patches/patch-doc_Makefile.am
new file mode 100644 (file)
index 0000000..61d0919
--- /dev/null
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Disable generating manual in pdf
+
+--- doc/Makefile.am.orig       2018-06-23 21:13:47.982109206 +0900
++++ doc/Makefile.am    2018-06-23 21:17:30.011571953 +0900
+@@ -9,12 +9,12 @@ TEXINFO_TEX = no-texinfo.tex
+ MAKEINFO = $(EMACS) -q -no-site-file -batch -l texinfmt -f batch-texinfo-format
+-all: manual.pdf
++all:
+ manual.pdf: tc.texinfo
+-      ptex tc.texinfo
+-      $(EMACS) -q -no-site-file -batch -l $(srcdir)/texindex.el \
+-              -f batch-texindex tc.cp tc.cp tc.fn tc.ky tc.tp tc.vr
+-      ptex tc.texinfo
+-      mv tc.dvi manual.dvi
+-      dvipdfm manual.dvi
++      echo tc.texinfo
++#     $(EMACS) -q -no-site-file -batch -l $(srcdir)/texindex.el \
++#             -f batch-texindex tc.cp tc.cp tc.fn tc.ky tc.tp tc.vr
++#     ptex tc.texinfo
++#     mv tc.dvi manual.dvi
++#     dvipdfm manual.dvi
diff --git a/tc/patches/patch-etc_Makefile.am b/tc/patches/patch-etc_Makefile.am
new file mode 100644 (file)
index 0000000..3d31b26
--- /dev/null
@@ -0,0 +1,38 @@
+$NetBSD: patch-etc_Makefile.am,v 1.5 2014/10/08 03:57:37 makoto Exp $
+
+(1) To merge sybmol.rev (if configured with --enable-symbol-rev)
+(2) To sort bushu.exand by emacs-internal-code order
+(3) Please note beginning with # line seems to be important.
+    Don't remove the line without testing functionality, thanks.
+
+--- etc/Makefile.am.orig       2013-12-21 11:19:49.000000000 +0900
++++ etc/Makefile.am    2014-02-21 10:58:26.000000000 +0900
+@@ -4,11 +4,25 @@ DISTDATA = EELLLTXT EELLLTXT.tut bushu.r
+ pkgdata_DATA = $(DISTDATA) bushu.expand bushu.index2
+ EXTRA_DIST = $(DISTDATA) mk-bdic
++BATCH_SORT    = ../BATCH-SORT
++RM            = ${RM}
+-bushu.expand bushu.index2: bushu.rev
++bushu.expand bushu.index2: bushu.rev $(BATCH_SORT)
++      @echo ' *** Taking care bushu.rev and sorting it'
++      @if [ .${SYMBOLREV} = ."yes" ]; then \
++      cat bushu.rev symbol.rev > bushu.rev.tmp ;\
++      echo ' *** symbol.rev will be included in bushu.rev ***'; \
++      else \
++      mv bushu.rev bushu.rev.tmp ;\
++      echo ' *** symbol.rev will NOT be included in bushu.rev ***'; \
++      fi
++      $(EMACS) -q -no-site-file -batch -l $(BATCH_SORT) -f batch-sort-file bushu.rev.tmp bushu.rev euc-japan euc-japan
++#     $(EMACS) -q -no-site-file -batch -l $(BATCH_SORT) -f batch-sort-file bushu.rev.tmp bushu.rev utf-8 utf-8 
++      @echo ''
+       @echo '*** compiling bushu dictionary ***'
+       @echo '*** this may take a few minutes ***'
+-      $(EMACS) -q -no-site-file -batch -l $(srcdir)/mk-bdic
++      $(EMACS) -q -no-site-file -batch -l $(srcdir)/mk-bdic -f mk-bdic
++      @echo ' *** compiling bushu dictionary done  ***'
+ clean:
+-      $(RM) bushu.expand bushu.index2
++      $(RM) -f bushu.expand bushu.index2
diff --git a/tc/patches/patch-etc_Makefile.in b/tc/patches/patch-etc_Makefile.in
new file mode 100644 (file)
index 0000000..7975cd9
--- /dev/null
@@ -0,0 +1,47 @@
+$NetBSD: patch-etc_Makefile.in,v 1.2 2013/04/08 23:35:31 makoto Exp $
+
+Supporting to add following argment for configure.
+ --enable-symbol-rev 
+--- etc/Makefile.in.orig       2013-02-28 06:23:19.000000000 +0900
++++ etc/Makefile.in    2018-07-29 10:52:41.946584874 +0900
+@@ -159,6 +159,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
+ SET_MAKE = @SET_MAKE@
+ SHELL = /bin/sh
+ STRIP = @STRIP@
++SYMBOLREV = @SYMBOLREV@
+ TEXI2HTML = @TEXI2HTML@
+ TEXI2HTML_FLAGS = @TEXI2HTML_FLAGS@
+ VERSION = @VERSION@
+@@ -208,6 +209,8 @@ top_srcdir = @top_srcdir@
+ DISTDATA = EELLLTXT EELLLTXT.tut bushu.rev symbol.rev tc-bitmap-8x16
+ pkgdata_DATA = $(DISTDATA) bushu.expand bushu.index2
+ EXTRA_DIST = $(DISTDATA) mk-bdic
++BATCH_SORT = ../BATCH-SORT
++RM = ${RM}
+ all: all-am
+ .SUFFIXES:
+@@ -415,9 +418,19 @@ uninstall-am: uninstall-pkgdataDATA
+       uninstall-pkgdataDATA
+-bushu.expand bushu.index2: bushu.rev
+-      @echo '*** compiling bushu dictionary ***'
+-      @echo '*** this may take a few minutes ***'
++bushu.expand bushu.index2: bushu.rev $(BATCH_SORT)
++      @echo ' *** Taking care bushu.rev and sorting it'
++      @if [ .${SYMBOLREV} = ."yes" ]; then \
++      cat bushu.rev symbol.rev > bushu.rev.tmp ;\
++      echo ' *** symbol.rev will be included in bushu.rev ***'; \
++      else \
++      mv bushu.rev bushu.rev.tmp ;\
++      echo ' *** symbol.rev will NOT be included in bushu.rev ***'; \
++      fi
++      $(EMACS) -q -no-site-file -batch -l $(BATCH_SORT) -f batch-sort-file bushu.rev.tmp bushu.rev euc-japan euc-japan 
++      ls -l bushu.rev*
++      @echo ' *** compiling bushu dictionary ***'
++      @echo ' *** this may take a few minutes ***'
+       $(EMACS) -q -no-site-file -batch -l $(srcdir)/mk-bdic
+ clean:
diff --git a/tc/patches/patch-etc_bushu.rev b/tc/patches/patch-etc_bushu.rev
new file mode 100644 (file)
index 0000000..3d7043b
--- /dev/null
@@ -0,0 +1,23 @@
+$NetBSD: patch-etc_bushu.rev,v 1.1 2013/01/22 13:54:22 makoto Exp $
+
+Just adding few entries for combination.
+
+--- etc/bushu.rev.orig 2011-04-24 20:50:27.000000000 +0900
++++ etc/bushu.rev      2011-04-24 21:04:34.000000000 +0900
+@@ -594,6 +594,7 @@
+ ¶å²µÐ¨
+ ¶æ¥¤¶ñ
+ ¶ç¸ýÒ±
++ä£ÃݽÜ
+ ¶èÒ¹¥á
+ ¶éÆȶç
+ ¶ê²¦µ×
+@@ -4184,7 +4185,7 @@
+ ßå²ÐÔö
+ ßæô¦1
+ ßçШô¦
+-ßèÆü¶ç
++ßè¶çÅÀ
+ ßéÒ©´Ý
+ ßê²Ð¹Ä
+ ßë²Ðà©
diff --git a/tc/patches/patch-etc_mk-bdic b/tc/patches/patch-etc_mk-bdic
new file mode 100644 (file)
index 0000000..138337e
--- /dev/null
@@ -0,0 +1,20 @@
+$NetBSD: patch-etc_mk-bdic,v 1.2 2013/12/23 03:13:49 makoto Exp $
+
+Make it as a function shape, otherwise just loading may
+stall at completion
+
+--- etc/mk-bdic.orig   2013-12-23 11:26:57.000000000 +0900
++++ etc/mk-bdic        2013-12-23 12:09:25.000000000 +0900
+@@ -1,4 +1,6 @@
+ ; -*-emacs-lisp-*-
++(provide 'mk-bdic)
++(defun mk-bdic ()
+ (and (fboundp 'set-language-environment)
+      (set-language-environment "Japanese"))
+ (setq load-path (cons "../lisp" load-path))
+@@ -15,4 +17,4 @@
+     (tcode-bushu-init 999))
+   (tcode-save-dictionaries)
+   (message "making bushu dictionary...done"))
+-(kill-emacs)
++)
diff --git a/tc/patches/patch-lisp_Makefile.am b/tc/patches/patch-lisp_Makefile.am
new file mode 100644 (file)
index 0000000..87803ba
--- /dev/null
@@ -0,0 +1,29 @@
+$NetBSD: patch-lisp_Makefile.am,v 1.2 2013/04/09 01:03:46 makoto Exp $
+
+(1) This patch is reference only, not actually used.
+(2) automake on this directory won't be run with usual make package
+    This may be used to generate Makefile.in file
+
+--- lisp/Makefile.am.orig      2013-04-09 09:02:41.000000000 +0900
++++ lisp/Makefile.am   2013-04-09 09:56:41.000000000 +0900
+@@ -10,9 +10,9 @@ COMMON_EL_FILES = tc-setup.el tc.el tc-h
+       tc-inst.el tc-stat.el tc-ja-alnum.el \
+       try-tbl.el try-etbl.el ttc-tbl.el ttc-rtbl.el ttc-ltbl.el
+-lisp_LISP = tc-sysdep.el $(COMMON_EL_FILES) tc-is18.el tc-is19.el tc-is20.el tc-is22.el \
++lisp_LISP =              $(COMMON_EL_FILES) tc-is18.el tc-is19.el tc-is20.el tc-is22.el \
+       tc-image.el tc-mkmzdic.el $(PREFILE)
+-lisp_DATA = tc-bitmap.el
++lisp_DATA = tc-bitmap.el tc-sysdep.el
+ ELCFILES = compile.log
+ noinst_LISP = make-elc guess tc-pre-base
+@@ -26,7 +26,7 @@ compile.log: $(PREFILE)
+       $(SHELL) add-site-info tc-pre-base $(PREFILE) \
+               "@datadir@/@PACKAGE@/"
+       $(EMACS) -q -no-site-file -batch -l $(srcdir)/make-elc \
+-              $(COMMON_EL_FILES) $(EL_FILES) 2> compile.log
++              $(COMMON_EL_FILES) $(EL_FILES) $(lisp_LISP) 2> compile.log
+ clean-generic:
+       rm -f *.elc $(PREFILE)
diff --git a/tc/patches/patch-lisp_Makefile.in b/tc/patches/patch-lisp_Makefile.in
new file mode 100644 (file)
index 0000000..336cda1
--- /dev/null
@@ -0,0 +1,32 @@
+$NetBSD: patch-lisp_Makefile.in,v 1.2 2013/04/09 01:03:46 makoto Exp $
+
+(1) lisp_LISP the list of *.el to be compiled
+(2) lisp_DATA not to be compiled
+
+Automake won't run on this directory, so not only Makefile.am
+but this Makefile.in should be patched the same way
+
+--- lisp/Makefile.in.orig      2013-04-09 09:02:41.000000000 +0900
++++ lisp/Makefile.in   2013-04-09 09:59:07.000000000 +0900
+@@ -243,10 +243,10 @@ COMMON_EL_FILES = tc-setup.el tc.el tc-h
+       tc-inst.el tc-stat.el tc-ja-alnum.el \
+       try-tbl.el try-etbl.el ttc-tbl.el ttc-rtbl.el ttc-ltbl.el
+-lisp_LISP = tc-sysdep.el $(COMMON_EL_FILES) tc-is18.el tc-is19.el tc-is20.el tc-is22.el \
++lisp_LISP =              $(COMMON_EL_FILES) tc-is18.el tc-is19.el tc-is20.el tc-is22.el \
+       tc-image.el tc-mkmzdic.el $(PREFILE)
+-lisp_DATA = tc-bitmap.el
++lisp_DATA = tc-bitmap.el tc-sysdep.el 
+ ELCFILES = compile.log
+ noinst_LISP = make-elc guess tc-pre-base
+ EXTRA_DIST = $(lisp_LISP) $(noinst_LISP) add-site-info
+@@ -561,7 +561,7 @@ compile.log: $(PREFILE)
+       $(SHELL) add-site-info tc-pre-base $(PREFILE) \
+               "@datadir@/@PACKAGE@/"
+       $(EMACS) -q -no-site-file -batch -l $(srcdir)/make-elc \
+-              $(COMMON_EL_FILES) $(EL_FILES) 2> compile.log
++              $(COMMON_EL_FILES) $(EL_FILES) $(lisp_LISP) 2> compile.log
+ clean-generic:
+       rm -f *.elc $(PREFILE)
diff --git a/tc/patches/patch-lisp_eelll.el b/tc/patches/patch-lisp_eelll.el
new file mode 100644 (file)
index 0000000..b361d31
--- /dev/null
@@ -0,0 +1,24 @@
+$NetBSD: patch-lisp_eelll.el,v 1.1 2013/12/15 14:21:09 makoto Exp $
+
+Replace obsolete variable
+
+--- lisp/eelll.el.orig 2013-12-15 14:31:48.000000000 +0900
++++ lisp/eelll.el      2013-12-15 15:06:25.000000000 +0900
+@@ -361,7 +361,7 @@ 
+         (setq j (1+ j) k 0)
+         (while (< k 5)
+           (setq k (1+ k))
+-          (insert "¡¾¡¾¡¾¡¾¡¾  ")
++          (insert "°ì°ì°ì°ì°ì  ")
+           (if (= k c) (insert "  ")))
+         (delete-horizontal-space)
+         (insert "\n"))
+@@ -1000,7 +1000,7 @@
+   (interactive)
+   (save-excursion
+     (set-buffer " *eelll: strokes*")
+-    (insert (char-to-string last-command-char)))
++    (insert (char-to-string last-command-event)))
+   (if eelll-move-cursor
+       (insert " ")))
diff --git a/tc/patches/patch-lisp_tc-pre-base.in b/tc/patches/patch-lisp_tc-pre-base.in
new file mode 100644 (file)
index 0000000..7726faa
--- /dev/null
@@ -0,0 +1,31 @@
+$NetBSD$
+
+(1) string-to-int is an obsolete function; use `string-to-number' instead
+
+(2) use tc-is22 for emacs26 too
+
+--- ./lisp/tc-pre-base.in.orig 2016-03-21 18:53:18.000000000 +0900
++++ ./lisp/tc-pre-base.in      2016-12-23 21:48:21.000000000 +0900
+@@ -26,10 +26,10 @@
+   (cond ((string-match "XEmacs" emacs-version)
+        'xemacs)
+       ((and (boundp 'mule-version)
+-            (>= (string-to-int mule-version) 4))
++            (>= (string-to-number mule-version) 4))
+        'mule-4)
+       ((and (boundp 'mule-version)
+-            (= (string-to-int mule-version) 3))
++            (= (string-to-number mule-version) 3))
+        'mule-3)
+       ((numberp (string-match "^19" emacs-version))
+        'mule-2)
+@@ -47,7 +47,8 @@
+        'tc-is18)
+       ((memq tcode-emacs-version '(mule-1 mule-2 mule-3 xemacs))
+        'tc-is19)
+-      ((numberp (string-match "^22" emacs-version))
++      ((or (numberp (string-match "^22" emacs-version))
++           (numberp (string-match "^26" emacs-version)) )
+        'tc-is22)
+       (t
+        'tc-is20))
diff --git a/tc/patches/patch-lisp_tc-recover.el b/tc/patches/patch-lisp_tc-recover.el
new file mode 100644 (file)
index 0000000..861773a
--- /dev/null
@@ -0,0 +1,54 @@
+$NetBSD: patch-lisp_tc-recover.el,v 1.1 2013/12/15 14:21:09 makoto Exp $
+
+Fix following problem
+  Emacs-20 (20.7) -> Symbol's function definition is void: coding-system-from-name
+  Emacs-21 (21.4) -> Symbol's function definition is void: coding-system-from-name
+  Emacs-22 (22.3) -> Symbol's function definition is void: coding-system-from-name
+This file is used only when byte compile of BATCH-SORT, and not to be installed.
+
+--- /dev/null  2013-12-15 21:37:29.000000000 +0900
++++ lisp/tc-recover.el 2013-12-15 21:42:13.000000000 +0900
+@@ -0,0 +1,43 @@
++;; tc-recover.el
++;; For Emacs-23.0-Versions before 2009-01-27.
++;; CVSWeb URLs:
++;; http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/mule-cmds.el?cvsroot=emacs&r1=1.355&r2=1.356
++(when (not (and (fboundp 'canonicalize-coding-system-name)
++                (fboundp 'coding-system-from-name)))
++  ;; Canonicalize the coding system name NAME by removing some prefixes
++  ;; and delimiter characters. Support function of
++  ;; coding-system-from-name.
++  (defun canonicalize-coding-system-name (name)
++    (if (string-match "^iso[-_ ]?[0-9]" name)
++        ;; "iso-8859-1" -> "8859-1", "iso-2022-jp" ->"2022-jp"
++        (setq name (substring name (1- (match-end 0)))))
++    (let ((idx (string-match "[-_ /]" name)))
++      ;; Delete "-", "_", " ", "/" but do distinguish "16-be" and "16be".
++      (while idx
++        (if (and (>= idx 2)
++                 (eq (string-match "16-[lb]e$" name (- idx 2))
++                     (- idx 2)))
++            (setq idx (string-match "[-_ /]" name (match-end 0)))
++          (setq name (concat (substring name 0 idx) (substring name (1+ idx)))
++                idx (string-match "[-_ /]" name idx))))
++      name))
++
++  (defun coding-system-from-name (name)
++    "Return a coding system whose name matches with NAME (string or symbol)."
++    (let (sym)
++      (if (stringp name) (setq sym (intern name))
++        (setq sym name name (symbol-name name)))
++      (if (coding-system-p sym)
++          sym
++        (let ((eol-type
++               (if (string-match "-\\(unix\\|dos\\|mac\\)$" name)
++                   (prog1 (intern (match-string 1 name))
++                     (setq name (substring name 0 (match-beginning 0)))))))
++          (setq name (canonicalize-coding-system-name (downcase name)))
++          (catch 'tag
++            (dolist (elt (coding-system-list))
++              (if (string= (canonicalize-coding-system-name (symbol-name elt))
++                           name)
++                  (throw 'tag (if eol-type (coding-system-change-eol-conversion
++                                            elt eol-type)
++                                elt))))))))))
diff --git a/tc/patches/patch-lisp_tc-sysdep.el b/tc/patches/patch-lisp_tc-sysdep.el
new file mode 100644 (file)
index 0000000..fce1277
--- /dev/null
@@ -0,0 +1,17 @@
+$NetBSD: patch-lisp_tc-sysdep.el,v 1.1 2013/01/22 13:54:22 makoto Exp $
+(1)
+ To work with emacs-25 or later
+ You will get following error if C-s tried for incremental search.
+ Symbol's function definition is void: isearch-last-command-char
+
+--- lisp/tc-sysdep.el.orig     2013-02-28 06:23:19.000000000 +0900
++++ lisp/tc-sysdep.el  2018-07-29 10:53:30.585699444 +0900
+@@ -228,7 +228,7 @@ BODY should be a list of lisp expression
+ ;;;
+ ;;; Fix incompatibilities between 18 and 19.
+ ;;;
+-(if (string-match "^\\(19\\|2[01234]\\)" emacs-version)
++(if (string-match "^\\(19\\|2[0-9]\\)" emacs-version)
+     (progn
+       (defun tcode-redo-command (ch)
+       "¥­¡¼ CH ¤ò¸½ºß¤Î¥­¡¼¥Þ¥Ã¥×¤ÇºÆ¼Â¹Ô¤¹¤ë"
diff --git a/tc/patches/patch-mazegaki_Makefile.am b/tc/patches/patch-mazegaki_Makefile.am
new file mode 100644 (file)
index 0000000..9c233d8
--- /dev/null
@@ -0,0 +1,21 @@
+$NetBSD: patch-mazegaki_Makefile.am,v 1.1 2013/01/22 13:54:22 makoto Exp $
+
+To sort mazegaki.dic in emacs-internal-code order
+
+--- mazegaki/Makefile.am.orig  2011-04-16 11:35:10.000000000 +0900
++++ mazegaki/Makefile.am       2011-04-16 21:34:16.000000000 +0900
+@@ -14,11 +14,14 @@
+              $(DISTDATA)
+ DICS = greece.maz jukujiku.maz itaiji.maz
++BATCH_SORT       = ../BATCH-SORT
+ RM = /bin/rm
+ mazegaki.dic: $(DICS)
+       $(RM) -f $@
+       $(EMACS) -q -no-site-file -batch -l $(srcdir)/mk-mzdic
++      mv mazegaki.dic mazegaki.dic.tmp
++      $(EMACS) -q -no-site-file -batch -l $(BATCH_SORT) -f batch-sort-file mazegaki.dic.tmp mazegaki.dic euc-japan euc-japan
+ # pd_kihon.yom: step1
+ #     ./step2.pl
diff --git a/tc/patches/patch-mazegaki_mkcertain.pl b/tc/patches/patch-mazegaki_mkcertain.pl
new file mode 100644 (file)
index 0000000..1515c60
--- /dev/null
@@ -0,0 +1,12 @@
+$NetBSD: patch-mazegaki_mkcertain.pl,v 1.1 2013/01/22 13:54:22 makoto Exp $
+
+Interpreter fix
+
+--- mazegaki/mkcertain.pl.orig 2011-04-14 14:10:06.000000000 +0000
++++ mazegaki/mkcertain.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl5
++#!@PERL@
+ use Term::Cap;
+ use Term::Complete;