(tc-git/{distinfo, patches}) (1) add missing entry (2) convert patch for lisp/tc-pre.el to lisp/tc-pre-base.in

[Makoto Fujiwara (CF-S9) <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara (CF-S9) <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Sat Dec 24 12:22:43 2016 +0900
Changeset:	5f7debee3d8eeee279c15b2c2bd38897e0060a69

Modified Files:
	tc-git/distinfo
Added Files:
	tc-git/patches/patch-lisp_tc-pre-base.in
Removed Files:
	tc-git/patches/patch-lisp_tc-pre.el

Log Message:
(tc-git/{distinfo, patches}) (1) add missing entry (2) convert patch for lisp/tc-pre.el to lisp/tc-pre-base.in

  (1) Don't know why, but one entry for 'patch-etc_Makefile.in' was missing
  (2) Convert patch-lisp_tc-pre.el to patches/patch-lisp_tc-pre-base.in

  Now tested on emacs25 and emacs26 (string-to-int is the keyword)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5f7debee3d8eeee279c15b2c2bd38897e0060a69

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tc-git/distinfo                          |  3 ++-
 tc-git/patches/patch-lisp_tc-pre-base.in | 25 +++++++++++++++++++++++++
 tc-git/patches/patch-lisp_tc-pre.el      | 15 ---------------
 3 files changed, 27 insertions(+), 16 deletions(-)

diffs:
diff --git a/tc-git/distinfo b/tc-git/distinfo
index 581a818..503afba 100644
--- a/tc-git/distinfo
+++ b/tc-git/distinfo
@@ -5,12 +5,13 @@ SHA1 (patch-bushu-util_bushu2canna) = 9573de81b6f9ef7a225fc954b618f7905e648821
 SHA1 (patch-bushu-util_where) = 07bd3faf178ef57b9cc0afae20f56dbf83cc1d6d
 SHA1 (patch-configure.ac) = 4174e3674e2cc7dbb6daf5de56fa76f24273edf9
 SHA1 (patch-etc_Makefile.am) = 368d4cc39ca7572dd3a1bb632e4ded3046cf2c42
+SHA1 (patch-etc_Makefile.in) = 5d17622136ce9960dcc5dc43f4763d3e315241b1
 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.el) = 200e958583bfb162df6e57d45d06289813d4cdda
+SHA1 (patch-lisp_tc-pre-base.in) = 233b8b98ed5efc073e9f01aaae5a693cdef63155
 SHA1 (patch-lisp_tc-recover.el) = 8426353463fb59723597604e1cbbda30c635ee5a
 SHA1 (patch-lisp_tc-sysdep.el) = c55322a844fe8a055c3274d5e392918ea360c9e0
 SHA1 (patch-mazegaki_Makefile.am) = ee718aa68c9947f1a923dcad4211314ae219b0ce
diff --git a/tc-git/patches/patch-lisp_tc-pre-base.in b/tc-git/patches/patch-lisp_tc-pre-base.in
new file mode 100644
index 0000000..4b0c022
--- /dev/null
+++ b/tc-git/patches/patch-lisp_tc-pre-base.in
@@ -0,0 +1,25 @@
+--- /export/WRKOBJDIR/wip/tc-git/work/tc/lisp/tc-pre-base.in.orig	2016-03-21 18:53:18.000000000 +0900
++++ /export/WRKOBJDIR/wip/tc-git/work/tc/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-git/patches/patch-lisp_tc-pre.el b/tc-git/patches/patch-lisp_tc-pre.el
deleted file mode 100644
index fcc864c..0000000
--- a/tc-git/patches/patch-lisp_tc-pre.el
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lisp_tc-pre.el,v 1.1 2013/01/22 13:54:22 makoto Exp $
-
-One line left as old version, fix.
-
---- lisp/tc-pre.el.orig	2012-08-06 23:22:57.000000000 +0900
-+++ lisp/tc-pre.el	2012-08-06 23:21:29.000000000 +0900
-@@ -95,7 +95,7 @@
- 
- ;;;; Version
- 
--(defconst tcode-version "2.3.1")
-+(defconst tcode-version "3.0")
- 
- (defun tcode-version ()
-   "T$B%3!<%IF~NO4D6-$N%P!<%8%g%s$rI=<($9$k!#(B"