 @@ -1,19 +1,19 @@
 #!@PERL5@
+#
 # $OpenBSD: mdoclint,v 1.14 2009/04/13 12:40:05 espie Exp $
-# $NetBSD: mdoclint,v 1.21 2013/01/01 01:42:08 jnemeth Exp $
+# $NetBSD: mdoclint,v 1.22 2013/03/06 21:26:45 wiz Exp $
+#
-# Copyright (c) 2001-2012 Thomas Klausner
+# 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.
+#
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR, THOMAS KLAUSNER,
 # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 @@ -32,77 +32,132 @@ use strict;
 use warnings;
 $| = 1;
 package Parser;
 use Getopt::Std;
 use constant {
 	OPENBSD => 0,
 	NETBSD => 1
 };
 use vars qw(
-    	$opt_A $opt_a $opt_D $opt_d $opt_e $opt_F $opt_f $opt_H $opt_h $opt_m
+    	$opt_A $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_o $opt_P $opt_p $opt_r $opt_S $opt_s $opt_v $opt_w
 	$opt_X $opt_x
 );
 my $arch=`uname -m`;
 chomp($arch);
-my $options="AaDdeFfHhmnOoPprSsvwXx";
+my $options="AaDdeFfHhlmnOoPprSsvwXx";
 sub usage
+	{
 	my $default = OPENBSD ? "-aDdfmnoPprSsXx" : "-aDdefmnoPprSsXx";
 	print STDERR <<"EOF";
 mdoclint: verify man page correctness
 usage:	mdoclint [-$options] file ...
 	-A	warn about missing .An in AUTHORS section
 	-a	warn about SEE ALSO section problems
 	-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)
 	-f	warn about possible incorrect .Fn syntax
 	-H	warn about characters that produce problems in HTML output
 	-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 unsorted .It arguments
 	-o	warn about non-empty .Os strings
 	-P	warn about paragraph problems
 	-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 FreeBSD, NetBSD, or OpenBSD
 	-x	warn about cross-references with missing targets
 Default is $default if no flag is specified.
 EOF
 	exit(0);
+}
 my %short = (
     "Free" => ".Fx",
     "Net" => ".Nx",
     "Open" => ".Ox"
 );
 my %libraries = (
     "libarchive" => 1,
     "libarm" => 1,
     "libarm32" => 1,
     "libbluetooth" => 1,
     "libc" => 1,
     "libcdk" => 1,
     "libcompat" => 1,
     "libcrypt" => 1,
     "libcurses" => 1,
     "libdm" => 1,
     "libedit" => 1,
     "libelf" => 1,
     "libevent" => 1,
     "libexecinfo" => 1,
     "libfetch" => 1,
     "libform" => 1,
     "libi386" => 1,
     "libintl" => 1,
     "libipsec" => 1,
     "libiscsi" => 1,
     "libisns" => 1,
     "libkvm" => 1,
     "libm" => 1,
     "libm68k" => 1,
     "libmagic" => 1,
     "libmenu" => 1,
     "libnetpgp" => 1,
     "libossaudio" => 1,
     "libpam" => 1,
     "libpcap" => 1,
     "libpci" => 1,
     "libperfuse" => 1,
     "libpmc" => 1,
     "libposix" => 1,
     "libppath" => 1,
     "libprop" => 1,
     "libpthread" => 1,
     "libpuffs" => 1,
     "libquota" => 1,
     "librefuse" => 1,
     "libresolv" => 1,
     "librt" => 1,
     "libsaslc" => 1,
     "libssp" => 1,
     "libtermcap" => 1,
     "libterminfo" => 1,
     "libusbhid" => 1,
     "libutil" => 1,
     "libx86_64" => 1,
     "libz" => 1
 );
 # constants to build
 my %sections;
 my $arches_re;
 my $sections_re;
 my $esections_re;
 my $valid_date_re;
 # and the code that builds them
+{
 	my @sections = (
 		"NAME",
 		NETBSD ? "LIBRARY" : undef,
 		"SYNOPSIS",
 		"DESCRIPTION",
 @@ -196,33 +251,34 @@ sub forder {
 		if($c){ return $c };
+	}
 	return (length($a) <=> length($b));
+}
 sub handle_options
+{
 	getopts($options);
 	$opt_h and usage();
 	# default to all warnings if no flag is set
 	unless ($opt_A or $opt_a or $opt_D or $opt_d or $opt_e
-		or $opt_f or $opt_H or $opt_m or $opt_n or $opt_O
+		or $opt_f or $opt_H or $opt_l
 		or $opt_m or $opt_n or $opt_O
 		or $opt_o or $opt_P or $opt_p or $opt_r
 		or $opt_S or $opt_s or $opt_X or $opt_x) {
 		$opt_A = $opt_a = $opt_D = $opt_d = $opt_f = $opt_m =
 		    $opt_n = $opt_O = $opt_o = $opt_P = $opt_p = $opt_r = $opt_S =
 		    $opt_s = $opt_X = $opt_x = 1;
-		$opt_e = 1 if NETBSD;
+		$opt_e = $opt_l = 1 if NETBSD;
+	}
+}
 sub verify_xref
+{
 	my ($self, $page, $section, $pre, $post) = @_;
 	if ("$page.$section" eq $self->{fn}) {
 		$self->warning("Xref to itself (use .Nm instead)") if $opt_x;
+	}
 	# try to find corresponding man page
 	for my $dir ("/usr/share/man",
 	    OPENBSD ? "/usr/X11R6/man" : "/usr/X11R7/man") {
 @@ -451,26 +507,31 @@ sub process_line
 	if (/\b(Free|Net|Open)BSD\b/o
 	    and not /\b(?:www|ftp)\.(?:Free|Net|Open)BSD\.org\b/o
 	    and not /\bOpenBSD\::.*3p\b/o
 	    and not /\/pub\/OpenBSD\//o
 	    and not /\@(?:Free|Net|Open)BSD\.(?i:org)\b/o) {
 		$s->warning("verbose mention of `$1BSD' instead of "
 		    . "`$short{$1}': `$_'") if $opt_X;
+	}
 	if (/^\./o and (/Bx (Open)/o or /Bx (Free)/o or /Bx (Net)/o)) {
 		$s->warning("`.Bx $1' found -- use $short{$1} instead")
 		    if $opt_X;
+	}
 	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) {
 		$s->warning("new sentence, new line: `$_'") if $opt_p;
+	}
 	if (/^\... .*[^\s][\.();,\[\]\{\}:]$/o
 	    and not /\s\.\.\.$/o and not /\\&.$/o) {

 @@ -1,49 +1,49 @@
 .\"	$OpenBSD: mdoclint.1,v 1.7 2009/04/13 19:06:38 jmc Exp $
-.\" $NetBSD: mdoclint.1,v 1.6 2012/02/22 15:31:35 wiz Exp $
+.\" $NetBSD: mdoclint.1,v 1.7 2013/03/06 21:26:45 wiz Exp $
 .\"
-.\" Copyright (c) 2001-2011 Thomas Klausner
+.\" 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.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR, THOMAS KLAUSNER,
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" 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 September 26, 2011
+.Dd March 6, 2013
 .Dt MDOCLINT 1
 .Os
 .Sh NAME
 .Nm mdoclint
 .Nd man page verifier
 .Sh SYNOPSIS
 .Nm
-.Op Fl AaDdeFfHhmnOoPprSsvwXx
+.Op Fl AaDdeFfHhlmnOoPprSsvwXx
 .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 aDdefmnoPprSsXx
 is assumed (that is, everything except
 .Fl FHhvw ) .
 .Pp
 The options are as follows:
 .Bl -tag -width xxxx -compact
 @@ -80,26 +80,28 @@ HTML output:
 .Sq \*[Gt] ,
 and
 .Sq \*[Am] .
 Replace a pair of angle quotes with the .Aq macro.
 Otherwise, the replacements are
 .Dq \e*[Lt] ,
 .Dq \e*[Gt] ,
 and
 .Dq \e*[Am] .
 This option is off by default,
 as these characters no longer pose any problems.
 .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 about unsorted
 .Dq .It
 macros.
 .It Fl o
 Warn when the .Os macro has an argument (it shouldn't have one at

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.25 2013/01/01 01:42:08 jnemeth Exp $
+# $NetBSD: Makefile,v 1.26 2013/03/06 21:26:45 wiz Exp $
-DISTNAME=	mdoclint-1.18
+DISTNAME=	mdoclint-1.19
 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
 CONFLICTS=	mdocml<1.6.9