Remove -f. From Ingo Schwarze.

Similar check already in mandoc.

Bump version.

3 files changed, 10 insertions, 19 deletions

diff --git a/textproc/mdoclint/Makefile b/textproc/mdoclint/Makefile
index f8a8bd12556..0cc9bb426f9 100644
--- a/textproc/mdoclint/Makefile
+++ b/textproc/mdoclint/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2017/06/01 14:33:28 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2017/06/01 14:38:50 wiz Exp $
 
-DISTNAME=	mdoclint-1.53
+DISTNAME=	mdoclint-1.54
 CATEGORIES=	textproc
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/textproc/mdoclint/files/mdoclint b/textproc/mdoclint/files/mdoclint
index 1c25ce8067e..6edb94df285 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.73 2017/06/01 14:33:28 wiz Exp $
+# $NetBSD: mdoclint,v 1.74 2017/06/01 14:38:50 wiz Exp $
 #
 # Copyright (c) 2001-2017 Thomas Klausner
 # All rights reserved.
@@ -42,7 +42,7 @@ use constant {
 };
 
 use vars qw(
-	$opt_D $opt_d $opt_e $opt_F $opt_f $opt_h $opt_l
+	$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
 );
 
@@ -53,7 +53,7 @@ my $options="aDdeFfHhlmnoprSvwXx";
 
 sub usage
 	{
-	my $default = OPENBSD ? "-DdfmnoprSx" : "-DdeflmnoprSx";
+	my $default = OPENBSD ? "-DdmnoprSx" : "-DdelmnoprSx";
 
 	print STDERR <<"EOF";
 mdoclint: verify man page correctness
@@ -62,7 +62,6 @@ usage:	mdoclint [-$options] file ...
 	-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	display this help text
 	-l	warn about unknown libraries
 	-m	warn about man pages that are not in mdoc(7) format
@@ -237,10 +236,10 @@ sub handle_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_f or $opt_l
+	unless ($opt_D or $opt_d or $opt_e or $opt_l
 		or $opt_m or $opt_n or $opt_o or $opt_p or $opt_r
 		or $opt_S or $opt_x) {
-		$opt_D = $opt_d = $opt_f = $opt_m =
+		$opt_D = $opt_d = $opt_m =
 		    $opt_n = $opt_o = $opt_p = $opt_r = $opt_S =
 		    $opt_x = 1;
 		$opt_e = $opt_l = 1 if NETBSD;
@@ -430,9 +429,6 @@ sub process_line
 		}
 	}
 
-	if (/^\.Fn.*,.+/o) {
-		$s->warning("possible .Fn misuse: `$_'") if $opt_f;
-	}
 	if (/^\.Lb\s+(\S+)/o) {
 		if (not $libraries{$1}) {
 			$s->warning("Unknown library `$1' used as Lb argument") if $opt_l;
diff --git a/textproc/mdoclint/files/mdoclint.1 b/textproc/mdoclint/files/mdoclint.1
index 900992a1f73..206484091c3 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.19 2017/06/01 14:33:28 wiz Exp $
+.\" $NetBSD: mdoclint.1,v 1.20 2017/06/01 14:38:50 wiz Exp $
 .\"
 .\" Copyright (c) 2001-2013 Thomas Klausner
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .Nd man page verifier
 .Sh SYNOPSIS
 .Nm
-.Op Fl DdeFfhlmnoprSvwx
+.Op Fl DdeFhlmnoprSvwx
 .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 DdeflmnoprSx
+.Fl DdelmnoprSx
 is assumed (that is, everything except
 .Fl Fhvw ) .
 .Pp
@@ -55,11 +55,6 @@ Warn about bad date strings (in the .Dd macro).
 Warn about unsorted errors (for functions).
 .It Fl F
 Delete whitespace at the end of input lines.
-.It Fl f
-Warn about possible .Fn abuse; its arguments should be put in
-.Sq \&"
-separately, not together and separated by commas.
-Those will be automatically added by mdoc.
 .It Fl h
 Display usage.
 .It Fl l