CVS commit: pkgsrc/pkgtools/pkglint

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Nov 13 21:20:59 UTC 2021

Modified Files:
        pkgsrc/pkgtools/pkglint: Makefile
        pkgsrc/pkgtools/pkglint/files: line.go package.go pkgsrc.go

Log Message:
pkgtools/pkglint: update to 21.3.3

Changes since 21.3.2:

Explain warning about invalid symlink.

Do not warn when a package uses MAKE_JOBS without adding it to
BUILD_DEFS, since MAKE_JOBS is supposed to be a build-time only
variable.


To generate a diff of this commit:
cvs rdiff -u -r1.702 -r1.703 pkgsrc/pkgtools/pkglint/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/pkgtools/pkglint/files/line.go
cvs rdiff -u -r1.103 -r1.104 pkgsrc/pkgtools/pkglint/files/package.go
cvs rdiff -u -r1.64 -r1.65 pkgsrc/pkgtools/pkglint/files/pkgsrc.go

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkglint/Makefile
diff -u pkgsrc/pkgtools/pkglint/Makefile:1.702 pkgsrc/pkgtools/pkglint/Makefile:1.703
--- pkgsrc/pkgtools/pkglint/Makefile:1.702      Fri Nov  5 20:02:47 2021
+++ pkgsrc/pkgtools/pkglint/Makefile    Sat Nov 13 21:20:59 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.702 2021/11/05 20:02:47 bsiegert Exp $
+# $NetBSD: Makefile,v 1.703 2021/11/13 21:20:59 rillig Exp $
 
-PKGNAME=       pkglint-21.3.2
-PKGREVISION=   1
+PKGNAME=       pkglint-21.3.3
 CATEGORIES=    pkgtools
 DISTNAME=      tools
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=golang/}

Index: pkgsrc/pkgtools/pkglint/files/line.go
diff -u pkgsrc/pkgtools/pkglint/files/line.go:1.49 pkgsrc/pkgtools/pkglint/files/line.go:1.50
--- pkgsrc/pkgtools/pkglint/files/line.go:1.49  Sun Jun  6 07:41:34 2021
+++ pkgsrc/pkgtools/pkglint/files/line.go       Sat Nov 13 21:20:59 2021
@@ -167,7 +167,7 @@ func (line *Line) Notef(format string, a
        G.Logger.Diag(line, Note, format, args...)
 }
 
-func (line *Line) Explain(explanation ...string) { G.Logger.Explain(explanation...) }
+func (*Line) Explain(explanation ...string) { G.Logger.Explain(explanation...) }
 
 func (line *Line) String() string {
        return sprintf("%s:%s: %s", line.Filename(), line.Linenos(), line.Text)

Index: pkgsrc/pkgtools/pkglint/files/package.go
diff -u pkgsrc/pkgtools/pkglint/files/package.go:1.103 pkgsrc/pkgtools/pkglint/files/package.go:1.104
--- pkgsrc/pkgtools/pkglint/files/package.go:1.103      Sat Aug 14 09:46:11 2021
+++ pkgsrc/pkgtools/pkglint/files/package.go    Sat Nov 13 21:20:59 2021
@@ -1494,7 +1494,11 @@ func (pkg *Package) checkDirent(dirent C
                }
 
        case mode&os.ModeSymlink != 0:
-               NewLineWhole(dirent).Warnf("Invalid symlink name.")
+               line := NewLineWhole(dirent)
+               line.Warnf("Invalid symlink name.")
+               line.Explain(
+                       "The only symlinks that pkglint ever expects are those to",
+                       "WRKDIR, which are usually named 'work' or 'work.*'.")
 
        default:
                NewLineWhole(dirent).Errorf("Only files and directories are allowed in pkgsrc.")

Index: pkgsrc/pkgtools/pkglint/files/pkgsrc.go
diff -u pkgsrc/pkgtools/pkglint/files/pkgsrc.go:1.64 pkgsrc/pkgtools/pkglint/files/pkgsrc.go:1.65
--- pkgsrc/pkgtools/pkglint/files/pkgsrc.go:1.64        Sat Aug 14 15:11:30 2021
+++ pkgsrc/pkgtools/pkglint/files/pkgsrc.go     Sat Nov 13 21:20:59 2021
@@ -881,6 +881,7 @@ func (src *Pkgsrc) loadDefaultBuildDefs(
                "FETCH_CMD",
                "FETCH_OUTPUT_ARGS",
                "FETCH_USING",
+               "MAKE_JOBS",
                "PKGSRC_RUN_TEST")
 
        // The following variables are used so often that not every