Wed Oct 23 14:02:00 2019 UTC ()
(inputmethod/tc) Fix build for new emacs, 25-26


(mef)
diff -r1.19 -r1.20 pkgsrc/inputmethod/tc/Makefile
diff -r1.6 -r1.7 pkgsrc/inputmethod/tc/distinfo
diff -r1.3 -r1.4 pkgsrc/inputmethod/tc/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/inputmethod/tc/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/inputmethod/tc/patches/patch-ac
cvs diff -r1.19 -r1.20 pkgsrc/inputmethod/tc/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/tc/Makefile 2013/04/06 20:27:21 1.19
+++ pkgsrc/inputmethod/tc/Makefile 2019/10/23 14:01:59 1.20
@@ -1,27 +1,38 @@ @@ -1,27 +1,38 @@
1# $NetBSD: Makefile,v 1.19 2013/04/06 20:27:21 rodent Exp $ 1# $NetBSD: Makefile,v 1.20 2019/10/23 14:01:59 mef Exp $
2# 2#
3 3
4DISTNAME= tc-2.3.1 4DISTNAME= tc-2.3.1
5PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} 5PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
6PKGREVISION= 4 6PKGREVISION= 4
7CATEGORIES= japanese inputmethod 7CATEGORIES= japanese inputmethod
8MASTER_SITES= http://openlab.ring.gr.jp/tcode/resources/soft/ 8MASTER_SITES= http://openlab.ring.gr.jp/tcode/resources/soft/
9 9
10MAINTAINER= tech-pkg-ja@jp.NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://openlab.ring.gr.jp/tcode/tc2/index.html 11HOMEPAGE= http://openlab.ring.gr.jp/tcode/tc2/index.html
12COMMENT= T-Code driver for Emacs 12COMMENT= T-Code driver for Emacs
 13LICENSE= gnu-gpl-v2
13 14
14MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
 16SUBST_CLASSES+= string-to-int
 17SUBST_STAGE.string-to-int= pre-configure
 18SUBST_FILES.string-to-int= \
 19 lisp/eelll.el \
 20 lisp/tc-is19.el \
 21 lisp/tc-is20.el \
 22 lisp/tc-pre-base \
 23 lisp/tc-pre-base.in \
 24 lisp/tc-pre.el
 25SUBST_SED.string-to-int= -e 's/string-to-int/string-to-number/'
15 26
16.include "../../editors/emacs/modules.mk" 27.include "../../editors/emacs/modules.mk"
17 28
18.if ${EMACS_FLAVOR} == "xemacs" 29.if ${EMACS_FLAVOR} == "xemacs"
19CONFIGURE_ARGS+=--with-emacs=xemacs 30CONFIGURE_ARGS+=--with-emacs=xemacs
20CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX}/tc 31CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX}/tc
21.endif 32.endif
22 33
23USE_TOOLS+= gmake 34USE_TOOLS+= gmake
24GNU_CONFIGURE= YES 35GNU_CONFIGURE= YES
25INFO_FILES= yes 36INFO_FILES= yes
26 37
27.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/inputmethod/tc/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/tc/distinfo 2015/11/03 22:13:40 1.6
+++ pkgsrc/inputmethod/tc/distinfo 2019/10/23 14:01:59 1.7
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.6 2015/11/03 22:13:40 agc Exp $ 1$NetBSD: distinfo,v 1.7 2019/10/23 14:01:59 mef Exp $
2 2
3SHA1 (tc-2.3.1.tar.gz) = 7eb55134581b83692ea6deb10c227232d0c8df4d 3SHA1 (tc-2.3.1.tar.gz) = 7eb55134581b83692ea6deb10c227232d0c8df4d
4RMD160 (tc-2.3.1.tar.gz) = 4364a4e14c710e68d714146da3545d928b87bf52 4RMD160 (tc-2.3.1.tar.gz) = 4364a4e14c710e68d714146da3545d928b87bf52
5SHA512 (tc-2.3.1.tar.gz) = c4ddcbf03fc4acfbcad836f1a1b63263dfa1436ba0359861fcde8b32a4d438c7a1542a10ddb37a971ebb66db5d18578ec66e8fdaf2038bc50eb2bea6d01ad722 5SHA512 (tc-2.3.1.tar.gz) = c4ddcbf03fc4acfbcad836f1a1b63263dfa1436ba0359861fcde8b32a4d438c7a1542a10ddb37a971ebb66db5d18578ec66e8fdaf2038bc50eb2bea6d01ad722
6Size (tc-2.3.1.tar.gz) = 798831 bytes 6Size (tc-2.3.1.tar.gz) = 798831 bytes
7SHA1 (patch-aa) = 016ccc19211b9b87e81a3fa743f69e607cf643fa 7SHA1 (patch-aa) = cc227ae107772c8ab4e380ac85f09f79fed7a15d
8SHA1 (patch-ab) = 9708d7db6da3ed1b7c0c74a6e1eda288570ba0e7 8SHA1 (patch-ab) = 7754225f8f09ac8dc3e4a4e3d0dda63315641ea3
9SHA1 (patch-ac) = f9cb2f43a2d94b653ffd5f207290b5d9252c83bc 9SHA1 (patch-ac) = 388e127cb055b01a4ddedc0dd9181f53b5a1b345
cvs diff -r1.3 -r1.4 pkgsrc/inputmethod/tc/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/inputmethod/tc/patches/patch-aa 2009/07/16 22:51:50 1.3
+++ pkgsrc/inputmethod/tc/patches/patch-aa 2019/10/23 14:02:00 1.4
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-aa,v 1.3 2009/07/16 22:51:50 uebayasi Exp $ 1$NetBSD: patch-aa,v 1.4 2019/10/23 14:02:00 mef Exp $
 2
 3support new mules
2 4
3--- acinclude.m4.orig 2002-03-25 09:15:51.000000000 +0900 5--- acinclude.m4.orig 2002-03-25 09:15:51.000000000 +0900
4+++ acinclude.m4 6+++ acinclude.m4
5@@ -50,7 +50,7 @@ mule1) 7@@ -50,7 +50,7 @@ mule1)
6 ELC_FILES="tc-is18.elc" 8 ELC_FILES="tc-is18.elc"
7 NO_COMPILE_EL_FILES="tc-sysdep.el tc-is19.el tc-is20.el" 9 NO_COMPILE_EL_FILES="tc-sysdep.el tc-is19.el tc-is20.el"
8 ;; 10 ;;
9-mule4|mule5) 11-mule4|mule5)
10+mule4|mule5|mule6) 12+mule4|mule5|mule6)
11 EL_FILES="tc-is20.el" 13 EL_FILES="tc-is20.el"
12 ELC_FILES="tc-is20.elc" 14 ELC_FILES="tc-is20.elc"
13 NO_COMPILE_EL_FILES="tc-sysdep.el tc-is18.el tc-is19.el" 15 NO_COMPILE_EL_FILES="tc-sysdep.el tc-is18.el tc-is19.el"
cvs diff -r1.3 -r1.4 pkgsrc/inputmethod/tc/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/inputmethod/tc/patches/patch-ab 2009/07/16 22:51:50 1.3
+++ pkgsrc/inputmethod/tc/patches/patch-ab 2019/10/23 14:02:00 1.4
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ab,v 1.3 2009/07/16 22:51:50 uebayasi Exp $ 1$NetBSD: patch-ab,v 1.4 2019/10/23 14:02:00 mef Exp $
 2
 3support for new mules
2 4
3--- configure.orig 2009-07-17 07:47:52.000000000 +0900 5--- configure.orig 2009-07-17 07:47:52.000000000 +0900
4+++ configure 6+++ configure
5@@ -1227,7 +1227,7 @@ mule1) 7@@ -1227,7 +1227,7 @@ mule1)
6 ELC_FILES="tc-is18.elc" 8 ELC_FILES="tc-is18.elc"
7 NO_COMPILE_EL_FILES="tc-sysdep.el tc-is19.el tc-is20.el" 9 NO_COMPILE_EL_FILES="tc-sysdep.el tc-is19.el tc-is20.el"
8 ;; 10 ;;
9-mule4|mule5) 11-mule4|mule5)
10+mule4|mule5|mule6) 12+mule4|mule5|mule6)
11 EL_FILES="tc-is20.el" 13 EL_FILES="tc-is20.el"
12 ELC_FILES="tc-is20.elc" 14 ELC_FILES="tc-is20.elc"
13 NO_COMPILE_EL_FILES="tc-sysdep.el tc-is18.el tc-is19.el" 15 NO_COMPILE_EL_FILES="tc-sysdep.el tc-is18.el tc-is19.el"
cvs diff -r1.1 -r1.2 pkgsrc/inputmethod/tc/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/inputmethod/tc/patches/patch-ac 2009/07/16 22:51:50 1.1
+++ pkgsrc/inputmethod/tc/patches/patch-ac 2019/10/23 14:02:00 1.2
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1$NetBSD: patch-ac,v 1.1 2009/07/16 22:51:50 uebayasi Exp $ 1$NetBSD: patch-ac,v 1.2 2019/10/23 14:02:00 mef Exp $
 2
 3support for new muls
2 4
3--- lisp/guess.orig 2002-03-25 09:16:05.000000000 +0900 5--- lisp/guess.orig 2002-03-25 09:16:05.000000000 +0900
4+++ lisp/guess 6+++ lisp/guess
5@@ -13,4 +13,5 @@ 7@@ -13,4 +13,5 @@
6 ((string-match "^3.[0-9]" mule-version) "mule3") 8 ((string-match "^3.[0-9]" mule-version) "mule3")
7 ((string-match "^4.[0-9]" mule-version) "mule4") 9 ((string-match "^4.[0-9]" mule-version) "mule4")
8 ((string-match "^5.[0-9]" mule-version) "mule5") 10 ((string-match "^5.[0-9]" mule-version) "mule5")
9+ ((string-match "^6.[0-9]" mule-version) "mule6") 11+ ((string-match "^6.[0-9]" mule-version) "mule6")
10 (t "mule1")))) 12 (t "mule1"))))