CVS commit: pkgsrc/pkgtools/pkglint

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu Aug  9 20:21:42 UTC 2018

Modified Files:
        pkgsrc/pkgtools/pkglint: Makefile
        pkgsrc/pkgtools/pkglint/files: buildlink3.go category.go
            package_test.go

Log Message:
pkgtools/pkglint: make the tests run cleanly


To generate a diff of this commit:
cvs rdiff -u -r1.544 -r1.545 pkgsrc/pkgtools/pkglint/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/pkgtools/pkglint/files/buildlink3.go
cvs rdiff -u -r1.11 -r1.12 pkgsrc/pkgtools/pkglint/files/category.go
cvs rdiff -u -r1.25 -r1.26 pkgsrc/pkgtools/pkglint/files/package_test.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.544 pkgsrc/pkgtools/pkglint/Makefile:1.545
--- pkgsrc/pkgtools/pkglint/Makefile:1.544      Thu Aug  9 20:08:12 2018
+++ pkgsrc/pkgtools/pkglint/Makefile    Thu Aug  9 20:21:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.544 2018/08/09 20:08:12 rillig Exp $
+# $NetBSD: Makefile,v 1.545 2018/08/09 20:21:42 rillig Exp $
 
 PKGNAME=       pkglint-5.5.16
 DISTFILES=     # none
@@ -22,7 +22,7 @@ SUBST_CLASSES+=               pkglint
 SUBST_STAGE.pkglint=   post-configure
 SUBST_FILES.pkglint+=  pkglint.go
 SUBST_SED.pkglint+=    -e s\|@VERSION@\|${PKGNAME:S/pkglint-//}\|g
-SUBST_SED.pkglint+=    -e s\|@BMAKE@\|${MAKE:Q}\|g
+SUBST_SED.pkglint+=    -e s\|@BMAKE@\|${MAKE:T:Q}\|g
 
 do-extract:
        ${RUN} ${MKDIR} ${WRKDIR}/pkglint

Index: pkgsrc/pkgtools/pkglint/files/buildlink3.go
diff -u pkgsrc/pkgtools/pkglint/files/buildlink3.go:1.12 pkgsrc/pkgtools/pkglint/files/buildlink3.go:1.13
--- pkgsrc/pkgtools/pkglint/files/buildlink3.go:1.12    Thu Jul 12 16:23:36 2018
+++ pkgsrc/pkgtools/pkglint/files/buildlink3.go Thu Aug  9 20:21:42 2018
@@ -13,7 +13,7 @@ func ChecklinesBuildlink3Mk(mklines *MkL
 
        mklines.Check()
 
-       exp := NewExpecter(mklines.lines)
+       exp := NewMkExpecter(mklines)
 
        for exp.AdvanceIfPrefix("#") {
                line := exp.PreviousLine()

Index: pkgsrc/pkgtools/pkglint/files/category.go
diff -u pkgsrc/pkgtools/pkglint/files/category.go:1.11 pkgsrc/pkgtools/pkglint/files/category.go:1.12
--- pkgsrc/pkgtools/pkglint/files/category.go:1.11      Sun Jan 28 23:21:16 2018
+++ pkgsrc/pkgtools/pkglint/files/category.go   Thu Aug  9 20:21:42 2018
@@ -18,7 +18,7 @@ func CheckdirCategory() {
        mklines := NewMkLines(lines)
        mklines.Check()
 
-       exp := NewExpecter(lines)
+       exp := NewMkExpecter(mklines)
        for exp.AdvanceIfPrefix("#") {
        }
        exp.ExpectEmptyLine(G.opts.WarnSpace)

Index: pkgsrc/pkgtools/pkglint/files/package_test.go
diff -u pkgsrc/pkgtools/pkglint/files/package_test.go:1.25 pkgsrc/pkgtools/pkglint/files/package_test.go:1.26
--- pkgsrc/pkgtools/pkglint/files/package_test.go:1.25  Thu Aug  9 20:08:12 2018
+++ pkgsrc/pkgtools/pkglint/files/package_test.go       Thu Aug  9 20:21:42 2018
@@ -515,7 +515,7 @@ func (s *Suite) Test_Package_includeAfte
 
        t.CheckOutputLines(
                "WARN: ~/category/package/Makefile: Neither PLIST nor PLIST.common exist, and PLIST_SRC is unset.",
-               "WARN: ~/category/package/distinfo: File not found. Please run \"@BMAKE@ makesum\" or define NO_CHECKSUM=yes in the package Makefile.",
+               "WARN: ~/category/package/distinfo: File not found. Please run \""+confMake+" makesum\" or define NO_CHECKSUM=yes in the package Makefile.",
                "ERROR: ~/category/package/Makefile: Each package must define its LICENSE.",
                "WARN: ~/category/package/Makefile: No COMMENT given.",
                "ERROR: ~/category/package/Makefile:4: \"options.mk\" does not exist.",