diff options
| author | wiz <wiz@pkgsrc.org> | 2013-03-14 18:01:12 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2013-03-14 18:01:12 +0000 |
| commit | 9d64be42db965677f6d85f805f58252b71ed6b0a (patch) | |
| tree | 8064a77547e2baba6055b1ea669b8f7be4964c1b /textproc | |
| parent | 4e74abee01788d8a80c3437ca2901bfb595f0337 (diff) | |
| download | pkgsrc-9d64be42db965677f6d85f805f58252b71ed6b0a.tar.gz | |
Report correct line for duplicate RCS Ids.
Noted by jmc@openbsd.org.
Bump version.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/mdoclint/Makefile | 4 | ||||
| -rwxr-xr-x | textproc/mdoclint/files/mdoclint | 16 |
2 files changed, 9 insertions, 11 deletions
diff --git a/textproc/mdoclint/Makefile b/textproc/mdoclint/Makefile index 9290e63a54f..cbcd6c852a6 100644 --- a/textproc/mdoclint/Makefile +++ b/textproc/mdoclint/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.26 2013/03/06 21:26:45 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2013/03/14 18:01:12 wiz Exp $ -DISTNAME= mdoclint-1.19 +DISTNAME= mdoclint-1.20 CATEGORIES= textproc MASTER_SITES= # none DISTFILES= # none diff --git a/textproc/mdoclint/files/mdoclint b/textproc/mdoclint/files/mdoclint index 8bd67e2e866..fc4a02f1a73 100755 --- a/textproc/mdoclint/files/mdoclint +++ b/textproc/mdoclint/files/mdoclint @@ -1,7 +1,7 @@ #!@PERL5@ # # $OpenBSD: mdoclint,v 1.14 2009/04/13 12:40:05 espie Exp $ -# $NetBSD: mdoclint,v 1.29 2013/03/10 22:14:40 wiz Exp $ +# $NetBSD: mdoclint,v 1.30 2013/03/14 18:01:13 wiz Exp $ # # Copyright (c) 2001-2013 Thomas Klausner # All rights reserved. @@ -424,12 +424,16 @@ sub process_line } if (/\$OpenBSD\b.*\$/o) { $s->{oxrcsidseen}++; - # nothing else to do + if (OPENBSD and ($s->{oxrcsidseen} > 1)) { + $s->warning("RCS Id seen twice") if $opt_r; + } return "$_\n"; } if (/[\$]NetBSD\b.*\$/o) { $s->{nxrcsidseen}++; - # nothing else to do + if (NETBSD and ($s->{nxrcsidseen} > 1)) { + $s->warning("RCS Id seen twice") if $opt_r; + } return "$_\n"; } # comments @@ -632,15 +636,9 @@ sub finish if (NETBSD and not $s->{nxrcsidseen}) { $s->warning("Missing RCS Id") if $opt_r; } - if (NETBSD and ($s->{nxrcsidseen} > 1)) { - $s->warning("RCS Id seen twice") if $opt_r; - } if (OPENBSD and not $s->{oxrcsidseen}) { $s->warning("Missing RCS Id") if $opt_r; } - if (OPENBSD and ($s->{oxrcsidseen} > 1)) { - $s->warning("RCS Id seen twice") if $opt_r; - } if ($s->{lastline} =~ /^\.Pp/o) { $s->warning("Paragraph problem: .Pp at EOF") if $opt_P; |