import of php-7.0.0; currently un-hooked

2015-12-14 17:58:45 +00:00 · 2015-12-14 17:58:45 +00:00 · 92624326a1
commit 92624326a1
parent 25da47f547
60 changed files with 1402 additions and 0 deletions
--- a/lang/php/7.0/Makefile
+++ b/lang/php/7.0/Makefile
@ -0,0 +1,16 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+
+PV=		7.0
+V=		${PV}.0
+
+BUILD_DEPENDS+=	www/apache-httpd
+
+WANTLIB-main+=	stdc++ ncurses readline
+
+.include <bsd.port.mk>
+
+# XXX disable suhosin for 7.0 and enforce apache2 because apache
+# is not supported anymore
+FLAVORS:=
+CONFIGURE_ARGS+=	--disable-suhosin \
+			--with-apxs2=${LOCALBASE}/sbin/apxs2
--- a/lang/php/7.0/distinfo
+++ b/lang/php/7.0/distinfo
@ -0,0 +1,4 @@
+SHA256 (php-7.0.0.tar.bz2) = qSpUMGgyFno598DsAFJPxvP32YXIBsqnYyVh0N3t/Oo=
+SHA256 (suhosin-0.9.38.tar.gz) = wC12xOfOd3kQo3wYGBy2f9npDv4BB/6rPeMTG1+JvOo=
+SIZE (php-7.0.0.tar.bz2) = 13975832
+SIZE (suhosin-0.9.38.tar.gz) = 122800
--- a/lang/php/7.0/patches/patch-acinclude_m4
+++ b/lang/php/7.0/patches/patch-acinclude_m4
@ -0,0 +1,46 @@
+$OpenBSD: patch-acinclude_m4,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+--- acinclude.m4.orig.port	Sun Dec  6 14:05:46 2015
+++ acinclude.m4	Sun Dec  6 14:07:36 2015
+@@ -985,15 +985,9 @@ dnl ---------------------------------------------- Sha
+   if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
+ dnl ---------------------------------------------- CLI static module
+     [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
+-    case "$PHP_SAPI" in
+-      cgi|embed[)]
+-        PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,)
+-        EXT_STATIC="$EXT_STATIC $1;$ext_dir"
+-        ;;
+-      *[)]
+         PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,cli)
+-        ;;
+-    esac
+        PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,cgi)
+        PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,fpm)
+     EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir"
+   fi
+   PHP_ADD_BUILD_DIR($ext_builddir)
+@@ -1043,12 +1037,6 @@ You either need to build $1 shared or build $2 statica
+ build to be successful.
+ ])
+   fi
+-  if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then
+-    AC_MSG_ERROR([
+-You've configured extension $1, which depends on extension $2,
+-but you've either not enabled $2, or have disabled it.
+-])
+-  fi
+   dnl Some systems require that we link $2 to $1 when building
+ ])
+ 
+@@ -2321,9 +2309,9 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+   test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
+ 
+   dnl Fallbacks for different configure options
+-  if test "$PHP_OPENSSL" != "no"; then
+  if test -n "$PHP_OPENSSL" && test "$PHP_OPENSSL" != "no"; then
+     PHP_OPENSSL_DIR=$PHP_OPENSSL
+-  elif test "$PHP_IMAP_SSL" != "no"; then
+  elif test -n "$PHP_IMAP_SSL" && test "$PHP_IMAP_SSL" != "no"; then
+     PHP_OPENSSL_DIR=$PHP_IMAP_SSL
+   fi
+ 
--- a/lang/php/7.0/patches/patch-configure_in
+++ b/lang/php/7.0/patches/patch-configure_in
@ -0,0 +1,32 @@
+$OpenBSD: patch-configure_in,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+--- configure.in.orig.port	Tue Dec  1 14:36:25 2015
+++ configure.in	Sun Dec  6 14:04:54 2015
+@@ -1045,16 +1045,16 @@ case $php_sapi_module in
+     enable_static=no
+     case $with_pic in
+       yes)
+-        standard_libtool_flag='-prefer-pic'
+        standard_libtool_flag=''
+         ;;
+       no)
+-        standard_libtool_flag='-prefer-non-pic'
+        standard_libtool_flag=''
+         ;;
+     esac
+     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
+     ;;
+   *[)]
+-    standard_libtool_flag='-prefer-non-pic -static'
+    standard_libtool_flag=''
+     if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
+       enable_shared=no
+     fi
+@@ -1245,7 +1245,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
+ EXPANDED_DATADIR=$datadir
+ EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
+ EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
+-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
+INCLUDE_PATH=.:$libdir
+ 
+ exec_prefix=$old_exec_prefix
+ libdir=$old_libdir
--- a/lang/php/7.0/patches/patch-ext_gd_config_m4
+++ b/lang/php/7.0/patches/patch-ext_gd_config_m4
@ -0,0 +1,28 @@
+$OpenBSD: patch-ext_gd_config_m4,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+
+revert https://github.com/php/php-src/commit/5e9c6c3b644b290255fb10c8eb34778665c2f8a3.patch
+which breaks things for finding /usr/X11R6/include/X11/xpm.h
+
+--- ext/gd/config.m4.orig.port	Tue Dec  1 14:36:33 2015
+++ ext/gd/config.m4	Sun Dec  6 14:04:50 2015
+@@ -163,11 +163,18 @@ AC_DEFUN([PHP_GD_XPM],[
+   if test "$PHP_XPM_DIR" != "no"; then
+ 
+     for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
+-      test -f $i/include/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i && break
+-      test -f $i/include/X11/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i/X11 && break
+      test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
+     done
+ 
+     if test -z "$GD_XPM_DIR"; then
+      AC_MSG_ERROR([libXpm.(a|so) not found.])
+    fi
+
+    for i in include include/X11; do
+      test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/include
+    done
+
+    if test -z "$GD_XPM_INC"; then
+       AC_MSG_ERROR([xpm.h not found.])
+     fi
+ 
--- a/lang/php/7.0/patches/patch-ext_gd_gdcache_h
+++ b/lang/php/7.0/patches/patch-ext_gd_gdcache_h
@ -0,0 +1,11 @@
+$OpenBSD: patch-ext_gd_gdcache_h,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+--- ext/gd/gdcache.h.orig.port	Wed Sep 26 16:44:16 2007
+++ ext/gd/gdcache.h	Sat Jun 18 12:14:48 2011
+@@ -41,6 +41,7 @@
+ /*********************************************************/
+ 
+ #if (!defined(_OSD_POSIX) && !defined(__FreeBSD__)) && HAVE_MALLOC_H
+#elif !defined(__OpenBSD__)
+ #include <malloc.h>
+ #else
+ #include <stdlib.h> /* BS2000/OSD defines malloc() & friends in stdlib.h */
--- a/lang/php/7.0/patches/patch-ext_gd_libgd_gdkanji_c
+++ b/lang/php/7.0/patches/patch-ext_gd_libgd_gdkanji_c
@ -0,0 +1,12 @@
+$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+--- ext/gd/libgd/gdkanji.c.orig.port	Tue Dec  1 14:36:33 2015
+++ ext/gd/libgd/gdkanji.c	Sun Dec  6 14:04:50 2015
+@@ -361,7 +361,7 @@ do_convert (unsigned char *to, unsigned char *from, co
+   from_len = strlen ((const char *) from) + 1;
+   to_len = BUFSIZ;
+ 
+-  if ((int) iconv(cd, (char **) &from, &from_len, (char **) &to, &to_len) == -1)
+  if ((int) iconv(cd, (const char **) &from, &from_len, (char **) &to, &to_len) == -1)
+     {
+ #ifdef HAVE_ERRNO_H
+       if (errno == EINVAL)
--- a/lang/php/7.0/patches/patch-ext_iconv_iconv_c
+++ b/lang/php/7.0/patches/patch-ext_iconv_iconv_c
@ -0,0 +1,75 @@
+$OpenBSD: patch-ext_iconv_iconv_c,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+--- ext/iconv/iconv.c.orig.port	Tue Dec  1 14:36:40 2015
+++ ext/iconv/iconv.c	Sun Dec  6 14:04:50 2015
+@@ -471,7 +471,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d
+ 
+ 			out_p = ZSTR_VAL((d)->s) + ZSTR_LEN((d)->s);
+ 
+-			if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+			if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+ #if ICONV_SUPPORTS_ERRNO
+ 				switch (errno) {
+ 					case EINVAL:
+@@ -651,7 +651,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const c
+ 	out_p = ZSTR_VAL(out_buf);
+ 
+ 	while (in_left > 0) {
+-		result = iconv(cd, (char **) &in_p, &in_left, (char **) &out_p, &out_left);
+		result = iconv(cd, (const char **) &in_p, &in_left, (char **) &out_p, &out_left);
+ 		out_size = bsz - out_left;
+ 		if (result == (size_t)(-1)) {
+ 			if (ignore_ilseq && errno == EILSEQ) {
+@@ -776,7 +776,7 @@ static php_iconv_err_t _php_iconv_strlen(size_t *pretv
+ 
+ 		prev_in_left = in_left;
+ 
+-		if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+		if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+ 			if (prev_in_left == in_left) {
+ 				break;
+ 			}
+@@ -897,7 +897,7 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pr
+ 
+ 		prev_in_left = in_left;
+ 
+-		if (iconv(cd1, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+		if (iconv(cd1, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+ 			if (prev_in_left == in_left) {
+ 				break;
+ 			}
+@@ -1028,7 +1028,7 @@ static php_iconv_err_t _php_iconv_strpos(size_t *pretv
+ 
+ 		prev_in_left = in_left;
+ 
+-		if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+		if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+ 			if (prev_in_left == in_left) {
+ #if ICONV_SUPPORTS_ERRNO
+ 				switch (errno) {
+@@ -1275,7 +1275,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st
+ 
+ 					out_left = out_size - out_reserved;
+ 
+-					if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+					if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+ #if ICONV_SUPPORTS_ERRNO
+ 						switch (errno) {
+ 							case EINVAL:
+@@ -1376,7 +1376,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st
+ 					out_p = buf;
+ 					out_left = out_size;
+ 
+-					if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+					if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+ #if ICONV_SUPPORTS_ERRNO
+ 						switch (errno) {
+ 							case EINVAL:
+@@ -2626,7 +2626,7 @@ static int php_iconv_stream_filter_append_bucket(
+ 		tcnt = self->stub_len;
+ 
+ 		while (tcnt > 0) {
+-			if (iconv(self->cd, &pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
+			if (iconv(self->cd, (const char **)&pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
+ #if ICONV_SUPPORTS_ERRNO
+ 				switch (errno) {
+ 					case EILSEQ:
--- a/lang/php/7.0/patches/patch-ext_imap_config_m4
+++ b/lang/php/7.0/patches/patch-ext_imap_config_m4
@ -0,0 +1,12 @@
+$OpenBSD: patch-ext_imap_config_m4,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+--- ext/imap/config.m4.orig.port	Thu Aug  8 16:50:57 2013
+++ ext/imap/config.m4	Thu Aug  8 16:51:34 2013
+@@ -180,7 +180,7 @@ if test "$PHP_IMAP" != "no"; then  
+     ],[])
+     CPPFLAGS=$old_CPPFLAGS
+ 
+-    PHP_CHECK_LIBRARY(pam, pam_start, 
+    PHP_CHECK_LIBRARY(pam, DISABLEDpam_start, 
+     [
+       PHP_ADD_LIBRARY(pam,, IMAP_SHARED_LIBADD)
+       AC_DEFINE(HAVE_LIBPAM,1,[ ])
--- a/lang/php/7.0/patches/patch-ext_mysqlnd_config9_m4
+++ b/lang/php/7.0/patches/patch-ext_mysqlnd_config9_m4
@ -0,0 +1,20 @@
+$OpenBSD: patch-ext_mysqlnd_config9_m4,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+--- ext/mysqlnd/config9.m4.orig.port	Tue Dec  1 14:36:42 2015
+++ ext/mysqlnd/config9.m4	Sun Dec  6 14:08:19 2015
+@@ -16,6 +16,7 @@ if test -z "$PHP_ZLIB_DIR"; then
+ fi
+ 
+ dnl If some extension uses mysqlnd it will get compiled in PHP core
+PHP_MYSQLND_ENABLED="yes"
+ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
+   mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
+   mysqlnd_base_sources="mysqlnd.c mysqlnd_alloc.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
+@@ -34,7 +35,7 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_E
+   test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
+ 
+   if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then
+-    AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
+    AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]),, [-lcrypto])
+     AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
+ 
+     PHP_SETUP_OPENSSL(MYSQLND_SHARED_LIBADD, [AC_DEFINE(MYSQLND_HAVE_SSL,1,[Enable mysqlnd code that uses OpenSSL directly])])
--- a/lang/php/7.0/patches/patch-ext_odbc_config_m4
+++ b/lang/php/7.0/patches/patch-ext_odbc_config_m4
@ -0,0 +1,14 @@
+$OpenBSD: patch-ext_odbc_config_m4,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+
+don't link php binary with iodbc
+
+--- ext/odbc/config.m4.orig.port	Wed Apr 15 20:05:57 2015
+++ ext/odbc/config.m4	Sat Apr 25 18:10:11 2015
+@@ -396,7 +396,6 @@ PHP_ARG_WITH(iodbc,,
+       AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+     fi 
+     if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
+-      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
+       ODBC_TYPE=iodbc
+       ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
+       ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
--- a/lang/php/7.0/patches/patch-ext_sockets_sockaddr_conv_c
+++ b/lang/php/7.0/patches/patch-ext_sockets_sockaddr_conv_c
@ -0,0 +1,14 @@
+$OpenBSD: patch-ext_sockets_sockaddr_conv_c,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+--- ext/sockets/sockaddr_conv.c.orig.port	Tue Dec  1 14:36:34 2015
+++ ext/sockets/sockaddr_conv.c	Sun Dec  6 14:04:50 2015
+@@ -11,6 +11,10 @@
+ 
+ extern int php_string_to_if_index(const char *val, unsigned *out);
+ 
+#if defined(__OpenBSD__)
+#define AI_V4MAPPED 0
+#endif
+
+ #if HAVE_IPV6
+ /* Sets addr by hostname, or by ip in string form (AF_INET6) */
+ int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket *php_sock) /* {{{ */
--- a/lang/php/7.0/patches/patch-ext_spl_php_spl_c
+++ b/lang/php/7.0/patches/patch-ext_spl_php_spl_c
@ -0,0 +1,29 @@
+$OpenBSD: patch-ext_spl_php_spl_c,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+--- ext/spl/php_spl.c.orig.port	Sun Dec  6 14:08:26 2015
+++ ext/spl/php_spl.c	Sun Dec  6 14:09:05 2015
+@@ -755,20 +755,20 @@ PHP_FUNCTION(spl_object_hash)
+ 
+ PHPAPI zend_string *php_spl_object_hash(zval *obj) /* {{{*/
+ {
+-	intptr_t hash_handle, hash_handlers;
+	zend_intptr_t hash_handle, hash_handlers;
+ 
+ 	if (!SPL_G(hash_mask_init)) {
+ 		if (!BG(mt_rand_is_seeded)) {
+ 			php_mt_srand((uint32_t)GENERATE_SEED());
+ 		}
+ 
+-		SPL_G(hash_mask_handle)   = (intptr_t)(php_mt_rand() >> 1);
+-		SPL_G(hash_mask_handlers) = (intptr_t)(php_mt_rand() >> 1);
+		SPL_G(hash_mask_handle)   = (zend_intptr_t)(php_mt_rand() >> 1);
+		SPL_G(hash_mask_handlers) = (zend_intptr_t)(php_mt_rand() >> 1);
+ 		SPL_G(hash_mask_init) = 1;
+ 	}
+ 
+-	hash_handle   = SPL_G(hash_mask_handle)^(intptr_t)Z_OBJ_HANDLE_P(obj);
+-	hash_handlers = SPL_G(hash_mask_handlers)^(intptr_t)Z_OBJ_HT_P(obj);
+	hash_handle   = SPL_G(hash_mask_handle)^(zend_intptr_t)Z_OBJ_HANDLE_P(obj);
+	hash_handlers = SPL_G(hash_mask_handlers)^(zend_intptr_t)Z_OBJ_HT_P(obj);
+ 
+ 	return strpprintf(32, "%016lx%016lx", hash_handle, hash_handlers);
+ }
--- a/lang/php/7.0/patches/patch-ext_spl_php_spl_h
+++ b/lang/php/7.0/patches/patch-ext_spl_php_spl_h
@ -0,0 +1,14 @@
+$OpenBSD: patch-ext_spl_php_spl_h,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+--- ext/spl/php_spl.h.orig.port	Sun Dec  6 14:09:13 2015
+++ ext/spl/php_spl.h	Sun Dec  6 14:09:25 2015
+@@ -62,8 +62,8 @@ PHP_MINFO_FUNCTION(spl);
+ ZEND_BEGIN_MODULE_GLOBALS(spl)
+ 	zend_string *autoload_extensions;
+ 	HashTable   *autoload_functions;
+-	intptr_t     hash_mask_handle;
+-	intptr_t     hash_mask_handlers;
+	zend_intptr_t     hash_mask_handle;
+	zend_intptr_t     hash_mask_handlers;
+ 	int          hash_mask_init;
+ 	int          autoload_running;
+ ZEND_END_MODULE_GLOBALS(spl)
--- a/lang/php/7.0/patches/patch-ext_standard_config_m4
+++ b/lang/php/7.0/patches/patch-ext_standard_config_m4
@ -0,0 +1,25 @@
+$OpenBSD: patch-ext_standard_config_m4,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+--- ext/standard/config.m4.orig.port	Tue Dec  1 14:36:39 2015
+++ ext/standard/config.m4	Sun Dec  6 14:04:50 2015
+@@ -391,16 +391,16 @@ dnl
+ dnl Detect library functions needed by php dns_xxx functions
+ dnl ext/standard/php_dns.h will collect these in a single define: HAVE_FULL_DNS_FUNCS
+ dnl
+-PHP_CHECK_FUNC(res_nsearch, resolv, bind, socket)
+-PHP_CHECK_FUNC(dns_search, resolv, bind, socket)
+-PHP_CHECK_FUNC(dn_expand, resolv, bind, socket)
+-PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket)
+PHP_CHECK_FUNC(res_nsearch, resolv, socket)
+PHP_CHECK_FUNC(dns_search, resolv, socket)
+PHP_CHECK_FUNC(dn_expand, resolv, socket)
+PHP_CHECK_FUNC(dn_skipname, resolv, socket)
+ 
+ dnl
+ dnl These are old deprecated functions
+ dnl
+ 
+-PHP_CHECK_FUNC(res_search, resolv, bind, socket)
+PHP_CHECK_FUNC(res_search, resolv, socket)
+ 
+ dnl
+ dnl Check if atof() accepts NAN
--- a/lang/php/7.0/patches/patch-ext_tidy_config_m4
+++ b/lang/php/7.0/patches/patch-ext_tidy_config_m4
@ -0,0 +1,33 @@
+$OpenBSD: patch-ext_tidy_config_m4,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+--- ext/tidy/config.m4.orig.port	Wed Sep 26 16:44:16 2007
+++ ext/tidy/config.m4	Sat Jun 18 12:14:51 2011
+@@ -14,12 +14,12 @@ if test "$PHP_TIDY" != "no"; then
+   fi
+ 
+   for i in $TIDY_SEARCH_DIRS; do
+-    if test -f $i/include/tidy/tidy.h; then
+    if test -f $i/include/tidyp/tidyp.h; then
+       TIDY_DIR=$i
+-      TIDY_INCDIR=$i/include/tidy
+-    elif test -f $i/include/tidy.h; then
+      TIDY_INCDIR=$i/include/tidyp
+    elif test -f $i/include/tidyp.h; then
+       TIDY_DIR=$i
+-      TIDY_INCDIR=$i/include
+      TIDY_INCDIR=$i/include/tidyp
+     fi
+   done
+ 
+@@ -29,10 +29,10 @@ if test "$PHP_TIDY" != "no"; then
+ 
+   TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
+ 
+-  PHP_ADD_LIBRARY_WITH_PATH(tidy, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
+  PHP_ADD_LIBRARY_WITH_PATH(tidyp, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
+   PHP_ADD_INCLUDE($TIDY_INCDIR)
+ 
+-  PHP_CHECK_LIBRARY(tidy,tidyOptGetDoc,
+  PHP_CHECK_LIBRARY(tidyp,tidyOptGetDoc,
+   [
+   AC_DEFINE(HAVE_TIDYOPTGETDOC,1,[ ])
+   ],[],[])
--- a/lang/php/7.0/patches/patch-ext_tidy_tidy_c
+++ b/lang/php/7.0/patches/patch-ext_tidy_tidy_c
@ -0,0 +1,12 @@
+$OpenBSD: patch-ext_tidy_tidy_c,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+--- ext/tidy/tidy.c.orig.port	Wed Jul  3 08:10:53 2013
+++ ext/tidy/tidy.c	Sat Jul 27 18:39:50 2013
+@@ -30,7 +30,7 @@
+ #include "php_ini.h"
+ #include "ext/standard/info.h"
+ 
+-#include "tidy.h"
+#include "tidyp.h"
+ #include "buffio.h"
+ 
+ /* compatibility with older versions of libtidy */
--- a/lang/php/7.0/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
+++ b/lang/php/7.0/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
@ -0,0 +1,12 @@
+$OpenBSD: patch-ext_xmlrpc_libxmlrpc_encodings_c,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+--- ext/xmlrpc/libxmlrpc/encodings.c.orig.port	Tue Dec  1 14:36:35 2015
+++ ext/xmlrpc/libxmlrpc/encodings.c	Sun Dec  6 14:04:50 2015
+@@ -79,7 +79,7 @@ static char* convert(const char* src, int src_len, int
+          if(outbuf) {
+             out_ptr = (char*)outbuf;
+             while(inlenleft) {
+-               st = iconv(ic, (char**)&src, &inlenleft, &out_ptr, &outlenleft);
+               st = iconv(ic, (const char**)&src, &inlenleft, &out_ptr, &outlenleft);
+                if(st == -1) {
+                   if(errno == E2BIG) {
+                      int diff = out_ptr - outbuf;
--- a/lang/php/7.0/patches/patch-main_php_h
+++ b/lang/php/7.0/patches/patch-main_php_h
@ -0,0 +1,13 @@
+$OpenBSD: patch-main_php_h,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+--- main/php.h.orig.port	Wed Nov 12 14:52:21 2014
+++ main/php.h	Sat Nov 15 10:45:12 2014
+@@ -146,7 +146,9 @@ END_EXTERN_C()
+ # if PHP_WIN32
+ typedef int socklen_t;
+ # else
+#   if !defined(__OpenBSD__)
+ typedef unsigned int socklen_t;
+#   endif
+ # endif
+ #endif
+ 
--- a/lang/php/7.0/patches/patch-main_php_ini_c
+++ b/lang/php/7.0/patches/patch-main_php_ini_c
@ -0,0 +1,12 @@
+$OpenBSD: patch-main_php_ini_c,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+--- main/php_ini.c.orig.port	Sun Dec  6 14:09:32 2015
+++ main/php_ini.c	Sun Dec  6 14:10:01 2015
+@@ -572,7 +572,7 @@ int php_init_config(void)
+ 
+ 		/* If still no ini file found, search for php.ini file in search path */
+ 		if (!fh.handle.fp) {
+-			fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &opened_path);
+			fh.handle.fp = php_fopen_with_path("php-${PV}.ini", "r", php_ini_search_path, &opened_path);
+ 			if (fh.handle.fp) {
+ 				fh.filename = ZSTR_VAL(opened_path);
+ 			}
--- a/lang/php/7.0/patches/patch-main_php_open_temporary_file_c
+++ b/lang/php/7.0/patches/patch-main_php_open_temporary_file_c
@ -0,0 +1,12 @@
+$OpenBSD: patch-main_php_open_temporary_file_c,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+--- main/php_open_temporary_file.c.orig.port	Tue Dec  1 14:36:43 2015
+++ main/php_open_temporary_file.c	Sun Dec 13 17:06:18 2015
+@@ -138,7 +138,7 @@ static int php_do_open_temporary_file(const char *path
+ 		trailing_slash = "/";
+ 	}
+ 
+-	if (snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXX", new_state.cwd, trailing_slash, pfx) >= MAXPATHLEN) {
+    if (snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXXXXXX", new_state.cwd, trailing_slash, pfx) >= MAXPATHLEN) {
+ 		efree(new_state.cwd);
+ 		return -1;
+ 	}
--- a/lang/php/7.0/patches/patch-main_streams_php_stream_transport_h
+++ b/lang/php/7.0/patches/patch-main_streams_php_stream_transport_h
@ -0,0 +1,33 @@
+$OpenBSD: patch-main_streams_php_stream_transport_h,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+
+Real world apps and PHP source code (e.g. SOAP, mysqlnd) just use
+STREAM_CRYPTO_METHOD_TLS_CLIENT expecting this to give them "the best
+TLS version". Allow this to do what they expect.
+
+Remove useless STREAM_CRYPTO_METHOD_TLS_ANY_* which aren't used anywhere
+or exported to the parser.
+
+--- main/streams/php_stream_transport.h.orig.port	Tue Dec  1 14:36:43 2015
+++ main/streams/php_stream_transport.h	Sun Dec  6 14:04:50 2015
+@@ -172,9 +172,7 @@ typedef enum {
+ 	STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT = (1 << 3 | 1),
+ 	STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT = (1 << 4 | 1),
+ 	STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT = (1 << 5 | 1),
+-	/* tls now equates only to the specific TLSv1 method for BC with pre-5.6 */
+-	STREAM_CRYPTO_METHOD_TLS_CLIENT = (1 << 3 | 1),
+-	STREAM_CRYPTO_METHOD_TLS_ANY_CLIENT = ((1 << 3) | (1 << 4) | (1 << 5) | 1),
+	STREAM_CRYPTO_METHOD_TLS_CLIENT = ((1 << 3) | (1 << 4) | (1 << 5) | 1),
+ 	STREAM_CRYPTO_METHOD_ANY_CLIENT = ((1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 5) | 1),
+ 	STREAM_CRYPTO_METHOD_SSLv2_SERVER = (1 << 1),
+ 	STREAM_CRYPTO_METHOD_SSLv3_SERVER = (1 << 2),
+@@ -183,9 +181,7 @@ typedef enum {
+ 	STREAM_CRYPTO_METHOD_TLSv1_0_SERVER = (1 << 3),
+ 	STREAM_CRYPTO_METHOD_TLSv1_1_SERVER = (1 << 4),
+ 	STREAM_CRYPTO_METHOD_TLSv1_2_SERVER = (1 << 5),
+-	/* tls equates only to the specific TLSv1 method for BC with pre-5.6 */
+-	STREAM_CRYPTO_METHOD_TLS_SERVER = (1 << 3),
+-	STREAM_CRYPTO_METHOD_TLS_ANY_SERVER = ((1 << 3) | (1 << 4) | (1 << 5)),
+	STREAM_CRYPTO_METHOD_TLS_SERVER = ((1 << 3) | (1 << 4) | (1 << 5)),
+ 	STREAM_CRYPTO_METHOD_ANY_SERVER = ((1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 5))
+ } php_stream_xport_crypt_method_t;
+ 
--- a/lang/php/7.0/patches/patch-php_ini-development
+++ b/lang/php/7.0/patches/patch-php_ini-development
@ -0,0 +1,59 @@
+$OpenBSD: patch-php_ini-development,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+--- php.ini-development.orig.port	Tue Dec  1 14:36:27 2015
+++ php.ini-development	Sun Dec  6 14:04:50 2015
+@@ -697,11 +697,8 @@ default_charset = "UTF-8"
+ ;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ; UNIX: "/path1:/path2"
+-;include_path = ".:/php/includes"
+include_path = ".:OPENBSD_INCLUDE_PATH"
+ ;
+-; Windows: "\path1;\path2"
+-;include_path = ".;c:\php\includes"
+-;
+ ; PHP's default setting for include_path is ".;/path/to/php/pear"
+ ; http://php.net/include-path
+ 
+@@ -723,6 +720,7 @@ user_dir =
+ ; extension_dir = "./"
+ ; On windows:
+ ; extension_dir = "ext"
+extension_dir = "MODULES_DIR"
+ 
+ ; Directory where the temporary files should be placed.
+ ; Defaults to the system default (see sys_get_temp_dir)
+@@ -807,7 +805,7 @@ max_file_uploads = 20
+ 
+ ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
+ ; http://php.net/allow-url-fopen
+-allow_url_fopen = On
+allow_url_fopen = Off
+ 
+ ; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
+ ; http://php.net/allow-url-include
+@@ -910,7 +908,7 @@ cli_server.color = On
+ [Date]
+ ; Defines the default timezone used by the date functions
+ ; http://php.net/date.timezone
+-;date.timezone =
+date.timezone = UTC
+ 
+ ; http://php.net/date.default-latitude
+ ;date.default_latitude = 31.7667
+@@ -1006,16 +1004,6 @@ pdo_mysql.default_socket=
+ ;phar.cache_list =
+ 
+ [mail function]
+-; For Win32 only.
+-; http://php.net/smtp
+-SMTP = localhost
+-; http://php.net/smtp-port
+-smtp_port = 25
+-
+-; For Win32 only.
+-; http://php.net/sendmail-from
+-;sendmail_from = me@example.com
+-
+ ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
+ ; http://php.net/sendmail-path
+ ;sendmail_path =
--- a/lang/php/7.0/patches/patch-php_ini-production
+++ b/lang/php/7.0/patches/patch-php_ini-production
@ -0,0 +1,42 @@
+$OpenBSD: patch-php_ini-production,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+--- php.ini-production.orig.port	Tue Dec  1 14:36:27 2015
+++ php.ini-production	Sun Dec  6 14:04:50 2015
+@@ -697,11 +697,8 @@ default_charset = "UTF-8"
+ ;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ; UNIX: "/path1:/path2"
+-;include_path = ".:/php/includes"
+include_path = ".:OPENBSD_INCLUDE_PATH"
+ ;
+-; Windows: "\path1;\path2"
+-;include_path = ".;c:\php\includes"
+-;
+ ; PHP's default setting for include_path is ".;/path/to/php/pear"
+ ; http://php.net/include-path
+ 
+@@ -723,6 +720,7 @@ user_dir =
+ ; extension_dir = "./"
+ ; On windows:
+ ; extension_dir = "ext"
+extension_dir = "MODULES_DIR"
+ 
+ ; Directory where the temporary files should be placed.
+ ; Defaults to the system default (see sys_get_temp_dir)
+@@ -807,7 +805,7 @@ max_file_uploads = 20
+ 
+ ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
+ ; http://php.net/allow-url-fopen
+-allow_url_fopen = On
+allow_url_fopen = Off
+ 
+ ; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
+ ; http://php.net/allow-url-include
+@@ -910,7 +908,7 @@ cli_server.color = On
+ [Date]
+ ; Defines the default timezone used by the date functions
+ ; http://php.net/date.timezone
+-;date.timezone =
+date.timezone = UTC
+ 
+ ; http://php.net/date.default-latitude
+ ;date.default_latitude = 31.7667
--- a/lang/php/7.0/patches/patch-sapi_cgi_cgi_main_c
+++ b/lang/php/7.0/patches/patch-sapi_cgi_cgi_main_c
@ -0,0 +1,25 @@
+$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+--- sapi/cgi/cgi_main.c.orig.port	Sun Dec  6 14:11:02 2015
+++ sapi/cgi/cgi_main.c	Sun Dec  6 14:11:41 2015
+@@ -1722,6 +1722,7 @@ int main(int argc, char *argv[])
+ 	char *orig_optarg = php_optarg;
+ 	char *script_file = NULL;
+ 	size_t ini_entries_len = 0;
+	char *ini;
+ 	/* end of temporary locals */
+ 
+ 	int max_requests = 500;
+@@ -1784,7 +1785,12 @@ int main(int argc, char *argv[])
+ 
+ 	sapi_startup(&cgi_sapi_module);
+ 	fastcgi = fcgi_is_fastcgi();
+-	cgi_sapi_module.php_ini_path_override = NULL;
+
+	if ((ini = getenv("PHP_INI_PATH"))) {
+		cgi_sapi_module.php_ini_path_override = ini;
+	} else {
+		cgi_sapi_module.php_ini_path_override = NULL;
+	}
+ 
+ #ifdef PHP_WIN32
+ 	_fmode = _O_BINARY; /* sets default for file streams to binary */
--- a/lang/php/7.0/patches/patch-sapi_cli_php_cli_c
+++ b/lang/php/7.0/patches/patch-sapi_cli_php_cli_c
@ -0,0 +1,11 @@
+$OpenBSD: patch-sapi_cli_php_cli_c,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+--- sapi/cli/php_cli.c.orig.port	Tue Dec  1 14:36:28 2015
+++ sapi/cli/php_cli.c	Sun Dec  6 14:04:50 2015
+@@ -663,6 +663,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
+ 	int lineno = 0;
+ 	const char *param_error=NULL;
+ 	int hide_argv = 0;
+	char *ini;
+ 
+ 	zend_try {
+ 
--- a/lang/php/7.0/patches/patch-sapi_fpm_fpm_fpm_atomic_h
+++ b/lang/php/7.0/patches/patch-sapi_fpm_fpm_fpm_atomic_h
@ -0,0 +1,103 @@
+$OpenBSD: patch-sapi_fpm_fpm_fpm_atomic_h,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+
+Add support for mips
+Fix types for sparc64
+
+--- sapi/fpm/fpm/fpm_atomic.h.orig.port	Wed Nov 21 20:07:23 2012
+++ sapi/fpm/fpm/fpm_atomic.h	Fri Nov 23 15:40:43 2012
+@@ -77,10 +77,10 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l
+ }
+ /* }}} */
+ 
+-#if (__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
+-
+ #elif ( __arm__ || __arm ) /* W-Mark Kubacki */
+ 
+#if (__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
+
+ #if (__arch64__ || __arch64)
+ typedef int64_t                     atomic_int_t;
+ typedef uint64_t                    atomic_uint_t;
+@@ -101,7 +101,7 @@ typedef uint32_t                    atomic_uint_t;
+ typedef uint64_t                    atomic_uint_t;
+ typedef volatile atomic_uint_t      atomic_t;
+ 
+-static inline int atomic_cas_64(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */
+static inline atomic_uint_t atomic_cas_64(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */
+ {
+ 	__asm__ __volatile__("casx [%2], %3, %0 " : "=&r"(new)  : "0"(new), "r"(lock), "r"(old): "memory");
+ 
+@@ -118,7 +118,7 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l
+ typedef uint32_t                    atomic_uint_t;
+ typedef volatile atomic_uint_t      atomic_t;
+ 
+-static inline int atomic_cas_32(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */
+static inline atomic_uint_t atomic_cas_32(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */
+ {
+ 	__asm__ __volatile__("cas [%2], %3, %0 " : "=&r"(new)  : "0"(new), "r"(lock), "r"(old): "memory");
+ 
+@@ -136,6 +136,64 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l
+ #else /* #if (__sparcv9 || __sparcv9__) */
+ #error Sparc v8 and predecessors are not and will not be supported (see bug report 53310)
+ #endif /* #if (__sparcv9 || __sparcv9__) */
+
+#elif ( __mips__ || __mips64__ )
+
+#if (__LP64__ || _LP64)
+typedef uint64_t                    atomic_uint_t;
+typedef volatile atomic_uint_t      atomic_t;
+
+static inline atomic_uint_t atomic_cas_64(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */
+{
+	atomic_uint_t v;
+
+	__asm__ __volatile__ (
+	"\t.set\tnoreorder\n"
+	"\tlld\t%0, 0(%1)\n"
+	"\tbne\t%0, %2, 1f\n"
+	"\tnop\n"
+	"\tscd\t%3, 0(%1)\n"
+	"1:\n"
+	"\t.set\treorder\n" :
+	"=r" (v) : "r" (lock), "r" (old), "r" (new) : "memory");
+
+	return v;
+}
+/* }}} */
+
+static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) /* {{{ */
+{
+	return (atomic_cas_64(lock, old, set)==old);
+}
+/* }}} */
+#else
+typedef uint32_t                    atomic_uint_t;
+typedef volatile atomic_uint_t      atomic_t;
+
+static inline atomic_uint_t atomic_cas_32(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */
+{
+	atomic_uint_t v;
+
+	__asm__ __volatile__ (
+	"\t.set\tnoreorder\n"
+	"\tll\t%0, 0(%1)\n"
+	"\tbne\t%0, %2, 1f\n"
+	"\tnop\n"
+	"\tsc\t%3, 0(%1)\n"
+	"1:\n"
+	"\t.set\treorder\n" :
+	"=r" (v) : "r" (lock), "r" (old), "r" (new) : "memory");
+
+	return v;
+}
+/* }}} */
+
+static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) /* {{{ */
+{
+	return (atomic_cas_32(lock, old, set)==old);
+}
+/* }}} */
+#endif
+ 
+ #else
+ 
--- a/lang/php/7.0/patches/patch-sapi_fpm_www_conf_in
+++ b/lang/php/7.0/patches/patch-sapi_fpm_www_conf_in
@ -0,0 +1,34 @@
+$OpenBSD: patch-sapi_fpm_www_conf_in,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
+--- sapi/fpm/www.conf.in.orig.port	Sun Dec  6 14:12:56 2015
+++ sapi/fpm/www.conf.in	Sun Dec  6 14:13:21 2015
+@@ -33,7 +33,7 @@ group = @php_fpm_group@
+ ;                            (IPv6 and IPv4-mapped) on a specific port;
+ ;   '/path/to/unix/socket' - to listen on a unix socket.
+ ; Note: This value is mandatory.
+-listen = 127.0.0.1:9000
+listen = /var/www/run/php-fpm.sock
+ 
+ ; Set listen(2) backlog.
+ ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
+@@ -44,9 +44,9 @@ listen = 127.0.0.1:9000
+ ; BSD-derived systems allow connections regardless of permissions.
+ ; Default Values: user and group are set as the running user
+ ;                 mode is set to 0660
+-;listen.owner = @php_fpm_user@
+-;listen.group = @php_fpm_group@
+-;listen.mode = 0660
+listen.owner = www
+listen.group = www
+listen.mode = 0660
+ ; When POSIX Access Control Lists are supported you can set them using
+ ; these options, value is a comma separated list of user/group names.
+ ; When set, listen.owner and listen.group are ignored
+@@ -347,7 +347,7 @@ pm.max_spare_servers = 3
+ ;       possible. However, all PHP paths will be relative to the chroot
+ ;       (error_log, sessions.save_path, ...).
+ ; Default Value: not set
+-;chroot =
+chroot = /var/www
+ 
+ ; Chdir to this directory at the start.
+ ; Note: relative path can be used.
--- a/lang/php/7.0/patches/patch-scripts_Makefile_frag
+++ b/lang/php/7.0/patches/patch-scripts_Makefile_frag
@ -0,0 +1,14 @@
+$OpenBSD: patch-scripts_Makefile_frag,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+--- scripts/Makefile.frag.orig.port	Tue Jul 13 18:24:13 2010
+++ scripts/Makefile.frag	Sat Jun 18 12:14:54 2011
+@@ -3,8 +3,8 @@
+ # Build environment install
+ #
+ 
+-phpincludedir = $(includedir)/php
+-phpbuilddir = $(libdir)/build
+phpincludedir = $(peardir)/include
+phpbuilddir = $(peardir)/build
+ 
+ BUILD_FILES = \
+ 	scripts/phpize.m4 \
--- a/lang/php/7.0/patches/patch-scripts_php-config_in
+++ b/lang/php/7.0/patches/patch-scripts_php-config_in
@ -0,0 +1,31 @@
+$OpenBSD: patch-scripts_php-config_in,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+--- scripts/php-config.in.orig.port	Thu Jul 18 16:37:33 2013
+++ scripts/php-config.in	Sun Jul 28 11:30:20 2013
+@@ -1,12 +1,12 @@
+ #! /bin/sh
+ 
+ SED="@SED@"
+-prefix="@prefix@"
+prefix='/var/www/pear'
+ datarootdir="@datarootdir@"
+ exec_prefix="@exec_prefix@"
+ version="@PHP_VERSION@"
+ vernum="@PHP_VERSION_ID@"
+-include_dir="@includedir@/php"
+include_dir="@PEAR_INSTALLDIR@/include"
+ includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
+ ldflags="@PHP_LDFLAGS@"
+ libs="@EXTRA_LIBS@"
+@@ -24,10 +24,11 @@ php_sapis="@PHP_INSTALLED_SAPIS@"
+ for sapi in $php_sapis; do
+   case $sapi in
+   cli)
+-    php_cli_binary="@bindir@/${program_prefix}php${program_suffix}${exe_extension}"
+    php_cli_binary="/usr/local/bin/php${program_suffix}"
+     ;;
+   cgi)
+     php_cgi_binary="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}"
+    php_cgi_binary="/usr/local/bin/php-cgi${program_suffix}"
+     ;;
+   esac
+ done
--- a/lang/php/7.0/patches/patch-scripts_phpize_in
+++ b/lang/php/7.0/patches/patch-scripts_phpize_in
@ -0,0 +1,18 @@
+$OpenBSD: patch-scripts_phpize_in,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+--- scripts/phpize.in.orig.port	Sat Jul 27 18:47:01 2013
+++ scripts/phpize.in	Sat Jul 27 18:47:19 2013
+@@ -1,11 +1,11 @@
+ #!/bin/sh
+ 
+ # Variable declaration
+-prefix='@prefix@'
+prefix=@PEAR_INSTALLDIR@
+ datarootdir='@datarootdir@'
+ exec_prefix="`eval echo @exec_prefix@`"
+-phpdir="`eval echo @libdir@`/build"
+-includedir="`eval echo @includedir@`/php"
+phpdir="$prefix/build"
+includedir="$prefix/include"
+ builddir="`pwd`"
+ SED="@SED@"
+ 
--- a/lang/php/7.0/pkg/DESCR-fpm
+++ b/lang/php/7.0/pkg/DESCR-fpm
@ -0,0 +1,6 @@
+PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI
+implementation with some additional features useful for sites of
+any size, especially busier sites.
+
+PHP-FPM also handles running processes in a chroot jail and this
+is enabled in the example php-fpm.conf file; adjust this if needed.
--- a/lang/php/7.0/pkg/PLIST-bz2
+++ b/lang/php/7.0/pkg/PLIST-bz2
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-bz2,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-bz2->=7.0,<7.1
+@conflict php5-bz2->=5.2
+lib/php-${PV}/modules/bz2.so
+share/examples/php-${PV}/bz2.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/bz2.ini
--- a/lang/php/7.0/pkg/PLIST-curl
+++ b/lang/php/7.0/pkg/PLIST-curl
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-curl,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-curl->=7.0,<7.1
+@conflict php5-curl->=5.2
+lib/php-${PV}/modules/curl.so
+share/examples/php-${PV}/curl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/curl.ini
--- a/lang/php/7.0/pkg/PLIST-dba
+++ b/lang/php/7.0/pkg/PLIST-dba
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-dba,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-dba->=7.0,<7.1
+@conflict php5-dba->=5.2
+lib/php-${PV}/modules/dba.so
+share/examples/php-${PV}/dba.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/dba.ini
--- a/lang/php/7.0/pkg/PLIST-fastcgi
+++ b/lang/php/7.0/pkg/PLIST-fastcgi
@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST-fastcgi,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-fastcgi->=7.0,<7.1
+@bin bin/php-fastcgi-${PV}
--- a/lang/php/7.0/pkg/PLIST-fpm
+++ b/lang/php/7.0/pkg/PLIST-fpm
@ -0,0 +1,8 @@
+@comment $OpenBSD: PLIST-fpm,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-fpm->=7.0,<7.1
+@man man/man8/php-fpm-${PV}.8
+@bin sbin/php-fpm-${PV}
+share/examples/php-${PV}/php-fpm.conf
+@sample ${SYSCONFDIR}/php-fpm.conf
+@rcscript ${RCDIR}/php${SV}_fpm
--- a/lang/php/7.0/pkg/PLIST-gd
+++ b/lang/php/7.0/pkg/PLIST-gd
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-gd,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-gd->=7.0,<7.1
+@conflict php5-gd->=5.2
+lib/php-${PV}/modules/gd.so
+share/examples/php-${PV}/gd.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/gd.ini
--- a/lang/php/7.0/pkg/PLIST-gmp
+++ b/lang/php/7.0/pkg/PLIST-gmp
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-gmp,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-gmp->=7.0,<7.1
+@conflict php5-gmp->=5.2
+lib/php-${PV}/modules/gmp.so
+share/examples/php-${PV}/gmp.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/gmp.ini
--- a/lang/php/7.0/pkg/PLIST-imap
+++ b/lang/php/7.0/pkg/PLIST-imap
@ -0,0 +1,9 @@
+@comment $OpenBSD: PLIST-imap,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-imap->=7.0,<7.1
+@conflict php5-imap->=5.2
+lib/php-${PV}/modules/imap.so
+share/examples/php-${PV}/imap.ini
+@comment etc/master.passwd
+@comment etc/spwd.db
+@sample ${SYSCONFDIR}/php-${PV}.sample/imap.ini
--- a/lang/php/7.0/pkg/PLIST-intl
+++ b/lang/php/7.0/pkg/PLIST-intl
@ -0,0 +1,6 @@
+@comment $OpenBSD: PLIST-intl,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-intl->=7.0,<7.1
+lib/php-${PV}/modules/intl.so
+share/examples/php-${PV}/intl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/intl.ini
--- a/lang/php/7.0/pkg/PLIST-ldap
+++ b/lang/php/7.0/pkg/PLIST-ldap
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-ldap,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-ldap->=7.0,<7.1
+@conflict php5-ldap->=5.2
+lib/php-${PV}/modules/ldap.so
+share/examples/php-${PV}/ldap.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ldap.ini
--- a/lang/php/7.0/pkg/PLIST-main
+++ b/lang/php/7.0/pkg/PLIST-main
@ -0,0 +1,384 @@
+@comment $OpenBSD: PLIST-main,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php->=7.0,<7.1
+@conflict php5-core->=5.2
+@conflict php5-core-fastcgi->=5.2
+@conflict php-pdo_sqlite->=7.0,<7.1
+@conflict php5-pdo_sqlite->=5.2
+@pkgpath lang/php/5.4
+@pkgpath lang/php/5.4,-pdo_sqlite
+@extraunexec rm -f ${SYSCONFDIR}/php-${PV}/php-${PV}.sample/*
+@mode 1700
+@owner www
+@group www
+@sample /var/www/tmp/
+@mode
+@owner
+@group
+@bin bin/php-${PV}
+bin/php-config-${PV}
+bin/phpize-${PV}
+lib/php-${PV}/
+lib/php-${PV}/libphp7.so
+lib/php-${PV}/modules/
+lib/php-${PV}/modules/opcache.so
+@man man/man1/php-${PV}.1
+@man man/man1/php-config-${PV}.1
+@man man/man1/phpize-${PV}.1
+share/examples/php-${PV}/
+@sample /var/www/conf/modules.sample/
+@sample ${SYSCONFDIR}/php-${PV}.sample/
+share/examples/php-${PV}/opcache.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini
+share/examples/php-${PV}/php.conf
+@sample /var/www/conf/modules.sample/php-${PV}.conf
+share/examples/php-${PV}/php.ini-development
+share/examples/php-${PV}/php.ini-production
+@sample ${SYSCONFDIR}/php-${PV}.ini
+share/php-${PV}/
+share/php-${PV}/build/
+share/php-${PV}/build/Makefile.global
+share/php-${PV}/build/acinclude.m4
+share/php-${PV}/build/config.guess
+share/php-${PV}/build/config.sub
+share/php-${PV}/build/libtool.m4
+share/php-${PV}/build/ltmain.sh
+share/php-${PV}/build/mkdep.awk
+share/php-${PV}/build/phpize.m4
+share/php-${PV}/build/run-tests.php
+share/php-${PV}/build/scan_makefile_in.awk
+share/php-${PV}/build/shtool
+share/php-${PV}/include/
+share/php-${PV}/include/TSRM/
+share/php-${PV}/include/TSRM/TSRM.h
+share/php-${PV}/include/TSRM/readdir.h
+share/php-${PV}/include/TSRM/tsrm_config.h
+share/php-${PV}/include/TSRM/tsrm_config.w32.h
+share/php-${PV}/include/TSRM/tsrm_config_common.h
+share/php-${PV}/include/TSRM/tsrm_nw.h
+share/php-${PV}/include/TSRM/tsrm_strtok_r.h
+share/php-${PV}/include/TSRM/tsrm_win32.h
+share/php-${PV}/include/Zend/
+share/php-${PV}/include/Zend/zend.h
+share/php-${PV}/include/Zend/zend_API.h
+share/php-${PV}/include/Zend/zend_ast.h
+share/php-${PV}/include/Zend/zend_alloc.h
+share/php-${PV}/include/Zend/zend_alloc_sizes.h
+share/php-${PV}/include/Zend/zend_arena.h
+share/php-${PV}/include/Zend/zend_build.h
+share/php-${PV}/include/Zend/zend_builtin_functions.h
+share/php-${PV}/include/Zend/zend_closures.h
+share/php-${PV}/include/Zend/zend_compile.h
+share/php-${PV}/include/Zend/zend_config.h
+share/php-${PV}/include/Zend/zend_config.nw.h
+share/php-${PV}/include/Zend/zend_config.w32.h
+share/php-${PV}/include/Zend/zend_constants.h
+share/php-${PV}/include/Zend/zend_dtrace.h
+share/php-${PV}/include/Zend/zend_errors.h
+share/php-${PV}/include/Zend/zend_exceptions.h
+share/php-${PV}/include/Zend/zend_execute.h
+share/php-${PV}/include/Zend/zend_extensions.h
+share/php-${PV}/include/Zend/zend_float.h
+share/php-${PV}/include/Zend/zend_gc.h
+share/php-${PV}/include/Zend/zend_generators.h
+share/php-${PV}/include/Zend/zend_globals.h
+share/php-${PV}/include/Zend/zend_globals_macros.h
+share/php-${PV}/include/Zend/zend_hash.h
+share/php-${PV}/include/Zend/zend_highlight.h
+share/php-${PV}/include/Zend/zend_inheritance.h
+share/php-${PV}/include/Zend/zend_ini.h
+share/php-${PV}/include/Zend/zend_ini_parser.h
+share/php-${PV}/include/Zend/zend_ini_scanner.h
+share/php-${PV}/include/Zend/zend_ini_scanner_defs.h
+share/php-${PV}/include/Zend/zend_interfaces.h
+share/php-${PV}/include/Zend/zend_istdiostream.h
+share/php-${PV}/include/Zend/zend_iterators.h
+share/php-${PV}/include/Zend/zend_language_parser.h
+share/php-${PV}/include/Zend/zend_language_scanner.h
+share/php-${PV}/include/Zend/zend_language_scanner_defs.h
+share/php-${PV}/include/Zend/zend_list.h
+share/php-${PV}/include/Zend/zend_llist.h
+share/php-${PV}/include/Zend/zend_long.h
+share/php-${PV}/include/Zend/zend_modules.h
+share/php-${PV}/include/Zend/zend_multibyte.h
+share/php-${PV}/include/Zend/zend_multiply.h
+share/php-${PV}/include/Zend/zend_object_handlers.h
+share/php-${PV}/include/Zend/zend_objects.h
+share/php-${PV}/include/Zend/zend_objects_API.h
+share/php-${PV}/include/Zend/zend_operators.h
+share/php-${PV}/include/Zend/zend_portability.h
+share/php-${PV}/include/Zend/zend_ptr_stack.h
+share/php-${PV}/include/Zend/zend_range_check.h
+share/php-${PV}/include/Zend/zend_signal.h
+share/php-${PV}/include/Zend/zend_smart_str.h
+share/php-${PV}/include/Zend/zend_smart_str_public.h
+share/php-${PV}/include/Zend/zend_sort.h
+share/php-${PV}/include/Zend/zend_stack.h
+share/php-${PV}/include/Zend/zend_stream.h
+share/php-${PV}/include/Zend/zend_string.h
+share/php-${PV}/include/Zend/zend_strtod.h
+share/php-${PV}/include/Zend/zend_strtod_int.h
+share/php-${PV}/include/Zend/zend_ts_hash.h
+share/php-${PV}/include/Zend/zend_types.h
+share/php-${PV}/include/Zend/zend_variables.h
+share/php-${PV}/include/Zend/zend_virtual_cwd.h
+share/php-${PV}/include/Zend/zend_vm.h
+share/php-${PV}/include/Zend/zend_vm_def.h
+share/php-${PV}/include/Zend/zend_vm_execute.h
+share/php-${PV}/include/Zend/zend_vm_opcodes.h
+share/php-${PV}/include/ext/
+share/php-${PV}/include/ext/date/
+share/php-${PV}/include/ext/date/lib/
+share/php-${PV}/include/ext/date/lib/timelib.h
+share/php-${PV}/include/ext/date/lib/timelib_config.h
+share/php-${PV}/include/ext/date/lib/timelib_structs.h
+share/php-${PV}/include/ext/date/php_date.h
+share/php-${PV}/include/ext/dom/
+share/php-${PV}/include/ext/dom/xml_common.h
+share/php-${PV}/include/ext/filter/
+share/php-${PV}/include/ext/filter/php_filter.h
+share/php-${PV}/include/ext/gd/
+share/php-${PV}/include/ext/gd/gdcache.h
+share/php-${PV}/include/ext/gd/gd_compat.h
+share/php-${PV}/include/ext/gd/libgd/
+share/php-${PV}/include/ext/gd/libgd/gd.h
+share/php-${PV}/include/ext/gd/libgd/gd_intern.h
+share/php-${PV}/include/ext/gd/libgd/gd_io.h
+share/php-${PV}/include/ext/gd/libgd/gdcache.h
+share/php-${PV}/include/ext/gd/libgd/gdfontg.h
+share/php-${PV}/include/ext/gd/libgd/gdfontl.h
+share/php-${PV}/include/ext/gd/libgd/gdfontmb.h
+share/php-${PV}/include/ext/gd/libgd/gdfonts.h
+share/php-${PV}/include/ext/gd/libgd/gdfontt.h
+share/php-${PV}/include/ext/gd/libgd/gdhelpers.h
+share/php-${PV}/include/ext/gd/libgd/jisx0208.h
+share/php-${PV}/include/ext/gd/libgd/wbmp.h
+share/php-${PV}/include/ext/gd/php_gd.h
+share/php-${PV}/include/ext/hash/
+share/php-${PV}/include/ext/hash/php_hash.h
+share/php-${PV}/include/ext/hash/php_hash_adler32.h
+share/php-${PV}/include/ext/hash/php_hash_crc32.h
+share/php-${PV}/include/ext/hash/php_hash_fnv.h
+share/php-${PV}/include/ext/hash/php_hash_gost.h
+share/php-${PV}/include/ext/hash/php_hash_haval.h
+share/php-${PV}/include/ext/hash/php_hash_joaat.h
+share/php-${PV}/include/ext/hash/php_hash_md.h
+share/php-${PV}/include/ext/hash/php_hash_ripemd.h
+share/php-${PV}/include/ext/hash/php_hash_sha.h
+share/php-${PV}/include/ext/hash/php_hash_snefru.h
+share/php-${PV}/include/ext/hash/php_hash_tiger.h
+share/php-${PV}/include/ext/hash/php_hash_whirlpool.h
+share/php-${PV}/include/ext/iconv/
+share/php-${PV}/include/ext/iconv/php_have_bsd_iconv.h
+share/php-${PV}/include/ext/iconv/php_have_glibc_iconv.h
+share/php-${PV}/include/ext/iconv/php_have_ibm_iconv.h
+share/php-${PV}/include/ext/iconv/php_have_iconv.h
+share/php-${PV}/include/ext/iconv/php_have_libiconv.h
+share/php-${PV}/include/ext/iconv/php_iconv.h
+share/php-${PV}/include/ext/iconv/php_iconv_aliased_libiconv.h
+share/php-${PV}/include/ext/iconv/php_iconv_broken_ignore.h
+share/php-${PV}/include/ext/iconv/php_iconv_supports_errno.h
+share/php-${PV}/include/ext/iconv/php_php_iconv_h_path.h
+share/php-${PV}/include/ext/iconv/php_php_iconv_impl.h
+share/php-${PV}/include/ext/json/
+share/php-${PV}/include/ext/json/php_json.h
+share/php-${PV}/include/ext/libxml/
+share/php-${PV}/include/ext/libxml/php_libxml.h
+share/php-${PV}/include/ext/mbstring/
+share/php-${PV}/include/ext/mbstring/libmbfl/
+share/php-${PV}/include/ext/mbstring/libmbfl/config.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/eaw_table.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfilter.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_language.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
+share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_string.h
+share/php-${PV}/include/ext/mbstring/mbstring.h
+share/php-${PV}/include/ext/mbstring/oniguruma/
+share/php-${PV}/include/ext/mbstring/oniguruma/oniguruma.h
+share/php-${PV}/include/ext/mbstring/php_mbregex.h
+share/php-${PV}/include/ext/mbstring/php_onig_compat.h
+share/php-${PV}/include/ext/mysqli/
+share/php-${PV}/include/ext/mysqli/mysqli_libmysql.h
+share/php-${PV}/include/ext/mysqli/php_mysqli_structs.h
+share/php-${PV}/include/ext/mysqlnd/
+share/php-${PV}/include/ext/mysqlnd/config-win.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_alloc.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_block_alloc.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_charset.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_debug.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_enum_n_def.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_ext_plugin.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_libmysql_compat.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_net.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_portability.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_priv.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_result.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_result_meta.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_reverse_api.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_statistics.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_structs.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_wireprotocol.h
+share/php-${PV}/include/ext/mysqlnd/mysql_float_to_double.h
+share/php-${PV}/include/ext/mysqlnd/php_mysqlnd.h
+share/php-${PV}/include/ext/pcre/
+share/php-${PV}/include/ext/pcre/pcrelib/
+share/php-${PV}/include/ext/pcre/pcrelib/config.h
+share/php-${PV}/include/ext/pcre/pcrelib/pcre.h
+share/php-${PV}/include/ext/pcre/pcrelib/pcre_internal.h
+share/php-${PV}/include/ext/pcre/pcrelib/pcreposix.h
+share/php-${PV}/include/ext/pcre/pcrelib/ucp.h
+share/php-${PV}/include/ext/pcre/php_pcre.h
+share/php-${PV}/include/ext/pdo/
+share/php-${PV}/include/ext/pdo/php_pdo.h
+share/php-${PV}/include/ext/pdo/php_pdo_driver.h
+share/php-${PV}/include/ext/pdo/php_pdo_error.h
+share/php-${PV}/include/ext/phar/
+share/php-${PV}/include/ext/phar/php_phar.h
+share/php-${PV}/include/ext/session/
+share/php-${PV}/include/ext/session/mod_files.h
+share/php-${PV}/include/ext/session/mod_user.h
+share/php-${PV}/include/ext/session/php_session.h
+share/php-${PV}/include/ext/simplexml/
+share/php-${PV}/include/ext/simplexml/php_simplexml.h
+share/php-${PV}/include/ext/simplexml/php_simplexml_exports.h
+share/php-${PV}/include/ext/sockets/
+share/php-${PV}/include/ext/sockets/php_sockets.h
+share/php-${PV}/include/ext/spl/
+share/php-${PV}/include/ext/spl/php_spl.h
+share/php-${PV}/include/ext/spl/spl_array.h
+share/php-${PV}/include/ext/spl/spl_directory.h
+share/php-${PV}/include/ext/spl/spl_dllist.h
+share/php-${PV}/include/ext/spl/spl_engine.h
+share/php-${PV}/include/ext/spl/spl_exceptions.h
+share/php-${PV}/include/ext/spl/spl_fixedarray.h
+share/php-${PV}/include/ext/spl/spl_functions.h
+share/php-${PV}/include/ext/spl/spl_heap.h
+share/php-${PV}/include/ext/spl/spl_iterators.h
+share/php-${PV}/include/ext/spl/spl_observer.h
+share/php-${PV}/include/ext/sqlite3/
+share/php-${PV}/include/ext/sqlite3/libsqlite/
+share/php-${PV}/include/ext/sqlite3/libsqlite/sqlite3.h
+share/php-${PV}/include/ext/standard/
+share/php-${PV}/include/ext/standard/base64.h
+share/php-${PV}/include/ext/standard/basic_functions.h
+share/php-${PV}/include/ext/standard/crc32.h
+share/php-${PV}/include/ext/standard/credits.h
+share/php-${PV}/include/ext/standard/credits_ext.h
+share/php-${PV}/include/ext/standard/credits_sapi.h
+share/php-${PV}/include/ext/standard/crypt_blowfish.h
+share/php-${PV}/include/ext/standard/crypt_freesec.h
+share/php-${PV}/include/ext/standard/css.h
+share/php-${PV}/include/ext/standard/cyr_convert.h
+share/php-${PV}/include/ext/standard/datetime.h
+share/php-${PV}/include/ext/standard/dl.h
+share/php-${PV}/include/ext/standard/exec.h
+share/php-${PV}/include/ext/standard/file.h
+share/php-${PV}/include/ext/standard/flock_compat.h
+share/php-${PV}/include/ext/standard/fsock.h
+share/php-${PV}/include/ext/standard/head.h
+share/php-${PV}/include/ext/standard/html.h
+share/php-${PV}/include/ext/standard/html_tables.h
+share/php-${PV}/include/ext/standard/info.h
+share/php-${PV}/include/ext/standard/md5.h
+share/php-${PV}/include/ext/standard/microtime.h
+share/php-${PV}/include/ext/standard/pack.h
+share/php-${PV}/include/ext/standard/pageinfo.h
+share/php-${PV}/include/ext/standard/php_array.h
+share/php-${PV}/include/ext/standard/php_assert.h
+share/php-${PV}/include/ext/standard/php_browscap.h
+share/php-${PV}/include/ext/standard/php_crypt.h
+share/php-${PV}/include/ext/standard/php_crypt_r.h
+share/php-${PV}/include/ext/standard/php_dir.h
+share/php-${PV}/include/ext/standard/php_dns.h
+share/php-${PV}/include/ext/standard/php_ext_syslog.h
+share/php-${PV}/include/ext/standard/php_filestat.h
+share/php-${PV}/include/ext/standard/php_fopen_wrappers.h
+share/php-${PV}/include/ext/standard/php_ftok.h
+share/php-${PV}/include/ext/standard/php_http.h
+share/php-${PV}/include/ext/standard/php_image.h
+share/php-${PV}/include/ext/standard/php_incomplete_class.h
+share/php-${PV}/include/ext/standard/php_iptc.h
+share/php-${PV}/include/ext/standard/php_lcg.h
+share/php-${PV}/include/ext/standard/php_link.h
+share/php-${PV}/include/ext/standard/php_mail.h
+share/php-${PV}/include/ext/standard/php_math.h
+share/php-${PV}/include/ext/standard/php_metaphone.h
+share/php-${PV}/include/ext/standard/php_password.h
+share/php-${PV}/include/ext/standard/php_rand.h
+share/php-${PV}/include/ext/standard/php_random.h
+share/php-${PV}/include/ext/standard/php_smart_string.h
+share/php-${PV}/include/ext/standard/php_smart_string_public.h
+share/php-${PV}/include/ext/standard/php_standard.h
+share/php-${PV}/include/ext/standard/php_string.h
+share/php-${PV}/include/ext/standard/php_type.h
+share/php-${PV}/include/ext/standard/php_uuencode.h
+share/php-${PV}/include/ext/standard/php_var.h
+share/php-${PV}/include/ext/standard/php_versioning.h
+share/php-${PV}/include/ext/standard/proc_open.h
+share/php-${PV}/include/ext/standard/quot_print.h
+share/php-${PV}/include/ext/standard/scanf.h
+share/php-${PV}/include/ext/standard/sha1.h
+share/php-${PV}/include/ext/standard/streamsfuncs.h
+share/php-${PV}/include/ext/standard/uniqid.h
+share/php-${PV}/include/ext/standard/url.h
+share/php-${PV}/include/ext/standard/url_scanner_ex.h
+share/php-${PV}/include/ext/standard/winver.h
+share/php-${PV}/include/ext/xml/
+share/php-${PV}/include/ext/xml/expat_compat.h
+share/php-${PV}/include/ext/xml/php_xml.h
+share/php-${PV}/include/include/
+share/php-${PV}/include/main/
+share/php-${PV}/include/main/SAPI.h
+share/php-${PV}/include/main/build-defs.h
+share/php-${PV}/include/main/fastcgi.h
+share/php-${PV}/include/main/fopen_wrappers.h
+share/php-${PV}/include/main/http_status_codes.h
+share/php-${PV}/include/main/php.h
+share/php-${PV}/include/main/php_compat.h
+share/php-${PV}/include/main/php_config.h
+share/php-${PV}/include/main/php_content_types.h
+share/php-${PV}/include/main/php_getopt.h
+share/php-${PV}/include/main/php_globals.h
+share/php-${PV}/include/main/php_ini.h
+share/php-${PV}/include/main/php_main.h
+share/php-${PV}/include/main/php_memory_streams.h
+share/php-${PV}/include/main/php_network.h
+share/php-${PV}/include/main/php_open_temporary_file.h
+share/php-${PV}/include/main/php_output.h
+share/php-${PV}/include/main/php_reentrancy.h
+share/php-${PV}/include/main/php_scandir.h
+share/php-${PV}/include/main/php_stdint.h
+share/php-${PV}/include/main/php_streams.h
+share/php-${PV}/include/main/php_syslog.h
+share/php-${PV}/include/main/php_ticks.h
+share/php-${PV}/include/main/php_variables.h
+share/php-${PV}/include/main/php_version.h
+share/php-${PV}/include/main/rfc1867.h
+share/php-${PV}/include/main/snprintf.h
+share/php-${PV}/include/main/spprintf.h
+share/php-${PV}/include/main/streams/
+share/php-${PV}/include/main/streams/php_stream_context.h
+share/php-${PV}/include/main/streams/php_stream_filter_api.h
+share/php-${PV}/include/main/streams/php_stream_glob_wrapper.h
+share/php-${PV}/include/main/streams/php_stream_mmap.h
+share/php-${PV}/include/main/streams/php_stream_plain_wrapper.h
+share/php-${PV}/include/main/streams/php_stream_transport.h
+share/php-${PV}/include/main/streams/php_stream_userspace.h
+share/php-${PV}/include/main/streams/php_streams_int.h
+share/php-${PV}/include/main/win95nt.h
+share/php-${PV}/include/sapi/
+share/php-${PV}/include/sapi/cli/
+share/php-${PV}/include/sapi/cli/cli.h
+@sample ${SYSCONFDIR}/php-${PV}/
--- a/lang/php/7.0/pkg/PLIST-mcrypt
+++ b/lang/php/7.0/pkg/PLIST-mcrypt
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-mcrypt,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-mcrypt->=7.0,<7.1
+@conflict php5-mcrypt->=5.2
+lib/php-${PV}/modules/mcrypt.so
+share/examples/php-${PV}/mcrypt.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mcrypt.ini
--- a/lang/php/7.0/pkg/PLIST-mysqli
+++ b/lang/php/7.0/pkg/PLIST-mysqli
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-mysqli,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-mysqli->=7.0,<7.1
+@conflict php5-mysqli->=5.2
+lib/php-${PV}/modules/mysqli.so
+share/examples/php-${PV}/mysqli.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mysqli.ini
--- a/lang/php/7.0/pkg/PLIST-odbc
+++ b/lang/php/7.0/pkg/PLIST-odbc
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-odbc,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-odbc->=7.0,<7.1
+@conflict php5-odbc->=5.2
+lib/php-${PV}/modules/odbc.so
+share/examples/php-${PV}/odbc.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/odbc.ini
--- a/lang/php/7.0/pkg/PLIST-pcntl
+++ b/lang/php/7.0/pkg/PLIST-pcntl
@ -0,0 +1,9 @@
+@comment $OpenBSD: PLIST-pcntl,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-pcntl->=7.0,<7.1
+@conflict php5-pcntl->=5.2
+@conflict pecl-pcntl-*
+@pkgpath www/pecl-pcntl
+lib/php-${PV}/modules/pcntl.so
+share/examples/php-${PV}/pcntl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pcntl.ini
--- a/lang/php/7.0/pkg/PLIST-pdo_dblib
+++ b/lang/php/7.0/pkg/PLIST-pdo_dblib
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pdo_dblib,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-pdo_dblib->=7.0,<7.1
+@conflict php5-pdo_dblib->=5.2
+lib/php-${PV}/modules/pdo_dblib.so
+share/examples/php-${PV}/pdo_dblib.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_dblib.ini
--- a/lang/php/7.0/pkg/PLIST-pdo_mysql
+++ b/lang/php/7.0/pkg/PLIST-pdo_mysql
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pdo_mysql,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-pdo_mysql->=7.0,<7.1
+@conflict php5-pdo_mysql->=5.2
+lib/php-${PV}/modules/pdo_mysql.so
+share/examples/php-${PV}/pdo_mysql.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_mysql.ini
--- a/lang/php/7.0/pkg/PLIST-pdo_pgsql
+++ b/lang/php/7.0/pkg/PLIST-pdo_pgsql
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pdo_pgsql,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-pdo_pgsql->=7.0,<7.1
+@conflict php5-pdo_pgsql->=5.2
+lib/php-${PV}/modules/pdo_pgsql.so
+share/examples/php-${PV}/pdo_pgsql.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_pgsql.ini
--- a/lang/php/7.0/pkg/PLIST-pgsql
+++ b/lang/php/7.0/pkg/PLIST-pgsql
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pgsql,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-pgsql->=7.0,<7.1
+@conflict php5-pgsql->=5.2
+lib/php-${PV}/modules/pgsql.so
+share/examples/php-${PV}/pgsql.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pgsql.ini
--- a/lang/php/7.0/pkg/PLIST-pspell
+++ b/lang/php/7.0/pkg/PLIST-pspell
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pspell,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-pspell->=7.0,<7.1
+@conflict php5-pspell->=5.2
+lib/php-${PV}/modules/pspell.so
+share/examples/php-${PV}/pspell.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pspell.ini
--- a/lang/php/7.0/pkg/PLIST-shmop
+++ b/lang/php/7.0/pkg/PLIST-shmop
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-shmop,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-shmop->=7.0,<7.1
+@conflict php5-shmop->=5.2
+lib/php-${PV}/modules/shmop.so
+share/examples/php-${PV}/shmop.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/shmop.ini
--- a/lang/php/7.0/pkg/PLIST-snmp
+++ b/lang/php/7.0/pkg/PLIST-snmp
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-snmp,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-snmp->=7.0,<7.1
+@conflict php5-snmp->=5.2
+lib/php-${PV}/modules/snmp.so
+share/examples/php-${PV}/snmp.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/snmp.ini
--- a/lang/php/7.0/pkg/PLIST-soap
+++ b/lang/php/7.0/pkg/PLIST-soap
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-soap,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-soap->=7.0,<7.1
+@conflict php5-soap->=5.2
+lib/php-${PV}/modules/soap.so
+share/examples/php-${PV}/soap.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/soap.ini
--- a/lang/php/7.0/pkg/PLIST-tidy
+++ b/lang/php/7.0/pkg/PLIST-tidy
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-tidy,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-tidy->=7.0,<7.1
+@conflict php5-tidy->=5.2
+lib/php-${PV}/modules/tidy.so
+share/examples/php-${PV}/tidy.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/tidy.ini
--- a/lang/php/7.0/pkg/PLIST-xmlrpc
+++ b/lang/php/7.0/pkg/PLIST-xmlrpc
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-xmlrpc,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-xmlrpc->=7.0,<7.1
+@conflict php5-xmlrpc->=5.2
+lib/php-${PV}/modules/xmlrpc.so
+share/examples/php-${PV}/xmlrpc.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlrpc.ini
--- a/lang/php/7.0/pkg/PLIST-xsl
+++ b/lang/php/7.0/pkg/PLIST-xsl
@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-xsl,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-xsl->=7.0,<7.1
+@conflict php5-xsl->=5.2
+lib/php-${PV}/modules/xsl.so
+share/examples/php-${PV}/xsl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xsl.ini
--- a/lang/php/7.0/pkg/PLIST-zip
+++ b/lang/php/7.0/pkg/PLIST-zip
@ -0,0 +1,8 @@
+@comment $OpenBSD: PLIST-zip,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+@option no-default-conflict
+@conflict php-zip->=7.0,<7.1
+@conflict pecl-zip-*
+@pkgpath archivers/pecl-zip
+lib/php-${PV}/modules/zip.so
+share/examples/php-${PV}/zip.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/zip.ini
--- a/lang/php/7.0/pkg/php70_fpm.rc
+++ b/lang/php/7.0/pkg/php70_fpm.rc
@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $OpenBSD: php70_fpm.rc,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+
+daemon="${TRUEPREFIX}/sbin/php-fpm-${PV}"
+
+. /etc/rc.d/rc.subr
+
+pexp="php-fpm-${PV}: master process .*"
+rc_reload=NO
+
+rc_cmd $1