summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/php/phpversion.mk4
-rw-r--r--lang/php55/Makefile.php6
-rw-r--r--lang/php55/distinfo8
3 files changed, 8 insertions, 10 deletions
diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 3b1109d50b3..53430605186 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.58.2.1 2014/06/01 13:20:22 spz Exp $
+# $NetBSD: phpversion.mk,v 1.58.2.2 2014/06/02 15:33:45 tron 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.
PHP53_VERSION= 5.3.28
PHP54_VERSION= 5.4.28
-PHP55_VERSION= 5.5.12
+PHP55_VERSION= 5.5.13
# Define initial release of major version.
PHP53_RELDATE= 20090630
diff --git a/lang/php55/Makefile.php b/lang/php55/Makefile.php
index 36fb3d923ee..62048dd760f 100644
--- a/lang/php55/Makefile.php
+++ b/lang/php55/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.2 2013/08/31 12:31:10 adam Exp $
+# $NetBSD: Makefile.php,v 1.2.6.1 2014/06/02 15:33:45 tron Exp $
# used by lang/php55/Makefile
# used by www/ap-php/Makefile
# used by www/php-fpm/Makefile
@@ -41,9 +41,7 @@ CONFIGURE_ARGS+= --enable-xml
CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX}
.include "../../textproc/libxml2/buildlink3.mk"
-# Note: This expression is the same as ${PKGBASE}, but the latter is
-# not defined yet, so we cannot use it here.
-PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
+PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX}
PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline
PKG_SUGGESTED_OPTIONS+= inet6 ssl
diff --git a/lang/php55/distinfo b/lang/php55/distinfo
index 9875b6f834c..52eeaecf587 100644
--- a/lang/php55/distinfo
+++ b/lang/php55/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17.2.1 2014/06/01 13:20:22 spz Exp $
+$NetBSD: distinfo,v 1.17.2.2 2014/06/02 15:33:45 tron Exp $
-SHA1 (php-5.5.12.tar.bz2) = eaa0b27368f98af2fa9aa6f08d7ea23bdb53c748
-RMD160 (php-5.5.12.tar.bz2) = c09c98e85c503cf030b0f215fcab0986945ce7ba
-Size (php-5.5.12.tar.bz2) = 13251734 bytes
+SHA1 (php-5.5.13.tar.bz2) = b16ff3218d2cc79a5acac577f7560dbb80f205d1
+RMD160 (php-5.5.13.tar.bz2) = 806623a7d78ad1c7efcdd953bfea58075e559aae
+Size (php-5.5.13.tar.bz2) = 13274145 bytes
SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
SHA1 (patch-aclocal.m4) = 14ae2898e1d68b552e76a7e4ee7006f1aee1f932
SHA1 (patch-build_libtool.m4) = 6ee935c55cc01704c6e9edb4e383b2ddb7c746e7