Fri Jul 27 20:54:02 2012 UTC ()
Improve warning about gettext/msgfmt dependency.
In another part pkglint already knows that BUILD_USES_MSGFMT is deprecated,
so a second run would have provided the correct answer.


(wiz)
diff -r1.842 -r1.843 pkgsrc/pkgtools/pkglint/files/pkglint.pl
cvs diff -r1.842 -r1.843 pkgsrc/pkgtools/pkglint/files/Attic/pkglint.pl (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint/files/Attic/pkglint.pl 2012/07/17 19:24:46 1.842
+++ pkgsrc/pkgtools/pkglint/files/Attic/pkglint.pl 2012/07/27 20:54:02 1.843
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#! @PERL@ 1#! @PERL@
2# $NetBSD: pkglint.pl,v 1.842 2012/07/17 19:24:46 wiz Exp $ 2# $NetBSD: pkglint.pl,v 1.843 2012/07/27 20:54:02 wiz Exp $
3# 3#
4 4
5# pkglint - static analyzer and checker for pkgsrc packages 5# pkglint - static analyzer and checker for pkgsrc packages
6# 6#
7# Written by: 7# Written by:
8# Roland Illig <rillig@NetBSD.org> 8# Roland Illig <rillig@NetBSD.org>
9# 9#
10# Based on work by: 10# Based on work by:
11# Hubert Feyrer <hubertf@NetBSD.org> 11# Hubert Feyrer <hubertf@NetBSD.org>
12# Thorsten Frueauf <frueauf@NetBSD.org> 12# Thorsten Frueauf <frueauf@NetBSD.org>
13# Thomas Klausner <wiz@NetBSD.org> 13# Thomas Klausner <wiz@NetBSD.org>
14# and others. 14# and others.
15# 15#
@@ -4990,27 +4990,27 @@ sub checkline_mk_vartype_basic($$$$$$$$) @@ -4990,27 +4990,27 @@ sub checkline_mk_vartype_basic($$$$$$$$)
4990"Typical dependencies have the form \"package>=2.5\", \"package-[0-9]*\"", 4990"Typical dependencies have the form \"package>=2.5\", \"package-[0-9]*\"",
4991"or \"package-3.141\"."); 4991"or \"package-3.141\".");
4992 } 4992 }
4993 4993
4994 } elsif ($type eq "DependencyWithPath") { 4994 } elsif ($type eq "DependencyWithPath") {
4995 if ($value =~ regex_unresolved) { 4995 if ($value =~ regex_unresolved) {
4996 # don't even try to check anything 4996 # don't even try to check anything
4997 } elsif ($value =~ m"(.*):(\.\./\.\./([^/]+)/([^/]+))$") { 4997 } elsif ($value =~ m"(.*):(\.\./\.\./([^/]+)/([^/]+))$") {
4998 my ($pattern, $relpath, $cat, $pkg) = ($1, $2, $3, $4); 4998 my ($pattern, $relpath, $cat, $pkg) = ($1, $2, $3, $4);
4999 4999
5000 checkline_relative_pkgdir($line, $relpath); 5000 checkline_relative_pkgdir($line, $relpath);
5001 5001
5002 if ($pkg eq "msgfmt" || $pkg eq "gettext") { 5002 if ($pkg eq "msgfmt" || $pkg eq "gettext") {
5003 $line->log_warning("Please use BUILD_USES_MSGFMT=yes instead of this dependency."); 5003 $line->log_warning("Please use USE_TOOLS+=msgfmt instead of this dependency.");
5004 5004
5005 } elsif ($pkg =~ m"^perl\d+") { 5005 } elsif ($pkg =~ m"^perl\d+") {
5006 $line->log_warning("Please use USE_TOOLS+=perl:run instead of this dependency."); 5006 $line->log_warning("Please use USE_TOOLS+=perl:run instead of this dependency.");
5007 5007
5008 } elsif ($pkg eq "gmake") { 5008 } elsif ($pkg eq "gmake") {
5009 $line->log_warning("Please use USE_TOOLS+=gmake instead of this dependency."); 5009 $line->log_warning("Please use USE_TOOLS+=gmake instead of this dependency.");
5010 5010
5011 } 5011 }
5012 5012
5013 if ($pattern =~ regex_dependency_gt) { 5013 if ($pattern =~ regex_dependency_gt) {
5014# ($abi_pkg, $abi_version) = ($1, $2); 5014# ($abi_pkg, $abi_version) = ($1, $2);
5015 } elsif ($pattern =~ regex_dependency_wildcard) { 5015 } elsif ($pattern =~ regex_dependency_wildcard) {
5016# ($abi_pkg) = ($1); 5016# ($abi_pkg) = ($1);