summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/php/phpversion.mk4
-rw-r--r--lang/php55/distinfo10
-rw-r--r--lang/php55/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 29c9812e2ee..07a639f1b32 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.99 2015/05/16 11:18:57 taca Exp $
+# $NetBSD: phpversion.mk,v 1.100 2015/06/12 00:44:32 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
@@ -82,7 +82,7 @@ PHPVERSION_MK= defined
# Define each PHP's version.
PHP54_VERSION= 5.4.41
-PHP55_VERSION= 5.5.25
+PHP55_VERSION= 5.5.26
PHP56_VERSION= 5.6.9
# Define initial release of major version.
diff --git a/lang/php55/distinfo b/lang/php55/distinfo
index d3c82ef19bc..b4f80f5468a 100644
--- a/lang/php55/distinfo
+++ b/lang/php55/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.40 2015/05/16 11:17:45 taca Exp $
+$NetBSD: distinfo,v 1.41 2015/06/12 00:44:32 taca Exp $
-SHA1 (php-5.5.25.tar.bz2) = 89a7c0de86db9e06106f5bc091b13aa0c0e06952
-RMD160 (php-5.5.25.tar.bz2) = c48a7598875595404c0143fde782f82452b24f63
-Size (php-5.5.25.tar.bz2) = 13422002 bytes
+SHA1 (php-5.5.26.tar.bz2) = f2f80ef51d38b39c4ef060942e2ddcfffec9927a
+RMD160 (php-5.5.26.tar.bz2) = abfc8d5fa0615e22d4510bd025195cb9e88c2e77
+Size (php-5.5.26.tar.bz2) = 13671379 bytes
SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2
SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2
@@ -13,7 +13,7 @@ SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b
SHA1 (patch-ext_opcache_config.m4) = 7c0d98feaeec8a0ca61f6f77a1906aa2d601be3f
SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
-SHA1 (patch-ext_phar_Makefile.frag) = f8e3f7b7c3e93765d019e5614a884df6185d0436
+SHA1 (patch-ext_phar_Makefile.frag) = f465bb5acd4bb87bb403baa98b61ac707800fd30
SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941
SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4
diff --git a/lang/php55/patches/patch-ext_phar_Makefile.frag b/lang/php55/patches/patch-ext_phar_Makefile.frag
index 97b5ab878e0..e97ce0d88eb 100644
--- a/lang/php55/patches/patch-ext_phar_Makefile.frag
+++ b/lang/php55/patches/patch-ext_phar_Makefile.frag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ext_phar_Makefile.frag,v 1.2 2014/12/19 16:10:38 taca Exp $
+$NetBSD: patch-ext_phar_Makefile.frag,v 1.3 2015/06/12 00:44:32 taca Exp $
---- ext/phar/Makefile.frag.orig 2014-12-17 09:39:40.000000000 +0000
+--- ext/phar/Makefile.frag.orig 2015-06-10 12:26:49.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:10:38 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