diff options
| author | reed <reed@pkgsrc.org> | 2016-09-30 18:27:37 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2016-09-30 18:27:37 +0000 |
| commit | 5cb5f4495f46ca0a11d8eb076901229be2a29b50 (patch) | |
| tree | 8fdec8034625d12bc26fa82a7fec57648c5e4f13 /pkgtools | |
| parent | 42ce0928bb314ce14da996015b9299017f3dea9f (diff) | |
| download | pkgsrc-5cb5f4495f46ca0a11d8eb076901229be2a29b50.tar.gz | |
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 (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/distinfo.go | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.go | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index fe90fd9939c..77f64ac4192 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -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 --git a/pkgtools/pkglint/files/distinfo.go b/pkgtools/pkglint/files/distinfo.go index 048ebdd5faa..6d026f9ca45 100644 --- a/pkgtools/pkglint/files/distinfo.go +++ b/pkgtools/pkglint/files/distinfo.go @@ -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 } diff --git a/pkgtools/pkglint/files/pkglint.go b/pkgtools/pkglint/files/pkglint.go index ab8c391624d..6709d34def2 100644 --- a/pkgtools/pkglint/files/pkglint.go +++ b/pkgtools/pkglint/files/pkglint.go @@ -403,7 +403,7 @@ func resolveVarsInRelativePath(relpath string, adjustDepth bool) string { 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) |