Date: Tue, 10 Jul 2012 02:35:16 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: marcus@FreeBSD.org Subject: ports/169745: [PATCH] ports-mgmt/portlint: reduce false alarm of MAN* and MAN*PREFIX check Message-ID: <3WWFb822vxz5rV@sunpoet.net> Resent-Message-ID: <201207091840.q69IeDxC042163@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169745 >Category: ports >Synopsis: [PATCH] ports-mgmt/portlint: reduce false alarm of MAN* and MAN*PREFIX check >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 09 18:40:13 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 9.0-STABLE amd64 >Organization: The FreeBSD Project >Environment: System: FreeBSD bonjour.sunpoet.net 9.0-STABLE FreeBSD 9.0-STABLE #0: Sat Jul 7 22:40:22 CST >Description: - Reduce false alarm of MAN* and MAN*PREFIX check Port maintainer (marcus@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: CVS) >How-To-Repeat: % cd /usr/ports/net/mDNSResponder/ % grep MAN8 Makefile EXTRA_MAN8= dnsextd.8 mDNSResponderPosix.8 MAN8= mdnsd.8 ${EXTRA_MAN8} ${INSTALL_MAN} ${EXTRA_MAN8} ${MAN8PREFIX}/man/man8/ % portlint WARN: Makefile: only one MASTER_SITE configured. Consider adding additional mirrors. FATAL: Makefile: duplicate MAN8 macro. Only the last MAN8 macro will be processed. Use MAN8+=... instead to append man pages. 1 fatal error and 1 warning found. >Fix: --- portlint-2.13.11.patch begins here --- Index: src/portlint.pl =================================================================== RCS file: /home/ncvs/ports/ports-mgmt/portlint/src/portlint.pl,v retrieving revision 1.129 diff -u -u -r1.129 portlint.pl --- src/portlint.pl 9 Jul 2012 01:36:00 -0000 1.129 +++ src/portlint.pl 9 Jul 2012 16:46:55 -0000 @@ -3024,25 +3024,25 @@ print "OK: pkg-plist MAN$i=$plistmanall{$i}\n" if ($verbose); } if ($tmp =~ /PERL_CONFIGURE=\s*/ - && $tmp =~ /MAN3PREFIX=\s*\${PREFIX}\/lib\/perl5\/\${PERL_VERSION}/) { + && $tmp =~ /^MAN3PREFIX=\s*\${PREFIX}\/lib\/perl5\/\${PERL_VERSION}/) { &perror("WARN", $file, -1, "MAN3PREFIX is ". "\"\${PREFIX}/lib/perl5/\${PERL_VERSION}\" ". "when PERL_CONFIGURE is set. You do not need to specify it."); } foreach my $i (split(//, $manchapters)) { - if ($tmp =~ /MAN\U$i\E=\s*([^\n]*)\n/) { + if ($tmp =~ /^MAN\U$i\E=\s*([^\n]*)\n/) { print "OK: Makefile MAN\U$i\E=$1\n" if ($verbose); } } foreach my $i (split(//, $manchapters)) { next if ($i eq ''); - my @mansecs = grep(/MAN\U$i\E=\s*(.*)/, split(/\n/, $tmp)); + my @mansecs = grep(/^MAN\U$i\E=\s*(.*)/, split(/\n/, $tmp)); if (scalar @mansecs > 1) { &perror("FATAL", $file, -1, "duplicate MAN$i macro. ". "Only the last MAN$i macro will be processed. Use ". "MAN$i+=... instead to append man pages."); } - if ($tmp =~ /MAN\U$i\E=\s*([^\n]*)\n/) { + if ($tmp =~ /^MAN\U$i\E=\s*([^\n]*)\n/) { @mman = grep($_ !~ /^\s*$/, split(/\s+/, $1)); @pman = grep($_ !~ /^\s*$/, split(/\s+/, $plistmanall{$i} // '')); --- portlint-2.13.11.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3WWFb822vxz5rV>