 @@ -58,27 +58,28 @@ func (s *Suite) SetUpTest(c *check.C) {
 	s.Tester = &t
 	G = NewPkglint()
 	G.Testing = true
 	G.Logger.out = NewSeparatorWriter(&t.stdout)
 	G.Logger.err = NewSeparatorWriter(&t.stderr)
 	trace.Out = &t.stdout
 	// XXX: Maybe the tests can run a bit faster when they don't
 	// create a temporary directory each.
 	G.Pkgsrc = NewPkgsrc(t.File("."))
 	t.c = c
-	t.SetUpCommandLine("-Wall") // To catch duplicate warnings
+	t.SetUpCommandLine("-Wall")    // To catch duplicate warnings
 	t.seenSetUpCommandLine = false // This default call doesn't count.
 	// To improve code coverage and ensure that trace.Result works
 	// in all cases. The latter cannot be ensured at compile time.
 	t.EnableSilentTracing()
 	prevdir, err := os.Getwd()
 	assertNil(err, "Cannot get current working directory: %s", err)
 	t.prevdir = prevdir
 	// No longer usable; see https://github.com/go-check/check/issues/22
 	t.c = nil
+}
 @@ -121,54 +122,57 @@ func Test(t *testing.T) { check.TestingT
 // It is separated from the Suite since the latter contains
 // all the test methods, which makes it difficult to find
 // a method by auto-completion.
 type Tester struct {
 	c        *check.C // Only usable during the test method itself
 	testName string
 	stdout  bytes.Buffer
 	stderr  bytes.Buffer
 	tmpdir  string
 	prevdir string // The current working directory before the test started
 	relCwd  string // See Tester.Chdir
-	seenSetupPkgsrc int
+	seenSetUpCommandLine bool
-	seenFinish      bool
+	seenSetupPkgsrc      int
-	seenMain        bool
+	seenFinish           bool
 	seenMain             bool
+}
 // SetUpCommandLine simulates a command line for the remainder of the test.
 // See Pkglint.ParseCommandLine.
 //
 // If SetUpCommandLine is not called explicitly in a test, the command line
 // "-Wall" is used, to provide a high code coverage in the tests.
 func (t *Tester) SetUpCommandLine(args ...string) {
 	// Prevent tracing from being disabled; see EnableSilentTracing.
 	prevTracing := trace.Tracing
 	defer func() { trace.Tracing = prevTracing }()
 	exitcode := G.ParseCommandLine(append([]string{"pkglint"}, args...))
 	if exitcode != -1 && exitcode != 0 {
 		t.CheckOutputEmpty()
 		t.c.Fatalf("Cannot parse command line: %#v", args)
+	}
 	// Duplicate diagnostics often mean that the checking code is run
 	// twice, which is unnecessary.
 	//
 	// It also reveals diagnostics that are logged multiple times per
 	// line and thus can easily get annoying to the pkgsrc developers.
 	G.Logger.Opts.LogVerbose = true
 	t.seenSetUpCommandLine = true
+}
 // SetUpVartypes registers a few hundred variables like MASTER_SITES,
 // WRKSRC, SUBST_SED.*, so that their data types are known to pkglint.
 //
 // Without calling this, there will be many warnings about undefined
 // or unused variables, or unknown shell commands.
 //
 // See SetUpTool for registering tools like echo, awk, perl.
 func (t *Tester) SetUpVartypes() {
 	G.Pkgsrc.vartypes.Init(&G.Pkgsrc)
+}
 @@ -663,26 +667,30 @@ func (t *Tester) FinishSetUp() {
 		t.Errorf("Redundant t.FinishSetup() since it was called multiple times.")
+	}
+}
 // Main runs the pkglint main program with the given command line arguments.
 //
 // Arguments that name existing files or directories in the temporary test
 // directory are transformed to their actual paths.
 func (t *Tester) Main(args ...string) int {
 	if t.seenFinish && !t.seenMain {
 		t.Errorf("Calling t.FinishSetup() before t.Main() is redundant " +
 			"since t.Main() loads the pkgsrc infrastructure.")
+	}
 	if t.seenSetUpCommandLine {
 		t.Errorf("Calling t.SetupCommandLine() before t.Main() is redundant " +
 			"since t.Main() accepts the command line options directly.")
+	}
 	t.seenMain = true
 	// Reset the logger, for tests where t.Main is called multiple times.
 	G.Logger.errors = 0
 	G.Logger.warnings = 0
 	G.Logger.logged = Once{}
 	argv := []string{"pkglint"}
 	for _, arg := range args {
 		fileArg := t.File(arg)
 		_, err := os.Lstat(fileArg)
 		if err == nil {

 @@ -1504,37 +1504,37 @@ func (s *Suite) Test_MkLine_ResolveVarsI
 	test("${FILESDIR}", "files")
 	test("${PKGDIR}", ".")
 	// Just for branch coverage.
 	G.Testing = false
 	test("${PKGSRCDIR}", "../..")
+}
 func (s *Suite) Test_MkLine_ResolveVarsInRelativePath__directory_depth(c *check.C) {
 	t := s.Init(c)
 	t.SetUpVartypes()
-	mklines := t.SetUpFileMkLines("multimedia/totem/bla.mk",
+	mklines := t.SetUpFileMkLines("multimedia/totem/filename.mk",
 		MkCvsID,
 		"BUILDLINK_PKGSRCDIR.totem?=\t../../multimedia/totem")
 	mklines.Check()
 	t.CheckOutputLines(
-		"WARN: ~/multimedia/totem/bla.mk:2: "+
+		"WARN: ~/multimedia/totem/filename.mk:2: "+
 			"The variable BUILDLINK_PKGSRCDIR.totem should not be given a default value in this file; "+
 			"it would be ok in buildlink3.mk.",
-		"ERROR: ~/multimedia/totem/bla.mk:2: Relative path \"../../multimedia/totem/Makefile\" does not exist.")
+		"ERROR: ~/multimedia/totem/filename.mk:2: Relative path \"../../multimedia/totem/Makefile\" does not exist.")
+}
 // Just for code coverage
 func (s *Suite) Test_MkLine_ResolveVarsInRelativePath__without_tracing(c *check.C) {
 	t := s.Init(c)
 	t.DisableTracing()
 	t.SetUpVartypes()
 	mklines := t.SetUpFileMkLines("buildlink3.mk",
 		MkCvsID,
 		"BUILDLINK_PKGSRCDIR.totem?=\t../../${PKGPATH.multimedia/totem}")
 	mklines.Check()

 @@ -1145,27 +1145,26 @@ func (s *Suite) Test_MkLines_Check__auto
 	t.SetUpCommandLine("-Wall")
 	test(
 		"WARN: Makefile:7: HOMEPAGE should not be defined in terms of MASTER_SITEs.")
 	t.SetUpCommandLine("-Wall", "--autofix")
 	test(
 		nil...)
+}
 func (s *Suite) Test_MkLines_Check__autofix_MASTER_SITE_in_HOMEPAGE_in_package(c *check.C) {
 	t := s.Init(c)
 	t.SetUpCommandLine("-Wall", "--autofix")
 	t.SetUpPackage("category/package",
 		"MASTER_SITES=\thttps://cdn1.example.org/ https://cdn2.example.org/",
 		"HOMEPAGE=\t${MASTER_SITES}")
 	t.Main("-Wall", "-q", "category/package")
 	// When MASTER_SITES consists of several URLs, take the first one,
 	// assuming that it is the most appropriate.
 	t.CheckOutputLines(
 		"WARN: ~/category/package/Makefile:9: " +
 			"HOMEPAGE should not be defined in terms of MASTER_SITEs. " +
 			"Use https://cdn1.example.org/ directly.")

 @@ -330,26 +330,27 @@ func (s *Suite) Test_Pkgsrc_loadDocChang
 	t.SetUpPkgsrc()
 	t.Remove("doc/CHANGES-2018")
 	t.Remove("doc/TODO")
 	t.Remove("doc")
 	t.ExpectFatal(
 		t.FinishSetUp,
 		"FATAL: ~/doc: Cannot be read for loading the package changes.")
+}
 func (s *Suite) Test_Pkgsrc_loadDocChangesFromFile(c *check.C) {
 	t := s.Init(c)
 	t.SetUpCommandLine("-Cglobal", "-Wall")
 	t.CreateFileLines("doc/CHANGES-2018",
 		"\tAdded category/package version 1.0 [author1 2015-01-01]", // Wrong year
 		"\tUpdated category/package to 1.5 [author2 2018-01-02]",
 		"\tRenamed category/package to category/pkg [author3 2018-01-03]",
 		"\tMoved category/package to other/package [author4 2018-01-04]",
 		"\tRemoved category/package [author5 2018-01-09]", // Too far in the future
 		"\tRemoved category/package successor category/package2 [author6 2018-01-06]",
 		"\tDowngraded category/package to 1.2 [author7 2018-01-07]",
 		"\tReworked category/package to 1.2 [author8 2018-01-08]",
 		"",
 		"\ttoo few fields",
 		"\ttoo many many many many many fields",
 		"\tmissing brackets around author",
 @@ -400,45 +401,84 @@ func (s *Suite) Test_Pkgsrc_loadDocChang
 	t := s.Init(c)
 	t.SetUpPackage("wip/package")
 	t.CreateFileLines("doc/CHANGES-2018",
 		CvsID,
 		"",
 		"Changes to the packages collection and infrastructure in 2018:",
 		"",
 		"\tUpdated sysutils/checkperms to 1.10 [rillig 2018-01-05]",
 		"\tUpdated sysutils/checkperms to 1.11 [rillig 2018-01-01]",
 		"\t\tWrong indentation",
 		"\tInvalid pkgpath to 1.16 [rillig 2019-06-16]")
-	t.Main(t.File("wip/package"))
+	t.Main("-Cglobal", "-Wall", "wip/package")
 	t.CheckOutputLines(
 		"Looks fine.")
+}
 // When a single package is checked, only the lines from doc/CHANGES
 // that are related to that package are shown. The others are too
 // unrelated.
 func (s *Suite) Test_Pkgsrc_loadDocChangesFromFile__default(c *check.C) {
 	t := s.Init(c)
 	t.SetUpPackage("category/package")
 	t.CreateFileLines("doc/CHANGES-2018",
 		CvsID,
 		"",
 		"Changes to the packages collection and infrastructure in 2018:",
 		"",
 		"\tUpdated sysutils/checkperms to 1.10 [rillig 2018-01-05]",
 		"\tUpdated sysutils/checkperms to 1.11 [rillig 2018-01-01]",
 		"\t\tWrong indentation",
 		"\tInvalid pkgpath to 1.16 [rillig 2019-06-16]",
 		"\tUpdated category/package to 2.0 [rillig 2019-07-24]")
 	t.CreateFileLines("Makefile",
 		MkCvsID)
 	t.Main("category/package")
 	t.CheckOutputLines(
 		"WARN: ~/category/package/Makefile:3: The package is being downgraded from 2.0 (see ../../doc/CHANGES-2018:9) to 1.0.",
 		"1 warning found.",
 		"(Run \"pkglint -e\" to show explanations.)")
 	// Only when the global checks are enabled, the errors from doc/CHANGES are shown.
 	t.Main("-Cglobal", "-Wall", ".")
 	t.CheckOutputLines(
 		"WARN: ~/doc/CHANGES-2018:6: Date \"2018-01-01\" for sysutils/checkperms is earlier than \"2018-01-05\" in line 5.",
 		"WARN: ~/doc/CHANGES-2018:7: Package changes should be indented using a single tab, not \"\\t\\t\".",
 		"WARN: ~/doc/CHANGES-2018:8: Unknown doc/CHANGES line: \tInvalid pkgpath to 1.16 [rillig 2019-06-16]",
 		"WARN: ~/doc/CHANGES-2018:9: Year \"2019\" for category/package does not match the filename ~/doc/CHANGES-2018.",
 		"4 warnings found.",
 		"(Run \"pkglint -e\" to show explanations.)")
+}
 func (s *Suite) Test_Pkgsrc_loadDocChangesFromFile__wrong_indentation(c *check.C) {
 	t := s.Init(c)
 	t.SetUpPackage("category/package")
 	t.CreateFileLines("doc/CHANGES-2018",
 		CvsID,
 		"",
 		"Changes to the packages collection and infrastructure in 2018:",
 		"",
 		"        Updated sysutils/checkperms to 1.10 [rillig 2018-01-05]",
 		"    \tUpdated sysutils/checkperms to 1.11 [rillig 2018-01-01]")
-	t.Main(t.File("category/package"))
+	t.Main("-Cglobal", "-Wall", "category/package")
 	t.CheckOutputLines(
 		"WARN: ~/doc/CHANGES-2018:5: Package changes should be indented using a single tab, not \"        \".",
 		"WARN: ~/doc/CHANGES-2018:6: Package changes should be indented using a single tab, not \"    \\t\".",
 		"2 warnings found.",
 		"(Run \"pkglint -e\" to show explanations.)")
+}
 // Once or twice in a decade, changes to the pkgsrc infrastructure are also
 // documented in doc/CHANGES. These entries typically span multiple lines.
 func (s *Suite) Test_Pkgsrc_loadDocChangesFromFile__infrastructure(c *check.C) {
 	t := s.Init(c)
 @@ -538,26 +578,27 @@ func (s *Suite) Test_Pkgsrc_parseDocChan
 	// "from" is wrong
 	test("\tMoved pkgpath from previous [author date]",
 		"WARN: doc/CHANGES-2019:123: Unknown doc/CHANGES line: \tMoved pkgpath from previous [author date]")
 	// "Split" is wrong
 	// TODO: Add a warning since this is probably a typo.
 	test("\tSplit pkgpath into a and b [author date]",
 		nil...)
+}
 func (s *Suite) Test_Pkgsrc_loadDocChangesFromFile__old(c *check.C) {
 	t := s.Init(c)
 	t.SetUpCommandLine("-Cglobal", "-Wall")
 	t.SetUpPkgsrc()
 	t.CreateFileLines("doc/CHANGES-2010",
 		CvsID,
 		"",
 		"Changes to the packages collection and infrastructure in 2015:",
 		"",
 		"\tInvalid line [3 4]")
 	t.CreateFileLines("doc/CHANGES-2015",
 		CvsID,
 		"",
 		"Changes to the packages collection and infrastructure in 2015:",
 		"",
 		"\tUpdated pkgpath to 1.0 [author 2015-07-01]",

 @@ -480,28 +480,28 @@ func (s *Suite) Test_VartypeCheck_FetchU
 	G.Pkg.load()
 	vt.Varname("MASTER_SITES")
 	vt.Values(
 		"https://github.com/example/project/",
 		"http://ftp.gnu.org/pub/gnu/bison", // Missing a slash at the end
 		"${MASTER_SITE_GNU:=bison}",
 		"${MASTER_SITE_INVALID:=subdir/}",
 		"${MASTER_SITE_OWN}",
 		"${MASTER_SITE_OWN:=subdir/}")
 	vt.Output(
 		"WARN: filename.mk:1: Please use ${MASTER_SITE_GITHUB:=example/} "+
-			"instead of \"https://github.com/example/project/\" "+
+			"instead of \"https://github.com/example/\" "+
-			"and run \""+confMake+" help topic=github\" for further tips.",
+			"and run \""+confMake+" help topic=github\" for further instructions.",
 		"WARN: filename.mk:2: Please use ${MASTER_SITE_GNU:=bison} "+
 			"instead of \"http://ftp.gnu.org/pub/gnu/bison\".",
 		"ERROR: filename.mk:3: The subdirectory in MASTER_SITE_GNU must end with a slash.",
 		"ERROR: filename.mk:4: The site MASTER_SITE_INVALID does not exist.")
 	// PR 46570, keyword gimp-fix-ca
 	vt.Values(
 		"https://example.org/download.cgi?filename=filename&sha1=12341234")
 	vt.OutputEmpty()
 	vt.Values(
 		"http://example.org/distfiles/",
 @@ -515,26 +515,33 @@ func (s *Suite) Test_VartypeCheck_FetchU
 		"${MASTER_SITE_GITHUB:S,^,-,:=project/archive/${DISTFILE}}")
 	// No warning that the part after the := must end with a slash,
 	// since there is another modifier in the variable use, in this case :S.
 	//
 	// That modifier adds a hyphen at the beginning (but pkglint doesn't
 	// inspect this), therefore the URL is not required to end with a slash anymore.
 	vt.OutputEmpty()
 	// As of June 2019, the :S modifier is not analyzed since it is unusual.
 	vt.Values(
 		"${MASTER_SITE_GNU:S,$,subdir/,}")
 	vt.OutputEmpty()
 	vt.Values(
 		"https://github.com/transmission/transmission-releases/raw/master/")
 	vt.Output(
 		"WARN: filename.mk:51: Please use ${MASTER_SITE_GITHUB:=transmission/} " +
 			"instead of \"https://github.com/transmission/\" " +
 			"and run \"" + confMake + " help topic=github\" for further instructions.")
+}
 func (s *Suite) Test_VartypeCheck_FetchURL__without_package(c *check.C) {
 	t := s.Init(c)
 	vt := NewVartypeCheckTester(t, (*VartypeCheck).FetchURL)
 	vt.Varname("MASTER_SITES")
 	vt.Values(
 		"https://github.com/example/project/",
 		"${MASTER_SITE_OWN}")
 	vt.Output(

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.588 2019/07/14 21:25:47 rillig Exp $
+# $NetBSD: Makefile,v 1.589 2019/07/30 18:16:13 rillig Exp $
-PKGNAME=	pkglint-5.7.16
+PKGNAME=	pkglint-5.7.17
 CATEGORIES=	pkgtools
 DISTNAME=	tools
 MASTER_SITES=	${MASTER_SITE_GITHUB:=golang/}
 GITHUB_PROJECT=	tools
 GITHUB_TAG=	92d8274bd7b8a4c65f24bafe401a029e58392704
 MAINTAINER=	rillig@NetBSD.org
 HOMEPAGE=	https://github.com/rillig/pkglint
 COMMENT=	Verifier for NetBSD packages
 LICENSE=	2-clause-bsd
 CONFLICTS+=	pkglint4-[0-9]*
 USE_TOOLS+=		pax

 @@ -491,27 +491,27 @@ func (*Pkgsrc) parseDocChange(line *Line
+	}
 	if warn {
 		line.Warnf("Unknown doc/CHANGES line: %s", line.Text)
 		line.Explain(
 			"See mk/misc/developer.mk for the rules.")
+	}
 	return nil
+}
 func (src *Pkgsrc) loadDocChangesFromFile(filename string) []*Change {
-	warn := !G.Wip
+	warn := G.Opts.CheckGlobal && !G.Wip
 	// Each date in the file should be from the same year as the filename says.
 	// This check has been added in 2018.
 	// For years earlier than 2018 pkglint doesn't care because it's not a big issue anyway.
 	year := ""
 	if _, yyyy := match1(filename, `-(\d\d\d\d)$`); yyyy >= "2018" {
 		year = yyyy
+	}
 	infra := false
 	lines := Load(filename, MustSucceed|NotEmpty)
 	var changes []*Change
 	for _, line := range lines.Lines {

	@@ -492,28 +492,28 @@ func (cv *VartypeCheck) Enum(allowedValu		@@ -492,28 +492,28 @@ func (cv *VartypeCheck) Enum(allowedValu
492	}	492	}
493		493
494	func (cv *VartypeCheck) FetchURL() {	494	func (cv *VartypeCheck) FetchURL() {
495		495
496	// TODO: Handle leading "-".	496	// TODO: Handle leading "-".
497		497
498	cv.URL()	498	cv.URL()
499		499
500	for siteURL, siteName := range G.Pkgsrc.MasterSiteURLToVar {	500	for siteURL, siteName := range G.Pkgsrc.MasterSiteURLToVar {
501	if hasPrefix(cv.Value, siteURL) {	501	if hasPrefix(cv.Value, siteURL) {
502	subdir := cv.Value[len(siteURL):]	502	subdir := cv.Value[len(siteURL):]
503	if hasPrefix(cv.Value, "https://github.com/") {	503	if hasPrefix(cv.Value, "https://github.com/") {
504	subdir = strings.SplitAfter(subdir, "/")[0]	504	subdir = strings.SplitAfter(subdir, "/")[0]
505	cv.Warnf("Please use ${%s:=%s} instead of %q and run %q for further tips.",	505	cv.Warnf("Please use ${%s:=%s} instead of %q and run %q for further instructions.",
506	siteName, subdir, cv.Value, makeHelp("github"))	506	siteName, subdir, cv.Value[:len(siteURL)+len(subdir)], makeHelp("github"))
507	} else {	507	} else {
508	cv.Warnf("Please use ${%s:=%s} instead of %q.", siteName, subdir, cv.Value)	508	cv.Warnf("Please use ${%s:=%s} instead of %q.", siteName, subdir, cv.Value)
509	}	509	}
510	return	510	return
511	}	511	}
512	}	512	}
513		513
514	tokens := cv.MkLine.Tokenize(cv.Value, false)	514	tokens := cv.MkLine.Tokenize(cv.Value, false)
515	for _, token := range tokens {	515	for _, token := range tokens {
516	varUse := token.Varuse	516	varUse := token.Varuse
517	if varUse == nil {	517	if varUse == nil {
518	continue	518	continue
519	}	519	}