Sun Oct 8 23:25:06 2017 UTC ()
Updated pkglint4 to 4.164

Removed support for kde3, since it has been removed from pkgsrc.


(rillig)
diff -r1.8 -r1.9 pkgsrc/pkgtools/pkglint4/Makefile
diff -r1.5 -r1.6 pkgsrc/pkgtools/pkglint4/files/pkglint.pl
cvs diff -r1.8 -r1.9 pkgsrc/pkgtools/pkglint4/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint4/Makefile 2017/06/14 16:25:17 1.8
+++ pkgsrc/pkgtools/pkglint4/Makefile 2017/10/08 23:25:06 1.9
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.8 2017/06/14 16:25:17 prlw1 Exp $ 1# $NetBSD: Makefile,v 1.9 2017/10/08 23:25:06 rillig Exp $
2 2
3PKGNAME= pkglint4-4.163 3PKGNAME= pkglint4-4.164
4PKGREVISION= 2 
5CATEGORIES= pkgtools 4CATEGORIES= pkgtools
6 5
7OWNER= rillig@NetBSD.org 6OWNER= rillig@NetBSD.org
8HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/ 7HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/
9COMMENT= Verifier for NetBSD packages (old version, for all platforms) 8COMMENT= Verifier for NetBSD packages (old version, for all platforms)
10LICENSE= 2-clause-bsd 9LICENSE= 2-clause-bsd
11 10
12DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 11DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
13DEPENDS+= p5-enum>=1.016:../../devel/p5-enum 12DEPENDS+= p5-enum>=1.016:../../devel/p5-enum
14DEPENDS+= p5-pkgsrc-Dewey>=1.0:../../pkgtools/p5-pkgsrc-Dewey 13DEPENDS+= p5-pkgsrc-Dewey>=1.0:../../pkgtools/p5-pkgsrc-Dewey
15CONFLICTS+= pkglint>=5.0 14CONFLICTS+= pkglint>=5.0
16 15
17WRKSRC= ${WRKDIR} 16WRKSRC= ${WRKDIR}
cvs diff -r1.5 -r1.6 pkgsrc/pkgtools/pkglint4/files/pkglint.pl (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint4/files/pkglint.pl 2017/06/14 16:23:09 1.5
+++ pkgsrc/pkgtools/pkglint4/files/pkglint.pl 2017/10/08 23:25:06 1.6
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#! @PERL@ 1#! @PERL@
2# $NetBSD: pkglint.pl,v 1.5 2017/06/14 16:23:09 prlw1 Exp $ 2# $NetBSD: pkglint.pl,v 1.6 2017/10/08 23:25:06 rillig 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#
@@ -3763,34 +3763,26 @@ sub checkline_mk_varassign($$$$$) { @@ -3763,34 +3763,26 @@ sub checkline_mk_varassign($$$$$) {
3763 } 3763 }
3764 3764
3765 if ($varname eq "PERL5_PACKLIST" && defined($effective_pkgbase) && $effective_pkgbase =~ m"^p5-(.*)") { 3765 if ($varname eq "PERL5_PACKLIST" && defined($effective_pkgbase) && $effective_pkgbase =~ m"^p5-(.*)") {
3766 my ($guess) = ($1); 3766 my ($guess) = ($1);
3767 $guess =~ s/-/\//g; 3767 $guess =~ s/-/\//g;
3768 $guess = "auto/${guess}/.packlist"; 3768 $guess = "auto/${guess}/.packlist";
3769 3769
3770 my ($ucvalue, $ucguess) = (uc($value), uc($guess)); 3770 my ($ucvalue, $ucguess) = (uc($value), uc($guess));
3771 if ($ucvalue ne $ucguess && $ucvalue ne "\${PERL5_SITEARCH\}/${ucguess}") { 3771 if ($ucvalue ne $ucguess && $ucvalue ne "\${PERL5_SITEARCH\}/${ucguess}") {
3772 $line->log_warning("Unusual value for PERL5_PACKLIST -- \"${guess}\" expected."); 3772 $line->log_warning("Unusual value for PERL5_PACKLIST -- \"${guess}\" expected.");
3773 } 3773 }
3774 } 3774 }
3775 3775
3776 if ($varname eq "CONFIGURE_ARGS" && $value =~ m"=\$\{PREFIX\}/share/kde") { 
3777 $line->log_note("Please .include \"../../meta-pkgs/kde3/kde3.mk\" instead of this line."); 
3778 $line->explain_note( 
3779"That file probably does many things automatically and consistently that", 
3780"this package also does. When using kde3.mk, you can probably also leave", 
3781"out some explicit dependencies."); 
3782 } 
3783 
3784 if ($varname eq "EVAL_PREFIX" && $value =~ m"^([\w_]+)=") { 3776 if ($varname eq "EVAL_PREFIX" && $value =~ m"^([\w_]+)=") {
3785 my ($eval_varname) = ($1); 3777 my ($eval_varname) = ($1);
3786 3778
3787 # The variables mentioned in EVAL_PREFIX will later be 3779 # The variables mentioned in EVAL_PREFIX will later be
3788 # defined by find-prefix.mk. Therefore, they are marked 3780 # defined by find-prefix.mk. Therefore, they are marked
3789 # as known in the current file. 3781 # as known in the current file.
3790 $mkctx_vardef->{$eval_varname} = $line; 3782 $mkctx_vardef->{$eval_varname} = $line;
3791 } 3783 }
3792 3784
3793 if ($varname eq "PYTHON_VERSIONS_ACCEPTED") { 3785 if ($varname eq "PYTHON_VERSIONS_ACCEPTED") {
3794 checkline_decreasing_order($line, $varname, $value); 3786 checkline_decreasing_order($line, $varname, $value);
3795 } 3787 }
3796 3788