pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

(inputmethod/tc-git) MASTER repository gets historical merge. Forked from the point of we used.



Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara (CF-SX2) <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Sat Jul 28 07:05:31 2018 +0900
Changeset:	f88e0a757a8383705853af7bd4ca6c376e92b01f

Modified Files:
	tc-git/Makefile
	tc-git/distinfo
	tc-git/patches/patch-etc_Makefile.in
	tc-git/patches/patch-lisp_tc-sysdep.el

Log Message:
(inputmethod/tc-git) MASTER repository gets historical merge. Forked from the point of we used.

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

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

diffstat:
 tc-git/Makefile                        |  2 +-
 tc-git/distinfo                        |  4 ++--
 tc-git/patches/patch-etc_Makefile.in   | 21 ++++++++-------------
 tc-git/patches/patch-lisp_tc-sysdep.el |  6 +++---
 4 files changed, 14 insertions(+), 19 deletions(-)

diffs:
diff --git a/tc-git/Makefile b/tc-git/Makefile
index 1ac63e1f07..3876ea0a4b 100644
--- a/tc-git/Makefile
+++ b/tc-git/Makefile
@@ -29,7 +29,7 @@ MESSAGE_SUBST+=		LISPDIR=${EMACS_LISPPREFIX}
 INFO_FILES=		YES
 
 GIT_REPOSITORIES=	tc
-GIT_REPO.tc=		http://github.com/kanchoku/tc.git
+GIT_REPO.tc=		http://github.com/makoto-fujiwara/tc.git
 # 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
diff --git a/tc-git/distinfo b/tc-git/distinfo
index 7d4d741243..4a76a2cd3a 100644
--- a/tc-git/distinfo
+++ b/tc-git/distinfo
@@ -6,7 +6,7 @@ SHA1 (patch-bushu-util_where) = 07bd3faf178ef57b9cc0afae20f56dbf83cc1d6d
 SHA1 (patch-configure.ac) = 4174e3674e2cc7dbb6daf5de56fa76f24273edf9
 SHA1 (patch-doc_Makefile.am) = fa69f7e5a4a49ad38479929549740f1c9e1a37fb
 SHA1 (patch-etc_Makefile.am) = 368d4cc39ca7572dd3a1bb632e4ded3046cf2c42
-SHA1 (patch-etc_Makefile.in) = 5d17622136ce9960dcc5dc43f4763d3e315241b1
+SHA1 (patch-etc_Makefile.in) = 373a0817f8327489abbded4c85545a3d96dbd1e6
 SHA1 (patch-etc_bushu.rev) = 53259ef27da2b3e57ff9834957c8ee9b2fe4f833
 SHA1 (patch-etc_mk-bdic) = 37a5ed85e1bff4b06ac35ae2e3208fac977233ef
 SHA1 (patch-lisp_Makefile.am) = b80c93ae0ed60e8816a7cae452f5d300d9964781
@@ -14,6 +14,6 @@ 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) = c55322a844fe8a055c3274d5e392918ea360c9e0
+SHA1 (patch-lisp_tc-sysdep.el) = e8f2e149f41cd127af4da57548e772505d0048d7
 SHA1 (patch-mazegaki_Makefile.am) = ee718aa68c9947f1a923dcad4211314ae219b0ce
 SHA1 (patch-mazegaki_mkcertain.pl) = d2b525316863aee93d2072b094adc45aba0fc55a
diff --git a/tc-git/patches/patch-etc_Makefile.in b/tc-git/patches/patch-etc_Makefile.in
index a4239adeed..3dd7d6d698 100644
--- a/tc-git/patches/patch-etc_Makefile.in
+++ b/tc-git/patches/patch-etc_Makefile.in
@@ -3,9 +3,9 @@ $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-04-09 08:22:32.000000000 +0900
-+++ etc/Makefile.in	2013-04-09 08:26:40.000000000 +0900
-@@ -159,6 +159,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
+--- etc/Makefile.in.orig	2018-07-27 22:40:27.530745543 +0900
++++ etc/Makefile.in	2018-07-27 22:43:20.684600231 +0900
+@@ -145,6 +145,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
  SET_MAKE = @SET_MAKE@
  SHELL = /bin/sh
  STRIP = @STRIP@
@@ -13,7 +13,7 @@ Supporting to add following argment for configure.
  TEXI2HTML = @TEXI2HTML@
  TEXI2HTML_FLAGS = @TEXI2HTML_FLAGS@
  VERSION = @VERSION@
-@@ -208,6 +209,8 @@ top_srcdir = @top_srcdir@
+@@ -194,6 +195,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
@@ -22,14 +22,14 @@ Supporting to add following argment for configure.
  all: all-am
  
  .SUFFIXES:
-@@ -415,13 +418,24 @@ uninstall-am: uninstall-pkgdataDATA
- 	uninstall-pkgdataDATA
- 
+@@ -401,10 +404,19 @@ uninstall-am: uninstall-pkgdataDATA
+ 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ 	uninstall-am 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 \
@@ -46,8 +46,3 @@ Supporting to add following argment for configure.
  	$(EMACS) -q -no-site-file -batch -l $(srcdir)/mk-bdic
  
  clean:
--	$(RM) bushu.expand bushu.index2
-+	$(RM) -f bushu.expand bushu.index2
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/tc-git/patches/patch-lisp_tc-sysdep.el b/tc-git/patches/patch-lisp_tc-sysdep.el
index ee081e3669..4e1d56be42 100644
--- a/tc-git/patches/patch-lisp_tc-sysdep.el
+++ b/tc-git/patches/patch-lisp_tc-sysdep.el
@@ -4,13 +4,13 @@ $NetBSD: patch-lisp_tc-sysdep.el,v 1.1 2013/01/22 13:54:22 makoto Exp $
  You will get following error if C-s tried for incremental search.
  Symbol's function definition is void: isearch-last-command-char
 
---- work/tc/lisp/tc-sysdep.el.orig	2013-01-22 22:07:16.000000000 +0900
-+++ lisp/tc-sysdep.el	2013-01-22 22:10:14.000000000 +0900
+--- lisp/tc-sysdep.el.orig	2018-07-27 22:40:27.540117546 +0900
++++ lisp/tc-sysdep.el	2018-07-27 22:44:27.936253867 +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[0123]\\)" emacs-version)
 +(if (string-match "^\\(19\\|2[0-9]\\)" emacs-version)
      (progn
        (defun tcode-redo-command (ch)


Home | Main Index | Thread Index | Old Index