summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/php/phpversion.mk4
-rw-r--r--lang/php56/distinfo10
-rw-r--r--lang/php56/patches/patch-ext_phar_Makefile.frag13
3 files changed, 9 insertions, 18 deletions
diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 07a639f1b32..69d2726224a 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.100 2015/06/12 00:44:32 taca Exp $
+# $NetBSD: phpversion.mk,v 1.101 2015/06/12 00:47:03 taca Exp $
#
# This file selects a PHP version, based on the user's preferences and
# the installed packages. It does not add a dependency on the PHP
@@ -83,7 +83,7 @@ PHPVERSION_MK= defined
# Define each PHP's version.
PHP54_VERSION= 5.4.41
PHP55_VERSION= 5.5.26
-PHP56_VERSION= 5.6.9
+PHP56_VERSION= 5.6.10
# Define initial release of major version.
PHP54_RELDATE= 20120301
diff --git a/lang/php56/distinfo b/lang/php56/distinfo
index d7b2f0e4ae6..2419d21205c 100644
--- a/lang/php56/distinfo
+++ b/lang/php56/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2015/05/16 11:18:57 taca Exp $
+$NetBSD: distinfo,v 1.11 2015/06/12 00:47:03 taca Exp $
-SHA1 (php-5.6.9.tar.bz2) = a03f3a168a83a5e6fb983c44933f23fc44323a00
-RMD160 (php-5.6.9.tar.bz2) = b99aefd6118cbfc139b08fd137026edcb49d3e63
-Size (php-5.6.9.tar.bz2) = 14037070 bytes
+SHA1 (php-5.6.10.tar.bz2) = 309255ff5ac3d789f0277354f0686404af646e09
+RMD160 (php-5.6.10.tar.bz2) = c5cad85f011889997b0ba9dd5e5b6f013be0fd65
+Size (php-5.6.10.tar.bz2) = 14080915 bytes
SHA1 (patch-acinclude.m4) = b38fc34c3a3847dc317e8e286612b21ec8fd5ce8
SHA1 (patch-aclocal.m4) = 49117c42e03bd3ed57d967d33ba543f936013b4f
SHA1 (patch-build_libtool.m4) = f459cda09cbdad9780568d271091fb17bbc5d965
@@ -13,7 +13,7 @@ SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c
SHA1 (patch-ext_opcache_config.m4) = 031db201f68a120615561a5abd3e84aff58b523d
SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398
SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5
-SHA1 (patch-ext_phar_Makefile.frag) = 3dc3627a908d129b54cfb745d60e352e0372b271
+SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2
SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64
SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f
SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2
diff --git a/lang/php56/patches/patch-ext_phar_Makefile.frag b/lang/php56/patches/patch-ext_phar_Makefile.frag
index 21a17b7ed9f..033a274451a 100644
--- a/lang/php56/patches/patch-ext_phar_Makefile.frag
+++ b/lang/php56/patches/patch-ext_phar_Makefile.frag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ext_phar_Makefile.frag,v 1.2 2014/12/19 16:12:48 taca Exp $
+$NetBSD: patch-ext_phar_Makefile.frag,v 1.3 2015/06/12 00:47:03 taca Exp $
---- ext/phar/Makefile.frag.orig 2014-12-17 01:25:00.000000000 +0000
+--- ext/phar/Makefile.frag.orig 2015-06-10 07:42:27.000000000 +0000
+++ ext/phar/Makefile.frag
@@ -18,7 +18,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
else \
@@ -11,12 +11,3 @@ $NetBSD: patch-ext_phar_Makefile.frag,v 1.2 2014/12/19 16:12:48 taca Exp $
$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
-@test -d $(builddir)/phar || mkdir $(builddir)/phar
-@@ -39,7 +39,7 @@ install-pharcmd: pharcmd
- -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
- $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
- -@rm -f $(INSTALL_ROOT)$(bindir)/phar
-- $(LN_S) -f $(INSTALL_ROOT)$(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
-+ $(LN_S) -f phar.phar $(INSTALL_ROOT)$(bindir)/phar
- @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
- @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1
- @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1