Update php54 to 5.4.31.

24 Jul 2014, PHP 5.4.31

- Core:
  . Fixed bug #67428 (header('Location: foo') will override a 308-399 response
    code). (Adam)
  . Fixed bug #67436 (Autoloader isn't called if two method definitions don't
    match). (Bob)
  . Fixed bug #67091 (make install fails to install libphp5.so on FreeBSD 10.0).
    (Ferenc)
  . Fixed bug #67151 (strtr with empty array crashes). (Nikita)
  . Fixed bug #67407 (Windows 8.1/Server 2012 R2 reported as Windows 8/Server
    2012). (Christian Wenz)

- CLI server:
  . Implemented FR #67429 (CLI server is missing some new HTTP response codes).
    (Adam)
  . Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
    (Adam)

- FPM:
  . Fixed bug #67530 (error_log=syslog ignored). (Remi)
  . Fixed bug #67531 (syslog cannot be set in pool configuration). (Remi)

- Intl:
  . Fixed bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting).
    (Stas)

- pgsql:
  . Fixed bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756),
    which affected builds against libpq < 7.3. (Adam)

- Phar:
  . Fixed bug #67587 (Redirection loop on nginx with FPM). (Christian Weiske)

- Streams:
  . Fixed bug #67430 (http:// wrapper doesn't follow 308 redirects). (Adam)

6 files changed, 23 insertions, 87 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index e8f129f7c88..9b4683fd181 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.67 2014/07/26 00:11:55 taca Exp $
+# $NetBSD: phpversion.mk,v 1.68 2014/07/26 00:12:53 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.
 PHP53_VERSION=	5.3.28
-PHP54_VERSION=	5.4.30
+PHP54_VERSION=	5.4.31
 PHP55_VERSION=	5.5.15
 
 # Define initial release of major version.
diff --git a/lang/php54/Makefile b/lang/php54/Makefile
index 63eb8c45a4a..9cea231a8be 100644
--- a/lang/php54/Makefile
+++ b/lang/php54/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2014/07/13 15:25:03 taca Exp $
+# $NetBSD: Makefile,v 1.25 2014/07/26 00:12:54 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		1
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
diff --git a/lang/php54/distinfo b/lang/php54/distinfo
index 703f8444061..99be7cbd7e4 100644
--- a/lang/php54/distinfo
+++ b/lang/php54/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.44 2014/07/13 15:25:03 taca Exp $
+$NetBSD: distinfo,v 1.45 2014/07/26 00:12:54 taca Exp $
 
-SHA1 (php-5.4.30.tar.bz2) = 1dbc68dfb696d0c776a1bcf9566a96b6bae5e1c7
-RMD160 (php-5.4.30.tar.bz2) = 9c85983d7f170070ed162d85aef828f5c3c0a577
-Size (php-5.4.30.tar.bz2) = 12315772 bytes
+SHA1 (php-5.4.31.tar.bz2) = 46cb2a7827fa3af4980462f62190b96cc283ec99
+RMD160 (php-5.4.31.tar.bz2) = 92bf8dca7dc5211070e83d20c181e442107b9a2a
+Size (php-5.4.31.tar.bz2) = 12273437 bytes
 SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00
-SHA1 (patch-aclocal.m4) = eae2ed8ea2985933c4fe88ba52577c14ac88eb92
-SHA1 (patch-build_libtool.m4) = 6dfef7c07a42dc54611c104265ef43c50a4e88ca
-SHA1 (patch-configure) = a7b2e15625d6005ed3ce16280b0e26a378e0b5f2
+SHA1 (patch-aclocal.m4) = 699086785fcd3d3834cc6016479dbdae6518e522
+SHA1 (patch-build_libtool.m4) = d81527abea3bd97e220f00a5d5296d8b1bfe2659
+SHA1 (patch-configure) = df6209127b1e23d17bc7128da3a44f3e44bbfd48
 SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
 SHA1 (patch-ext_gd_libgd_gdxpm.c) = 9a175417fad9ac23037a24122f8d1258b9eebbcb
 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
diff --git a/lang/php54/patches/patch-aclocal.m4 b/lang/php54/patches/patch-aclocal.m4
index 05c6a47d5a0..f99289c5f27 100644
--- a/lang/php54/patches/patch-aclocal.m4
+++ b/lang/php54/patches/patch-aclocal.m4
@@ -1,17 +1,8 @@
-$NetBSD: patch-aclocal.m4,v 1.1 2014/03/19 21:50:23 asau Exp $
+$NetBSD: patch-aclocal.m4,v 1.2 2014/07/26 00:12:54 taca Exp $
 
---- aclocal.m4.orig	2014-03-05 08:26:32.000000000 +0000
+--- aclocal.m4.orig	2014-07-23 01:10:06.000000000 +0000
 +++ aclocal.m4
-@@ -4546,7 +4546,7 @@ dgux*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
-+freebsd1|freebsd1.*)
-   dynamic_linker=no
-   ;;
- 
-@@ -4557,7 +4557,7 @@ freebsd* | dragonfly*)
+@@ -4553,7 +4553,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -20,7 +11,7 @@ $NetBSD: patch-aclocal.m4,v 1.1 2014/03/19 21:50:23 asau Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -6173,7 +6173,7 @@ case $host_os in
+@@ -6169,7 +6169,7 @@ case $host_os in
  	;;
      esac
      ;;
@@ -29,12 +20,3 @@ $NetBSD: patch-aclocal.m4,v 1.1 2014/03/19 21:50:23 asau Exp $
      # C++ shared libraries reported to be fairly broken before switch to ELF
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
-@@ -8856,7 +8856,7 @@ _LT_EOF
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
- 
--    freebsd1*)
-+    freebsd1|freebsd1.*)
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
- 
diff --git a/lang/php54/patches/patch-build_libtool.m4 b/lang/php54/patches/patch-build_libtool.m4
index 79a55b75731..d5c2f16b4b3 100644
--- a/lang/php54/patches/patch-build_libtool.m4
+++ b/lang/php54/patches/patch-build_libtool.m4
@@ -1,17 +1,8 @@
-$NetBSD: patch-build_libtool.m4,v 1.1 2014/03/19 21:50:23 asau Exp $
+$NetBSD: patch-build_libtool.m4,v 1.2 2014/07/26 00:12:54 taca Exp $
 
---- build/libtool.m4.orig	2014-03-05 08:07:14.000000000 +0000
+--- build/libtool.m4.orig	2014-07-23 00:59:30.000000000 +0000
 +++ build/libtool.m4
-@@ -1532,7 +1532,7 @@ dgux*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
-+freebsd1|freebsd1.*)
-   dynamic_linker=no
-   ;;
- 
-@@ -1543,7 +1543,7 @@ freebsd* | dragonfly*)
+@@ -1539,7 +1539,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -20,7 +11,7 @@ $NetBSD: patch-build_libtool.m4,v 1.1 2014/03/19 21:50:23 asau Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -3159,7 +3159,7 @@ case $host_os in
+@@ -3155,7 +3155,7 @@ case $host_os in
  	;;
      esac
      ;;
@@ -29,12 +20,3 @@ $NetBSD: patch-build_libtool.m4,v 1.1 2014/03/19 21:50:23 asau Exp $
      # C++ shared libraries reported to be fairly broken before switch to ELF
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
-@@ -5842,7 +5842,7 @@ _LT_EOF
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
- 
--    freebsd1*)
-+    freebsd1|freebsd1.*)
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
- 
diff --git a/lang/php54/patches/patch-configure b/lang/php54/patches/patch-configure
index 38e0efec4db..fc09dde4403 100644
--- a/lang/php54/patches/patch-configure
+++ b/lang/php54/patches/patch-configure
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure,v 1.8 2014/06/13 14:31:19 fhajny Exp $
+$NetBSD: patch-configure,v 1.9 2014/07/26 00:12:54 taca Exp $
 
---- configure.orig	2014-05-27 21:41:03.000000000 +0000
+--- configure.orig	2014-07-23 01:10:11.000000000 +0000
 +++ configure
 @@ -8319,27 +8319,6 @@ EOF
      ;;
@@ -108,25 +108,7 @@ $NetBSD: patch-configure,v 1.8 2014/06/13 14:31:19 fhajny Exp $
  fi
  
  if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
-@@ -108733,7 +108686,7 @@ if test -z "$aix_libpath"; then aix_libp
-       hardcode_shlibpath_var=no
-       ;;
- 
--    freebsd1*)
-+    freebsd1|freebsd1.*)
-       ld_shlibs=no
-       ;;
- 
-@@ -109382,7 +109335,7 @@ dgux*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
-+freebsd1|freebsd1.*)
-   dynamic_linker=no
-   ;;
- 
-@@ -109393,7 +109346,7 @@ freebsd* | dragonfly*)
+@@ -109385,7 +109338,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -135,7 +117,7 @@ $NetBSD: patch-configure,v 1.8 2014/06/13 14:31:19 fhajny Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -111473,7 +111426,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -111465,7 +111418,7 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -144,16 +126,7 @@ $NetBSD: patch-configure,v 1.8 2014/06/13 14:31:19 fhajny Exp $
      # C++ shared libraries reported to be fairly broken before switch to ELF
      ld_shlibs_CXX=no
      ;;
-@@ -113019,7 +112972,7 @@ dgux*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
-+freebsd1|freebsd1.*)
-   dynamic_linker=no
-   ;;
- 
-@@ -113030,7 +112983,7 @@ freebsd* | dragonfly*)
+@@ -113018,7 +112971,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in