From 06b35eb66eb51bd74e47e3461a998db73f7b930a Mon Sep 17 00:00:00 2001
From: matsuand <30614168+matsuand@users.noreply.github.com>
Date: Mon, 15 Nov 2021 10:12:53 +0900
Subject: [PATCH] GNU which 2.21: Update sources.

---
 manual/GNU_which/Makefile                          | 27 ++++++-----------
 manual/GNU_which/original/getfiles.txt             | 34 ++++++++++++++++++++++
 manual/GNU_which/po4a/add_ja/copyright/which.1.txt |  3 +-
 manual/GNU_which/po4a/ja.po                        |  8 ++---
 manual/GNU_which/po4a/which.cfg                    |  1 +
 manual/GNU_which/translation_list                  |  2 +-
 6 files changed, 50 insertions(+), 25 deletions(-)
 create mode 100644 manual/GNU_which/original/getfiles.txt

diff --git a/manual/GNU_which/Makefile b/manual/GNU_which/Makefile
index afa5da71..11edc283 100644
--- a/manual/GNU_which/Makefile
+++ b/manual/GNU_which/Makefile
@@ -2,29 +2,20 @@ PACKAGE = which
 
 THRESH = 100
 EXTFLAGS =
-PO4AFLAGS += -M UTF-8 -k $(THRESH) $(EXTFLAGS)
+PO4AFLAGS += -k $(THRESH) $(EXTFLAGS)
 PO4ACFG = po4a/$(PACKAGE).cfg
-LANGS = ja
+POFILE  = po4a/ja.po
 
-WORK_DIR = .
-
-all:	translate
+all: translate
 
 translate:
-	po4a $(PO4AFLAGS) -v --variable langs='$(LANGS)' \
-	  --previous --srcdir $(WORK_DIR) --destdir $(WORK_DIR) $(PO4ACFG)
+	po4a $(PO4AFLAGS) $(PO4ACFG)
 
 stat:
-	@for l in $(LANGS); do \
-	  echo -n "$$l: "; \
-	  msgfmt --statistics -o /dev/null po4a/$$l.po; \
-	done
+	@msgfmt -v --statistics -o /dev/null $(POFILE)
 
 page-stat:
-	@LC_ALL=C po4a $(PO4AFLAGS) --force -v -k 0 --variable langs='$(LANGS)' \
-	  --previous --srcdir $(WORK_DIR) --destdir $(WORK_DIR) $(PO4ACFG) | \
-	  grep translated | \
-	  sed -e 's/(\([1-9][0-9]*\) strings)/(\1 of \1 strings)/' \
-	      -e 's/[()]//g' \
-	      -e 's/^draft\/man[1-9]\///' | \
-	  awk '{printf("%-15s: %7s (%3s/%3s)\n",$$1,$$3,$$5,$$7);}'
+	@echo $(POFILE):
+	@po4a --force --no-update -k 0 $(PO4ACFG)
+
+.PHONY: translate stat page-stat
diff --git a/manual/GNU_which/original/getfiles.txt b/manual/GNU_which/original/getfiles.txt
new file mode 100644
index 00000000..e3e5a809
--- /dev/null
+++ b/manual/GNU_which/original/getfiles.txt
@@ -0,0 +1,34 @@
+#------------------------------
+# ソース tarball 入手と伸長
+#------------------------------
+$ cd ~/src
+$ wget -N https://ftp.gnu.org/gnu/which/which-2.21.tar.gz
+$ tar xf which-2.21.tar.gz
+$ ls
+which-2.21
+
+#------------------------------
+# man ページ生成
+#------------------------------
+
+$ cd ~/src/which-2.21
+$ ./configure --prefix=/usr
+$ make DESTDIR=. install-man
+
+#------------------------------
+# 当プロジェクトへの man ページのコピー
+#------------------------------
+
+$ cd $(JMTOP)/manual/GNU_which/original
+$ cat > getfiles.sh <<"EOF"
+#!/bin/sh
+
+SRCDIR=~/src/which-2.21
+
+rm -fr man1
+mkdir  man1
+
+cp $SRCDIR/usr/share/man/man1/*.1 man1
+EOF
+
+$ sh getfiles.sh
diff --git a/manual/GNU_which/po4a/add_ja/copyright/which.1.txt b/manual/GNU_which/po4a/add_ja/copyright/which.1.txt
index 893979f4..2dbd483a 100644
--- a/manual/GNU_which/po4a/add_ja/copyright/which.1.txt
+++ b/manual/GNU_which/po4a/add_ja/copyright/which.1.txt
@@ -1,5 +1,4 @@
 PO4A-HEADER: mode=before; position=^\.TH
 .\"
-.\" Translated 2021-07-05
-.\"    by Michio MATSUYAMA <michio_matsuyama@yahoo.co.jp>
+.\" To be translated for 2.21, 2021-11-15
 .\"
diff --git a/manual/GNU_which/po4a/ja.po b/manual/GNU_which/po4a/ja.po
index c48215f0..e1af9caa 100644
--- a/manual/GNU_which/po4a/ja.po
+++ b/manual/GNU_which/po4a/ja.po
@@ -1,14 +1,14 @@
 # Japanese translations for GNU which package
-#
-# Japanese Version Copyright (c) 2021 Linux JM project
-#         all rights reserved.
+# Copyright (C) 2021 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU which package.
+# Linux JM project <linuxjm-discuss@lists.osdn.me>, 2021
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU which 2.21\n"
 "POT-Creation-Date: 2021-05-15 13:00+0900\n"
 "PO-Revision-Date: 2021-07-05 12:45+0900\n"
-"Last-Translator: Michio MATSUYAMA <michio_matsuyama@yahoo.co.jp>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Linux JM project <linuxjm-discuss@lists.osdn.me>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
diff --git a/manual/GNU_which/po4a/which.cfg b/manual/GNU_which/po4a/which.cfg
index a0648085..cc8ebf03 100644
--- a/manual/GNU_which/po4a/which.cfg
+++ b/manual/GNU_which/po4a/which.cfg
@@ -1,5 +1,6 @@
 [po4a_langs] ja
 [po4a_paths] po4a/which.pot $lang:po4a/$lang.po
+[po4a_alias: man] man opt:"-v --previous" opt_ja:"-M UTF-8"
 
 [type: man] original/man1/which.1 $lang:release/man1/which.1 \
 	add_$lang:?po4a/add_$lang/copyright/which.1.txt \
diff --git a/manual/GNU_which/translation_list b/manual/GNU_which/translation_list
index 3c879228..83fc7c30 100644
--- a/manual/GNU_which/translation_list
+++ b/manual/GNU_which/translation_list
@@ -1 +1 @@
-△:GNU which:2.21:2015/03/20:which:1:2021/07/05::michio_matsuyama@yahoo.co.jp:Michio MATSUYAMA:
+×:GNU which:2.21:2015/03/20:which:1:2021/11/15::::
-- 
2.11.0