 @@ -1,17 +1,17 @@
 #!@PERL5@
+#
 # $OpenBSD: mdoclint,v 1.14 2009/04/13 12:40:05 espie Exp $
-# $NetBSD: mdoclint,v 1.40 2013/08/05 10:08:25 wiz Exp $
+# $NetBSD: mdoclint,v 1.41 2013/08/21 11:22:15 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.
+#
 @@ -72,37 +72,38 @@ usage:	mdoclint [-$options] file ...
 	-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 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 explicit mentions of the *BSD system names
 	-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",
     "DragonFly" => ".Dx",
     "Open" => ".Ox"
 );
 my %libraries = (
     "libarchive" => 1,
     "libarm" => 1,
     "libarm32" => 1,
     "libbluetooth" => 1,
     "libc" => 1,
     "libcdk" => 1,
     "libcompat" => 1,
     "libcrypt" => 1,
     "libcurses" => 1,
 @@ -513,35 +514,36 @@ sub process_line
 	if (OPENBSD) {
 		if (/^(?:[<>])/o or /[^\\][<>]/o) {
 			$s->warning("use \*(Lt \*(Gt (or .Aq) ",
 			    "instead of < >: `$_'") if $opt_H;
+		}
+	}
 	if (NETBSD) {
 		if (/^(?:[<>&])/o or /[^\\][<>&]/o) {
 			$s->warning("use \*[Lt] \*[Gt] (or .Aq) \*[Am] ",
 			    "instead of < > &: `$_'") if $opt_H;
+		}
+	}
-	if (/\b(Free|Net|Open)BSD\b/o
+	if (/\b(Free|Net|DragonFly|Open)BSD\b/o
-	    and not /\b(?:www|ftp)\.(?:Free|Net|Open)BSD\.org\b/o
+	    and not /\b(?:www|ftp)\.(?:Free|Net|DragonFly|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)) {
+	if (/^\./o and (/Bx (Open)/o or /Bx (Free)/o
 			or /Bx (DragonFly)/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) {

 @@ -1,41 +1,41 @@
 .\"	$OpenBSD: mdoclint.1,v 1.7 2009/04/13 19:06:38 jmc Exp $
-.\" $NetBSD: mdoclint.1,v 1.12 2013/08/05 07:37:14 wiz Exp $
+.\" $NetBSD: mdoclint.1,v 1.13 2013/08/21 11:22:15 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.
 .\"
 .\" 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 July 30, 2013
+.Dd August 21, 2013
 .Dt MDOCLINT 1
 .Os
 .Sh NAME
 .Nm mdoclint
 .Nd man page verifier
 .Sh SYNOPSIS
 .Nm
 .Op Fl AaDdeFfHhlmnoPprSsvwXx
 .Ar
 .Sh DESCRIPTION
 .Nm
 is a man page verifier.
 It tries to automatically find as many common
 @@ -119,32 +119,34 @@ 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
 Display the section name,
 in addition to the relevant line number,
 in warnings.
 .It Fl X
 Warn about explicit mentions of the words
 .Dq FreeBSD ,
 .Dq NetBSD ,
 .Dq DragonFlyBSD ,
 and
 .Dq OpenBSD ,
-which should be replaced by .Fx, .Nx, and .Ox respectively.
+which should be replaced by .Fx, .Nx, .Dx, and .Ox respectively.
 Also notices occurrences of
 .Dq \&.Bx Free ,
 .Dq \&.Bx Net ,
 .Dq \&.Bx DragonFly ,
 and
 .Dq \&.Bx Open ,
 for which the same applies.
 .It Fl x
 Warn about cross-references whose target is missing, cross-references
 to itself, or plain bogus cross-references.
 .Pp
 For
 .Dq .Xr name X ,
 the following files are checked:
 .Pa /usr/share/man/manX/name.X ,
 .Pa /usr/share/man/manX/`uname -m`/name.X ,
 .Pa /usr/X11R7/man/manX/name.X ,

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.30 2013/07/30 19:09:00 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2013/08/21 11:22:15 wiz Exp $
-DISTNAME=	mdoclint-1.22
+DISTNAME=	mdoclint-1.23
 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