CVS commit: pkgsrc/pkgtools/pkglint

["Jeremy C. Reed" <reed%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   reed
Date:           Fri Sep 30 18:27:37 UTC 2016

Modified Files:
        pkgsrc/pkgtools/pkglint: Makefile
        pkgsrc/pkgtools/pkglint/files: distinfo.go pkglint.go

Log Message:
pkglint has hardcoded php55 referenced a couple times.
That package was removedi and caused pkglint errors like:
ERROR: ../../lang/php/ext.mk:25: Cannot read
"./../../lang/php55/Makefile.common".

So update to later php56.

I don't understand why the ChecklinesDistinfo function in distinfo.go
has an exception for the php patches directory but changed there too.

I received an okay on packages@ list.

Note that the make check for the pkglint package failed for me
but the pkglint worked for me in my tests of some php using packages.

Increase version of pkglint.


To generate a diff of this commit:
cvs rdiff -u -r1.496 -r1.497 pkgsrc/pkgtools/pkglint/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/pkgtools/pkglint/files/distinfo.go
cvs rdiff -u -r1.11 -r1.12 pkgsrc/pkgtools/pkglint/files/pkglint.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.496 pkgsrc/pkgtools/pkglint/Makefile:1.497
--- pkgsrc/pkgtools/pkglint/Makefile:1.496      Sat Sep 17 23:58:04 2016
+++ pkgsrc/pkgtools/pkglint/Makefile    Fri Sep 30 18:27:37 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.496 2016/09/17 23:58:04 rillig Exp $
+# $NetBSD: Makefile,v 1.497 2016/09/30 18:27:37 reed Exp $
 
-PKGNAME=       pkglint-5.4.9
+PKGNAME=       pkglint-5.4.9.1
 DISTFILES=     # none
 CATEGORIES=    pkgtools
 

Index: pkgsrc/pkgtools/pkglint/files/distinfo.go
diff -u pkgsrc/pkgtools/pkglint/files/distinfo.go:1.8 pkgsrc/pkgtools/pkglint/files/distinfo.go:1.9
--- pkgsrc/pkgtools/pkglint/files/distinfo.go:1.8       Sun Jun  5 11:24:32 2016
+++ pkgsrc/pkgtools/pkglint/files/distinfo.go   Fri Sep 30 18:27:37 2016
@@ -15,8 +15,8 @@ func ChecklinesDistinfo(lines []*Line) {
 
        fname := lines[0].Fname
        var patchesDir = "patches"
-       if G.Pkg != nil && hasSuffix(fname, "/lang/php55/distinfo") {
-               patchesDir = G.CurPkgsrcdir + "/lang/php55/patches"
+       if G.Pkg != nil && hasSuffix(fname, "/lang/php56/distinfo") {
+               patchesDir = G.CurPkgsrcdir + "/lang/php56/patches"
        } else if G.Pkg != nil && dirExists(G.CurrentDir+"/"+G.Pkg.Patchdir) {
                patchesDir = G.Pkg.Patchdir
        }

Index: pkgsrc/pkgtools/pkglint/files/pkglint.go
diff -u pkgsrc/pkgtools/pkglint/files/pkglint.go:1.11 pkgsrc/pkgtools/pkglint/files/pkglint.go:1.12
--- pkgsrc/pkgtools/pkglint/files/pkglint.go:1.11       Sun Jul 10 21:24:47 2016
+++ pkgsrc/pkgtools/pkglint/files/pkglint.go    Fri Sep 30 18:27:37 2016
@@ -403,7 +403,7 @@ func resolveVarsInRelativePath(relpath s
        tmp = strings.Replace(tmp, "${.CURDIR}", ".", -1)
        tmp = strings.Replace(tmp, "${.PARSEDIR}", ".", -1)
        tmp = strings.Replace(tmp, "${LUA_PKGSRCDIR}", "../../lang/lua52", -1)
-       tmp = strings.Replace(tmp, "${PHPPKGSRCDIR}", "../../lang/php55", -1)
+       tmp = strings.Replace(tmp, "${PHPPKGSRCDIR}", "../../lang/php56", -1)
        tmp = strings.Replace(tmp, "${SUSE_DIR_PREFIX}", "suse100", -1)
        tmp = strings.Replace(tmp, "${PYPKGSRCDIR}", "../../lang/python27", -1)
        tmp = strings.Replace(tmp, "${PYPACKAGE}", "python27", -1)