[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint pkglint has hardcoded php55 reference...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/44696fbc5dcb
branches:  trunk
changeset: 353221:44696fbc5dcb
user:      reed <reed%pkgsrc.org@localhost>
date:      Fri Sep 30 18:27:37 2016 +0000

description:
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.

diffstat:

 pkgtools/pkglint/Makefile          |  4 ++--
 pkgtools/pkglint/files/distinfo.go |  4 ++--
 pkgtools/pkglint/files/pkglint.go  |  2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r db5d9a100293 -r 44696fbc5dcb pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Fri Sep 30 17:17:37 2016 +0000
+++ b/pkgtools/pkglint/Makefile Fri Sep 30 18:27:37 2016 +0000
@@ -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
 
diff -r db5d9a100293 -r 44696fbc5dcb pkgtools/pkglint/files/distinfo.go
--- a/pkgtools/pkglint/files/distinfo.go        Fri Sep 30 17:17:37 2016 +0000
+++ b/pkgtools/pkglint/files/distinfo.go        Fri Sep 30 18:27:37 2016 +0000
@@ -15,8 +15,8 @@
 
        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
        }
diff -r db5d9a100293 -r 44696fbc5dcb pkgtools/pkglint/files/pkglint.go
--- a/pkgtools/pkglint/files/pkglint.go Fri Sep 30 17:17:37 2016 +0000
+++ b/pkgtools/pkglint/files/pkglint.go Fri Sep 30 18:27:37 2016 +0000
@@ -403,7 +403,7 @@
        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)