(inputmethod/tc) eliminating to use wip/mk/git-package.mk

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: (inputmethod/tc) eliminating to use wip/mk/git-package.mk
From: Makoto Fujiwara <mef%NetBSD.org@localhost>
Date: Fri, 5 Jul 2024 13:20:15 +0000
Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <mef%NetBSD.org@localhost>
Pushed By:	mef
Date:		Fri Jul 5 22:18:07 2024 +0900
Changeset:	e63bdc8d5495f5363888c80f44804b2d5bcccab4

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) eliminating to use wip/mk/git-package.mk

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

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

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

diffs:
diff --git a/tc-git/Makefile b/tc-git/Makefile
index 32dad22496..dbf894fd2e 100644
--- a/tc-git/Makefile
+++ b/tc-git/Makefile
@@ -2,6 +2,9 @@
 
 DISTNAME=		tc-2.99.3
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
+MASTER_SITES=   	${MASTER_SITE_GITHUB:=makoto-fujiwara/}
+PKG_REVISION=		1
+
 CATEGORIES=		inputmethod
 
 MAINTAINER=		makoto%ki.nu@localhost
@@ -10,7 +13,6 @@ COMMENT=		2-stroke non associative direct input for Kanji
 # tc is in GPL2, kw is unknown for the moment
 LICENSE=		gnu-gpl-v2
 
-WRKSRC=			${WRKDIR}/tc
 INSTALLATION_DIRS=	${EMACS_INFOPREFIX} \
 			${EMACS_LISPPREFIX}/${DISTNAME} \
 			share/examples/tc
@@ -28,14 +30,6 @@ MAKEFLAGS+=		EMACS=${EMACS_BIN}
 MESSAGE_SUBST+=		LISPDIR=${EMACS_LISPPREFIX}
 INFO_FILES=		YES
 
-GIT_REPOSITORIES=	tc
-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
-## With some condition, it pauses waiting for interaction:
-## Saving file /WRKOBJDIR/wip/tc-git/work/tc/etc/bushu.rev...
-
 MAKE_JOBS_SAFE=		no
 
 CONFIGURE_ARGS.emacs=	--with-lispdir=${EMACS_LISPPREFIX}/${DISTNAME}
@@ -91,6 +85,5 @@ post-install:
 	${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 "../../wip/mk/git-package.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/tc-git/distinfo b/tc-git/distinfo
index 4a76a2cd3a..a0261fc119 100644
--- a/tc-git/distinfo
+++ b/tc-git/distinfo
@@ -1,12 +1,15 @@
 $NetBSD: distinfo,v 1.9 2014/10/08 03:57:37 makoto Exp $
 
+BLAKE2s (tc-2.99.3.tar.gz) = eb3d5461fabe94a3663c80c72efbf5b6a60bd6d7f1e0ca03d4dc3085f4101176
+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) = 368d4cc39ca7572dd3a1bb632e4ded3046cf2c42
-SHA1 (patch-etc_Makefile.in) = 373a0817f8327489abbded4c85545a3d96dbd1e6
+SHA1 (patch-etc_Makefile.in) = 11c38d66b50a31c33f9b90a9a959c9886264f0be
 SHA1 (patch-etc_bushu.rev) = 53259ef27da2b3e57ff9834957c8ee9b2fe4f833
 SHA1 (patch-etc_mk-bdic) = 37a5ed85e1bff4b06ac35ae2e3208fac977233ef
 SHA1 (patch-lisp_Makefile.am) = b80c93ae0ed60e8816a7cae452f5d300d9964781
@@ -14,6 +17,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) = e8f2e149f41cd127af4da57548e772505d0048d7
+SHA1 (patch-lisp_tc-sysdep.el) = 774f1d5a08de5ee190bd5acc77ef93a2c8444007
 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 3dd7d6d698..7e0adb472c 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	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@
+--- etc/Makefile.in.orig	2013-02-28 06:23:19.000000000 +0900
++++ etc/Makefile.in	2024-07-05 22:04:12.496151279 +0900
+@@ -159,6 +159,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@
-@@ -194,6 +195,8 @@ top_srcdir = @top_srcdir@
+@@ -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
@@ -22,24 +22,23 @@ Supporting to add following argment for configure.
  all: all-am
  
  .SUFFIXES:
-@@ -401,10 +404,19 @@ uninstall-am: uninstall-pkgdataDATA
- 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- 	uninstall-am uninstall-pkgdataDATA
+@@ -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)
++hu.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 \
++	 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 euc-japan euc-japan
 +	ls -l bushu.rev*
 +	@echo ' *** compiling bushu dictionary ***'
 +	@echo ' *** this may take a few minutes ***'
diff --git a/tc-git/patches/patch-lisp_tc-sysdep.el b/tc-git/patches/patch-lisp_tc-sysdep.el
index 4e1d56be42..b4b150e1ee 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
 
---- 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
+--- lisp/tc-sysdep.el.orig	2013-02-28 06:23:19.000000000 +0900
++++ lisp/tc-sysdep.el	2024-07-05 22:08:17.766064723 +0900
 @@ -228,7 +228,7 @@ BODY should be a list of lisp expression
  ;;;
  ;;; Fix incompatibilities between 18 and 19.
  ;;;
--(if (string-match "^\\(19\\|2[0123]\\)" emacs-version)
+-(if (string-match "^\\(19\\|2[01234]\\)" emacs-version)
 +(if (string-match "^\\(19\\|2[0-9]\\)" emacs-version)
      (progn
        (defun tcode-redo-command (ch)
Prev by Date: graphviz: Remove, used to update graphics/graphviz
Next by Date: cingg-netbsd: remove/comment out few not needed anymore lines from Makefile
Previous by Thread: graphviz: Update to 12.0.0
Next by Thread: cingg-netbsd: remove/comment out few not needed anymore lines from Makefile
Indexes:
Home | Main Index | Thread Index | Old Index