This patch updates remind from 4.0.3 to 4.2.0. To get make test running i cherry picked two commits.
Tested on three amd64 systems. (Only one with tkremind) Index: Makefile =================================================================== RCS file: /cvs/ports/misc/remind/Makefile,v retrieving revision 1.60 diff -u -p -r1.60 Makefile --- Makefile 16 Aug 2022 17:42:21 -0000 1.60 +++ Makefile 17 Oct 2022 14:21:00 -0000 @@ -1,7 +1,7 @@ COMMENT= scripting language for reminders, with a Tk front end -DISTNAME= remind-04.00.03 -PKGNAME= remind-4.0.3 +DISTNAME= remind-04.02.00 +PKGNAME= remind-4.2.0 CATEGORIES= misc Index: distinfo =================================================================== RCS file: /cvs/ports/misc/remind/distinfo,v retrieving revision 1.30 diff -u -p -r1.30 distinfo --- distinfo 16 Aug 2022 17:42:21 -0000 1.30 +++ distinfo 17 Oct 2022 14:21:00 -0000 @@ -1,2 +1,2 @@ -SHA256 (remind-04.00.03.tar.gz) = slTeBD7zk3aUxaRYBwrOtNz4cbWL0q57Me8SWwB3eHk= -SIZE (remind-04.00.03.tar.gz) = 466497 +SHA256 (remind-04.02.00.tar.gz) = pkds8N/nG8RmjndGaRAMWNaLaNxszwjKfqn6M0XnJzk= +SIZE (remind-04.02.00.tar.gz) = 486788 Index: patches/patch-src_dosubst_c =================================================================== RCS file: patches/patch-src_dosubst_c diff -N patches/patch-src_dosubst_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_dosubst_c 17 Oct 2022 14:21:00 -0000 @@ -0,0 +1,13 @@ +# Cherry pick https://salsa.debian.org/dskoll/remind/-/commit/8fc19358bbea9429f8bed960ec60937b196751be +Index: src/dosubst.c +--- src/dosubst.c.orig ++++ src/dosubst.c +@@ -244,7 +244,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger * + } + } + if (!c) { +- Wprint("Warning: Unterminated %{...} substitution sequence"); ++ Wprint("Warning: Unterminated %%{...} substitution sequence"); + } + if (UserFuncExists(s) != 3) { + continue; Index: patches/patch-tests_test_cmp =================================================================== RCS file: patches/patch-tests_test_cmp diff -N patches/patch-tests_test_cmp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tests_test_cmp 17 Oct 2022 14:21:00 -0000 @@ -0,0 +1,162 @@ +# Cherry Pick from https://salsa.debian.org/dskoll/remind/-/commit/3692a6b265452d96904f67871325afb1b401c16e#444f828087e44bbf858dd1feeed7d2863b2d4bfc +Index: tests/test.cmp +--- tests/test.cmp.orig ++++ tests/test.cmp +@@ -10334,20 +10334,20 @@ STDOUT is a: PIPE + + set a localtoutc('2022-01-01@12:00') + localtoutc(2022-01-01@12:00) => 2022-01-01@17:00 +-set a localtoutc('2022-03-13@02:59') +-localtoutc(2022-03-13@02:59) => 2022-03-13@07:59 +-set a localtoutc('2022-03-13@03:00') +-localtoutc(2022-03-13@03:00) => 2022-03-13@07:00 +-set a localtoutc('2022-03-13@03:01') +-localtoutc(2022-03-13@03:01) => 2022-03-13@07:01 ++set a localtoutc('2022-03-13@03:59') ++localtoutc(2022-03-13@03:59) => 2022-03-13@07:59 ++set a localtoutc('2022-03-13@04:00') ++localtoutc(2022-03-13@04:00) => 2022-03-13@08:00 ++set a localtoutc('2022-03-13@04:01') ++localtoutc(2022-03-13@04:01) => 2022-03-13@08:01 + set a localtoutc('2022-06-01@12:00') + localtoutc(2022-06-01@12:00) => 2022-06-01@16:00 +-set a localtoutc('2022-11-06@01:59') +-localtoutc(2022-11-06@01:59) => 2022-11-06@05:59 +-set a localtoutc('2022-11-06@02:00') +-localtoutc(2022-11-06@02:00) => 2022-11-06@07:00 +-set a localtoutc('2022-11-06@02:01') +-localtoutc(2022-11-06@02:01) => 2022-11-06@07:01 ++set a localtoutc('2022-11-06@02:59') ++localtoutc(2022-11-06@02:59) => 2022-11-06@07:59 ++set a localtoutc('2022-11-06@03:00') ++localtoutc(2022-11-06@03:00) => 2022-11-06@08:00 ++set a localtoutc('2022-11-06@03:01') ++localtoutc(2022-11-06@03:01) => 2022-11-06@08:01 + set a localtoutc('2022-12-01@12:00') + localtoutc(2022-12-01@12:00) => 2022-12-01@17:00 + +@@ -10355,10 +10355,10 @@ set b utctolocal('2022-01-01@17:00') + utctolocal(2022-01-01@17:00) => 2022-01-01@12:00 + set b utctolocal('2022-03-13@06:00') + utctolocal(2022-03-13@06:00) => 2022-03-13@01:00 +-set b utctolocal('2022-03-13@06:01') +-utctolocal(2022-03-13@06:01) => 2022-03-13@01:01 +-set b utctolocal('2022-03-13@06:59') +-utctolocal(2022-03-13@06:59) => 2022-03-13@01:59 ++set b utctolocal('2022-03-13@07:01') ++utctolocal(2022-03-13@07:01) => 2022-03-13@03:01 ++set b utctolocal('2022-03-13@07:59') ++utctolocal(2022-03-13@07:59) => 2022-03-13@03:59 + set b utctolocal('2022-03-13@07:00') + utctolocal(2022-03-13@07:00) => 2022-03-13@03:00 + set b utctolocal('2022-03-13@07:01') +@@ -10367,20 +10367,20 @@ set b utctolocal('2022-03-13@07:59') + utctolocal(2022-03-13@07:59) => 2022-03-13@03:59 + set b utctolocal('2022-06-01@16:00') + utctolocal(2022-06-01@16:00) => 2022-06-01@12:00 +-set b utctolocal('2022-11-06@05:59') +-utctolocal(2022-11-06@05:59) => 2022-11-06@01:59 +-set b utctolocal('2022-11-06@06:00') +-utctolocal(2022-11-06@06:00) => 2022-11-06@01:00 +-set b utctolocal('2022-11-06@06:01') +-utctolocal(2022-11-06@06:01) => 2022-11-06@01:01 +-set b utctolocal('2022-11-06@06:59') +-utctolocal(2022-11-06@06:59) => 2022-11-06@01:59 ++set b utctolocal('2022-11-06@03:59') ++utctolocal(2022-11-06@03:59) => 2022-11-05@23:59 + set b utctolocal('2022-11-06@07:00') + utctolocal(2022-11-06@07:00) => 2022-11-06@02:00 + set b utctolocal('2022-11-06@07:01') + utctolocal(2022-11-06@07:01) => 2022-11-06@02:01 +-set b utctolocal('2022-12-01@17:00') +-utctolocal(2022-12-01@17:00) => 2022-12-01@12:00 ++set b utctolocal('2022-11-06@07:59') ++utctolocal(2022-11-06@07:59) => 2022-11-06@02:59 ++set b utctolocal('2022-11-06@08:00') ++utctolocal(2022-11-06@08:00) => 2022-11-06@03:00 ++set b utctolocal('2022-11-06@08:01') ++utctolocal(2022-11-06@08:01) => 2022-11-06@03:01 ++set b utctolocal('2022-12-01@18:00') ++utctolocal(2022-12-01@18:00) => 2022-12-01@13:00 + + set c timezone('2022-07-01') + timezone(2022-07-01) => "EDT" +@@ -10392,20 +10392,20 @@ No reminders. + + set a localtoutc('2022-01-01@12:00') + localtoutc(2022-01-01@12:00) => 2022-01-01@11:00 +-set a localtoutc('2022-03-13@02:59') +-localtoutc(2022-03-13@02:59) => 2022-03-13@01:59 +-set a localtoutc('2022-03-13@03:00') +-localtoutc(2022-03-13@03:00) => 2022-03-13@02:00 +-set a localtoutc('2022-03-13@03:01') +-localtoutc(2022-03-13@03:01) => 2022-03-13@02:01 ++set a localtoutc('2022-03-13@03:59') ++localtoutc(2022-03-13@03:59) => 2022-03-13@02:59 ++set a localtoutc('2022-03-13@04:00') ++localtoutc(2022-03-13@04:00) => 2022-03-13@03:00 ++set a localtoutc('2022-03-13@04:01') ++localtoutc(2022-03-13@04:01) => 2022-03-13@03:01 + set a localtoutc('2022-06-01@12:00') + localtoutc(2022-06-01@12:00) => 2022-06-01@10:00 +-set a localtoutc('2022-11-06@01:59') +-localtoutc(2022-11-06@01:59) => 2022-11-06@00:59 +-set a localtoutc('2022-11-06@02:00') +-localtoutc(2022-11-06@02:00) => 2022-11-06@01:00 +-set a localtoutc('2022-11-06@02:01') +-localtoutc(2022-11-06@02:01) => 2022-11-06@01:01 ++set a localtoutc('2022-11-06@02:59') ++localtoutc(2022-11-06@02:59) => 2022-11-06@01:59 ++set a localtoutc('2022-11-06@03:00') ++localtoutc(2022-11-06@03:00) => 2022-11-06@02:00 ++set a localtoutc('2022-11-06@03:01') ++localtoutc(2022-11-06@03:01) => 2022-11-06@02:01 + set a localtoutc('2022-12-01@12:00') + localtoutc(2022-12-01@12:00) => 2022-12-01@11:00 + +@@ -10413,10 +10413,10 @@ set b utctolocal('2022-01-01@17:00') + utctolocal(2022-01-01@17:00) => 2022-01-01@18:00 + set b utctolocal('2022-03-13@06:00') + utctolocal(2022-03-13@06:00) => 2022-03-13@07:00 +-set b utctolocal('2022-03-13@06:01') +-utctolocal(2022-03-13@06:01) => 2022-03-13@07:01 +-set b utctolocal('2022-03-13@06:59') +-utctolocal(2022-03-13@06:59) => 2022-03-13@07:59 ++set b utctolocal('2022-03-13@07:01') ++utctolocal(2022-03-13@07:01) => 2022-03-13@08:01 ++set b utctolocal('2022-03-13@07:59') ++utctolocal(2022-03-13@07:59) => 2022-03-13@08:59 + set b utctolocal('2022-03-13@07:00') + utctolocal(2022-03-13@07:00) => 2022-03-13@08:00 + set b utctolocal('2022-03-13@07:01') +@@ -10425,20 +10425,20 @@ set b utctolocal('2022-03-13@07:59') + utctolocal(2022-03-13@07:59) => 2022-03-13@08:59 + set b utctolocal('2022-06-01@16:00') + utctolocal(2022-06-01@16:00) => 2022-06-01@18:00 +-set b utctolocal('2022-11-06@05:59') +-utctolocal(2022-11-06@05:59) => 2022-11-06@06:59 +-set b utctolocal('2022-11-06@06:00') +-utctolocal(2022-11-06@06:00) => 2022-11-06@07:00 +-set b utctolocal('2022-11-06@06:01') +-utctolocal(2022-11-06@06:01) => 2022-11-06@07:01 +-set b utctolocal('2022-11-06@06:59') +-utctolocal(2022-11-06@06:59) => 2022-11-06@07:59 ++set b utctolocal('2022-11-06@03:59') ++utctolocal(2022-11-06@03:59) => 2022-11-06@04:59 + set b utctolocal('2022-11-06@07:00') + utctolocal(2022-11-06@07:00) => 2022-11-06@08:00 + set b utctolocal('2022-11-06@07:01') + utctolocal(2022-11-06@07:01) => 2022-11-06@08:01 +-set b utctolocal('2022-12-01@17:00') +-utctolocal(2022-12-01@17:00) => 2022-12-01@18:00 ++set b utctolocal('2022-11-06@07:59') ++utctolocal(2022-11-06@07:59) => 2022-11-06@08:59 ++set b utctolocal('2022-11-06@08:00') ++utctolocal(2022-11-06@08:00) => 2022-11-06@09:00 ++set b utctolocal('2022-11-06@08:01') ++utctolocal(2022-11-06@08:01) => 2022-11-06@09:01 ++set b utctolocal('2022-12-01@18:00') ++utctolocal(2022-12-01@18:00) => 2022-12-01@19:00 + + set c timezone('2022-07-01') + timezone(2022-07-01) => "CEST" Index: patches/patch-tests_tz_rem =================================================================== RCS file: patches/patch-tests_tz_rem diff -N patches/patch-tests_tz_rem --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tests_tz_rem 17 Oct 2022 14:21:00 -0000 @@ -0,0 +1,48 @@ +# Cerrhy Pick from https://salsa.debian.org/dskoll/remind/-/commit/3692a6b265452d96904f67871325afb1b401c16e#444f828087e44bbf858dd1feeed7d2863b2d4bfc +Index: tests/tz.rem +--- tests/tz.rem.orig ++++ tests/tz.rem +@@ -1,30 +1,30 @@ + # Test conversion between local time and UTC + + set a localtoutc('2022-01-01@12:00') +-set a localtoutc('2022-03-13@02:59') +-set a localtoutc('2022-03-13@03:00') +-set a localtoutc('2022-03-13@03:01') ++set a localtoutc('2022-03-13@03:59') ++set a localtoutc('2022-03-13@04:00') ++set a localtoutc('2022-03-13@04:01') + set a localtoutc('2022-06-01@12:00') +-set a localtoutc('2022-11-06@01:59') +-set a localtoutc('2022-11-06@02:00') +-set a localtoutc('2022-11-06@02:01') ++set a localtoutc('2022-11-06@02:59') ++set a localtoutc('2022-11-06@03:00') ++set a localtoutc('2022-11-06@03:01') + set a localtoutc('2022-12-01@12:00') + + set b utctolocal('2022-01-01@17:00') + set b utctolocal('2022-03-13@06:00') +-set b utctolocal('2022-03-13@06:01') +-set b utctolocal('2022-03-13@06:59') ++set b utctolocal('2022-03-13@07:01') ++set b utctolocal('2022-03-13@07:59') + set b utctolocal('2022-03-13@07:00') + set b utctolocal('2022-03-13@07:01') + set b utctolocal('2022-03-13@07:59') + set b utctolocal('2022-06-01@16:00') +-set b utctolocal('2022-11-06@05:59') +-set b utctolocal('2022-11-06@06:00') +-set b utctolocal('2022-11-06@06:01') +-set b utctolocal('2022-11-06@06:59') ++set b utctolocal('2022-11-06@03:59') + set b utctolocal('2022-11-06@07:00') + set b utctolocal('2022-11-06@07:01') +-set b utctolocal('2022-12-01@17:00') ++set b utctolocal('2022-11-06@07:59') ++set b utctolocal('2022-11-06@08:00') ++set b utctolocal('2022-11-06@08:01') ++set b utctolocal('2022-12-01@18:00') + + set c timezone('2022-07-01') + set c timezone('2022-12-01') Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/misc/remind/pkg/PLIST,v retrieving revision 1.11 diff -u -p -r1.11 PLIST --- pkg/PLIST 13 Apr 2022 08:39:30 -0000 1.11 +++ pkg/PLIST 17 Oct 2022 14:21:00 -0000 @@ -17,11 +17,16 @@ libdata/perl5/site_perl/Remind/PDF/Entry @man man/man3p/Remind::PDF.3p @man man/man3p/Remind::PDF::Entry.3p share/examples/remind/ +share/examples/remind/alignment.rem +share/examples/remind/ansitext +share/examples/remind/astro share/examples/remind/defs.rem share/examples/remind/remind.vim share/remind/ +share/remind/ansitext.rem share/remind/holidays/ share/remind/holidays/ca.rem +share/remind/holidays/jewish.rem share/remind/holidays/us.rem share/remind/lang/ share/remind/lang/auto.rem
