Remove -s option. mandoc already warns about trailing whitespace.

From Ingo Schwarze.

Bump version.

3 files changed, 14 insertions, 21 deletions

diff --git a/textproc/mdoclint/Makefile b/textproc/mdoclint/Makefile
index 948d9d31201..ff1a8ca25ba 100644
--- a/textproc/mdoclint/Makefile
+++ b/textproc/mdoclint/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2017/05/02 13:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2017/05/14 18:00:12 wiz Exp $
 
-DISTNAME=	mdoclint-1.48
+DISTNAME=	mdoclint-1.49
 CATEGORIES=	textproc
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/textproc/mdoclint/files/mdoclint b/textproc/mdoclint/files/mdoclint
index 94d88ccf190..abce62f2e78 100755
--- a/textproc/mdoclint/files/mdoclint
+++ b/textproc/mdoclint/files/mdoclint
@@ -1,7 +1,7 @@
 #!@PERL5@
 #
 # $OpenBSD: mdoclint,v 1.48 2016/01/24 20:10:48 schwarze Exp $
-# $NetBSD: mdoclint,v 1.68 2017/05/02 13:59:10 wiz Exp $
+# $NetBSD: mdoclint,v 1.69 2017/05/14 18:00:12 wiz Exp $
 #
 # Copyright (c) 2001-2017 Thomas Klausner
 # All rights reserved.
@@ -45,18 +45,18 @@ use constant {
 
 use vars qw(
 	$opt_a $opt_D $opt_d $opt_e $opt_F $opt_f $opt_H $opt_h $opt_l
-	$opt_m $opt_n $opt_o $opt_p $opt_r $opt_S $opt_s $opt_v $opt_w
+	$opt_m $opt_n $opt_o $opt_p $opt_r $opt_S $opt_v $opt_w
 	$opt_X $opt_x
 );
 
 
 my $arch=`uname -m`;
 chomp($arch);
-my $options="aDdeFfHhlmnoprSsvwXx";
+my $options="aDdeFfHhlmnoprSvwXx";
 
 sub usage
 	{
-	my $default = OPENBSD ? "-aDdfmnoprSsXx" : "-aDdeflmnoprSsXx";
+	my $default = OPENBSD ? "-aDdfmnoprSXx" : "-aDdeflmnoprSXx";
 
 	print STDERR <<"EOF";
 mdoclint: verify man page correctness
@@ -76,7 +76,6 @@ usage:	mdoclint [-$options] file ...
 	-p	warn about punctuation problems
 	-r	warn about missing RCS Id
 	-S	warn about any .Sh weirdness
-	-s	warn about whitespace problems
 	-v	verbose output
 	-w	show section header in warnings
 	-X	warn about explicit mentions of the *BSD system names
@@ -254,10 +253,10 @@ sub handle_options
 	unless ($opt_a or $opt_D or $opt_d or $opt_e
 		or $opt_f or $opt_H or $opt_l
 		or $opt_m or $opt_n or $opt_o or $opt_p or $opt_r
-		or $opt_S or $opt_s or $opt_X or $opt_x) {
+		or $opt_S or $opt_X or $opt_x) {
 		$opt_a = $opt_D = $opt_d = $opt_f = $opt_m =
 		    $opt_n = $opt_o = $opt_p = $opt_r = $opt_S =
-		    $opt_s = $opt_X = $opt_x = 1;
+		    $opt_X = $opt_x = 1;
 		$opt_e = $opt_l = 1 if NETBSD;
 	}
 }
@@ -423,10 +422,7 @@ sub process_line
 	($s, $_) = @_;
 	chomp;
 	# always cut trailing spaces
-	if (/\s+$/o) {
-		$s->warning("trailing space: `$_'") if $opt_s;
-		s/\s+$//o;
-	}
+	s/\s+$//o;
 	if (/\$OpenBSD\b.*\$/o) {
 		$s->{oxrcsidseen}++;
 		if (OPENBSD and ($s->{oxrcsidseen} > 1)) {
diff --git a/textproc/mdoclint/files/mdoclint.1 b/textproc/mdoclint/files/mdoclint.1
index a3426ae4d03..2d81a2dcb0e 100755
--- a/textproc/mdoclint/files/mdoclint.1
+++ b/textproc/mdoclint/files/mdoclint.1
@@ -1,5 +1,5 @@
 .\"	$OpenBSD: mdoclint.1,v 1.7 2009/04/13 19:06:38 jmc Exp $
-.\" $NetBSD: mdoclint.1,v 1.15 2017/05/02 13:59:10 wiz Exp $
+.\" $NetBSD: mdoclint.1,v 1.16 2017/05/14 18:00:12 wiz Exp $
 .\"
 .\" Copyright (c) 2001-2013 Thomas Klausner
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 28, 2017
+.Dd May 14, 2017
 .Dt MDOCLINT 1
 .Os
 .Sh NAME
@@ -33,7 +33,7 @@
 .Nd man page verifier
 .Sh SYNOPSIS
 .Nm
-.Op Fl aDdeFfHhlmnoprSsvwXx
+.Op Fl aDdeFfHhlmnoprSvwXx
 .Ar
 .Sh DESCRIPTION
 .Nm
@@ -41,7 +41,7 @@ is a man page verifier.
 It tries to automatically find as many common
 errors that occur when writing man pages as possible.
 If no flags are given,
-.Fl aDdeflmnoprSsXx
+.Fl aDdeflmnoprSXx
 is assumed (that is, everything except
 .Fl FHhvw ) .
 .Pp
@@ -60,8 +60,7 @@ Warn about bad date strings (in the .Dd macro).
 .It Fl e
 Warn about unsorted errors (for functions).
 .It Fl F
-Fix whitespace problems (see also
-.Fl s ) .
+Delete whitespace at the end of input lines.
 .It Fl f
 Warn about possible .Fn abuse; its arguments should be put in
 .Sq \&"
@@ -108,8 +107,6 @@ Warn about missing RCS Id.
 Warn about any unknown sections or about a section that comes in the
 wrong order (see
 .Xr mdoc 7 ) .
-.It Fl s
-Warn about superfluous whitespace at the end of line.
 .It Fl v
 Verbose output.
 .It Fl w