 @@ -1,216 +1,216 @@
-# $NetBSD: phpversion.mk,v 1.60 2014/04/05 03:43:40 taca Exp $
+# $NetBSD: phpversion.mk,v 1.61 2014/05/01 15:52:33 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
 # package.
+#
 # === User-settable variables ===
+#
 # PHP_VERSION_DEFAULT
 #	The PHP version to choose when more than one is acceptable to
 #	the package.
+#
 #	Possible: 53 54 55
 #	Default: 54
+#
 # === Infrastructure variables ===
+#
 # PHP_VERSION_REQD
 #	PHP version to use. This variable should not be set in
 #	packages.  Normally it is used by bulk build tools.
+#
 #	Possible: ${PHP_VERSIONS_ACCEPTED}
 #	Default:  ${PHP_VERSION_DEFAULT}
+#
 # === Package-settable variables ===
+#
 # PHP_VERSIONS_ACCEPTED
 #	The PHP versions that are accepted by the package.
+#
 #	Possible: 53 54 55
 #	Default: 54 53
+#
 # PHP_CHECK_INSTALLED
 #	Check installed version of PHP.  Should be used lang/php53,
 #	lang/php54 and lang/php55 only.
+#
 #	Possible: Yes No
 #	Default: Yes
+#
 # === Variables defined by this file ===
+#
 # PKG_PHP_VERSION
 #	The selected PHP version.
+#
 #	Possible: 53 54 55
 #	Default: ${PHP_VERSION_DEFAULT}
+#
 # PHP_BASE_VERS
 #	The selected PHP's full version depends on PKG_PHP_VERSION
+#
 # PKG_PHP_MAJOR_VERS
 #	The selected PHP's major version.
+#
 #	Possible: 5
 #	Default: 5
+#
 # PKG_PHP
 #	The same as ${PKG_PHP_VERSION}, prefixed with "php-".
+#
 # PHPPKGSRCDIR
 #	The directory of the PHP implementation, relative to the
 #	package directory.
+#
 #	Example: ../../lang/php54
+#
 # PHP_PKG_PREFIX
 #	The prefix that is prepended to the package name.
+#
 #	Example: php53, php54, php55
+#
 # PHP_EXTENSION_DIR
 #	Relative path to ${PREFIX} for PHP's extensions.  It is derived from
 #	initial release of major version.
+#
 #	Example: lib/php/20090630
+#
 # Keywords: php
+#
 .if !defined(PHPVERSION_MK)
 PHPVERSION_MK=	defined
 # Define each PHP's version.
 PHP53_VERSION=	5.3.28
 PHP54_VERSION=	5.4.27
-PHP55_VERSION=	5.5.11
+PHP55_VERSION=	5.5.12
 # Define initial release of major version.
 PHP53_RELDATE=	20090630
 PHP54_RELDATE=	20120301
 PHP55_RELDATE=	20130620
 _VARGROUPS+=	php
 _USER_VARS.php=	PHP_VERSION_DEFAULT
 _PKG_VARS.php=	PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD
 _SYS_VARS.php=	PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
 		PKG_PHP_MAJOR_VERS
 .include "../../mk/bsd.prefs.mk"
 PHP_VERSION_DEFAULT?=		54
 PHP_VERSIONS_ACCEPTED?=		54 55 53
 # transform the list into individual variables
 .for pv in ${PHP_VERSIONS_ACCEPTED}
 _PHP_VERSION_${pv}_OK=	yes
 .endfor
 # check what is installed
 .if exists(${LOCALBASE}/lib/php/20130620)
 _PHP_VERSION_55_INSTALLED=	yes
 _PHP_INSTALLED=			yes
 .elif exists(${LOCALBASE}/lib/php/20120301)
 _PHP_VERSION_54_INSTALLED=	yes
 _PHP_INSTALLED=			yes
 .elif exists(${LOCALBASE}/lib/php/20090626) || exists(${LOCALBASE}/include/php/Zend/zend_gc.h)
 _PHP_VERSION_53_INSTALLED=	yes
 _PHP_INSTALLED=			yes
 .endif
 # if a version is explicitely required, take it
 .if defined(PHP_VERSION_REQD)
 _PHP_VERSION=	${PHP_VERSION_REQD}
 .endif
 # if the default is already installed, it is first choice
 .if !defined(_PHP_VERSION)
 .if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
 .if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED)
 _PHP_VERSION=	${PHP_VERSION_DEFAULT}
 .endif
 .endif
 .endif
 # prefer an already installed version, in order of "accepted"
 .if !defined(_PHP_VERSION)
 .for pv in ${PHP_VERSIONS_ACCEPTED}
 .if defined(_PHP_VERSION_${pv}_INSTALLED)
 _PHP_VERSION?=	${pv}
 .else
 # keep information as last resort - see below
 _PHP_VERSION_FIRSTACCEPTED?=	${pv}
 .endif
 .endfor
 .endif
 # if the default is OK for the addon pkg, take this
 .if !defined(_PHP_VERSION)
 .if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
 _PHP_VERSION=	${PHP_VERSION_DEFAULT}
 .endif
 .endif
 # take the first one accepted by the package
 .if !defined(_PHP_VERSION)
 _PHP_VERSION=	${_PHP_VERSION_FIRSTACCEPTED}
 .endif
+#
 # Variable assignment for multi-PHP packages
 MULTI+=	PHP_VERSION_REQD=${_PHP_VERSION}
 # export some of internal variables
 PKG_PHP_VERSION:=	${_PHP_VERSION:C/\.[0-9]//}
 PKG_PHP:=		PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/}
 # currently we have only PHP 5.x packages.
 PKG_PHP_MAJOR_VERS:=	5
 PHP_CHECK_INSTALLED?=	Yes
 # if installed PHP isn't compatible with required PHP, bail out
 .if empty(PHP_CHECK_INSTALLED:M[nN][oO])
 .if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED)
 PKG_SKIP_REASON+=	"Package accepts ${PKG_PHP}, but different version is installed"
 .endif
 .endif
 MESSAGE_SUBST+=		PKG_PHP_VERSION=${PKG_PHP_VERSION} \
 			PKG_PHP=${PKG_PHP}
 PLIST_SUBST+=		PKG_PHP_VERSION=${PKG_PHP_VERSION} \
 			PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \
 			PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 # force the selected PHP version for recursive builds
 PHP_VERSION_REQD:=	${PKG_PHP_VERSION}
+#
 # set variables for the version we decided to use:
+#
 .if ${_PHP_VERSION} == "53"
 PHPPKGSRCDIR=		../../lang/php53
 PHP_BASE_VERS=		${PHP53_VERSION}
 PHP_PKG_PREFIX=		php53
 PHP_EXTENSION_DIR=	lib/php/${PHP53_RELDATE}
 .elif ${_PHP_VERSION} == "54"
 PHPPKGSRCDIR=		../../lang/php54
 PHP_BASE_VERS=		${PHP54_VERSION}
 PHP_PKG_PREFIX=		php54
 PHP_EXTENSION_DIR=	lib/php/${PHP54_RELDATE}
 .elif ${_PHP_VERSION} == "55"
 PHPPKGSRCDIR=		../../lang/php55
 PHP_BASE_VERS=		${PHP55_VERSION}
 PHP_PKG_PREFIX=		php55
 PHP_EXTENSION_DIR=	lib/php/${PHP55_RELDATE}
 .else
 # force an error
 PKG_SKIP_REASON+=	"${PKG_PHP} is not a valid package"
 .endif
+#
 # check installed version aginst required:
+#
 .if !empty(PHP_CHECK_INSTALLED:M[nN][oO])
 .if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED}
 PKG_SKIP_REASON+=	"${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed."
 .endif
 .endif
 .endif	# PHPVERSION_MK

 @@ -1,25 +1,25 @@
-$NetBSD: distinfo,v 1.19 2014/04/14 10:17:19 jperkin Exp $
+$NetBSD: distinfo,v 1.20 2014/05/01 15:52:33 taca Exp $
-SHA1 (php-5.5.11.tar.bz2) = 58d660e5455b3f2abdfe3205182ffe3a58b5d1cd
+SHA1 (php-5.5.12.tar.bz2) = eaa0b27368f98af2fa9aa6f08d7ea23bdb53c748
-RMD160 (php-5.5.11.tar.bz2) = 9666e7e595ffa8cc8db87534d75fb05efda495ad
+RMD160 (php-5.5.12.tar.bz2) = c09c98e85c503cf030b0f215fcab0986945ce7ba
-Size (php-5.5.11.tar.bz2) = 13207627 bytes
+Size (php-5.5.12.tar.bz2) = 13251734 bytes
 SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
 SHA1 (patch-aclocal.m4) = 14ae2898e1d68b552e76a7e4ee7006f1aee1f932
 SHA1 (patch-build_libtool.m4) = 6ee935c55cc01704c6e9edb4e383b2ddb7c746e7
-SHA1 (patch-configure) = 8d8af34ce99d91f8086079963b31b145caab66d3
+SHA1 (patch-configure) = 7b4bef368e6709c26c0db31a4c7ebc04e4d55e9c
 SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2
 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
 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) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba
 SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
-SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8b72c83819e4d348001c11ec122d377f95b2099d
+SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941
 SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4
 SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937
 SHA1 (patch-php.ini-development) = 4fc40f0af5f6e58b614794e066a5738694dc8ef8
 SHA1 (patch-php.ini-production) = 47c1b14ee78fbcaa084a58d2c0c3e843104072be
 SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
 SHA1 (patch-sapi_cgi_Makefile.frag) = 3784758c085066d1088ae1420b0f9bcf98f74de9
 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593

 @@ -1,117 +1,117 @@
-$NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
+$NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
---- configure.orig	2014-03-05 10:52:32.000000000 +0000
+--- configure.orig	2014-04-30 08:40:22.000000000 +0000
 +++ configure
 @@ -23604,7 +23604,7 @@ fi
      if test "$found_openssl" = "no"; then
      if test "$PHP_OPENSSL_DIR" = "yes"; then
 -      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
 +      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
      fi
      for i in $PHP_OPENSSL_DIR; do
 @@ -25754,7 +25754,7 @@ $as_echo "yes" >&6; }
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
 -    for header_file in ext/sqlite3/libsqlite/sqlite3.h; do
 +    for header_file; do
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
 @@ -36811,7 +36811,7 @@ fi
      if test "$found_openssl" = "no"; then
      if test "$PHP_OPENSSL_DIR" = "yes"; then
 -      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
 +      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
      fi
      for i in $PHP_OPENSSL_DIR; do
 @@ -48213,7 +48213,7 @@ fi
      if test "$found_openssl" = "no"; then
      if test "$PHP_OPENSSL_DIR" = "yes"; then
 -      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
 +      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
      fi
      for i in $PHP_OPENSSL_DIR; do
-@@ -65190,7 +65190,7 @@ rm -f core *.core core.conftest.* gmon.o
+@@ -65189,7 +65189,7 @@ rm -f core *.core core.conftest.* gmon.o
  fi
 -if test "$flock_type" == "unknown"; then
 +if test "$flock_type" = "unknown"; then
  	as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5
  fi
-@@ -104584,12 +104584,7 @@ old_CC=$CC
+@@ -104582,12 +104582,7 @@ old_CC=$CC
  if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
    CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
    INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
 -  cat >meta_ccld<<EOF
 -#! /bin/sh
 -exec $CC $ac_cv_pthreads_cflags \$@
 -EOF
 -  CC="$abs_builddir/meta_ccld"
 -  chmod +x meta_ccld
 +  CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
  fi
  if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
-@@ -107703,7 +107698,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -107701,7 +107696,7 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var=no
        ;;
 -    freebsd1*)
 +    freebsd1|freebsd1.*)
        ld_shlibs=no
        ;;
-@@ -108352,7 +108347,7 @@ dgux*)
+@@ -108350,7 +108345,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
 -freebsd1*)
 +freebsd1|freebsd1.*)
    dynamic_linker=no
    ;;
-@@ -108363,7 +108358,7 @@ freebsd* | dragonfly*)
+@@ -108361,7 +108356,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
 -    freebsd[123]*) objformat=aout ;;
 +    freebsd[123]|freebsd[123].*) objformat=aout ;;
      *) objformat=elf ;;
      esac
    fi
-@@ -110443,7 +110438,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -110441,7 +110436,7 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
 -  freebsd[12]*)
 +  freebsd[12]|freebsd[12].*)
      # C++ shared libraries reported to be fairly broken before switch to ELF
      ld_shlibs_CXX=no
      ;;
-@@ -111989,7 +111984,7 @@ dgux*)
+@@ -111987,7 +111982,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
 -freebsd1*)
 +freebsd1|freebsd1.*)
    dynamic_linker=no
    ;;
-@@ -112000,7 +111995,7 @@ freebsd* | dragonfly*)
+@@ -111998,7 +111993,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
 -    freebsd[123]*) objformat=aout ;;
 +    freebsd[123]|freebsd[123].*) objformat=aout ;;
      *) objformat=elf ;;
      esac
    fi

 @@ -1,15 +1,15 @@
-$NetBSD: patch-ext_sqlite3_libsqlite_sqlite3.c,v 1.1 2014/04/14 10:17:19 jperkin Exp $
+$NetBSD: patch-ext_sqlite3_libsqlite_sqlite3.c,v 1.2 2014/05/01 15:52:33 taca Exp $
 Don't redefine _XOPEN_SOURCE, it is already set from php.
---- ext/sqlite3/libsqlite/sqlite3.c.orig	2014-04-01 12:32:03.000000000 +0000
+--- ext/sqlite3/libsqlite/sqlite3.c.orig	2014-04-29 08:04:30.000000000 +0000
 +++ ext/sqlite3/libsqlite/sqlite3.c
-@@ -7822,7 +7822,7 @@ struct sqlite3_rtree_geometry {
+@@ -7867,7 +7867,7 @@ struct sqlite3_rtree_geometry {
  ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
  ** it.
  */
 -#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__)
 +#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__sun)
  #  define _XOPEN_SOURCE 600
  #endif