From 98644d122e90586a7d3fe128c3f79a2cd47eb5c8 Mon Sep 17 00:00:00 2001 From: schwarze Date: Thu, 27 Apr 2017 22:27:43 +0000 Subject: [PATCH] Merge trivial patches from pkgsrc to get rid of gratuitious differences; no functional change on OpenBSD: rev.s 1.50, 1.52, 1.62, 1.63 Of course, keep intentional differences. --- regress/usr.bin/mdoclint/mdoclint | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/regress/usr.bin/mdoclint/mdoclint b/regress/usr.bin/mdoclint/mdoclint index 737fe4a3306..dd9e2e9a475 100644 --- a/regress/usr.bin/mdoclint/mdoclint +++ b/regress/usr.bin/mdoclint/mdoclint @@ -1,9 +1,9 @@ #!/usr/bin/perl # -# $OpenBSD: mdoclint,v 1.55 2017/04/27 22:07:06 schwarze Exp $ -# $NetBSD: mdoclint,v 1.49 2014/06/23 18:10:21 wiz Exp $ +# $OpenBSD: mdoclint,v 1.56 2017/04/27 22:27:43 schwarze Exp $ +# $NetBSD: mdoclint,v 1.65 2017/04/25 13:17:38 wiz Exp $ # -# Copyright (c) 2001-2013 Thomas Klausner +# Copyright (c) 2001-2017 Thomas Klausner # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -140,6 +140,7 @@ my %libraries = ( "libppath" => 1, "libprop" => 1, "libpthread" => 1, + "libpthread_dbg" => 1, "libpuffs" => 1, "libquota" => 1, "librefuse" => 1, @@ -205,7 +206,8 @@ my $valid_date_re; if (NETBSD) { @arches = (qw(acorn26 acorn32 algor alpha amiga arc atari - bebox cats cesfic cobalt dreamcast evbarm evbmips evbppc + bebox cats cesfic cobalt dreamcast + emips evbarm evbmips evbppc evbsh3 evbsh5 hp300 hpcarm hpcmips hpcsh hppa i386 ibmnws luna68k mac68k macppc mipsco mmeye mvme68k mvmeppc netwinder news68k newsmips next68k @@ -227,7 +229,7 @@ my $valid_date_re; $valid_date_re = qr{\$Mdocdate\b}; } if (NETBSD) { - $valid_date_re = qr{(?:January|February|March|April|May|June|July|August|September|October|November|December)\s*[1-9][0-9]*,\s*(?:198[0-9]|199[0-9]|200[0-9]|201[0-4])$}o; + $valid_date_re = qr{(?:January|February|March|April|May|June|July|August|September|October|November|December)\s*[1-9][0-9]*,\s*(?:198[0-9]|199[0-9]|200[0-9]|201[0-7])$}o; } } @@ -293,6 +295,7 @@ sub verify_xref } } return 1 if -f "./$page.$section"; + return 1 if -f "./$page.mdoc"; $self->warning($pre."trailing Xref to $page($section)$post") if $opt_x; return 0; -- 2.20.1