Hi,
here is a routine maintainer update to textproc/igor-1.595.
The main benefit is that it catches yet more misspellings.
There are also some additions to DocBook SGML validation,
but that hardly matters for us.
Note that we have to patch away /usr/local/etc/ which was
introduced upstream between 1.555 and 1.595 and cannot be
configured.
OK?
Ingo
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/igor/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 30 Aug 2015 14:30:22 -0000 1.4
+++ Makefile 28 Nov 2017 20:18:07 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.4 2015/08/30 14:30:22 schwarze Exp $
COMMENT = FreeBSD Documentation Project sanity check script
-VERSION = 1.555
+VERSION = 1.595
DISTNAME = igor-${VERSION}
CATEGORIES = textproc
HOMEPAGE = http://www.wonkity.com/~wblock/igor/
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/igor/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 30 Aug 2015 14:30:22 -0000 1.4
+++ distinfo 28 Nov 2017 20:18:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (igor-1.555.tar.gz) = kQ/tBi4jQtV2UEDWncjNrT+HIP+6Tep+YG/jR5rQ3cU=
-SIZE (igor-1.555.tar.gz) = 36959
+SHA256 (igor-1.595.tar.gz) = 8OGJUjXW2sI/lHWd0BOovLm40CNb/kT7ZfOhnIBIEKQ=
+SIZE (igor-1.595.tar.gz) = 44626
Index: patches/patch-igor
===================================================================
RCS file: /cvs/ports/textproc/igor/patches/patch-igor,v
retrieving revision 1.2
diff -u -p -r1.2 patch-igor
--- patches/patch-igor 30 Aug 2015 14:30:22 -0000 1.2
+++ patches/patch-igor 28 Nov 2017 20:18:07 -0000
@@ -1,7 +1,11 @@
$OpenBSD: patch-igor,v 1.2 2015/08/30 14:30:22 schwarze Exp $
-do not report contractions by default (local change)
---- igor.orig Sun Aug 16 23:40:00 2015
-+++ igor Sun Aug 30 16:06:04 2015
+
+Chunks 1-3: Do not report contractions by default (local change).
+Chunk 4: Do not use /usr/local/etc/ (local change).
+
+Index: igor
+--- igor.orig
++++ igor
@@ -104,7 +104,7 @@ usage: $prog -h
-f FreeBSD obsolete features
-r repeated words
@@ -24,7 +28,7 @@ do not report contractions by default (l
$opt_a = $opt_b = $opt_c = $opt_d = $opt_e = $opt_f = $opt_g
- = $opt_m = $opt_o = $opt_p = $opt_r = $opt_s = $opt_u
+ = $opt_m = $opt_o = $opt_p = $opt_r = $opt_s
- = $opt_E = 1;
+ = $opt_E = $opt_S = 1;
}
@@ -263,7 +263,7 @@ sub initialize {
@@ -35,4 +39,15 @@ do not report contractions by default (l
+ = $opt_t = $opt_w = $opt_E = $opt_S
= $opt_W = 1;
$opt_x = $opt_y = 0;
+ }
+@@ -1017,8 +1017,8 @@ sub init_spellingerrors {
+ my @spellfiles;
+ # IGORSPELLFILES environment variable is a whitespace-separated list of
files
+ push (@spellfiles, split /\s/, $ENV{'IGORSPELLFILES'}) if
defined($ENV{'IGORSPELLFILES'});
+- # all files found in /usr/local/etc/igor/spelling
+- push (@spellfiles, split /\s/, `ls /usr/local/etc/igor/spelling/*`) if
-d '/usr/local/etc/igor/spelling';
++ # all files found in /etc/igor/spelling
++ push (@spellfiles, split /\s/, `ls /etc/igor/spelling/*`) if -d
'/etc/igor/spelling';
+ for my $spellfile (@spellfiles) {
+ readspelling($spellfile);
}
Index: patches/patch-igor_1
===================================================================
RCS file: /cvs/ports/textproc/igor/patches/patch-igor_1,v
retrieving revision 1.2
diff -u -p -r1.2 patch-igor_1
--- patches/patch-igor_1 30 Aug 2015 14:30:22 -0000 1.2
+++ patches/patch-igor_1 28 Nov 2017 20:18:07 -0000
@@ -1,7 +1,11 @@
$OpenBSD: patch-igor_1,v 1.2 2015/08/30 14:30:22 schwarze Exp $
-do not report contractions by default (local change)
---- igor.1.orig Sun Aug 16 23:40:00 2015
-+++ igor.1 Sun Aug 30 16:06:04 2015
+
+Chunks 1+3: Do not report contractions by default (local change).
+Chunks 2+4: Do not use /usr/local/etc/ (local change).
+
+Index: igor.1
+--- igor.1.orig
++++ igor.1
@@ -104,7 +104,7 @@ When ready for the actual commit, run
.Nm
without this option to check the date.
@@ -11,6 +15,15 @@ do not report contractions by default (l
.It Fl z
Run all applicable non-whitespace
.Pq content
+@@ -154,7 +154,7 @@ documents.
+ Additional files of misspelled words may be added with the
+ .Ev IGORSPELLFILES
+ environment variable, or placed in the
+-.Pa /usr/local/etc/igor/spelling
++.Pa /etc/igor/spelling
+ 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
.It Fl u
@@ -24,3 +37,14 @@ do not report contractions by default (l
.It Fl w
Find general whitespace errors, including trailing whitespace at
the end of lines, blank lines containing whitespace, and tabs
+@@ -271,8 +277,8 @@ A list of whitespace-delimited filenames containing ad
+ words.
+ .El
+ .Sh FILES
+-.Bl -tag -width /usr/local/etc/igor/spelling/
+-.It Pa /usr/local/etc/igor/spelling/
++.Bl -tag -width /etc/igor/spelling/
++.It Pa /etc/igor/spelling/
+ Directory for additional misspelled word files.
+ .El
+ .Sh EXAMPLES
