Re: local polishing of textproc/igor

2020-10-02 Thread Klemens Nanni
On Fri, Oct 02, 2020 at 09:38:28PM +0200, Ingo Schwarze wrote:
> we rarely patch manual pages of ports, but the port textproc/igor
> that i maintain is in a somewhat awkward situation right now
> so i'd like to fix it locally.
That's absoloutely fine with me.

>  1. I noticed a cross reference that is completely wrong
> and quite likely to confuse users.
> 
>  2. A web link given in the manual page went 404, and a replacement
> is readily available but not especially easy to find.
> This issue was reported by Alan .
> 
> I talked to upstream and Warren Block does not plan to roll a new
> release in the forseeable future, so waiting for that is not helping
> our users.
OK kn



local polishing of textproc/igor

2020-10-02 Thread Ingo Schwarze
Hi,

we rarely patch manual pages of ports, but the port textproc/igor
that i maintain is in a somewhat awkward situation right now
so i'd like to fix it locally.

 1. I noticed a cross reference that is completely wrong
and quite likely to confuse users.

 2. A web link given in the manual page went 404, and a replacement
is readily available but not especially easy to find.
This issue was reported by Alan .

I talked to upstream and Warren Block does not plan to roll a new
release in the forseeable future, so waiting for that is not helping
our users.

OK?
  Ingo


Index: Makefile
===
RCS file: /cvs/ports/textproc/igor/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile12 Jul 2019 20:49:59 -  1.7
+++ Makefile2 Oct 2020 19:27:41 -
@@ -2,7 +2,7 @@
 
 COMMENT =  FreeBSD Documentation Project sanity check script
 VERSION =  1.595
-REVISION = 0
+REVISION = 1
 DISTNAME = igor-${VERSION}
 CATEGORIES =   textproc
 HOMEPAGE = http://www.wonkity.com/~wblock/igor/
Index: patches/patch-igor_1
===
RCS file: /cvs/ports/textproc/igor/patches/patch-igor_1,v
retrieving revision 1.3
diff -u -p -r1.3 patch-igor_1
--- patches/patch-igor_129 Nov 2017 13:26:36 -  1.3
+++ patches/patch-igor_12 Oct 2020 19:27:41 -
@@ -1,11 +1,22 @@
 $OpenBSD: patch-igor_1,v 1.3 2017/11/29 13:26:36 schwarze Exp $
 
-Chunks 1+3: Do not report contractions by default (local change).
-Chunks 2+4: Do not use /usr/local/etc/ (local change).
+Chunk 1: Correct wrong cross reference (also submitted upstream).
+Chunks 2 and 3(3): Do not report contractions by default (local change).
+Chunks 3(1) and 4: Do not use /usr/local/etc/ (local change).
+Chunk 3(2): Correct link to Debian wordlist (agreed with upstream).
 
 Index: igor.1
 --- igor.1.orig
 +++ igor.1
+@@ -30,7 +30,7 @@ to detect a file's type and only runs the applicable t
+ Files compressed with
+ .Xr gzip 1
+ or
+-.Xr bzip 2
++.Xr bzip2 1
+ are automatically decompressed.
+ If multiple files are specified, filenames are displayed before each
+ is analyzed.
 @@ -104,7 +104,7 @@ When ready for the actual commit, run
  .Nm
  without this option to check the date.
@@ -15,7 +26,7 @@ Index: igor.1
  .It Fl z
  Run all applicable non-whitespace
  .Pq content
-@@ -154,7 +154,7 @@ documents.
+@@ -154,15 +154,21 @@ documents.
  Additional files of misspelled words may be added with the
  .Ev IGORSPELLFILES
  environment variable, or placed in the
@@ -24,8 +35,10 @@ Index: igor.1
  directory.
  The first word on each line, including apostrophes, will be included in the
  list of known misspellings to be checked.
-@@ -163,6 +163,12 @@ The Debian project has a list of words at
- .Li 
http://anonscm.debian.org/gitweb/?p=lintian/lintian.git;a=blob_plain;f=vendors/debian/ftp-master-auto-reject/data/spelling/corrections;hb=HEAD
+ Blank lines and lines starting with a # character are ignored.
+ The Debian project has a list of words at
+-.Li 
http://anonscm.debian.org/gitweb/?p=lintian/lintian.git;a=blob_plain;f=vendors/debian/ftp-master-auto-reject/data/spelling/corrections;hb=HEAD
++.Lk 
https://salsa.debian.org/lintian/lintian/-/raw/master/data/spelling/corrections
  .It Fl u
  Identify contractions, which make translation more difficult.
 +This test is off by default on