From 725fa859bdc9bdc6bf67b6d0caff1abea556eda9 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 10 Dec 2015 08:23:15 +0000 Subject: Bump php default version to 55 to follow pkgsrc. Bump version. --- pkgtools/pkglint/Makefile | 4 ++-- pkgtools/pkglint/files/makefiles.go | 2 +- pkgtools/pkglint4/Makefile | 4 ++-- pkgtools/pkglint4/files/pkglint.pl | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index f538003c414..b53b053bf63 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.472 2015/12/05 15:51:15 rillig Exp $ +# $NetBSD: Makefile,v 1.473 2015/12/10 08:23:15 wiz Exp $ -PKGNAME= pkglint-5.2.2 +PKGNAME= pkglint-5.2.2.1 DISTFILES= # none CATEGORIES= pkgtools diff --git a/pkgtools/pkglint/files/makefiles.go b/pkgtools/pkglint/files/makefiles.go index 0b2c318974f..318cb21d0b1 100644 --- a/pkgtools/pkglint/files/makefiles.go +++ b/pkgtools/pkglint/files/makefiles.go @@ -145,7 +145,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/php54", -1) + tmp = strings.Replace(tmp, "${PHPPKGSRCDIR}", "../../lang/php55", -1) tmp = strings.Replace(tmp, "${SUSE_DIR_PREFIX}", "suse100", -1) tmp = strings.Replace(tmp, "${PYPKGSRCDIR}", "../../lang/python27", -1) if G.pkgContext != nil { diff --git a/pkgtools/pkglint4/Makefile b/pkgtools/pkglint4/Makefile index 7adf676a4e4..b1cb63d541f 100644 --- a/pkgtools/pkglint4/Makefile +++ b/pkgtools/pkglint4/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2015/11/25 16:42:21 rillig Exp $ +# $NetBSD: Makefile,v 1.2 2015/12/10 08:23:15 wiz Exp $ -PKGNAME= pkglint4-4.158 +PKGNAME= pkglint4-4.159 CATEGORIES= pkgtools OWNER= wiz@NetBSD.org diff --git a/pkgtools/pkglint4/files/pkglint.pl b/pkgtools/pkglint4/files/pkglint.pl index ddb6c1f8c48..94cdd399323 100644 --- a/pkgtools/pkglint4/files/pkglint.pl +++ b/pkgtools/pkglint4/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.1 2015/11/25 16:42:21 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.2 2015/12/10 08:23:15 wiz Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -1325,7 +1325,7 @@ sub resolve_relative_path($$) { $relpath =~ s,\$\{\.CURDIR\},.,; $relpath =~ s,\$\{\.PARSEDIR\},.,; $relpath =~ s,\$\{LUA_PKGSRCDIR\},../../lang/lua52,; - $relpath =~ s,\$\{PHPPKGSRCDIR\},../../lang/php54,; + $relpath =~ s,\$\{PHPPKGSRCDIR\},../../lang/php55,; $relpath =~ s,\$\{SUSE_DIR_PREFIX\},suse100,; $relpath =~ s,\$\{PYPKGSRCDIR\},../../lang/python27,; $relpath =~ s,\$\{FILESDIR\},$filesdir, if defined($filesdir); -- cgit v1.2.3