Tue Apr 28 04:17:29 2020 UTC ()
textproc/cmigemo: fix "TEST: not found" in configure patch


(rillig)
diff -r1.14 -r1.15 pkgsrc/textproc/cmigemo/Makefile
diff -r1.3 -r1.4 pkgsrc/textproc/cmigemo/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/cmigemo/patches/patch-configure

cvs diff -r1.14 -r1.15 pkgsrc/textproc/cmigemo/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/cmigemo/Makefile 2019/11/04 21:43:34 1.14
+++ pkgsrc/textproc/cmigemo/Makefile 2020/04/28 04:17:29 1.15
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.14 2019/11/04 21:43:34 rillig Exp $ 1# $NetBSD: Makefile,v 1.15 2020/04/28 04:17:29 rillig Exp $
2# 2#
3 3
4DISTNAME= cmigemo-default-src-20110227 4DISTNAME= cmigemo-default-src-20110227
5PKGNAME= ${DISTNAME:S/-default-src-/-1.3e./} 5PKGNAME= ${DISTNAME:S/-default-src-/-1.3e./}
6PKGREVISION= 7 6PKGREVISION= 8
7CATEGORIES= textproc 7CATEGORIES= textproc
8MASTER_SITES= http://cmigemo.googlecode.com/files/ 8MASTER_SITES= http://cmigemo.googlecode.com/files/
9EXTRACT_SUFX= .zip 9EXTRACT_SUFX= .zip
10DISTFILES= ${DEFAULT_DISTFILES} ${JISYOFILE} 10DISTFILES= ${DEFAULT_DISTFILES} ${JISYOFILE}
11 11
12MAINTAINER= goro@venus.dti.ne.jp 12MAINTAINER= goro@venus.dti.ne.jp
13HOMEPAGE= http://www.kaoriya.net/software/cmigemo 13HOMEPAGE= http://www.kaoriya.net/software/cmigemo
14COMMENT= Migemo library implemented in C 14COMMENT= Migemo library implemented in C
15LICENSE= mit 15LICENSE= mit
16 16
17MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
18 18
19# sync with inputmethod/skk-jisyo-cdb 19# sync with inputmethod/skk-jisyo-cdb

cvs diff -r1.3 -r1.4 pkgsrc/textproc/cmigemo/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/cmigemo/distinfo 2015/11/04 01:59:26 1.3
+++ pkgsrc/textproc/cmigemo/distinfo 2020/04/28 04:17:29 1.4
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.3 2015/11/04 01:59:26 agc Exp $ 1$NetBSD: distinfo,v 1.4 2020/04/28 04:17:29 rillig Exp $
2 2
3SHA1 (SKK-JISYO.L.201102.bz2) = 14a6160269548a6ead1adf627fa0b9c8e27751fe 3SHA1 (SKK-JISYO.L.201102.bz2) = 14a6160269548a6ead1adf627fa0b9c8e27751fe
4RMD160 (SKK-JISYO.L.201102.bz2) = d993fd99ed2156fb2163e021a850094b53590518 4RMD160 (SKK-JISYO.L.201102.bz2) = d993fd99ed2156fb2163e021a850094b53590518
5SHA512 (SKK-JISYO.L.201102.bz2) = 4d4d99512aa3e17a43a885237d1436475f578d9bfa3904bb3cefe4c6471b7a01ba7d71afe111453dc4041904ddb118ca6f9cd1448800cc4710f47d50e45dbe8f 5SHA512 (SKK-JISYO.L.201102.bz2) = 4d4d99512aa3e17a43a885237d1436475f578d9bfa3904bb3cefe4c6471b7a01ba7d71afe111453dc4041904ddb118ca6f9cd1448800cc4710f47d50e45dbe8f
6Size (SKK-JISYO.L.201102.bz2) = 1694273 bytes 6Size (SKK-JISYO.L.201102.bz2) = 1694273 bytes
7SHA1 (cmigemo-default-src-20110227.zip) = 25e279c56d3a8f1e82cbfb3526d1b38742d1d66c 7SHA1 (cmigemo-default-src-20110227.zip) = 25e279c56d3a8f1e82cbfb3526d1b38742d1d66c
8RMD160 (cmigemo-default-src-20110227.zip) = 38d0670b3ebe36af78650a0b13dbdf14b16ded95 8RMD160 (cmigemo-default-src-20110227.zip) = 38d0670b3ebe36af78650a0b13dbdf14b16ded95
9SHA512 (cmigemo-default-src-20110227.zip) = b69a2be26eeb8612b9b5ced254e116169d5c37fc3e510471a37437c8f445ee9577f1aba527178d187d997dee3b7f2a27a4ab606831c75848e8b7997767df25f7 9SHA512 (cmigemo-default-src-20110227.zip) = b69a2be26eeb8612b9b5ced254e116169d5c37fc3e510471a37437c8f445ee9577f1aba527178d187d997dee3b7f2a27a4ab606831c75848e8b7997767df25f7
10Size (cmigemo-default-src-20110227.zip) = 116574 bytes 10Size (cmigemo-default-src-20110227.zip) = 116574 bytes
11SHA1 (patch-compile_Make__gcc.mak) = c99e3e335142ffa3e24655980b6eca6dc5235842 11SHA1 (patch-compile_Make__gcc.mak) = c99e3e335142ffa3e24655980b6eca6dc5235842
12SHA1 (patch-compile_config.mk.in) = 7480a20f597c49ba18a2ab01098f7ee2a492d026 12SHA1 (patch-compile_config.mk.in) = 7480a20f597c49ba18a2ab01098f7ee2a492d026
13SHA1 (patch-compile_unix.mak) = f0fe8277035ebcf8e5aeef83ab72fd466a1ec8ce 13SHA1 (patch-compile_unix.mak) = f0fe8277035ebcf8e5aeef83ab72fd466a1ec8ce
14SHA1 (patch-configure) = 35e32a9ead93a02f8b85ce4c7cff3ced6afcbc45 14SHA1 (patch-configure) = f657eaf5dd5ddef02814e9539fcdd5833686e7c4
15SHA1 (patch-dict_dict.mak) = 80f59a3110b6b152c0a03d829077c059a23e843b 15SHA1 (patch-dict_dict.mak) = 80f59a3110b6b152c0a03d829077c059a23e843b
16SHA1 (patch-src_wordbuf.c) = 27194e8b6e5e297eb16d7d0f0b8d3d61604f94fb 16SHA1 (patch-src_wordbuf.c) = 27194e8b6e5e297eb16d7d0f0b8d3d61604f94fb

cvs diff -r1.1 -r1.2 pkgsrc/textproc/cmigemo/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/textproc/cmigemo/patches/patch-configure 2013/09/01 05:28:26 1.1
+++ pkgsrc/textproc/cmigemo/patches/patch-configure 2020/04/28 04:17:29 1.2
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1$NetBSD: patch-configure,v 1.1 2013/09/01 05:28:26 obache Exp $ 1$NetBSD: patch-configure,v 1.2 2020/04/28 04:17:29 rillig Exp $
2 2
3* prefer user select tool via envrinment variable to auto detect one.  3* prefer user select tool via envrinment variable to auto detect one.
4 4
5--- configure.orig 2011-02-27 10:45:40.000000000 +0000 5--- configure.orig 2011-02-27 10:45:40.000000000 +0000
6+++ configure 6+++ configure
7@@ -29,6 +29,7 @@ do 7@@ -29,6 +29,7 @@ do
8 done 8 done
9  9
10 # Check HTTP access tool 10 # Check HTTP access tool
11+if test -z "$PROGRAM_HTTP"; then 11+if test -z "$PROGRAM_HTTP"; then
12 if CHECK_COMMAND curl ; then 12 if CHECK_COMMAND curl ; then
13 PROGRAM_HTTP="curl -O" 13 PROGRAM_HTTP="curl -O"
14 elif CHECK_COMMAND wget ; then 14 elif CHECK_COMMAND wget ; then
15@@ -39,8 +40,10 @@ else 15@@ -39,8 +40,10 @@ else
16 echo "ERROR: Require one of HTTP access tools (curl, wget or fetch)." 16 echo "ERROR: Require one of HTTP access tools (curl, wget or fetch)."
17 exit 1 17 exit 1
18 fi 18 fi
19+fi 19+fi
20  20
21 # Check encoding filter 21 # Check encoding filter
22+if TEST -z "$PROGRAM_ENCODEFILTER"; then 22+if test -z "$PROGRAM_ENCODEFILTER"; then
23 if CHECK_COMMAND qkc ; then 23 if CHECK_COMMAND qkc ; then
24 PROGRAM_ENCODEFILTER="qkc -q -u" 24 PROGRAM_ENCODEFILTER="qkc -q -u"
25 elif CHECK_COMMAND nkf ; then 25 elif CHECK_COMMAND nkf ; then
26@@ -49,8 +52,10 @@ else 26@@ -49,8 +52,10 @@ else
27 echo "ERROR: Require qkc or nkf installed for encode filter." 27 echo "ERROR: Require qkc or nkf installed for encode filter."
28 exit 1 28 exit 1
29 fi 29 fi
30+fi 30+fi
31  31
32 # Check install program 32 # Check install program
33+if test -z "$PROGRAM_INSTALL"; then 33+if test -z "$PROGRAM_INSTALL"; then
34 if test -x /usr/ucb/install ; then 34 if test -x /usr/ucb/install ; then
35 PROGRAM_INSTALL="/usr/ucb/install" 35 PROGRAM_INSTALL="/usr/ucb/install"