Import of pkgsrc-2015Q1

lang/php55/Makefile

@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2014/03/29 22:10:15 he Exp $
+# $NetBSD: Makefile,v 1.20 2015/03/16 00:26:31 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
-PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		2
+PKGNAME=		php-${PHP_VERSION}
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
@@ -28,6 +27,13 @@ MESSAGE_SUBST+=		CGIDIR=${CGIDIR}
 CONFIGURE_ENV+=		lt_cv_path_SED=${SED:Q}
 MAKE_ENV+=		INSTALL_ROOT=${DESTDIR}
 
+# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2)
+# and lacks the zone memory allocator
+.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
+CFLAGS+=		-DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
+.endif
+
+
 CONF_FILES=		${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
 PLIST_SUBST+=		PHPEXTDIR="${PHP_EXTENSION_DIR}"
 

lang/php55/Makefile.common

@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.2 2013/10/25 21:47:51 joerg Exp $
+# $NetBSD: Makefile.common,v 1.3 2015/03/16 00:26:31 taca Exp $
 # used by lang/php55/Makefile.php
 # used by lang/php/ext.mk
 # used by meta-pkgs/php55-extensions/Makefile
 
 PHP_VERSION_REQD=	55
-PHP_BASE_VERS=		${PHP55_VERSION}
 
 .include "../../lang/php/common.mk"
 

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.4 2014/06/13 14:13:20 fhajny Exp $
 # used by lang/php55/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -37,13 +37,12 @@ CONFIGURE_ARGS+=	--disable-pdo
 CONFIGURE_ARGS+=	--disable-json
 
 CONFIGURE_ARGS+=	--enable-cgi
+CONFIGURE_ARGS+=	--enable-mysqlnd
 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
 

lang/php55/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/11/15 16:33:14 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/02/19 13:35:24 taca Exp $
 bin/phar
 bin/phar.phar
 bin/php
@@ -95,6 +95,27 @@ include/php/ext/hash/php_hash_tiger.h
 include/php/ext/hash/php_hash_types.h
 include/php/ext/hash/php_hash_whirlpool.h
 include/php/ext/libxml/php_libxml.h
+include/php/ext/mysqlnd/config-win.h
+include/php/ext/mysqlnd/mysql_float_to_double.h
+include/php/ext/mysqlnd/mysqlnd.h
+include/php/ext/mysqlnd/mysqlnd_alloc.h
+include/php/ext/mysqlnd/mysqlnd_block_alloc.h
+include/php/ext/mysqlnd/mysqlnd_charset.h
+include/php/ext/mysqlnd/mysqlnd_debug.h
+include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
+include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
+include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
+include/php/ext/mysqlnd/mysqlnd_net.h
+include/php/ext/mysqlnd/mysqlnd_portability.h
+include/php/ext/mysqlnd/mysqlnd_priv.h
+include/php/ext/mysqlnd/mysqlnd_result.h
+include/php/ext/mysqlnd/mysqlnd_result_meta.h
+include/php/ext/mysqlnd/mysqlnd_reverse_api.h
+include/php/ext/mysqlnd/mysqlnd_statistics.h
+include/php/ext/mysqlnd/mysqlnd_structs.h
+include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
+include/php/ext/mysqlnd/php_mysqlnd.h
+include/php/ext/mysqlnd/php_mysqlnd_config.h
 include/php/ext/pcre/pcrelib/config.h
 include/php/ext/pcre/pcrelib/pcre.h
 include/php/ext/pcre/pcrelib/pcre_internal.h

lang/php55/distinfo

@@ -1,25 +1,27 @@
-$NetBSD: distinfo,v 1.17 2014/03/29 22:10:15 he Exp $
+$NetBSD: distinfo,v 1.38 2015/03/20 16:30:38 taca Exp $
 
-SHA1 (php-5.5.10.tar.bz2) = 833cf2a7f5428e95b92c28b6440211f9bd0c7937
-RMD160 (php-5.5.10.tar.bz2) = 9f3a5a4521304bb9e9aa2846f0834a7a28d1f704
-Size (php-5.5.10.tar.bz2) = 13102742 bytes
+SHA1 (php-5.5.23.tar.bz2) = a206cc931bd3aec946a7e5f82b28552d4a93c3cb
+RMD160 (php-5.5.23.tar.bz2) = 936892bf22a39920920e85d2b69bcdac9c4fffc9
+Size (php-5.5.23.tar.bz2) = 13308115 bytes
 SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
-SHA1 (patch-aclocal.m4) = 14ae2898e1d68b552e76a7e4ee7006f1aee1f932
-SHA1 (patch-build_libtool.m4) = 6ee935c55cc01704c6e9edb4e383b2ddb7c746e7
-SHA1 (patch-configure) = 8d8af34ce99d91f8086079963b31b145caab66d3
-SHA1 (patch-ext_fileinfo_data__file.c) = 4f87518145f3288fc1161f397d146093b335dd70
+SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2
+SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2
+SHA1 (patch-configure) = e81731b426b31656de72a4e4b3ad341b5ac34f82
 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_Makefile.frag) = f8e3f7b7c3e93765d019e5614a884df6185d0436
 SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
+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) = 00245ed6a09f9faa9412e0749b087e2f0e01b33a
-SHA1 (patch-php.ini-production) = 89ae95ddb864fc55535c16210d9630c4b77ec54a
+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_fpm_events_port.c) = ad45bcebadf923ee8cb3f2ad4d78d21dd178a8e3
+SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = c5bcf5ffb5f5f63d975c9563c4ba77c850534702
 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593

lang/php55/patches/patch-aclocal.m4

@@ -1,17 +1,8 @@
-$NetBSD: patch-aclocal.m4,v 1.1 2014/03/19 21:56:31 asau Exp $
+$NetBSD: patch-aclocal.m4,v 1.2 2014/07/26 00:11:55 taca Exp $
 
---- aclocal.m4.orig	2014-03-05 10:52:28.000000000 +0000
+--- aclocal.m4.orig	2014-07-23 09:08:13.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:56:31 asau Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -6174,7 +6174,7 @@ case $host_os in
+@@ -6170,7 +6170,7 @@ case $host_os in
  	;;
      esac
      ;;
@@ -29,12 +20,3 @@ $NetBSD: patch-aclocal.m4,v 1.1 2014/03/19 21:56:31 asau Exp $
      # C++ shared libraries reported to be fairly broken before switch to ELF
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
-@@ -8857,7 +8857,7 @@ _LT_EOF
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
- 
--    freebsd1*)
-+    freebsd1|freebsd1.*)
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
- 

lang/php55/patches/patch-build_libtool.m4

@@ -1,17 +1,8 @@
-$NetBSD: patch-build_libtool.m4,v 1.1 2014/03/19 21:56:31 asau Exp $
+$NetBSD: patch-build_libtool.m4,v 1.2 2014/07/26 00:11:55 taca Exp $
 
---- build/libtool.m4.orig	2014-03-05 10:18:00.000000000 +0000
+--- build/libtool.m4.orig	2014-07-23 09:00:58.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:56:31 asau Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -3160,7 +3160,7 @@ case $host_os in
+@@ -3156,7 +3156,7 @@ case $host_os in
  	;;
      esac
      ;;
@@ -29,12 +20,3 @@ $NetBSD: patch-build_libtool.m4,v 1.1 2014/03/19 21:56:31 asau Exp $
      # C++ shared libraries reported to be fairly broken before switch to ELF
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
-@@ -5843,7 +5843,7 @@ _LT_EOF
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
- 
--    freebsd1*)
-+    freebsd1|freebsd1.*)
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
- 

lang/php55/patches/patch-configure

@@ -1,8 +1,64 @@
-$NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
+$NetBSD: patch-configure,v 1.8 2014/07/26 00:11:55 taca Exp $
 
---- configure.orig	2014-03-05 10:52:32.000000000 +0000
+--- configure.orig	2014-07-23 09:08:17.000000000 +0000
 +++ configure
-@@ -23604,7 +23604,7 @@ fi
+@@ -8321,27 +8321,6 @@ EOF
+     ;;
+   esac
+ 
+-  if test "$APACHE_VERSION" -lt 2004001; then
+-    APXS_MPM=`$APXS -q MPM_NAME`
+-    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  else
+-    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
+-    if test -n "$APACHE_THREADED_MPM"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+@@ -9145,27 +9124,6 @@ EOF
+     ;;
+   esac
+ 
+-  if test "$APACHE_VERSION" -lt 2004001; then
+-    APXS_MPM=`$APXS -q MPM_NAME`
+-    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  else
+-    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
+-    if test -n "$APACHE_THREADED_MPM"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+@@ -23604,7 +23562,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -11,7 +67,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -25754,7 +25754,7 @@ $as_echo "yes" >&6; }
+@@ -25754,7 +25712,7 @@ $as_echo "yes" >&6; }
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -20,7 +76,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -36811,7 +36811,7 @@ fi
+@@ -36811,7 +36769,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -29,7 +85,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -48213,7 +48213,7 @@ fi
+@@ -48213,7 +48171,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -38,7 +94,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -65190,7 +65190,7 @@ rm -f core *.core core.conftest.* gmon.o
+@@ -65189,7 +65147,7 @@ rm -f core *.core core.conftest.* gmon.o
  fi
  
  
@@ -47,7 +103,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
  	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 +104540,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"
@@ -61,25 +117,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
  fi
  
  if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
-@@ -107703,7 +107698,7 @@ if test -z "$aix_libpath"; then aix_libp
-       hardcode_shlibpath_var=no
-       ;;
- 
--    freebsd1*)
-+    freebsd1|freebsd1.*)
-       ld_shlibs=no
-       ;;
- 
-@@ -108352,7 +108347,7 @@ dgux*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
-+freebsd1|freebsd1.*)
-   dynamic_linker=no
-   ;;
- 
-@@ -108363,7 +108358,7 @@ freebsd* | dragonfly*)
+@@ -108353,7 +108306,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -88,7 +126,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -110443,7 +110438,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -110433,7 +110386,7 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -97,16 +135,7 @@ $NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
      # C++ shared libraries reported to be fairly broken before switch to ELF
      ld_shlibs_CXX=no
      ;;
-@@ -111989,7 +111984,7 @@ dgux*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
-+freebsd1|freebsd1.*)
-   dynamic_linker=no
-   ;;
- 
-@@ -112000,7 +111995,7 @@ freebsd* | dragonfly*)
+@@ -111986,7 +111939,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in

lang/php55/patches/patch-ext_phar_Makefile.frag

@@ -1,6 +1,6 @@
-$NetBSD: patch-ext_phar_Makefile.frag,v 1.1 2013/07/29 16:41:02 taca Exp $
+$NetBSD: patch-ext_phar_Makefile.frag,v 1.2 2014/12/19 16:10:38 taca Exp $
 
---- ext/phar/Makefile.frag.orig	2012-05-03 17:10:43.000000000 +0000
+--- ext/phar/Makefile.frag.orig	2014-12-17 09:39:40.000000000 +0000
 +++ ext/phar/Makefile.frag
 @@ -18,7 +18,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
  	else \
@@ -11,9 +11,12 @@ $NetBSD: patch-ext_phar_Makefile.frag,v 1.1 2013/07/29 16:41:02 taca Exp $
  
  $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
  	-@test -d $(builddir)/phar || mkdir $(builddir)/phar
-@@ -39,4 +39,4 @@ install-pharcmd: pharcmd
+@@ -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 $(bindir)/phar.phar $(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

lang/php55/patches/patch-ext_sqlite3_libsqlite_sqlite3.c

@@ -0,0 +1,15 @@
+$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-29 08:04:30.000000000 +0000
++++ ext/sqlite3/libsqlite/sqlite3.c
+@@ -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
+ 

lang/php55/patches/patch-php.ini-development

@@ -1,8 +1,8 @@
-$NetBSD: patch-php.ini-development,v 1.3 2014/01/11 17:05:09 taca Exp $
+$NetBSD: patch-php.ini-development,v 1.4 2014/04/04 03:05:00 taca Exp $
 
---- php.ini-development.orig	2014-01-08 10:15:20.000000000 +0000
+--- php.ini-development.orig	2014-04-01 12:32:03.000000000 +0000
 +++ php.ini-development
-@@ -703,7 +703,7 @@ default_mimetype = "text/html"
+@@ -693,7 +693,7 @@ default_mimetype = "text/html"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -11,7 +11,7 @@ $NetBSD: patch-php.ini-development,v 1.3 2014/01/11 17:05:09 taca Exp $
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -724,8 +724,8 @@ doc_root =
+@@ -714,8 +714,8 @@ doc_root =
  ; http://php.net/user-dir
  user_dir =
  
@@ -22,7 +22,7 @@ $NetBSD: patch-php.ini-development,v 1.3 2014/01/11 17:05:09 taca Exp $
  ; extension_dir = "./"
  ; On windows:
  ; extension_dir = "ext"
-@@ -798,7 +798,7 @@ file_uploads = On
+@@ -788,7 +788,7 @@ file_uploads = On
  ; Temporary directory for HTTP uploaded files (will use system default if not
  ; specified).
  ; http://php.net/upload-tmp-dir

lang/php55/patches/patch-php.ini-production

@@ -1,8 +1,8 @@
-$NetBSD: patch-php.ini-production,v 1.3 2014/01/11 17:05:09 taca Exp $
+$NetBSD: patch-php.ini-production,v 1.4 2014/04/04 03:05:00 taca Exp $
 
---- php.ini-production.orig	2014-01-08 10:15:20.000000000 +0000
+--- php.ini-production.orig	2014-04-01 12:32:03.000000000 +0000
 +++ php.ini-production
-@@ -703,7 +703,7 @@ default_mimetype = "text/html"
+@@ -693,7 +693,7 @@ default_mimetype = "text/html"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -11,7 +11,7 @@ $NetBSD: patch-php.ini-production,v 1.3 2014/01/11 17:05:09 taca Exp $
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -724,8 +724,8 @@ doc_root =
+@@ -714,8 +714,8 @@ doc_root =
  ; http://php.net/user-dir
  user_dir =
  
@@ -22,7 +22,7 @@ $NetBSD: patch-php.ini-production,v 1.3 2014/01/11 17:05:09 taca Exp $
  ; extension_dir = "./"
  ; On windows:
  ; extension_dir = "ext"
-@@ -798,7 +798,7 @@ file_uploads = On
+@@ -788,7 +788,7 @@ file_uploads = On
  ; Temporary directory for HTTP uploaded files (will use system default if not
  ; specified).
  ; http://php.net/upload-tmp-dir

lang/php55/patches/patch-sapi_fpm_fpm_events_port.c

@@ -0,0 +1,47 @@
+$NetBSD: patch-sapi_fpm_fpm_events_port.c,v 1.1 2014/06/13 14:09:34 fhajny Exp $
+
+Fix code to make FPM intercept signals properly even with pipes (via catch_workers_output=yes).
+See https://bugs.php.net/bug.php?id=65800.
+--- sapi/fpm/fpm/events/port.c.orig	2013-09-18 05:48:57.000000000 +0000
++++ sapi/fpm/fpm/events/port.c
+@@ -124,6 +124,7 @@ static int fpm_event_port_wait(struct fp
+ 	t.tv_nsec = (timeout % 1000) * 1000 * 1000;
+ 
+ 	/* wait for inconming event or timeout. We want at least one event or timeout */
++again:
+ 	nget = 1;
+ 	ret = port_getn(pfd, events, nevents, &nget, &t);
+ 	if (ret < 0) {
+@@ -133,17 +134,31 @@ static int fpm_event_port_wait(struct fp
+ 			zlog(ZLOG_WARNING, "poll() returns %d", errno);
+ 			return -1;
+ 		}
++
++		if (errno == EINTR)
++			goto again;
++
++		return 0;
+ 	}
+ 
+ 	for (i = 0; i < nget; i++) {
++		struct fpm_event_s *ev;
+ 
+ 		/* do we have a ptr to the event ? */
+ 		if (!events[i].portev_user) {
+ 			continue;
+ 		}
+ 
++		ev = (struct fpm_event_s *)events[i].portev_user;
++
++		if (port_associate(pfd, PORT_SOURCE_FD,
++		    ev->fd, POLLIN, (void *)ev) < 0) {
++			zlog(ZLOG_ERROR, "port: unable to add the event");
++			return -1;
++		}
++
+ 		/* fire the event */
+-		fpm_event_fire((struct fpm_event_s *)events[i].portev_user);
++		fpm_event_fire(ev);
+ 
+ 		/* sanity check */
+ 		if (fpm_globals.parent_pid != getpid()) {

lang/php55/patches/patch-sapi_fpm_fpm_fpm__sockets.c

@@ -0,0 +1,15 @@
+$NetBSD: patch-sapi_fpm_fpm_fpm__sockets.c,v 1.2 2015/03/19 08:12:50 he Exp $
+
+Treat NetBSD the same as FreeBSD wrt. tcp_info struct field usage.
+
+--- ./sapi/fpm/fpm/fpm_sockets.c.orig	2014-09-17 07:03:27.000000000 +0000
++++ ./sapi/fpm/fpm/fpm_sockets.c
+@@ -405,7 +405,7 @@ int fpm_socket_get_listening_queue(int s
+ 		zlog(ZLOG_SYSERROR, "failed to retrieve TCP_INFO for socket");
+ 		return -1;
+ 	}
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ 	if (info.__tcpi_sacked == 0) {
+ 		return -1;
+ 	}