cvs2fossil: update patch comment, remove unused patch

[Thomas Klausner <wiz%gatalith.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Wed Jul 12 21:28:27 2023 +0200
Changeset:	cd52e54003155ff6e18fde85a2c6add8d5d05b65

Modified Files:
	cvs2fossil/distinfo
	cvs2fossil/patches/patch-04-commit_main.c
Removed Files:
	cvs2fossil/patches/patch-convert.sh

Log Message:
cvs2fossil: update patch comment, remove unused patch

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

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

diffstat:
 cvs2fossil/distinfo                       |  3 +-
 cvs2fossil/patches/patch-04-commit_main.c |  1 +
 cvs2fossil/patches/patch-convert.sh       | 77 -------------------------------
 3 files changed, 2 insertions(+), 79 deletions(-)

diffs:
diff --git a/cvs2fossil/distinfo b/cvs2fossil/distinfo
index bc3d40fe4d..214d1d4b66 100644
--- a/cvs2fossil/distinfo
+++ b/cvs2fossil/distinfo
@@ -4,6 +4,5 @@ BLAKE2s (cvs2fossil-20140502.tar.gz) = 275555dc446eedb1c50bbb446391e72dac23fea5b
 SHA512 (cvs2fossil-20140502.tar.gz) = dc5f64c5af0fe6a35143244c2858dcccd4ad2131fb5e375132ffc9071dfcff8984fdbb9664f774238ddd2c14c5155686e2c99962753131a3f5cd2f58f0d19a3d
 Size (cvs2fossil-20140502.tar.gz) = 1258545 bytes
 SHA1 (patch-01-import_main.c) = 6177f632e9a7213e9aff911e28ac04378102fae5
-SHA1 (patch-04-commit_main.c) = 01eee277568a00178969c279ba46e89189fecb76
+SHA1 (patch-04-commit_main.c) = edd8f7d4ee3e1f8e3784c8ad035a5a5a7d371a4e
 SHA1 (patch-common_common.h) = 625959ee61513df52696987c9fba2abb83c91262
-SHA1 (patch-convert.sh) = 2cb7abefb9888c5b99e85d18e135be7e53557bbb
diff --git a/cvs2fossil/patches/patch-04-commit_main.c b/cvs2fossil/patches/patch-04-commit_main.c
index 0a47ff457a..eb9a0f759e 100644
--- a/cvs2fossil/patches/patch-04-commit_main.c
+++ b/cvs2fossil/patches/patch-04-commit_main.c
@@ -1,6 +1,7 @@
 $NetBSD$
 
 Add missing header.
+Add -s option to set merge window timeframe in seconds.
 
 --- 04-commit/main.c.orig	2014-05-02 21:04:50.000000000 +0000
 +++ 04-commit/main.c
diff --git a/cvs2fossil/patches/patch-convert.sh b/cvs2fossil/patches/patch-convert.sh
deleted file mode 100644
index f939a04b22..0000000000
--- a/cvs2fossil/patches/patch-convert.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD$
-
-Adapt script for pkgsrc paths, make arguments available from command line.
-
---- convert.sh.orig	2011-02-15 18:57:40.000000000 +0000
-+++ convert.sh
-@@ -1,18 +1,34 @@
- #!/bin/sh
- 
--# Sample conversion script
--
- set -e
- 
--db=/home/joerg/repo/src-new
--repo=/home/joerg/repo/netbsd/src
-+USAGE="usage: $0 [-m] source-cvs-rsync-path target-path"
-+strip=""
-+while getopts m f
-+do
-+    case $f in
-+        m)      strip=-m;;
-+        \?)     echo "$USAGE" >&2; exit 1;;
-+    esac
-+done
-+shift $((OPTIND - 1))
-+
-+if [ "$#" != 2 ]
-+then
-+	echo "$USAGE" >&2
-+	exit 1
-+fi
-+
-+PATH=@PREFIX@/libexec/cvs2fossil:$PATH
-+db="$2"
-+repo="$1"
- fossil=$db.fossil
- 
- #
- # If you want the module name itself to be skipped, add -m.
- # Instead of e.g. src/bin/... as path, this will create only bin/...
- #
--time 01-import/01-import $db $repo
-+time 01-import "$strip" $db $repo
- oldest=$(echo 'SELECT datetime(r.date,"-1 second") FROM revision r ORDER BY r.date LIMIT 1;' | sqlite3 $db)
- 
- #
-@@ -35,14 +51,25 @@ oldest=$(echo 'SELECT datetime(r.date,"-
- #  revision IN (SELECT revision.id FROM revision WHERE date > "1998-05-01");
- #EOF
- 
--time 02-vendorbranches/02-vendorbranches $db
--time 03-branchtime/03-branchtime $db
-+time 02-vendorbranches $db
-+time 03-branchtime $db
- rm -f $fossil
--fossil new -A root --date-override "$oldest" $fossil
-+fossil1 new -A root --date-override "$oldest" $fossil
-+# this is a random value used to identify repository groups in
-+# fossil. it will complain if you try to pull/push changes across
-+# different projects. Use the same value for incremental runs.
- project=eeb7e06236b08dc4b57b6ab3b957fe5756c64f5b
- sqlite3 $fossil 'UPDATE config SET value="'$project'" WHERE name="project-code"'
- initial=$(sqlite3 $fossil 'SELECT uuid FROM blob WHERE rid=1')
--TMPDIR=. time 04-commit/04-commit -b $initial $db $fossil
-+TMPDIR=. time 04-commit -b $initial $db $fossil
- du -h $fossil
--time fossil rebuild --noverify $fossil
-+time fossil1 rebuild --noverify $fossil
- #TMPDIR=. time sqlite3 $fossil 'pragma synchronous=off; pragma journal_mode=off; vacuum'
-+
-+echo Checking for possible problems
-+99-warnings $db || true
-+echo End of warnings
-+
-+echo Checking for timewarp issues
-+fossil1 test-timewarp-list --detail -R $fossil
-+echo End of timewarp issues