 @@ -1,17 +1,17 @@
 #!@PERL5@
+#
 # $OpenBSD: mdoclint,v 1.48 2016/01/24 20:10:48 schwarze Exp $
-# $NetBSD: mdoclint,v 1.74 2017/06/01 14:38:50 wiz Exp $
+# $NetBSD: mdoclint,v 1.75 2017/06/07 19:09:55 wiz Exp $
+#
 # Copyright (c) 2001-2017 Thomas Klausner
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 @@ -33,49 +33,48 @@ use warnings;
 $| = 1;
 package Parser;
 use Getopt::Std;
 use constant {
 	OPENBSD => 0,
 	NETBSD => 1,
 };
 use vars qw(
 	$opt_D $opt_d $opt_e $opt_F $opt_h $opt_l
-	$opt_m $opt_n $opt_o $opt_p $opt_r $opt_S $opt_v $opt_w $opt_x
+	$opt_m $opt_o $opt_p $opt_r $opt_S $opt_v $opt_w $opt_x
 );
 my $arch=`uname -m`;
 chomp($arch);
-my $options="aDdeFfHhlmnoprSvwXx";
+my $options="DdeFhlmoprSvwx";
 sub usage
+	{
-	my $default = OPENBSD ? "-DdmnoprSx" : "-DdelmnoprSx";
+	my $default = OPENBSD ? "-DdmoprSx" : "-DdelmoprSx";
 	print STDERR <<"EOF";
 mdoclint: verify man page correctness
 usage:	mdoclint [-$options] file ...
 	-D	warn about bad casing and archs in .Dt
 	-d	warn about bad date strings (in .Dd only)
 	-e	warn about unsorted errors (for functions)
 	-F	fix whitespace problems (asks before overwriting)
 	-h	display this help text
 	-l	warn about unknown libraries
 	-m	warn about man pages that are not in mdoc(7) format
 	-n	warn about .Nd's ending in '.'
 	-o	warn about non-empty .Os strings
 	-p	warn about punctuation problems
 	-r	warn about missing RCS Id
 	-S	warn about any .Sh weirdness
 	-v	verbose output
 	-w	show section header in warnings
 	-x	warn about cross-references with missing targets
 Default is $default if no flag is specified.
 EOF
 	exit(0);
+}
 @@ -226,32 +225,30 @@ sub warning
 	my $extra = "";
 	if ($opt_w) {
 		$extra = $self->{current_section_header}.":";
+	}
 	print STDOUT "$self->{fn}:$extra$self->{ln}: ", join('', @_), "\n";
+}
 sub handle_options
+{
 	getopts($options);
 	$opt_h and usage();
 	# default to all warnings if no flag is set
-	unless ($opt_D or $opt_d or $opt_e or $opt_l
+	unless ($opt_D or $opt_d or $opt_e or $opt_l or $opt_m
-		or $opt_m or $opt_n or $opt_o or $opt_p or $opt_r
+	    or $opt_o or $opt_p or $opt_r or $opt_S or $opt_x) {
 		or $opt_S or $opt_x) {
 		$opt_D = $opt_d = $opt_m =
-		    $opt_n = $opt_o = $opt_p = $opt_r = $opt_S =
+		    $opt_o = $opt_p = $opt_r = $opt_S = $opt_x = 1;
 		    $opt_x = 1;
 		$opt_e = $opt_l = 1 if NETBSD;
+	}
+}
 sub verify_xref
+{
 	my ($self, $page, $section, $pre, $post) = @_;
 	if ($self->{names}{$page.$section}) {
 		$self->warning("Xref to itself (use .Nm instead)") if $opt_x;
+	}
 	# try to find corresponding man page
 	if (OPENBSD) {
 @@ -428,30 +425,26 @@ sub process_line
 			$s->{names}{$1.$s->{sec}} = 1;
+		}
+	}
 	if (/^\.Lb\s+(\S+)/o) {
 		if (not $libraries{$1}) {
 			$s->warning("Unknown library `$1' used as Lb argument") if $opt_l;
+		}
+	}
 	if (/^\.Os\s+(.+)/o) {
 		$s->warning(".Os used with argument `$1'") if $opt_o;
+	}
 	if (/^\.Nd.*\.$/o) {
 		$s->warning(".Nd ends with a dot: `$_'") if $opt_n;
 	if (/(\w\w)\.\s+[A-Z]/o and not /^.%T/ and not $s->{inliteral}) {
 		if ("$1" ne "St") {
 			$s->warning("new sentence, new line: `$_'") if $opt_p;
+		}
+	}
 	if (/^\... .*[^\s][\.();,\[\]\{\}:]$/o
 	    and not /\s\.\.\.$/o and not /\\&.$/o) {
 		$s->warning("punctuation in format string ",
 		    "without space: `$_'") if $opt_p;
+	}
 	if (/^\./o and /Ns [\.();,\[\]\{\}:]/o) {
 		$s->warning("possible Ns abuse: `$_'") if $opt_p;
+	}

 @@ -1,15 +1,15 @@
 .\"	$OpenBSD: mdoclint.1,v 1.7 2009/04/13 19:06:38 jmc Exp $
-.\" $NetBSD: mdoclint.1,v 1.20 2017/06/01 14:38:50 wiz Exp $
+.\" $NetBSD: mdoclint.1,v 1.21 2017/06/07 19:09:55 wiz Exp $
 .\"
 .\" Copyright (c) 2001-2013 Thomas Klausner
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 @@ -23,59 +23,56 @@
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd May 15, 2017
 .Dt MDOCLINT 1
 .Os
 .Sh NAME
 .Nm mdoclint
 .Nd man page verifier
 .Sh SYNOPSIS
 .Nm
-.Op Fl DdeFhlmnoprSvwx
+.Op Fl DdeFhlmoprSvwx
 .Ar
 .Sh DESCRIPTION
 .Nm
 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 DdelmnoprSx
+.Fl DdelmoprSx
 is assumed (that is, everything except
 .Fl Fhvw ) .
 .Pp
 The options are as follows:
 .Bl -tag -width xxxx -compact
 .It Fl D
 Warn about bad casing and architectures in the .Dt macro.
 .It Fl d
 Warn about bad date strings (in the .Dd macro).
 .It Fl e
 Warn about unsorted errors (for functions).
 .It Fl F
 Delete whitespace at the end of input lines.
 .It Fl h
 Display usage.
 .It Fl l
 Warn about unknown libraries used as arguments to Lb.
 .It Fl m
 Warn if man page is not in
 .Xr mdoc 7
 format.
 .It Fl n
 Warn when the .Nd macro's argument ends in a dot, that is
 .Sq \&. .
 .It Fl o
 Warn when the .Os macro has an argument (it shouldn't have one at
 least in the base system, because on
 .Nx
 the current version is default).
 .It Fl p
 Warn about possible punctuation problems at the end of macro arguments,
 abuse of .Ns to get punctuation directly next to a word,
 and sentences not starting on a new line.
 .It Fl r
 Warn about missing RCS Id.
 .It Fl S
 Warn about any unknown sections or about a section that comes in the

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.65 2017/06/01 14:38:50 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2017/06/07 19:09:55 wiz Exp $
-DISTNAME=	mdoclint-1.54
+DISTNAME=	mdoclint-1.55
 CATEGORIES=	textproc
 MASTER_SITES=	# none
 DISTFILES=	# none
 OWNER=		wiz@NetBSD.org
 #HOMEPAGE=	#
 COMMENT=	Tool for verifying man pages
 LICENSE=	2-clause-bsd
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 WRKSRC=		${WRKDIR}
 NO_BUILD=	yes