summaryrefslogtreecommitdiff
path: root/pkgtools/pkglint/files/pkgsrc.go
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2020-06-01 20:49:54 +0000
committerrillig <rillig@pkgsrc.org>2020-06-01 20:49:54 +0000
commit05d76c3982a4aaf6ced2f7744f7043f9f4e6e4ac (patch)
tree119ec105dd83c8cf4e64fa8b9a0cb9858163627a /pkgtools/pkglint/files/pkgsrc.go
parent67f2e52979de3b4cd3050e4b462bddf771386c34 (diff)
downloadpkgsrc-05d76c3982a4aaf6ced2f7744f7043f9f4e6e4ac.tar.gz
pkgtools/pkglint: update to 20.1.12
Changes since 20.1.11: The file bsd.pkg.mk must only ever be included by package Makefiles directly, not by other Makefile fragments. Seen in www/w3m. The variable BUILDLINK_PREFIX.* should only be used for packages that have actually been included by the package. This catches the use of BUILDLINK_PREFIX.libiconv, which should have been iconv instead. Allow comments before line 3 in buildlink3.mk files. This is necessary for mariadb55-client since its buildlink identifier is mysql-client, which is so non-obvious that it needs to be documented.
Diffstat (limited to 'pkgtools/pkglint/files/pkgsrc.go')
-rw-r--r--pkgtools/pkglint/files/pkgsrc.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/pkgsrc.go b/pkgtools/pkglint/files/pkgsrc.go
index 76a8ab3fc9b..55fbdde60f9 100644
--- a/pkgtools/pkglint/files/pkgsrc.go
+++ b/pkgtools/pkglint/files/pkgsrc.go
@@ -186,7 +186,7 @@ func (src *Pkgsrc) loadDocChangesFromFile(filename CurrPath) []*Change {
// 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.Base(), `-(\d\d\d\d)$`); yyyy >= "2018" {
+ if _, yyyy := match1(filename.Base().String(), `-(\d\d\d\d)$`); yyyy >= "2018" {
year = yyyy
}
@@ -532,7 +532,7 @@ func (src *Pkgsrc) loadToolsPlatform() {
var systems []string
scopes := make(map[string]*RedundantScope)
for _, mkFile := range src.File("mk/tools").ReadPaths() {
- m, opsys := match1(mkFile.Base(), `^tools\.(.+)\.mk$`)
+ m, opsys := match1(mkFile.Base().String(), `^tools\.(.+)\.mk$`)
if !m {
continue
}