UPDATE: php revamp

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
41 messages Options
123
Reply | Threaded
Open this post in threaded view
|

UPDATE: php revamp

Martijn van Duren-7
Hello ports@,

Last couple of months I've been busy getting to know the OpenBSD ports
system and the php build environment.
The main reason being my need for functionality at my $DAYJOB which
isn't offered by the default php install on OpenBSD. Most notably php
7.1 and chroot (the php function).

During my quest I ended up touching about every part of the port and
I'm currently quite happy with the result, although there's still some
things I want to touch later on.

Some of the highlights I've done:
- Remove PHP 5.5. It's dead upstream for almost a year, so there's no
need to keep it on OpenBSD.
- Clean up the CONFIGURE_ARGS. There were some arguments there that
were simply not in PHP anymore.
- Move some deprecated modules into the PHP 5.6 Makefile. This keeps
the Makefile.inc cleaner of if/else bloat.
- Replace the -fastcgi port with -cgi. -cgi is the official name and
for fastcgi needs -fpm is recommended. This avoids confusion.
- Move modules to their own subpackage where possible. I don't like my
clean php install having ftp or wddx. Let people make up their own mind.
- Remove unused dependencies (e.g. mariadb isn't needed when building
with mysqlnd)
- Move every SAPI to their own subpackage. People running -fpm don't
need mod_php or -cgi.
- Move the extension headers to their corresponding subpackage.
- Clean up the build environment. YACC=, USE_LIBTOOL, etc don't seem to
be needed (anymore).
- Clean up patches. Some are unneeded, redundant, superfluous so keep
it to a minimum for maintainability.
- Subpackages requiring another module have those dependencies. (e.g.
installing -pdo_mysql also pulls in -pdo and -mysqlnd)
- Install phar and disable it on sparc64. This should allow us to have
php on sparc64, without phar support. Untested for lack of hardware.
- Enable the chroot function by default. This function normally gets
disabled if any SAPI other than -cli, -cgi, or -embed is compiled.
I reckon that if the chroot function is usable the code is running as
root and you have bigger problems than a php server locking itself out
of your main filesystem.
- Allow phpize to work without --with-php-config.
- Try to rely on other packages where code would be otherwise compiled
in. E.g. devel/pcre for the pcre module and textproc/oniguruma for
mbstring. These libraries are also packaged inside PHP if not available
on the main system.
- Miscellaneous cleanup

For the packages this means the following:
Removed:
- php-fastcgi
Added:
- php-apxs2
- php-bcmath
- php-calendar
- php-cgi
- php-cli
- php-ctype
- php-dom
- php-enchant
- php-exif
- php-fileinfo
- php-fpm
- php-ftp
- php-gettext
- php-iconv
- php-json
- php-mbstring
- php-mysqlnd
- php-opcache
- php-pdo
- php-pdo_sqlite
- php-phar
- php-posix
- php-readline
- php-simplexml
- php-sockets
- php-sqlite3
- php-sysvmsg
- php-sysvsem
- php-sysvshm
- php-tokenizer
- php-wddx
- php-xmlreader
- php-xmlwriter
Modules moved to shared components:
- bcmath
- calendar
- ctype
- dom
- exif
- fileinfo
- ftp
- gettext
- iconv
- json
- mbstring
- mysqlnd
- PDO
- pdo_sqlite
- Phar
- posix
- readline
- SimpleXML
- sockets
- sqlite3
- sysvmsg
- sysvsem
- sysvshm
- tokenizer
- wddx
- xmlreader
- xmlwriter
Modules kept compiled in:
- Core (for obvious reasons)
- date (can't be build stand-alone)
- ereg (removed in php 7.0, not worth the effort, also pcre is in
default install)
- filter (can't be build stand-alone)
- hash (required to be built-in for phar hash-checking)
- libxml (can't be build stand-alone)
- openssl (allow tls as a Stream Socket Transport in a default install)
- pcre (can't be build stand-alone)
- Reflection (can't be build stand-alone)
- session (what's a webserver without sessions?)
- SPL (can't be build stand-alone)
- standard (for obvious reasons)
- xml (required for pear building. Should be turned into a module once
something like phpctl is in place)
- zlib (required for phar)

When updating to the new packages I didn't encounter any problems,
except for the expected behaviour that some modules or SAPIs are now in
other packages, which could easily be covered with a current.html entry.

Some things that I would like to realize once this gets accepted are:
- Allow easier module manipulation via an external tool. E.g.
"phpctl-5.6 enable pdo_mysql", or "phpctl-5.6 list | phpctl-7.1 load".
I'm not sure of the semantics and haven't started on this yet. But it
would solve some issues, like migration or automatic module enabling
during package building (-xml).
- Allow pecl modules to be built with multiple PHP versions. Right now
all pecl modules are only available for 5.6, but I could use some of
those on my 7.1 install, which I now have to built custom with my
revamped phpize, which is not ideal.

The new layout requires a few tweaks in the pecl and pear department,
but nothing too fancy. See patch down below.

Also, arguments can be made to move some packages back together. E.g.
-cli into -main. I'm not against it, but it seems better to me to start
from maximum subdivision and combine them where needed.

As might be expected, I've been running with the 7.1 version of this
patch now for over 2 months without any issues (at least, that are
still left in this version).

Finally some thanks are due to jasper@ and sthen@ for some handholding.

Comments, questions, scoldings, OKs?

martijn@

Index: www/pear/Makefile
===================================================================
RCS file: /cvs/ports/www/pear/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- www/pear/Makefile 1 Apr 2016 18:46:06 -0000 1.24
+++ www/pear/Makefile 2 Jul 2017 10:52:35 -0000
@@ -23,8 +23,10 @@ PERMIT_PACKAGE_CDROM= Yes
 MULTI_PACKAGES= -main -utils
 
 MODULES= lang/php
-BUILD_DEPENDS= ${_MODPHP_BUILD_DEPENDS}
-RUN_DEPENDS-main= www/pear,-utils
+BUILD_DEPENDS= ${_MODPHP_BUILD_DEPENDS} \
+ lang/php/${MODPHP_VERSION},-cli
+RUN_DEPENDS-main= www/pear,-utils \
+ lang/php/${MODPHP_VERSION},-cli
 
 # Most of pear have to live in /var/www where apache is chroot'ed to.
 PREFIX-main= ${VARBASE}/www
@@ -32,7 +34,7 @@ PREFIX-utils= /usr/local
 
 NO_TEST= Yes
 
-BUILD_DEPENDS= devel/p5-Expect
+BUILD_DEPENDS+= devel/p5-Expect
 SUBST_VARS= MODPHP_BIN
 
 do-extract:
Index: mail/pecl-mailparse/Makefile
===================================================================
RCS file: /cvs/ports/mail/pecl-mailparse/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- mail/pecl-mailparse/Makefile 19 Mar 2016 21:18:38 -0000 1.19
+++ mail/pecl-mailparse/Makefile 2 Jul 2017 10:52:57 -0000
@@ -16,6 +16,9 @@ WANTLIB = c
 AUTOCONF_VERSION = 2.52
 AUTOMAKE_VERSION = 1.4
 
+RUN_DEPENDS= lang/php/${MODPHP_VERSION},-mbstring
+BUILD_DEPENDS= lang/php/${MODPHP_VERSION},-mbstring
+
 MODULES = lang/php/pecl
 
 CONFIGURE_STYLE = gnu
Index: www/pecl-http/Makefile
===================================================================
RCS file: /cvs/ports/www/./pecl-http/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- www/pecl-http/Makefile 8 Nov 2016 14:38:55 -0000 1.13
+++ www/pecl-http/Makefile 2 Jul 2017 10:52:57 -0000
@@ -20,12 +20,14 @@ MODULES= lang/php/pecl
 CONFIGURE_STYLE= gnu
 
 RUN_DEPENDS+= www/pecl-raphf \
- www/pecl-propro
+ www/pecl-propro \
+ lang/php/${MODPHP_VERSION},-iconv
 TEST_DEPENDS+= ${RUN_DEPENDS}
-BUILD_DEPENDS+= ${RUN_DEPENDS}
+BUILD_DEPENDS+= ${RUN_DEPENDS} \
+ lang/php/${MODPHP_VERSION},-iconv
 LIB_DEPENDS= devel/gettext \
  devel/libidn \
- net/curl
+ net/curl \
 
 TEST_EXTS+= -d extension_dir=${LOCALBASE}/lib/php-${MODPHP_VERSION}/modules
 TEST_EXTS+= -d extension=raphf.so
Index: www/pecl-http/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/./pecl-http/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- www/pecl-http/pkg/PLIST 1 Feb 2016 21:55:38 -0000 1.3
+++ www/pecl-http/pkg/PLIST 2 Jul 2017 10:52:58 -0000
@@ -1,37 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.3 2016/02/01 21:55:38 sthen Exp $
-@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
+@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
 lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
 share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
 @sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini
 share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/
 share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_api.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_buffer.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_client.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_client_request.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_client_response.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_cookie.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_curl.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_encoding.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_env.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_env_request.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_env_response.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_etag.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_exception.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_filter.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_header.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_header_parser.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_info.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_message.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_message_body.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_message_parser.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_misc.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_negotiate.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_object.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_options.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_params.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_querystring.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_response_codes.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_url.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_utf8.h
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_version.h

php.tar.bz2 (45K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: php revamp

Robert Nagy
Hi

Antoine, can you please push this into a bulk?

On (2017-07-02 19:52), Martijn van Duren wrote:

> Hello ports@,
>
> Last couple of months I've been busy getting to know the OpenBSD ports
> system and the php build environment.
> The main reason being my need for functionality at my $DAYJOB which
> isn't offered by the default php install on OpenBSD. Most notably php
> 7.1 and chroot (the php function).
>
> During my quest I ended up touching about every part of the port and
> I'm currently quite happy with the result, although there's still some
> things I want to touch later on.
>
> Some of the highlights I've done:
> - Remove PHP 5.5. It's dead upstream for almost a year, so there's no
> need to keep it on OpenBSD.
> - Clean up the CONFIGURE_ARGS. There were some arguments there that
> were simply not in PHP anymore.
> - Move some deprecated modules into the PHP 5.6 Makefile. This keeps
> the Makefile.inc cleaner of if/else bloat.
> - Replace the -fastcgi port with -cgi. -cgi is the official name and
> for fastcgi needs -fpm is recommended. This avoids confusion.
> - Move modules to their own subpackage where possible. I don't like my
> clean php install having ftp or wddx. Let people make up their own mind.
> - Remove unused dependencies (e.g. mariadb isn't needed when building
> with mysqlnd)
> - Move every SAPI to their own subpackage. People running -fpm don't
> need mod_php or -cgi.
> - Move the extension headers to their corresponding subpackage.
> - Clean up the build environment. YACC=, USE_LIBTOOL, etc don't seem to
> be needed (anymore).
> - Clean up patches. Some are unneeded, redundant, superfluous so keep
> it to a minimum for maintainability.
> - Subpackages requiring another module have those dependencies. (e.g.
> installing -pdo_mysql also pulls in -pdo and -mysqlnd)
> - Install phar and disable it on sparc64. This should allow us to have
> php on sparc64, without phar support. Untested for lack of hardware.
> - Enable the chroot function by default. This function normally gets
> disabled if any SAPI other than -cli, -cgi, or -embed is compiled.
> I reckon that if the chroot function is usable the code is running as
> root and you have bigger problems than a php server locking itself out
> of your main filesystem.
> - Allow phpize to work without --with-php-config.
> - Try to rely on other packages where code would be otherwise compiled
> in. E.g. devel/pcre for the pcre module and textproc/oniguruma for
> mbstring. These libraries are also packaged inside PHP if not available
> on the main system.
> - Miscellaneous cleanup
>
> For the packages this means the following:
> Removed:
> - php-fastcgi
> Added:
> - php-apxs2
> - php-bcmath
> - php-calendar
> - php-cgi
> - php-cli
> - php-ctype
> - php-dom
> - php-enchant
> - php-exif
> - php-fileinfo
> - php-fpm
> - php-ftp
> - php-gettext
> - php-iconv
> - php-json
> - php-mbstring
> - php-mysqlnd
> - php-opcache
> - php-pdo
> - php-pdo_sqlite
> - php-phar
> - php-posix
> - php-readline
> - php-simplexml
> - php-sockets
> - php-sqlite3
> - php-sysvmsg
> - php-sysvsem
> - php-sysvshm
> - php-tokenizer
> - php-wddx
> - php-xmlreader
> - php-xmlwriter
> Modules moved to shared components:
> - bcmath
> - calendar
> - ctype
> - dom
> - exif
> - fileinfo
> - ftp
> - gettext
> - iconv
> - json
> - mbstring
> - mysqlnd
> - PDO
> - pdo_sqlite
> - Phar
> - posix
> - readline
> - SimpleXML
> - sockets
> - sqlite3
> - sysvmsg
> - sysvsem
> - sysvshm
> - tokenizer
> - wddx
> - xmlreader
> - xmlwriter
> Modules kept compiled in:
> - Core (for obvious reasons)
> - date (can't be build stand-alone)
> - ereg (removed in php 7.0, not worth the effort, also pcre is in
> default install)
> - filter (can't be build stand-alone)
> - hash (required to be built-in for phar hash-checking)
> - libxml (can't be build stand-alone)
> - openssl (allow tls as a Stream Socket Transport in a default install)
> - pcre (can't be build stand-alone)
> - Reflection (can't be build stand-alone)
> - session (what's a webserver without sessions?)
> - SPL (can't be build stand-alone)
> - standard (for obvious reasons)
> - xml (required for pear building. Should be turned into a module once
> something like phpctl is in place)
> - zlib (required for phar)
>
> When updating to the new packages I didn't encounter any problems,
> except for the expected behaviour that some modules or SAPIs are now in
> other packages, which could easily be covered with a current.html entry.
>
> Some things that I would like to realize once this gets accepted are:
> - Allow easier module manipulation via an external tool. E.g.
> "phpctl-5.6 enable pdo_mysql", or "phpctl-5.6 list | phpctl-7.1 load".
> I'm not sure of the semantics and haven't started on this yet. But it
> would solve some issues, like migration or automatic module enabling
> during package building (-xml).
> - Allow pecl modules to be built with multiple PHP versions. Right now
> all pecl modules are only available for 5.6, but I could use some of
> those on my 7.1 install, which I now have to built custom with my
> revamped phpize, which is not ideal.
>
> The new layout requires a few tweaks in the pecl and pear department,
> but nothing too fancy. See patch down below.
>
> Also, arguments can be made to move some packages back together. E.g.
> -cli into -main. I'm not against it, but it seems better to me to start
> from maximum subdivision and combine them where needed.
>
> As might be expected, I've been running with the 7.1 version of this
> patch now for over 2 months without any issues (at least, that are
> still left in this version).
>
> Finally some thanks are due to jasper@ and sthen@ for some handholding.
>
> Comments, questions, scoldings, OKs?
>
> martijn@
>
> Index: www/pear/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/pear/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- www/pear/Makefile 1 Apr 2016 18:46:06 -0000 1.24
> +++ www/pear/Makefile 2 Jul 2017 10:52:35 -0000
> @@ -23,8 +23,10 @@ PERMIT_PACKAGE_CDROM= Yes
>  MULTI_PACKAGES= -main -utils
>  
>  MODULES= lang/php
> -BUILD_DEPENDS= ${_MODPHP_BUILD_DEPENDS}
> -RUN_DEPENDS-main= www/pear,-utils
> +BUILD_DEPENDS= ${_MODPHP_BUILD_DEPENDS} \
> + lang/php/${MODPHP_VERSION},-cli
> +RUN_DEPENDS-main= www/pear,-utils \
> + lang/php/${MODPHP_VERSION},-cli
>  
>  # Most of pear have to live in /var/www where apache is chroot'ed to.
>  PREFIX-main= ${VARBASE}/www
> @@ -32,7 +34,7 @@ PREFIX-utils= /usr/local
>  
>  NO_TEST= Yes
>  
> -BUILD_DEPENDS= devel/p5-Expect
> +BUILD_DEPENDS+= devel/p5-Expect
>  SUBST_VARS= MODPHP_BIN
>  
>  do-extract:
> Index: mail/pecl-mailparse/Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/pecl-mailparse/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- mail/pecl-mailparse/Makefile 19 Mar 2016 21:18:38 -0000 1.19
> +++ mail/pecl-mailparse/Makefile 2 Jul 2017 10:52:57 -0000
> @@ -16,6 +16,9 @@ WANTLIB = c
>  AUTOCONF_VERSION = 2.52
>  AUTOMAKE_VERSION = 1.4
>  
> +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-mbstring
> +BUILD_DEPENDS= lang/php/${MODPHP_VERSION},-mbstring
> +
>  MODULES = lang/php/pecl
>  
>  CONFIGURE_STYLE = gnu
> Index: www/pecl-http/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/./pecl-http/Makefile,v
> retrieving revision 1.13
> diff -u -p -r1.13 Makefile
> --- www/pecl-http/Makefile 8 Nov 2016 14:38:55 -0000 1.13
> +++ www/pecl-http/Makefile 2 Jul 2017 10:52:57 -0000
> @@ -20,12 +20,14 @@ MODULES= lang/php/pecl
>  CONFIGURE_STYLE= gnu
>  
>  RUN_DEPENDS+= www/pecl-raphf \
> - www/pecl-propro
> + www/pecl-propro \
> + lang/php/${MODPHP_VERSION},-iconv
>  TEST_DEPENDS+= ${RUN_DEPENDS}
> -BUILD_DEPENDS+= ${RUN_DEPENDS}
> +BUILD_DEPENDS+= ${RUN_DEPENDS} \
> + lang/php/${MODPHP_VERSION},-iconv
>  LIB_DEPENDS= devel/gettext \
>   devel/libidn \
> - net/curl
> + net/curl \
>  
>  TEST_EXTS+= -d extension_dir=${LOCALBASE}/lib/php-${MODPHP_VERSION}/modules
>  TEST_EXTS+= -d extension=raphf.so
> Index: www/pecl-http/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/www/./pecl-http/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- www/pecl-http/pkg/PLIST 1 Feb 2016 21:55:38 -0000 1.3
> +++ www/pecl-http/pkg/PLIST 2 Jul 2017 10:52:58 -0000
> @@ -1,37 +1,7 @@
>  @comment $OpenBSD: PLIST,v 1.3 2016/02/01 21:55:38 sthen Exp $
> -@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
> +@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
>  lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
>  share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
>  @sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini
>  share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/
>  share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_api.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_buffer.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_client.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_client_request.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_client_response.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_cookie.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_curl.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_encoding.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_env.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_env_request.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_env_response.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_etag.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_exception.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_filter.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_header.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_header_parser.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_info.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_message.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_message_body.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_message_parser.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_misc.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_negotiate.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_object.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_options.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_params.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_querystring.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_response_codes.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_url.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_utf8.h
> -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_version.h


Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: php revamp

Stuart Henderson
In reply to this post by Martijn van Duren-7
On 2017/07/02 19:52, Martijn van Duren wrote:
> - Move modules to their own subpackage where possible. I don't like my
> clean php install having ftp or wddx. Let people make up their own mind.

Doing this means that it's necessary to audit the existing ports
using PHP to figure out which of them need extra dependencies.

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: php revamp

Antoine Jacoutot-7
In reply to this post by Robert Nagy
On Sun, Jul 02, 2017 at 07:56:50PM +0200, Robert Nagy wrote:
> Hi
>
> Antoine, can you please push this into a bulk?

If I could have a full diff, that'd make it easier.
I am a bit worried about dependant ports, we are going to look deep into them to
add missing php modules because of the split.

>
> On (2017-07-02 19:52), Martijn van Duren wrote:
> > Hello ports@,
> >
> > Last couple of months I've been busy getting to know the OpenBSD ports
> > system and the php build environment.
> > The main reason being my need for functionality at my $DAYJOB which
> > isn't offered by the default php install on OpenBSD. Most notably php
> > 7.1 and chroot (the php function).
> >
> > During my quest I ended up touching about every part of the port and
> > I'm currently quite happy with the result, although there's still some
> > things I want to touch later on.
> >
> > Some of the highlights I've done:
> > - Remove PHP 5.5. It's dead upstream for almost a year, so there's no
> > need to keep it on OpenBSD.
> > - Clean up the CONFIGURE_ARGS. There were some arguments there that
> > were simply not in PHP anymore.
> > - Move some deprecated modules into the PHP 5.6 Makefile. This keeps
> > the Makefile.inc cleaner of if/else bloat.
> > - Replace the -fastcgi port with -cgi. -cgi is the official name and
> > for fastcgi needs -fpm is recommended. This avoids confusion.
> > - Move modules to their own subpackage where possible. I don't like my
> > clean php install having ftp or wddx. Let people make up their own mind.
> > - Remove unused dependencies (e.g. mariadb isn't needed when building
> > with mysqlnd)
> > - Move every SAPI to their own subpackage. People running -fpm don't
> > need mod_php or -cgi.
> > - Move the extension headers to their corresponding subpackage.
> > - Clean up the build environment. YACC=, USE_LIBTOOL, etc don't seem to
> > be needed (anymore).
> > - Clean up patches. Some are unneeded, redundant, superfluous so keep
> > it to a minimum for maintainability.
> > - Subpackages requiring another module have those dependencies. (e.g.
> > installing -pdo_mysql also pulls in -pdo and -mysqlnd)
> > - Install phar and disable it on sparc64. This should allow us to have
> > php on sparc64, without phar support. Untested for lack of hardware.
> > - Enable the chroot function by default. This function normally gets
> > disabled if any SAPI other than -cli, -cgi, or -embed is compiled.
> > I reckon that if the chroot function is usable the code is running as
> > root and you have bigger problems than a php server locking itself out
> > of your main filesystem.
> > - Allow phpize to work without --with-php-config.
> > - Try to rely on other packages where code would be otherwise compiled
> > in. E.g. devel/pcre for the pcre module and textproc/oniguruma for
> > mbstring. These libraries are also packaged inside PHP if not available
> > on the main system.
> > - Miscellaneous cleanup
> >
> > For the packages this means the following:
> > Removed:
> > - php-fastcgi
> > Added:
> > - php-apxs2
> > - php-bcmath
> > - php-calendar
> > - php-cgi
> > - php-cli
> > - php-ctype
> > - php-dom
> > - php-enchant
> > - php-exif
> > - php-fileinfo
> > - php-fpm
> > - php-ftp
> > - php-gettext
> > - php-iconv
> > - php-json
> > - php-mbstring
> > - php-mysqlnd
> > - php-opcache
> > - php-pdo
> > - php-pdo_sqlite
> > - php-phar
> > - php-posix
> > - php-readline
> > - php-simplexml
> > - php-sockets
> > - php-sqlite3
> > - php-sysvmsg
> > - php-sysvsem
> > - php-sysvshm
> > - php-tokenizer
> > - php-wddx
> > - php-xmlreader
> > - php-xmlwriter
> > Modules moved to shared components:
> > - bcmath
> > - calendar
> > - ctype
> > - dom
> > - exif
> > - fileinfo
> > - ftp
> > - gettext
> > - iconv
> > - json
> > - mbstring
> > - mysqlnd
> > - PDO
> > - pdo_sqlite
> > - Phar
> > - posix
> > - readline
> > - SimpleXML
> > - sockets
> > - sqlite3
> > - sysvmsg
> > - sysvsem
> > - sysvshm
> > - tokenizer
> > - wddx
> > - xmlreader
> > - xmlwriter
> > Modules kept compiled in:
> > - Core (for obvious reasons)
> > - date (can't be build stand-alone)
> > - ereg (removed in php 7.0, not worth the effort, also pcre is in
> > default install)
> > - filter (can't be build stand-alone)
> > - hash (required to be built-in for phar hash-checking)
> > - libxml (can't be build stand-alone)
> > - openssl (allow tls as a Stream Socket Transport in a default install)
> > - pcre (can't be build stand-alone)
> > - Reflection (can't be build stand-alone)
> > - session (what's a webserver without sessions?)
> > - SPL (can't be build stand-alone)
> > - standard (for obvious reasons)
> > - xml (required for pear building. Should be turned into a module once
> > something like phpctl is in place)
> > - zlib (required for phar)
> >
> > When updating to the new packages I didn't encounter any problems,
> > except for the expected behaviour that some modules or SAPIs are now in
> > other packages, which could easily be covered with a current.html entry.
> >
> > Some things that I would like to realize once this gets accepted are:
> > - Allow easier module manipulation via an external tool. E.g.
> > "phpctl-5.6 enable pdo_mysql", or "phpctl-5.6 list | phpctl-7.1 load".
> > I'm not sure of the semantics and haven't started on this yet. But it
> > would solve some issues, like migration or automatic module enabling
> > during package building (-xml).
> > - Allow pecl modules to be built with multiple PHP versions. Right now
> > all pecl modules are only available for 5.6, but I could use some of
> > those on my 7.1 install, which I now have to built custom with my
> > revamped phpize, which is not ideal.
> >
> > The new layout requires a few tweaks in the pecl and pear department,
> > but nothing too fancy. See patch down below.
> >
> > Also, arguments can be made to move some packages back together. E.g.
> > -cli into -main. I'm not against it, but it seems better to me to start
> > from maximum subdivision and combine them where needed.
> >
> > As might be expected, I've been running with the 7.1 version of this
> > patch now for over 2 months without any issues (at least, that are
> > still left in this version).
> >
> > Finally some thanks are due to jasper@ and sthen@ for some handholding.
> >
> > Comments, questions, scoldings, OKs?
> >
> > martijn@
> >
> > Index: www/pear/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/www/pear/Makefile,v
> > retrieving revision 1.24
> > diff -u -p -r1.24 Makefile
> > --- www/pear/Makefile 1 Apr 2016 18:46:06 -0000 1.24
> > +++ www/pear/Makefile 2 Jul 2017 10:52:35 -0000
> > @@ -23,8 +23,10 @@ PERMIT_PACKAGE_CDROM= Yes
> >  MULTI_PACKAGES= -main -utils
> >  
> >  MODULES= lang/php
> > -BUILD_DEPENDS= ${_MODPHP_BUILD_DEPENDS}
> > -RUN_DEPENDS-main= www/pear,-utils
> > +BUILD_DEPENDS= ${_MODPHP_BUILD_DEPENDS} \
> > + lang/php/${MODPHP_VERSION},-cli
> > +RUN_DEPENDS-main= www/pear,-utils \
> > + lang/php/${MODPHP_VERSION},-cli
> >  
> >  # Most of pear have to live in /var/www where apache is chroot'ed to.
> >  PREFIX-main= ${VARBASE}/www
> > @@ -32,7 +34,7 @@ PREFIX-utils= /usr/local
> >  
> >  NO_TEST= Yes
> >  
> > -BUILD_DEPENDS= devel/p5-Expect
> > +BUILD_DEPENDS+= devel/p5-Expect
> >  SUBST_VARS= MODPHP_BIN
> >  
> >  do-extract:
> > Index: mail/pecl-mailparse/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/mail/pecl-mailparse/Makefile,v
> > retrieving revision 1.19
> > diff -u -p -r1.19 Makefile
> > --- mail/pecl-mailparse/Makefile 19 Mar 2016 21:18:38 -0000 1.19
> > +++ mail/pecl-mailparse/Makefile 2 Jul 2017 10:52:57 -0000
> > @@ -16,6 +16,9 @@ WANTLIB = c
> >  AUTOCONF_VERSION = 2.52
> >  AUTOMAKE_VERSION = 1.4
> >  
> > +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-mbstring
> > +BUILD_DEPENDS= lang/php/${MODPHP_VERSION},-mbstring
> > +
> >  MODULES = lang/php/pecl
> >  
> >  CONFIGURE_STYLE = gnu
> > Index: www/pecl-http/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/www/./pecl-http/Makefile,v
> > retrieving revision 1.13
> > diff -u -p -r1.13 Makefile
> > --- www/pecl-http/Makefile 8 Nov 2016 14:38:55 -0000 1.13
> > +++ www/pecl-http/Makefile 2 Jul 2017 10:52:57 -0000
> > @@ -20,12 +20,14 @@ MODULES= lang/php/pecl
> >  CONFIGURE_STYLE= gnu
> >  
> >  RUN_DEPENDS+= www/pecl-raphf \
> > - www/pecl-propro
> > + www/pecl-propro \
> > + lang/php/${MODPHP_VERSION},-iconv
> >  TEST_DEPENDS+= ${RUN_DEPENDS}
> > -BUILD_DEPENDS+= ${RUN_DEPENDS}
> > +BUILD_DEPENDS+= ${RUN_DEPENDS} \
> > + lang/php/${MODPHP_VERSION},-iconv
> >  LIB_DEPENDS= devel/gettext \
> >   devel/libidn \
> > - net/curl
> > + net/curl \
> >  
> >  TEST_EXTS+= -d extension_dir=${LOCALBASE}/lib/php-${MODPHP_VERSION}/modules
> >  TEST_EXTS+= -d extension=raphf.so
> > Index: www/pecl-http/pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/www/./pecl-http/pkg/PLIST,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 PLIST
> > --- www/pecl-http/pkg/PLIST 1 Feb 2016 21:55:38 -0000 1.3
> > +++ www/pecl-http/pkg/PLIST 2 Jul 2017 10:52:58 -0000
> > @@ -1,37 +1,7 @@
> >  @comment $OpenBSD: PLIST,v 1.3 2016/02/01 21:55:38 sthen Exp $
> > -@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
> > +@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
> >  lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
> >  share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
> >  @sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini
> >  share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/
> >  share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_api.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_buffer.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_client.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_client_request.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_client_response.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_cookie.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_curl.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_encoding.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_env.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_env_request.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_env_response.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_etag.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_exception.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_filter.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_header.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_header_parser.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_info.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_message.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_message_body.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_message_parser.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_misc.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_negotiate.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_object.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_options.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_params.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_querystring.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_response_codes.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_url.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_utf8.h
> > -share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_version.h
>
>

--
Antoine

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: php revamp

Martijn van Duren-7
Here's an updated diff based on PHP5.6.31, 7.0.21 and 7.1.7.
This time in diff-form as requested by Antoine.

This also fixes a couple of dependency issues found by Antoine.

Currently the computer is still crunching on the dependencies on the
extensions moved outside of main. I'll get back on that later.

martijn@

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/php/Makefile,v
retrieving revision 1.11
diff -u -p -a -u -r1.11 Makefile
--- Makefile 28 Apr 2016 18:19:23 -0000 1.11
+++ Makefile 8 Jul 2017 18:28:19 -0000
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.11 2016/04/28 18:19:23 sthen Exp $
 
 SUBDIR =
-SUBDIR += 5.5
 SUBDIR += 5.6
 SUBDIR += 7.0
+SUBDIR += 7.1
 
 .include <bsd.port.subdir.mk>
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.94
diff -u -p -a -u -r1.94 Makefile.inc
--- Makefile.inc 12 Jun 2017 11:48:34 -0000 1.94
+++ Makefile.inc 8 Jul 2017 18:28:19 -0000
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile.inc,v 1.94 2017/06/12 11:48:34 sthen Exp $
+# $OpenBSD: Makefile.inc,v 1.93 2017/04/26 08:15:05 sthen Exp $
 
-BROKEN-hppa= no __sync_bool_compare_and_swap support nor asm fallback
+BROKEN-hppa= no __sync_bool_compare_and_swap support nor asm fallback
 
 COMMENT-main= server-side HTML-embedded scripting language
-COMMENT-fastcgi= stand-alone FastCGI version of PHP
 
 PKGNAME-main?= php-${V}
-PKGNAME-fastcgi?= php-fastcgi-${V}
 
-DISTFILES?= php-${V}.tar.bz2
+DISTFILES+= php-${V}.tar.bz2
 
 DISTNAME?= php-${V}
 CATEGORIES= lang www
@@ -20,7 +18,6 @@ MASTER_SITES= http://se.php.net/distrib
  http://us.php.net/distributions/ \
  http://no.php.net/distributions/ \
  http://uk.php.net/distributions/
-MASTER_SITES0= https://download.suhosin.org/
 
 # UPGRADERS: please read BOTH the PHP and Zend licenses
 # and make sure they are safe before an upgrade
@@ -35,7 +32,6 @@ MODPHP_CONFIG_PATH= /var/www/conf
 
 # where the main php module is stored (outside the chroot)
 APACHE_MODULE_SUBDIR= lib/php-${PV}
-APACHE_MODULE_DIR= ${LOCALBASE}/${APACHE_MODULE_SUBDIR}
 
 # where the PEAR and extension modules are (inside the chroot)
 CHROOT_DIR?= /var/www
@@ -44,13 +40,6 @@ MODULES_DIR= ${LOCALBASE}/${MODULES_SUB
 
 INI_TEMPLATES?= development production
 
-# XXX use the bundled libtool because it needs some specific options we
-# don't have.
-USE_LIBTOOL?= No
-
-.if ${PV} != "7.0"
-FLAVORS= no_suhosin
-.endif
 FLAVOR?=
 
 PATCHORIG= .orig.port
@@ -60,312 +49,457 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${L
  LDFLAGS="-L${LOCALBASE}/lib -pthread" \
  EXTENSION_DIR=${MODULES_DIR} \
  LIBCXX="${LIBCXX}" \
+ YACC="/usr/bin/yacc" \
  lt_cv_path_SED=/usr/bin/sed
 # configure detects us as having decimal fp support but it's not built in
 # in libgcc. https://bugs.php.net/bug.php?id=68114
 CONFIGURE_ENV+= ac_cv_decimal_fp_supported=no
 MAKE_ENV=               ${CONFIGURE_ENV}
 
-CONFIGURE_ARGS+= --enable-shared \
+CONFIGURE_ARGS+= --disable-rpath \
  --disable-static \
- --disable-rpath \
- --with-config-file-path=${SYSCONFDIR} \
  --enable-inline-optimization \
- --with-pic \
- --with-pear=${LOCALBASE}/share/php-${PV} \
+ --enable-shared \
+ --program-suffix=-${PV} \
+ --with-config-file-path=${SYSCONFDIR} \
  --with-config-file-scan-dir=${SYSCONFDIR}/php-${PV} \
- --with-pdo-sqlite \
- --enable-sqlite-utf8 \
- --with-sqlite3 \
- --program-suffix=-${PV}
-
-# readline is broken in PHP-5.3
-.if ${PV} != 5.3
-CONFIGURE_ARGS += --with-readline
-.endif
-
-# apache module
-CONFIGURE_ARGS+= --with-apxs2=${LOCALBASE}/sbin/apxs2
-BUILD_DEPENDS+= www/apache-httpd
+ --with-pear=${LOCALBASE}/share/php-${PV} \
+ --with-pic \
 
 # default included extensions
-CONFIGURE_ARGS+= --with-openssl \
- --with-zlib \
- --enable-xml \
- --enable-wddx \
- --enable-cli \
- --with-iconv=${LOCALBASE} \
- --with-gettext=${LOCALBASE} \
- --enable-bcmath \
+CONFIGURE_ARGS+= --enable-filter
+# Hash needed embedded for phar signature support
+CONFIGURE_ARGS+= --enable-hash \
+ --enable-libxml=${LOCALBASE} \
  --enable-session \
- --enable-calendar \
- --enable-ctype \
- --enable-ftp \
- --with-pcre-regex \
- --enable-sockets \
- --enable-sysvmsg \
- --enable-sysvsem \
- --enable-sysvshm \
- --enable-mbstring \
- --enable-exif \
- --enable-zend-multibyte \
- --enable-fastcgi \
- --enable-fpm \
- --with-fpm-user=www \
- --with-fpm-group=www
+ --with-mhash=${LOCALBASE} \
+ --with-openssl \
+ --with-pcre-regex=${LOCALBASE} \
+ --with-zlib
 
 TEST_TARGET= test
 TEST_FLAGS= NO_INTERACTION=1
 
-MULTI_PACKAGES+= -main -fastcgi
+MULTI_PACKAGES= -main
+
+# SAPIs
+MULTI_PACKAGES+= -apxs2 -cgi -cli -dbg -fpm
+
+# Extensions
+PHP_MODULES= -bcmath -bz2 -calendar -ctype -curl -dba -dom -enchant \
+ -exif -fileinfo -ftp -gd -gettext -gmp -iconv -imap \
+ -intl -json -ldap -mbstring -mcrypt -mysqlnd -mysqli \
+ -odbc -pcntl -pdo -pdo_dblib -pdo_mysql -pdo_pgsql \
+ -pdo_sqlite -pgsql -phar -posix -pspell -readline \
+ -shmop -simplexml -snmp -soap -sockets -sqlite3 \
+ -sysvmsg -sysvsem -sysvshm -tidy -tokenizer -wddx \
+ -xmlreader -xmlrpc -xmlwriter -xsl -zip
+# Embed xml for now, since it's required for pear.
+# Currently there's no clean way to enable or disable modules
+#PHP_MODULES+= -xml
+
+PHP_ZEND_MODULES= -opcache
+
+PHP_MODULES_EXTRA?=
+PHP_MODULES+= ${PHP_MODULES_EXTRA}
+
+MULTI_PACKAGES+= ${PHP_MODULES} ${PHP_ZEND_MODULES}
+
+#
+# Broken section
+# Use *_FOR_ARCHS, since BROKEN doesn't work for subpackages
+#
+
+#BROKEN-dbg= Segfaults on readline() return value
+ONLY_FOR_ARCHS-dbg=
+#BROKEN-phar-sparc64= SIGBUS during phar generation
+NOT_FOR_ARCHS-phar= sparc64
+.include <bsd.port.arch.mk>
+
+#
+# php SAPIs
+#
+
+WANTLIBSAPI= c crypto mhash pcre pthread ssl xml2>=8 z
+WANTLIBSAPI+= ${LIBCXX}
+
+LIB_DEPENDSSAPI= textproc/libxml \
+ devel/pcre \
+ security/mhash
+# These libraries aren't direct dependencies for core PHP, but seems to be drawn
+# in through libxml2 somehow.
+# Since libxml2 is part of the core install through libxml, which can't be build
+# individually, don't care too much about them, just keep these here as a
+# reminder.
+WANTLIBSAPI+= iconv lzma m
+LIB_DEPENDSSAPI+= converters/libiconv \
+ archivers/xz
+
+# apxs2
+COMMENT-apxs2= apache2 sapi for php
+CONFIGURE_ARGS+= --with-apxs2=${LOCALBASE}/sbin/apxs2
+BUILD_DEPENDS+= www/apache-httpd
+RUN_DEPENDS-apxs2+= www/apache-httpd \
+ mail/femail,-chroot
+WANTLIB-apxs2= ${WANTLIBSAPI}
+LIB_DEPENDS-apxs2= ${LIB_DEPENDSSAPI}
+
+# cgi
+COMMENT-cgi= cgi sapi for php
+CONFIGURE_ARGS+= --enable-cgi
+WANTLIB-cgi= ${WANTLIBSAPI}
+LIB_DEPENDS-cgi= ${LIB_DEPENDSSAPI}
+
+# cli
+COMMENT-cli= cli sapi for php
+CONFIGURE_ARGS+= --enable-cli
+WANTLIB-cli= ${WANTLIBSAPI}
+LIB_DEPENDS-cli= ${LIB_DEPENDSSAPI}
+
+# dbg
+COMMENT-dbg= debug sapi for php
+.if ${BUILD_PACKAGES:M-dbg}
+CONFIGURE_ARGS+= --enable-phpdbg
+.else
+CONFIGURE_ARGS+= --disable-phpdbg
+.endif
+WANTLIB-dbg= readline ${WANTLIBSAPI}
+LIB_DEPENDS-dbg= ${LIB_DEPENDSSAPI}
+
+# fpm
+COMMENT-fpm= fpm sapi for php
+CONFIGURE_ARGS+= --enable-fpm \
+ --with-fpm-user=www \
+ --with-fpm-group=www
+WANTLIB-fpm= ${WANTLIBSAPI}
+LIB_DEPENDS-fpm= ${LIB_DEPENDSSAPI}
+RUN_DEPENDS-fpm= mail/femail,-chroot
 
 #
 # Loadable php extensions by name that are included in all versions
 #
 
+# bcmath
+COMMENT-bcmath= bcmath precision mathematics extensions for php
+CONFIGURE_ARGS+= --enable-bcmath=shared
+
 # bz2
-MULTI_PACKAGES+= -bz2
-COMMENT-bz2= bzip2 compression extensions for php5
+COMMENT-bz2= bzip2 compression extensions for php
 CONFIGURE_ARGS+= --with-bz2=shared,${LOCALBASE}
 LIB_DEPENDS-bz2= archivers/bzip2
 WANTLIB-bz2= bz2>=10 pthread
 
+# calendar
+COMMENT-calendar= calendar format converting extensions for php
+CONFIGURE_ARGS+= --enable-calendar=shared
+
+# ctype
+COMMENT-ctype= ctype character class check extensions for php
+CONFIGURE_ARGS+= --enable-ctype=shared
+
 # curl
-MULTI_PACKAGES+= -curl
-COMMENT-curl= curl URL library extensions for php5
+COMMENT-curl= curl URL library extensions for php
 CONFIGURE_ARGS+= --with-curl=shared,${LOCALBASE}
 LIB_DEPENDS-curl= net/curl
 WANTLIB-curl= pthread crypto nghttp2 ssl z curl>=2
 
 # dba
-MULTI_PACKAGES+= -dba
-COMMENT-dba= dba GDBM access extensions for php5
+COMMENT-dba= dba GDBM access extensions for php
 CONFIGURE_ARGS+= --enable-dba=shared --with-gdbm=${LOCALBASE}
 LIB_DEPENDS-dba= databases/gdbm
 WANTLIB-dba= gdbm>=2 pthread
 
+# dom
+COMMENT-dom= dom xml operations for php
+CONFIGURE_ARGS+= --enable-dom=shared
+
+# enchant
+COMMENT-enchant= enchant spelling check extensions for php
+CONFIGURE_ARGS+= --with-enchant=shared
+LIB_DEPENDS-enchant= textproc/enchant
+WANTLIB-enchant= enchant
+
+# exif
+COMMENT-exif= exif image meta data extensions for php
+CONFIGURE_ARGS+= --enable-exif=shared
+LIB_DEPENDS-exif= graphics/libexif
+WANTLIB-exif= exif
+
+# fileinfo
+COMMENT-fileinfo= fileinfo content type guessing extensions for php
+CONFIGURE_ARGS+= --enable-fileinfo=shared
+
+# ftp
+COMMENT-ftp= ftp extensions for php
+CONFIGURE_ARGS+= --enable-ftp=shared
+WANTLIB-ftp= ssl crypto
+
 # gd
-MULTI_PACKAGES+= -gd
-COMMENT-gd= image manipulation extensions for php5
+COMMENT-gd= image manipulation extensions for php
 LIB_DEPENDS-gd= graphics/jpeg \
  graphics/png
-.if ${PV} != "7.0"
-LIB_DEPENDS-gd+= devel/t1lib
-WANTLIB-gd+= t1>=5
+.if ${PV} == "5.6"
+LIB_DEPENDS-gd+= devel/t1lib \
+ multimedia/libvpx
+WANTLIB-gd+= t1>=5 \
+ vpx
+CONFIGURE_ARGS+= --with-t1lib=${LOCALBASE} \
+ --with-vpx-dir=${LOCALBASE}
 .endif
 WANTLIB-gd+= z jpeg>=62 png>=3 pthread X11 Xpm freetype
 CONFIGURE_ARGS+= --with-gd=shared \
  --with-jpeg-dir=${LOCALBASE} \
  --with-png-dir=${LOCALBASE} \
  --with-zlib-dir=/usr \
- --with-t1lib=${LOCALBASE} \
  --with-freetype-dir=${X11BASE} \
  --with-xpm-dir=${X11BASE}
 
+# gettext
+COMMENT-gettext= gettext native language support extensions for php
+CONFIGURE_ARGS+= --with-gettext=shared,${LOCALBASE}
+LIB_DEPENDS-gettext= devel/gettext
+WANTLIB-gettext= intl
+
 # gmp
-MULTI_PACKAGES+= -gmp
-COMMENT-gmp= gmp math library support for php5
+COMMENT-gmp= gmp math library support for php
 CONFIGURE_ARGS+= --with-gmp=shared,${LOCALBASE}
 LIB_DEPENDS-gmp= devel/gmp
 WANTLIB-gmp= gmp>=4 pthread
 
-# intl
-MULTI_PACKAGES+= -intl
-COMMENT-intl= intl library support for php5
-CONFIGURE_ARGS+= --enable-intl=shared \
- --with-icu-dir=${LOCALBASE}
-LIB_DEPENDS-intl= textproc/icu4c
-WANTLIB-intl= ${LIBCXX} icudata icui18n icuio icuuc m pthread
+# iconv
+COMMENT-iconv= iconv character conversion extensions for php
+CONFIGURE_ARGS+= --with-iconv=shared,${LOCALBASE}
+LIB_DEPENDS-iconv= converters/libiconv
+WANTLIB-iconv= iconv
 
 # imap
-MULTI_PACKAGES+= -imap
-COMMENT-imap= imap, pop3 and nntp extensions for php5
+COMMENT-imap= imap, pop3 and nntp extensions for php
 CONFIGURE_ARGS+= --with-imap=shared,${LOCALBASE} \
  --with-imap-ssl
 LIB_DEPENDS-imap= mail/alpine,-c-client
 WANTLIB-imap= pthread crypto ssl c-client>=5
 
+# intl
+COMMENT-intl= intl library support for php
+CONFIGURE_ARGS+= --enable-intl=shared \
+ --with-icu-dir=${LOCALBASE}
+LIB_DEPENDS-intl= textproc/icu4c
+WANTLIB-intl= icudata icui18n icuio icuuc pthread
+
+# json
+COMMENT-json= json javascript object notation extensions for php
+CONFIGURE_ARGS+= --enable-json=shared
+
 # ldap
-MULTI_PACKAGES+= -ldap
-COMMENT-ldap= ldap protocol extensions for php5
-CONFIGURE_ARGS+= --with-ldap=shared,${LOCALBASE}
-LIB_DEPENDS-ldap= databases/openldap
-WANTLIB-ldap= pthread ldap>=2 lber
+COMMENT-ldap= ldap protocol extensions for php
+CONFIGURE_ARGS+= --with-ldap=shared,${LOCALBASE} \
+ --with-ldap-sasl=${LOCALBASE}
+LIB_DEPENDS-ldap= databases/openldap \
+ security/cyrus-sasl2
+WANTLIB-ldap= pthread ldap>=2 lber \
+ sasl2
+
+# mbstring
+COMMENT-mbstring= mbstring multibyte character manipulation extensions for php
+CONFIGURE_ARGS+= --enable-mbstring=shared \
+ --with-onig=${LOCALBASE}
+LIB_DEPENDS-mbstring= textproc/oniguruma
+WANTLIB-mbstring= onig
 
 # mcrypt
-MULTI_PACKAGES+= -mcrypt
-COMMENT-mcrypt= mcrypt encryption/decryption extensions for php5
+COMMENT-mcrypt= mcrypt encryption/decryption extensions for php
 CONFIGURE_ARGS+= --with-mcrypt=shared,${LOCALBASE}
 LIB_DEPENDS-mcrypt= security/libmcrypt devel/libtool,-ltdl
 WANTLIB-mcrypt= mcrypt ltdl>=1 pthread
 
-.if ${PV} != "7.0"
-# mysql
-MULTI_PACKAGES+= -mysql
-COMMENT-mysql= mysql database access extensions for php5
-CONFIGURE_ARGS+= --with-mysql=shared,${LOCALBASE}
-LIB_DEPENDS-mysql= databases/mariadb
-WANTLIB-mysql= pthread lib/mysql/mysqlclient
-.endif
+# mysqlnd
+COMMENT-mysqlnd= mysqlclient replacement for php
+CONFIGURE_ARGS+= --enable-mysqlnd=shared
+WANTLIB-mysqlnd= crypto m pthread ssl z
 
 # mysqli
-MULTI_PACKAGES+= -mysqli
-COMMENT-mysqli= mysql database access extensions for php5
-CONFIGURE_ARGS+= --with-mysqli=shared,${LOCALBASE}/bin/mysql_config
-LIB_DEPENDS-mysqli= databases/mariadb
-WANTLIB-mysqli= crypto m pthread ssl z lib/mysql/mysqlclient
+COMMENT-mysqli= mysql database access extensions for php
+CONFIGURE_ARGS+= --with-mysqli=shared,mysqlnd
+RUN_DEPENDS-mysqli= lang/php/${PV},-mysqlnd
 
 # odbc
-MULTI_PACKAGES+= -odbc
-COMMENT-odbc= odbc database access extensions for php5
+COMMENT-odbc= odbc database access extensions for php
 CONFIGURE_ARGS+=        --with-iodbc=shared,${LOCALBASE}
 LIB_DEPENDS-odbc= databases/iodbc
 WANTLIB-odbc= iodbc>=2 pthread
-.if ${PV} != "5.3"
 WANTLIB-odbc+= iodbcinst
-.endif
+
+# opcache
+COMMENT-opcache= opcache bytecode caching extensions for php
+CONFIGURE_ARGS+= --enable-opcache
 
 # pcntl
-MULTI_PACKAGES+= -pcntl
-COMMENT-pcntl= PCNTL extensions for php5
+COMMENT-pcntl= PCNTL extensions for php
 CONFIGURE_ARGS+= --enable-pcntl=shared
 LIB_DEPENDS-pcntl=
 WANTLIB-pcntl= pthread
 
+# pdo
+COMMENT-pdo= PDO database interface extensions for php
+CONFIGURE_ARGS+= --enable-pdo=shared
+
+# pdo-dblib
+COMMENT-pdo_dblib= PDO DB-LIB support for php
+CONFIGURE_ARGS+=        --with-pdo-dblib=shared,${LOCALBASE}
+LIB_DEPENDS-pdo_dblib= databases/freetds
+WANTLIB-pdo_dblib= sybdb>=6 pthread
+RUN_DEPENDS-pdo_dblib= lang/php/${PV},-pdo
+
 # pdo-mysql
-MULTI_PACKAGES+= -pdo_mysql
-COMMENT-pdo_mysql= PDO mysql database access extensions for php5
-CONFIGURE_ARGS+= --with-pdo-mysql=shared,${LOCALBASE}
-LIB_DEPENDS-pdo_mysql= databases/mariadb
-WANTLIB-pdo_mysql= crypto m pthread ssl z lib/mysql/mysqlclient
+COMMENT-pdo_mysql= PDO mysql database access extensions for php
+CONFIGURE_ARGS+= --with-pdo-mysql=shared,mysqlnd
+RUN_DEPENDS-pdo_mysql= lang/php/${PV},-mysqlnd lang/php/${PV},-pdo
 
 # pdo-pgsql
-MULTI_PACKAGES+= -pdo_pgsql
-COMMENT-pdo_pgsql= PDO database access extensions for php5
-CONFIGURE_ARGS+=        --with-pdo-pgsql=shared,${LOCALBASE}
+COMMENT-pdo_pgsql= PDO database access extensions for php
+CONFIGURE_ARGS+=       --with-pdo-pgsql=shared,${LOCALBASE}
 LIB_DEPENDS-pdo_pgsql= databases/postgresql
 WANTLIB-pdo_pgsql= pq>=2 pthread
+RUN_DEPENDS-pdo_pgsql= lang/php/${PV},-pdo
+
+# pdo-sqlite
+COMMENT-pdo_sqlite= PDO sqlite3 database access extensions for php
+CONFIGURE_ARGS+=       --with-pdo-sqlite=shared,${LOCALBASE}
+LIB_DEPENDS-pdo_sqlite= databases/sqlite3
+WANTLIB-pdo_sqlite= sqlite3
+RUN_DEPENDS-pdo_sqlite= lang/php/${PV},-sqlite3 lang/php/${PV},-pdo
 
 # pgsql
-MULTI_PACKAGES+= -pgsql
-COMMENT-pgsql= pgsql database access extensions for php5
+COMMENT-pgsql= pgsql database access extensions for php
 CONFIGURE_ARGS+= --with-pgsql=shared,${LOCALBASE}
 LIB_DEPENDS-pgsql= databases/postgresql
 WANTLIB-pgsql= pq>=2 pthread
 
+# phar
+COMMENT-phar= phar archive abstraction extensions for php
+.if ${BUILD_PACKAGES:M-phar}
+CONFIGURE_ARGS+= --enable-phar=shared
+.else
+CONFIGURE_ARGS+= --disable-phar
+.endif
+
+# posix
+COMMENT-posix= posix functions extensions for php
+CONFIGURE_ARGS+= --enable-posix=shared
+
 # pspell
-MULTI_PACKAGES+= -pspell
-COMMENT-pspell= pspell library extensions for php5
+COMMENT-pspell= pspell library extensions for php
 CONFIGURE_ARGS+= --with-pspell=shared,${LOCALBASE}
 LIB_DEPENDS-pspell= textproc/aspell/core
 WANTLIB-pspell= aspell>=16 pspell>=16 pthread
 
+# readline
+COMMENT-readline= readline editable command lines extensions for php
+CONFIGURE_ARGS+= --with-readline=shared
+WANTLIB-readline= readline ncurses
+
 # shmop
-MULTI_PACKAGES+= -shmop
-COMMENT-shmop= shared memory extensions for php5
+COMMENT-shmop= shared memory extensions for php
 CONFIGURE_ARGS+= --enable-shmop=shared,${LOCALBASE}
-LIB_DEPENDS-shmop=
 WANTLIB-shmop= pthread
 
-# soap
-MULTI_PACKAGES+= -soap
-COMMENT-soap= SOAP functions for php5
-CONFIGURE_ARGS+= --enable-soap=shared,${LOCALBASE}
-LIB_DEPENDS-soap= textproc/libxml
-WANTLIB-soap= iconv m pthread z xml2>=8 lzma
+# simplexml
+COMMENT-simplexml= simplexml xml to object toolset extensions for php
+CONFIGURE_ARGS+= --enable-simplexml=shared
+LIB_DEPENDS-simplexml= textproc/libxml
+WANTLIB-simplexml+= xml2>=8
 
 # snmp
-MULTI_PACKAGES+= -snmp
-COMMENT-snmp= snmp protocol extensions for php5
-CONFIGURE_ARGS+= --with-snmp=shared,${LOCALBASE} --enable-ucd-snmp-hack
+COMMENT-snmp= snmp protocol extensions for php
+CONFIGURE_ARGS+= --with-snmp=shared,${LOCALBASE}
 LIB_DEPENDS-snmp= net/net-snmp
 WANTLIB-snmp= crypto m netsnmp>=6.2 pthread
 
-.if ${PV} != "7.0"
-# sybase-ct
-MULTI_PACKAGES+= -sybase_ct
-COMMENT-sybase_ct= sybase database access extensions for php5
-CONFIGURE_ARGS+= --with-sybase-ct=shared,${LOCALBASE}
-LIB_DEPENDS-sybase_ct= databases/freetds
-WANTLIB-sybase_ct= ct pthread
-.endif
-
-# pdo-dblib
-MULTI_PACKAGES+= -pdo_dblib
-COMMENT-pdo_dblib= PDO DB-LIB support for php5
-CONFIGURE_ARGS+=        --with-pdo-dblib=shared,${LOCALBASE}
-LIB_DEPENDS-pdo_dblib= databases/freetds
-WANTLIB-pdo_dblib= sybdb>=6 pthread
+# soap
+COMMENT-soap= SOAP functions for php
+CONFIGURE_ARGS+= --enable-soap=shared,${LOCALBASE}
+LIB_DEPENDS-soap= textproc/libxml
+WANTLIB-soap= iconv m pthread z xml2>=8 lzma
 
-.if ${PV} != "7.0"
-# mssql
-MULTI_PACKAGES+= -mssql
-COMMENT-mssql= microsoft sql access extensions for php5
-CONFIGURE_ARGS+=        --with-mssql=shared,${LOCALBASE}
-LIB_DEPENDS-mssql= databases/freetds
-WANTLIB-mssql= sybdb>=6 pthread
-.endif
+# sockets
+COMMENT-sockets= sockets extensions for php
+CONFIGURE_ARGS+= --enable-sockets=shared
+
+# sqlite3
+COMMENT-sqlite3= sqlite3 database access extensions for php
+CONFIGURE_ARGS+= --with-sqlite3=shared,${LOCALBASE}
+LIB_DEPENDS-sqlite3= databases/sqlite3
+WANTLIB-sqlite3= sqlite3
+
+# sysvmsg
+COMMENT-sysvmsg= sysvmsg System V messges extensions for php
+CONFIGURE_ARGS+= --enable-sysvmsg=shared
+
+# sysvsem
+COMMENT-sysvsem= sysvsem System V semaphore extensions for php
+CONFIGURE_ARGS+= --enable-sysvsem=shared
+
+# sysvshm
+COMMENT-sysvshm= sysvshm System V shared memory extensions for php
+CONFIGURE_ARGS+= --enable-sysvshm=shared
 
 # tidy
-MULTI_PACKAGES+= -tidy
 COMMENT-tidy= tidy HTML cleaner bindings
 CONFIGURE_ARGS+= --with-tidy=shared,${LOCALBASE}
 LIB_DEPENDS-tidy= www/tidyp
 WANTLIB-tidy= tidyp pthread
 
-# xml-rpc
-MULTI_PACKAGES+= -xmlrpc
-COMMENT-xmlrpc= XML RPC functions for php5
+# tokenizer
+COMMENT-tokenizer= tokenizer php source analyzing extensions for php
+CONFIGURE_ARGS+= --enable-tokenizer=shared
+
+# wddx
+COMMENT-wddx= wddx extensions for php
+CONFIGURE_ARGS+= --enable-wddx=shared
+LIB_DEPENDS-wddx= textproc/libxml
+WANTLIB-wddx= xml2>=8
+
+# xml
+COMMENT-xml= xml extensions for php
+CONFIGURE_ARGS+= --enable-xml
+LIB_DEPENDS-xml= textproc/libxml
+WANTLIB-xml= xml2>=8
+
+# xmlreader
+COMMENT-xmlreader= xmlreader streaming xml cursor extensions for php
+CONFIGURE_ARGS+= --enable-xmlreader=shared
+RUN_DEPENDS-xmlreader= lang/php/${PV},-dom
+
+# xmlrpc
+COMMENT-xmlrpc= XML RPC functions for php
 CONFIGURE_ARGS+= --with-xmlrpc=shared
 LIB_DEPENDS-xmlrpc= textproc/libxml
 WANTLIB-xmlrpc= iconv m z xml2>=8 pthread lzma
 
+# xmlwriter
+COMMENT-xmlwriter= xmlwriter streaming xml writer extensions for php
+CONFIGURE_ARGS+= --enable-xmlwriter=shared
+LIB_DEPENDS-xmlwriter= textproc/libxml
+WANTLIB-xmlwriter= xml2>=8
+
 # xsl
-MULTI_PACKAGES+= -xsl
-COMMENT-xsl= XSL functions for php5
-CONFIGURE_ARGS+= --with-xsl=shared --enable-dom
+COMMENT-xsl= XSL functions for php
+CONFIGURE_ARGS+= --with-xsl=shared
 LIB_DEPENDS-xsl= textproc/libxslt
 WANTLIB-xsl= iconv m xml2 z xslt>=3 exslt pthread lzma
 
 # zip
-MULTI_PACKAGES+= -zip
-COMMENT-zip= zip functions for php5
+COMMENT-zip= zip functions for php
 CONFIGURE_ARGS+= --enable-zip=shared,${LOCALBASE}
 LIB_DEPENDS-zip=
 WANTLIB-zip= z pthread
 
+
 # some variables to substitute
 SUBST_VARS= MODPHP_CONFIG_PATH SV PV ^MODULE_NAME
 PHP_VERSION= ${V}
 SV= ${PV:S/.//}
 
-.for i in TRUEPREFIX MODULES_DIR PHP_VERSION APACHE_MODULE_DIR
-PHPXS_SUBST+= -e 's,${i},${${i}},'
-.endfor
-
-WANTLIB-main+= c crypto iconv intl lzma m pthread ssl xml2>=8 z
-WANTLIB-main+= ncurses readline ${LIBCXX}
-
-# php 5.4/5.5 : WANTLIB-main += ${LIBCXX}
-WANTLIB-fastcgi= ${WANTLIB-main}
-LIB_DEPENDS-main= devel/gettext \
- textproc/libxml
-RUN_DEPENDS-main= mail/femail,-chroot
-LIB_DEPENDS-fastcgi= ${LIB_DEPENDS-main}
-RUN_DEPENDS-fastcgi=
-
-SUHOSIN_V= 0.9.38
-.if ${FLAVOR:Mno_suhosin} || ${PV} == "7.0"
-SUPDISTFILES= suhosin-${SUHOSIN_V}.tar.gz:0
-.else
-DISTFILES+= suhosin-${SUHOSIN_V}.tar.gz:0
-PATCH_LIST= patch-* suhosin-*
-CONFIGURE_ARGS+= --enable-suhosin
-
-pre-patch:
- @mv ${WRKDIR}/suhosin-${SUHOSIN_V} ${WRKSRC}/ext/suhosin
-.endif
-
 pre-fake:
  ${INSTALL_DATA_DIR} ${PREFIX}/${APACHE_MODULE_SUBDIR}/modules
 
@@ -374,29 +508,29 @@ DESTDIRNAME= INSTALL_ROOT
 
 pre-configure:
  ${SUBST_CMD} ${WRKSRC}/main/php_ini.c
+ ${SUBST_CMD} ${WRKSRC}/scripts/phpize.m4
  @perl -pi -e "s,OPENBSD_PEAR_ROOT,'${CHROOT_DIR}/pear',g;" \
  -e "s,OPENBSD_PREFIX,${TRUEPREFIX},;" \
  ${WRKSRC}/scripts/phpize.in \
  ${WRKSRC}/scripts/php-config.in
 
-.for i in ${MULTI_PACKAGES:N-main:N-fastcgi:S/-//g}
+.for i in ${MULTI_PACKAGES:N-main:S/-//g}
 MODULE_NAME-${i}= ${i}
 DESCR-${i}= ${.CURDIR}/../files/DESCR-${i}
 PKGNAME-${i}= php-${i}-${V}
-.if ${V:M5.4*}
-PKGSPEC-${i}= php-${i}->=5.4,<5.5
-.elif ${V:M5.5*}
-PKGSPEC-${i}= php-${i}->=5.5,<5.6
-.elif ${V:M5.6*}
+.if ${V:M5.6*}
 PKGSPEC-${i}= php-${i}->=5.6,<5.7
+RUN_DEPENDS-${i}+= php->=5.6.30p0:lang/php/${PV}
 .elif ${V:M7.0*}
 PKGSPEC-${i}= php-${i}->=7.0,<7.1
-.endif
+RUN_DEPENDS-${i}+= php->=7.0.19:lang/php/${PV}
+.elif ${V:M7.1*}
+PKGSPEC-${i}= php-${i}->=7.1,<7.2
 RUN_DEPENDS-${i}+= php-${V}:lang/php/${PV}
+.endif
 .endfor
 
 DESCR-main= ${.CURDIR}/../files/DESCR-main
-DESCR-fastcgi= ${.CURDIR}/../files/DESCR-fastcgi
 
 post-install:
  ${SUBST_DATA} ${.CURDIR}/../files/README-main \
@@ -405,13 +539,19 @@ post-install:
  ${PREFIX}/${APACHE_MODULE_SUBDIR}/
  ${INSTALL_DATA_DIR} ${WRKINST}/${CHROOT_DIR}/conf/php-${PV}.sample
  ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php-${PV}
+ ${INSTALL_PROGRAM} ${WRKBUILD}/ext/phar/phar.phar ${PREFIX}/bin/phar-${PV}
+ ${INSTALL_MAN} ${WRKBUILD}/ext/phar/phar.1 ${PREFIX}/man/man1/phar-${PV}.1
  ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cli/php ${PREFIX}/bin/php-${PV}
- ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cgi/php-cgi ${PREFIX}/bin/php-fastcgi-${PV}
+ ${INSTALL_MAN} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/man/man1/php-${PV}.1
+ ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cgi/php-cgi ${PREFIX}/bin/php-cgi-${PV}
+ ${INSTALL_MAN} ${WRKSRC}/sapi/cgi/php-cgi.1 ${PREFIX}/man/man1/php-cgi-${PV}.1
+# ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/phpdbg/phpdbg ${PREFIX}/bin/phpdbg-${PV}
+# ${INSTALL_MAN} ${WRKBUILD}/sapi/phpdbg/phpdbg.1 ${PREFIX}/man/man1/phpdbg-${PV}.1
  ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/fpm/php-fpm ${PREFIX}/sbin/php-fpm-${PV}
  ${INSTALL_MAN} ${WRKBUILD}/sapi/fpm/php-fpm.8 ${PREFIX}/man/man8/php-fpm-${PV}.8
  ${INSTALL_DATA} ${WRKBUILD}/sapi/fpm/php-fpm.conf \
  ${PREFIX}/share/examples/php-${PV}/php-fpm.conf
-.if ${PV} == "7.0"
+.if ${PV} != "5.6"
  cat ${WRKBUILD}/sapi/fpm/www.conf >> \
  ${PREFIX}/share/examples/php-${PV}/php-fpm.conf
 .endif
@@ -421,17 +561,19 @@ post-install:
  @perl -pi -e "s,!!PREFIX!!,${TRUEPREFIX},g;s,!!PV!!,${PV},g;s,!!MV!!,${PV:R},g" \
  ${PREFIX}/share/examples/php-${PV}/php.conf
 
-.for m in ${MULTI_PACKAGES:N-main:N-fastcgi:S/-//g}
+.for m in ${PHP_MODULES:S/-//g}
  ${INSTALL_DATA} ${WRKBUILD}/modules/${m}.so \
  ${PREFIX}/${MODULES_SUBDIR}/${m}.so
  echo "extension=${m}.so" > \
  ${PREFIX}/share/examples/php-${PV}/${m}.ini
 .endfor
- if [ -f ${WRKBUILD}/modules/opcache.so ]; then \
- ${INSTALL_DATA} ${WRKBUILD}/modules/opcache.so \
-    ${PREFIX}/${MODULES_SUBDIR}/opcache.so; \
- echo "zend_extension=opcache.so" > \
-    ${PREFIX}/share/examples/php-${PV}/opcache.ini; fi
+.for m in ${PHP_ZEND_MODULES:S/-//g}
+ ${INSTALL_DATA} ${WRKBUILD}/modules/${m}.so \
+ ${PREFIX}/${MODULES_SUBDIR}/${m}.so
+ echo "zend_extension=${m}.so" > \
+ ${PREFIX}/share/examples/php-${PV}/${m}.ini
+.endfor
+
  ${INSTALL_DATA_DIR} ${WRKINST}/${CHROOT_DIR}/etc
  echo "www:*:67:67::0:0:dummy user to appease c-client:/nonexistent:/sbin/nologin" > \
  ${WRKINST}/${CHROOT_DIR}/etc/master.passwd.imap
@@ -443,4 +585,3 @@ post-install:
  <${WRKSRC}/php.ini-${i} \
  >${PREFIX}/share/examples/php-${PV}/php.ini-${i}
 .endfor
- ${INSTALL_MAN} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/man/man1/php-${PV}.1
Index: php.port.mk
===================================================================
RCS file: /cvs/ports/lang/php/php.port.mk,v
retrieving revision 1.16
diff -u -p -a -u -r1.16 php.port.mk
--- php.port.mk 25 Apr 2017 11:26:43 -0000 1.16
+++ php.port.mk 8 Jul 2017 18:28:19 -0000
@@ -3,12 +3,12 @@
 CATEGORIES+= lang/php
 
 MODPHP_VERSION?= 5.6
-.if ${MODPHP_VERSION} == 5.5
-MODPHP_VSPEC = >=${MODPHP_VERSION},<5.6
-.elif ${MODPHP_VERSION} == 5.6
+.if ${MODPHP_VERSION} == 5.6
 MODPHP_VSPEC = >=${MODPHP_VERSION},<5.7
 .elif ${MODPHP_VERSION} == 7.0
 MODPHP_VSPEC = >=${MODPHP_VERSION},<7.1
+.elif ${MODPHP_VERSION} == 7.1
+MODPHP_VSPEC = >=${MODPHP_VERSION},<7.2
 .endif
 MODPHPSPEC = php-${MODPHP_VSPEC}
 
@@ -33,23 +33,19 @@ MODPHP_PHP_CONFIG= ${LOCALBASE}/bin/php-
 MODPHP_INCDIR= ${LOCALBASE}/include/php-${MODPHP_VERSION}
 MODPHP_LIBDIR= ${LOCALBASE}/lib/php-${MODPHP_VERSION}
 
-MODPHP_CONFIGURE_ARGS= --with-php-config=${LOCALBASE}/bin/php-config-${MODPHP_VERSION}
 SUBST_VARS+= MODPHP_VERSION
 
 MODPHP_DO_PHPIZE?=
 .if !empty(MODPHP_DO_PHPIZE)
-AUTOCONF_VERSION= 2.62
-AUTOMAKE_VERSION= 1.9
+AUTOCONF_VERSION= 2.69
 
-BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
+BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS}
 
 .if empty(CONFIGURE_STYLE)
 CONFIGURE_STYLE= gnu
 .endif
 
-CONFIGURE_ENV+= AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
- AUTOCONF_VERSION=${AUTOCONF_VERSION}
+CONFIGURE_ENV+= AUTOCONF_VERSION=${AUTOCONF_VERSION}
 CONFIGURE_ARGS+= ${MODPHP_CONFIGURE_ARGS}
 
 pre-configure:
Index: 5.5/Makefile
===================================================================
RCS file: 5.5/Makefile
diff -N 5.5/Makefile
--- 5.5/Makefile 12 Jun 2017 11:48:34 -0000 1.65
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-# $OpenBSD: Makefile,v 1.65 2017/06/12 11:48:34 sthen Exp $
-
-BROKEN-alpha= pcre_jit_compile.c:65:2: error: #error Unsupported architecture
-
-PV= 5.5
-V= ${PV}.38
-REVISION = 0
-REVISION-intl= 1
-
-.include <bsd.port.mk>
Index: 5.5/distinfo
===================================================================
RCS file: 5.5/distinfo
diff -N 5.5/distinfo
--- 5.5/distinfo 19 Dec 2016 20:34:22 -0000 1.33
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-SHA256 (php-5.5.38.tar.bz2) = RzyB67LkjKRoyu4DF2ImZlGEPXInwYqCSt2bB7k5Pjg=
-SHA256 (suhosin-0.9.38.tar.gz) = wC12xOfOd3kQo3wYGBy2f9npDv4BB/6rPeMTG1+JvOo=
-SIZE (php-5.5.38.tar.bz2) = 13701262
-SIZE (suhosin-0.9.38.tar.gz) = 122800
Index: 5.5/patches/patch-Zend_zend_alloc_c
===================================================================
RCS file: 5.5/patches/patch-Zend_zend_alloc_c
diff -N 5.5/patches/patch-Zend_zend_alloc_c
--- 5.5/patches/patch-Zend_zend_alloc_c 6 Feb 2016 23:31:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-Zend_zend_alloc_c,v 1.1 2016/02/06 23:31:20 sthen Exp $
-
-Apparently not enabled by default, and currently a bit close to release to
-try doing so, but for something in #ifdef MM_HEAP_PROTECTION, you want more
-than rand()^getpid() when /dev/urandom is inaccessible, right?
-
---- Zend/zend_alloc.c.orig.port Mon Feb  1 23:04:02 2016
-+++ Zend/zend_alloc.c Mon Feb  1 23:34:27 2016
-@@ -976,6 +976,9 @@ static void zend_mm_free_cache(zend_mm_heap *heap)
- #if ZEND_MM_HEAP_PROTECTION || ZEND_MM_COOKIES
- static void zend_mm_random(unsigned char *buf, size_t size) /* {{{ */
- {
-+#if defined(__OpenBSD__)
-+ arc4random_buf(buf, size);
-+#else
- size_t i = 0;
- unsigned char t;
-
-@@ -1031,6 +1034,7 @@ static void zend_mm_random(unsigned char *buf, size_t
- } while (buf[i] == 0);
- t = buf[i++] << 1;
-     }
-+#endif /* openbsd */
- }
- /* }}} */
- #endif
Index: 5.5/patches/patch-acinclude_m4
===================================================================
RCS file: 5.5/patches/patch-acinclude_m4
diff -N 5.5/patches/patch-acinclude_m4
--- 5.5/patches/patch-acinclude_m4 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-$OpenBSD: patch-acinclude_m4,v 1.1.1.1 2013/08/07 16:46:56 robert Exp $
---- acinclude.m4.orig.port Sun Jul 28 10:54:23 2013
-+++ acinclude.m4 Sun Jul 28 10:55:00 2013
-@@ -984,15 +984,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(PHP_EXT_DIR($1),$2,$ac_extra,)
--        EXT_STATIC="$EXT_STATIC $1"
--        ;;
--      *[)]
-         PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
--        ;;
--    esac
-+        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
-+        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
-     EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
-   fi
-   PHP_ADD_BUILD_DIR($ext_builddir)
-@@ -1042,12 +1036,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
- ])
-
-@@ -2320,9 +2308,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
-
Index: 5.5/patches/patch-aclocal_m4
===================================================================
RCS file: 5.5/patches/patch-aclocal_m4
diff -N 5.5/patches/patch-aclocal_m4
--- 5.5/patches/patch-aclocal_m4 26 Apr 2017 08:15:05 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-aclocal_m4,v 1.1 2017/04/26 08:15:05 sthen Exp $
---- aclocal.m4.orig.port Tue Apr 25 00:35:44 2017
-+++ aclocal.m4 Tue Apr 25 00:35:57 2017
-@@ -762,7 +762,9 @@ AC_DEFUN([PHP_REQUIRE_CXX],[
-   if test -z "$php_cxx_done"; then
-     AC_PROG_CXX
-     AC_PROG_CXXCPP
--    PHP_ADD_LIBRARY(stdc++)
-+    for i in $LIBCXX; do
-+      PHP_ADD_LIBRARY($i)
-+    done
-     php_cxx_done=yes
-   fi
- ])
Index: 5.5/patches/patch-configure_in
===================================================================
RCS file: 5.5/patches/patch-configure_in
diff -N 5.5/patches/patch-configure_in
--- 5.5/patches/patch-configure_in 19 Feb 2015 20:14:41 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.2 2015/02/19 20:14:41 sthen Exp $
---- configure.in.orig.port Wed Feb 18 15:39:54 2015
-+++ configure.in Thu Feb 19 14:23:11 2015
-@@ -1039,16 +1039,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
-@@ -1239,7 +1239,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
Index: 5.5/patches/patch-ext_gd_config_m4
===================================================================
RCS file: 5.5/patches/patch-ext_gd_config_m4
diff -N 5.5/patches/patch-ext_gd_config_m4
--- 5.5/patches/patch-ext_gd_config_m4 27 Mar 2014 14:05:02 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-ext_gd_config_m4,v 1.1 2014/03/27 14:05:02 sthen 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 Wed Mar  5 10:18:00 2014
-+++ ext/gd/config.m4 Thu Mar 27 13:43:18 2014
-@@ -158,11 +158,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
-
Index: 5.5/patches/patch-ext_gd_gdcache_h
===================================================================
RCS file: 5.5/patches/patch-ext_gd_gdcache_h
diff -N 5.5/patches/patch-ext_gd_gdcache_h
--- 5.5/patches/patch-ext_gd_gdcache_h 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ext_gd_gdcache_h,v 1.1.1.1 2013/08/07 16:46:55 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 */
Index: 5.5/patches/patch-ext_gd_libgd_gdcache_h
===================================================================
RCS file: 5.5/patches/patch-ext_gd_libgd_gdcache_h
diff -N 5.5/patches/patch-ext_gd_libgd_gdcache_h
--- 5.5/patches/patch-ext_gd_libgd_gdcache_h 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_gd_libgd_gdcache_h,v 1.1.1.1 2013/08/07 16:46:55 robert Exp $
---- ext/gd/libgd/gdcache.h.orig.port Wed Sep 26 16:44:16 2007
-+++ ext/gd/libgd/gdcache.h Sat Jun 18 12:14:49 2011
-@@ -41,7 +41,7 @@
- /*********************************************************/
-
- #include <stdlib.h>
--#ifdef HAVE_MALLOC_H
-+#if (!defined(__OpenBSD__)) && HAVE_MALLOC_H
-  #include <malloc.h>
- #endif
- #ifndef NULL
Index: 5.5/patches/patch-ext_gd_libgd_gdkanji_c
===================================================================
RCS file: 5.5/patches/patch-ext_gd_libgd_gdkanji_c
diff -N 5.5/patches/patch-ext_gd_libgd_gdkanji_c
--- 5.5/patches/patch-ext_gd_libgd_gdkanji_c 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.1.1.1 2013/08/07 16:46:55 robert Exp $
---- ext/gd/libgd/gdkanji.c.orig.port Wed Sep 26 16:44:16 2007
-+++ ext/gd/libgd/gdkanji.c Sat Jun 18 12:14:49 2011
-@@ -362,7 +362,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)
Index: 5.5/patches/patch-ext_iconv_iconv_c
===================================================================
RCS file: 5.5/patches/patch-ext_iconv_iconv_c
diff -N 5.5/patches/patch-ext_iconv_iconv_c
--- 5.5/patches/patch-ext_iconv_iconv_c 12 Jul 2015 14:07:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-$OpenBSD: patch-ext_iconv_iconv_c,v 1.2 2015/07/12 14:07:10 robert Exp $
---- ext/iconv/iconv.c.orig.port Wed Jul  8 16:55:35 2015
-+++ ext/iconv/iconv.c Sun Jul 12 15:58:13 2015
-@@ -398,7 +398,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d
-
- out_p = (d)->c + (d)->len;
-
-- 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:
-@@ -585,7 +585,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const c
- out_p = 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) {
-@@ -710,7 +710,7 @@ static php_iconv_err_t _php_iconv_strlen(unsigned int
-
- 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;
- }
-@@ -831,7 +831,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;
- }
-@@ -963,7 +963,7 @@ static php_iconv_err_t _php_iconv_strpos(unsigned int
-
- 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) {
-@@ -1212,7 +1212,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:
-@@ -1312,7 +1312,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:
-@@ -2585,7 +2585,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:
Index: 5.5/patches/patch-ext_imap_config_m4
===================================================================
RCS file: 5.5/patches/patch-ext_imap_config_m4
diff -N 5.5/patches/patch-ext_imap_config_m4
--- 5.5/patches/patch-ext_imap_config_m4 8 Aug 2013 19:11:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_imap_config_m4,v 1.1 2013/08/08 19:11:43 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,[ ])
Index: 5.5/patches/patch-ext_mcrypt_mcrypt_c
===================================================================
RCS file: 5.5/patches/patch-ext_mcrypt_mcrypt_c
diff -N 5.5/patches/patch-ext_mcrypt_mcrypt_c
--- 5.5/patches/patch-ext_mcrypt_mcrypt_c 25 Jun 2016 18:54:15 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-ext_mcrypt_mcrypt_c,v 1.2 2016/06/25 18:54:15 sthen Exp $
-
-mcrypt IV creation. no /dev/{u,}random? yes, it is using the last hunk.
-
---- ext/mcrypt/mcrypt.c.orig.port Tue Jun 21 12:11:59 2016
-+++ ext/mcrypt/mcrypt.c Sat Jun 25 13:41:19 2016
-@@ -1411,6 +1411,10 @@ PHP_FUNCTION(mcrypt_create_iv)
-
- iv = ecalloc(size + 1, 1);
-
-+#if defined(__OpenBSD__)
-+ arc4random_buf(iv, (size_t) size);
-+ n = size;
-+#else
- if (source == RANDOM || source == URANDOM) {
- #if PHP_WIN32
- /* random/urandom equivalent on Windows */
-@@ -1455,6 +1459,7 @@ PHP_FUNCTION(mcrypt_create_iv)
- iv[--size] = (char) (255.0 * php_rand(TSRMLS_C) / RAND_MAX);
- }
- }
-+#endif /* openbsd */
- RETURN_STRINGL(iv, n, 0);
- }
- /* }}} */
Index: 5.5/patches/patch-ext_mysqlnd_config9_m4
===================================================================
RCS file: 5.5/patches/patch-ext_mysqlnd_config9_m4
diff -N 5.5/patches/patch-ext_mysqlnd_config9_m4
--- 5.5/patches/patch-ext_mysqlnd_config9_m4 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ext_mysqlnd_config9_m4,v 1.1.1.1 2013/08/07 16:46:55 robert Exp $
---- ext/mysqlnd/config9.m4.orig.port Wed Jul  3 08:10:53 2013
-+++ ext/mysqlnd/config9.m4 Sat Jul 27 18:39:50 2013
-@@ -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_bt.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
Index: 5.5/patches/patch-ext_odbc_config_m4
===================================================================
RCS file: 5.5/patches/patch-ext_odbc_config_m4
diff -N 5.5/patches/patch-ext_odbc_config_m4
--- 5.5/patches/patch-ext_odbc_config_m4 25 Apr 2015 16:09:57 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-ext_odbc_config_m4,v 1.4 2015/04/25 16:09:57 robert Exp $
-
-don't link php binary with iodbc
-
---- ext/odbc/config.m4.orig.port Wed Apr 15 12:43:00 2015
-+++ ext/odbc/config.m4 Sat Apr 25 18:07:46 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`
Index: 5.5/patches/patch-ext_session_session_c
===================================================================
RCS file: 5.5/patches/patch-ext_session_session_c
diff -N 5.5/patches/patch-ext_session_session_c
--- 5.5/patches/patch-ext_session_session_c 6 Feb 2016 23:31:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-ext_session_session_c,v 1.1 2016/02/06 23:31:20 sthen Exp $
-
-Perhaps the whole function can be replaced, but we have to start somewhere.
-
---- ext/session/session.c.orig.port Mon Feb  1 23:04:02 2016
-+++ ext/session/session.c Mon Feb  1 23:48:25 2016
-@@ -346,7 +346,11 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS)
- efree(buf);
-
- if (PS(entropy_length) > 0) {
--#ifdef PHP_WIN32
-+#if defined(__OpenBSD__)
-+ unsigned char rbuf[2048];
-+ size_t toread = PS(entropy_length);
-+ arc4random_buf(rbuf, MIN(toread, sizeof(rbuf)));
-+#elif defined(PHP_WIN32)
- unsigned char rbuf[2048];
- size_t toread = PS(entropy_length);
-
Index: 5.5/patches/patch-ext_sockets_sockaddr_conv_c
===================================================================
RCS file: 5.5/patches/patch-ext_sockets_sockaddr_conv_c
diff -N 5.5/patches/patch-ext_sockets_sockaddr_conv_c
--- 5.5/patches/patch-ext_sockets_sockaddr_conv_c 28 Apr 2014 22:02:39 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-ext_sockets_sockaddr_conv_c,v 1.3 2014/04/28 22:02:39 sthen Exp $
---- ext/sockets/sockaddr_conv.c.orig.port Wed Mar  5 10:18:00 2014
-+++ ext/sockets/sockaddr_conv.c Mon Mar 24 22:53:00 2014
-@@ -11,6 +11,10 @@
-
- extern int php_string_to_if_index(const char *val, unsigned *out TSRMLS_DC);
-
-+#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 TSRMLS_DC) /* {{{ */
Index: 5.5/patches/patch-ext_spl_php_spl_c
===================================================================
RCS file: 5.5/patches/patch-ext_spl_php_spl_c
diff -N 5.5/patches/patch-ext_spl_php_spl_c
--- 5.5/patches/patch-ext_spl_php_spl_c 20 Sep 2013 20:20:28 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-ext_spl_php_spl_c,v 1.2 2013/09/20 20:20:28 sthen Exp $
---- ext/spl/php_spl.c.orig.port Wed Sep 18 14:08:04 2013
-+++ ext/spl/php_spl.c Fri Sep 20 15:23:16 2013
-@@ -784,7 +784,7 @@ PHP_FUNCTION(spl_object_hash)
-
- PHPAPI void php_spl_object_hash(zval *obj, char *result TSRMLS_DC) /* {{{*/
- {
-- intptr_t hash_handle, hash_handlers;
-+ zend_intptr_t hash_handle, hash_handlers;
- char *hex;
-
- if (!SPL_G(hash_mask_init)) {
-@@ -792,13 +792,13 @@ PHPAPI void php_spl_object_hash(zval *obj, char *resul
- php_mt_srand(GENERATE_SEED() TSRMLS_CC);
- }
-
-- SPL_G(hash_mask_handle)   = (intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
-- SPL_G(hash_mask_handlers) = (intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
-+ SPL_G(hash_mask_handle)   = (zend_intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
-+ SPL_G(hash_mask_handlers) = (zend_intptr_t)(php_mt_rand(TSRMLS_C) >> 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);
-
- spprintf(&hex, 32, "%016lx%016lx", hash_handle, hash_handlers);
-
Index: 5.5/patches/patch-ext_spl_php_spl_h
===================================================================
RCS file: 5.5/patches/patch-ext_spl_php_spl_h
diff -N 5.5/patches/patch-ext_spl_php_spl_h
--- 5.5/patches/patch-ext_spl_php_spl_h 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-ext_spl_php_spl_h,v 1.1.1.1 2013/08/07 16:46:55 robert Exp $
---- ext/spl/php_spl.h.orig.port Sun Jan  3 09:23:27 2010
-+++ ext/spl/php_spl.h Sat Jun 18 12:14:51 2011
-@@ -67,8 +67,8 @@ ZEND_BEGIN_MODULE_GLOBALS(spl)
- HashTable *  autoload_functions;
- int          autoload_running;
- int          autoload_extensions_len;
-- 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;
- ZEND_END_MODULE_GLOBALS(spl)
-
Index: 5.5/patches/patch-ext_standard_config_m4
===================================================================
RCS file: 5.5/patches/patch-ext_standard_config_m4
diff -N 5.5/patches/patch-ext_standard_config_m4
--- 5.5/patches/patch-ext_standard_config_m4 20 Sep 2013 20:20:28 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-ext_standard_config_m4,v 1.2 2013/09/20 20:20:28 sthen Exp $
---- ext/standard/config.m4.orig.port Wed Sep 18 14:08:04 2013
-+++ ext/standard/config.m4 Fri Sep 20 15:23:16 2013
-@@ -389,16 +389,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
Index: 5.5/patches/patch-ext_standard_password_c
===================================================================
RCS file: 5.5/patches/patch-ext_standard_password_c
diff -N 5.5/patches/patch-ext_standard_password_c
--- 5.5/patches/patch-ext_standard_password_c 6 Feb 2016 23:31:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-ext_standard_password_c,v 1.1 2016/02/06 23:31:20 sthen Exp $
---- ext/standard/password.c.orig.port Mon Feb  1 23:04:02 2016
-+++ ext/standard/password.c Mon Feb  1 23:51:51 2016
-@@ -124,6 +124,9 @@ static int php_password_make_salt(size_t length, char
-
- buffer = (char *) safe_emalloc(raw_length, 1, 1);
-
-+#if defined(__OpenBSD__)
-+ arc4random_buf(buffer, raw_length);
-+#else
- #if PHP_WIN32
- {
- BYTE *iv_b = (BYTE *) buffer;
-@@ -156,6 +159,7 @@ static int php_password_make_salt(size_t length, char
- buffer[i] ^= (char) (255.0 * php_rand(TSRMLS_C) / RAND_MAX);
- }
- }
-+#endif /* openbsd */
-
- result = safe_emalloc(length, 1, 1);
- if (php_password_salt_to64(buffer, raw_length, length, result) == FAILURE) {
Index: 5.5/patches/patch-ext_tidy_config_m4
===================================================================
RCS file: 5.5/patches/patch-ext_tidy_config_m4
diff -N 5.5/patches/patch-ext_tidy_config_m4
--- 5.5/patches/patch-ext_tidy_config_m4 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-ext_tidy_config_m4,v 1.1.1.1 2013/08/07 16:46:55 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,[ ])
-   ],[],[])
Index: 5.5/patches/patch-ext_tidy_tidy_c
===================================================================
RCS file: 5.5/patches/patch-ext_tidy_tidy_c
diff -N 5.5/patches/patch-ext_tidy_tidy_c
--- 5.5/patches/patch-ext_tidy_tidy_c 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_tidy_tidy_c,v 1.1.1.1 2013/08/07 16:46:55 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 */
Index: 5.5/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
===================================================================
RCS file: 5.5/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
diff -N 5.5/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
--- 5.5/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_xmlrpc_libxmlrpc_encodings_c,v 1.1.1.1 2013/08/07 16:46:55 robert Exp $
---- ext/xmlrpc/libxmlrpc/encodings.c.orig.port Wed Sep 26 16:44:16 2007
-+++ ext/xmlrpc/libxmlrpc/encodings.c Sat Jun 18 12:14:51 2011
-@@ -78,7 +78,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;
Index: 5.5/patches/patch-main_php_h
===================================================================
RCS file: 5.5/patches/patch-main_php_h
diff -N 5.5/patches/patch-main_php_h
--- 5.5/patches/patch-main_php_h 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-main_php_h,v 1.1.1.1 2013/08/07 16:46:55 robert Exp $
---- main/php.h.orig.port Thu Jul 18 16:37:33 2013
-+++ main/php.h Sun Jul 28 11:30:14 2013
-@@ -145,7 +145,9 @@ END_EXTERN_C()
- # if PHP_WIN32
- typedef int socklen_t;
- # else
-+#   if !defined(__OpenBSD__)
- typedef unsigned int socklen_t;
-+#   endif
- # endif
- #endif
-
Index: 5.5/patches/patch-main_php_ini_c
===================================================================
RCS file: 5.5/patches/patch-main_php_ini_c
diff -N 5.5/patches/patch-main_php_ini_c
--- 5.5/patches/patch-main_php_ini_c 19 Dec 2016 20:34:22 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-main_php_ini_c,v 1.3 2016/12/19 20:34:22 martijn Exp $
---- main/php_ini.c.orig.port Wed Jul 20 10:41:48 2016
-+++ main/php_ini.c Thu Dec  8 10:53:58 2016
-@@ -576,7 +576,7 @@ int php_init_config(TSRMLS_D)
-
- /* 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, &php_ini_opened_path TSRMLS_CC);
-+ fh.handle.fp = php_fopen_with_path("php-${PV}.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
- if (fh.handle.fp) {
- fh.filename = php_ini_opened_path;
- }
Index: 5.5/patches/patch-main_php_open_temporary_file_c
===================================================================
RCS file: 5.5/patches/patch-main_php_open_temporary_file_c
diff -N 5.5/patches/patch-main_php_open_temporary_file_c
--- 5.5/patches/patch-main_php_open_temporary_file_c 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-main_php_open_temporary_file_c,v 1.1.1.1 2013/08/07 16:46:56 robert Exp $
---- main/php_open_temporary_file.c.orig.port Sun Feb  7 20:15:58 2010
-+++ main/php_open_temporary_file.c Sat Jun 18 12:14:52 2011
-@@ -138,7 +138,7 @@ static int php_do_open_temporary_file(const char *path
- trailing_slash = "/";
- }
-
-- if (spprintf(&opened_path, 0, "%s%s%sXXXXXX", new_state.cwd, trailing_slash, pfx) >= MAXPATHLEN) {
-+ if (spprintf(&opened_path, 0, "%s%s%sXXXXXXXXXX", new_state.cwd, trailing_slash, pfx) >= MAXPATHLEN) {
- efree(opened_path);
- free(new_state.cwd);
- return -1;
Index: 5.5/patches/patch-php_ini-development
===================================================================
RCS file: 5.5/patches/patch-php_ini-development
diff -N 5.5/patches/patch-php_ini-development
--- 5.5/patches/patch-php_ini-development 19 Feb 2015 20:14:41 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,59 +0,0 @@
-$OpenBSD: patch-php_ini-development,v 1.6 2015/02/19 20:14:41 sthen Exp $
---- php.ini-development.orig.port Wed Feb 18 15:39:54 2015
-+++ php.ini-development Thu Feb 19 14:23:08 2015
-@@ -690,11 +690,8 @@ default_mimetype = "text/html"
- ;;;;;;;;;;;;;;;;;;;;;;;;;
-
- ; 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
-
-@@ -716,6 +713,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)
-@@ -800,7 +798,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
-@@ -907,7 +905,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
-@@ -986,16 +984,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 = [hidden email]
--
- ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
- ; http://php.net/sendmail-path
- ;sendmail_path =
Index: 5.5/patches/patch-php_ini-production
===================================================================
RCS file: 5.5/patches/patch-php_ini-production
diff -N 5.5/patches/patch-php_ini-production
--- 5.5/patches/patch-php_ini-production 19 Feb 2015 20:14:41 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-php_ini-production,v 1.6 2015/02/19 20:14:41 sthen Exp $
---- php.ini-production.orig.port Wed Feb 18 15:39:54 2015
-+++ php.ini-production Thu Feb 19 14:23:08 2015
-@@ -690,11 +690,8 @@ default_mimetype = "text/html"
- ;;;;;;;;;;;;;;;;;;;;;;;;;
-
- ; 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
-
-@@ -716,6 +713,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)
-@@ -800,7 +798,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
-@@ -907,7 +905,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
Index: 5.5/patches/patch-sapi_apache_mod_php5_c
===================================================================
RCS file: 5.5/patches/patch-sapi_apache_mod_php5_c
diff -N 5.5/patches/patch-sapi_apache_mod_php5_c
--- 5.5/patches/patch-sapi_apache_mod_php5_c 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-sapi_apache_mod_php5_c,v 1.1.1.1 2013/08/07 16:46:56 robert Exp $
---- sapi/apache/mod_php5.c.orig.port Wed Jul  3 08:10:53 2013
-+++ sapi/apache/mod_php5.c Sat Jul 27 18:39:50 2013
-@@ -952,12 +952,19 @@ static void php_child_exit_handler(server_rec *s, pool
-  */
- static void php_init_handler(server_rec *s, pool *p)
- {
-+ char *ini;
-+
- register_cleanup(p, NULL, (void (*)(void *))apache_php_module_shutdown_wrapper, (void (*)(void *))php_module_shutdown_for_exec);
- if (!apache_php_initialized) {
- apache_php_initialized = 1;
- #ifdef ZTS
- tsrm_startup(1, 1, 0, NULL);
- #endif
-+
-+        if ((ini = getenv("PHP_INI_PATH"))) {
-+ apache_sapi_module.php_ini_path_override = ini;
-+ }
-+
- sapi_startup(&apache_sapi_module);
- php_apache_startup(&apache_sapi_module);
- }
Index: 5.5/patches/patch-sapi_cgi_cgi_main_c
===================================================================
RCS file: 5.5/patches/patch-sapi_cgi_cgi_main_c
diff -N 5.5/patches/patch-sapi_cgi_cgi_main_c
--- 5.5/patches/patch-sapi_cgi_cgi_main_c 19 Feb 2015 20:14:41 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.2 2015/02/19 20:14:41 sthen Exp $
---- sapi/cgi/cgi_main.c.orig.port Wed Feb 18 15:39:54 2015
-+++ sapi/cgi/cgi_main.c Thu Feb 19 14:23:08 2015
-@@ -1746,6 +1746,7 @@ int main(int argc, char *argv[])
- char *orig_optarg = php_optarg;
- char *script_file = NULL;
- int ini_entries_len = 0;
-+ char *ini;
- /* end of temporary locals */
-
- #ifdef ZTS
-@@ -1800,7 +1801,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 */
Index: 5.5/patches/patch-sapi_cli_php_cli_c
===================================================================
RCS file: 5.5/patches/patch-sapi_cli_php_cli_c
diff -N 5.5/patches/patch-sapi_cli_php_cli_c
--- 5.5/patches/patch-sapi_cli_php_cli_c 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-sapi_cli_php_cli_c,v 1.1.1.1 2013/08/07 16:46:56 robert Exp $
---- sapi/cli/php_cli.c.orig.port Thu Jul 18 16:37:33 2013
-+++ sapi/cli/php_cli.c Sun Jul 28 11:30:14 2013
-@@ -673,6 +673,7 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /*
- int lineno = 0;
- const char *param_error=NULL;
- int hide_argv = 0;
-+ char *ini;
-
- zend_try {
-
Index: 5.5/patches/patch-sapi_fpm_fpm_fpm_atomic_h
===================================================================
RCS file: 5.5/patches/patch-sapi_fpm_fpm_fpm_atomic_h
diff -N 5.5/patches/patch-sapi_fpm_fpm_fpm_atomic_h
--- 5.5/patches/patch-sapi_fpm_fpm_fpm_atomic_h 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,103 +0,0 @@
-$OpenBSD: patch-sapi_fpm_fpm_fpm_atomic_h,v 1.1.1.1 2013/08/07 16:46:56 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
-
Index: 5.5/patches/patch-sapi_fpm_php-fpm_conf_in
===================================================================
RCS file: 5.5/patches/patch-sapi_fpm_php-fpm_conf_in
diff -N 5.5/patches/patch-sapi_fpm_php-fpm_conf_in
--- 5.5/patches/patch-sapi_fpm_php-fpm_conf_in 19 Feb 2015 20:14:41 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-sapi_fpm_php-fpm_conf_in,v 1.4 2015/02/19 20:14:41 sthen Exp $
---- sapi/fpm/php-fpm.conf.in.orig.port Wed Feb 18 15:39:54 2015
-+++ sapi/fpm/php-fpm.conf.in Thu Feb 19 14:23:08 2015
-@@ -161,7 +161,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: 65535 (-1 on FreeBSD and OpenBSD)
-@@ -172,9 +172,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
-  
- ; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
- ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-@@ -466,7 +466,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.
Index: 5.5/patches/patch-scripts_Makefile_frag
===================================================================
RCS file: 5.5/patches/patch-scripts_Makefile_frag
diff -N 5.5/patches/patch-scripts_Makefile_frag
--- 5.5/patches/patch-scripts_Makefile_frag 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-scripts_Makefile_frag,v 1.1.1.1 2013/08/07 16:46:56 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 \
Index: 5.5/patches/patch-scripts_php-config_in
===================================================================
RCS file: 5.5/patches/patch-scripts_php-config_in
diff -N 5.5/patches/patch-scripts_php-config_in
--- 5.5/patches/patch-scripts_php-config_in 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-scripts_php-config_in,v 1.1.1.1 2013/08/07 16:46:56 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
Index: 5.5/patches/patch-scripts_phpize_in
===================================================================
RCS file: 5.5/patches/patch-scripts_phpize_in
diff -N 5.5/patches/patch-scripts_phpize_in
--- 5.5/patches/patch-scripts_phpize_in 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-scripts_phpize_in,v 1.1.1.1 2013/08/07 16:46:56 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@"
-
Index: 5.5/patches/suhosin-ext_suhosin_execute_c
===================================================================
RCS file: 5.5/patches/suhosin-ext_suhosin_execute_c
diff -N 5.5/patches/suhosin-ext_suhosin_execute_c
--- 5.5/patches/suhosin-ext_suhosin_execute_c 22 Jun 2016 21:18:33 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: suhosin-ext_suhosin_execute_c,v 1.1 2016/06/22 21:18:33 sthen Exp $
---- ext/suhosin/execute.c.orig.port Mon Feb  1 23:04:02 2016
-+++ ext/suhosin/execute.c Mon Feb  1 23:38:49 2016
-@@ -1312,6 +1312,9 @@ static php_uint32 suhosin_mt_rand(TSRMLS_D)
-  */
- static void suhosin_gen_entropy(php_uint32 *entropybuf TSRMLS_DC)
- {
-+#if defined(__OpenBSD__)
-+    arc4random_buf(entropybuf, 8 * sizeof(php_uint32));
-+#else
-     php_uint32 seedbuf[20];
-     /* On a modern OS code, stack and heap base are randomized */
-     unsigned long code_value  = (unsigned long)suhosin_gen_entropy;
-@@ -1335,7 +1338,7 @@ static void suhosin_gen_entropy(php_uint32 *entropybuf
- #endif
-     seedbuf[5] = (php_uint32) 0x7fffffff * php_combined_lcg(TSRMLS_C);
-
--#ifndef PHP_WIN32
-+#if !defined(PHP_WIN32)
-     fd = VCWD_OPEN("/dev/urandom", O_RDONLY);
-     if (fd >= 0) {
-         /* ignore error case - if urandom doesn't give us any/enough random bytes */
-@@ -1354,6 +1357,7 @@ static void suhosin_gen_entropy(php_uint32 *entropybuf
-         suhosin_SHA256Update(&context, (unsigned char*)SUHOSIN_G(seedingkey), strlen(SUHOSIN_G(seedingkey)));
-     }
-     suhosin_SHA256Final((void *)entropybuf, &context);
-+#endif /* openbsd */
- }
- /* }}} */
-
Index: 5.5/pkg/PLIST-bz2
===================================================================
RCS file: 5.5/pkg/PLIST-bz2
diff -N 5.5/pkg/PLIST-bz2
--- 5.5/pkg/PLIST-bz2 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-bz2,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-bz2->=5.5,<5.6
-@conflict php5-bz2->=5.2
-lib/php-${PV}/modules/bz2.so
-share/examples/php-${PV}/bz2.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/bz2.ini
Index: 5.5/pkg/PLIST-curl
===================================================================
RCS file: 5.5/pkg/PLIST-curl
diff -N 5.5/pkg/PLIST-curl
--- 5.5/pkg/PLIST-curl 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-curl,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-curl->=5.5,<5.6
-@conflict php5-curl->=5.2
-lib/php-${PV}/modules/curl.so
-share/examples/php-${PV}/curl.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/curl.ini
Index: 5.5/pkg/PLIST-dba
===================================================================
RCS file: 5.5/pkg/PLIST-dba
diff -N 5.5/pkg/PLIST-dba
--- 5.5/pkg/PLIST-dba 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-dba,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-dba->=5.5,<5.6
-@conflict php5-dba->=5.2
-lib/php-${PV}/modules/dba.so
-share/examples/php-${PV}/dba.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/dba.ini
Index: 5.5/pkg/PLIST-fastcgi
===================================================================
RCS file: 5.5/pkg/PLIST-fastcgi
diff -N 5.5/pkg/PLIST-fastcgi
--- 5.5/pkg/PLIST-fastcgi 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PLIST-fastcgi,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-fastcgi->=5.5,<5.6
-@bin bin/php-fastcgi-${PV}
Index: 5.5/pkg/PLIST-gd
===================================================================
RCS file: 5.5/pkg/PLIST-gd
diff -N 5.5/pkg/PLIST-gd
--- 5.5/pkg/PLIST-gd 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-gd,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-gd->=5.5,<5.6
-@conflict php5-gd->=5.2
-lib/php-${PV}/modules/gd.so
-share/examples/php-${PV}/gd.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/gd.ini
Index: 5.5/pkg/PLIST-gmp
===================================================================
RCS file: 5.5/pkg/PLIST-gmp
diff -N 5.5/pkg/PLIST-gmp
--- 5.5/pkg/PLIST-gmp 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-gmp,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-gmp->=5.5,<5.6
-@conflict php5-gmp->=5.2
-lib/php-${PV}/modules/gmp.so
-share/examples/php-${PV}/gmp.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/gmp.ini
Index: 5.5/pkg/PLIST-imap
===================================================================
RCS file: 5.5/pkg/PLIST-imap
diff -N 5.5/pkg/PLIST-imap
--- 5.5/pkg/PLIST-imap 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-@comment $OpenBSD: PLIST-imap,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-imap->=5.5,<5.6
-@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
Index: 5.5/pkg/PLIST-intl
===================================================================
RCS file: 5.5/pkg/PLIST-intl
diff -N 5.5/pkg/PLIST-intl
--- 5.5/pkg/PLIST-intl 29 Jun 2016 16:14:42 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-@comment $OpenBSD: PLIST-intl,v 1.2 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-intl->=5.5,<5.6
-lib/php-${PV}/modules/intl.so
-share/examples/php-${PV}/intl.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/intl.ini
Index: 5.5/pkg/PLIST-ldap
===================================================================
RCS file: 5.5/pkg/PLIST-ldap
diff -N 5.5/pkg/PLIST-ldap
--- 5.5/pkg/PLIST-ldap 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-ldap,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-ldap->=5.5,<5.6
-@conflict php5-ldap->=5.2
-lib/php-${PV}/modules/ldap.so
-share/examples/php-${PV}/ldap.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/ldap.ini
Index: 5.5/pkg/PLIST-main
===================================================================
RCS file: 5.5/pkg/PLIST-main
diff -N 5.5/pkg/PLIST-main
--- 5.5/pkg/PLIST-main 29 Jun 2016 16:14:42 -0000 1.16
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,392 +0,0 @@
-@comment $OpenBSD: PLIST-main,v 1.16 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php->=5.5,<5.6
-@conflict php-pdo_sqlite->=5.5,<5.6
-@conflict php-fpm->=5.5,<5.6
-@conflict php5-core->=5.2
-@conflict php5-core-fastcgi->=5.2
-@conflict php5-pdo_sqlite->=5.2
-@pkgpath lang/php/5.4
-@pkgpath lang/php/5.4,-pdo_sqlite
-@pkgpath lang/php/5.5,-fpm
-@pkgpath lang/php/5.5,-main,ap2
-@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}/libphp5.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
-@man man/man8/php-fpm-${PV}.8
-@bin sbin/php-fpm-${PV}
-share/doc/pkg-readmes/${FULLPKGNAME}
-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/examples/php-${PV}/php-fpm.conf
-@sample ${SYSCONFDIR}/php-fpm.conf
-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_virtual_cwd.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_alloc.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_dynamic_array.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_indent.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_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_ptr_stack.h
-share/php-${PV}/include/Zend/zend_qsort.h
-share/php-${PV}/include/Zend/zend_signal.h
-share/php-${PV}/include/Zend/zend_stack.h
-share/php-${PV}/include/Zend/zend_static_allocator.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_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_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/ereg/
-share/php-${PV}/include/ext/ereg/php_ereg.h
-share/php-${PV}/include/ext/ereg/php_regex.h
-share/php-${PV}/include/ext/ereg/regex/
-share/php-${PV}/include/ext/ereg/regex/cclass.h
-share/php-${PV}/include/ext/ereg/regex/cname.h
-share/php-${PV}/include/ext/ereg/regex/regex.h
-share/php-${PV}/include/ext/ereg/regex/regex2.h
-share/php-${PV}/include/ext/ereg/regex/utils.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/gd_compat.h
-share/php-${PV}/include/ext/gd/gdcache.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/libgd/webpimg.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_types.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/mysql_float_to_double.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/php_mysqlnd.h
-share/php-${PV}/include/ext/mysqlnd/php_mysqlnd_config.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/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/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_smart_str.h
-share/php-${PV}/include/ext/standard/php_smart_str_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/fopen_wrappers.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_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/win32_internal_function_disabled.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}/
-@rcscript ${RCDIR}/php${SV}_fpm
Index: 5.5/pkg/PLIST-mcrypt
===================================================================
RCS file: 5.5/pkg/PLIST-mcrypt
diff -N 5.5/pkg/PLIST-mcrypt
--- 5.5/pkg/PLIST-mcrypt 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-mcrypt,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-mcrypt->=5.5,<5.6
-@conflict php5-mcrypt->=5.2
-lib/php-${PV}/modules/mcrypt.so
-share/examples/php-${PV}/mcrypt.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/mcrypt.ini
Index: 5.5/pkg/PLIST-mssql
===================================================================
RCS file: 5.5/pkg/PLIST-mssql
diff -N 5.5/pkg/PLIST-mssql
--- 5.5/pkg/PLIST-mssql 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-mssql,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-mssql->=5.5,<5.6
-@conflict php5-mssql->=5.2
-lib/php-${PV}/modules/mssql.so
-share/examples/php-${PV}/mssql.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/mssql.ini
Index: 5.5/pkg/PLIST-mysql
===================================================================
RCS file: 5.5/pkg/PLIST-mysql
diff -N 5.5/pkg/PLIST-mysql
--- 5.5/pkg/PLIST-mysql 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-mysql,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-mysql->=5.5,<5.6
-@conflict php5-mysql->=5.2
-lib/php-${PV}/modules/mysql.so
-share/examples/php-${PV}/mysql.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/mysql.ini
Index: 5.5/pkg/PLIST-mysqli
===================================================================
RCS file: 5.5/pkg/PLIST-mysqli
diff -N 5.5/pkg/PLIST-mysqli
--- 5.5/pkg/PLIST-mysqli 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-mysqli,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-mysqli->=5.5,<5.6
-@conflict php5-mysqli->=5.2
-lib/php-${PV}/modules/mysqli.so
-share/examples/php-${PV}/mysqli.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/mysqli.ini
Index: 5.5/pkg/PLIST-odbc
===================================================================
RCS file: 5.5/pkg/PLIST-odbc
diff -N 5.5/pkg/PLIST-odbc
--- 5.5/pkg/PLIST-odbc 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-odbc,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-odbc->=5.5,<5.6
-@conflict php5-odbc->=5.2
-lib/php-${PV}/modules/odbc.so
-share/examples/php-${PV}/odbc.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/odbc.ini
Index: 5.5/pkg/PLIST-pcntl
===================================================================
RCS file: 5.5/pkg/PLIST-pcntl
diff -N 5.5/pkg/PLIST-pcntl
--- 5.5/pkg/PLIST-pcntl 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-@comment $OpenBSD: PLIST-pcntl,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-pcntl->=5.5,<5.6
-@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
Index: 5.5/pkg/PLIST-pdo_dblib
===================================================================
RCS file: 5.5/pkg/PLIST-pdo_dblib
diff -N 5.5/pkg/PLIST-pdo_dblib
--- 5.5/pkg/PLIST-pdo_dblib 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-pdo_dblib,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-pdo_dblib->=5.5,<5.6
-@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
Index: 5.5/pkg/PLIST-pdo_mysql
===================================================================
RCS file: 5.5/pkg/PLIST-pdo_mysql
diff -N 5.5/pkg/PLIST-pdo_mysql
--- 5.5/pkg/PLIST-pdo_mysql 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-pdo_mysql,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-pdo_mysql->=5.5,<5.6
-@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
Index: 5.5/pkg/PLIST-pdo_pgsql
===================================================================
RCS file: 5.5/pkg/PLIST-pdo_pgsql
diff -N 5.5/pkg/PLIST-pdo_pgsql
--- 5.5/pkg/PLIST-pdo_pgsql 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-pdo_pgsql,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-pdo_pgsql->=5.5,<5.6
-@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
Index: 5.5/pkg/PLIST-pgsql
===================================================================
RCS file: 5.5/pkg/PLIST-pgsql
diff -N 5.5/pkg/PLIST-pgsql
--- 5.5/pkg/PLIST-pgsql 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-pgsql,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-pgsql->=5.5,<5.6
-@conflict php5-pgsql->=5.2
-lib/php-${PV}/modules/pgsql.so
-share/examples/php-${PV}/pgsql.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/pgsql.ini
Index: 5.5/pkg/PLIST-pspell
===================================================================
RCS file: 5.5/pkg/PLIST-pspell
diff -N 5.5/pkg/PLIST-pspell
--- 5.5/pkg/PLIST-pspell 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-pspell,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-pspell->=5.5,<5.6
-@conflict php5-pspell->=5.2
-lib/php-${PV}/modules/pspell.so
-share/examples/php-${PV}/pspell.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/pspell.ini
Index: 5.5/pkg/PLIST-shmop
===================================================================
RCS file: 5.5/pkg/PLIST-shmop
diff -N 5.5/pkg/PLIST-shmop
--- 5.5/pkg/PLIST-shmop 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-shmop,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-shmop->=5.5,<5.6
-@conflict php5-shmop->=5.2
-lib/php-${PV}/modules/shmop.so
-share/examples/php-${PV}/shmop.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/shmop.ini
Index: 5.5/pkg/PLIST-snmp
===================================================================
RCS file: 5.5/pkg/PLIST-snmp
diff -N 5.5/pkg/PLIST-snmp
--- 5.5/pkg/PLIST-snmp 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-snmp,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-snmp->=5.5,<5.6
-@conflict php5-snmp->=5.2
-lib/php-${PV}/modules/snmp.so
-share/examples/php-${PV}/snmp.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/snmp.ini
Index: 5.5/pkg/PLIST-soap
===================================================================
RCS file: 5.5/pkg/PLIST-soap
diff -N 5.5/pkg/PLIST-soap
--- 5.5/pkg/PLIST-soap 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-soap,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-soap->=5.5,<5.6
-@conflict php5-soap->=5.2
-lib/php-${PV}/modules/soap.so
-share/examples/php-${PV}/soap.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/soap.ini
Index: 5.5/pkg/PLIST-sybase_ct
===================================================================
RCS file: 5.5/pkg/PLIST-sybase_ct
diff -N 5.5/pkg/PLIST-sybase_ct
--- 5.5/pkg/PLIST-sybase_ct 29 Jun 2016 16:14:42 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-@comment $OpenBSD: PLIST-sybase_ct,v 1.2 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-sybase_ct->=5.5,<5.6
-@conflict php5-sybase_ct->=5.2
-@pkgpath www/php5/extensions,-sybase_ct
-lib/php-${PV}/modules/sybase_ct.so
-share/examples/php-${PV}/sybase_ct.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/sybase_ct.ini
Index: 5.5/pkg/PLIST-tidy
===================================================================
RCS file: 5.5/pkg/PLIST-tidy
diff -N 5.5/pkg/PLIST-tidy
--- 5.5/pkg/PLIST-tidy 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-tidy,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-tidy->=5.5,<5.6
-@conflict php5-tidy->=5.2
-lib/php-${PV}/modules/tidy.so
-share/examples/php-${PV}/tidy.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/tidy.ini
Index: 5.5/pkg/PLIST-xmlrpc
===================================================================
RCS file: 5.5/pkg/PLIST-xmlrpc
diff -N 5.5/pkg/PLIST-xmlrpc
--- 5.5/pkg/PLIST-xmlrpc 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-xmlrpc,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-xmlrpc->=5.5,<5.6
-@conflict php5-xmlrpc->=5.2
-lib/php-${PV}/modules/xmlrpc.so
-share/examples/php-${PV}/xmlrpc.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/xmlrpc.ini
Index: 5.5/pkg/PLIST-xsl
===================================================================
RCS file: 5.5/pkg/PLIST-xsl
diff -N 5.5/pkg/PLIST-xsl
--- 5.5/pkg/PLIST-xsl 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-xsl,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-xsl->=5.5,<5.6
-@conflict php5-xsl->=5.2
-lib/php-${PV}/modules/xsl.so
-share/examples/php-${PV}/xsl.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/xsl.ini
Index: 5.5/pkg/PLIST-zip
===================================================================
RCS file: 5.5/pkg/PLIST-zip
diff -N 5.5/pkg/PLIST-zip
--- 5.5/pkg/PLIST-zip 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-@comment $OpenBSD: PLIST-zip,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-zip->=5.5,<5.6
-@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
Index: 5.5/pkg/php55_fpm.rc
===================================================================
RCS file: 5.5/pkg/php55_fpm.rc
diff -N 5.5/pkg/php55_fpm.rc
--- 5.5/pkg/php55_fpm.rc 18 Sep 2015 09:18:23 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: php55_fpm.rc,v 1.1 2015/09/18 09:18:23 sthen Exp $
-
-daemon="${TRUEPREFIX}/sbin/php-fpm-${PV}"
-
-. /etc/rc.d/rc.subr
-
-pexp="php-fpm-${PV}: master process .*"
-rc_reload=NO
-
-rc_cmd $1
Index: 5.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.46
diff -u -p -a -u -r1.46 Makefile
--- 5.6/Makefile 12 Jun 2017 11:48:34 -0000 1.46
+++ 5.6/Makefile 8 Jul 2017 18:28:19 -0000
@@ -1,11 +1,44 @@
-# $OpenBSD: Makefile,v 1.46 2017/06/12 11:48:34 sthen Exp $
-
-BROKEN-alpha= pcre_jit_compile.c:65:2: error: #error Unsupported architecture
+# $OpenBSD: Makefile,v 1.45 2017/04/10 11:46:22 sthen Exp $
 
 PV= 5.6
-V= ${PV}.30
-REVISION-intl= 0
+V= ${PV}.31
+
+MASTER_SITES0= https://download.suhosin.org/
+
+FLAVORS= no_suhosin
+FLAVOR?=
+
+SUHOSIN_V= 0.9.38
+
+.if ${FLAVOR:Mno_suhosin}
+SUPDISTFILES= suhosin-${SUHOSIN_V}.tar.gz:0
+.else
+DISTFILES+= suhosin-${SUHOSIN_V}.tar.gz:0
+PATCH_LIST= patch-* suhosin-*
+CONFIGURE_ARGS+= --enable-suhosin
+
+pre-patch:
+ @mv ${WRKDIR}/suhosin-${SUHOSIN_V} ${WRKSRC}/ext/suhosin
+.endif
+
+# mysql
+PHP_MODULES_EXTRA= -mysql
+COMMENT-mysql= mysql database access extensions for php
+CONFIGURE_ARGS+= --with-mysql=shared,mysqlnd
+PHP_MODULES_DEPEND-mysql= -mysqlnd
+
+# sybase-ct
+PHP_MODULES_EXTRA+= -sybase_ct
+COMMENT-sybase_ct= sybase database access extensions for php
+CONFIGURE_ARGS+= --with-sybase-ct=shared,${LOCALBASE}
+LIB_DEPENDS-sybase_ct= databases/freetds
+WANTLIB-sybase_ct= ct pthread
 
-WANTLIB-main+= ${LIBCXX} ncurses readline
+# mssql
+PHP_MODULES_EXTRA+= -mssql
+COMMENT-mssql= microsoft sql access extensions for php
+CONFIGURE_ARGS+=        --with-mssql=shared,${LOCALBASE}
+LIB_DEPENDS-mssql= databases/freetds
+WANTLIB-mssql= sybdb>=6 pthread
 
 .include <bsd.port.mk>
Index: 5.6/distinfo
===================================================================
RCS file: /cvs/ports/lang/php/5.6/distinfo,v
retrieving revision 1.26
diff -u -p -a -u -r1.26 distinfo
--- 5.6/distinfo 22 Jan 2017 17:00:33 -0000 1.26
+++ 5.6/distinfo 8 Jul 2017 18:28:19 -0000
@@ -1,4 +1,4 @@
-SHA256 (php-5.6.30.tar.bz2) = oQXCk/odv/EYtbDKdAKebEYfjHj0mzN6Kpi+njLCeQY=
+SHA256 (php-5.6.31.tar.bz2) = jzlxactl8FOfO8sEBg+Xdw1z4ZB0o3vSxYuY6/bssQ8=
 SHA256 (suhosin-0.9.38.tar.gz) = wC12xOfOd3kQo3wYGBy2f9npDv4BB/6rPeMTG1+JvOo=
-SIZE (php-5.6.30.tar.bz2) = 15011816
+SIZE (php-5.6.31.tar.bz2) = 15028813
 SIZE (suhosin-0.9.38.tar.gz) = 122800
Index: 5.6/patches/patch-acinclude_m4
===================================================================
RCS file: 5.6/patches/patch-acinclude_m4
diff -N 5.6/patches/patch-acinclude_m4
--- 5.6/patches/patch-acinclude_m4 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-$OpenBSD: patch-acinclude_m4,v 1.1 2014/11/15 13:43:01 robert Exp $
---- acinclude.m4.orig.port Sun Jul 28 10:54:23 2013
-+++ acinclude.m4 Sun Jul 28 10:55:00 2013
-@@ -984,15 +984,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(PHP_EXT_DIR($1),$2,$ac_extra,)
--        EXT_STATIC="$EXT_STATIC $1"
--        ;;
--      *[)]
-         PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
--        ;;
--    esac
-+        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
-+        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
-     EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
-   fi
-   PHP_ADD_BUILD_DIR($ext_builddir)
-@@ -1042,12 +1036,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
- ])
-
-@@ -2320,9 +2308,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
-
Index: 5.6/patches/patch-configure_in
===================================================================
RCS file: 5.6/patches/patch-configure_in
diff -N 5.6/patches/patch-configure_in
--- 5.6/patches/patch-configure_in 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.1 2014/11/15 13:43:01 robert Exp $
---- configure.in.orig.port Wed Nov 12 14:52:21 2014
-+++ configure.in Sat Nov 15 10:45:17 2014
-@@ -1042,16 +1042,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
-@@ -1242,7 +1242,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
Index: 5.6/patches/patch-ext_gd_gdcache_h
===================================================================
RCS file: 5.6/patches/patch-ext_gd_gdcache_h
diff -N 5.6/patches/patch-ext_gd_gdcache_h
--- 5.6/patches/patch-ext_gd_gdcache_h 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ext_gd_gdcache_h,v 1.1 2014/11/15 13:43:01 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 */
Index: 5.6/patches/patch-ext_gd_libgd_gdkanji_c
===================================================================
RCS file: 5.6/patches/patch-ext_gd_libgd_gdkanji_c
diff -N 5.6/patches/patch-ext_gd_libgd_gdkanji_c
--- 5.6/patches/patch-ext_gd_libgd_gdkanji_c 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/gd/libgd/gdkanji.c.orig.port Wed Sep 26 16:44:16 2007
-+++ ext/gd/libgd/gdkanji.c Sat Jun 18 12:14:49 2011
-@@ -362,7 +362,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)
Index: 5.6/patches/patch-ext_iconv_iconv_c
===================================================================
RCS file: 5.6/patches/patch-ext_iconv_iconv_c
diff -N 5.6/patches/patch-ext_iconv_iconv_c
--- 5.6/patches/patch-ext_iconv_iconv_c 12 Jul 2015 14:06:23 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-$OpenBSD: patch-ext_iconv_iconv_c,v 1.2 2015/07/12 14:06:23 robert Exp $
---- ext/iconv/iconv.c.orig.port Fri Jul 10 02:33:32 2015
-+++ ext/iconv/iconv.c Sun Jul 12 16:05:11 2015
-@@ -463,7 +463,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d
-
- out_p = (d)->c + (d)->len;
-
-- 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:
-@@ -650,7 +650,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const c
- out_p = 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) {
-@@ -775,7 +775,7 @@ static php_iconv_err_t _php_iconv_strlen(unsigned int
-
- 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;
- }
-@@ -896,7 +896,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(unsigned int
-
- 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) {
-@@ -1277,7 +1277,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:
-@@ -1377,7 +1377,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:
-@@ -2650,7 +2650,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:
Index: 5.6/patches/patch-ext_mysqlnd_config9_m4
===================================================================
RCS file: 5.6/patches/patch-ext_mysqlnd_config9_m4
diff -N 5.6/patches/patch-ext_mysqlnd_config9_m4
--- 5.6/patches/patch-ext_mysqlnd_config9_m4 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ext_mysqlnd_config9_m4,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/mysqlnd/config9.m4.orig.port Wed Jul  3 08:10:53 2013
-+++ ext/mysqlnd/config9.m4 Sat Jul 27 18:39:50 2013
-@@ -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_bt.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
Index: 5.6/patches/patch-ext_odbc_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-ext_odbc_config_m4,v
retrieving revision 1.3
diff -u -p -a -u -r1.3 patch-ext_odbc_config_m4
--- 5.6/patches/patch-ext_odbc_config_m4 25 Apr 2015 16:20:29 -0000 1.3
+++ 5.6/patches/patch-ext_odbc_config_m4 8 Jul 2017 18:28:19 -0000
@@ -1,14 +1,21 @@
-$OpenBSD: patch-ext_odbc_config_m4,v 1.3 2015/04/25 16:20:29 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,,
+$OpenBSD$
+--- ext/odbc/config.m4.orig.port Mon Jun 26 23:36:19 2017
++++ ext/odbc/config.m4 Mon Jun 26 23:37:10 2017
+@@ -396,7 +396,7 @@ 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)
++      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
        ODBC_TYPE=iodbc
        ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
        ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
+@@ -409,7 +409,7 @@ PHP_ARG_WITH(iodbc,,
+       if test "$PHP_IODBC" = "yes"; then
+         PHP_IODBC=/usr/local
+       fi
+-      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
+       PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
+       ODBC_TYPE=iodbc
+       ODBC_INCLUDE=-I$PHP_IODBC/include
Index: 5.6/patches/patch-ext_openssl_config0_m4
===================================================================
RCS file: 5.6/patches/patch-ext_openssl_config0_m4
diff -N 5.6/patches/patch-ext_openssl_config0_m4
--- 5.6/patches/patch-ext_openssl_config0_m4 25 Apr 2015 16:20:29 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- ext/openssl/config0.m4.orig.port Wed Apr 15 20:05:57 2015
-+++ ext/openssl/config0.m4 Sat Apr 25 18:10:11 2015
-@@ -19,7 +19,7 @@ if test "$PHP_OPENSSL" != "no"; then
-     PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
-   fi
-
--  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]))
-   AC_CHECK_FUNCS([RAND_egd])
-
Index: 5.6/patches/patch-ext_session_session_c
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-ext_session_session_c,v
retrieving revision 1.1
diff -u -p -a -u -r1.1 patch-ext_session_session_c
--- 5.6/patches/patch-ext_session_session_c 6 Feb 2016 23:30:25 -0000 1.1
+++ 5.6/patches/patch-ext_session_session_c 8 Jul 2017 18:28:19 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-ext_session_session_c,v
 
 Perhaps the whole function can be replaced, but we have to start somewhere.
 
---- ext/session/session.c.orig.port Mon Feb  1 23:04:02 2016
-+++ ext/session/session.c Mon Feb  1 23:48:25 2016
-@@ -346,7 +346,11 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS)
+--- ext/session/session.c.orig.port Thu Jan 19 01:17:47 2017
++++ ext/session/session.c Wed May 24 12:18:08 2017
+@@ -346,7 +346,26 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS)
  efree(buf);
 
  if (PS(entropy_length) > 0) {
@@ -13,6 +13,21 @@ Perhaps the whole function can be replac
 + unsigned char rbuf[2048];
 + size_t toread = PS(entropy_length);
 + arc4random_buf(rbuf, MIN(toread, sizeof(rbuf)));
++
++ switch (PS(hash_func)) {
++ case PS_HASH_FUNC_MD5:
++ PHP_MD5Update(&md5_context, rbuf, toread);
++ break;
++ case PS_HASH_FUNC_SHA1:
++ PHP_SHA1Update(&sha1_context, rbuf, toread);
++ break;
++# if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
++ case PS_HASH_FUNC_OTHER:
++ PS(hash_ops)->hash_update(hash_context, rbuf, toread);
++ break;
++# endif /* HAVE_HASH_EXT */
++ }
++
 +#elif defined(PHP_WIN32)
  unsigned char rbuf[2048];
  size_t toread = PS(entropy_length);
Index: 5.6/patches/patch-ext_sockets_sockaddr_conv_c
===================================================================
RCS file: 5.6/patches/patch-ext_sockets_sockaddr_conv_c
diff -N 5.6/patches/patch-ext_sockets_sockaddr_conv_c
--- 5.6/patches/patch-ext_sockets_sockaddr_conv_c 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-ext_sockets_sockaddr_conv_c,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/sockets/sockaddr_conv.c.orig.port Wed Mar  5 10:18:00 2014
-+++ ext/sockets/sockaddr_conv.c Mon Mar 24 22:53:00 2014
-@@ -11,6 +11,10 @@
-
- extern int php_string_to_if_index(const char *val, unsigned *out TSRMLS_DC);
-
-+#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 TSRMLS_DC) /* {{{ */
Index: 5.6/patches/patch-ext_spl_php_spl_c
===================================================================
RCS file: 5.6/patches/patch-ext_spl_php_spl_c
diff -N 5.6/patches/patch-ext_spl_php_spl_c
--- 5.6/patches/patch-ext_spl_php_spl_c 6 May 2016 19:59:32 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-ext_spl_php_spl_c,v 1.2 2016/05/06 19:59:32 sthen Exp $
---- ext/spl/php_spl.c.orig.port Thu Apr 28 01:33:49 2016
-+++ ext/spl/php_spl.c Fri Apr 29 14:02:27 2016
-@@ -788,7 +788,7 @@ PHP_FUNCTION(spl_object_hash)
-
- PHPAPI void php_spl_object_hash(zval *obj, char *result TSRMLS_DC) /* {{{*/
- {
-- intptr_t hash_handle, hash_handlers;
-+ zend_intptr_t hash_handle, hash_handlers;
- char *hex;
-
- if (!SPL_G(hash_mask_init)) {
-@@ -796,13 +796,13 @@ PHPAPI void php_spl_object_hash(zval *obj, char *resul
- php_mt_srand(GENERATE_SEED() TSRMLS_CC);
- }
-
-- SPL_G(hash_mask_handle)   = (intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
-- SPL_G(hash_mask_handlers) = (intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
-+ SPL_G(hash_mask_handle)   = (zend_intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
-+ SPL_G(hash_mask_handlers) = (zend_intptr_t)(php_mt_rand(TSRMLS_C) >> 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);
-
- spprintf(&hex, 32, "%016lx%016lx", hash_handle, hash_handlers);
-
Index: 5.6/patches/patch-ext_spl_php_spl_h
===================================================================
RCS file: 5.6/patches/patch-ext_spl_php_spl_h
diff -N 5.6/patches/patch-ext_spl_php_spl_h
--- 5.6/patches/patch-ext_spl_php_spl_h 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-ext_spl_php_spl_h,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/spl/php_spl.h.orig.port Wed Nov 12 14:52:21 2014
-+++ ext/spl/php_spl.h Sat Nov 15 10:45:12 2014
-@@ -62,8 +62,8 @@ ZEND_BEGIN_MODULE_GLOBALS(spl)
- HashTable *  autoload_functions;
- int          autoload_running;
- int          autoload_extensions_len;
-- 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;
- ZEND_END_MODULE_GLOBALS(spl)
-
Index: 5.6/patches/patch-ext_standard_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-ext_standard_config_m4,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 patch-ext_standard_config_m4
--- 5.6/patches/patch-ext_standard_config_m4 6 May 2016 19:59:32 -0000 1.2
+++ 5.6/patches/patch-ext_standard_config_m4 8 Jul 2017 18:28:19 -0000
@@ -1,25 +1,36 @@
-$OpenBSD: patch-ext_standard_config_m4,v 1.2 2016/05/06 19:59:32 sthen Exp $
---- ext/standard/config.m4.orig.port Thu Apr 28 01:33:49 2016
-+++ ext/standard/config.m4 Fri Apr 29 14:02:27 2016
-@@ -398,16 +398,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
+$OpenBSD$
+--- ext/standard/config.m4.orig.port Wed May 24 17:33:35 2017
++++ ext/standard/config.m4 Wed May 24 17:33:51 2017
+@@ -368,31 +368,7 @@ else
+   AC_MSG_RESULT(no)
+ fi
 
--PHP_CHECK_FUNC(res_search, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_search, resolv, socket)
+-PHP_ENABLE_CHROOT_FUNC=no
+-case "$PHP_SAPI" in
+-  embed)
+-    PHP_ENABLE_CHROOT_FUNC=yes
+-  ;;
+-
+-  none)
+-    for PROG in $PHP_BINARIES; do
+-      case "$PROG" in
+-        cgi|cli)
+-          PHP_ENABLE_CHROOT_FUNC=yes
+-        ;;
+-
+-        *)
+-          PHP_ENABLE_CHROOT_FUNC=no
+-          break
+-        ;;
+-      esac
+-   done
+-  ;;
+-esac
+-
+-if test "$PHP_ENABLE_CHROOT_FUNC" = "yes"; then
+-  AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
+-fi
++AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
 
  dnl
- dnl Check if atof() accepts NAN
+ dnl Detect library functions needed by php dns_xxx functions
Index: 5.6/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
===================================================================
RCS file: 5.6/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
diff -N 5.6/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
--- 5.6/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_xmlrpc_libxmlrpc_encodings_c,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/xmlrpc/libxmlrpc/encodings.c.orig.port Wed Sep 26 16:44:16 2007
-+++ ext/xmlrpc/libxmlrpc/encodings.c Sat Jun 18 12:14:51 2011
-@@ -78,7 +78,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;
Index: 5.6/patches/patch-main_php_h
===================================================================
RCS file: 5.6/patches/patch-main_php_h
diff -N 5.6/patches/patch-main_php_h
--- 5.6/patches/patch-main_php_h 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-main_php_h,v 1.1 2014/11/15 13:43:01 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
-
Index: 5.6/patches/patch-main_php_ini_c
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-main_php_ini_c,v
retrieving revision 1.4
diff -u -p -a -u -r1.4 patch-main_php_ini_c
--- 5.6/patches/patch-main_php_ini_c 22 Jan 2017 17:00:33 -0000 1.4
+++ 5.6/patches/patch-main_php_ini_c 8 Jul 2017 18:28:19 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-main_php_ini_c,v 1.4 2017/01/22 17:00:33 martijn Exp $
 --- main/php_ini.c.orig.port Thu Jan 19 01:17:47 2017
-+++ main/php_ini.c Fri Jan 20 07:35:15 2017
++++ main/php_ini.c Wed May 24 11:02:41 2017
 @@ -576,7 +576,7 @@ int php_init_config(TSRMLS_D)
 
  /* If still no ini file found, search for php.ini file in search path */
Index: 5.6/patches/patch-main_php_open_temporary_file_c
===================================================================
RCS file: 5.6/patches/patch-main_php_open_temporary_file_c
diff -N 5.6/patches/patch-main_php_open_temporary_file_c
--- 5.6/patches/patch-main_php_open_temporary_file_c 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-main_php_open_temporary_file_c,v 1.1 2014/11/15 13:43:01 robert Exp $
---- main/php_open_temporary_file.c.orig.port Wed Nov 12 14:52:21 2014
-+++ main/php_open_temporary_file.c Sat Nov 15 10:45:12 2014
-@@ -138,7 +138,7 @@ static int php_do_open_temporary_file(const char *path
- trailing_slash = "/";
- }
-
-- if (spprintf(&opened_path, 0, "%s%s%sXXXXXX", new_state.cwd, trailing_slash, pfx) >= MAXPATHLEN) {
-+ if (spprintf(&opened_path, 0, "%s%s%sXXXXXXXXXX", new_state.cwd, trailing_slash, pfx) >= MAXPATHLEN) {
- efree(opened_path);
- efree(new_state.cwd);
- return -1;
Index: 5.6/patches/patch-sapi_cgi_cgi_main_c
===================================================================
RCS file: 5.6/patches/patch-sapi_cgi_cgi_main_c
diff -N 5.6/patches/patch-sapi_cgi_cgi_main_c
--- 5.6/patches/patch-sapi_cgi_cgi_main_c 19 Dec 2016 20:35:09 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.6 2016/12/19 20:35:09 martijn Exp $
---- sapi/cgi/cgi_main.c.orig.port Wed Nov  9 02:22:57 2016
-+++ sapi/cgi/cgi_main.c Thu Dec  8 10:55:27 2016
-@@ -1749,6 +1749,7 @@ int main(int argc, char *argv[])
- char *orig_optarg = php_optarg;
- char *script_file = NULL;
- int ini_entries_len = 0;
-+ char *ini;
- /* end of temporary locals */
-
- #ifdef ZTS
-@@ -1809,7 +1810,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 */
Index: 5.6/patches/patch-sapi_cli_php_cli_c
===================================================================
RCS file: 5.6/patches/patch-sapi_cli_php_cli_c
diff -N 5.6/patches/patch-sapi_cli_php_cli_c
--- 5.6/patches/patch-sapi_cli_php_cli_c 19 Dec 2016 20:35:09 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-sapi_cli_php_cli_c,v 1.2 2016/12/19 20:35:09 martijn Exp $
---- sapi/cli/php_cli.c.orig.port Wed Nov  9 02:22:57 2016
-+++ sapi/cli/php_cli.c Thu Dec  8 10:55:27 2016
-@@ -677,6 +677,7 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /*
- int lineno = 0;
- const char *param_error=NULL;
- int hide_argv = 0;
-+ char *ini;
-
- zend_try {
-
Index: 5.6/patches/patch-sapi_fpm_php-fpm_conf_in
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-sapi_fpm_php-fpm_conf_in,v
retrieving revision 1.3
diff -u -p -a -u -r1.3 patch-sapi_fpm_php-fpm_conf_in
--- 5.6/patches/patch-sapi_fpm_php-fpm_conf_in 3 Apr 2015 17:53:44 -0000 1.3
+++ 5.6/patches/patch-sapi_fpm_php-fpm_conf_in 8 Jul 2017 18:28:19 -0000
@@ -10,19 +10,6 @@ $OpenBSD: patch-sapi_fpm_php-fpm_conf_in
 
  ; Set listen(2) backlog.
  ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
-@@ -172,9 +172,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
 @@ -471,7 +471,7 @@ pm.max_spare_servers = 3
  ;       possible. However, all PHP paths will be relative to the chroot
  ;       (error_log, sessions.save_path, ...).
Index: 5.6/patches/patch-scripts_php-config_in
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-scripts_php-config_in,v
retrieving revision 1.1
diff -u -p -a -u -r1.1 patch-scripts_php-config_in
--- 5.6/patches/patch-scripts_php-config_in 15 Nov 2014 13:43:01 -0000 1.1
+++ 5.6/patches/patch-scripts_php-config_in 8 Jul 2017 18:28:19 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-scripts_php-config_in,v 1.1 2014/11/15 13:43:01 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 @@
+--- scripts/php-config.in.orig.port Thu Jan 19 01:17:47 2017
++++ scripts/php-config.in Sun Jun  4 20:05:26 2017
+@@ -1,13 +1,13 @@
  #! /bin/sh
 
  SED="@SED@"
@@ -12,11 +12,13 @@ $OpenBSD: patch-scripts_php-config_in,v
  version="@PHP_VERSION@"
  vernum="@PHP_VERSION_ID@"
 -include_dir="@includedir@/php"
+-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"
 +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"
++includes="-I/usr/local/include -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@"
+ extension_dir='@EXTENSION_DIR@'
+@@ -24,10 +24,10 @@ php_sapis="@PHP_INSTALLED_SAPIS@"
  for sapi in $php_sapis; do
    case $sapi in
    cli)
@@ -24,7 +26,7 @@ $OpenBSD: patch-scripts_php-config_in,v
 +    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="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}"
 +    php_cgi_binary="/usr/local/bin/php-cgi${program_suffix}"
      ;;
    esac
Index: 5.6/patches/patch-scripts_phpize_m4
===================================================================
RCS file: 5.6/patches/patch-scripts_phpize_m4
diff -N 5.6/patches/patch-scripts_phpize_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/patches/patch-scripts_phpize_m4 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- scripts/phpize.m4.orig.port Fri Jun  2 21:36:25 2017
++++ scripts/phpize.m4 Fri Jun  2 21:36:41 2017
+@@ -36,7 +36,7 @@ PHP_SHLIB_SUFFIX_NAMES
+
+ dnl Find php-config script
+ PHP_ARG_WITH(php-config,,
+-[  --with-php-config=PATH  Path to php-config [php-config]], php-config, no)
++[  --with-php-config=PATH  Path to php-config [php-config]], php-config-${PV}, no)
+
+ dnl For BC
+ PHP_CONFIG=$PHP_PHP_CONFIG
Index: 5.6/patches/suhosin-ext_suhosin_execute_c
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/suhosin-ext_suhosin_execute_c,v
retrieving revision 1.1
diff -u -p -a -u -r1.1 suhosin-ext_suhosin_execute_c
--- 5.6/patches/suhosin-ext_suhosin_execute_c 22 Jun 2016 21:18:33 -0000 1.1
+++ 5.6/patches/suhosin-ext_suhosin_execute_c 8 Jul 2017 18:28:19 -0000
@@ -11,15 +11,6 @@ $OpenBSD: suhosin-ext_suhosin_execute_c,
      php_uint32 seedbuf[20];
      /* On a modern OS code, stack and heap base are randomized */
      unsigned long code_value  = (unsigned long)suhosin_gen_entropy;
-@@ -1335,7 +1338,7 @@ static void suhosin_gen_entropy(php_uint32 *entropybuf
- #endif
-     seedbuf[5] = (php_uint32) 0x7fffffff * php_combined_lcg(TSRMLS_C);
-
--#ifndef PHP_WIN32
-+#if !defined(PHP_WIN32)
-     fd = VCWD_OPEN("/dev/urandom", O_RDONLY);
-     if (fd >= 0) {
-         /* ignore error case - if urandom doesn't give us any/enough random bytes */
 @@ -1354,6 +1357,7 @@ static void suhosin_gen_entropy(php_uint32 *entropybuf
          suhosin_SHA256Update(&context, (unsigned char*)SUHOSIN_G(seedingkey), strlen(SUHOSIN_G(seedingkey)));
      }
Index: 5.6/pkg/PLIST-apxs2
===================================================================
RCS file: 5.6/pkg/PLIST-apxs2
diff -N 5.6/pkg/PLIST-apxs2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-apxs2 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-apxs2->=5.6,<5.7
+lib/php-${PV}/libphp5.so
+share/examples/php-${PV}/php.conf
+@sample /var/www/conf/modules.sample/php-${PV}.conf
Index: 5.6/pkg/PLIST-bcmath
===================================================================
RCS file: 5.6/pkg/PLIST-bcmath
diff -N 5.6/pkg/PLIST-bcmath
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-bcmath 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-bcmath->=5.6,<5.7
+lib/php-${PV}/modules/bcmath.so
+share/examples/php-${PV}/bcmath.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/bcmath.ini
Index: 5.6/pkg/PLIST-bz2
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-bz2,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-bz2
--- 5.6/pkg/PLIST-bz2 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-bz2 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-bz2->=5.6,<5.7
-@conflict php5-bz2->=5.2
 lib/php-${PV}/modules/bz2.so
 share/examples/php-${PV}/bz2.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/bz2.ini
Index: 5.6/pkg/PLIST-calendar
===================================================================
RCS file: 5.6/pkg/PLIST-calendar
diff -N 5.6/pkg/PLIST-calendar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-calendar 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-calendar->=5.6,<5.7
+lib/php-${PV}/modules/calendar.so
+share/examples/php-${PV}/calendar.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/calendar.ini
Index: 5.6/pkg/PLIST-cgi
===================================================================
RCS file: 5.6/pkg/PLIST-cgi
diff -N 5.6/pkg/PLIST-cgi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-cgi 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-cgi->=5.6,<5.7
+@bin bin/php-cgi-${PV}
+@man man/man1/php-cgi-${PV}.1
Index: 5.6/pkg/PLIST-cli
===================================================================
RCS file: 5.6/pkg/PLIST-cli
diff -N 5.6/pkg/PLIST-cli
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-cli 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-cli->=5.6,<5.7
+@bin bin/php-${PV}
+@man man/man1/php-${PV}.1
+share/php-${PV}/include/sapi/
+share/php-${PV}/include/sapi/cli/
+share/php-${PV}/include/sapi/cli/cli.h
Index: 5.6/pkg/PLIST-ctype
===================================================================
RCS file: 5.6/pkg/PLIST-ctype
diff -N 5.6/pkg/PLIST-ctype
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-ctype 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-ctype->=5.6,<5.7
+lib/php-${PV}/modules/ctype.so
+share/examples/php-${PV}/ctype.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ctype.ini
Index: 5.6/pkg/PLIST-curl
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-curl,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-curl
--- 5.6/pkg/PLIST-curl 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-curl 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-curl->=5.6,<5.7
-@conflict php5-curl->=5.2
 lib/php-${PV}/modules/curl.so
 share/examples/php-${PV}/curl.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/curl.ini
Index: 5.6/pkg/PLIST-dba
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-dba,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-dba
--- 5.6/pkg/PLIST-dba 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-dba 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-dba->=5.6,<5.7
-@conflict php5-dba->=5.2
 lib/php-${PV}/modules/dba.so
 share/examples/php-${PV}/dba.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/dba.ini
Index: 5.6/pkg/PLIST-dbg
===================================================================
RCS file: 5.6/pkg/PLIST-dbg
diff -N 5.6/pkg/PLIST-dbg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-dbg 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-dbg->=5.6,<5.7
+@bin bin/phpdbg-${PV}
+@man man/man1/phpdbg-${PV}.1
Index: 5.6/pkg/PLIST-dom
===================================================================
RCS file: 5.6/pkg/PLIST-dom
diff -N 5.6/pkg/PLIST-dom
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-dom 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-dom->=5.6,<5.7
+lib/php-${PV}/modules/dom.so
+share/examples/php-${PV}/dom.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/dom.ini
+share/php-${PV}/include/ext/dom/
+share/php-${PV}/include/ext/dom/xml_common.h
Index: 5.6/pkg/PLIST-enchant
===================================================================
RCS file: 5.6/pkg/PLIST-enchant
diff -N 5.6/pkg/PLIST-enchant
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-enchant 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-enchant->=5.6,<5.7
+lib/php-${PV}/modules/enchant.so
+share/examples/php-${PV}/enchant.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/enchant.ini
Index: 5.6/pkg/PLIST-exif
===================================================================
RCS file: 5.6/pkg/PLIST-exif
diff -N 5.6/pkg/PLIST-exif
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-exif 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-exif->=5.6,<5.7
+lib/php-${PV}/modules/exif.so
+share/examples/php-${PV}/exif.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/exif.ini
Index: 5.6/pkg/PLIST-fastcgi
===================================================================
RCS file: 5.6/pkg/PLIST-fastcgi
diff -N 5.6/pkg/PLIST-fastcgi
--- 5.6/pkg/PLIST-fastcgi 29 Jun 2016 16:14:42 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PLIST-fastcgi,v 1.2 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-fastcgi->=5.6,<5.7
-@bin bin/php-fastcgi-${PV}
Index: 5.6/pkg/PLIST-fileinfo
===================================================================
RCS file: 5.6/pkg/PLIST-fileinfo
diff -N 5.6/pkg/PLIST-fileinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-fileinfo 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-fileinfo->=5.6,<5.7
+lib/php-${PV}/modules/fileinfo.so
+share/examples/php-${PV}/fileinfo.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/fileinfo.ini
Index: 5.6/pkg/PLIST-fpm
===================================================================
RCS file: 5.6/pkg/PLIST-fpm
diff -N 5.6/pkg/PLIST-fpm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-fpm 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-fpm->=5.6,<5.7
+@bin sbin/php-fpm-${PV}
+@man man/man8/php-fpm-${PV}.8
+share/examples/php-${PV}/php-fpm.conf
+@sample ${SYSCONFDIR}/php-fpm.conf
+@rcscript ${RCDIR}/php${SV}_fpm
Index: 5.6/pkg/PLIST-ftp
===================================================================
RCS file: 5.6/pkg/PLIST-ftp
diff -N 5.6/pkg/PLIST-ftp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-ftp 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-ftp->=5.6,<5.7
+lib/php-${PV}/modules/ftp.so
+share/examples/php-${PV}/ftp.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ftp.ini
Index: 5.6/pkg/PLIST-gd
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-gd,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-gd
--- 5.6/pkg/PLIST-gd 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-gd 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,24 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-gd->=5.6,<5.7
-@conflict php5-gd->=5.2
 lib/php-${PV}/modules/gd.so
 share/examples/php-${PV}/gd.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/gd.ini
+share/php-${PV}/include/ext/gd/
+share/php-${PV}/include/ext/gd/gd_compat.h
+share/php-${PV}/include/ext/gd/gdcache.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/libgd/webpimg.h
+share/php-${PV}/include/ext/gd/php_gd.h
Index: 5.6/pkg/PLIST-gettext
===================================================================
RCS file: 5.6/pkg/PLIST-gettext
diff -N 5.6/pkg/PLIST-gettext
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-gettext 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-gettext->=5.6,<5.7
+lib/php-${PV}/modules/gettext.so
+share/examples/php-${PV}/gettext.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/gettext.ini
Index: 5.6/pkg/PLIST-gmp
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-gmp,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-gmp
--- 5.6/pkg/PLIST-gmp 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-gmp 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-gmp->=5.6,<5.7
-@conflict php5-gmp->=5.2
 lib/php-${PV}/modules/gmp.so
 share/examples/php-${PV}/gmp.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/gmp.ini
Index: 5.6/pkg/PLIST-iconv
===================================================================
RCS file: 5.6/pkg/PLIST-iconv
diff -N 5.6/pkg/PLIST-iconv
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-iconv 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,19 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-iconv->=5.6,<5.7
+lib/php-${PV}/modules/iconv.so
+share/examples/php-${PV}/iconv.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/iconv.ini
+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
Index: 5.6/pkg/PLIST-imap
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-imap,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-imap
--- 5.6/pkg/PLIST-imap 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-imap 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-imap->=5.6,<5.7
-@conflict php5-imap->=5.2
 lib/php-${PV}/modules/imap.so
 share/examples/php-${PV}/imap.ini
 @comment etc/master.passwd
Index: 5.6/pkg/PLIST-json
===================================================================
RCS file: 5.6/pkg/PLIST-json
diff -N 5.6/pkg/PLIST-json
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-json 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-json->=5.6,<5.7
+lib/php-${PV}/modules/json.so
+share/examples/php-${PV}/json.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/json.ini
+share/php-${PV}/include/ext/json/
+share/php-${PV}/include/ext/json/php_json.h
Index: 5.6/pkg/PLIST-ldap
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-ldap,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-ldap
--- 5.6/pkg/PLIST-ldap 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-ldap 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-ldap->=5.6,<5.7
-@conflict php5-ldap->=5.2
 lib/php-${PV}/modules/ldap.so
 share/examples/php-${PV}/ldap.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/ldap.ini
Index: 5.6/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -a -u -r1.10 PLIST-main
--- 5.6/pkg/PLIST-main 29 Jun 2016 16:14:42 -0000 1.10
+++ 5.6/pkg/PLIST-main 8 Jul 2017 18:28:19 -0000
@@ -2,14 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php->=5.6,<5.7
-@conflict php-fpm->=5.6,<5.7
-@conflict php5-core->=5.2
-@conflict php5-core-fastcgi->=5.2
-@conflict php5-pdo_sqlite->=5.2
-@pkgpath lang/php/5.4
-@pkgpath lang/php/5.4,-pdo_sqlite
-@pkgpath lang/php/5.6,-fpm
-@pkgpath lang/php/5.6,-main,ap2
 @extraunexec rm -f ${SYSCONFDIR}/php-${PV}/php-${PV}.sample/*
 @mode 1700
 @owner www
@@ -18,31 +10,19 @@
 @mode
 @owner
 @group
-@bin bin/php-${PV}
 bin/php-config-${PV}
 bin/phpize-${PV}
 lib/php-${PV}/
-lib/php-${PV}/libphp5.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
-@man man/man8/php-fpm-${PV}.8
-@bin sbin/php-fpm-${PV}
 share/doc/pkg-readmes/${FULLPKGNAME}
 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/examples/php-${PV}/php-fpm.conf
-@sample ${SYSCONFDIR}/php-fpm.conf
 share/php-${PV}/
 share/php-${PV}/build/
 share/php-${PV}/build/Makefile.global
@@ -135,8 +115,6 @@ share/php-${PV}/include/ext/date/lib/tim
 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/ereg/
 share/php-${PV}/include/ext/ereg/php_ereg.h
 share/php-${PV}/include/ext/ereg/php_regex.h
@@ -148,24 +126,6 @@ share/php-${PV}/include/ext/ereg/regex/r
 share/php-${PV}/include/ext/ereg/regex/utils.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/gd_compat.h
-share/php-${PV}/include/ext/gd/gdcache.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/libgd/webpimg.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
@@ -180,93 +140,14 @@ share/php-${PV}/include/ext/hash/php_has
 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/mysql_float_to_double.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/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
@@ -279,9 +160,6 @@ share/php-${PV}/include/ext/spl/spl_func
 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
@@ -346,9 +224,6 @@ share/php-${PV}/include/ext/standard/uni
 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
@@ -388,8 +263,4 @@ share/php-${PV}/include/main/streams/php
 share/php-${PV}/include/main/streams/php_streams_int.h
 share/php-${PV}/include/main/win32_internal_function_disabled.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}/
-@rcscript ${RCDIR}/php${SV}_fpm
Index: 5.6/pkg/PLIST-mbstring
===================================================================
RCS file: 5.6/pkg/PLIST-mbstring
diff -N 5.6/pkg/PLIST-mbstring
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-mbstring 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,29 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-mbstring->=5.6,<5.7
+lib/php-${PV}/modules/mbstring.so
+share/examples/php-${PV}/mbstring.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mbstring.ini
+share/php-${PV}/include/ext/mbstring/
+share/php-${PV}/include/ext/mbstring/php_mbregex.h
+share/php-${PV}/include/ext/mbstring/php_onig_compat.h
+share/php-${PV}/include/ext/mbstring/mbstring.h
+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
Index: 5.6/pkg/PLIST-mcrypt
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-mcrypt,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-mcrypt
--- 5.6/pkg/PLIST-mcrypt 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-mcrypt 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-mcrypt->=5.6,<5.7
-@conflict php5-mcrypt->=5.2
 lib/php-${PV}/modules/mcrypt.so
 share/examples/php-${PV}/mcrypt.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/mcrypt.ini
Index: 5.6/pkg/PLIST-mssql
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-mssql,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-mssql
--- 5.6/pkg/PLIST-mssql 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-mssql 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-mssql->=5.6,<5.7
-@conflict php5-mssql->=5.2
 lib/php-${PV}/modules/mssql.so
 share/examples/php-${PV}/mssql.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/mssql.ini
Index: 5.6/pkg/PLIST-mysql
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-mysql,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-mysql
--- 5.6/pkg/PLIST-mysql 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-mysql 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-mysql->=5.6,<5.7
-@conflict php5-mysql->=5.2
 lib/php-${PV}/modules/mysql.so
 share/examples/php-${PV}/mysql.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/mysql.ini
Index: 5.6/pkg/PLIST-mysqli
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-mysqli,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-mysqli
--- 5.6/pkg/PLIST-mysqli 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-mysqli 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,9 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-mysqli->=5.6,<5.7
-@conflict php5-mysqli->=5.2
 lib/php-${PV}/modules/mysqli.so
 share/examples/php-${PV}/mysqli.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/mysqli.ini
+share/php-${PV}/include/ext/mysqli/
+share/php-${PV}/include/ext/mysqli/mysqli_mysqlnd.h
+share/php-${PV}/include/ext/mysqli/php_mysqli_structs.h
Index: 5.6/pkg/PLIST-mysqlnd
===================================================================
RCS file: 5.6/pkg/PLIST-mysqlnd
diff -N 5.6/pkg/PLIST-mysqlnd
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-mysqlnd 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,28 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-mysqlnd->=5.6,<5.7
+lib/php-${PV}/modules/mysqlnd.so
+share/examples/php-${PV}/mysqlnd.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mysqlnd.ini
+share/php-${PV}/include/ext/mysqlnd/
+share/php-${PV}/include/ext/mysqlnd/config-win.h
+share/php-${PV}/include/ext/mysqlnd/mysql_float_to_double.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/php_mysqlnd.h
Index: 5.6/pkg/PLIST-odbc
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-odbc,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-odbc
--- 5.6/pkg/PLIST-odbc 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-odbc 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-odbc->=5.6,<5.7
-@conflict php5-odbc->=5.2
 lib/php-${PV}/modules/odbc.so
 share/examples/php-${PV}/odbc.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/odbc.ini
Index: 5.6/pkg/PLIST-opcache
===================================================================
RCS file: 5.6/pkg/PLIST-opcache
diff -N 5.6/pkg/PLIST-opcache
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-opcache 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-opcache->=5.6,<5.7
+lib/php-${PV}/modules/opcache.so
+share/examples/php-${PV}/opcache.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini
Index: 5.6/pkg/PLIST-pcntl
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-pcntl,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-pcntl
--- 5.6/pkg/PLIST-pcntl 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-pcntl 8 Jul 2017 18:28:19 -0000
@@ -2,9 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-pcntl->=5.6,<5.7
-@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
Index: 5.6/pkg/PLIST-pdo
===================================================================
RCS file: 5.6/pkg/PLIST-pdo
diff -N 5.6/pkg/PLIST-pdo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-pdo 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,11 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo->=5.6,<5.7
+lib/php-${PV}/modules/pdo.so
+share/examples/php-${PV}/pdo.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo.ini
+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
Index: 5.6/pkg/PLIST-pdo_dblib
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-pdo_dblib,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-pdo_dblib
--- 5.6/pkg/PLIST-pdo_dblib 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-pdo_dblib 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-pdo_dblib->=5.6,<5.7
-@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
Index: 5.6/pkg/PLIST-pdo_mysql
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-pdo_mysql,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-pdo_mysql
--- 5.6/pkg/PLIST-pdo_mysql 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-pdo_mysql 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-pdo_mysql->=5.6,<5.7
-@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
Index: 5.6/pkg/PLIST-pdo_pgsql
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-pdo_pgsql,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-pdo_pgsql
--- 5.6/pkg/PLIST-pdo_pgsql 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-pdo_pgsql 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-pdo_pgsql->=5.6,<5.7
-@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
Index: 5.6/pkg/PLIST-pdo_sqlite
===================================================================
RCS file: 5.6/pkg/PLIST-pdo_sqlite
diff -N 5.6/pkg/PLIST-pdo_sqlite
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-pdo_sqlite 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_sqlite->=5.6,<5.7
+lib/php-${PV}/modules/pdo_sqlite.so
+share/examples/php-${PV}/pdo_sqlite.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_sqlite.ini
Index: 5.6/pkg/PLIST-pgsql
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-pgsql,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-pgsql
--- 5.6/pkg/PLIST-pgsql 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-pgsql 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-pgsql->=5.6,<5.7
-@conflict php5-pgsql->=5.2
 lib/php-${PV}/modules/pgsql.so
 share/examples/php-${PV}/pgsql.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/pgsql.ini
Index: 5.6/pkg/PLIST-phar
===================================================================
RCS file: 5.6/pkg/PLIST-phar
diff -N 5.6/pkg/PLIST-phar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-phar 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,11 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-phar->=5.6,<5.7
+bin/phar-${PV}
+@man man/man1/phar-${PV}.1
+lib/php-${PV}/modules/phar.so
+share/examples/php-${PV}/phar.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/phar.ini
+share/php-${PV}/include/ext/phar/
+share/php-${PV}/include/ext/phar/php_phar.h
Index: 5.6/pkg/PLIST-posix
===================================================================
RCS file: 5.6/pkg/PLIST-posix
diff -N 5.6/pkg/PLIST-posix
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-posix 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-posix->=5.6,<5.7
+lib/php-${PV}/modules/posix.so
+share/examples/php-${PV}/posix.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/posix.ini
Index: 5.6/pkg/PLIST-pspell
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-pspell,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-pspell
--- 5.6/pkg/PLIST-pspell 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-pspell 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-pspell->=5.6,<5.7
-@conflict php5-pspell->=5.2
 lib/php-${PV}/modules/pspell.so
 share/examples/php-${PV}/pspell.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/pspell.ini
Index: 5.6/pkg/PLIST-readline
===================================================================
RCS file: 5.6/pkg/PLIST-readline
diff -N 5.6/pkg/PLIST-readline
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-readline 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-readline->=5.6,<5.7
+lib/php-${PV}/modules/readline.so
+share/examples/php-${PV}/readline.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/readline.ini
Index: 5.6/pkg/PLIST-shmop
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-shmop,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-shmop
--- 5.6/pkg/PLIST-shmop 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-shmop 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-shmop->=5.6,<5.7
-@conflict php5-shmop->=5.2
 lib/php-${PV}/modules/shmop.so
 share/examples/php-${PV}/shmop.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/shmop.ini
Index: 5.6/pkg/PLIST-simplexml
===================================================================
RCS file: 5.6/pkg/PLIST-simplexml
diff -N 5.6/pkg/PLIST-simplexml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-simplexml 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-simplexml->=5.6,<5.7
+lib/php-${PV}/modules/simplexml.so
+share/examples/php-${PV}/simplexml.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/simplexml.ini
+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
Index: 5.6/pkg/PLIST-snmp
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-snmp,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-snmp
--- 5.6/pkg/PLIST-snmp 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-snmp 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-snmp->=5.6,<5.7
-@conflict php5-snmp->=5.2
 lib/php-${PV}/modules/snmp.so
 share/examples/php-${PV}/snmp.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/snmp.ini
Index: 5.6/pkg/PLIST-soap
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-soap,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-soap
--- 5.6/pkg/PLIST-soap 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-soap 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-soap->=5.6,<5.7
-@conflict php5-soap->=5.2
 lib/php-${PV}/modules/soap.so
 share/examples/php-${PV}/soap.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/soap.ini
Index: 5.6/pkg/PLIST-sockets
===================================================================
RCS file: 5.6/pkg/PLIST-sockets
diff -N 5.6/pkg/PLIST-sockets
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-sockets 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sockets->=5.6,<5.7
+lib/php-${PV}/modules/sockets.so
+share/examples/php-${PV}/sockets.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sockets.ini
+share/php-${PV}/include/ext/sockets/
+share/php-${PV}/include/ext/sockets/php_sockets.h
Index: 5.6/pkg/PLIST-sqlite3
===================================================================
RCS file: 5.6/pkg/PLIST-sqlite3
diff -N 5.6/pkg/PLIST-sqlite3
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-sqlite3 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sqlite3->=5.6,<5.7
+lib/php-${PV}/modules/sqlite3.so
+share/examples/php-${PV}/sqlite3.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sqlite3.ini
Index: 5.6/pkg/PLIST-sybase_ct
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-sybase_ct,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-sybase_ct
--- 5.6/pkg/PLIST-sybase_ct 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-sybase_ct 8 Jul 2017 18:28:19 -0000
@@ -2,8 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-sybase_ct->=5.6,<5.7
-@conflict php5-sybase_ct->=5.2
-@pkgpath www/php5/extensions,-sybase_ct
 lib/php-${PV}/modules/sybase_ct.so
 share/examples/php-${PV}/sybase_ct.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/sybase_ct.ini
Index: 5.6/pkg/PLIST-sysvmsg
===================================================================
RCS file: 5.6/pkg/PLIST-sysvmsg
diff -N 5.6/pkg/PLIST-sysvmsg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-sysvmsg 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvmsg->=5.6,<5.7
+lib/php-${PV}/modules/sysvmsg.so
+share/examples/php-${PV}/sysvmsg.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvmsg.ini
Index: 5.6/pkg/PLIST-sysvsem
===================================================================
RCS file: 5.6/pkg/PLIST-sysvsem
diff -N 5.6/pkg/PLIST-sysvsem
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-sysvsem 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvsem->=5.6,<5.7
+lib/php-${PV}/modules/sysvsem.so
+share/examples/php-${PV}/sysvsem.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvsem.ini
Index: 5.6/pkg/PLIST-sysvshm
===================================================================
RCS file: 5.6/pkg/PLIST-sysvshm
diff -N 5.6/pkg/PLIST-sysvshm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-sysvshm 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvshm->=5.6,<5.7
+lib/php-${PV}/modules/sysvshm.so
+share/examples/php-${PV}/sysvshm.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvshm.ini
Index: 5.6/pkg/PLIST-tidy
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-tidy,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-tidy
--- 5.6/pkg/PLIST-tidy 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-tidy 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-tidy->=5.6,<5.7
-@conflict php5-tidy->=5.2
 lib/php-${PV}/modules/tidy.so
 share/examples/php-${PV}/tidy.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/tidy.ini
Index: 5.6/pkg/PLIST-tokenizer
===================================================================
RCS file: 5.6/pkg/PLIST-tokenizer
diff -N 5.6/pkg/PLIST-tokenizer
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-tokenizer 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-tokenizer->=5.6,<5.7
+lib/php-${PV}/modules/tokenizer.so
+share/examples/php-${PV}/tokenizer.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/tokenizer.ini
Index: 5.6/pkg/PLIST-wddx
===================================================================
RCS file: 5.6/pkg/PLIST-wddx
diff -N 5.6/pkg/PLIST-wddx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-wddx 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-wddx->=5.6,<5.7
+lib/php-${PV}/modules/wddx.so
+share/examples/php-${PV}/wddx.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/wddx.ini
Index: 5.6/pkg/PLIST-xml
===================================================================
RCS file: 5.6/pkg/PLIST-xml
diff -N 5.6/pkg/PLIST-xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-xml 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xml->=5.6,<5.7
+lib/php-${PV}/modules/xml.so
+share/examples/php-${PV}/xml.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xml.ini
+share/php-${PV}/include/ext/xml/
+share/php-${PV}/include/ext/xml/expat_compat.h
+share/php-${PV}/include/ext/xml/php_xml.h
Index: 5.6/pkg/PLIST-xmlreader
===================================================================
RCS file: 5.6/pkg/PLIST-xmlreader
diff -N 5.6/pkg/PLIST-xmlreader
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-xmlreader 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlreader->=5.6,<5.7
+lib/php-${PV}/modules/xmlreader.so
+share/examples/php-${PV}/xmlreader.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlreader.ini
Index: 5.6/pkg/PLIST-xmlrpc
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-xmlrpc,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-xmlrpc
--- 5.6/pkg/PLIST-xmlrpc 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-xmlrpc 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-xmlrpc->=5.6,<5.7
-@conflict php5-xmlrpc->=5.2
 lib/php-${PV}/modules/xmlrpc.so
 share/examples/php-${PV}/xmlrpc.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/xmlrpc.ini
Index: 5.6/pkg/PLIST-xmlwriter
===================================================================
RCS file: 5.6/pkg/PLIST-xmlwriter
diff -N 5.6/pkg/PLIST-xmlwriter
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/pkg/PLIST-xmlwriter 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlwriter->=5.6,<5.7
+lib/php-${PV}/modules/xmlwriter.so
+share/examples/php-${PV}/xmlwriter.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlwriter.ini
Index: 5.6/pkg/PLIST-xsl
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-xsl,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-xsl
--- 5.6/pkg/PLIST-xsl 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-xsl 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-xsl->=5.6,<5.7
-@conflict php5-xsl->=5.2
 lib/php-${PV}/modules/xsl.so
 share/examples/php-${PV}/xsl.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/xsl.ini
Index: 5.6/pkg/PLIST-zip
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-zip,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-zip
--- 5.6/pkg/PLIST-zip 29 Jun 2016 16:14:42 -0000 1.2
+++ 5.6/pkg/PLIST-zip 8 Jul 2017 18:28:19 -0000
@@ -2,8 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-zip->=5.6,<5.7
-@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
Index: 7.0/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.30
diff -u -p -a -u -r1.30 Makefile
--- 7.0/Makefile 12 Jun 2017 11:48:34 -0000 1.30
+++ 7.0/Makefile 8 Jul 2017 18:28:19 -0000
@@ -1,15 +1,6 @@
-# $OpenBSD: Makefile,v 1.30 2017/06/12 11:48:34 sthen Exp $
-
-BROKEN-sparc64= SIGBUS during phar generation
+# $OpenBSD: Makefile,v 1.29 2017/04/25 11:21:14 sthen Exp $
 
 PV= 7.0
-V= ${PV}.20
-
-WANTLIB-main+= ${LIBCXX} ncurses readline
-
-BUILD_DEPENDS+= devel/bison
-
-CONFIGURE_ENV+= YACC="${LOCALBASE}/bin/bison -y"
-CONFIGURE_ARGS+= --with-pcre-jit=no
+V= ${PV}.21
 
 .include <bsd.port.mk>
Index: 7.0/distinfo
===================================================================
RCS file: /cvs/ports/lang/php/7.0/distinfo,v
retrieving revision 1.16
diff -u -p -a -u -r1.16 distinfo
--- 7.0/distinfo 12 Jun 2017 11:48:34 -0000 1.16
+++ 7.0/distinfo 8 Jul 2017 18:28:19 -0000
@@ -1,4 +1,2 @@
-SHA256 (php-7.0.20.tar.bz2) = zf3f4BzGFSGOMz40ocdhye+P31GZsnYXJkoCcF7af8M=
-SHA256 (suhosin-0.9.38.tar.gz) = wC12xOfOd3kQo3wYGBy2f9npDv4BB/6rPeMTG1+JvOo=
-SIZE (php-7.0.20.tar.bz2) = 15327671
-SIZE (suhosin-0.9.38.tar.gz) = 122800
+SHA256 (php-7.0.21.tar.bz2) = K6Ezw5Leb4aqzO2MVOCt79HIHThArDI7mSa47T3GIx8=
+SIZE (php-7.0.21.tar.bz2) = 15342611
Index: 7.0/patches/patch-acinclude_m4
===================================================================
RCS file: 7.0/patches/patch-acinclude_m4
diff -N 7.0/patches/patch-acinclude_m4
--- 7.0/patches/patch-acinclude_m4 24 Feb 2017 09:13:12 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-$OpenBSD: patch-acinclude_m4,v 1.2 2017/02/24 09:13:12 robert Exp $
---- acinclude.m4.orig.port Tue Feb 14 14:50:52 2017
-+++ acinclude.m4 Thu Feb 23 18:50:53 2017
-@@ -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
- ])
-
-@@ -2324,9 +2312,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
-
Index: 7.0/patches/patch-configure_in
===================================================================
RCS file: 7.0/patches/patch-configure_in
diff -N 7.0/patches/patch-configure_in
--- 7.0/patches/patch-configure_in 12 Jun 2017 11:48:34 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.3 2017/06/12 11:48:34 sthen Exp $
-Index: configure.in
---- configure.in.orig
-+++ configure.in
-@@ -1052,16 +1052,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
-@@ -1252,7 +1252,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
Index: 7.0/patches/patch-ext_gd_gdcache_h
===================================================================
RCS file: 7.0/patches/patch-ext_gd_gdcache_h
diff -N 7.0/patches/patch-ext_gd_gdcache_h
--- 7.0/patches/patch-ext_gd_gdcache_h 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$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 */
Index: 7.0/patches/patch-ext_gd_libgd_gdkanji_c
===================================================================
RCS file: 7.0/patches/patch-ext_gd_libgd_gdkanji_c
diff -N 7.0/patches/patch-ext_gd_libgd_gdkanji_c
--- 7.0/patches/patch-ext_gd_libgd_gdkanji_c 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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)
Index: 7.0/patches/patch-ext_iconv_iconv_c
===================================================================
RCS file: 7.0/patches/patch-ext_iconv_iconv_c
diff -N 7.0/patches/patch-ext_iconv_iconv_c
--- 7.0/patches/patch-ext_iconv_iconv_c 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-$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:
Index: 7.0/patches/patch-ext_mcrypt_mcrypt_c
===================================================================
RCS file: 7.0/patches/patch-ext_mcrypt_mcrypt_c
diff -N 7.0/patches/patch-ext_mcrypt_mcrypt_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/patches/patch-ext_mcrypt_mcrypt_c 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,60 @@
+$OpenBSD$
+--- ext/mcrypt/mcrypt.c.orig.port Tue May  9 13:41:04 2017
++++ ext/mcrypt/mcrypt.c Wed May 24 20:25:47 2017
+@@ -1374,51 +1374,12 @@ PHP_FUNCTION(mcrypt_create_iv)
+ }
+
+ iv = ecalloc(size + 1, 1);
++ if (php_random_bytes_silent(iv, (size_t) size) == FAILURE) {
++ efree(iv);
++ php_error_docref(NULL, E_WARNING, "Could not gather sufficient random data");
++ RETURN_FALSE;
++ }
+
+- if (source == RANDOM || source == URANDOM) {
+-#ifdef PHP_WIN32
+- /* random/urandom equivalent on Windows */
+- BYTE *iv_b = (BYTE *) iv;
+- if (php_win32_get_random_bytes(iv_b, (size_t) size) == FAILURE){
+- efree(iv);
+- php_error_docref(NULL, E_WARNING, "Could not gather sufficient random data");
+- RETURN_FALSE;
+- }
+- n = (int)size;
+-#else
+- int    *fd = &MCG(fd[source]);
+- size_t read_bytes = 0;
+-
+- if (*fd < 0) {
+- *fd = open(source == RANDOM ? "/dev/random" : "/dev/urandom", O_RDONLY);
+- if (*fd < 0) {
+- efree(iv);
+- php_error_docref(NULL, E_WARNING, "Cannot open source device");
+- RETURN_FALSE;
+- }
+- }
+-
+- while (read_bytes < size) {
+- n = read(*fd, iv + read_bytes, size - read_bytes);
+- if (n <= 0) {
+- break;
+- }
+- read_bytes += n;
+- }
+- n = read_bytes;
+-
+- if (n < size) {
+- efree(iv);
+- php_error_docref(NULL, E_WARNING, "Could not gather sufficient random data");
+- RETURN_FALSE;
+- }
+-#endif
+- } else {
+- n = (int)size;
+- while (size) {
+- iv[--size] = (char) (255.0 * php_rand() / RAND_MAX);
+- }
+- }
+ RETVAL_STRINGL(iv, n);
+ efree(iv);
+ }
Index: 7.0/patches/patch-ext_mysqlnd_config9_m4
===================================================================
RCS file: 7.0/patches/patch-ext_mysqlnd_config9_m4
diff -N 7.0/patches/patch-ext_mysqlnd_config9_m4
--- 7.0/patches/patch-ext_mysqlnd_config9_m4 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$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])])
Index: 7.0/patches/patch-ext_odbc_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-ext_odbc_config_m4,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 patch-ext_odbc_config_m4
--- 7.0/patches/patch-ext_odbc_config_m4 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ 7.0/patches/patch-ext_odbc_config_m4 8 Jul 2017 18:28:19 -0000
@@ -1,14 +1,21 @@
-$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,,
+$OpenBSD$
+--- ext/odbc/config.m4.orig.port Mon Jun 26 23:38:13 2017
++++ ext/odbc/config.m4 Mon Jun 26 23:38:23 2017
+@@ -396,7 +396,7 @@ 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)
++      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
        ODBC_TYPE=iodbc
        ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
        ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
+@@ -409,7 +409,7 @@ PHP_ARG_WITH(iodbc,,
+       if test "$PHP_IODBC" = "yes"; then
+         PHP_IODBC=/usr/local
+       fi
+-      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
+       PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
+       ODBC_TYPE=iodbc
+       ODBC_INCLUDE=-I$PHP_IODBC/include
Index: 7.0/patches/patch-ext_session_session_c
===================================================================
RCS file: 7.0/patches/patch-ext_session_session_c
diff -N 7.0/patches/patch-ext_session_session_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/patches/patch-ext_session_session_c 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,63 @@
+$OpenBSD$
+--- ext/session/session.c.orig.port Tue Feb 14 14:51:37 2017
++++ ext/session/session.c Wed May 24 13:41:47 2017
+@@ -47,6 +47,7 @@
+ #include "ext/standard/php_lcg.h"
+ #include "ext/standard/url_scanner_ex.h"
+ #include "ext/standard/php_rand.h" /* for RAND_MAX */
++#include "ext/standard/php_random.h"
+ #include "ext/standard/info.h"
+ #include "zend_smart_str.h"
+ #include "ext/standard/url.h"
+@@ -356,12 +357,9 @@ PHPAPI zend_string *php_session_create_id(PS_CREATE_SI
+ efree(buf);
+
+ if (PS(entropy_length) > 0) {
+-#ifdef PHP_WIN32
+ unsigned char rbuf[2048];
+ size_t toread = PS(entropy_length);
+-
+- if (php_win32_get_random_bytes(rbuf, MIN(toread, sizeof(rbuf))) == SUCCESS){
+-
++ if (php_random_bytes_silent(rbuf, MIN(toread, sizeof(rbuf))) == SUCCESS) {
+ switch (PS(hash_func)) {
+ case PS_HASH_FUNC_MD5:
+ PHP_MD5Update(&md5_context, rbuf, toread);
+@@ -376,37 +374,6 @@ PHPAPI zend_string *php_session_create_id(PS_CREATE_SI
+ # endif /* HAVE_HASH_EXT */
+ }
+ }
+-#else
+- int fd;
+-
+- fd = VCWD_OPEN(PS(entropy_file), O_RDONLY);
+- if (fd >= 0) {
+- unsigned char rbuf[2048];
+- int n;
+- int to_read = PS(entropy_length);
+-
+- while (to_read > 0) {
+- n = read(fd, rbuf, MIN(to_read, sizeof(rbuf)));
+- if (n <= 0) break;
+-
+- switch (PS(hash_func)) {
+- case PS_HASH_FUNC_MD5:
+- PHP_MD5Update(&md5_context, rbuf, n);
+- break;
+- case PS_HASH_FUNC_SHA1:
+- PHP_SHA1Update(&sha1_context, rbuf, n);
+- break;
+-#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
+- case PS_HASH_FUNC_OTHER:
+- PS(hash_ops)->hash_update(hash_context, rbuf, n);
+- break;
+-#endif /* HAVE_HASH_EXT */
+- }
+- to_read -= n;
+- }
+- close(fd);
+- }
+-#endif
+ }
+
+ digest = emalloc(digest_len + 1);
Index: 7.0/patches/patch-ext_sockets_sockaddr_conv_c
===================================================================
RCS file: 7.0/patches/patch-ext_sockets_sockaddr_conv_c
diff -N 7.0/patches/patch-ext_sockets_sockaddr_conv_c
--- 7.0/patches/patch-ext_sockets_sockaddr_conv_c 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$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) /* {{{ */
Index: 7.0/patches/patch-ext_spl_php_spl_c
===================================================================
RCS file: 7.0/patches/patch-ext_spl_php_spl_c
diff -N 7.0/patches/patch-ext_spl_php_spl_c
--- 7.0/patches/patch-ext_spl_php_spl_c 24 Feb 2017 09:13:12 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-ext_spl_php_spl_c,v 1.4 2017/02/24 09:13:12 robert Exp $
---- ext/spl/php_spl.c.orig.port Tue Feb 14 14:51:32 2017
-+++ ext/spl/php_spl.c Thu Feb 23 18:50:47 2017
-@@ -768,19 +768,19 @@ 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_handle   = SPL_G(hash_mask_handle)^(zend_intptr_t)Z_OBJ_HANDLE_P(obj);
- hash_handlers = SPL_G(hash_mask_handlers);
-
- return strpprintf(32, "%016lx%016lx", hash_handle, hash_handlers);
Index: 7.0/patches/patch-ext_spl_php_spl_h
===================================================================
RCS file: 7.0/patches/patch-ext_spl_php_spl_h
diff -N 7.0/patches/patch-ext_spl_php_spl_h
--- 7.0/patches/patch-ext_spl_php_spl_h 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$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)
Index: 7.0/patches/patch-ext_standard_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-ext_standard_config_m4,v
retrieving revision 1.4
diff -u -p -a -u -r1.4 patch-ext_standard_config_m4
--- 7.0/patches/patch-ext_standard_config_m4 12 Jun 2017 11:48:34 -0000 1.4
+++ 7.0/patches/patch-ext_standard_config_m4 8 Jul 2017 18:28:19 -0000
@@ -1,28 +1,36 @@
-$OpenBSD: patch-ext_standard_config_m4,v 1.4 2017/06/12 11:48:34 sthen Exp $
-Index: ext/standard/config.m4
---- ext/standard/config.m4.orig
-+++ ext/standard/config.m4
-@@ -401,17 +401,17 @@ 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(res_ndestroy, 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(res_ndestroy, 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
+$OpenBSD$
+--- ext/standard/config.m4.orig.port Wed May 24 17:25:22 2017
++++ ext/standard/config.m4 Wed May 24 17:25:34 2017
+@@ -370,31 +370,7 @@ else
+   AC_MSG_RESULT(no)
+ fi
 
--PHP_CHECK_FUNC(res_search, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_search, resolv, socket)
+-PHP_ENABLE_CHROOT_FUNC=no
+-case "$PHP_SAPI" in
+-  embed)
+-    PHP_ENABLE_CHROOT_FUNC=yes
+-  ;;
+-
+-  none)
+-    for PROG in $PHP_BINARIES; do
+-      case "$PROG" in
+-        cgi|cli)
+-          PHP_ENABLE_CHROOT_FUNC=yes
+-        ;;
+-
+-        *)
+-          PHP_ENABLE_CHROOT_FUNC=no
+-          break
+-        ;;
+-      esac
+-   done
+-  ;;
+-esac
+-
+-if test "$PHP_ENABLE_CHROOT_FUNC" = "yes"; then
+-  AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
+-fi
++AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
 
  dnl
- dnl Check if atof() accepts NAN
+ dnl Detect library functions needed by php dns_xxx functions
Index: 7.0/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
===================================================================
RCS file: 7.0/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
diff -N 7.0/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
--- 7.0/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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;
Index: 7.0/patches/patch-main_php_h
===================================================================
RCS file: 7.0/patches/patch-main_php_h
diff -N 7.0/patches/patch-main_php_h
--- 7.0/patches/patch-main_php_h 12 Jun 2017 11:48:34 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-main_php_h,v 1.2 2017/06/12 11:48:34 sthen Exp $
-Index: main/php.h
---- main/php.h.orig
-+++ main/php.h
-@@ -146,7 +146,9 @@ END_EXTERN_C()
- # ifdef PHP_WIN32
- typedef int socklen_t;
- # else
-+#   if !defined(__OpenBSD__)
- typedef unsigned int socklen_t;
-+#   endif
- # endif
- #endif
-
Index: 7.0/patches/patch-main_php_ini_c
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-main_php_ini_c,v
retrieving revision 1.3
diff -u -p -a -u -r1.3 patch-main_php_ini_c
--- 7.0/patches/patch-main_php_ini_c 22 Jan 2017 17:01:32 -0000 1.3
+++ 7.0/patches/patch-main_php_ini_c 8 Jul 2017 18:28:19 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-main_php_ini_c,v 1.3 2017/01/22 17:01:32 martijn Exp $
---- main/php_ini.c.orig.port Tue Jan 17 12:53:05 2017
-+++ main/php_ini.c Fri Jan 20 07:38:39 2017
+--- main/php_ini.c.orig.port Tue Feb 14 14:52:57 2017
++++ main/php_ini.c Wed May 24 13:41:57 2017
 @@ -572,7 +572,7 @@ int php_init_config(void)
 
  /* If still no ini file found, search for php.ini file in search path */
Index: 7.0/patches/patch-main_php_open_temporary_file_c
===================================================================
RCS file: 7.0/patches/patch-main_php_open_temporary_file_c
diff -N 7.0/patches/patch-main_php_open_temporary_file_c
--- 7.0/patches/patch-main_php_open_temporary_file_c 14 Dec 2015 17:58:46 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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;
- }
Index: 7.0/patches/patch-sapi_cgi_cgi_main_c
===================================================================
RCS file: 7.0/patches/patch-sapi_cgi_cgi_main_c
diff -N 7.0/patches/patch-sapi_cgi_cgi_main_c
--- 7.0/patches/patch-sapi_cgi_cgi_main_c 14 Dec 2015 17:58:46 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$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 */
Index: 7.0/patches/patch-sapi_cli_php_cli_c
===================================================================
RCS file: 7.0/patches/patch-sapi_cli_php_cli_c
diff -N 7.0/patches/patch-sapi_cli_php_cli_c
--- 7.0/patches/patch-sapi_cli_php_cli_c 24 Feb 2017 09:13:12 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-sapi_cli_php_cli_c,v 1.2 2017/02/24 09:13:12 robert Exp $
---- sapi/cli/php_cli.c.orig.port Tue Feb 14 14:51:10 2017
-+++ sapi/cli/php_cli.c Thu Feb 23 18:50:47 2017
-@@ -666,6 +666,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 {
-
Index: 7.0/patches/patch-sapi_fpm_www_conf_in
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-sapi_fpm_www_conf_in,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 patch-sapi_fpm_www_conf_in
--- 7.0/patches/patch-sapi_fpm_www_conf_in 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ 7.0/patches/patch-sapi_fpm_www_conf_in 8 Jul 2017 18:28:19 -0000
@@ -10,19 +10,6 @@ $OpenBSD: patch-sapi_fpm_www_conf_in,v 1
 
  ; 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, ...).
Index: 7.0/patches/patch-scripts_php-config_in
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-scripts_php-config_in,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 patch-scripts_php-config_in
--- 7.0/patches/patch-scripts_php-config_in 14 Dec 2015 17:58:46 -0000 1.1.1.1
+++ 7.0/patches/patch-scripts_php-config_in 8 Jul 2017 18:28:19 -0000
@@ -1,7 +1,7 @@
 $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 @@
+--- scripts/php-config.in.orig.port Tue May  9 13:40:49 2017
++++ scripts/php-config.in Sun Jun  4 20:05:53 2017
+@@ -1,13 +1,13 @@
  #! /bin/sh
 
  SED="@SED@"
@@ -12,11 +12,13 @@ $OpenBSD: patch-scripts_php-config_in,v
  version="@PHP_VERSION@"
  vernum="@PHP_VERSION_ID@"
 -include_dir="@includedir@/php"
+-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"
 +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"
++includes="-I/usr/local/include -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@"
+ extension_dir='@EXTENSION_DIR@'
+@@ -24,10 +24,10 @@ php_sapis="@PHP_INSTALLED_SAPIS@"
  for sapi in $php_sapis; do
    case $sapi in
    cli)
@@ -24,7 +26,7 @@ $OpenBSD: patch-scripts_php-config_in,v
 +    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="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}"
 +    php_cgi_binary="/usr/local/bin/php-cgi${program_suffix}"
      ;;
    esac
Index: 7.0/patches/patch-scripts_phpize_m4
===================================================================
RCS file: 7.0/patches/patch-scripts_phpize_m4
diff -N 7.0/patches/patch-scripts_phpize_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/patches/patch-scripts_phpize_m4 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- scripts/phpize.m4.orig.port Fri Jun  2 21:36:25 2017
++++ scripts/phpize.m4 Fri Jun  2 21:36:41 2017
+@@ -36,7 +36,7 @@ PHP_SHLIB_SUFFIX_NAMES
+
+ dnl Find php-config script
+ PHP_ARG_WITH(php-config,,
+-[  --with-php-config=PATH  Path to php-config [php-config]], php-config, no)
++[  --with-php-config=PATH  Path to php-config [php-config]], php-config-${PV}, no)
+
+ dnl For BC
+ PHP_CONFIG=$PHP_PHP_CONFIG
Index: 7.0/pkg/PLIST-apxs2
===================================================================
RCS file: 7.0/pkg/PLIST-apxs2
diff -N 7.0/pkg/PLIST-apxs2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-apxs2 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-apxs2->=7.0,<7.1
+lib/php-${PV}/libphp7.so
+share/examples/php-${PV}/php.conf
+@sample /var/www/conf/modules.sample/php-${PV}.conf
Index: 7.0/pkg/PLIST-bcmath
===================================================================
RCS file: 7.0/pkg/PLIST-bcmath
diff -N 7.0/pkg/PLIST-bcmath
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-bcmath 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-bcmath->=7.0,<7.1
+lib/php-${PV}/modules/bcmath.so
+share/examples/php-${PV}/bcmath.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/bcmath.ini
Index: 7.0/pkg/PLIST-bz2
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-bz2,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-bz2
--- 7.0/pkg/PLIST-bz2 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-bz2 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-calendar
===================================================================
RCS file: 7.0/pkg/PLIST-calendar
diff -N 7.0/pkg/PLIST-calendar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-calendar 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-calendar->=7.0,<7.1
+lib/php-${PV}/modules/calendar.so
+share/examples/php-${PV}/calendar.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/calendar.ini
Index: 7.0/pkg/PLIST-cgi
===================================================================
RCS file: 7.0/pkg/PLIST-cgi
diff -N 7.0/pkg/PLIST-cgi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-cgi 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-cgi->=7.0,<7.1
+@bin bin/php-cgi-${PV}
+@man man/man1/php-cgi-${PV}.1
Index: 7.0/pkg/PLIST-cli
===================================================================
RCS file: 7.0/pkg/PLIST-cli
diff -N 7.0/pkg/PLIST-cli
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-cli 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-cli->=7.0,<7.1
+@bin bin/php-${PV}
+@man man/man1/php-${PV}.1
+share/php-${PV}/include/sapi/
+share/php-${PV}/include/sapi/cli/
+share/php-${PV}/include/sapi/cli/cli.h
Index: 7.0/pkg/PLIST-ctype
===================================================================
RCS file: 7.0/pkg/PLIST-ctype
diff -N 7.0/pkg/PLIST-ctype
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-ctype 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-ctype->=7.0,<7.1
+lib/php-${PV}/modules/ctype.so
+share/examples/php-${PV}/ctype.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ctype.ini
Index: 7.0/pkg/PLIST-curl
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-curl,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-curl
--- 7.0/pkg/PLIST-curl 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-curl 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-dba
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-dba,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-dba
--- 7.0/pkg/PLIST-dba 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-dba 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-dbg
===================================================================
RCS file: 7.0/pkg/PLIST-dbg
diff -N 7.0/pkg/PLIST-dbg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-dbg 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-dbg->=7.0,<7.1
+@bin bin/phpdbg-${PV}
+@man man/man1/phpdbg-${PV}.1
Index: 7.0/pkg/PLIST-dom
===================================================================
RCS file: 7.0/pkg/PLIST-dom
diff -N 7.0/pkg/PLIST-dom
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-dom 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-dom->=7.0,<7.1
+lib/php-${PV}/modules/dom.so
+share/examples/php-${PV}/dom.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/dom.ini
+share/php-${PV}/include/ext/dom/
+share/php-${PV}/include/ext/dom/xml_common.h
Index: 7.0/pkg/PLIST-enchant
===================================================================
RCS file: 7.0/pkg/PLIST-enchant
diff -N 7.0/pkg/PLIST-enchant
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-enchant 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-enchant->=7.0,<7.1
+lib/php-${PV}/modules/enchant.so
+share/examples/php-${PV}/enchant.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/enchant.ini
Index: 7.0/pkg/PLIST-exif
===================================================================
RCS file: 7.0/pkg/PLIST-exif
diff -N 7.0/pkg/PLIST-exif
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-exif 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-exif->=7.0,<7.1
+lib/php-${PV}/modules/exif.so
+share/examples/php-${PV}/exif.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/exif.ini
Index: 7.0/pkg/PLIST-fastcgi
===================================================================
RCS file: 7.0/pkg/PLIST-fastcgi
diff -N 7.0/pkg/PLIST-fastcgi
--- 7.0/pkg/PLIST-fastcgi 29 Jun 2016 16:14:42 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PLIST-fastcgi,v 1.2 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-fastcgi->=7.0,<7.1
-@bin bin/php-fastcgi-${PV}
Index: 7.0/pkg/PLIST-fileinfo
===================================================================
RCS file: 7.0/pkg/PLIST-fileinfo
diff -N 7.0/pkg/PLIST-fileinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-fileinfo 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-fileinfo->=7.0,<7.1
+lib/php-${PV}/modules/fileinfo.so
+share/examples/php-${PV}/fileinfo.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/fileinfo.ini
Index: 7.0/pkg/PLIST-fpm
===================================================================
RCS file: 7.0/pkg/PLIST-fpm
diff -N 7.0/pkg/PLIST-fpm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-fpm 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@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
Index: 7.0/pkg/PLIST-ftp
===================================================================
RCS file: 7.0/pkg/PLIST-ftp
diff -N 7.0/pkg/PLIST-ftp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-ftp 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-ftp->=7.0,<7.1
+lib/php-${PV}/modules/ftp.so
+share/examples/php-${PV}/ftp.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ftp.ini
Index: 7.0/pkg/PLIST-gd
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-gd,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-gd
--- 7.0/pkg/PLIST-gd 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-gd 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,23 @@
 @option no-default-conflict
 @option is-branch
 @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
+share/php-${PV}/include/ext/gd/
+share/php-${PV}/include/ext/gd/gd_compat.h
+share/php-${PV}/include/ext/gd/gdcache.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
Index: 7.0/pkg/PLIST-gettext
===================================================================
RCS file: 7.0/pkg/PLIST-gettext
diff -N 7.0/pkg/PLIST-gettext
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-gettext 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-gettext->=7.0,<7.1
+lib/php-${PV}/modules/gettext.so
+share/examples/php-${PV}/gettext.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/gettext.ini
Index: 7.0/pkg/PLIST-gmp
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-gmp,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-gmp
--- 7.0/pkg/PLIST-gmp 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-gmp 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-iconv
===================================================================
RCS file: 7.0/pkg/PLIST-iconv
diff -N 7.0/pkg/PLIST-iconv
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-iconv 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,19 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-iconv->=7.0,<7.1
+lib/php-${PV}/modules/iconv.so
+share/examples/php-${PV}/iconv.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/iconv.ini
+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
Index: 7.0/pkg/PLIST-imap
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-imap,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-imap
--- 7.0/pkg/PLIST-imap 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-imap 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-json
===================================================================
RCS file: 7.0/pkg/PLIST-json
diff -N 7.0/pkg/PLIST-json
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-json 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-json->=7.0,<7.1
+lib/php-${PV}/modules/json.so
+share/examples/php-${PV}/json.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/json.ini
+share/php-${PV}/include/ext/json/
+share/php-${PV}/include/ext/json/php_json.h
Index: 7.0/pkg/PLIST-ldap
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-ldap,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-ldap
--- 7.0/pkg/PLIST-ldap 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-ldap 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -a -u -r1.6 PLIST-main
--- 7.0/pkg/PLIST-main 25 Apr 2017 11:21:14 -0000 1.6
+++ 7.0/pkg/PLIST-main 8 Jul 2017 18:28:19 -0000
@@ -2,13 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php->=7.0,<7.1
-@conflict php-fpm->=7.0,<7.1
-@conflict php5-core->=5.2
-@conflict php5-core-fastcgi->=5.2
-@conflict php5-pdo_sqlite->=5.2
-@pkgpath lang/php/5.4
-@pkgpath lang/php/5.4,-pdo_sqlite
-@pkgpath lang/php/7.0,-fpm
 @extraunexec rm -f ${SYSCONFDIR}/php-${PV}/php-${PV}.sample/*
 @mode 1700
 @owner www
@@ -17,31 +10,19 @@
 @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
-@man man/man8/php-fpm-${PV}.8
-@bin sbin/php-fpm-${PV}
 share/doc/pkg-readmes/${FULLPKGNAME}
 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/examples/php-${PV}/php-fpm.conf
-@sample ${SYSCONFDIR}/php-fpm.conf
 share/php-${PV}/
 share/php-${PV}/build/
 share/php-${PV}/build/Makefile.global
@@ -142,27 +123,8 @@ share/php-${PV}/include/ext/date/lib/tim
 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/gd_compat.h
-share/php-${PV}/include/ext/gd/gdcache.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
@@ -177,93 +139,14 @@ share/php-${PV}/include/ext/hash/php_has
 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/mysql_float_to_double.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/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
@@ -276,9 +159,6 @@ share/php-${PV}/include/ext/spl/spl_func
 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
@@ -344,9 +224,6 @@ share/php-${PV}/include/ext/standard/uni
 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
@@ -387,8 +264,4 @@ share/php-${PV}/include/main/streams/php
 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}/
-@rcscript ${RCDIR}/php${SV}_fpm
Index: 7.0/pkg/PLIST-mbstring
===================================================================
RCS file: 7.0/pkg/PLIST-mbstring
diff -N 7.0/pkg/PLIST-mbstring
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-mbstring 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,29 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-mbstring->=7.0,<7.1
+lib/php-${PV}/modules/mbstring.so
+share/examples/php-${PV}/mbstring.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mbstring.ini
+share/php-${PV}/include/ext/mbstring/
+share/php-${PV}/include/ext/mbstring/mbstring.h
+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/php_mbregex.h
+share/php-${PV}/include/ext/mbstring/php_onig_compat.h
Index: 7.0/pkg/PLIST-mcrypt
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-mcrypt,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-mcrypt
--- 7.0/pkg/PLIST-mcrypt 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-mcrypt 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-mysqli
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-mysqli,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-mysqli
--- 7.0/pkg/PLIST-mysqli 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-mysqli 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,9 @@
 @option no-default-conflict
 @option is-branch
 @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
+share/php-${PV}/include/ext/mysqli/
+share/php-${PV}/include/ext/mysqli/mysqli_mysqlnd.h
+share/php-${PV}/include/ext/mysqli/php_mysqli_structs.h
Index: 7.0/pkg/PLIST-mysqlnd
===================================================================
RCS file: 7.0/pkg/PLIST-mysqlnd
diff -N 7.0/pkg/PLIST-mysqlnd
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-mysqlnd 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,28 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-mysqlnd->=7.0,<7.1
+lib/php-${PV}/modules/mysqlnd.so
+share/examples/php-${PV}/mysqlnd.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mysqlnd.ini
+share/php-${PV}/include/ext/mysqlnd/
+share/php-${PV}/include/ext/mysqlnd/config-win.h
+share/php-${PV}/include/ext/mysqlnd/mysql_float_to_double.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/php_mysqlnd.h
Index: 7.0/pkg/PLIST-odbc
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-odbc,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-odbc
--- 7.0/pkg/PLIST-odbc 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-odbc 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-opcache
===================================================================
RCS file: 7.0/pkg/PLIST-opcache
diff -N 7.0/pkg/PLIST-opcache
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-opcache 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-opcache->=7.0,<7.1
+lib/php-${PV}/modules/opcache.so
+share/examples/php-${PV}/opcache.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini
Index: 7.0/pkg/PLIST-pcntl
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-pcntl,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-pcntl
--- 7.0/pkg/PLIST-pcntl 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-pcntl 8 Jul 2017 18:28:19 -0000
@@ -2,9 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-pdo
===================================================================
RCS file: 7.0/pkg/PLIST-pdo
diff -N 7.0/pkg/PLIST-pdo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-pdo 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,11 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo->=7.0,<7.1
+lib/php-${PV}/modules/pdo.so
+share/examples/php-${PV}/pdo.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo.ini
+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
Index: 7.0/pkg/PLIST-pdo_dblib
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-pdo_dblib,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-pdo_dblib
--- 7.0/pkg/PLIST-pdo_dblib 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-pdo_dblib 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-pdo_mysql
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-pdo_mysql,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-pdo_mysql
--- 7.0/pkg/PLIST-pdo_mysql 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-pdo_mysql 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-pdo_pgsql
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-pdo_pgsql,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-pdo_pgsql
--- 7.0/pkg/PLIST-pdo_pgsql 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-pdo_pgsql 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-pdo_sqlite
===================================================================
RCS file: 7.0/pkg/PLIST-pdo_sqlite
diff -N 7.0/pkg/PLIST-pdo_sqlite
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-pdo_sqlite 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_sqlite->=7.0,<7.1
+lib/php-${PV}/modules/pdo_sqlite.so
+share/examples/php-${PV}/pdo_sqlite.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_sqlite.ini
Index: 7.0/pkg/PLIST-pgsql
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-pgsql,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-pgsql
--- 7.0/pkg/PLIST-pgsql 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-pgsql 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-phar
===================================================================
RCS file: 7.0/pkg/PLIST-phar
diff -N 7.0/pkg/PLIST-phar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-phar 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,11 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-phar->=7.0,<7.1
+bin/phar-${PV}
+@man man/man1/phar-${PV}.1
+lib/php-${PV}/modules/phar.so
+share/examples/php-${PV}/phar.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/phar.ini
+share/php-${PV}/include/ext/phar/
+share/php-${PV}/include/ext/phar/php_phar.h
Index: 7.0/pkg/PLIST-posix
===================================================================
RCS file: 7.0/pkg/PLIST-posix
diff -N 7.0/pkg/PLIST-posix
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-posix 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-posix->=7.0,<7.1
+lib/php-${PV}/modules/posix.so
+share/examples/php-${PV}/posix.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/posix.ini
Index: 7.0/pkg/PLIST-pspell
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-pspell,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-pspell
--- 7.0/pkg/PLIST-pspell 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-pspell 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-readline
===================================================================
RCS file: 7.0/pkg/PLIST-readline
diff -N 7.0/pkg/PLIST-readline
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-readline 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-readline->=7.0,<7.1
+lib/php-${PV}/modules/readline.so
+share/examples/php-${PV}/readline.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/readline.ini
Index: 7.0/pkg/PLIST-shmop
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-shmop,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-shmop
--- 7.0/pkg/PLIST-shmop 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-shmop 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-simplexml
===================================================================
RCS file: 7.0/pkg/PLIST-simplexml
diff -N 7.0/pkg/PLIST-simplexml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-simplexml 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-simplexml->=7.0,<7.1
+lib/php-${PV}/modules/simplexml.so
+share/examples/php-${PV}/simplexml.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/simplexml.ini
+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
Index: 7.0/pkg/PLIST-snmp
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-snmp,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-snmp
--- 7.0/pkg/PLIST-snmp 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-snmp 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-soap
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-soap,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-soap
--- 7.0/pkg/PLIST-soap 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-soap 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-sockets
===================================================================
RCS file: 7.0/pkg/PLIST-sockets
diff -N 7.0/pkg/PLIST-sockets
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-sockets 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sockets->=7.0,<7.1
+lib/php-${PV}/modules/sockets.so
+share/examples/php-${PV}/sockets.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sockets.ini
+share/php-${PV}/include/ext/sockets/
+share/php-${PV}/include/ext/sockets/php_sockets.h
Index: 7.0/pkg/PLIST-sqlite3
===================================================================
RCS file: 7.0/pkg/PLIST-sqlite3
diff -N 7.0/pkg/PLIST-sqlite3
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-sqlite3 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sqlite3->=7.0,<7.1
+lib/php-${PV}/modules/sqlite3.so
+share/examples/php-${PV}/sqlite3.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sqlite3.ini
Index: 7.0/pkg/PLIST-sysvmsg
===================================================================
RCS file: 7.0/pkg/PLIST-sysvmsg
diff -N 7.0/pkg/PLIST-sysvmsg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-sysvmsg 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvmsg->=7.0,<7.1
+lib/php-${PV}/modules/sysvmsg.so
+share/examples/php-${PV}/sysvmsg.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvmsg.ini
Index: 7.0/pkg/PLIST-sysvsem
===================================================================
RCS file: 7.0/pkg/PLIST-sysvsem
diff -N 7.0/pkg/PLIST-sysvsem
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-sysvsem 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvsem->=7.0,<7.1
+lib/php-${PV}/modules/sysvsem.so
+share/examples/php-${PV}/sysvsem.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvsem.ini
Index: 7.0/pkg/PLIST-sysvshm
===================================================================
RCS file: 7.0/pkg/PLIST-sysvshm
diff -N 7.0/pkg/PLIST-sysvshm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-sysvshm 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvshm->=7.0,<7.1
+lib/php-${PV}/modules/sysvshm.so
+share/examples/php-${PV}/sysvshm.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvshm.ini
Index: 7.0/pkg/PLIST-tidy
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-tidy,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-tidy
--- 7.0/pkg/PLIST-tidy 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-tidy 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-tokenizer
===================================================================
RCS file: 7.0/pkg/PLIST-tokenizer
diff -N 7.0/pkg/PLIST-tokenizer
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-tokenizer 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-tokenizer->=7.0,<7.1
+lib/php-${PV}/modules/tokenizer.so
+share/examples/php-${PV}/tokenizer.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/tokenizer.ini
Index: 7.0/pkg/PLIST-wddx
===================================================================
RCS file: 7.0/pkg/PLIST-wddx
diff -N 7.0/pkg/PLIST-wddx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-wddx 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-wddx->=7.0,<7.1
+lib/php-${PV}/modules/wddx.so
+share/examples/php-${PV}/wddx.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/wddx.ini
Index: 7.0/pkg/PLIST-xml
===================================================================
RCS file: 7.0/pkg/PLIST-xml
diff -N 7.0/pkg/PLIST-xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-xml 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xml->=7.0,<7.1
+lib/php-${PV}/modules/xml.so
+share/examples/php-${PV}/xml.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xml.ini
+share/php-${PV}/include/ext/xml/
+share/php-${PV}/include/ext/xml/expat_compat.h
+share/php-${PV}/include/ext/xml/php_xml.h
Index: 7.0/pkg/PLIST-xmlreader
===================================================================
RCS file: 7.0/pkg/PLIST-xmlreader
diff -N 7.0/pkg/PLIST-xmlreader
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-xmlreader 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlreader->=7.0,<7.1
+lib/php-${PV}/modules/xmlreader.so
+share/examples/php-${PV}/xmlreader.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlreader.ini
Index: 7.0/pkg/PLIST-xmlrpc
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-xmlrpc,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-xmlrpc
--- 7.0/pkg/PLIST-xmlrpc 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-xmlrpc 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-xmlwriter
===================================================================
RCS file: 7.0/pkg/PLIST-xmlwriter
diff -N 7.0/pkg/PLIST-xmlwriter
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/pkg/PLIST-xmlwriter 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlwriter->=7.0,<7.1
+lib/php-${PV}/modules/xmlwriter.so
+share/examples/php-${PV}/xmlwriter.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlwriter.ini
Index: 7.0/pkg/PLIST-xsl
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-xsl,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-xsl
--- 7.0/pkg/PLIST-xsl 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-xsl 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.0/pkg/PLIST-zip
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-zip,v
retrieving revision 1.2
diff -u -p -a -u -r1.2 PLIST-zip
--- 7.0/pkg/PLIST-zip 29 Jun 2016 16:14:42 -0000 1.2
+++ 7.0/pkg/PLIST-zip 8 Jul 2017 18:28:19 -0000
@@ -2,8 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: 7.1/Makefile
===================================================================
RCS file: 7.1/Makefile
diff -N 7.1/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/Makefile 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,10 @@
+# $OpenBSD: Makefile,v 1.29 2017/04/25 11:21:14 sthen Exp $
+
+BROKEN-sparc64= SIGBUS during phar generation
+
+PV= 7.1
+V= ${PV}.7
+
+PHP_MODULES_EXTRA=
+
+.include <bsd.port.mk>
Index: 7.1/distinfo
===================================================================
RCS file: 7.1/distinfo
diff -N 7.1/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/distinfo 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,2 @@
+SHA256 (php-7.1.7.tar.bz2) = B5tnkph/ONxIX5IljAT54C3t1ZP50mDr5yU0P4EtH/g=
+SIZE (php-7.1.7.tar.bz2) = 15751686
Index: 7.1/patches/patch-acinclude_m4
===================================================================
RCS file: 7.1/patches/patch-acinclude_m4
diff -N 7.1/patches/patch-acinclude_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-acinclude_m4 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+--- acinclude.m4.orig.port Wed May 24 14:58:24 2017
++++ acinclude.m4 Wed May 24 14:58:43 2017
+@@ -2337,13 +2337,13 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+
+   dnl If pkg-config is found try using it
+   if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
+-    if $PKG_CONFIG --atleast-version=1.0.1 openssl; then
++    if $PKG_CONFIG --atleast-version=1.0.0 openssl; then
+       found_openssl=yes
+       OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`
+       OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
+       OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
+     else
+-      AC_MSG_ERROR([OpenSSL version 1.0.1 or greater required.])
++      AC_MSG_ERROR([OpenSSL version 1.0.0 or greater required.])
+     fi
+
+     if test -n "$OPENSSL_LIBS"; then
+@@ -2388,9 +2388,9 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+   yes
+ #endif
+     ],[
+-      AC_MSG_RESULT([>= 1.0.1])
++      AC_MSG_RESULT([>= 1.0.0])
+     ],[
+-      AC_MSG_ERROR([OpenSSL version 1.0.1 or greater required.])
++      AC_MSG_ERROR([OpenSSL version 1.0.0 or greater required.])
+     ])
+     CPPFLAGS=$old_CPPFLAGS
+
Index: 7.1/patches/patch-aclocal_m4
===================================================================
RCS file: 7.1/patches/patch-aclocal_m4
diff -N 7.1/patches/patch-aclocal_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-aclocal_m4 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,42 @@
+$OpenBSD: patch-aclocal_m4,v 1.1 2017/04/26 08:15:05 sthen Exp $
+--- aclocal.m4.orig.port Tue May  9 14:29:42 2017
++++ aclocal.m4 Wed May 24 15:01:47 2017
+@@ -762,7 +762,9 @@ AC_DEFUN([PHP_REQUIRE_CXX],[
+   if test -z "$php_cxx_done"; then
+     AC_PROG_CXX
+     AC_PROG_CXXCPP
+-    PHP_ADD_LIBRARY(stdc++)
++    for i in $LIBCXX; do
++      PHP_ADD_LIBRARY($i)
++    done
+     php_cxx_done=yes
+   fi
+ ])
+@@ -2337,13 +2339,13 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+
+   dnl If pkg-config is found try using it
+   if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
+-    if $PKG_CONFIG --atleast-version=1.0.1 openssl; then
++    if $PKG_CONFIG --atleast-version=1.0.0 openssl; then
+       found_openssl=yes
+       OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`
+       OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
+       OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
+     else
+-      AC_MSG_ERROR([OpenSSL version 1.0.1 or greater required.])
++      AC_MSG_ERROR([OpenSSL version 1.0.0 or greater required.])
+     fi
+
+     if test -n "$OPENSSL_LIBS"; then
+@@ -2388,9 +2390,9 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+   yes
+ #endif
+     ],[
+-      AC_MSG_RESULT([>= 1.0.1])
++      AC_MSG_RESULT([>= 1.0.0])
+     ],[
+-      AC_MSG_ERROR([OpenSSL version 1.0.1 or greater required.])
++      AC_MSG_ERROR([OpenSSL version 1.0.0 or greater required.])
+     ])
+     CPPFLAGS=$old_CPPFLAGS
+
Index: 7.1/patches/patch-ext_gd_config_m4
===================================================================
RCS file: 7.1/patches/patch-ext_gd_config_m4
diff -N 7.1/patches/patch-ext_gd_config_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-ext_gd_config_m4 8 Jul 2017 18:28:19 -0000
@@ -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
+
Index: 7.1/patches/patch-ext_imap_config_m4
===================================================================
RCS file: 7.1/patches/patch-ext_imap_config_m4
diff -N 7.1/patches/patch-ext_imap_config_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-ext_imap_config_m4 8 Jul 2017 18:28:19 -0000
@@ -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,[ ])
Index: 7.1/patches/patch-ext_mcrypt_mcrypt_c
===================================================================
RCS file: 7.1/patches/patch-ext_mcrypt_mcrypt_c
diff -N 7.1/patches/patch-ext_mcrypt_mcrypt_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-ext_mcrypt_mcrypt_c 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,59 @@
+$OpenBSD$
+--- ext/mcrypt/mcrypt.c.orig.port Tue May  9 14:29:40 2017
++++ ext/mcrypt/mcrypt.c Wed May 24 14:24:38 2017
+@@ -1375,50 +1375,12 @@ PHP_FUNCTION(mcrypt_create_iv)
+
+ iv = ecalloc(size + 1, 1);
+
+- if (source == RANDOM || source == URANDOM) {
+-#ifdef PHP_WIN32
+- /* random/urandom equivalent on Windows */
+- BYTE *iv_b = (BYTE *) iv;
+- if (php_win32_get_random_bytes(iv_b, (size_t) size) == FAILURE){
+- efree(iv);
+- php_error_docref(NULL, E_WARNING, "Could not gather sufficient random data");
+- RETURN_FALSE;
+- }
+- n = (int)size;
+-#else
+- int    *fd = &MCG(fd[source]);
+- size_t read_bytes = 0;
++ if (php_random_bytes_silent(iv, (size_t) size) == FAILURE) {
++ efree(iv);
++ php_error_docref(NULL, E_WARNING, "Could not gather sufficient random data");
++ RETURN_FALSE;
++ }
+
+- if (*fd < 0) {
+- *fd = open(source == RANDOM ? "/dev/random" : "/dev/urandom", O_RDONLY);
+- if (*fd < 0) {
+- efree(iv);
+- php_error_docref(NULL, E_WARNING, "Cannot open source device");
+- RETURN_FALSE;
+- }
+- }
+-
+- while ((zend_long)read_bytes < size) {
+- n = read(*fd, iv + read_bytes, size - read_bytes);
+- if (n <= 0) {
+- break;
+- }
+- read_bytes += n;
+- }
+- n = read_bytes;
+-
+- if (n < size) {
+- efree(iv);
+- php_error_docref(NULL, E_WARNING, "Could not gather sufficient random data");
+- RETURN_FALSE;
+- }
+-#endif
+- } else {
+- n = (int)size;
+- while (size) {
+- iv[--size] = (char) (255.0 * php_rand() / RAND_MAX);
+- }
+- }
+ RETVAL_STRINGL(iv, n);
+ efree(iv);
+ }
Index: 7.1/patches/patch-ext_odbc_config_m4
===================================================================
RCS file: 7.1/patches/patch-ext_odbc_config_m4
diff -N 7.1/patches/patch-ext_odbc_config_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-ext_odbc_config_m4 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- ext/odbc/config.m4.orig.port Mon Jun 26 22:55:51 2017
++++ ext/odbc/config.m4 Mon Jun 26 22:56:21 2017
+@@ -396,7 +396,7 @@ 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)
++      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
+       ODBC_TYPE=iodbc
+       ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
+       ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
+@@ -409,7 +409,7 @@ PHP_ARG_WITH(iodbc,,
+       if test "$PHP_IODBC" = "yes"; then
+         PHP_IODBC=/usr/local
+       fi
+-      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
+       PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
+       ODBC_TYPE=iodbc
+       ODBC_INCLUDE=-I$PHP_IODBC/include
Index: 7.1/patches/patch-ext_openssl_config0_m4
===================================================================
RCS file: 7.1/patches/patch-ext_openssl_config0_m4
diff -N 7.1/patches/patch-ext_openssl_config0_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-ext_openssl_config0_m4 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,11 @@
+--- ext/openssl/config0.m4.orig.port Wed May 24 14:54:07 2017
++++ ext/openssl/config0.m4 Wed May 24 14:54:15 2017
+@@ -3,7 +3,7 @@ dnl $Id$
+ dnl
+
+ PHP_ARG_WITH(openssl, for OpenSSL support,
+-[  --with-openssl[=DIR]      Include OpenSSL support (requires OpenSSL >= 1.0.1)])
++[  --with-openssl[=DIR]      Include OpenSSL support (requires OpenSSL >= 1.0.0)])
+
+ PHP_ARG_WITH(kerberos, for Kerberos support,
+ [  --with-kerberos[=DIR]     OPENSSL: Include Kerberos support], no, no)
Index: 7.1/patches/patch-ext_standard_config_m4
===================================================================
RCS file: 7.1/patches/patch-ext_standard_config_m4
diff -N 7.1/patches/patch-ext_standard_config_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-ext_standard_config_m4 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,36 @@
+$OpenBSD$
+--- ext/standard/config.m4.orig.port Wed May 24 17:11:41 2017
++++ ext/standard/config.m4 Wed May 24 17:12:02 2017
+@@ -310,31 +310,7 @@ else
+   AC_MSG_RESULT(no)
+ fi
+
+-PHP_ENABLE_CHROOT_FUNC=no
+-case "$PHP_SAPI" in
+-  embed)
+-    PHP_ENABLE_CHROOT_FUNC=yes
+-  ;;
+-
+-  none)
+-    for PROG in $PHP_BINARIES; do
+-      case "$PROG" in
+-        cgi|cli)
+-          PHP_ENABLE_CHROOT_FUNC=yes
+-        ;;
+-
+-        *)
+-          PHP_ENABLE_CHROOT_FUNC=no
+-          break
+-        ;;
+-      esac
+-   done
+-  ;;
+-esac
+-
+-if test "$PHP_ENABLE_CHROOT_FUNC" = "yes"; then
+-  AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
+-fi
++AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
+
+ dnl
+ dnl Detect library functions needed by php dns_xxx functions
Index: 7.1/patches/patch-ext_tidy_config_m4
===================================================================
RCS file: 7.1/patches/patch-ext_tidy_config_m4
diff -N 7.1/patches/patch-ext_tidy_config_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-ext_tidy_config_m4 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,20 @@
+$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 Tue May  9 14:29:39 2017
++++ ext/tidy/config.m4 Wed May 24 14:20:21 2017
+@@ -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
+
Index: 7.1/patches/patch-ext_tidy_tidy_c
===================================================================
RCS file: 7.1/patches/patch-ext_tidy_tidy_c
diff -N 7.1/patches/patch-ext_tidy_tidy_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-ext_tidy_tidy_c 8 Jul 2017 18:28:19 -0000
@@ -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 Tue May  9 14:29:39 2017
++++ ext/tidy/tidy.c Wed May 24 14:32:01 2017
+@@ -30,7 +30,7 @@
+ #include "php_ini.h"
+ #include "ext/standard/info.h"
+
+-#include "tidy.h"
++#include "tidyp.h"
+
+ #if HAVE_TIDYBUFFIO_H
+ #include "tidybuffio.h"
Index: 7.1/patches/patch-main_php_ini_c
===================================================================
RCS file: 7.1/patches/patch-main_php_ini_c
diff -N 7.1/patches/patch-main_php_ini_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-main_php_ini_c 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,12 @@
+$OpenBSD: patch-main_php_ini_c,v 1.3 2017/01/22 17:01:32 martijn Exp $
+--- main/php_ini.c.orig.port Tue May  9 14:29:42 2017
++++ main/php_ini.c Wed May 24 15:00:20 2017
+@@ -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);
+ }
Index: 7.1/patches/patch-main_streams_php_stream_transport_h
===================================================================
RCS file: 7.1/patches/patch-main_streams_php_stream_transport_h
diff -N 7.1/patches/patch-main_streams_php_stream_transport_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-main_streams_php_stream_transport_h 8 Jul 2017 18:28:19 -0000
@@ -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;
+
Index: 7.1/patches/patch-php_ini-development
===================================================================
RCS file: 7.1/patches/patch-php_ini-development
diff -N 7.1/patches/patch-php_ini-development
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-php_ini-development 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,59 @@
+$OpenBSD: patch-php_ini-development,v 1.5 2016/10/31 15:06:10 robert Exp $
+--- php.ini-development.orig.port Tue May  9 14:29:42 2017
++++ php.ini-development Wed May 24 14:20:21 2017
+@@ -710,11 +710,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
+
+@@ -736,6 +733,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)
+@@ -832,7 +830,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
+@@ -936,7 +934,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
+@@ -1029,16 +1027,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 = [hidden email]
+-
+ ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
+ ; http://php.net/sendmail-path
+ ;sendmail_path =
Index: 7.1/patches/patch-php_ini-production
===================================================================
RCS file: 7.1/patches/patch-php_ini-production
diff -N 7.1/patches/patch-php_ini-production
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-php_ini-production 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,42 @@
+$OpenBSD: patch-php_ini-production,v 1.4 2016/10/31 15:06:10 robert Exp $
+--- php.ini-production.orig.port Tue May  9 14:29:42 2017
++++ php.ini-production Wed May 24 14:20:21 2017
+@@ -710,11 +710,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
+
+@@ -736,6 +733,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)
+@@ -832,7 +830,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
+@@ -936,7 +934,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
Index: 7.1/patches/patch-sapi_fpm_fpm_fpm_atomic_h
===================================================================
RCS file: 7.1/patches/patch-sapi_fpm_fpm_fpm_atomic_h
diff -N 7.1/patches/patch-sapi_fpm_fpm_fpm_atomic_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-sapi_fpm_fpm_fpm_atomic_h 8 Jul 2017 18:28:19 -0000
@@ -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
+
Index: 7.1/patches/patch-sapi_fpm_www_conf_in
===================================================================
RCS file: 7.1/patches/patch-sapi_fpm_www_conf_in
diff -N 7.1/patches/patch-sapi_fpm_www_conf_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-sapi_fpm_www_conf_in 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,21 @@
+$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)
+@@ -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.
Index: 7.1/patches/patch-scripts_Makefile_frag
===================================================================
RCS file: 7.1/patches/patch-scripts_Makefile_frag
diff -N 7.1/patches/patch-scripts_Makefile_frag
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-scripts_Makefile_frag 8 Jul 2017 18:28:19 -0000
@@ -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 \
Index: 7.1/patches/patch-scripts_php-config_in
===================================================================
RCS file: 7.1/patches/patch-scripts_php-config_in
diff -N 7.1/patches/patch-scripts_php-config_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-scripts_php-config_in 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,33 @@
+$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 Tue May  9 14:29:42 2017
++++ scripts/php-config.in Sun Jun  4 20:06:49 2017
+@@ -1,13 +1,13 @@
+ #! /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"
+-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"
++include_dir="@PEAR_INSTALLDIR@/include"
++includes="-I/usr/local/include -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@"
+ extension_dir='@EXTENSION_DIR@'
+@@ -24,10 +24,10 @@ 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
Index: 7.1/patches/patch-scripts_phpize_in
===================================================================
RCS file: 7.1/patches/patch-scripts_phpize_in
diff -N 7.1/patches/patch-scripts_phpize_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-scripts_phpize_in 8 Jul 2017 18:28:19 -0000
@@ -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@"
+
Index: 7.1/patches/patch-scripts_phpize_m4
===================================================================
RCS file: 7.1/patches/patch-scripts_phpize_m4
diff -N 7.1/patches/patch-scripts_phpize_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/patches/patch-scripts_phpize_m4 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- scripts/phpize.m4.orig.port Fri Jun  2 21:36:25 2017
++++ scripts/phpize.m4 Fri Jun  2 21:36:41 2017
+@@ -36,7 +36,7 @@ PHP_SHLIB_SUFFIX_NAMES
+
+ dnl Find php-config script
+ PHP_ARG_WITH(php-config,,
+-[  --with-php-config=PATH  Path to php-config [php-config]], php-config, no)
++[  --with-php-config=PATH  Path to php-config [php-config]], php-config-${PV}, no)
+
+ dnl For BC
+ PHP_CONFIG=$PHP_PHP_CONFIG
Index: 7.1/pkg/PLIST-apxs2
===================================================================
RCS file: 7.1/pkg/PLIST-apxs2
diff -N 7.1/pkg/PLIST-apxs2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-apxs2 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-apxs2->=7.1,<7.2
+lib/php-${PV}/libphp7.so
+share/examples/php-${PV}/php.conf
+@sample /var/www/conf/modules.sample/php-${PV}.conf
Index: 7.1/pkg/PLIST-bcmath
===================================================================
RCS file: 7.1/pkg/PLIST-bcmath
diff -N 7.1/pkg/PLIST-bcmath
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-bcmath 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-bcmath->=7.1,<7.2
+lib/php-${PV}/modules/bcmath.so
+share/examples/php-${PV}/bcmath.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/bcmath.ini
Index: 7.1/pkg/PLIST-bz2
===================================================================
RCS file: 7.1/pkg/PLIST-bz2
diff -N 7.1/pkg/PLIST-bz2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-bz2 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-bz2,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-bz2->=7.1,<7.2
+lib/php-${PV}/modules/bz2.so
+share/examples/php-${PV}/bz2.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/bz2.ini
Index: 7.1/pkg/PLIST-calendar
===================================================================
RCS file: 7.1/pkg/PLIST-calendar
diff -N 7.1/pkg/PLIST-calendar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-calendar 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-calendar->=7.1,<7.2
+lib/php-${PV}/modules/calendar.so
+share/examples/php-${PV}/calendar.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/calendar.ini
Index: 7.1/pkg/PLIST-cgi
===================================================================
RCS file: 7.1/pkg/PLIST-cgi
diff -N 7.1/pkg/PLIST-cgi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-cgi 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-cgi->=7.1,<7.2
+@bin bin/php-cgi-${PV}
+@man man/man1/php-cgi-${PV}.1
Index: 7.1/pkg/PLIST-cli
===================================================================
RCS file: 7.1/pkg/PLIST-cli
diff -N 7.1/pkg/PLIST-cli
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-cli 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-cli->=7.1,<7.2
+@bin bin/php-${PV}
+@man man/man1/php-${PV}.1
+share/php-${PV}/include/sapi/
+share/php-${PV}/include/sapi/cli/
+share/php-${PV}/include/sapi/cli/cli.h
Index: 7.1/pkg/PLIST-ctype
===================================================================
RCS file: 7.1/pkg/PLIST-ctype
diff -N 7.1/pkg/PLIST-ctype
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-ctype 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-ctype->=7.1,<7.2
+lib/php-${PV}/modules/ctype.so
+share/examples/php-${PV}/ctype.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ctype.ini
Index: 7.1/pkg/PLIST-curl
===================================================================
RCS file: 7.1/pkg/PLIST-curl
diff -N 7.1/pkg/PLIST-curl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-curl 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-curl,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-curl->=7.1,<7.2
+lib/php-${PV}/modules/curl.so
+share/examples/php-${PV}/curl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/curl.ini
Index: 7.1/pkg/PLIST-dba
===================================================================
RCS file: 7.1/pkg/PLIST-dba
diff -N 7.1/pkg/PLIST-dba
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-dba 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-dba,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-dba->=7.1,<7.2
+lib/php-${PV}/modules/dba.so
+share/examples/php-${PV}/dba.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/dba.ini
Index: 7.1/pkg/PLIST-dbg
===================================================================
RCS file: 7.1/pkg/PLIST-dbg
diff -N 7.1/pkg/PLIST-dbg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-dbg 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-dbg->=7.1,<7.2
+@bin bin/phpdbg-${PV}
+@man man/man1/phpdbg-${PV}.1
Index: 7.1/pkg/PLIST-dom
===================================================================
RCS file: 7.1/pkg/PLIST-dom
diff -N 7.1/pkg/PLIST-dom
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-dom 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-dom->=7.1,<7.2
+lib/php-${PV}/modules/dom.so
+share/examples/php-${PV}/dom.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/dom.ini
+share/php-${PV}/include/ext/dom/
+share/php-${PV}/include/ext/dom/xml_common.h
Index: 7.1/pkg/PLIST-enchant
===================================================================
RCS file: 7.1/pkg/PLIST-enchant
diff -N 7.1/pkg/PLIST-enchant
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-enchant 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-enchant->=7.1,<7.2
+lib/php-${PV}/modules/enchant.so
+share/examples/php-${PV}/enchant.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/enchant.ini
Index: 7.1/pkg/PLIST-exif
===================================================================
RCS file: 7.1/pkg/PLIST-exif
diff -N 7.1/pkg/PLIST-exif
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-exif 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-exif->=7.1,<7.2
+lib/php-${PV}/modules/exif.so
+share/examples/php-${PV}/exif.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/exif.ini
Index: 7.1/pkg/PLIST-fileinfo
===================================================================
RCS file: 7.1/pkg/PLIST-fileinfo
diff -N 7.1/pkg/PLIST-fileinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-fileinfo 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-fileinfo->=7.1,<7.2
+lib/php-${PV}/modules/fileinfo.so
+share/examples/php-${PV}/fileinfo.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/fileinfo.ini
Index: 7.1/pkg/PLIST-fpm
===================================================================
RCS file: 7.1/pkg/PLIST-fpm
diff -N 7.1/pkg/PLIST-fpm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-fpm 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-fpm->=7.1,<7.2
+@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
Index: 7.1/pkg/PLIST-ftp
===================================================================
RCS file: 7.1/pkg/PLIST-ftp
diff -N 7.1/pkg/PLIST-ftp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-ftp 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-ftp->=7.1,<7.2
+lib/php-${PV}/modules/ftp.so
+share/examples/php-${PV}/ftp.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ftp.ini
Index: 7.1/pkg/PLIST-gd
===================================================================
RCS file: 7.1/pkg/PLIST-gd
diff -N 7.1/pkg/PLIST-gd
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-gd 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,24 @@
+@comment $OpenBSD: PLIST-gd,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-gd->=7.1,<7.2
+lib/php-${PV}/modules/gd.so
+share/examples/php-${PV}/gd.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/gd.ini
+share/php-${PV}/include/ext/gd/
+share/php-${PV}/include/ext/gd/gd_compat.h
+share/php-${PV}/include/ext/gd/gdcache.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
Index: 7.1/pkg/PLIST-gettext
===================================================================
RCS file: 7.1/pkg/PLIST-gettext
diff -N 7.1/pkg/PLIST-gettext
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-gettext 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-gettext->=7.1,<7.2
+lib/php-${PV}/modules/gettext.so
+share/examples/php-${PV}/gettext.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/gettext.ini
Index: 7.1/pkg/PLIST-gmp
===================================================================
RCS file: 7.1/pkg/PLIST-gmp
diff -N 7.1/pkg/PLIST-gmp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-gmp 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-gmp,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-gmp->=7.1,<7.2
+lib/php-${PV}/modules/gmp.so
+share/examples/php-${PV}/gmp.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/gmp.ini
Index: 7.1/pkg/PLIST-iconv
===================================================================
RCS file: 7.1/pkg/PLIST-iconv
diff -N 7.1/pkg/PLIST-iconv
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-iconv 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,19 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-iconv->=7.1,<7.2
+lib/php-${PV}/modules/iconv.so
+share/examples/php-${PV}/iconv.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/iconv.ini
+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
Index: 7.1/pkg/PLIST-imap
===================================================================
RCS file: 7.1/pkg/PLIST-imap
diff -N 7.1/pkg/PLIST-imap
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-imap 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD: PLIST-imap,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-imap->=7.1,<7.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
Index: 7.1/pkg/PLIST-intl
===================================================================
RCS file: 7.1/pkg/PLIST-intl
diff -N 7.1/pkg/PLIST-intl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-intl 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-intl,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-intl->=7.1,<7.2
+lib/php-${PV}/modules/intl.so
+share/examples/php-${PV}/intl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/intl.ini
Index: 7.1/pkg/PLIST-json
===================================================================
RCS file: 7.1/pkg/PLIST-json
diff -N 7.1/pkg/PLIST-json
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-json 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-json->=7.1,<7.2
+lib/php-${PV}/modules/json.so
+share/examples/php-${PV}/json.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/json.ini
+share/php-${PV}/include/ext/json/
+share/php-${PV}/include/ext/json/php_json.h
Index: 7.1/pkg/PLIST-ldap
===================================================================
RCS file: 7.1/pkg/PLIST-ldap
diff -N 7.1/pkg/PLIST-ldap
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-ldap 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-ldap,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-ldap->=7.1,<7.2
+lib/php-${PV}/modules/ldap.so
+share/examples/php-${PV}/ldap.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ldap.ini
Index: 7.1/pkg/PLIST-main
===================================================================
RCS file: 7.1/pkg/PLIST-main
diff -N 7.1/pkg/PLIST-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-main 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,267 @@
+@comment $OpenBSD: PLIST-main,v 1.6 2017/04/25 11:21:14 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php->=7.1,<7.2
+@extraunexec rm -f ${SYSCONFDIR}/php-${PV}/php-${PV}.sample/*
+@mode 1700
+@owner www
+@group www
+@sample /var/www/tmp/
+@mode
+@owner
+@group
+bin/php-config-${PV}
+bin/phpize-${PV}
+lib/php-${PV}/
+lib/php-${PV}/modules/
+@man man/man1/php-config-${PV}.1
+@man man/man1/phpize-${PV}.1
+share/doc/pkg-readmes/${FULLPKGNAME}
+share/examples/php-${PV}/
+@sample /var/www/conf/modules.sample/
+@sample ${SYSCONFDIR}/php-${PV}.sample/
+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/ax_check_compile_flag.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_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_ast.h
+share/php-${PV}/include/Zend/zend_bitset.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/filter/
+share/php-${PV}/include/ext/filter/php_filter.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/libxml/
+share/php-${PV}/include/ext/libxml/php_libxml.h
+share/php-${PV}/include/ext/pcre/
+share/php-${PV}/include/ext/pcre/php_pcre.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/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/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/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
+@sample ${SYSCONFDIR}/php-${PV}/
Index: 7.1/pkg/PLIST-mbstring
===================================================================
RCS file: 7.1/pkg/PLIST-mbstring
diff -N 7.1/pkg/PLIST-mbstring
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-mbstring 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,29 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-mbstring->=7.1,<7.2
+lib/php-${PV}/modules/mbstring.so
+share/examples/php-${PV}/mbstring.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mbstring.ini
+share/php-${PV}/include/ext/mbstring/
+share/php-${PV}/include/ext/mbstring/mbstring.h
+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/php_mbregex.h
+share/php-${PV}/include/ext/mbstring/php_onig_compat.h
Index: 7.1/pkg/PLIST-mcrypt
===================================================================
RCS file: 7.1/pkg/PLIST-mcrypt
diff -N 7.1/pkg/PLIST-mcrypt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-mcrypt 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-mcrypt,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-mcrypt->=7.1,<7.2
+lib/php-${PV}/modules/mcrypt.so
+share/examples/php-${PV}/mcrypt.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mcrypt.ini
Index: 7.1/pkg/PLIST-mysqli
===================================================================
RCS file: 7.1/pkg/PLIST-mysqli
diff -N 7.1/pkg/PLIST-mysqli
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-mysqli 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD: PLIST-mysqli,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-mysqli->=7.1,<7.2
+lib/php-${PV}/modules/mysqli.so
+share/examples/php-${PV}/mysqli.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mysqli.ini
+share/php-${PV}/include/ext/mysqli/
+share/php-${PV}/include/ext/mysqli/mysqli_mysqlnd.h
+share/php-${PV}/include/ext/mysqli/php_mysqli_structs.h
Index: 7.1/pkg/PLIST-mysqlnd
===================================================================
RCS file: 7.1/pkg/PLIST-mysqlnd
diff -N 7.1/pkg/PLIST-mysqlnd
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-mysqlnd 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,27 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-mysqlnd->=7.1,<7.2
+lib/php-${PV}/modules/mysqlnd.so
+share/examples/php-${PV}/mysqlnd.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mysqlnd.ini
+share/php-${PV}/include/ext/mysqlnd/
+share/php-${PV}/include/ext/mysqlnd/config-win.h
+share/php-${PV}/include/ext/mysqlnd/mysql_float_to_double.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_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/php_mysqlnd.h
Index: 7.1/pkg/PLIST-odbc
===================================================================
RCS file: 7.1/pkg/PLIST-odbc
diff -N 7.1/pkg/PLIST-odbc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-odbc 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-odbc,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-odbc->=7.1,<7.2
+lib/php-${PV}/modules/odbc.so
+share/examples/php-${PV}/odbc.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/odbc.ini
Index: 7.1/pkg/PLIST-opcache
===================================================================
RCS file: 7.1/pkg/PLIST-opcache
diff -N 7.1/pkg/PLIST-opcache
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-opcache 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-opcache->=7.1,<7.2
+lib/php-${PV}/modules/opcache.so
+share/examples/php-${PV}/opcache.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini
Index: 7.1/pkg/PLIST-pcntl
===================================================================
RCS file: 7.1/pkg/PLIST-pcntl
diff -N 7.1/pkg/PLIST-pcntl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-pcntl 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pcntl,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pcntl->=7.1,<7.2
+lib/php-${PV}/modules/pcntl.so
+share/examples/php-${PV}/pcntl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pcntl.ini
Index: 7.1/pkg/PLIST-pdo
===================================================================
RCS file: 7.1/pkg/PLIST-pdo
diff -N 7.1/pkg/PLIST-pdo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-pdo 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,11 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo->=7.1,<7.2
+lib/php-${PV}/modules/pdo.so
+share/examples/php-${PV}/pdo.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo.ini
+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
Index: 7.1/pkg/PLIST-pdo_dblib
===================================================================
RCS file: 7.1/pkg/PLIST-pdo_dblib
diff -N 7.1/pkg/PLIST-pdo_dblib
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-pdo_dblib 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pdo_dblib,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_dblib->=7.1,<7.2
+lib/php-${PV}/modules/pdo_dblib.so
+share/examples/php-${PV}/pdo_dblib.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_dblib.ini
Index: 7.1/pkg/PLIST-pdo_mysql
===================================================================
RCS file: 7.1/pkg/PLIST-pdo_mysql
diff -N 7.1/pkg/PLIST-pdo_mysql
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-pdo_mysql 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pdo_mysql,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_mysql->=7.1,<7.2
+lib/php-${PV}/modules/pdo_mysql.so
+share/examples/php-${PV}/pdo_mysql.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_mysql.ini
Index: 7.1/pkg/PLIST-pdo_pgsql
===================================================================
RCS file: 7.1/pkg/PLIST-pdo_pgsql
diff -N 7.1/pkg/PLIST-pdo_pgsql
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-pdo_pgsql 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pdo_pgsql,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_pgsql->=7.1,<7.2
+lib/php-${PV}/modules/pdo_pgsql.so
+share/examples/php-${PV}/pdo_pgsql.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_pgsql.ini
Index: 7.1/pkg/PLIST-pdo_sqlite
===================================================================
RCS file: 7.1/pkg/PLIST-pdo_sqlite
diff -N 7.1/pkg/PLIST-pdo_sqlite
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-pdo_sqlite 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_sqlite->=7.1,<7.2
+lib/php-${PV}/modules/pdo_sqlite.so
+share/examples/php-${PV}/pdo_sqlite.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_sqlite.ini
Index: 7.1/pkg/PLIST-pgsql
===================================================================
RCS file: 7.1/pkg/PLIST-pgsql
diff -N 7.1/pkg/PLIST-pgsql
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-pgsql 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pgsql,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pgsql->=7.1,<7.2
+lib/php-${PV}/modules/pgsql.so
+share/examples/php-${PV}/pgsql.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pgsql.ini
Index: 7.1/pkg/PLIST-phar
===================================================================
RCS file: 7.1/pkg/PLIST-phar
diff -N 7.1/pkg/PLIST-phar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-phar 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,11 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-phar->=7.1,<7.2
+bin/phar-${PV}
+@man man/man1/phar-${PV}.1
+lib/php-${PV}/modules/phar.so
+share/examples/php-${PV}/phar.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/phar.ini
+share/php-${PV}/include/ext/phar/
+share/php-${PV}/include/ext/phar/php_phar.h
Index: 7.1/pkg/PLIST-posix
===================================================================
RCS file: 7.1/pkg/PLIST-posix
diff -N 7.1/pkg/PLIST-posix
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-posix 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-posix->=7.1,<7.2
+lib/php-${PV}/modules/posix.so
+share/examples/php-${PV}/posix.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/posix.ini
Index: 7.1/pkg/PLIST-pspell
===================================================================
RCS file: 7.1/pkg/PLIST-pspell
diff -N 7.1/pkg/PLIST-pspell
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-pspell 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pspell,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pspell->=7.1,<7.2
+lib/php-${PV}/modules/pspell.so
+share/examples/php-${PV}/pspell.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pspell.ini
Index: 7.1/pkg/PLIST-readline
===================================================================
RCS file: 7.1/pkg/PLIST-readline
diff -N 7.1/pkg/PLIST-readline
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-readline 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-readline->=7.1,<7.2
+lib/php-${PV}/modules/readline.so
+share/examples/php-${PV}/readline.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/readline.ini
Index: 7.1/pkg/PLIST-shmop
===================================================================
RCS file: 7.1/pkg/PLIST-shmop
diff -N 7.1/pkg/PLIST-shmop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-shmop 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-shmop,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-shmop->=7.1,<7.2
+lib/php-${PV}/modules/shmop.so
+share/examples/php-${PV}/shmop.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/shmop.ini
Index: 7.1/pkg/PLIST-simplexml
===================================================================
RCS file: 7.1/pkg/PLIST-simplexml
diff -N 7.1/pkg/PLIST-simplexml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-simplexml 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-simplexml->=7.1,<7.2
+lib/php-${PV}/modules/simplexml.so
+share/examples/php-${PV}/simplexml.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/simplexml.ini
+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
Index: 7.1/pkg/PLIST-snmp
===================================================================
RCS file: 7.1/pkg/PLIST-snmp
diff -N 7.1/pkg/PLIST-snmp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-snmp 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-snmp,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-snmp->=7.1,<7.2
+lib/php-${PV}/modules/snmp.so
+share/examples/php-${PV}/snmp.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/snmp.ini
Index: 7.1/pkg/PLIST-soap
===================================================================
RCS file: 7.1/pkg/PLIST-soap
diff -N 7.1/pkg/PLIST-soap
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-soap 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-soap,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-soap->=7.1,<7.2
+lib/php-${PV}/modules/soap.so
+share/examples/php-${PV}/soap.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/soap.ini
Index: 7.1/pkg/PLIST-sockets
===================================================================
RCS file: 7.1/pkg/PLIST-sockets
diff -N 7.1/pkg/PLIST-sockets
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-sockets 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sockets->=7.1,<7.2
+lib/php-${PV}/modules/sockets.so
+share/examples/php-${PV}/sockets.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sockets.ini
+share/php-${PV}/include/ext/sockets/
+share/php-${PV}/include/ext/sockets/php_sockets.h
Index: 7.1/pkg/PLIST-sqlite3
===================================================================
RCS file: 7.1/pkg/PLIST-sqlite3
diff -N 7.1/pkg/PLIST-sqlite3
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-sqlite3 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sqlite3->=7.1,<7.2
+lib/php-${PV}/modules/sqlite3.so
+share/examples/php-${PV}/sqlite3.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sqlite3.ini
Index: 7.1/pkg/PLIST-sysvmsg
===================================================================
RCS file: 7.1/pkg/PLIST-sysvmsg
diff -N 7.1/pkg/PLIST-sysvmsg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-sysvmsg 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvmsg->=7.1,<7.2
+lib/php-${PV}/modules/sysvmsg.so
+share/examples/php-${PV}/sysvmsg.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvmsg.ini
Index: 7.1/pkg/PLIST-sysvsem
===================================================================
RCS file: 7.1/pkg/PLIST-sysvsem
diff -N 7.1/pkg/PLIST-sysvsem
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-sysvsem 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvsem->=7.1,<7.2
+lib/php-${PV}/modules/sysvsem.so
+share/examples/php-${PV}/sysvsem.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvsem.ini
Index: 7.1/pkg/PLIST-sysvshm
===================================================================
RCS file: 7.1/pkg/PLIST-sysvshm
diff -N 7.1/pkg/PLIST-sysvshm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-sysvshm 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvshm->=7.1,<7.2
+lib/php-${PV}/modules/sysvshm.so
+share/examples/php-${PV}/sysvshm.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvshm.ini
Index: 7.1/pkg/PLIST-tidy
===================================================================
RCS file: 7.1/pkg/PLIST-tidy
diff -N 7.1/pkg/PLIST-tidy
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-tidy 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-tidy,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-tidy->=7.1,<7.2
+lib/php-${PV}/modules/tidy.so
+share/examples/php-${PV}/tidy.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/tidy.ini
Index: 7.1/pkg/PLIST-tokenizer
===================================================================
RCS file: 7.1/pkg/PLIST-tokenizer
diff -N 7.1/pkg/PLIST-tokenizer
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-tokenizer 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-tokenizer->=7.1,<7.2
+lib/php-${PV}/modules/tokenizer.so
+share/examples/php-${PV}/tokenizer.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/tokenizer.ini
Index: 7.1/pkg/PLIST-wddx
===================================================================
RCS file: 7.1/pkg/PLIST-wddx
diff -N 7.1/pkg/PLIST-wddx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-wddx 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-wddx->=7.1,<7.2
+lib/php-${PV}/modules/wddx.so
+share/examples/php-${PV}/wddx.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/wddx.ini
Index: 7.1/pkg/PLIST-xml
===================================================================
RCS file: 7.1/pkg/PLIST-xml
diff -N 7.1/pkg/PLIST-xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-xml 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xml->=7.1,<7.2
+lib/php-${PV}/modules/xml.so
+share/examples/php-${PV}/xml.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xml.ini
+share/php-${PV}/include/ext/xml/
+share/php-${PV}/include/ext/xml/expat_compat.h
+share/php-${PV}/include/ext/xml/php_xml.h
Index: 7.1/pkg/PLIST-xmlreader
===================================================================
RCS file: 7.1/pkg/PLIST-xmlreader
diff -N 7.1/pkg/PLIST-xmlreader
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-xmlreader 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlreader->=7.1,<7.2
+lib/php-${PV}/modules/xmlreader.so
+share/examples/php-${PV}/xmlreader.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlreader.ini
Index: 7.1/pkg/PLIST-xmlrpc
===================================================================
RCS file: 7.1/pkg/PLIST-xmlrpc
diff -N 7.1/pkg/PLIST-xmlrpc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-xmlrpc 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-xmlrpc,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlrpc->=7.1,<7.2
+lib/php-${PV}/modules/xmlrpc.so
+share/examples/php-${PV}/xmlrpc.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlrpc.ini
Index: 7.1/pkg/PLIST-xmlwriter
===================================================================
RCS file: 7.1/pkg/PLIST-xmlwriter
diff -N 7.1/pkg/PLIST-xmlwriter
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-xmlwriter 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlwriter->=7.1,<7.2
+lib/php-${PV}/modules/xmlwriter.so
+share/examples/php-${PV}/xmlwriter.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlwriter.ini
Index: 7.1/pkg/PLIST-xsl
===================================================================
RCS file: 7.1/pkg/PLIST-xsl
diff -N 7.1/pkg/PLIST-xsl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-xsl 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-xsl,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-xsl->=7.1,<7.2
+lib/php-${PV}/modules/xsl.so
+share/examples/php-${PV}/xsl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xsl.ini
Index: 7.1/pkg/PLIST-zip
===================================================================
RCS file: 7.1/pkg/PLIST-zip
diff -N 7.1/pkg/PLIST-zip
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/PLIST-zip 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-zip,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-zip->=7.1,<7.2
+lib/php-${PV}/modules/zip.so
+share/examples/php-${PV}/zip.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/zip.ini
Index: 7.1/pkg/php71_fpm.rc
===================================================================
RCS file: 7.1/pkg/php71_fpm.rc
diff -N 7.1/pkg/php71_fpm.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.1/pkg/php71_fpm.rc 8 Jul 2017 18:28:19 -0000
@@ -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
Index: files/DESCR-apxs2
===================================================================
RCS file: files/DESCR-apxs2
diff -N files/DESCR-apxs2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-apxs2 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1 @@
+This is the PHP apache2 shared module.
Index: files/DESCR-bcmath
===================================================================
RCS file: files/DESCR-bcmath
diff -N files/DESCR-bcmath
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-bcmath 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,3 @@
+For arbitrary precision mathematics PHP offers the Binary Calculator
+which supports numbers of any size and precision up to
+2147483647-1 (or 0x7FFFFFFF-1) decimals, represented as strings.
Index: files/DESCR-calendar
===================================================================
RCS file: files/DESCR-calendar
diff -N files/DESCR-calendar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-calendar 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,11 @@
+The calendar extension presents a series of functions to simplify
+converting between different calendar formats. The intermediary or
+standard it is based on is the Julian Day Count. The Julian Day Count
+is a count of days starting from January 1st, 4713 B.C. To convert
+between calendar systems, you must first convert to Julian Day Count,
+then to the calendar system of your choice. Julian Day Count is very
+different from the Julian Calendar! For more information on Julian Day
+Count, visit http://www.hermetic.ch/cal_stud/jdn.htm. For more
+information on calendar systems visit
+http://www.fourmilab.ch/documents/calendar/. Excerpts from this page
+are included in these instructions, and are in quotes.
Index: files/DESCR-cgi
===================================================================
RCS file: files/DESCR-cgi
diff -N files/DESCR-cgi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-cgi 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1 @@
+CGI is the PHP FastCGI and CGI implementation.
Index: files/DESCR-cli
===================================================================
RCS file: files/DESCR-cli
diff -N files/DESCR-cli
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-cli 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1 @@
+The standard commandline interface for PHP
Index: files/DESCR-ctype
===================================================================
RCS file: files/DESCR-ctype
diff -N files/DESCR-ctype
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-ctype 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,3 @@
+The functions provided by this extension check whether a character or
+string falls into a certain character class according to the current
+locale.
Index: files/DESCR-curl
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-curl,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 DESCR-curl
--- files/DESCR-curl 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ files/DESCR-curl 8 Jul 2017 18:28:19 -0000
@@ -2,7 +2,7 @@ PHP supports libcurl, a library created
 allows you to connect and communicate to many different types of
 servers with many different types of protocols. libcurl currently
 supports the http, https, ftp, gopher, telnet, dict, file, and ldap
-protocols. libcurl also supports HTTPS certificates, HTTP POST,
-HTTP PUT, FTP uploading (this can also be done with PHP's ftp
-extension), HTTP form based upload, proxies, cookies, and user+password
+protocols. libcurl also supports HTTPS certificates, HTTP POST, HTTP
+PUT, FTP uploading (this can also be done with PHP's ftp extension),
+HTTP form based upload, proxies, cookies, and user+password
 authentication.
Index: files/DESCR-dba
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-dba,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 DESCR-dba
--- files/DESCR-dba 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ files/DESCR-dba 8 Jul 2017 18:28:19 -0000
@@ -3,6 +3,4 @@ databases.
 
 This is a general abstraction layer for several file-based databases.
 As such, functionality is limited to a common subset of features
-supported by modern databases such as Sleepycat Software's DB2.
-(This is not to be confused with IBM's DB2 software, which is
-supported through the ODBC functions.)
+supported by modern databases such as Oracle Berkeley DB.
Index: files/DESCR-dbase
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-dbase,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 DESCR-dbase
--- files/DESCR-dbase 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ files/DESCR-dbase 8 Jul 2017 18:28:19 -0000
@@ -1,17 +1,2 @@
 These functions allow you to access records stored in dBase-format
 (dbf) databases.
-
-There is no support for indexes or memo fields. There is no support
-for locking, too. Two concurrent webserver processes modifying the
-same dBase file will very likely ruin your database.
-
-dBase files are simple sequential files of fixed length records.
-Records are appended to the end of the file and delete records are
-kept until you call dbase_pack().
-
-We recommend that you do not use dBase files as your production
-database. Choose any real SQL server instead; MySQL or Postgres are
-common choices with PHP. dBase support is here to allow you to
-import and export data to and from your web database, because the
-file format is commonly understood by Windows spreadsheets and
-organizers.
Index: files/DESCR-dbg
===================================================================
RCS file: files/DESCR-dbg
diff -N files/DESCR-dbg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-dbg 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,6 @@
+Implemented as a SAPI module, phpdbg can excert complete control over
+the environment without impacting the functionality or performance of
+your code.
+
+phpdbg aims to be a lightweight, powerful, easy to use debugging
+platform for PHP5.4+.
Index: files/DESCR-dom
===================================================================
RCS file: files/DESCR-dom
diff -N files/DESCR-dom
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-dom 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,2 @@
+The DOM extension allows you to operate on XML documents through the
+DOM API with PHP.
Index: files/DESCR-enchant
===================================================================
RCS file: files/DESCR-enchant
diff -N files/DESCR-enchant
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-enchant 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,5 @@
+Enchant is the PHP binding for the » Enchant library. Enchant steps in
+to provide uniformity and conformity on top of all spelling libraries,
+and implement certain features that may be lacking in any individual
+provider library. Everything should "just work" for any and every
+definition of "just working."
Index: files/DESCR-exif
===================================================================
RCS file: files/DESCR-exif
diff -N files/DESCR-exif
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-exif 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,4 @@
+With the exif extension you are able to work with image meta data. For
+example, you may use exif functions to read meta data of pictures
+taken from digital cameras by working with information stored in the
+headers of the JPEG and TIFF images.
Index: files/DESCR-fastcgi
===================================================================
RCS file: files/DESCR-fastcgi
diff -N files/DESCR-fastcgi
--- files/DESCR-fastcgi 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-This is the core PHP binary compiled with FastCGI support
-(www.fastcgi.com). FastCGI deployments are generally faster than
-using PHP as a CGI, since the processes stay resident in memory
-between requests.
Index: files/DESCR-fileinfo
===================================================================
RCS file: files/DESCR-fileinfo
diff -N files/DESCR-fileinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-fileinfo 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,4 @@
+The functions in this module try to guess the content type and
+encoding of a file by looking for certain magic byte sequences at
+specific positions within the file. While this is not a bullet proof
+approach the heuristics used do a very good job.
Index: files/DESCR-fpm
===================================================================
RCS file: files/DESCR-fpm
diff -N files/DESCR-fpm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-fpm 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,3 @@
+FPM (FastCGI Process Manager) is an alternative PHP FastCGI
+implementation with some additional features (mostly) useful for
+heavy-loaded sites.
Index: files/DESCR-ftp
===================================================================
RCS file: files/DESCR-ftp
diff -N files/DESCR-ftp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-ftp 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+The functions in this extension implement client access to files
+servers speaking the File Transfer Protocol (FTP) as defined in
+http://www.faqs.org/rfcs/rfc959. This extension is meant for detailed
+access to an FTP server providing a wide range of control to the
+executing script. If you only wish to read from or write to a file on
+an FTP server, consider using the ftp:// wrapper with the filesystem
+functions which provide a simpler and more intuitive interface.
Index: files/DESCR-gd
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-gd,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 DESCR-gd
--- files/DESCR-gd 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ files/DESCR-gd 8 Jul 2017 18:28:19 -0000
@@ -1,12 +1,4 @@
-You can use the image functions in PHP to get the size of JPEG,
-GIF, PNG, SWF, TIFF and JPEG2000 images.
-
-By using the GD library, you will also be able to create and
-manipulate images. Support for TrueType and PostScript fonts
-is also included.
-
-The format of images you are able to manipulate depend on the version
-of GD you install, and any other libraries GD might need to access
-those image formats. Versions of GD older than gd-1.6 support gif
-format images, and do not support png, where versions greater than
-gd-1.6 support png, not gif.
+PHP is not limited to creating just HTML output. It can also be used
+to create and manipulate image files in a variety of different image
+formats, including GIF, PNG, JPEG, WBMP, and XPM. Even more
+conveniently, PHP can output image streams directly to a browser.
Index: files/DESCR-gettext
===================================================================
RCS file: files/DESCR-gettext
diff -N files/DESCR-gettext
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-gettext 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,5 @@
+The gettext functions implement an NLS (Native Language Support) API
+which can be used to internationalize your PHP applications. Please
+see the gettext documentation for your system for a thorough
+explanation of these functions or view the docs at
+http://www.gnu.org/software/gettext/manual/gettext.html.
Index: files/DESCR-iconv
===================================================================
RCS file: files/DESCR-iconv
diff -N files/DESCR-iconv
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-iconv 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,8 @@
+This module contains an interface to iconv character set conversion
+facility. With this module, you can turn a string represented by a
+local character set into the one represented by another character set,
+which may be the Unicode character set. Supported character sets
+depend on the iconv implementation of your system. Note that the iconv
+function on some systems may not work as you expect. In such case,
+it'd be a good idea to install the GNU libiconv library. It will
+most likely end up with more consistent results.
Index: files/DESCR-json
===================================================================
RCS file: files/DESCR-json
diff -N files/DESCR-json
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-json 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,5 @@
+This extension implements the JavaScript Object Notation (JSON)
+data-interchange format. The decoding in PHP 5 is handled by a parser
+based on the JSON_checker by Douglas Crockford. PHP 7 comes with a
+completely new and improved parser that is specifically written for
+PHP and licensed under the PHP license.
Index: files/DESCR-main
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-main,v
retrieving revision 1.3
diff -u -p -a -u -r1.3 DESCR-main
--- files/DESCR-main 20 Mar 2014 13:02:19 -0000 1.3
+++ files/DESCR-main 8 Jul 2017 18:28:19 -0000
@@ -6,7 +6,9 @@ PHP also has support for talking to othe
 as IMAP, SNMP, NNTP, POP3, or even HTTP. You can also open raw network
 sockets and interact using other protocols.
 
-This package installs a stand-alone binary which can be used for
-command-line scripts, as well as an Apache module. It also contains the
-pdo_sqlite driver that implements the PHP Data Objects (PDO) interface
-to enable access to SQLite 3 databases.
+This package installs the basics for building extensions. If you want
+to run actual PHP code you need to install one of the available SAPIs:
+  * php-apxs2
+  * php-cgi
+  * php-cli
+  * php-fpm
Index: files/DESCR-mbstring
===================================================================
RCS file: files/DESCR-mbstring
diff -N files/DESCR-mbstring
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-mbstring 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,5 @@
+mbstring provides multibyte specific string functions that help you
+deal with multibyte encodings in PHP. In addition to that, mbstring
+handles character encoding conversion between the possible encoding
+pairs. mbstring is designed to handle Unicode-based encodings such as
+UTF-8 and UCS-2 and many single-byte encodings for convenience.
Index: files/DESCR-mysqli
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-mysqli,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 DESCR-mysqli
--- files/DESCR-mysqli 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ files/DESCR-mysqli 8 Jul 2017 18:28:19 -0000
@@ -1,9 +1,2 @@
-These improved functions allow you to access the functionality provided
-by MySQL 4.1 and above.
-More information about the mysqli extension can be found at
-http://www.php.net/mysqli.
-
-Information about MySQL can be found at http://www.mysql.com/.
-
-Documentation for MySQL can be found at
-http://www.mysql.com/documentation/.
+The mysqli extension allows you to access the functionality provided
+by MySQL 4.1 and above.
Index: files/DESCR-mysqlnd
===================================================================
RCS file: files/DESCR-mysqlnd
diff -N files/DESCR-mysqlnd
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-mysqlnd 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,3 @@
+MySQL Native Driver is a replacement for the MySQL Client Library
+(libmysqlclient). MySQL Native Driver is part of the official PHP
+sources as of PHP 5.3.0.
Index: files/DESCR-ncurses
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-ncurses,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 DESCR-ncurses
--- files/DESCR-ncurses 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ files/DESCR-ncurses 8 Jul 2017 18:28:19 -0000
@@ -1,4 +1,6 @@
-ncurses (new curses) is a free software emulation of curses in
-System V Rel 4.0 (and above). It uses terminfo format, supports
-pads, colors, multiple highlights, form characters and function key
-mapping.
+ncurses (new curses) is a free software emulation of curses in System
+V Rel 4.0 (and above). It uses terminfo format, supports pads, colors,
+multiple highlights, form characters and function key mapping. Because
+of the interactive nature of this library, it will be of little use
+for writing Web applications, but may be useful when writing scripts
+meant using PHP from the command line.
Index: files/DESCR-opcache
===================================================================
RCS file: files/DESCR-opcache
diff -N files/DESCR-opcache
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-opcache 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,3 @@
+OPcache improves PHP performance by storing precompiled script
+bytecode in shared memory, thereby removing the need for PHP to load
+and parse scripts on each request.
Index: files/DESCR-pdo
===================================================================
RCS file: files/DESCR-pdo
diff -N files/DESCR-pdo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-pdo 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,6 @@
+The PHP Data Objects (PDO) extension defines a lightweight, consistent
+interface for accessing databases in PHP. Each database driver that
+implements the PDO interface can expose database-specific features as
+regular extension functions. Note that you cannot perform any database
+functions using the PDO extension by itself; you must use a
+database-specific PDO driver to access a database server.
Index: files/DESCR-pdo_dblib
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-pdo_dblib,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 DESCR-pdo_dblib
--- files/DESCR-pdo_dblib 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ files/DESCR-pdo_dblib 8 Jul 2017 18:28:19 -0000
@@ -1,8 +1,3 @@
-The PHP Data Objects (PDO) extension defines a lightweight,
-consistent interface for accessing databases in PHP.
-Each database driver that implements the PDO interface can
-expose database-specific features as regular extension functions.
-
-pdo_dblib is a driver that implements the PHP Data Objects (PDO)
-interface to enable access from PHP to Microsoft SQL Server and
-Sybase databases through the FreeTDS libary.
+PDO_DBLIB is a driver that implements the PHP Data Objects (PDO)
+interface to enable access from PHP to Microsoft SQL Server and Sybase
+databases through the FreeTDS library.
Index: files/DESCR-pdo_mysql
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-pdo_mysql,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 DESCR-pdo_mysql
--- files/DESCR-pdo_mysql 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ files/DESCR-pdo_mysql 8 Jul 2017 18:28:19 -0000
@@ -1,7 +1,3 @@
-The PHP Data Objects (PDO) extension defines a lightweight,
-consistent interface for accessing databases in PHP.
-Each database driver that implements the PDO interface can
-expose database-specific features as regular extension functions.
-
-pdo_mysql is a driver that implements the PHP Data Objects (PDO)
-interface to enable access from PHP to MySQL 3.x, 4.x and 5.x databases.
+PDO_MYSQL is a driver that implements the PHP Data Objects (PDO)
+interface to enable access from PHP to MySQL 3.x, 4.x and 5.x
+databases.
Index: files/DESCR-pdo_pgsql
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-pdo_pgsql,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 DESCR-pdo_pgsql
--- files/DESCR-pdo_pgsql 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ files/DESCR-pdo_pgsql 8 Jul 2017 18:28:19 -0000
@@ -1,7 +1,2 @@
-The PHP Data Objects (PDO) extension defines a lightweight,
-consistent interface for accessing databases in PHP.
-Each database driver that implements the PDO interface can
-expose database-specific features as regular extension functions.
-
-pdo_pgsql is a driver that implements the PHP Data Objects (PDO)
+PDO_PGSQL is a driver that implements the PHP Data Objects (PDO)
 interface to enable access from PHP to PostgreSQL databases.
Index: files/DESCR-pdo_sqlite
===================================================================
RCS file: files/DESCR-pdo_sqlite
diff -N files/DESCR-pdo_sqlite
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-pdo_sqlite 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,2 @@
+PDO_SQLITE is a driver that implements the PHP Data Objects (PDO)
+interface to enable access to SQLite 3 databases.
Index: files/DESCR-pgsql
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-pgsql,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 DESCR-pgsql
--- files/DESCR-pgsql 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ files/DESCR-pgsql 8 Jul 2017 18:28:19 -0000
@@ -1,13 +1,7 @@
-Postgres, developed originally in the UC Berkeley Computer Science
-Department, pioneered many of the object-relational concepts now
-becoming available in some commercial databases. It provides
-SQL92/SQL99 language support, transaction integrity and type
-extensibility. PostgreSQL is an open source descendant of this
-original Berkeley code.
-
-PostgreSQL database is Open Source product and available without
-cost. To use PostgreSQL support, you need PostgreSQL 6.5 or later.
-PostgreSQL 7.0 or later to enable all PostgreSQL module feature.
-PostgreSQL supports many character encoding including multibyte
-character encoding. The current version and more information about
-PostgreSQL is available at http://www.postgresql.org/.
+PostgreSQL database is an Open Source product and available without
+cost. Postgres, developed originally in the UC Berkeley Computer
+Science Department, pioneered many of the object-relational concepts
+now becoming available in some commercial databases. It provides
+SQL92/SQL99 language support, transactions, referential integrity,
+stored procedures and type extensibility. PostgreSQL is an open source
+descendant of this original Berkeley code.
Index: files/DESCR-phar
===================================================================
RCS file: files/DESCR-phar
diff -N files/DESCR-phar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-phar 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+The phar extension provides a way to put entire PHP applications into
+a single file called a "phar" (PHP Archive) for easy distribution and
+installation. In addition to providing this service, the phar
+extension also provides a file-format abstraction method for creating
+and manipulating tar and zip files through the PharData class, much as
+PDO provides a unified interface for accessing different databases.
+Unlike PDO, which cannot convert between different databases, Phar
+also can convert between tar, zip and phar file formats with a single
+line of code. see Phar::convertToExecutable() for one example.
Index: files/DESCR-posix
===================================================================
RCS file: files/DESCR-posix
diff -N files/DESCR-posix
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-posix 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,3 @@
+This module contains an interface to those functions defined in the
+IEEE 1003.1 (POSIX.1) standards document which are not accessible
+through other means.
Index: files/DESCR-pspell
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-pspell,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 DESCR-pspell
--- files/DESCR-pspell 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ files/DESCR-pspell 8 Jul 2017 18:28:19 -0000
@@ -1,2 +1,2 @@
-These functions allow you to check the spelling of a word and offer suggestions.
-More information about Pspell can be found at http://www.php.net/pspell.
+These functions allow you to check the spelling of a word and offer
+suggestions.
Index: files/DESCR-readline
===================================================================
RCS file: files/DESCR-readline
diff -N files/DESCR-readline
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-readline 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+The readline functions implement an interface to the GNU Readline
+library. These are functions that provide editable command lines. An
+example being the way Bash allows you to use the arrow keys to insert
+characters or scroll through command history. Because of the
+interactive nature of this library, it will be of little use for
+writing Web applications, but may be useful when writing scripts used
+from a command line.
Index: files/DESCR-simplexml
===================================================================
RCS file: files/DESCR-simplexml
diff -N files/DESCR-simplexml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-simplexml 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,3 @@
+The SimpleXML extension provides a very simple and easily usable
+toolset to convert XML to an object that can be processed with normal
+property selectors and array iterators.
Index: files/DESCR-soap
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-soap,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 DESCR-soap
--- files/DESCR-soap 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ files/DESCR-soap 8 Jul 2017 18:28:19 -0000
@@ -1,7 +1,2 @@
-SOAP (Simple Object Access Protocol) is a method for access remote
-XML resources on another machine.  It is a standard defined by The
-World Wide Web consortium (W3C).  Information about XSLT and related
-technologies can be found at http://www.w3.org/TR/soap.
-
-This PHP extension provides a processor independent API to SOAP
-protocol.
+The SOAP extension can be used to write SOAP Servers and Clients. It
+supports subsets of SOAP 1.1, SOAP 1.2 and WSDL 1.1 specifications.
Index: files/DESCR-sockets
===================================================================
RCS file: files/DESCR-sockets
diff -N files/DESCR-sockets
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-sockets 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+The socket extension implements a low-level interface to the socket
+communication functions based on the popular BSD sockets, providing
+the possibility to act as a socket server as well as a client.
+
+For a more generic client-side socket interface, see
+stream_socket_client(), stream_socket_server(), fsockopen(), and
+pfsockopen().
Index: files/DESCR-sqlite
===================================================================
RCS file: files/DESCR-sqlite
diff -N files/DESCR-sqlite
--- files/DESCR-sqlite 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-These functions allow you to access SQLite databases.
-More information about SQLite can be found at http://www.sqlite.org/.
-
-Documentation for SQLite can be found at
-http://www.sqlite.org/docs.html.
Index: files/DESCR-sqlite3
===================================================================
RCS file: files/DESCR-sqlite3
diff -N files/DESCR-sqlite3
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-sqlite3 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,4 @@
+This is an extension for the SQLite Embeddable SQL Database Engine.
+SQLite is a C library that implements an embeddable SQL database
+engine. Programs that link with the SQLite library can have SQL
+database access without running a separate RDBMS process.
Index: files/DESCR-sysvmsg
===================================================================
RCS file: files/DESCR-sysvmsg
diff -N files/DESCR-sysvmsg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-sysvmsg 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,7 @@
+This module provides wrappers for the System V IPC family of
+functions.  It includes inter-process messaging (IPC).
+
+The messaging functions may be used to send and receive messages
+to/from other processes. They provide a simple and effective means of
+exchanging data between processes, without the need for setting up an
+alternative using Unix domain sockets.
Index: files/DESCR-sysvsem
===================================================================
RCS file: files/DESCR-sysvsem
diff -N files/DESCR-sysvsem
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-sysvsem 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,4 @@
+This module provides wrappers for the System V IPC family of
+functions. It includes semaphores.
+
+Use semaphores for synchronization.
Index: files/DESCR-sysvshm
===================================================================
RCS file: files/DESCR-sysvshm
diff -N files/DESCR-sysvshm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-sysvshm 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+This module provides wrappers for the System V IPC family of
+functions. It includes shared memory.
+
+This module provides shared memory functions using System V shared
+memory. Shared memory may be used to provide access to global
+variables. Different httpd-daemons and even other programs (such as
+Perl, C, ...) are able to access this data to provide a global
+data-exchange. Remember, that shared memory is NOT safe against
+simultaneous access.
Index: files/DESCR-tidy
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-tidy,v
retrieving revision 1.1.1.1
diff -u -p -a -u -r1.1.1.1 DESCR-tidy
--- files/DESCR-tidy 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ files/DESCR-tidy 8 Jul 2017 18:28:19 -0000
@@ -1,2 +1,3 @@
-This module is a binding for the Tidy HTML clean and repair utility
-which allows you to clean and manipluate HTML documents.
+Tidy is a binding for the Tidy HTML clean and repair utility which
+allows you to not only clean and otherwise manipulate HTML documents,
+but also traverse the document tree.
Index: files/DESCR-tokenizer
===================================================================
RCS file: files/DESCR-tokenizer
diff -N files/DESCR-tokenizer
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-tokenizer 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,4 @@
+The tokenizer functions provide an interface to the PHP tokenizer
+embedded in the Zend Engine. Using these functions you may write your
+own PHP source analyzing or modification tools without having to deal
+with the language specification at the lexical level.
Index: files/DESCR-wddx
===================================================================
RCS file: files/DESCR-wddx
diff -N files/DESCR-wddx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-wddx 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1 @@
+These functions are intended for work with WDDX.
Index: files/DESCR-xml
===================================================================
RCS file: files/DESCR-xml
diff -N files/DESCR-xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-xml 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,9 @@
+XML (eXtensible Markup Language) is a data format for structured
+document interchange on the Web. It is a standard defined by The World
+Wide Web consortium (W3C). Information about XML and related
+technologies can be found at http://www.w3.org/XML/.
+
+This PHP extension implements support for James Clark's expat in PHP.
+This toolkit lets you parse, but not validate, XML documents. It
+supports three source character encodings also provided by PHP:
+US-ASCII, ISO-8859-1 and UTF-8. UTF-16 is not supported.
Index: files/DESCR-xmlreader
===================================================================
RCS file: files/DESCR-xmlreader
diff -N files/DESCR-xmlreader
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-xmlreader 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,3 @@
+The XMLReader extension is an XML Pull parser. The reader acts as a
+cursor going forward on the document stream and stopping at each node
+on the way.
Index: files/DESCR-xmlwriter
===================================================================
RCS file: files/DESCR-xmlwriter
diff -N files/DESCR-xmlwriter
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DESCR-xmlwriter 8 Jul 2017 18:28:19 -0000
@@ -0,0 +1,4 @@
+This is the XMLWriter extension. It wraps the libxml xmlWriter API.
+
+This extension represents a writer that provides a non-cached,
+forward-only means of generating streams or files containing XML data.
Index: files/DESCR-zip
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-zip,v
retrieving revision 1.1
diff -u -p -a -u -r1.1 DESCR-zip
--- files/DESCR-zip 16 Jun 2012 12:51:07 -0000 1.1
+++ files/DESCR-zip 8 Jul 2017 18:28:19 -0000
@@ -1,7 +1,2 @@
-Zip is a file format used for data compression and archiving.
-A zip file contains one or more files that have been compressed,
-to reduce file size, or stored as is. The zip file format permits
-a number of compression algorithms.
-
-This PHP extension provides a processor independent API to Zip
-transformations.
+This extension enables you to transparently read or write ZIP
+compressed archives and the files inside them.
Index: pecl/pecl.port.mk
===================================================================
RCS file: /cvs/ports/lang/php/pecl/pecl.port.mk,v
retrieving revision 1.6
diff -u -p -a -u -r1.6 pecl.port.mk
--- pecl/pecl.port.mk 19 Mar 2016 21:18:38 -0000 1.6
+++ pecl/pecl.port.mk 8 Jul 2017 18:28:19 -0000
@@ -15,16 +15,13 @@ EXTRACT_SUFX ?= .tgz
 .endif
 
 # XXX CONFIGURE_STYLE would be nice but it can't be set here
-AUTOCONF_VERSION ?= 2.62
-AUTOMAKE_VERSION ?= 1.9
+AUTOCONF_VERSION ?= 2.69
 
 LIBTOOL_FLAGS += --tag=disable-static
 
 DESTDIRNAME ?= INSTALL_ROOT
 
-BUILD_DEPENDS += www/pear \
- ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
+BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS}
 
 MODPHP_DO_SAMPLE ?= ${_PECLMOD}
 MODPHP_DO_PHPIZE ?= Yes
@@ -32,5 +29,4 @@ MODPHP_DO_PHPIZE ?= Yes
 .if !target(do-test) && ${NO_TEST:L:Mno}
 TEST_TARGET = test
 TEST_FLAGS =  NO_INTERACTION=1
-USE_GMAKE ?=  Yes
 .endif

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: php revamp

Martijn van Duren-7
Here's another update.

Changes since the previous version include:
* Update to 5.6.31, 7.0.22, and 7.1.8
* Included REVISION-bumps for pecl.
* Make php 7.* use the 5.6 php-fpm.conf file, so there's no difference  
between installs. All 3 versions use the same file, so this should
prevent unexpected behaviour if they're installed in a different order.
* Included should be all the dependency changes required to keep
everything running after the big split. I've based it on a pkg_locate
of all the php/phar-files and filtered out which require php runtime.
On these files I ran a full grep on the classes and functions per module
(thank you php reflection classes). This should in theory give us a
worst kaas^wcase scenario coverage of all the php requirements and some
ports could probably be trimmed down because of unused codepaths or
other reasons why the classname/function was found, but I'd rather leave
that fine comb for the people who actually use these ports.

I've tested all packages up to the make package stage, but no runtime
testing.
The amount of ports I've ploughed through is big, so I wouldn't be
surprised if I missed one or two, but any missed dependencies are easy
enough to find and adjust.

In other words, the diff below should be ready for a full bulk test.

martijn@

Index: lang/php/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- lang/php/Makefile 28 Apr 2016 18:19:23 -0000 1.11
+++ lang/php/Makefile 10 Aug 2017 20:03:52 -0000
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.11 2016/04/28 18:19:23 sthen Exp $
 
 SUBDIR =
-SUBDIR += 5.5
 SUBDIR += 5.6
 SUBDIR += 7.0
+SUBDIR += 7.1
 
 .include <bsd.port.subdir.mk>
Index: lang/php/Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.95
diff -u -p -r1.95 Makefile.inc
--- lang/php/Makefile.inc 16 Jul 2017 19:18:59 -0000 1.95
+++ lang/php/Makefile.inc 10 Aug 2017 20:03:52 -0000
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile.inc,v 1.95 2017/07/16 19:18:59 espie Exp $
+# $OpenBSD: Makefile.inc,v 1.93 2017/04/26 08:15:05 sthen Exp $
 
-BROKEN-hppa= no __sync_bool_compare_and_swap support nor asm fallback
+BROKEN-hppa= no __sync_bool_compare_and_swap support nor asm fallback
 
 COMMENT-main= server-side HTML-embedded scripting language
-COMMENT-fastcgi= stand-alone FastCGI version of PHP
 
 PKGNAME-main?= php-${V}
-PKGNAME-fastcgi?= php-fastcgi-${V}
 
-DISTFILES?= php-${V}.tar.bz2
+DISTFILES+= php-${V}.tar.bz2
 
 DISTNAME?= php-${V}
 CATEGORIES= lang www
@@ -20,7 +18,6 @@ MASTER_SITES= http://se.php.net/distrib
  http://us.php.net/distributions/ \
  http://no.php.net/distributions/ \
  http://uk.php.net/distributions/
-MASTER_SITES0= https://download.suhosin.org/
 
 # UPGRADERS: please read BOTH the PHP and Zend licenses
 # and make sure they are safe before an upgrade
@@ -35,7 +32,6 @@ MODPHP_CONFIG_PATH= /var/www/conf
 
 # where the main php module is stored (outside the chroot)
 APACHE_MODULE_SUBDIR= lib/php-${PV}
-APACHE_MODULE_DIR= ${LOCALBASE}/${APACHE_MODULE_SUBDIR}
 
 # where the PEAR and extension modules are (inside the chroot)
 CHROOT_DIR?= /var/www
@@ -44,13 +40,6 @@ MODULES_DIR= ${LOCALBASE}/${MODULES_SUB
 
 INI_TEMPLATES?= development production
 
-# XXX use the bundled libtool because it needs some specific options we
-# don't have.
-USE_LIBTOOL?= No
-
-.if ${PV} != "7.0"
-FLAVORS= no_suhosin
-.endif
 FLAVOR?=
 
 PATCHORIG= .orig.port
@@ -60,312 +49,457 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${L
  LDFLAGS="-L${LOCALBASE}/lib -pthread" \
  EXTENSION_DIR=${MODULES_DIR} \
  COMPILER_LIBCXX="${LIBCXX}" \
+ YACC="/usr/bin/yacc" \
  lt_cv_path_SED=/usr/bin/sed
 # configure detects us as having decimal fp support but it's not built in
 # in libgcc. https://bugs.php.net/bug.php?id=68114
 CONFIGURE_ENV+= ac_cv_decimal_fp_supported=no
 MAKE_ENV=               ${CONFIGURE_ENV}
 
-CONFIGURE_ARGS+= --enable-shared \
+CONFIGURE_ARGS+= --disable-rpath \
  --disable-static \
- --disable-rpath \
- --with-config-file-path=${SYSCONFDIR} \
  --enable-inline-optimization \
- --with-pic \
- --with-pear=${LOCALBASE}/share/php-${PV} \
+ --enable-shared \
+ --program-suffix=-${PV} \
+ --with-config-file-path=${SYSCONFDIR} \
  --with-config-file-scan-dir=${SYSCONFDIR}/php-${PV} \
- --with-pdo-sqlite \
- --enable-sqlite-utf8 \
- --with-sqlite3 \
- --program-suffix=-${PV}
-
-# readline is broken in PHP-5.3
-.if ${PV} != 5.3
-CONFIGURE_ARGS += --with-readline
-.endif
-
-# apache module
-CONFIGURE_ARGS+= --with-apxs2=${LOCALBASE}/sbin/apxs2
-BUILD_DEPENDS+= www/apache-httpd
+ --with-pear=${LOCALBASE}/share/php-${PV} \
+ --with-pic \
 
 # default included extensions
-CONFIGURE_ARGS+= --with-openssl \
- --with-zlib \
- --enable-xml \
- --enable-wddx \
- --enable-cli \
- --with-iconv=${LOCALBASE} \
- --with-gettext=${LOCALBASE} \
- --enable-bcmath \
+CONFIGURE_ARGS+= --enable-filter
+# Hash needed embedded for phar signature support
+CONFIGURE_ARGS+= --enable-hash \
+ --enable-libxml=${LOCALBASE} \
  --enable-session \
- --enable-calendar \
- --enable-ctype \
- --enable-ftp \
- --with-pcre-regex \
- --enable-sockets \
- --enable-sysvmsg \
- --enable-sysvsem \
- --enable-sysvshm \
- --enable-mbstring \
- --enable-exif \
- --enable-zend-multibyte \
- --enable-fastcgi \
- --enable-fpm \
- --with-fpm-user=www \
- --with-fpm-group=www
+ --with-mhash=${LOCALBASE} \
+ --with-openssl \
+ --with-pcre-regex=${LOCALBASE} \
+ --with-zlib
 
 TEST_TARGET= test
 TEST_FLAGS= NO_INTERACTION=1
 
-MULTI_PACKAGES+= -main -fastcgi
+MULTI_PACKAGES= -main
+
+# SAPIs
+MULTI_PACKAGES+= -apxs2 -cgi -cli -dbg -fpm
+
+# Extensions
+PHP_MODULES= -bcmath -bz2 -calendar -ctype -curl -dba -dom -enchant \
+ -exif -fileinfo -ftp -gd -gettext -gmp -iconv -imap \
+ -intl -json -ldap -mbstring -mcrypt -mysqlnd -mysqli \
+ -odbc -pcntl -pdo -pdo_dblib -pdo_mysql -pdo_pgsql \
+ -pdo_sqlite -pgsql -phar -posix -pspell -readline \
+ -shmop -simplexml -snmp -soap -sockets -sqlite3 \
+ -sysvmsg -sysvsem -sysvshm -tidy -tokenizer -wddx \
+ -xmlreader -xmlrpc -xmlwriter -xsl -zip
+# Embed xml for now, since it's required for pear.
+# Currently there's no clean way to enable or disable modules
+#PHP_MODULES+= -xml
+
+PHP_ZEND_MODULES= -opcache
+
+PHP_MODULES_EXTRA?=
+PHP_MODULES+= ${PHP_MODULES_EXTRA}
+
+MULTI_PACKAGES+= ${PHP_MODULES} ${PHP_ZEND_MODULES}
+
+#
+# Broken section
+# Use *_FOR_ARCHS, since BROKEN doesn't work for subpackages
+#
+
+#BROKEN-dbg= Segfaults on readline() return value
+ONLY_FOR_ARCHS-dbg=
+#BROKEN-phar-sparc64= SIGBUS during phar generation
+NOT_FOR_ARCHS-phar= sparc64
+.include <bsd.port.arch.mk>
+
+#
+# php SAPIs
+#
+
+WANTLIBSAPI= c crypto mhash pcre pthread ssl xml2>=8 z
+WANTLIBSAPI+= ${COMPILER_LIBCXX}
+
+LIB_DEPENDSSAPI= textproc/libxml \
+ devel/pcre \
+ security/mhash
+# These libraries aren't direct dependencies for core PHP, but seems to be drawn
+# in through libxml2 somehow.
+# Since libxml2 is part of the core install through libxml, which can't be build
+# individually, don't care too much about them, just keep these here as a
+# reminder.
+WANTLIBSAPI+= iconv lzma m
+LIB_DEPENDSSAPI+= converters/libiconv \
+ archivers/xz
+
+# apxs2
+COMMENT-apxs2= apache2 sapi for php
+CONFIGURE_ARGS+= --with-apxs2=${LOCALBASE}/sbin/apxs2
+BUILD_DEPENDS+= www/apache-httpd
+RUN_DEPENDS-apxs2+= www/apache-httpd \
+ mail/femail,-chroot
+WANTLIB-apxs2= ${WANTLIBSAPI}
+LIB_DEPENDS-apxs2= ${LIB_DEPENDSSAPI}
+
+# cgi
+COMMENT-cgi= cgi sapi for php
+CONFIGURE_ARGS+= --enable-cgi
+WANTLIB-cgi= ${WANTLIBSAPI}
+LIB_DEPENDS-cgi= ${LIB_DEPENDSSAPI}
+
+# cli
+COMMENT-cli= cli sapi for php
+CONFIGURE_ARGS+= --enable-cli
+WANTLIB-cli= ${WANTLIBSAPI}
+LIB_DEPENDS-cli= ${LIB_DEPENDSSAPI}
+
+# dbg
+COMMENT-dbg= debug sapi for php
+.if ${BUILD_PACKAGES:M-dbg}
+CONFIGURE_ARGS+= --enable-phpdbg
+.else
+CONFIGURE_ARGS+= --disable-phpdbg
+.endif
+WANTLIB-dbg= readline ${WANTLIBSAPI}
+LIB_DEPENDS-dbg= ${LIB_DEPENDSSAPI}
+
+# fpm
+COMMENT-fpm= fpm sapi for php
+CONFIGURE_ARGS+= --enable-fpm \
+ --with-fpm-user=www \
+ --with-fpm-group=www
+WANTLIB-fpm= ${WANTLIBSAPI}
+LIB_DEPENDS-fpm= ${LIB_DEPENDSSAPI}
+RUN_DEPENDS-fpm= mail/femail,-chroot
 
 #
 # Loadable php extensions by name that are included in all versions
 #
 
+# bcmath
+COMMENT-bcmath= bcmath precision mathematics extensions for php
+CONFIGURE_ARGS+= --enable-bcmath=shared
+
 # bz2
-MULTI_PACKAGES+= -bz2
-COMMENT-bz2= bzip2 compression extensions for php5
+COMMENT-bz2= bzip2 compression extensions for php
 CONFIGURE_ARGS+= --with-bz2=shared,${LOCALBASE}
 LIB_DEPENDS-bz2= archivers/bzip2
 WANTLIB-bz2= bz2>=10 pthread
 
+# calendar
+COMMENT-calendar= calendar format converting extensions for php
+CONFIGURE_ARGS+= --enable-calendar=shared
+
+# ctype
+COMMENT-ctype= ctype character class check extensions for php
+CONFIGURE_ARGS+= --enable-ctype=shared
+
 # curl
-MULTI_PACKAGES+= -curl
-COMMENT-curl= curl URL library extensions for php5
+COMMENT-curl= curl URL library extensions for php
 CONFIGURE_ARGS+= --with-curl=shared,${LOCALBASE}
 LIB_DEPENDS-curl= net/curl
 WANTLIB-curl= pthread crypto nghttp2 ssl z curl>=2
 
 # dba
-MULTI_PACKAGES+= -dba
-COMMENT-dba= dba GDBM access extensions for php5
+COMMENT-dba= dba GDBM access extensions for php
 CONFIGURE_ARGS+= --enable-dba=shared --with-gdbm=${LOCALBASE}
 LIB_DEPENDS-dba= databases/gdbm
 WANTLIB-dba= gdbm>=2 pthread
 
+# dom
+COMMENT-dom= dom xml operations for php
+CONFIGURE_ARGS+= --enable-dom=shared
+
+# enchant
+COMMENT-enchant= enchant spelling check extensions for php
+CONFIGURE_ARGS+= --with-enchant=shared
+LIB_DEPENDS-enchant= textproc/enchant
+WANTLIB-enchant= enchant
+
+# exif
+COMMENT-exif= exif image meta data extensions for php
+CONFIGURE_ARGS+= --enable-exif=shared
+LIB_DEPENDS-exif= graphics/libexif
+WANTLIB-exif= exif
+
+# fileinfo
+COMMENT-fileinfo= fileinfo content type guessing extensions for php
+CONFIGURE_ARGS+= --enable-fileinfo=shared
+
+# ftp
+COMMENT-ftp= ftp extensions for php
+CONFIGURE_ARGS+= --enable-ftp=shared
+WANTLIB-ftp= ssl crypto
+
 # gd
-MULTI_PACKAGES+= -gd
-COMMENT-gd= image manipulation extensions for php5
+COMMENT-gd= image manipulation extensions for php
 LIB_DEPENDS-gd= graphics/jpeg \
  graphics/png
-.if ${PV} != "7.0"
-LIB_DEPENDS-gd+= devel/t1lib
-WANTLIB-gd+= t1>=5
+.if ${PV} == "5.6"
+LIB_DEPENDS-gd+= devel/t1lib \
+ multimedia/libvpx
+WANTLIB-gd+= t1>=5 \
+ vpx
+CONFIGURE_ARGS+= --with-t1lib=${LOCALBASE} \
+ --with-vpx-dir=${LOCALBASE}
 .endif
 WANTLIB-gd+= z jpeg>=62 png>=3 pthread X11 Xpm freetype
 CONFIGURE_ARGS+= --with-gd=shared \
  --with-jpeg-dir=${LOCALBASE} \
  --with-png-dir=${LOCALBASE} \
  --with-zlib-dir=/usr \
- --with-t1lib=${LOCALBASE} \
  --with-freetype-dir=${X11BASE} \
  --with-xpm-dir=${X11BASE}
 
+# gettext
+COMMENT-gettext= gettext native language support extensions for php
+CONFIGURE_ARGS+= --with-gettext=shared,${LOCALBASE}
+LIB_DEPENDS-gettext= devel/gettext
+WANTLIB-gettext= intl
+
 # gmp
-MULTI_PACKAGES+= -gmp
-COMMENT-gmp= gmp math library support for php5
+COMMENT-gmp= gmp math library support for php
 CONFIGURE_ARGS+= --with-gmp=shared,${LOCALBASE}
 LIB_DEPENDS-gmp= devel/gmp
 WANTLIB-gmp= gmp>=4 pthread
 
-# intl
-MULTI_PACKAGES+= -intl
-COMMENT-intl= intl library support for php5
-CONFIGURE_ARGS+= --enable-intl=shared \
- --with-icu-dir=${LOCALBASE}
-LIB_DEPENDS-intl= textproc/icu4c
-WANTLIB-intl= ${COMPILER_LIBCXX} icudata icui18n icuio icuuc m pthread
+# iconv
+COMMENT-iconv= iconv character conversion extensions for php
+CONFIGURE_ARGS+= --with-iconv=shared,${LOCALBASE}
+LIB_DEPENDS-iconv= converters/libiconv
+WANTLIB-iconv= iconv
 
 # imap
-MULTI_PACKAGES+= -imap
-COMMENT-imap= imap, pop3 and nntp extensions for php5
+COMMENT-imap= imap, pop3 and nntp extensions for php
 CONFIGURE_ARGS+= --with-imap=shared,${LOCALBASE} \
  --with-imap-ssl
 LIB_DEPENDS-imap= mail/alpine,-c-client
 WANTLIB-imap= pthread crypto ssl c-client>=5
 
+# intl
+COMMENT-intl= intl library support for php
+CONFIGURE_ARGS+= --enable-intl=shared \
+ --with-icu-dir=${LOCALBASE}
+LIB_DEPENDS-intl= textproc/icu4c
+WANTLIB-intl= icudata icui18n icuio icuuc pthread
+
+# json
+COMMENT-json= json javascript object notation extensions for php
+CONFIGURE_ARGS+= --enable-json=shared
+
 # ldap
-MULTI_PACKAGES+= -ldap
-COMMENT-ldap= ldap protocol extensions for php5
-CONFIGURE_ARGS+= --with-ldap=shared,${LOCALBASE}
-LIB_DEPENDS-ldap= databases/openldap
-WANTLIB-ldap= pthread ldap>=2 lber
+COMMENT-ldap= ldap protocol extensions for php
+CONFIGURE_ARGS+= --with-ldap=shared,${LOCALBASE} \
+ --with-ldap-sasl=${LOCALBASE}
+LIB_DEPENDS-ldap= databases/openldap \
+ security/cyrus-sasl2
+WANTLIB-ldap= pthread ldap>=2 lber \
+ sasl2
+
+# mbstring
+COMMENT-mbstring= mbstring multibyte character manipulation extensions for php
+CONFIGURE_ARGS+= --enable-mbstring=shared \
+ --with-onig=${LOCALBASE}
+LIB_DEPENDS-mbstring= textproc/oniguruma
+WANTLIB-mbstring= onig
 
 # mcrypt
-MULTI_PACKAGES+= -mcrypt
-COMMENT-mcrypt= mcrypt encryption/decryption extensions for php5
+COMMENT-mcrypt= mcrypt encryption/decryption extensions for php
 CONFIGURE_ARGS+= --with-mcrypt=shared,${LOCALBASE}
 LIB_DEPENDS-mcrypt= security/libmcrypt devel/libtool,-ltdl
 WANTLIB-mcrypt= mcrypt ltdl>=1 pthread
 
-.if ${PV} != "7.0"
-# mysql
-MULTI_PACKAGES+= -mysql
-COMMENT-mysql= mysql database access extensions for php5
-CONFIGURE_ARGS+= --with-mysql=shared,${LOCALBASE}
-LIB_DEPENDS-mysql= databases/mariadb
-WANTLIB-mysql= pthread lib/mysql/mysqlclient
-.endif
+# mysqlnd
+COMMENT-mysqlnd= mysqlclient replacement for php
+CONFIGURE_ARGS+= --enable-mysqlnd=shared
+WANTLIB-mysqlnd= crypto m pthread ssl z
 
 # mysqli
-MULTI_PACKAGES+= -mysqli
-COMMENT-mysqli= mysql database access extensions for php5
-CONFIGURE_ARGS+= --with-mysqli=shared,${LOCALBASE}/bin/mysql_config
-LIB_DEPENDS-mysqli= databases/mariadb
-WANTLIB-mysqli= crypto m pthread ssl z lib/mysql/mysqlclient
+COMMENT-mysqli= mysql database access extensions for php
+CONFIGURE_ARGS+= --with-mysqli=shared,mysqlnd
+RUN_DEPENDS-mysqli= lang/php/${PV},-mysqlnd
 
 # odbc
-MULTI_PACKAGES+= -odbc
-COMMENT-odbc= odbc database access extensions for php5
+COMMENT-odbc= odbc database access extensions for php
 CONFIGURE_ARGS+=        --with-iodbc=shared,${LOCALBASE}
 LIB_DEPENDS-odbc= databases/iodbc
 WANTLIB-odbc= iodbc>=2 pthread
-.if ${PV} != "5.3"
 WANTLIB-odbc+= iodbcinst
-.endif
+
+# opcache
+COMMENT-opcache= opcache bytecode caching extensions for php
+CONFIGURE_ARGS+= --enable-opcache
 
 # pcntl
-MULTI_PACKAGES+= -pcntl
-COMMENT-pcntl= PCNTL extensions for php5
+COMMENT-pcntl= PCNTL extensions for php
 CONFIGURE_ARGS+= --enable-pcntl=shared
 LIB_DEPENDS-pcntl=
 WANTLIB-pcntl= pthread
 
+# pdo
+COMMENT-pdo= PDO database interface extensions for php
+CONFIGURE_ARGS+= --enable-pdo=shared
+
+# pdo-dblib
+COMMENT-pdo_dblib= PDO DB-LIB support for php
+CONFIGURE_ARGS+=        --with-pdo-dblib=shared,${LOCALBASE}
+LIB_DEPENDS-pdo_dblib= databases/freetds
+WANTLIB-pdo_dblib= sybdb>=6 pthread
+RUN_DEPENDS-pdo_dblib= lang/php/${PV},-pdo
+
 # pdo-mysql
-MULTI_PACKAGES+= -pdo_mysql
-COMMENT-pdo_mysql= PDO mysql database access extensions for php5
-CONFIGURE_ARGS+= --with-pdo-mysql=shared,${LOCALBASE}
-LIB_DEPENDS-pdo_mysql= databases/mariadb
-WANTLIB-pdo_mysql= crypto m pthread ssl z lib/mysql/mysqlclient
+COMMENT-pdo_mysql= PDO mysql database access extensions for php
+CONFIGURE_ARGS+= --with-pdo-mysql=shared,mysqlnd
+RUN_DEPENDS-pdo_mysql= lang/php/${PV},-mysqlnd lang/php/${PV},-pdo
 
 # pdo-pgsql
-MULTI_PACKAGES+= -pdo_pgsql
-COMMENT-pdo_pgsql= PDO database access extensions for php5
-CONFIGURE_ARGS+=        --with-pdo-pgsql=shared,${LOCALBASE}
+COMMENT-pdo_pgsql= PDO database access extensions for php
+CONFIGURE_ARGS+=       --with-pdo-pgsql=shared,${LOCALBASE}
 LIB_DEPENDS-pdo_pgsql= databases/postgresql
 WANTLIB-pdo_pgsql= pq>=2 pthread
+RUN_DEPENDS-pdo_pgsql= lang/php/${PV},-pdo
+
+# pdo-sqlite
+COMMENT-pdo_sqlite= PDO sqlite3 database access extensions for php
+CONFIGURE_ARGS+=       --with-pdo-sqlite=shared,${LOCALBASE}
+LIB_DEPENDS-pdo_sqlite= databases/sqlite3
+WANTLIB-pdo_sqlite= sqlite3
+RUN_DEPENDS-pdo_sqlite= lang/php/${PV},-sqlite3 lang/php/${PV},-pdo
 
 # pgsql
-MULTI_PACKAGES+= -pgsql
-COMMENT-pgsql= pgsql database access extensions for php5
+COMMENT-pgsql= pgsql database access extensions for php
 CONFIGURE_ARGS+= --with-pgsql=shared,${LOCALBASE}
 LIB_DEPENDS-pgsql= databases/postgresql
 WANTLIB-pgsql= pq>=2 pthread
 
+# phar
+COMMENT-phar= phar archive abstraction extensions for php
+.if ${BUILD_PACKAGES:M-phar}
+CONFIGURE_ARGS+= --enable-phar=shared
+.else
+CONFIGURE_ARGS+= --disable-phar
+.endif
+
+# posix
+COMMENT-posix= posix functions extensions for php
+CONFIGURE_ARGS+= --enable-posix=shared
+
 # pspell
-MULTI_PACKAGES+= -pspell
-COMMENT-pspell= pspell library extensions for php5
+COMMENT-pspell= pspell library extensions for php
 CONFIGURE_ARGS+= --with-pspell=shared,${LOCALBASE}
 LIB_DEPENDS-pspell= textproc/aspell/core
 WANTLIB-pspell= aspell>=16 pspell>=16 pthread
 
+# readline
+COMMENT-readline= readline editable command lines extensions for php
+CONFIGURE_ARGS+= --with-readline=shared
+WANTLIB-readline= readline ncurses
+
 # shmop
-MULTI_PACKAGES+= -shmop
-COMMENT-shmop= shared memory extensions for php5
+COMMENT-shmop= shared memory extensions for php
 CONFIGURE_ARGS+= --enable-shmop=shared,${LOCALBASE}
-LIB_DEPENDS-shmop=
 WANTLIB-shmop= pthread
 
-# soap
-MULTI_PACKAGES+= -soap
-COMMENT-soap= SOAP functions for php5
-CONFIGURE_ARGS+= --enable-soap=shared,${LOCALBASE}
-LIB_DEPENDS-soap= textproc/libxml
-WANTLIB-soap= iconv m pthread z xml2>=8 lzma
+# simplexml
+COMMENT-simplexml= simplexml xml to object toolset extensions for php
+CONFIGURE_ARGS+= --enable-simplexml=shared
+LIB_DEPENDS-simplexml= textproc/libxml
+WANTLIB-simplexml+= xml2>=8
 
 # snmp
-MULTI_PACKAGES+= -snmp
-COMMENT-snmp= snmp protocol extensions for php5
-CONFIGURE_ARGS+= --with-snmp=shared,${LOCALBASE} --enable-ucd-snmp-hack
+COMMENT-snmp= snmp protocol extensions for php
+CONFIGURE_ARGS+= --with-snmp=shared,${LOCALBASE}
 LIB_DEPENDS-snmp= net/net-snmp
 WANTLIB-snmp= crypto m netsnmp>=6.2 pthread
 
-.if ${PV} != "7.0"
-# sybase-ct
-MULTI_PACKAGES+= -sybase_ct
-COMMENT-sybase_ct= sybase database access extensions for php5
-CONFIGURE_ARGS+= --with-sybase-ct=shared,${LOCALBASE}
-LIB_DEPENDS-sybase_ct= databases/freetds
-WANTLIB-sybase_ct= ct pthread
-.endif
-
-# pdo-dblib
-MULTI_PACKAGES+= -pdo_dblib
-COMMENT-pdo_dblib= PDO DB-LIB support for php5
-CONFIGURE_ARGS+=        --with-pdo-dblib=shared,${LOCALBASE}
-LIB_DEPENDS-pdo_dblib= databases/freetds
-WANTLIB-pdo_dblib= sybdb>=6 pthread
+# soap
+COMMENT-soap= SOAP functions for php
+CONFIGURE_ARGS+= --enable-soap=shared,${LOCALBASE}
+LIB_DEPENDS-soap= textproc/libxml
+WANTLIB-soap= iconv m pthread z xml2>=8 lzma
 
-.if ${PV} != "7.0"
-# mssql
-MULTI_PACKAGES+= -mssql
-COMMENT-mssql= microsoft sql access extensions for php5
-CONFIGURE_ARGS+=        --with-mssql=shared,${LOCALBASE}
-LIB_DEPENDS-mssql= databases/freetds
-WANTLIB-mssql= sybdb>=6 pthread
-.endif
+# sockets
+COMMENT-sockets= sockets extensions for php
+CONFIGURE_ARGS+= --enable-sockets=shared
+
+# sqlite3
+COMMENT-sqlite3= sqlite3 database access extensions for php
+CONFIGURE_ARGS+= --with-sqlite3=shared,${LOCALBASE}
+LIB_DEPENDS-sqlite3= databases/sqlite3
+WANTLIB-sqlite3= sqlite3
+
+# sysvmsg
+COMMENT-sysvmsg= sysvmsg System V messges extensions for php
+CONFIGURE_ARGS+= --enable-sysvmsg=shared
+
+# sysvsem
+COMMENT-sysvsem= sysvsem System V semaphore extensions for php
+CONFIGURE_ARGS+= --enable-sysvsem=shared
+
+# sysvshm
+COMMENT-sysvshm= sysvshm System V shared memory extensions for php
+CONFIGURE_ARGS+= --enable-sysvshm=shared
 
 # tidy
-MULTI_PACKAGES+= -tidy
 COMMENT-tidy= tidy HTML cleaner bindings
 CONFIGURE_ARGS+= --with-tidy=shared,${LOCALBASE}
 LIB_DEPENDS-tidy= www/tidyp
 WANTLIB-tidy= tidyp pthread
 
-# xml-rpc
-MULTI_PACKAGES+= -xmlrpc
-COMMENT-xmlrpc= XML RPC functions for php5
+# tokenizer
+COMMENT-tokenizer= tokenizer php source analyzing extensions for php
+CONFIGURE_ARGS+= --enable-tokenizer=shared
+
+# wddx
+COMMENT-wddx= wddx extensions for php
+CONFIGURE_ARGS+= --enable-wddx=shared
+LIB_DEPENDS-wddx= textproc/libxml
+WANTLIB-wddx= xml2>=8
+
+# xml
+COMMENT-xml= xml extensions for php
+CONFIGURE_ARGS+= --enable-xml
+LIB_DEPENDS-xml= textproc/libxml
+WANTLIB-xml= xml2>=8
+
+# xmlreader
+COMMENT-xmlreader= xmlreader streaming xml cursor extensions for php
+CONFIGURE_ARGS+= --enable-xmlreader=shared
+RUN_DEPENDS-xmlreader= lang/php/${PV},-dom
+
+# xmlrpc
+COMMENT-xmlrpc= XML RPC functions for php
 CONFIGURE_ARGS+= --with-xmlrpc=shared
 LIB_DEPENDS-xmlrpc= textproc/libxml
 WANTLIB-xmlrpc= iconv m z xml2>=8 pthread lzma
 
+# xmlwriter
+COMMENT-xmlwriter= xmlwriter streaming xml writer extensions for php
+CONFIGURE_ARGS+= --enable-xmlwriter=shared
+LIB_DEPENDS-xmlwriter= textproc/libxml
+WANTLIB-xmlwriter= xml2>=8
+
 # xsl
-MULTI_PACKAGES+= -xsl
-COMMENT-xsl= XSL functions for php5
-CONFIGURE_ARGS+= --with-xsl=shared --enable-dom
+COMMENT-xsl= XSL functions for php
+CONFIGURE_ARGS+= --with-xsl=shared
 LIB_DEPENDS-xsl= textproc/libxslt
 WANTLIB-xsl= iconv m xml2 z xslt>=3 exslt pthread lzma
 
 # zip
-MULTI_PACKAGES+= -zip
-COMMENT-zip= zip functions for php5
+COMMENT-zip= zip functions for php
 CONFIGURE_ARGS+= --enable-zip=shared,${LOCALBASE}
 LIB_DEPENDS-zip=
 WANTLIB-zip= z pthread
 
+
 # some variables to substitute
 SUBST_VARS= MODPHP_CONFIG_PATH SV PV ^MODULE_NAME
 PHP_VERSION= ${V}
 SV= ${PV:S/.//}
 
-.for i in TRUEPREFIX MODULES_DIR PHP_VERSION APACHE_MODULE_DIR
-PHPXS_SUBST+= -e 's,${i},${${i}},'
-.endfor
-
-WANTLIB-main+= c crypto iconv intl lzma m pthread ssl xml2>=8 z
-WANTLIB-main+= ncurses readline ${COMPILER_LIBCXX}
-
-# php 5.4/5.5 : WANTLIB-main += ${COMPILER_LIBCXX}
-WANTLIB-fastcgi= ${WANTLIB-main}
-LIB_DEPENDS-main= devel/gettext \
- textproc/libxml
-RUN_DEPENDS-main= mail/femail,-chroot
-LIB_DEPENDS-fastcgi= ${LIB_DEPENDS-main}
-RUN_DEPENDS-fastcgi=
-
-SUHOSIN_V= 0.9.38
-.if ${FLAVOR:Mno_suhosin} || ${PV} == "7.0"
-SUPDISTFILES= suhosin-${SUHOSIN_V}.tar.gz:0
-.else
-DISTFILES+= suhosin-${SUHOSIN_V}.tar.gz:0
-PATCH_LIST= patch-* suhosin-*
-CONFIGURE_ARGS+= --enable-suhosin
-
-pre-patch:
- @mv ${WRKDIR}/suhosin-${SUHOSIN_V} ${WRKSRC}/ext/suhosin
-.endif
-
 pre-fake:
  ${INSTALL_DATA_DIR} ${PREFIX}/${APACHE_MODULE_SUBDIR}/modules
 
@@ -374,29 +508,29 @@ DESTDIRNAME= INSTALL_ROOT
 
 pre-configure:
  ${SUBST_CMD} ${WRKSRC}/main/php_ini.c
+ ${SUBST_CMD} ${WRKSRC}/scripts/phpize.m4
  @perl -pi -e "s,OPENBSD_PEAR_ROOT,'${CHROOT_DIR}/pear',g;" \
  -e "s,OPENBSD_PREFIX,${TRUEPREFIX},;" \
  ${WRKSRC}/scripts/phpize.in \
  ${WRKSRC}/scripts/php-config.in
 
-.for i in ${MULTI_PACKAGES:N-main:N-fastcgi:S/-//g}
+.for i in ${MULTI_PACKAGES:N-main:S/-//g}
 MODULE_NAME-${i}= ${i}
 DESCR-${i}= ${.CURDIR}/../files/DESCR-${i}
 PKGNAME-${i}= php-${i}-${V}
-.if ${V:M5.4*}
-PKGSPEC-${i}= php-${i}->=5.4,<5.5
-.elif ${V:M5.5*}
-PKGSPEC-${i}= php-${i}->=5.5,<5.6
-.elif ${V:M5.6*}
+.if ${V:M5.6*}
 PKGSPEC-${i}= php-${i}->=5.6,<5.7
+RUN_DEPENDS-${i}+= php->=5.6.30p0:lang/php/${PV}
 .elif ${V:M7.0*}
 PKGSPEC-${i}= php-${i}->=7.0,<7.1
-.endif
+RUN_DEPENDS-${i}+= php->=7.0.19:lang/php/${PV}
+.elif ${V:M7.1*}
+PKGSPEC-${i}= php-${i}->=7.1,<7.2
 RUN_DEPENDS-${i}+= php-${V}:lang/php/${PV}
+.endif
 .endfor
 
 DESCR-main= ${.CURDIR}/../files/DESCR-main
-DESCR-fastcgi= ${.CURDIR}/../files/DESCR-fastcgi
 
 post-install:
  ${SUBST_DATA} ${.CURDIR}/../files/README-main \
@@ -405,13 +539,19 @@ post-install:
  ${PREFIX}/${APACHE_MODULE_SUBDIR}/
  ${INSTALL_DATA_DIR} ${WRKINST}/${CHROOT_DIR}/conf/php-${PV}.sample
  ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php-${PV}
+ ${INSTALL_PROGRAM} ${WRKBUILD}/ext/phar/phar.phar ${PREFIX}/bin/phar-${PV}
+ ${INSTALL_MAN} ${WRKBUILD}/ext/phar/phar.1 ${PREFIX}/man/man1/phar-${PV}.1
  ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cli/php ${PREFIX}/bin/php-${PV}
- ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cgi/php-cgi ${PREFIX}/bin/php-fastcgi-${PV}
+ ${INSTALL_MAN} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/man/man1/php-${PV}.1
+ ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cgi/php-cgi ${PREFIX}/bin/php-cgi-${PV}
+ ${INSTALL_MAN} ${WRKSRC}/sapi/cgi/php-cgi.1 ${PREFIX}/man/man1/php-cgi-${PV}.1
+# ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/phpdbg/phpdbg ${PREFIX}/bin/phpdbg-${PV}
+# ${INSTALL_MAN} ${WRKBUILD}/sapi/phpdbg/phpdbg.1 ${PREFIX}/man/man1/phpdbg-${PV}.1
  ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/fpm/php-fpm ${PREFIX}/sbin/php-fpm-${PV}
  ${INSTALL_MAN} ${WRKBUILD}/sapi/fpm/php-fpm.8 ${PREFIX}/man/man8/php-fpm-${PV}.8
  ${INSTALL_DATA} ${WRKBUILD}/sapi/fpm/php-fpm.conf \
  ${PREFIX}/share/examples/php-${PV}/php-fpm.conf
-.if ${PV} == "7.0"
+.if ${PV} != "5.6"
  cat ${WRKBUILD}/sapi/fpm/www.conf >> \
  ${PREFIX}/share/examples/php-${PV}/php-fpm.conf
 .endif
@@ -421,17 +561,19 @@ post-install:
  @perl -pi -e "s,!!PREFIX!!,${TRUEPREFIX},g;s,!!PV!!,${PV},g;s,!!MV!!,${PV:R},g" \
  ${PREFIX}/share/examples/php-${PV}/php.conf
 
-.for m in ${MULTI_PACKAGES:N-main:N-fastcgi:S/-//g}
+.for m in ${PHP_MODULES:S/-//g}
  ${INSTALL_DATA} ${WRKBUILD}/modules/${m}.so \
  ${PREFIX}/${MODULES_SUBDIR}/${m}.so
  echo "extension=${m}.so" > \
  ${PREFIX}/share/examples/php-${PV}/${m}.ini
 .endfor
- if [ -f ${WRKBUILD}/modules/opcache.so ]; then \
- ${INSTALL_DATA} ${WRKBUILD}/modules/opcache.so \
-    ${PREFIX}/${MODULES_SUBDIR}/opcache.so; \
- echo "zend_extension=opcache.so" > \
-    ${PREFIX}/share/examples/php-${PV}/opcache.ini; fi
+.for m in ${PHP_ZEND_MODULES:S/-//g}
+ ${INSTALL_DATA} ${WRKBUILD}/modules/${m}.so \
+ ${PREFIX}/${MODULES_SUBDIR}/${m}.so
+ echo "zend_extension=${m}.so" > \
+ ${PREFIX}/share/examples/php-${PV}/${m}.ini
+.endfor
+
  ${INSTALL_DATA_DIR} ${WRKINST}/${CHROOT_DIR}/etc
  echo "www:*:67:67::0:0:dummy user to appease c-client:/nonexistent:/sbin/nologin" > \
  ${WRKINST}/${CHROOT_DIR}/etc/master.passwd.imap
@@ -443,4 +585,3 @@ post-install:
  <${WRKSRC}/php.ini-${i} \
  >${PREFIX}/share/examples/php-${PV}/php.ini-${i}
 .endfor
- ${INSTALL_MAN} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/man/man1/php-${PV}.1
Index: lang/php/php.port.mk
===================================================================
RCS file: /cvs/ports/lang/php/php.port.mk,v
retrieving revision 1.16
diff -u -p -r1.16 php.port.mk
--- lang/php/php.port.mk 25 Apr 2017 11:26:43 -0000 1.16
+++ lang/php/php.port.mk 10 Aug 2017 20:03:52 -0000
@@ -3,12 +3,12 @@
 CATEGORIES+= lang/php
 
 MODPHP_VERSION?= 5.6
-.if ${MODPHP_VERSION} == 5.5
-MODPHP_VSPEC = >=${MODPHP_VERSION},<5.6
-.elif ${MODPHP_VERSION} == 5.6
+.if ${MODPHP_VERSION} == 5.6
 MODPHP_VSPEC = >=${MODPHP_VERSION},<5.7
 .elif ${MODPHP_VERSION} == 7.0
 MODPHP_VSPEC = >=${MODPHP_VERSION},<7.1
+.elif ${MODPHP_VERSION} == 7.1
+MODPHP_VSPEC = >=${MODPHP_VERSION},<7.2
 .endif
 MODPHPSPEC = php-${MODPHP_VSPEC}
 
@@ -33,23 +33,19 @@ MODPHP_PHP_CONFIG= ${LOCALBASE}/bin/php-
 MODPHP_INCDIR= ${LOCALBASE}/include/php-${MODPHP_VERSION}
 MODPHP_LIBDIR= ${LOCALBASE}/lib/php-${MODPHP_VERSION}
 
-MODPHP_CONFIGURE_ARGS= --with-php-config=${LOCALBASE}/bin/php-config-${MODPHP_VERSION}
 SUBST_VARS+= MODPHP_VERSION
 
 MODPHP_DO_PHPIZE?=
 .if !empty(MODPHP_DO_PHPIZE)
-AUTOCONF_VERSION= 2.62
-AUTOMAKE_VERSION= 1.9
+AUTOCONF_VERSION= 2.69
 
-BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
+BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS}
 
 .if empty(CONFIGURE_STYLE)
 CONFIGURE_STYLE= gnu
 .endif
 
-CONFIGURE_ENV+= AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
- AUTOCONF_VERSION=${AUTOCONF_VERSION}
+CONFIGURE_ENV+= AUTOCONF_VERSION=${AUTOCONF_VERSION}
 CONFIGURE_ARGS+= ${MODPHP_CONFIGURE_ARGS}
 
 pre-configure:
Index: lang/php/5.5/Makefile
===================================================================
RCS file: lang/php/5.5/Makefile
diff -N lang/php/5.5/Makefile
--- lang/php/5.5/Makefile 26 Jul 2017 22:45:25 -0000 1.66
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-# $OpenBSD: Makefile,v 1.66 2017/07/26 22:45:25 sthen Exp $
-
-BROKEN-alpha= pcre_jit_compile.c:65:2: error: #error Unsupported architecture
-
-PV= 5.5
-V= ${PV}.38
-REVISION = 2
-
-.include <bsd.port.mk>
Index: lang/php/5.5/distinfo
===================================================================
RCS file: lang/php/5.5/distinfo
diff -N lang/php/5.5/distinfo
--- lang/php/5.5/distinfo 19 Dec 2016 20:34:22 -0000 1.33
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-SHA256 (php-5.5.38.tar.bz2) = RzyB67LkjKRoyu4DF2ImZlGEPXInwYqCSt2bB7k5Pjg=
-SHA256 (suhosin-0.9.38.tar.gz) = wC12xOfOd3kQo3wYGBy2f9npDv4BB/6rPeMTG1+JvOo=
-SIZE (php-5.5.38.tar.bz2) = 13701262
-SIZE (suhosin-0.9.38.tar.gz) = 122800
Index: lang/php/5.5/patches/patch-Zend_zend_alloc_c
===================================================================
RCS file: lang/php/5.5/patches/patch-Zend_zend_alloc_c
diff -N lang/php/5.5/patches/patch-Zend_zend_alloc_c
--- lang/php/5.5/patches/patch-Zend_zend_alloc_c 6 Feb 2016 23:31:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-Zend_zend_alloc_c,v 1.1 2016/02/06 23:31:20 sthen Exp $
-
-Apparently not enabled by default, and currently a bit close to release to
-try doing so, but for something in #ifdef MM_HEAP_PROTECTION, you want more
-than rand()^getpid() when /dev/urandom is inaccessible, right?
-
---- Zend/zend_alloc.c.orig.port Mon Feb  1 23:04:02 2016
-+++ Zend/zend_alloc.c Mon Feb  1 23:34:27 2016
-@@ -976,6 +976,9 @@ static void zend_mm_free_cache(zend_mm_heap *heap)
- #if ZEND_MM_HEAP_PROTECTION || ZEND_MM_COOKIES
- static void zend_mm_random(unsigned char *buf, size_t size) /* {{{ */
- {
-+#if defined(__OpenBSD__)
-+ arc4random_buf(buf, size);
-+#else
- size_t i = 0;
- unsigned char t;
-
-@@ -1031,6 +1034,7 @@ static void zend_mm_random(unsigned char *buf, size_t
- } while (buf[i] == 0);
- t = buf[i++] << 1;
-     }
-+#endif /* openbsd */
- }
- /* }}} */
- #endif
Index: lang/php/5.5/patches/patch-acinclude_m4
===================================================================
RCS file: lang/php/5.5/patches/patch-acinclude_m4
diff -N lang/php/5.5/patches/patch-acinclude_m4
--- lang/php/5.5/patches/patch-acinclude_m4 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-$OpenBSD: patch-acinclude_m4,v 1.1.1.1 2013/08/07 16:46:56 robert Exp $
---- acinclude.m4.orig.port Sun Jul 28 10:54:23 2013
-+++ acinclude.m4 Sun Jul 28 10:55:00 2013
-@@ -984,15 +984,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(PHP_EXT_DIR($1),$2,$ac_extra,)
--        EXT_STATIC="$EXT_STATIC $1"
--        ;;
--      *[)]
-         PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
--        ;;
--    esac
-+        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
-+        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
-     EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
-   fi
-   PHP_ADD_BUILD_DIR($ext_builddir)
-@@ -1042,12 +1036,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
- ])
-
-@@ -2320,9 +2308,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
-
Index: lang/php/5.5/patches/patch-aclocal_m4
===================================================================
RCS file: lang/php/5.5/patches/patch-aclocal_m4
diff -N lang/php/5.5/patches/patch-aclocal_m4
--- lang/php/5.5/patches/patch-aclocal_m4 26 Apr 2017 08:15:05 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-aclocal_m4,v 1.1 2017/04/26 08:15:05 sthen Exp $
---- aclocal.m4.orig.port Tue Apr 25 00:35:44 2017
-+++ aclocal.m4 Tue Apr 25 00:35:57 2017
-@@ -762,7 +762,9 @@ AC_DEFUN([PHP_REQUIRE_CXX],[
-   if test -z "$php_cxx_done"; then
-     AC_PROG_CXX
-     AC_PROG_CXXCPP
--    PHP_ADD_LIBRARY(stdc++)
-+    for i in $LIBCXX; do
-+      PHP_ADD_LIBRARY($i)
-+    done
-     php_cxx_done=yes
-   fi
- ])
Index: lang/php/5.5/patches/patch-configure_in
===================================================================
RCS file: lang/php/5.5/patches/patch-configure_in
diff -N lang/php/5.5/patches/patch-configure_in
--- lang/php/5.5/patches/patch-configure_in 19 Feb 2015 20:14:41 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.2 2015/02/19 20:14:41 sthen Exp $
---- configure.in.orig.port Wed Feb 18 15:39:54 2015
-+++ configure.in Thu Feb 19 14:23:11 2015
-@@ -1039,16 +1039,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
-@@ -1239,7 +1239,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
Index: lang/php/5.5/patches/patch-ext_gd_config_m4
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_gd_config_m4
diff -N lang/php/5.5/patches/patch-ext_gd_config_m4
--- lang/php/5.5/patches/patch-ext_gd_config_m4 27 Mar 2014 14:05:02 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-ext_gd_config_m4,v 1.1 2014/03/27 14:05:02 sthen 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 Wed Mar  5 10:18:00 2014
-+++ ext/gd/config.m4 Thu Mar 27 13:43:18 2014
-@@ -158,11 +158,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
-
Index: lang/php/5.5/patches/patch-ext_gd_gdcache_h
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_gd_gdcache_h
diff -N lang/php/5.5/patches/patch-ext_gd_gdcache_h
--- lang/php/5.5/patches/patch-ext_gd_gdcache_h 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ext_gd_gdcache_h,v 1.1.1.1 2013/08/07 16:46:55 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 */
Index: lang/php/5.5/patches/patch-ext_gd_libgd_gdcache_h
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_gd_libgd_gdcache_h
diff -N lang/php/5.5/patches/patch-ext_gd_libgd_gdcache_h
--- lang/php/5.5/patches/patch-ext_gd_libgd_gdcache_h 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_gd_libgd_gdcache_h,v 1.1.1.1 2013/08/07 16:46:55 robert Exp $
---- ext/gd/libgd/gdcache.h.orig.port Wed Sep 26 16:44:16 2007
-+++ ext/gd/libgd/gdcache.h Sat Jun 18 12:14:49 2011
-@@ -41,7 +41,7 @@
- /*********************************************************/
-
- #include <stdlib.h>
--#ifdef HAVE_MALLOC_H
-+#if (!defined(__OpenBSD__)) && HAVE_MALLOC_H
-  #include <malloc.h>
- #endif
- #ifndef NULL
Index: lang/php/5.5/patches/patch-ext_gd_libgd_gdkanji_c
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_gd_libgd_gdkanji_c
diff -N lang/php/5.5/patches/patch-ext_gd_libgd_gdkanji_c
--- lang/php/5.5/patches/patch-ext_gd_libgd_gdkanji_c 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.1.1.1 2013/08/07 16:46:55 robert Exp $
---- ext/gd/libgd/gdkanji.c.orig.port Wed Sep 26 16:44:16 2007
-+++ ext/gd/libgd/gdkanji.c Sat Jun 18 12:14:49 2011
-@@ -362,7 +362,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)
Index: lang/php/5.5/patches/patch-ext_iconv_iconv_c
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_iconv_iconv_c
diff -N lang/php/5.5/patches/patch-ext_iconv_iconv_c
--- lang/php/5.5/patches/patch-ext_iconv_iconv_c 12 Jul 2015 14:07:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-$OpenBSD: patch-ext_iconv_iconv_c,v 1.2 2015/07/12 14:07:10 robert Exp $
---- ext/iconv/iconv.c.orig.port Wed Jul  8 16:55:35 2015
-+++ ext/iconv/iconv.c Sun Jul 12 15:58:13 2015
-@@ -398,7 +398,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d
-
- out_p = (d)->c + (d)->len;
-
-- 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:
-@@ -585,7 +585,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const c
- out_p = 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) {
-@@ -710,7 +710,7 @@ static php_iconv_err_t _php_iconv_strlen(unsigned int
-
- 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;
- }
-@@ -831,7 +831,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;
- }
-@@ -963,7 +963,7 @@ static php_iconv_err_t _php_iconv_strpos(unsigned int
-
- 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) {
-@@ -1212,7 +1212,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:
-@@ -1312,7 +1312,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:
-@@ -2585,7 +2585,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:
Index: lang/php/5.5/patches/patch-ext_imap_config_m4
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_imap_config_m4
diff -N lang/php/5.5/patches/patch-ext_imap_config_m4
--- lang/php/5.5/patches/patch-ext_imap_config_m4 8 Aug 2013 19:11:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_imap_config_m4,v 1.1 2013/08/08 19:11:43 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,[ ])
Index: lang/php/5.5/patches/patch-ext_mcrypt_mcrypt_c
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_mcrypt_mcrypt_c
diff -N lang/php/5.5/patches/patch-ext_mcrypt_mcrypt_c
--- lang/php/5.5/patches/patch-ext_mcrypt_mcrypt_c 25 Jun 2016 18:54:15 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-ext_mcrypt_mcrypt_c,v 1.2 2016/06/25 18:54:15 sthen Exp $
-
-mcrypt IV creation. no /dev/{u,}random? yes, it is using the last hunk.
-
---- ext/mcrypt/mcrypt.c.orig.port Tue Jun 21 12:11:59 2016
-+++ ext/mcrypt/mcrypt.c Sat Jun 25 13:41:19 2016
-@@ -1411,6 +1411,10 @@ PHP_FUNCTION(mcrypt_create_iv)
-
- iv = ecalloc(size + 1, 1);
-
-+#if defined(__OpenBSD__)
-+ arc4random_buf(iv, (size_t) size);
-+ n = size;
-+#else
- if (source == RANDOM || source == URANDOM) {
- #if PHP_WIN32
- /* random/urandom equivalent on Windows */
-@@ -1455,6 +1459,7 @@ PHP_FUNCTION(mcrypt_create_iv)
- iv[--size] = (char) (255.0 * php_rand(TSRMLS_C) / RAND_MAX);
- }
- }
-+#endif /* openbsd */
- RETURN_STRINGL(iv, n, 0);
- }
- /* }}} */
Index: lang/php/5.5/patches/patch-ext_mysqlnd_config9_m4
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_mysqlnd_config9_m4
diff -N lang/php/5.5/patches/patch-ext_mysqlnd_config9_m4
--- lang/php/5.5/patches/patch-ext_mysqlnd_config9_m4 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ext_mysqlnd_config9_m4,v 1.1.1.1 2013/08/07 16:46:55 robert Exp $
---- ext/mysqlnd/config9.m4.orig.port Wed Jul  3 08:10:53 2013
-+++ ext/mysqlnd/config9.m4 Sat Jul 27 18:39:50 2013
-@@ -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_bt.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
Index: lang/php/5.5/patches/patch-ext_odbc_config_m4
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_odbc_config_m4
diff -N lang/php/5.5/patches/patch-ext_odbc_config_m4
--- lang/php/5.5/patches/patch-ext_odbc_config_m4 25 Apr 2015 16:09:57 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-ext_odbc_config_m4,v 1.4 2015/04/25 16:09:57 robert Exp $
-
-don't link php binary with iodbc
-
---- ext/odbc/config.m4.orig.port Wed Apr 15 12:43:00 2015
-+++ ext/odbc/config.m4 Sat Apr 25 18:07:46 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`
Index: lang/php/5.5/patches/patch-ext_session_session_c
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_session_session_c
diff -N lang/php/5.5/patches/patch-ext_session_session_c
--- lang/php/5.5/patches/patch-ext_session_session_c 6 Feb 2016 23:31:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-ext_session_session_c,v 1.1 2016/02/06 23:31:20 sthen Exp $
-
-Perhaps the whole function can be replaced, but we have to start somewhere.
-
---- ext/session/session.c.orig.port Mon Feb  1 23:04:02 2016
-+++ ext/session/session.c Mon Feb  1 23:48:25 2016
-@@ -346,7 +346,11 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS)
- efree(buf);
-
- if (PS(entropy_length) > 0) {
--#ifdef PHP_WIN32
-+#if defined(__OpenBSD__)
-+ unsigned char rbuf[2048];
-+ size_t toread = PS(entropy_length);
-+ arc4random_buf(rbuf, MIN(toread, sizeof(rbuf)));
-+#elif defined(PHP_WIN32)
- unsigned char rbuf[2048];
- size_t toread = PS(entropy_length);
-
Index: lang/php/5.5/patches/patch-ext_sockets_sockaddr_conv_c
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_sockets_sockaddr_conv_c
diff -N lang/php/5.5/patches/patch-ext_sockets_sockaddr_conv_c
--- lang/php/5.5/patches/patch-ext_sockets_sockaddr_conv_c 28 Apr 2014 22:02:39 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-ext_sockets_sockaddr_conv_c,v 1.3 2014/04/28 22:02:39 sthen Exp $
---- ext/sockets/sockaddr_conv.c.orig.port Wed Mar  5 10:18:00 2014
-+++ ext/sockets/sockaddr_conv.c Mon Mar 24 22:53:00 2014
-@@ -11,6 +11,10 @@
-
- extern int php_string_to_if_index(const char *val, unsigned *out TSRMLS_DC);
-
-+#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 TSRMLS_DC) /* {{{ */
Index: lang/php/5.5/patches/patch-ext_spl_php_spl_c
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_spl_php_spl_c
diff -N lang/php/5.5/patches/patch-ext_spl_php_spl_c
--- lang/php/5.5/patches/patch-ext_spl_php_spl_c 20 Sep 2013 20:20:28 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-ext_spl_php_spl_c,v 1.2 2013/09/20 20:20:28 sthen Exp $
---- ext/spl/php_spl.c.orig.port Wed Sep 18 14:08:04 2013
-+++ ext/spl/php_spl.c Fri Sep 20 15:23:16 2013
-@@ -784,7 +784,7 @@ PHP_FUNCTION(spl_object_hash)
-
- PHPAPI void php_spl_object_hash(zval *obj, char *result TSRMLS_DC) /* {{{*/
- {
-- intptr_t hash_handle, hash_handlers;
-+ zend_intptr_t hash_handle, hash_handlers;
- char *hex;
-
- if (!SPL_G(hash_mask_init)) {
-@@ -792,13 +792,13 @@ PHPAPI void php_spl_object_hash(zval *obj, char *resul
- php_mt_srand(GENERATE_SEED() TSRMLS_CC);
- }
-
-- SPL_G(hash_mask_handle)   = (intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
-- SPL_G(hash_mask_handlers) = (intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
-+ SPL_G(hash_mask_handle)   = (zend_intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
-+ SPL_G(hash_mask_handlers) = (zend_intptr_t)(php_mt_rand(TSRMLS_C) >> 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);
-
- spprintf(&hex, 32, "%016lx%016lx", hash_handle, hash_handlers);
-
Index: lang/php/5.5/patches/patch-ext_spl_php_spl_h
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_spl_php_spl_h
diff -N lang/php/5.5/patches/patch-ext_spl_php_spl_h
--- lang/php/5.5/patches/patch-ext_spl_php_spl_h 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-ext_spl_php_spl_h,v 1.1.1.1 2013/08/07 16:46:55 robert Exp $
---- ext/spl/php_spl.h.orig.port Sun Jan  3 09:23:27 2010
-+++ ext/spl/php_spl.h Sat Jun 18 12:14:51 2011
-@@ -67,8 +67,8 @@ ZEND_BEGIN_MODULE_GLOBALS(spl)
- HashTable *  autoload_functions;
- int          autoload_running;
- int          autoload_extensions_len;
-- 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;
- ZEND_END_MODULE_GLOBALS(spl)
-
Index: lang/php/5.5/patches/patch-ext_standard_config_m4
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_standard_config_m4
diff -N lang/php/5.5/patches/patch-ext_standard_config_m4
--- lang/php/5.5/patches/patch-ext_standard_config_m4 20 Sep 2013 20:20:28 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-ext_standard_config_m4,v 1.2 2013/09/20 20:20:28 sthen Exp $
---- ext/standard/config.m4.orig.port Wed Sep 18 14:08:04 2013
-+++ ext/standard/config.m4 Fri Sep 20 15:23:16 2013
-@@ -389,16 +389,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
Index: lang/php/5.5/patches/patch-ext_standard_password_c
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_standard_password_c
diff -N lang/php/5.5/patches/patch-ext_standard_password_c
--- lang/php/5.5/patches/patch-ext_standard_password_c 6 Feb 2016 23:31:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-ext_standard_password_c,v 1.1 2016/02/06 23:31:20 sthen Exp $
---- ext/standard/password.c.orig.port Mon Feb  1 23:04:02 2016
-+++ ext/standard/password.c Mon Feb  1 23:51:51 2016
-@@ -124,6 +124,9 @@ static int php_password_make_salt(size_t length, char
-
- buffer = (char *) safe_emalloc(raw_length, 1, 1);
-
-+#if defined(__OpenBSD__)
-+ arc4random_buf(buffer, raw_length);
-+#else
- #if PHP_WIN32
- {
- BYTE *iv_b = (BYTE *) buffer;
-@@ -156,6 +159,7 @@ static int php_password_make_salt(size_t length, char
- buffer[i] ^= (char) (255.0 * php_rand(TSRMLS_C) / RAND_MAX);
- }
- }
-+#endif /* openbsd */
-
- result = safe_emalloc(length, 1, 1);
- if (php_password_salt_to64(buffer, raw_length, length, result) == FAILURE) {
Index: lang/php/5.5/patches/patch-ext_tidy_config_m4
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_tidy_config_m4
diff -N lang/php/5.5/patches/patch-ext_tidy_config_m4
--- lang/php/5.5/patches/patch-ext_tidy_config_m4 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-ext_tidy_config_m4,v 1.1.1.1 2013/08/07 16:46:55 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,[ ])
-   ],[],[])
Index: lang/php/5.5/patches/patch-ext_tidy_tidy_c
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_tidy_tidy_c
diff -N lang/php/5.5/patches/patch-ext_tidy_tidy_c
--- lang/php/5.5/patches/patch-ext_tidy_tidy_c 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_tidy_tidy_c,v 1.1.1.1 2013/08/07 16:46:55 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 */
Index: lang/php/5.5/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
===================================================================
RCS file: lang/php/5.5/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
diff -N lang/php/5.5/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
--- lang/php/5.5/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_xmlrpc_libxmlrpc_encodings_c,v 1.1.1.1 2013/08/07 16:46:55 robert Exp $
---- ext/xmlrpc/libxmlrpc/encodings.c.orig.port Wed Sep 26 16:44:16 2007
-+++ ext/xmlrpc/libxmlrpc/encodings.c Sat Jun 18 12:14:51 2011
-@@ -78,7 +78,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;
Index: lang/php/5.5/patches/patch-main_php_h
===================================================================
RCS file: lang/php/5.5/patches/patch-main_php_h
diff -N lang/php/5.5/patches/patch-main_php_h
--- lang/php/5.5/patches/patch-main_php_h 7 Aug 2013 16:46:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-main_php_h,v 1.1.1.1 2013/08/07 16:46:55 robert Exp $
---- main/php.h.orig.port Thu Jul 18 16:37:33 2013
-+++ main/php.h Sun Jul 28 11:30:14 2013
-@@ -145,7 +145,9 @@ END_EXTERN_C()
- # if PHP_WIN32
- typedef int socklen_t;
- # else
-+#   if !defined(__OpenBSD__)
- typedef unsigned int socklen_t;
-+#   endif
- # endif
- #endif
-
Index: lang/php/5.5/patches/patch-main_php_ini_c
===================================================================
RCS file: lang/php/5.5/patches/patch-main_php_ini_c
diff -N lang/php/5.5/patches/patch-main_php_ini_c
--- lang/php/5.5/patches/patch-main_php_ini_c 19 Dec 2016 20:34:22 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-main_php_ini_c,v 1.3 2016/12/19 20:34:22 martijn Exp $
---- main/php_ini.c.orig.port Wed Jul 20 10:41:48 2016
-+++ main/php_ini.c Thu Dec  8 10:53:58 2016
-@@ -576,7 +576,7 @@ int php_init_config(TSRMLS_D)
-
- /* 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, &php_ini_opened_path TSRMLS_CC);
-+ fh.handle.fp = php_fopen_with_path("php-${PV}.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
- if (fh.handle.fp) {
- fh.filename = php_ini_opened_path;
- }
Index: lang/php/5.5/patches/patch-main_php_open_temporary_file_c
===================================================================
RCS file: lang/php/5.5/patches/patch-main_php_open_temporary_file_c
diff -N lang/php/5.5/patches/patch-main_php_open_temporary_file_c
--- lang/php/5.5/patches/patch-main_php_open_temporary_file_c 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-main_php_open_temporary_file_c,v 1.1.1.1 2013/08/07 16:46:56 robert Exp $
---- main/php_open_temporary_file.c.orig.port Sun Feb  7 20:15:58 2010
-+++ main/php_open_temporary_file.c Sat Jun 18 12:14:52 2011
-@@ -138,7 +138,7 @@ static int php_do_open_temporary_file(const char *path
- trailing_slash = "/";
- }
-
-- if (spprintf(&opened_path, 0, "%s%s%sXXXXXX", new_state.cwd, trailing_slash, pfx) >= MAXPATHLEN) {
-+ if (spprintf(&opened_path, 0, "%s%s%sXXXXXXXXXX", new_state.cwd, trailing_slash, pfx) >= MAXPATHLEN) {
- efree(opened_path);
- free(new_state.cwd);
- return -1;
Index: lang/php/5.5/patches/patch-php_ini-development
===================================================================
RCS file: lang/php/5.5/patches/patch-php_ini-development
diff -N lang/php/5.5/patches/patch-php_ini-development
--- lang/php/5.5/patches/patch-php_ini-development 19 Feb 2015 20:14:41 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,59 +0,0 @@
-$OpenBSD: patch-php_ini-development,v 1.6 2015/02/19 20:14:41 sthen Exp $
---- php.ini-development.orig.port Wed Feb 18 15:39:54 2015
-+++ php.ini-development Thu Feb 19 14:23:08 2015
-@@ -690,11 +690,8 @@ default_mimetype = "text/html"
- ;;;;;;;;;;;;;;;;;;;;;;;;;
-
- ; 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
-
-@@ -716,6 +713,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)
-@@ -800,7 +798,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
-@@ -907,7 +905,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
-@@ -986,16 +984,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 = [hidden email]
--
- ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
- ; http://php.net/sendmail-path
- ;sendmail_path =
Index: lang/php/5.5/patches/patch-php_ini-production
===================================================================
RCS file: lang/php/5.5/patches/patch-php_ini-production
diff -N lang/php/5.5/patches/patch-php_ini-production
--- lang/php/5.5/patches/patch-php_ini-production 19 Feb 2015 20:14:41 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-php_ini-production,v 1.6 2015/02/19 20:14:41 sthen Exp $
---- php.ini-production.orig.port Wed Feb 18 15:39:54 2015
-+++ php.ini-production Thu Feb 19 14:23:08 2015
-@@ -690,11 +690,8 @@ default_mimetype = "text/html"
- ;;;;;;;;;;;;;;;;;;;;;;;;;
-
- ; 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
-
-@@ -716,6 +713,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)
-@@ -800,7 +798,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
-@@ -907,7 +905,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
Index: lang/php/5.5/patches/patch-sapi_apache_mod_php5_c
===================================================================
RCS file: lang/php/5.5/patches/patch-sapi_apache_mod_php5_c
diff -N lang/php/5.5/patches/patch-sapi_apache_mod_php5_c
--- lang/php/5.5/patches/patch-sapi_apache_mod_php5_c 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-sapi_apache_mod_php5_c,v 1.1.1.1 2013/08/07 16:46:56 robert Exp $
---- sapi/apache/mod_php5.c.orig.port Wed Jul  3 08:10:53 2013
-+++ sapi/apache/mod_php5.c Sat Jul 27 18:39:50 2013
-@@ -952,12 +952,19 @@ static void php_child_exit_handler(server_rec *s, pool
-  */
- static void php_init_handler(server_rec *s, pool *p)
- {
-+ char *ini;
-+
- register_cleanup(p, NULL, (void (*)(void *))apache_php_module_shutdown_wrapper, (void (*)(void *))php_module_shutdown_for_exec);
- if (!apache_php_initialized) {
- apache_php_initialized = 1;
- #ifdef ZTS
- tsrm_startup(1, 1, 0, NULL);
- #endif
-+
-+        if ((ini = getenv("PHP_INI_PATH"))) {
-+ apache_sapi_module.php_ini_path_override = ini;
-+ }
-+
- sapi_startup(&apache_sapi_module);
- php_apache_startup(&apache_sapi_module);
- }
Index: lang/php/5.5/patches/patch-sapi_cgi_cgi_main_c
===================================================================
RCS file: lang/php/5.5/patches/patch-sapi_cgi_cgi_main_c
diff -N lang/php/5.5/patches/patch-sapi_cgi_cgi_main_c
--- lang/php/5.5/patches/patch-sapi_cgi_cgi_main_c 19 Feb 2015 20:14:41 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.2 2015/02/19 20:14:41 sthen Exp $
---- sapi/cgi/cgi_main.c.orig.port Wed Feb 18 15:39:54 2015
-+++ sapi/cgi/cgi_main.c Thu Feb 19 14:23:08 2015
-@@ -1746,6 +1746,7 @@ int main(int argc, char *argv[])
- char *orig_optarg = php_optarg;
- char *script_file = NULL;
- int ini_entries_len = 0;
-+ char *ini;
- /* end of temporary locals */
-
- #ifdef ZTS
-@@ -1800,7 +1801,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 */
Index: lang/php/5.5/patches/patch-sapi_cli_php_cli_c
===================================================================
RCS file: lang/php/5.5/patches/patch-sapi_cli_php_cli_c
diff -N lang/php/5.5/patches/patch-sapi_cli_php_cli_c
--- lang/php/5.5/patches/patch-sapi_cli_php_cli_c 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-sapi_cli_php_cli_c,v 1.1.1.1 2013/08/07 16:46:56 robert Exp $
---- sapi/cli/php_cli.c.orig.port Thu Jul 18 16:37:33 2013
-+++ sapi/cli/php_cli.c Sun Jul 28 11:30:14 2013
-@@ -673,6 +673,7 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /*
- int lineno = 0;
- const char *param_error=NULL;
- int hide_argv = 0;
-+ char *ini;
-
- zend_try {
-
Index: lang/php/5.5/patches/patch-sapi_fpm_fpm_fpm_atomic_h
===================================================================
RCS file: lang/php/5.5/patches/patch-sapi_fpm_fpm_fpm_atomic_h
diff -N lang/php/5.5/patches/patch-sapi_fpm_fpm_fpm_atomic_h
--- lang/php/5.5/patches/patch-sapi_fpm_fpm_fpm_atomic_h 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,103 +0,0 @@
-$OpenBSD: patch-sapi_fpm_fpm_fpm_atomic_h,v 1.1.1.1 2013/08/07 16:46:56 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
-
Index: lang/php/5.5/patches/patch-sapi_fpm_php-fpm_conf_in
===================================================================
RCS file: lang/php/5.5/patches/patch-sapi_fpm_php-fpm_conf_in
diff -N lang/php/5.5/patches/patch-sapi_fpm_php-fpm_conf_in
--- lang/php/5.5/patches/patch-sapi_fpm_php-fpm_conf_in 19 Feb 2015 20:14:41 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-sapi_fpm_php-fpm_conf_in,v 1.4 2015/02/19 20:14:41 sthen Exp $
---- sapi/fpm/php-fpm.conf.in.orig.port Wed Feb 18 15:39:54 2015
-+++ sapi/fpm/php-fpm.conf.in Thu Feb 19 14:23:08 2015
-@@ -161,7 +161,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: 65535 (-1 on FreeBSD and OpenBSD)
-@@ -172,9 +172,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
-  
- ; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
- ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-@@ -466,7 +466,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.
Index: lang/php/5.5/patches/patch-scripts_Makefile_frag
===================================================================
RCS file: lang/php/5.5/patches/patch-scripts_Makefile_frag
diff -N lang/php/5.5/patches/patch-scripts_Makefile_frag
--- lang/php/5.5/patches/patch-scripts_Makefile_frag 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-scripts_Makefile_frag,v 1.1.1.1 2013/08/07 16:46:56 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 \
Index: lang/php/5.5/patches/patch-scripts_php-config_in
===================================================================
RCS file: lang/php/5.5/patches/patch-scripts_php-config_in
diff -N lang/php/5.5/patches/patch-scripts_php-config_in
--- lang/php/5.5/patches/patch-scripts_php-config_in 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-scripts_php-config_in,v 1.1.1.1 2013/08/07 16:46:56 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
Index: lang/php/5.5/patches/patch-scripts_phpize_in
===================================================================
RCS file: lang/php/5.5/patches/patch-scripts_phpize_in
diff -N lang/php/5.5/patches/patch-scripts_phpize_in
--- lang/php/5.5/patches/patch-scripts_phpize_in 7 Aug 2013 16:46:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-scripts_phpize_in,v 1.1.1.1 2013/08/07 16:46:56 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@"
-
Index: lang/php/5.5/patches/suhosin-ext_suhosin_execute_c
===================================================================
RCS file: lang/php/5.5/patches/suhosin-ext_suhosin_execute_c
diff -N lang/php/5.5/patches/suhosin-ext_suhosin_execute_c
--- lang/php/5.5/patches/suhosin-ext_suhosin_execute_c 22 Jun 2016 21:18:33 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: suhosin-ext_suhosin_execute_c,v 1.1 2016/06/22 21:18:33 sthen Exp $
---- ext/suhosin/execute.c.orig.port Mon Feb  1 23:04:02 2016
-+++ ext/suhosin/execute.c Mon Feb  1 23:38:49 2016
-@@ -1312,6 +1312,9 @@ static php_uint32 suhosin_mt_rand(TSRMLS_D)
-  */
- static void suhosin_gen_entropy(php_uint32 *entropybuf TSRMLS_DC)
- {
-+#if defined(__OpenBSD__)
-+    arc4random_buf(entropybuf, 8 * sizeof(php_uint32));
-+#else
-     php_uint32 seedbuf[20];
-     /* On a modern OS code, stack and heap base are randomized */
-     unsigned long code_value  = (unsigned long)suhosin_gen_entropy;
-@@ -1335,7 +1338,7 @@ static void suhosin_gen_entropy(php_uint32 *entropybuf
- #endif
-     seedbuf[5] = (php_uint32) 0x7fffffff * php_combined_lcg(TSRMLS_C);
-
--#ifndef PHP_WIN32
-+#if !defined(PHP_WIN32)
-     fd = VCWD_OPEN("/dev/urandom", O_RDONLY);
-     if (fd >= 0) {
-         /* ignore error case - if urandom doesn't give us any/enough random bytes */
-@@ -1354,6 +1357,7 @@ static void suhosin_gen_entropy(php_uint32 *entropybuf
-         suhosin_SHA256Update(&context, (unsigned char*)SUHOSIN_G(seedingkey), strlen(SUHOSIN_G(seedingkey)));
-     }
-     suhosin_SHA256Final((void *)entropybuf, &context);
-+#endif /* openbsd */
- }
- /* }}} */
-
Index: lang/php/5.5/pkg/PLIST-bz2
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-bz2
diff -N lang/php/5.5/pkg/PLIST-bz2
--- lang/php/5.5/pkg/PLIST-bz2 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-bz2,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-bz2->=5.5,<5.6
-@conflict php5-bz2->=5.2
-lib/php-${PV}/modules/bz2.so
-share/examples/php-${PV}/bz2.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/bz2.ini
Index: lang/php/5.5/pkg/PLIST-curl
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-curl
diff -N lang/php/5.5/pkg/PLIST-curl
--- lang/php/5.5/pkg/PLIST-curl 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-curl,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-curl->=5.5,<5.6
-@conflict php5-curl->=5.2
-lib/php-${PV}/modules/curl.so
-share/examples/php-${PV}/curl.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/curl.ini
Index: lang/php/5.5/pkg/PLIST-dba
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-dba
diff -N lang/php/5.5/pkg/PLIST-dba
--- lang/php/5.5/pkg/PLIST-dba 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-dba,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-dba->=5.5,<5.6
-@conflict php5-dba->=5.2
-lib/php-${PV}/modules/dba.so
-share/examples/php-${PV}/dba.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/dba.ini
Index: lang/php/5.5/pkg/PLIST-fastcgi
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-fastcgi
diff -N lang/php/5.5/pkg/PLIST-fastcgi
--- lang/php/5.5/pkg/PLIST-fastcgi 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PLIST-fastcgi,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-fastcgi->=5.5,<5.6
-@bin bin/php-fastcgi-${PV}
Index: lang/php/5.5/pkg/PLIST-gd
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-gd
diff -N lang/php/5.5/pkg/PLIST-gd
--- lang/php/5.5/pkg/PLIST-gd 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-gd,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-gd->=5.5,<5.6
-@conflict php5-gd->=5.2
-lib/php-${PV}/modules/gd.so
-share/examples/php-${PV}/gd.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/gd.ini
Index: lang/php/5.5/pkg/PLIST-gmp
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-gmp
diff -N lang/php/5.5/pkg/PLIST-gmp
--- lang/php/5.5/pkg/PLIST-gmp 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-gmp,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-gmp->=5.5,<5.6
-@conflict php5-gmp->=5.2
-lib/php-${PV}/modules/gmp.so
-share/examples/php-${PV}/gmp.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/gmp.ini
Index: lang/php/5.5/pkg/PLIST-imap
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-imap
diff -N lang/php/5.5/pkg/PLIST-imap
--- lang/php/5.5/pkg/PLIST-imap 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-@comment $OpenBSD: PLIST-imap,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-imap->=5.5,<5.6
-@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
Index: lang/php/5.5/pkg/PLIST-intl
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-intl
diff -N lang/php/5.5/pkg/PLIST-intl
--- lang/php/5.5/pkg/PLIST-intl 29 Jun 2016 16:14:42 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-@comment $OpenBSD: PLIST-intl,v 1.2 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-intl->=5.5,<5.6
-lib/php-${PV}/modules/intl.so
-share/examples/php-${PV}/intl.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/intl.ini
Index: lang/php/5.5/pkg/PLIST-ldap
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-ldap
diff -N lang/php/5.5/pkg/PLIST-ldap
--- lang/php/5.5/pkg/PLIST-ldap 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-ldap,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-ldap->=5.5,<5.6
-@conflict php5-ldap->=5.2
-lib/php-${PV}/modules/ldap.so
-share/examples/php-${PV}/ldap.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/ldap.ini
Index: lang/php/5.5/pkg/PLIST-main
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-main
diff -N lang/php/5.5/pkg/PLIST-main
--- lang/php/5.5/pkg/PLIST-main 29 Jun 2016 16:14:42 -0000 1.16
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,392 +0,0 @@
-@comment $OpenBSD: PLIST-main,v 1.16 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php->=5.5,<5.6
-@conflict php-pdo_sqlite->=5.5,<5.6
-@conflict php-fpm->=5.5,<5.6
-@conflict php5-core->=5.2
-@conflict php5-core-fastcgi->=5.2
-@conflict php5-pdo_sqlite->=5.2
-@pkgpath lang/php/5.4
-@pkgpath lang/php/5.4,-pdo_sqlite
-@pkgpath lang/php/5.5,-fpm
-@pkgpath lang/php/5.5,-main,ap2
-@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}/libphp5.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
-@man man/man8/php-fpm-${PV}.8
-@bin sbin/php-fpm-${PV}
-share/doc/pkg-readmes/${FULLPKGNAME}
-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/examples/php-${PV}/php-fpm.conf
-@sample ${SYSCONFDIR}/php-fpm.conf
-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_virtual_cwd.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_alloc.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_dynamic_array.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_indent.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_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_ptr_stack.h
-share/php-${PV}/include/Zend/zend_qsort.h
-share/php-${PV}/include/Zend/zend_signal.h
-share/php-${PV}/include/Zend/zend_stack.h
-share/php-${PV}/include/Zend/zend_static_allocator.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_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_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/ereg/
-share/php-${PV}/include/ext/ereg/php_ereg.h
-share/php-${PV}/include/ext/ereg/php_regex.h
-share/php-${PV}/include/ext/ereg/regex/
-share/php-${PV}/include/ext/ereg/regex/cclass.h
-share/php-${PV}/include/ext/ereg/regex/cname.h
-share/php-${PV}/include/ext/ereg/regex/regex.h
-share/php-${PV}/include/ext/ereg/regex/regex2.h
-share/php-${PV}/include/ext/ereg/regex/utils.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/gd_compat.h
-share/php-${PV}/include/ext/gd/gdcache.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/libgd/webpimg.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_types.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/mysql_float_to_double.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/php_mysqlnd.h
-share/php-${PV}/include/ext/mysqlnd/php_mysqlnd_config.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/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/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_smart_str.h
-share/php-${PV}/include/ext/standard/php_smart_str_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/fopen_wrappers.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_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/win32_internal_function_disabled.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}/
-@rcscript ${RCDIR}/php${SV}_fpm
Index: lang/php/5.5/pkg/PLIST-mcrypt
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-mcrypt
diff -N lang/php/5.5/pkg/PLIST-mcrypt
--- lang/php/5.5/pkg/PLIST-mcrypt 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-mcrypt,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-mcrypt->=5.5,<5.6
-@conflict php5-mcrypt->=5.2
-lib/php-${PV}/modules/mcrypt.so
-share/examples/php-${PV}/mcrypt.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/mcrypt.ini
Index: lang/php/5.5/pkg/PLIST-mssql
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-mssql
diff -N lang/php/5.5/pkg/PLIST-mssql
--- lang/php/5.5/pkg/PLIST-mssql 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-mssql,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-mssql->=5.5,<5.6
-@conflict php5-mssql->=5.2
-lib/php-${PV}/modules/mssql.so
-share/examples/php-${PV}/mssql.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/mssql.ini
Index: lang/php/5.5/pkg/PLIST-mysql
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-mysql
diff -N lang/php/5.5/pkg/PLIST-mysql
--- lang/php/5.5/pkg/PLIST-mysql 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-mysql,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-mysql->=5.5,<5.6
-@conflict php5-mysql->=5.2
-lib/php-${PV}/modules/mysql.so
-share/examples/php-${PV}/mysql.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/mysql.ini
Index: lang/php/5.5/pkg/PLIST-mysqli
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-mysqli
diff -N lang/php/5.5/pkg/PLIST-mysqli
--- lang/php/5.5/pkg/PLIST-mysqli 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-mysqli,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-mysqli->=5.5,<5.6
-@conflict php5-mysqli->=5.2
-lib/php-${PV}/modules/mysqli.so
-share/examples/php-${PV}/mysqli.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/mysqli.ini
Index: lang/php/5.5/pkg/PLIST-odbc
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-odbc
diff -N lang/php/5.5/pkg/PLIST-odbc
--- lang/php/5.5/pkg/PLIST-odbc 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-odbc,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-odbc->=5.5,<5.6
-@conflict php5-odbc->=5.2
-lib/php-${PV}/modules/odbc.so
-share/examples/php-${PV}/odbc.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/odbc.ini
Index: lang/php/5.5/pkg/PLIST-pcntl
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-pcntl
diff -N lang/php/5.5/pkg/PLIST-pcntl
--- lang/php/5.5/pkg/PLIST-pcntl 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-@comment $OpenBSD: PLIST-pcntl,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-pcntl->=5.5,<5.6
-@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
Index: lang/php/5.5/pkg/PLIST-pdo_dblib
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-pdo_dblib
diff -N lang/php/5.5/pkg/PLIST-pdo_dblib
--- lang/php/5.5/pkg/PLIST-pdo_dblib 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-pdo_dblib,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-pdo_dblib->=5.5,<5.6
-@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
Index: lang/php/5.5/pkg/PLIST-pdo_mysql
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-pdo_mysql
diff -N lang/php/5.5/pkg/PLIST-pdo_mysql
--- lang/php/5.5/pkg/PLIST-pdo_mysql 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-pdo_mysql,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-pdo_mysql->=5.5,<5.6
-@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
Index: lang/php/5.5/pkg/PLIST-pdo_pgsql
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-pdo_pgsql
diff -N lang/php/5.5/pkg/PLIST-pdo_pgsql
--- lang/php/5.5/pkg/PLIST-pdo_pgsql 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-pdo_pgsql,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-pdo_pgsql->=5.5,<5.6
-@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
Index: lang/php/5.5/pkg/PLIST-pgsql
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-pgsql
diff -N lang/php/5.5/pkg/PLIST-pgsql
--- lang/php/5.5/pkg/PLIST-pgsql 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-pgsql,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-pgsql->=5.5,<5.6
-@conflict php5-pgsql->=5.2
-lib/php-${PV}/modules/pgsql.so
-share/examples/php-${PV}/pgsql.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/pgsql.ini
Index: lang/php/5.5/pkg/PLIST-pspell
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-pspell
diff -N lang/php/5.5/pkg/PLIST-pspell
--- lang/php/5.5/pkg/PLIST-pspell 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-pspell,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-pspell->=5.5,<5.6
-@conflict php5-pspell->=5.2
-lib/php-${PV}/modules/pspell.so
-share/examples/php-${PV}/pspell.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/pspell.ini
Index: lang/php/5.5/pkg/PLIST-shmop
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-shmop
diff -N lang/php/5.5/pkg/PLIST-shmop
--- lang/php/5.5/pkg/PLIST-shmop 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-shmop,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-shmop->=5.5,<5.6
-@conflict php5-shmop->=5.2
-lib/php-${PV}/modules/shmop.so
-share/examples/php-${PV}/shmop.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/shmop.ini
Index: lang/php/5.5/pkg/PLIST-snmp
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-snmp
diff -N lang/php/5.5/pkg/PLIST-snmp
--- lang/php/5.5/pkg/PLIST-snmp 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-snmp,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-snmp->=5.5,<5.6
-@conflict php5-snmp->=5.2
-lib/php-${PV}/modules/snmp.so
-share/examples/php-${PV}/snmp.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/snmp.ini
Index: lang/php/5.5/pkg/PLIST-soap
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-soap
diff -N lang/php/5.5/pkg/PLIST-soap
--- lang/php/5.5/pkg/PLIST-soap 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-soap,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-soap->=5.5,<5.6
-@conflict php5-soap->=5.2
-lib/php-${PV}/modules/soap.so
-share/examples/php-${PV}/soap.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/soap.ini
Index: lang/php/5.5/pkg/PLIST-sybase_ct
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-sybase_ct
diff -N lang/php/5.5/pkg/PLIST-sybase_ct
--- lang/php/5.5/pkg/PLIST-sybase_ct 29 Jun 2016 16:14:42 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-@comment $OpenBSD: PLIST-sybase_ct,v 1.2 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-sybase_ct->=5.5,<5.6
-@conflict php5-sybase_ct->=5.2
-@pkgpath www/php5/extensions,-sybase_ct
-lib/php-${PV}/modules/sybase_ct.so
-share/examples/php-${PV}/sybase_ct.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/sybase_ct.ini
Index: lang/php/5.5/pkg/PLIST-tidy
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-tidy
diff -N lang/php/5.5/pkg/PLIST-tidy
--- lang/php/5.5/pkg/PLIST-tidy 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-tidy,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-tidy->=5.5,<5.6
-@conflict php5-tidy->=5.2
-lib/php-${PV}/modules/tidy.so
-share/examples/php-${PV}/tidy.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/tidy.ini
Index: lang/php/5.5/pkg/PLIST-xmlrpc
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-xmlrpc
diff -N lang/php/5.5/pkg/PLIST-xmlrpc
--- lang/php/5.5/pkg/PLIST-xmlrpc 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-xmlrpc,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-xmlrpc->=5.5,<5.6
-@conflict php5-xmlrpc->=5.2
-lib/php-${PV}/modules/xmlrpc.so
-share/examples/php-${PV}/xmlrpc.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/xmlrpc.ini
Index: lang/php/5.5/pkg/PLIST-xsl
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-xsl
diff -N lang/php/5.5/pkg/PLIST-xsl
--- lang/php/5.5/pkg/PLIST-xsl 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST-xsl,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-xsl->=5.5,<5.6
-@conflict php5-xsl->=5.2
-lib/php-${PV}/modules/xsl.so
-share/examples/php-${PV}/xsl.ini
-@sample ${SYSCONFDIR}/php-${PV}.sample/xsl.ini
Index: lang/php/5.5/pkg/PLIST-zip
===================================================================
RCS file: lang/php/5.5/pkg/PLIST-zip
diff -N lang/php/5.5/pkg/PLIST-zip
--- lang/php/5.5/pkg/PLIST-zip 29 Jun 2016 16:14:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-@comment $OpenBSD: PLIST-zip,v 1.3 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-zip->=5.5,<5.6
-@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
Index: lang/php/5.5/pkg/php55_fpm.rc
===================================================================
RCS file: lang/php/5.5/pkg/php55_fpm.rc
diff -N lang/php/5.5/pkg/php55_fpm.rc
--- lang/php/5.5/pkg/php55_fpm.rc 18 Sep 2015 09:18:23 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: php55_fpm.rc,v 1.1 2015/09/18 09:18:23 sthen Exp $
-
-daemon="${TRUEPREFIX}/sbin/php-fpm-${PV}"
-
-. /etc/rc.d/rc.subr
-
-pexp="php-fpm-${PV}: master process .*"
-rc_reload=NO
-
-rc_cmd $1
Index: lang/php/5.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- lang/php/5.6/Makefile 26 Jul 2017 22:45:25 -0000 1.48
+++ lang/php/5.6/Makefile 10 Aug 2017 20:03:52 -0000
@@ -1,11 +1,44 @@
-# $OpenBSD: Makefile,v 1.48 2017/07/26 22:45:25 sthen Exp $
-
-BROKEN-alpha= pcre_jit_compile.c:65:2: error: #error Unsupported architecture
+# $OpenBSD: Makefile,v 1.45 2017/04/10 11:46:22 sthen Exp $
 
 PV= 5.6
-V= ${PV}.30
-REVISION= 1
+V= ${PV}.31
+
+MASTER_SITES0= https://download.suhosin.org/
+
+FLAVORS= no_suhosin
+FLAVOR?=
+
+SUHOSIN_V= 0.9.38
+
+.if ${FLAVOR:Mno_suhosin}
+SUPDISTFILES= suhosin-${SUHOSIN_V}.tar.gz:0
+.else
+DISTFILES+= suhosin-${SUHOSIN_V}.tar.gz:0
+PATCH_LIST= patch-* suhosin-*
+CONFIGURE_ARGS+= --enable-suhosin
+
+pre-patch:
+ @mv ${WRKDIR}/suhosin-${SUHOSIN_V} ${WRKSRC}/ext/suhosin
+.endif
+
+# mysql
+PHP_MODULES_EXTRA= -mysql
+COMMENT-mysql= mysql database access extensions for php
+CONFIGURE_ARGS+= --with-mysql=shared,mysqlnd
+PHP_MODULES_DEPEND-mysql= -mysqlnd
+
+# sybase-ct
+PHP_MODULES_EXTRA+= -sybase_ct
+COMMENT-sybase_ct= sybase database access extensions for php
+CONFIGURE_ARGS+= --with-sybase-ct=shared,${LOCALBASE}
+LIB_DEPENDS-sybase_ct= databases/freetds
+WANTLIB-sybase_ct= ct pthread
 
-WANTLIB-main+= ${COMPILER_LIBCXX} ncurses readline
+# mssql
+PHP_MODULES_EXTRA+= -mssql
+COMMENT-mssql= microsoft sql access extensions for php
+CONFIGURE_ARGS+=        --with-mssql=shared,${LOCALBASE}
+LIB_DEPENDS-mssql= databases/freetds
+WANTLIB-mssql= sybdb>=6 pthread
 
 .include <bsd.port.mk>
Index: lang/php/5.6/distinfo
===================================================================
RCS file: /cvs/ports/lang/php/5.6/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- lang/php/5.6/distinfo 22 Jan 2017 17:00:33 -0000 1.26
+++ lang/php/5.6/distinfo 10 Aug 2017 20:03:52 -0000
@@ -1,4 +1,4 @@
-SHA256 (php-5.6.30.tar.bz2) = oQXCk/odv/EYtbDKdAKebEYfjHj0mzN6Kpi+njLCeQY=
+SHA256 (php-5.6.31.tar.bz2) = jzlxactl8FOfO8sEBg+Xdw1z4ZB0o3vSxYuY6/bssQ8=
 SHA256 (suhosin-0.9.38.tar.gz) = wC12xOfOd3kQo3wYGBy2f9npDv4BB/6rPeMTG1+JvOo=
-SIZE (php-5.6.30.tar.bz2) = 15011816
+SIZE (php-5.6.31.tar.bz2) = 15028813
 SIZE (suhosin-0.9.38.tar.gz) = 122800
Index: lang/php/5.6/patches/patch-acinclude_m4
===================================================================
RCS file: lang/php/5.6/patches/patch-acinclude_m4
diff -N lang/php/5.6/patches/patch-acinclude_m4
--- lang/php/5.6/patches/patch-acinclude_m4 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-$OpenBSD: patch-acinclude_m4,v 1.1 2014/11/15 13:43:01 robert Exp $
---- acinclude.m4.orig.port Sun Jul 28 10:54:23 2013
-+++ acinclude.m4 Sun Jul 28 10:55:00 2013
-@@ -984,15 +984,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(PHP_EXT_DIR($1),$2,$ac_extra,)
--        EXT_STATIC="$EXT_STATIC $1"
--        ;;
--      *[)]
-         PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
--        ;;
--    esac
-+        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
-+        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
-     EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
-   fi
-   PHP_ADD_BUILD_DIR($ext_builddir)
-@@ -1042,12 +1036,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
- ])
-
-@@ -2320,9 +2308,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
-
Index: lang/php/5.6/patches/patch-configure_in
===================================================================
RCS file: lang/php/5.6/patches/patch-configure_in
diff -N lang/php/5.6/patches/patch-configure_in
--- lang/php/5.6/patches/patch-configure_in 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.1 2014/11/15 13:43:01 robert Exp $
---- configure.in.orig.port Wed Nov 12 14:52:21 2014
-+++ configure.in Sat Nov 15 10:45:17 2014
-@@ -1042,16 +1042,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
-@@ -1242,7 +1242,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
Index: lang/php/5.6/patches/patch-ext_gd_gdcache_h
===================================================================
RCS file: lang/php/5.6/patches/patch-ext_gd_gdcache_h
diff -N lang/php/5.6/patches/patch-ext_gd_gdcache_h
--- lang/php/5.6/patches/patch-ext_gd_gdcache_h 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ext_gd_gdcache_h,v 1.1 2014/11/15 13:43:01 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 */
Index: lang/php/5.6/patches/patch-ext_gd_libgd_gdkanji_c
===================================================================
RCS file: lang/php/5.6/patches/patch-ext_gd_libgd_gdkanji_c
diff -N lang/php/5.6/patches/patch-ext_gd_libgd_gdkanji_c
--- lang/php/5.6/patches/patch-ext_gd_libgd_gdkanji_c 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/gd/libgd/gdkanji.c.orig.port Wed Sep 26 16:44:16 2007
-+++ ext/gd/libgd/gdkanji.c Sat Jun 18 12:14:49 2011
-@@ -362,7 +362,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)
Index: lang/php/5.6/patches/patch-ext_iconv_iconv_c
===================================================================
RCS file: lang/php/5.6/patches/patch-ext_iconv_iconv_c
diff -N lang/php/5.6/patches/patch-ext_iconv_iconv_c
--- lang/php/5.6/patches/patch-ext_iconv_iconv_c 12 Jul 2015 14:06:23 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-$OpenBSD: patch-ext_iconv_iconv_c,v 1.2 2015/07/12 14:06:23 robert Exp $
---- ext/iconv/iconv.c.orig.port Fri Jul 10 02:33:32 2015
-+++ ext/iconv/iconv.c Sun Jul 12 16:05:11 2015
-@@ -463,7 +463,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d
-
- out_p = (d)->c + (d)->len;
-
-- 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:
-@@ -650,7 +650,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const c
- out_p = 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) {
-@@ -775,7 +775,7 @@ static php_iconv_err_t _php_iconv_strlen(unsigned int
-
- 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;
- }
-@@ -896,7 +896,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(unsigned int
-
- 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) {
-@@ -1277,7 +1277,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:
-@@ -1377,7 +1377,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:
-@@ -2650,7 +2650,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:
Index: lang/php/5.6/patches/patch-ext_mysqlnd_config9_m4
===================================================================
RCS file: lang/php/5.6/patches/patch-ext_mysqlnd_config9_m4
diff -N lang/php/5.6/patches/patch-ext_mysqlnd_config9_m4
--- lang/php/5.6/patches/patch-ext_mysqlnd_config9_m4 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ext_mysqlnd_config9_m4,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/mysqlnd/config9.m4.orig.port Wed Jul  3 08:10:53 2013
-+++ ext/mysqlnd/config9.m4 Sat Jul 27 18:39:50 2013
-@@ -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_bt.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
Index: lang/php/5.6/patches/patch-ext_odbc_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-ext_odbc_config_m4,v
retrieving revision 1.3
diff -u -p -r1.3 patch-ext_odbc_config_m4
--- lang/php/5.6/patches/patch-ext_odbc_config_m4 25 Apr 2015 16:20:29 -0000 1.3
+++ lang/php/5.6/patches/patch-ext_odbc_config_m4 10 Aug 2017 20:03:52 -0000
@@ -1,14 +1,21 @@
-$OpenBSD: patch-ext_odbc_config_m4,v 1.3 2015/04/25 16:20:29 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,,
+$OpenBSD$
+--- ext/odbc/config.m4.orig.port Mon Jun 26 23:36:19 2017
++++ ext/odbc/config.m4 Mon Jun 26 23:37:10 2017
+@@ -396,7 +396,7 @@ 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)
++      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
        ODBC_TYPE=iodbc
        ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
        ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
+@@ -409,7 +409,7 @@ PHP_ARG_WITH(iodbc,,
+       if test "$PHP_IODBC" = "yes"; then
+         PHP_IODBC=/usr/local
+       fi
+-      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
+       PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
+       ODBC_TYPE=iodbc
+       ODBC_INCLUDE=-I$PHP_IODBC/include
Index: lang/php/5.6/patches/patch-ext_openssl_config0_m4
===================================================================
RCS file: lang/php/5.6/patches/patch-ext_openssl_config0_m4
diff -N lang/php/5.6/patches/patch-ext_openssl_config0_m4
--- lang/php/5.6/patches/patch-ext_openssl_config0_m4 25 Apr 2015 16:20:29 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- ext/openssl/config0.m4.orig.port Wed Apr 15 20:05:57 2015
-+++ ext/openssl/config0.m4 Sat Apr 25 18:10:11 2015
-@@ -19,7 +19,7 @@ if test "$PHP_OPENSSL" != "no"; then
-     PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
-   fi
-
--  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]))
-   AC_CHECK_FUNCS([RAND_egd])
-
Index: lang/php/5.6/patches/patch-ext_session_session_c
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-ext_session_session_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-ext_session_session_c
--- lang/php/5.6/patches/patch-ext_session_session_c 6 Feb 2016 23:30:25 -0000 1.1
+++ lang/php/5.6/patches/patch-ext_session_session_c 10 Aug 2017 20:03:52 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-ext_session_session_c,v
 
 Perhaps the whole function can be replaced, but we have to start somewhere.
 
---- ext/session/session.c.orig.port Mon Feb  1 23:04:02 2016
-+++ ext/session/session.c Mon Feb  1 23:48:25 2016
-@@ -346,7 +346,11 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS)
+--- ext/session/session.c.orig.port Thu Jan 19 01:17:47 2017
++++ ext/session/session.c Wed May 24 12:18:08 2017
+@@ -346,7 +346,26 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS)
  efree(buf);
 
  if (PS(entropy_length) > 0) {
@@ -13,6 +13,21 @@ Perhaps the whole function can be replac
 + unsigned char rbuf[2048];
 + size_t toread = PS(entropy_length);
 + arc4random_buf(rbuf, MIN(toread, sizeof(rbuf)));
++
++ switch (PS(hash_func)) {
++ case PS_HASH_FUNC_MD5:
++ PHP_MD5Update(&md5_context, rbuf, toread);
++ break;
++ case PS_HASH_FUNC_SHA1:
++ PHP_SHA1Update(&sha1_context, rbuf, toread);
++ break;
++# if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
++ case PS_HASH_FUNC_OTHER:
++ PS(hash_ops)->hash_update(hash_context, rbuf, toread);
++ break;
++# endif /* HAVE_HASH_EXT */
++ }
++
 +#elif defined(PHP_WIN32)
  unsigned char rbuf[2048];
  size_t toread = PS(entropy_length);
Index: lang/php/5.6/patches/patch-ext_sockets_sockaddr_conv_c
===================================================================
RCS file: lang/php/5.6/patches/patch-ext_sockets_sockaddr_conv_c
diff -N lang/php/5.6/patches/patch-ext_sockets_sockaddr_conv_c
--- lang/php/5.6/patches/patch-ext_sockets_sockaddr_conv_c 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-ext_sockets_sockaddr_conv_c,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/sockets/sockaddr_conv.c.orig.port Wed Mar  5 10:18:00 2014
-+++ ext/sockets/sockaddr_conv.c Mon Mar 24 22:53:00 2014
-@@ -11,6 +11,10 @@
-
- extern int php_string_to_if_index(const char *val, unsigned *out TSRMLS_DC);
-
-+#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 TSRMLS_DC) /* {{{ */
Index: lang/php/5.6/patches/patch-ext_spl_php_spl_c
===================================================================
RCS file: lang/php/5.6/patches/patch-ext_spl_php_spl_c
diff -N lang/php/5.6/patches/patch-ext_spl_php_spl_c
--- lang/php/5.6/patches/patch-ext_spl_php_spl_c 6 May 2016 19:59:32 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-ext_spl_php_spl_c,v 1.2 2016/05/06 19:59:32 sthen Exp $
---- ext/spl/php_spl.c.orig.port Thu Apr 28 01:33:49 2016
-+++ ext/spl/php_spl.c Fri Apr 29 14:02:27 2016
-@@ -788,7 +788,7 @@ PHP_FUNCTION(spl_object_hash)
-
- PHPAPI void php_spl_object_hash(zval *obj, char *result TSRMLS_DC) /* {{{*/
- {
-- intptr_t hash_handle, hash_handlers;
-+ zend_intptr_t hash_handle, hash_handlers;
- char *hex;
-
- if (!SPL_G(hash_mask_init)) {
-@@ -796,13 +796,13 @@ PHPAPI void php_spl_object_hash(zval *obj, char *resul
- php_mt_srand(GENERATE_SEED() TSRMLS_CC);
- }
-
-- SPL_G(hash_mask_handle)   = (intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
-- SPL_G(hash_mask_handlers) = (intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
-+ SPL_G(hash_mask_handle)   = (zend_intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
-+ SPL_G(hash_mask_handlers) = (zend_intptr_t)(php_mt_rand(TSRMLS_C) >> 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);
-
- spprintf(&hex, 32, "%016lx%016lx", hash_handle, hash_handlers);
-
Index: lang/php/5.6/patches/patch-ext_spl_php_spl_h
===================================================================
RCS file: lang/php/5.6/patches/patch-ext_spl_php_spl_h
diff -N lang/php/5.6/patches/patch-ext_spl_php_spl_h
--- lang/php/5.6/patches/patch-ext_spl_php_spl_h 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-ext_spl_php_spl_h,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/spl/php_spl.h.orig.port Wed Nov 12 14:52:21 2014
-+++ ext/spl/php_spl.h Sat Nov 15 10:45:12 2014
-@@ -62,8 +62,8 @@ ZEND_BEGIN_MODULE_GLOBALS(spl)
- HashTable *  autoload_functions;
- int          autoload_running;
- int          autoload_extensions_len;
-- 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;
- ZEND_END_MODULE_GLOBALS(spl)
-
Index: lang/php/5.6/patches/patch-ext_standard_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-ext_standard_config_m4,v
retrieving revision 1.2
diff -u -p -r1.2 patch-ext_standard_config_m4
--- lang/php/5.6/patches/patch-ext_standard_config_m4 6 May 2016 19:59:32 -0000 1.2
+++ lang/php/5.6/patches/patch-ext_standard_config_m4 10 Aug 2017 20:03:52 -0000
@@ -1,25 +1,36 @@
-$OpenBSD: patch-ext_standard_config_m4,v 1.2 2016/05/06 19:59:32 sthen Exp $
---- ext/standard/config.m4.orig.port Thu Apr 28 01:33:49 2016
-+++ ext/standard/config.m4 Fri Apr 29 14:02:27 2016
-@@ -398,16 +398,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
+$OpenBSD$
+--- ext/standard/config.m4.orig.port Wed May 24 17:33:35 2017
++++ ext/standard/config.m4 Wed May 24 17:33:51 2017
+@@ -368,31 +368,7 @@ else
+   AC_MSG_RESULT(no)
+ fi
 
--PHP_CHECK_FUNC(res_search, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_search, resolv, socket)
+-PHP_ENABLE_CHROOT_FUNC=no
+-case "$PHP_SAPI" in
+-  embed)
+-    PHP_ENABLE_CHROOT_FUNC=yes
+-  ;;
+-
+-  none)
+-    for PROG in $PHP_BINARIES; do
+-      case "$PROG" in
+-        cgi|cli)
+-          PHP_ENABLE_CHROOT_FUNC=yes
+-        ;;
+-
+-        *)
+-          PHP_ENABLE_CHROOT_FUNC=no
+-          break
+-        ;;
+-      esac
+-   done
+-  ;;
+-esac
+-
+-if test "$PHP_ENABLE_CHROOT_FUNC" = "yes"; then
+-  AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
+-fi
++AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
 
  dnl
- dnl Check if atof() accepts NAN
+ dnl Detect library functions needed by php dns_xxx functions
Index: lang/php/5.6/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
===================================================================
RCS file: lang/php/5.6/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
diff -N lang/php/5.6/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
--- lang/php/5.6/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_xmlrpc_libxmlrpc_encodings_c,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/xmlrpc/libxmlrpc/encodings.c.orig.port Wed Sep 26 16:44:16 2007
-+++ ext/xmlrpc/libxmlrpc/encodings.c Sat Jun 18 12:14:51 2011
-@@ -78,7 +78,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;
Index: lang/php/5.6/patches/patch-main_php_h
===================================================================
RCS file: lang/php/5.6/patches/patch-main_php_h
diff -N lang/php/5.6/patches/patch-main_php_h
--- lang/php/5.6/patches/patch-main_php_h 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-main_php_h,v 1.1 2014/11/15 13:43:01 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
-
Index: lang/php/5.6/patches/patch-main_php_ini_c
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-main_php_ini_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-main_php_ini_c
--- lang/php/5.6/patches/patch-main_php_ini_c 22 Jan 2017 17:00:33 -0000 1.4
+++ lang/php/5.6/patches/patch-main_php_ini_c 10 Aug 2017 20:03:52 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-main_php_ini_c,v 1.4 2017/01/22 17:00:33 martijn Exp $
 --- main/php_ini.c.orig.port Thu Jan 19 01:17:47 2017
-+++ main/php_ini.c Fri Jan 20 07:35:15 2017
++++ main/php_ini.c Wed May 24 11:02:41 2017
 @@ -576,7 +576,7 @@ int php_init_config(TSRMLS_D)
 
  /* If still no ini file found, search for php.ini file in search path */
Index: lang/php/5.6/patches/patch-main_php_open_temporary_file_c
===================================================================
RCS file: lang/php/5.6/patches/patch-main_php_open_temporary_file_c
diff -N lang/php/5.6/patches/patch-main_php_open_temporary_file_c
--- lang/php/5.6/patches/patch-main_php_open_temporary_file_c 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-main_php_open_temporary_file_c,v 1.1 2014/11/15 13:43:01 robert Exp $
---- main/php_open_temporary_file.c.orig.port Wed Nov 12 14:52:21 2014
-+++ main/php_open_temporary_file.c Sat Nov 15 10:45:12 2014
-@@ -138,7 +138,7 @@ static int php_do_open_temporary_file(const char *path
- trailing_slash = "/";
- }
-
-- if (spprintf(&opened_path, 0, "%s%s%sXXXXXX", new_state.cwd, trailing_slash, pfx) >= MAXPATHLEN) {
-+ if (spprintf(&opened_path, 0, "%s%s%sXXXXXXXXXX", new_state.cwd, trailing_slash, pfx) >= MAXPATHLEN) {
- efree(opened_path);
- efree(new_state.cwd);
- return -1;
Index: lang/php/5.6/patches/patch-sapi_cgi_cgi_main_c
===================================================================
RCS file: lang/php/5.6/patches/patch-sapi_cgi_cgi_main_c
diff -N lang/php/5.6/patches/patch-sapi_cgi_cgi_main_c
--- lang/php/5.6/patches/patch-sapi_cgi_cgi_main_c 19 Dec 2016 20:35:09 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.6 2016/12/19 20:35:09 martijn Exp $
---- sapi/cgi/cgi_main.c.orig.port Wed Nov  9 02:22:57 2016
-+++ sapi/cgi/cgi_main.c Thu Dec  8 10:55:27 2016
-@@ -1749,6 +1749,7 @@ int main(int argc, char *argv[])
- char *orig_optarg = php_optarg;
- char *script_file = NULL;
- int ini_entries_len = 0;
-+ char *ini;
- /* end of temporary locals */
-
- #ifdef ZTS
-@@ -1809,7 +1810,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 */
Index: lang/php/5.6/patches/patch-sapi_cli_php_cli_c
===================================================================
RCS file: lang/php/5.6/patches/patch-sapi_cli_php_cli_c
diff -N lang/php/5.6/patches/patch-sapi_cli_php_cli_c
--- lang/php/5.6/patches/patch-sapi_cli_php_cli_c 19 Dec 2016 20:35:09 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-sapi_cli_php_cli_c,v 1.2 2016/12/19 20:35:09 martijn Exp $
---- sapi/cli/php_cli.c.orig.port Wed Nov  9 02:22:57 2016
-+++ sapi/cli/php_cli.c Thu Dec  8 10:55:27 2016
-@@ -677,6 +677,7 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /*
- int lineno = 0;
- const char *param_error=NULL;
- int hide_argv = 0;
-+ char *ini;
-
- zend_try {
-
Index: lang/php/5.6/patches/patch-sapi_fpm_php-fpm_conf_in
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-sapi_fpm_php-fpm_conf_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-sapi_fpm_php-fpm_conf_in
--- lang/php/5.6/patches/patch-sapi_fpm_php-fpm_conf_in 3 Apr 2015 17:53:44 -0000 1.3
+++ lang/php/5.6/patches/patch-sapi_fpm_php-fpm_conf_in 10 Aug 2017 20:03:52 -0000
@@ -10,19 +10,6 @@ $OpenBSD: patch-sapi_fpm_php-fpm_conf_in
 
  ; Set listen(2) backlog.
  ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
-@@ -172,9 +172,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
 @@ -471,7 +471,7 @@ pm.max_spare_servers = 3
  ;       possible. However, all PHP paths will be relative to the chroot
  ;       (error_log, sessions.save_path, ...).
Index: lang/php/5.6/patches/patch-scripts_php-config_in
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-scripts_php-config_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-scripts_php-config_in
--- lang/php/5.6/patches/patch-scripts_php-config_in 15 Nov 2014 13:43:01 -0000 1.1
+++ lang/php/5.6/patches/patch-scripts_php-config_in 10 Aug 2017 20:03:52 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-scripts_php-config_in,v 1.1 2014/11/15 13:43:01 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 @@
+--- scripts/php-config.in.orig.port Thu Jan 19 01:17:47 2017
++++ scripts/php-config.in Sun Jun  4 20:05:26 2017
+@@ -1,13 +1,13 @@
  #! /bin/sh
 
  SED="@SED@"
@@ -12,11 +12,13 @@ $OpenBSD: patch-scripts_php-config_in,v
  version="@PHP_VERSION@"
  vernum="@PHP_VERSION_ID@"
 -include_dir="@includedir@/php"
+-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"
 +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"
++includes="-I/usr/local/include -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@"
+ extension_dir='@EXTENSION_DIR@'
+@@ -24,10 +24,10 @@ php_sapis="@PHP_INSTALLED_SAPIS@"
  for sapi in $php_sapis; do
    case $sapi in
    cli)
@@ -24,7 +26,7 @@ $OpenBSD: patch-scripts_php-config_in,v
 +    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="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}"
 +    php_cgi_binary="/usr/local/bin/php-cgi${program_suffix}"
      ;;
    esac
Index: lang/php/5.6/patches/patch-scripts_phpize_m4
===================================================================
RCS file: lang/php/5.6/patches/patch-scripts_phpize_m4
diff -N lang/php/5.6/patches/patch-scripts_phpize_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/patches/patch-scripts_phpize_m4 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- scripts/phpize.m4.orig.port Fri Jun  2 21:36:25 2017
++++ scripts/phpize.m4 Fri Jun  2 21:36:41 2017
+@@ -36,7 +36,7 @@ PHP_SHLIB_SUFFIX_NAMES
+
+ dnl Find php-config script
+ PHP_ARG_WITH(php-config,,
+-[  --with-php-config=PATH  Path to php-config [php-config]], php-config, no)
++[  --with-php-config=PATH  Path to php-config [php-config]], php-config-${PV}, no)
+
+ dnl For BC
+ PHP_CONFIG=$PHP_PHP_CONFIG
Index: lang/php/5.6/patches/suhosin-ext_suhosin_execute_c
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/suhosin-ext_suhosin_execute_c,v
retrieving revision 1.1
diff -u -p -r1.1 suhosin-ext_suhosin_execute_c
--- lang/php/5.6/patches/suhosin-ext_suhosin_execute_c 22 Jun 2016 21:18:33 -0000 1.1
+++ lang/php/5.6/patches/suhosin-ext_suhosin_execute_c 10 Aug 2017 20:03:52 -0000
@@ -11,15 +11,6 @@ $OpenBSD: suhosin-ext_suhosin_execute_c,
      php_uint32 seedbuf[20];
      /* On a modern OS code, stack and heap base are randomized */
      unsigned long code_value  = (unsigned long)suhosin_gen_entropy;
-@@ -1335,7 +1338,7 @@ static void suhosin_gen_entropy(php_uint32 *entropybuf
- #endif
-     seedbuf[5] = (php_uint32) 0x7fffffff * php_combined_lcg(TSRMLS_C);
-
--#ifndef PHP_WIN32
-+#if !defined(PHP_WIN32)
-     fd = VCWD_OPEN("/dev/urandom", O_RDONLY);
-     if (fd >= 0) {
-         /* ignore error case - if urandom doesn't give us any/enough random bytes */
 @@ -1354,6 +1357,7 @@ static void suhosin_gen_entropy(php_uint32 *entropybuf
          suhosin_SHA256Update(&context, (unsigned char*)SUHOSIN_G(seedingkey), strlen(SUHOSIN_G(seedingkey)));
      }
Index: lang/php/5.6/pkg/PLIST-apxs2
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-apxs2
diff -N lang/php/5.6/pkg/PLIST-apxs2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-apxs2 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-apxs2->=5.6,<5.7
+lib/php-${PV}/libphp5.so
+share/examples/php-${PV}/php.conf
+@sample /var/www/conf/modules.sample/php-${PV}.conf
Index: lang/php/5.6/pkg/PLIST-bcmath
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-bcmath
diff -N lang/php/5.6/pkg/PLIST-bcmath
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-bcmath 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-bcmath->=5.6,<5.7
+lib/php-${PV}/modules/bcmath.so
+share/examples/php-${PV}/bcmath.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/bcmath.ini
Index: lang/php/5.6/pkg/PLIST-bz2
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-bz2,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-bz2
--- lang/php/5.6/pkg/PLIST-bz2 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-bz2 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-bz2->=5.6,<5.7
-@conflict php5-bz2->=5.2
 lib/php-${PV}/modules/bz2.so
 share/examples/php-${PV}/bz2.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/bz2.ini
Index: lang/php/5.6/pkg/PLIST-calendar
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-calendar
diff -N lang/php/5.6/pkg/PLIST-calendar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-calendar 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-calendar->=5.6,<5.7
+lib/php-${PV}/modules/calendar.so
+share/examples/php-${PV}/calendar.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/calendar.ini
Index: lang/php/5.6/pkg/PLIST-cgi
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-cgi
diff -N lang/php/5.6/pkg/PLIST-cgi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-cgi 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-cgi->=5.6,<5.7
+@bin bin/php-cgi-${PV}
+@man man/man1/php-cgi-${PV}.1
Index: lang/php/5.6/pkg/PLIST-cli
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-cli
diff -N lang/php/5.6/pkg/PLIST-cli
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-cli 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-cli->=5.6,<5.7
+@bin bin/php-${PV}
+@man man/man1/php-${PV}.1
+share/php-${PV}/include/sapi/
+share/php-${PV}/include/sapi/cli/
+share/php-${PV}/include/sapi/cli/cli.h
Index: lang/php/5.6/pkg/PLIST-ctype
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-ctype
diff -N lang/php/5.6/pkg/PLIST-ctype
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-ctype 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-ctype->=5.6,<5.7
+lib/php-${PV}/modules/ctype.so
+share/examples/php-${PV}/ctype.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ctype.ini
Index: lang/php/5.6/pkg/PLIST-curl
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-curl,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-curl
--- lang/php/5.6/pkg/PLIST-curl 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-curl 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-curl->=5.6,<5.7
-@conflict php5-curl->=5.2
 lib/php-${PV}/modules/curl.so
 share/examples/php-${PV}/curl.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/curl.ini
Index: lang/php/5.6/pkg/PLIST-dba
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-dba,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-dba
--- lang/php/5.6/pkg/PLIST-dba 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-dba 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-dba->=5.6,<5.7
-@conflict php5-dba->=5.2
 lib/php-${PV}/modules/dba.so
 share/examples/php-${PV}/dba.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/dba.ini
Index: lang/php/5.6/pkg/PLIST-dbg
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-dbg
diff -N lang/php/5.6/pkg/PLIST-dbg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-dbg 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-dbg->=5.6,<5.7
+@bin bin/phpdbg-${PV}
+@man man/man1/phpdbg-${PV}.1
Index: lang/php/5.6/pkg/PLIST-dom
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-dom
diff -N lang/php/5.6/pkg/PLIST-dom
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-dom 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-dom->=5.6,<5.7
+lib/php-${PV}/modules/dom.so
+share/examples/php-${PV}/dom.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/dom.ini
+share/php-${PV}/include/ext/dom/
+share/php-${PV}/include/ext/dom/xml_common.h
Index: lang/php/5.6/pkg/PLIST-enchant
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-enchant
diff -N lang/php/5.6/pkg/PLIST-enchant
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-enchant 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-enchant->=5.6,<5.7
+lib/php-${PV}/modules/enchant.so
+share/examples/php-${PV}/enchant.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/enchant.ini
Index: lang/php/5.6/pkg/PLIST-exif
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-exif
diff -N lang/php/5.6/pkg/PLIST-exif
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-exif 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-exif->=5.6,<5.7
+lib/php-${PV}/modules/exif.so
+share/examples/php-${PV}/exif.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/exif.ini
Index: lang/php/5.6/pkg/PLIST-fastcgi
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-fastcgi
diff -N lang/php/5.6/pkg/PLIST-fastcgi
--- lang/php/5.6/pkg/PLIST-fastcgi 29 Jun 2016 16:14:42 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PLIST-fastcgi,v 1.2 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-fastcgi->=5.6,<5.7
-@bin bin/php-fastcgi-${PV}
Index: lang/php/5.6/pkg/PLIST-fileinfo
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-fileinfo
diff -N lang/php/5.6/pkg/PLIST-fileinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-fileinfo 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-fileinfo->=5.6,<5.7
+lib/php-${PV}/modules/fileinfo.so
+share/examples/php-${PV}/fileinfo.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/fileinfo.ini
Index: lang/php/5.6/pkg/PLIST-fpm
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-fpm
diff -N lang/php/5.6/pkg/PLIST-fpm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-fpm 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-fpm->=5.6,<5.7
+@bin sbin/php-fpm-${PV}
+@man man/man8/php-fpm-${PV}.8
+share/examples/php-${PV}/php-fpm.conf
+@sample ${SYSCONFDIR}/php-fpm.conf
+@rcscript ${RCDIR}/php${SV}_fpm
Index: lang/php/5.6/pkg/PLIST-ftp
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-ftp
diff -N lang/php/5.6/pkg/PLIST-ftp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-ftp 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-ftp->=5.6,<5.7
+lib/php-${PV}/modules/ftp.so
+share/examples/php-${PV}/ftp.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ftp.ini
Index: lang/php/5.6/pkg/PLIST-gd
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-gd,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-gd
--- lang/php/5.6/pkg/PLIST-gd 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-gd 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,24 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-gd->=5.6,<5.7
-@conflict php5-gd->=5.2
 lib/php-${PV}/modules/gd.so
 share/examples/php-${PV}/gd.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/gd.ini
+share/php-${PV}/include/ext/gd/
+share/php-${PV}/include/ext/gd/gd_compat.h
+share/php-${PV}/include/ext/gd/gdcache.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/libgd/webpimg.h
+share/php-${PV}/include/ext/gd/php_gd.h
Index: lang/php/5.6/pkg/PLIST-gettext
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-gettext
diff -N lang/php/5.6/pkg/PLIST-gettext
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-gettext 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-gettext->=5.6,<5.7
+lib/php-${PV}/modules/gettext.so
+share/examples/php-${PV}/gettext.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/gettext.ini
Index: lang/php/5.6/pkg/PLIST-gmp
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-gmp,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-gmp
--- lang/php/5.6/pkg/PLIST-gmp 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-gmp 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-gmp->=5.6,<5.7
-@conflict php5-gmp->=5.2
 lib/php-${PV}/modules/gmp.so
 share/examples/php-${PV}/gmp.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/gmp.ini
Index: lang/php/5.6/pkg/PLIST-iconv
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-iconv
diff -N lang/php/5.6/pkg/PLIST-iconv
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-iconv 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,19 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-iconv->=5.6,<5.7
+lib/php-${PV}/modules/iconv.so
+share/examples/php-${PV}/iconv.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/iconv.ini
+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
Index: lang/php/5.6/pkg/PLIST-imap
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-imap,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-imap
--- lang/php/5.6/pkg/PLIST-imap 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-imap 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-imap->=5.6,<5.7
-@conflict php5-imap->=5.2
 lib/php-${PV}/modules/imap.so
 share/examples/php-${PV}/imap.ini
 @comment etc/master.passwd
Index: lang/php/5.6/pkg/PLIST-json
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-json
diff -N lang/php/5.6/pkg/PLIST-json
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-json 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-json->=5.6,<5.7
+lib/php-${PV}/modules/json.so
+share/examples/php-${PV}/json.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/json.ini
+share/php-${PV}/include/ext/json/
+share/php-${PV}/include/ext/json/php_json.h
Index: lang/php/5.6/pkg/PLIST-ldap
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-ldap,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-ldap
--- lang/php/5.6/pkg/PLIST-ldap 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-ldap 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-ldap->=5.6,<5.7
-@conflict php5-ldap->=5.2
 lib/php-${PV}/modules/ldap.so
 share/examples/php-${PV}/ldap.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/ldap.ini
Index: lang/php/5.6/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-main
--- lang/php/5.6/pkg/PLIST-main 29 Jun 2016 16:14:42 -0000 1.10
+++ lang/php/5.6/pkg/PLIST-main 10 Aug 2017 20:03:52 -0000
@@ -2,14 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php->=5.6,<5.7
-@conflict php-fpm->=5.6,<5.7
-@conflict php5-core->=5.2
-@conflict php5-core-fastcgi->=5.2
-@conflict php5-pdo_sqlite->=5.2
-@pkgpath lang/php/5.4
-@pkgpath lang/php/5.4,-pdo_sqlite
-@pkgpath lang/php/5.6,-fpm
-@pkgpath lang/php/5.6,-main,ap2
 @extraunexec rm -f ${SYSCONFDIR}/php-${PV}/php-${PV}.sample/*
 @mode 1700
 @owner www
@@ -18,31 +10,19 @@
 @mode
 @owner
 @group
-@bin bin/php-${PV}
 bin/php-config-${PV}
 bin/phpize-${PV}
 lib/php-${PV}/
-lib/php-${PV}/libphp5.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
-@man man/man8/php-fpm-${PV}.8
-@bin sbin/php-fpm-${PV}
 share/doc/pkg-readmes/${FULLPKGNAME}
 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/examples/php-${PV}/php-fpm.conf
-@sample ${SYSCONFDIR}/php-fpm.conf
 share/php-${PV}/
 share/php-${PV}/build/
 share/php-${PV}/build/Makefile.global
@@ -135,8 +115,6 @@ share/php-${PV}/include/ext/date/lib/tim
 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/ereg/
 share/php-${PV}/include/ext/ereg/php_ereg.h
 share/php-${PV}/include/ext/ereg/php_regex.h
@@ -148,24 +126,6 @@ share/php-${PV}/include/ext/ereg/regex/r
 share/php-${PV}/include/ext/ereg/regex/utils.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/gd_compat.h
-share/php-${PV}/include/ext/gd/gdcache.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/libgd/webpimg.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
@@ -180,93 +140,14 @@ share/php-${PV}/include/ext/hash/php_has
 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/mysql_float_to_double.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/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
@@ -279,9 +160,6 @@ share/php-${PV}/include/ext/spl/spl_func
 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
@@ -346,9 +224,6 @@ share/php-${PV}/include/ext/standard/uni
 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
@@ -388,8 +263,4 @@ share/php-${PV}/include/main/streams/php
 share/php-${PV}/include/main/streams/php_streams_int.h
 share/php-${PV}/include/main/win32_internal_function_disabled.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}/
-@rcscript ${RCDIR}/php${SV}_fpm
Index: lang/php/5.6/pkg/PLIST-mbstring
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-mbstring
diff -N lang/php/5.6/pkg/PLIST-mbstring
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-mbstring 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,29 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-mbstring->=5.6,<5.7
+lib/php-${PV}/modules/mbstring.so
+share/examples/php-${PV}/mbstring.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mbstring.ini
+share/php-${PV}/include/ext/mbstring/
+share/php-${PV}/include/ext/mbstring/php_mbregex.h
+share/php-${PV}/include/ext/mbstring/php_onig_compat.h
+share/php-${PV}/include/ext/mbstring/mbstring.h
+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
Index: lang/php/5.6/pkg/PLIST-mcrypt
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-mcrypt,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-mcrypt
--- lang/php/5.6/pkg/PLIST-mcrypt 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-mcrypt 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-mcrypt->=5.6,<5.7
-@conflict php5-mcrypt->=5.2
 lib/php-${PV}/modules/mcrypt.so
 share/examples/php-${PV}/mcrypt.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/mcrypt.ini
Index: lang/php/5.6/pkg/PLIST-mssql
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-mssql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-mssql
--- lang/php/5.6/pkg/PLIST-mssql 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-mssql 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-mssql->=5.6,<5.7
-@conflict php5-mssql->=5.2
 lib/php-${PV}/modules/mssql.so
 share/examples/php-${PV}/mssql.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/mssql.ini
Index: lang/php/5.6/pkg/PLIST-mysql
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-mysql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-mysql
--- lang/php/5.6/pkg/PLIST-mysql 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-mysql 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-mysql->=5.6,<5.7
-@conflict php5-mysql->=5.2
 lib/php-${PV}/modules/mysql.so
 share/examples/php-${PV}/mysql.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/mysql.ini
Index: lang/php/5.6/pkg/PLIST-mysqli
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-mysqli,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-mysqli
--- lang/php/5.6/pkg/PLIST-mysqli 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-mysqli 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,9 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-mysqli->=5.6,<5.7
-@conflict php5-mysqli->=5.2
 lib/php-${PV}/modules/mysqli.so
 share/examples/php-${PV}/mysqli.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/mysqli.ini
+share/php-${PV}/include/ext/mysqli/
+share/php-${PV}/include/ext/mysqli/mysqli_mysqlnd.h
+share/php-${PV}/include/ext/mysqli/php_mysqli_structs.h
Index: lang/php/5.6/pkg/PLIST-mysqlnd
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-mysqlnd
diff -N lang/php/5.6/pkg/PLIST-mysqlnd
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-mysqlnd 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,28 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-mysqlnd->=5.6,<5.7
+lib/php-${PV}/modules/mysqlnd.so
+share/examples/php-${PV}/mysqlnd.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mysqlnd.ini
+share/php-${PV}/include/ext/mysqlnd/
+share/php-${PV}/include/ext/mysqlnd/config-win.h
+share/php-${PV}/include/ext/mysqlnd/mysql_float_to_double.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/php_mysqlnd.h
Index: lang/php/5.6/pkg/PLIST-odbc
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-odbc,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-odbc
--- lang/php/5.6/pkg/PLIST-odbc 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-odbc 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-odbc->=5.6,<5.7
-@conflict php5-odbc->=5.2
 lib/php-${PV}/modules/odbc.so
 share/examples/php-${PV}/odbc.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/odbc.ini
Index: lang/php/5.6/pkg/PLIST-opcache
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-opcache
diff -N lang/php/5.6/pkg/PLIST-opcache
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-opcache 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-opcache->=5.6,<5.7
+lib/php-${PV}/modules/opcache.so
+share/examples/php-${PV}/opcache.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini
Index: lang/php/5.6/pkg/PLIST-pcntl
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-pcntl,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pcntl
--- lang/php/5.6/pkg/PLIST-pcntl 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-pcntl 10 Aug 2017 20:03:52 -0000
@@ -2,9 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-pcntl->=5.6,<5.7
-@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
Index: lang/php/5.6/pkg/PLIST-pdo
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-pdo
diff -N lang/php/5.6/pkg/PLIST-pdo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-pdo 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,11 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo->=5.6,<5.7
+lib/php-${PV}/modules/pdo.so
+share/examples/php-${PV}/pdo.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo.ini
+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
Index: lang/php/5.6/pkg/PLIST-pdo_dblib
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-pdo_dblib,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pdo_dblib
--- lang/php/5.6/pkg/PLIST-pdo_dblib 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-pdo_dblib 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-pdo_dblib->=5.6,<5.7
-@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
Index: lang/php/5.6/pkg/PLIST-pdo_mysql
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-pdo_mysql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pdo_mysql
--- lang/php/5.6/pkg/PLIST-pdo_mysql 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-pdo_mysql 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-pdo_mysql->=5.6,<5.7
-@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
Index: lang/php/5.6/pkg/PLIST-pdo_pgsql
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-pdo_pgsql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pdo_pgsql
--- lang/php/5.6/pkg/PLIST-pdo_pgsql 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-pdo_pgsql 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-pdo_pgsql->=5.6,<5.7
-@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
Index: lang/php/5.6/pkg/PLIST-pdo_sqlite
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-pdo_sqlite
diff -N lang/php/5.6/pkg/PLIST-pdo_sqlite
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-pdo_sqlite 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_sqlite->=5.6,<5.7
+lib/php-${PV}/modules/pdo_sqlite.so
+share/examples/php-${PV}/pdo_sqlite.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_sqlite.ini
Index: lang/php/5.6/pkg/PLIST-pgsql
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-pgsql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pgsql
--- lang/php/5.6/pkg/PLIST-pgsql 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-pgsql 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-pgsql->=5.6,<5.7
-@conflict php5-pgsql->=5.2
 lib/php-${PV}/modules/pgsql.so
 share/examples/php-${PV}/pgsql.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/pgsql.ini
Index: lang/php/5.6/pkg/PLIST-phar
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-phar
diff -N lang/php/5.6/pkg/PLIST-phar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-phar 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,11 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-phar->=5.6,<5.7
+bin/phar-${PV}
+@man man/man1/phar-${PV}.1
+lib/php-${PV}/modules/phar.so
+share/examples/php-${PV}/phar.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/phar.ini
+share/php-${PV}/include/ext/phar/
+share/php-${PV}/include/ext/phar/php_phar.h
Index: lang/php/5.6/pkg/PLIST-posix
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-posix
diff -N lang/php/5.6/pkg/PLIST-posix
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-posix 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-posix->=5.6,<5.7
+lib/php-${PV}/modules/posix.so
+share/examples/php-${PV}/posix.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/posix.ini
Index: lang/php/5.6/pkg/PLIST-pspell
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-pspell,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pspell
--- lang/php/5.6/pkg/PLIST-pspell 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-pspell 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-pspell->=5.6,<5.7
-@conflict php5-pspell->=5.2
 lib/php-${PV}/modules/pspell.so
 share/examples/php-${PV}/pspell.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/pspell.ini
Index: lang/php/5.6/pkg/PLIST-readline
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-readline
diff -N lang/php/5.6/pkg/PLIST-readline
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-readline 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-readline->=5.6,<5.7
+lib/php-${PV}/modules/readline.so
+share/examples/php-${PV}/readline.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/readline.ini
Index: lang/php/5.6/pkg/PLIST-shmop
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-shmop,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-shmop
--- lang/php/5.6/pkg/PLIST-shmop 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-shmop 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-shmop->=5.6,<5.7
-@conflict php5-shmop->=5.2
 lib/php-${PV}/modules/shmop.so
 share/examples/php-${PV}/shmop.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/shmop.ini
Index: lang/php/5.6/pkg/PLIST-simplexml
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-simplexml
diff -N lang/php/5.6/pkg/PLIST-simplexml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-simplexml 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-simplexml->=5.6,<5.7
+lib/php-${PV}/modules/simplexml.so
+share/examples/php-${PV}/simplexml.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/simplexml.ini
+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
Index: lang/php/5.6/pkg/PLIST-snmp
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-snmp,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-snmp
--- lang/php/5.6/pkg/PLIST-snmp 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-snmp 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-snmp->=5.6,<5.7
-@conflict php5-snmp->=5.2
 lib/php-${PV}/modules/snmp.so
 share/examples/php-${PV}/snmp.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/snmp.ini
Index: lang/php/5.6/pkg/PLIST-soap
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-soap,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-soap
--- lang/php/5.6/pkg/PLIST-soap 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-soap 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-soap->=5.6,<5.7
-@conflict php5-soap->=5.2
 lib/php-${PV}/modules/soap.so
 share/examples/php-${PV}/soap.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/soap.ini
Index: lang/php/5.6/pkg/PLIST-sockets
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-sockets
diff -N lang/php/5.6/pkg/PLIST-sockets
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-sockets 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sockets->=5.6,<5.7
+lib/php-${PV}/modules/sockets.so
+share/examples/php-${PV}/sockets.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sockets.ini
+share/php-${PV}/include/ext/sockets/
+share/php-${PV}/include/ext/sockets/php_sockets.h
Index: lang/php/5.6/pkg/PLIST-sqlite3
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-sqlite3
diff -N lang/php/5.6/pkg/PLIST-sqlite3
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-sqlite3 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sqlite3->=5.6,<5.7
+lib/php-${PV}/modules/sqlite3.so
+share/examples/php-${PV}/sqlite3.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sqlite3.ini
Index: lang/php/5.6/pkg/PLIST-sybase_ct
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-sybase_ct,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-sybase_ct
--- lang/php/5.6/pkg/PLIST-sybase_ct 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-sybase_ct 10 Aug 2017 20:03:52 -0000
@@ -2,8 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-sybase_ct->=5.6,<5.7
-@conflict php5-sybase_ct->=5.2
-@pkgpath www/php5/extensions,-sybase_ct
 lib/php-${PV}/modules/sybase_ct.so
 share/examples/php-${PV}/sybase_ct.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/sybase_ct.ini
Index: lang/php/5.6/pkg/PLIST-sysvmsg
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-sysvmsg
diff -N lang/php/5.6/pkg/PLIST-sysvmsg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-sysvmsg 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvmsg->=5.6,<5.7
+lib/php-${PV}/modules/sysvmsg.so
+share/examples/php-${PV}/sysvmsg.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvmsg.ini
Index: lang/php/5.6/pkg/PLIST-sysvsem
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-sysvsem
diff -N lang/php/5.6/pkg/PLIST-sysvsem
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-sysvsem 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvsem->=5.6,<5.7
+lib/php-${PV}/modules/sysvsem.so
+share/examples/php-${PV}/sysvsem.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvsem.ini
Index: lang/php/5.6/pkg/PLIST-sysvshm
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-sysvshm
diff -N lang/php/5.6/pkg/PLIST-sysvshm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-sysvshm 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvshm->=5.6,<5.7
+lib/php-${PV}/modules/sysvshm.so
+share/examples/php-${PV}/sysvshm.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvshm.ini
Index: lang/php/5.6/pkg/PLIST-tidy
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-tidy,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-tidy
--- lang/php/5.6/pkg/PLIST-tidy 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-tidy 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-tidy->=5.6,<5.7
-@conflict php5-tidy->=5.2
 lib/php-${PV}/modules/tidy.so
 share/examples/php-${PV}/tidy.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/tidy.ini
Index: lang/php/5.6/pkg/PLIST-tokenizer
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-tokenizer
diff -N lang/php/5.6/pkg/PLIST-tokenizer
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-tokenizer 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-tokenizer->=5.6,<5.7
+lib/php-${PV}/modules/tokenizer.so
+share/examples/php-${PV}/tokenizer.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/tokenizer.ini
Index: lang/php/5.6/pkg/PLIST-wddx
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-wddx
diff -N lang/php/5.6/pkg/PLIST-wddx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-wddx 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-wddx->=5.6,<5.7
+lib/php-${PV}/modules/wddx.so
+share/examples/php-${PV}/wddx.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/wddx.ini
Index: lang/php/5.6/pkg/PLIST-xml
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-xml
diff -N lang/php/5.6/pkg/PLIST-xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-xml 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xml->=5.6,<5.7
+lib/php-${PV}/modules/xml.so
+share/examples/php-${PV}/xml.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xml.ini
+share/php-${PV}/include/ext/xml/
+share/php-${PV}/include/ext/xml/expat_compat.h
+share/php-${PV}/include/ext/xml/php_xml.h
Index: lang/php/5.6/pkg/PLIST-xmlreader
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-xmlreader
diff -N lang/php/5.6/pkg/PLIST-xmlreader
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-xmlreader 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlreader->=5.6,<5.7
+lib/php-${PV}/modules/xmlreader.so
+share/examples/php-${PV}/xmlreader.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlreader.ini
Index: lang/php/5.6/pkg/PLIST-xmlrpc
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-xmlrpc,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-xmlrpc
--- lang/php/5.6/pkg/PLIST-xmlrpc 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-xmlrpc 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-xmlrpc->=5.6,<5.7
-@conflict php5-xmlrpc->=5.2
 lib/php-${PV}/modules/xmlrpc.so
 share/examples/php-${PV}/xmlrpc.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/xmlrpc.ini
Index: lang/php/5.6/pkg/PLIST-xmlwriter
===================================================================
RCS file: lang/php/5.6/pkg/PLIST-xmlwriter
diff -N lang/php/5.6/pkg/PLIST-xmlwriter
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/5.6/pkg/PLIST-xmlwriter 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlwriter->=5.6,<5.7
+lib/php-${PV}/modules/xmlwriter.so
+share/examples/php-${PV}/xmlwriter.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlwriter.ini
Index: lang/php/5.6/pkg/PLIST-xsl
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-xsl,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-xsl
--- lang/php/5.6/pkg/PLIST-xsl 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-xsl 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-xsl->=5.6,<5.7
-@conflict php5-xsl->=5.2
 lib/php-${PV}/modules/xsl.so
 share/examples/php-${PV}/xsl.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/xsl.ini
Index: lang/php/5.6/pkg/PLIST-zip
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-zip,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-zip
--- lang/php/5.6/pkg/PLIST-zip 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/5.6/pkg/PLIST-zip 10 Aug 2017 20:03:52 -0000
@@ -2,8 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php-zip->=5.6,<5.7
-@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
Index: lang/php/7.0/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- lang/php/7.0/Makefile 26 Jul 2017 22:45:25 -0000 1.32
+++ lang/php/7.0/Makefile 10 Aug 2017 20:03:52 -0000
@@ -1,16 +1,6 @@
-# $OpenBSD: Makefile,v 1.32 2017/07/26 22:45:25 sthen Exp $
-
-BROKEN-sparc64= SIGBUS during phar generation
+# $OpenBSD: Makefile,v 1.29 2017/04/25 11:21:14 sthen Exp $
 
 PV= 7.0
-V= ${PV}.20
-REVISION= 0
-
-WANTLIB-main+= ${COMPILER_LIBCXX} ncurses readline
-
-BUILD_DEPENDS+= devel/bison
-
-CONFIGURE_ENV+= YACC="${LOCALBASE}/bin/bison -y"
-CONFIGURE_ARGS+= --with-pcre-jit=no
+V= ${PV}.22
 
 .include <bsd.port.mk>
Index: lang/php/7.0/distinfo
===================================================================
RCS file: /cvs/ports/lang/php/7.0/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- lang/php/7.0/distinfo 12 Jun 2017 11:48:34 -0000 1.16
+++ lang/php/7.0/distinfo 10 Aug 2017 20:03:52 -0000
@@ -1,4 +1,2 @@
-SHA256 (php-7.0.20.tar.bz2) = zf3f4BzGFSGOMz40ocdhye+P31GZsnYXJkoCcF7af8M=
-SHA256 (suhosin-0.9.38.tar.gz) = wC12xOfOd3kQo3wYGBy2f9npDv4BB/6rPeMTG1+JvOo=
-SIZE (php-7.0.20.tar.bz2) = 15327671
-SIZE (suhosin-0.9.38.tar.gz) = 122800
+SHA256 (php-7.0.22.tar.bz2) = iOCyf2mr3RLs3oHwAMWp6kea9yGEVup/ZVfttDxt/d4=
+SIZE (php-7.0.22.tar.bz2) = 15391136
Index: lang/php/7.0/patches/patch-acinclude_m4
===================================================================
RCS file: lang/php/7.0/patches/patch-acinclude_m4
diff -N lang/php/7.0/patches/patch-acinclude_m4
--- lang/php/7.0/patches/patch-acinclude_m4 24 Feb 2017 09:13:12 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-$OpenBSD: patch-acinclude_m4,v 1.2 2017/02/24 09:13:12 robert Exp $
---- acinclude.m4.orig.port Tue Feb 14 14:50:52 2017
-+++ acinclude.m4 Thu Feb 23 18:50:53 2017
-@@ -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
- ])
-
-@@ -2324,9 +2312,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
-
Index: lang/php/7.0/patches/patch-configure_in
===================================================================
RCS file: lang/php/7.0/patches/patch-configure_in
diff -N lang/php/7.0/patches/patch-configure_in
--- lang/php/7.0/patches/patch-configure_in 12 Jun 2017 11:48:34 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.3 2017/06/12 11:48:34 sthen Exp $
-Index: configure.in
---- configure.in.orig
-+++ configure.in
-@@ -1052,16 +1052,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
-@@ -1252,7 +1252,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
Index: lang/php/7.0/patches/patch-ext_gd_gdcache_h
===================================================================
RCS file: lang/php/7.0/patches/patch-ext_gd_gdcache_h
diff -N lang/php/7.0/patches/patch-ext_gd_gdcache_h
--- lang/php/7.0/patches/patch-ext_gd_gdcache_h 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$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 */
Index: lang/php/7.0/patches/patch-ext_gd_libgd_gdkanji_c
===================================================================
RCS file: lang/php/7.0/patches/patch-ext_gd_libgd_gdkanji_c
diff -N lang/php/7.0/patches/patch-ext_gd_libgd_gdkanji_c
--- lang/php/7.0/patches/patch-ext_gd_libgd_gdkanji_c 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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)
Index: lang/php/7.0/patches/patch-ext_iconv_iconv_c
===================================================================
RCS file: lang/php/7.0/patches/patch-ext_iconv_iconv_c
diff -N lang/php/7.0/patches/patch-ext_iconv_iconv_c
--- lang/php/7.0/patches/patch-ext_iconv_iconv_c 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-$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:
Index: lang/php/7.0/patches/patch-ext_mcrypt_mcrypt_c
===================================================================
RCS file: lang/php/7.0/patches/patch-ext_mcrypt_mcrypt_c
diff -N lang/php/7.0/patches/patch-ext_mcrypt_mcrypt_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/patches/patch-ext_mcrypt_mcrypt_c 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,60 @@
+$OpenBSD$
+--- ext/mcrypt/mcrypt.c.orig.port Tue May  9 13:41:04 2017
++++ ext/mcrypt/mcrypt.c Wed May 24 20:25:47 2017
+@@ -1374,51 +1374,12 @@ PHP_FUNCTION(mcrypt_create_iv)
+ }
+
+ iv = ecalloc(size + 1, 1);
++ if (php_random_bytes_silent(iv, (size_t) size) == FAILURE) {
++ efree(iv);
++ php_error_docref(NULL, E_WARNING, "Could not gather sufficient random data");
++ RETURN_FALSE;
++ }
+
+- if (source == RANDOM || source == URANDOM) {
+-#ifdef PHP_WIN32
+- /* random/urandom equivalent on Windows */
+- BYTE *iv_b = (BYTE *) iv;
+- if (php_win32_get_random_bytes(iv_b, (size_t) size) == FAILURE){
+- efree(iv);
+- php_error_docref(NULL, E_WARNING, "Could not gather sufficient random data");
+- RETURN_FALSE;
+- }
+- n = (int)size;
+-#else
+- int    *fd = &MCG(fd[source]);
+- size_t read_bytes = 0;
+-
+- if (*fd < 0) {
+- *fd = open(source == RANDOM ? "/dev/random" : "/dev/urandom", O_RDONLY);
+- if (*fd < 0) {
+- efree(iv);
+- php_error_docref(NULL, E_WARNING, "Cannot open source device");
+- RETURN_FALSE;
+- }
+- }
+-
+- while (read_bytes < size) {
+- n = read(*fd, iv + read_bytes, size - read_bytes);
+- if (n <= 0) {
+- break;
+- }
+- read_bytes += n;
+- }
+- n = read_bytes;
+-
+- if (n < size) {
+- efree(iv);
+- php_error_docref(NULL, E_WARNING, "Could not gather sufficient random data");
+- RETURN_FALSE;
+- }
+-#endif
+- } else {
+- n = (int)size;
+- while (size) {
+- iv[--size] = (char) (255.0 * php_rand() / RAND_MAX);
+- }
+- }
+ RETVAL_STRINGL(iv, n);
+ efree(iv);
+ }
Index: lang/php/7.0/patches/patch-ext_mysqlnd_config9_m4
===================================================================
RCS file: lang/php/7.0/patches/patch-ext_mysqlnd_config9_m4
diff -N lang/php/7.0/patches/patch-ext_mysqlnd_config9_m4
--- lang/php/7.0/patches/patch-ext_mysqlnd_config9_m4 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$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])])
Index: lang/php/7.0/patches/patch-ext_odbc_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-ext_odbc_config_m4,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-ext_odbc_config_m4
--- lang/php/7.0/patches/patch-ext_odbc_config_m4 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ lang/php/7.0/patches/patch-ext_odbc_config_m4 10 Aug 2017 20:03:52 -0000
@@ -1,14 +1,21 @@
-$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,,
+$OpenBSD$
+--- ext/odbc/config.m4.orig.port Mon Jun 26 23:38:13 2017
++++ ext/odbc/config.m4 Mon Jun 26 23:38:23 2017
+@@ -396,7 +396,7 @@ 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)
++      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
        ODBC_TYPE=iodbc
        ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
        ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
+@@ -409,7 +409,7 @@ PHP_ARG_WITH(iodbc,,
+       if test "$PHP_IODBC" = "yes"; then
+         PHP_IODBC=/usr/local
+       fi
+-      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
+       PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
+       ODBC_TYPE=iodbc
+       ODBC_INCLUDE=-I$PHP_IODBC/include
Index: lang/php/7.0/patches/patch-ext_session_session_c
===================================================================
RCS file: lang/php/7.0/patches/patch-ext_session_session_c
diff -N lang/php/7.0/patches/patch-ext_session_session_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/patches/patch-ext_session_session_c 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,63 @@
+$OpenBSD$
+--- ext/session/session.c.orig.port Tue Feb 14 14:51:37 2017
++++ ext/session/session.c Wed May 24 13:41:47 2017
+@@ -47,6 +47,7 @@
+ #include "ext/standard/php_lcg.h"
+ #include "ext/standard/url_scanner_ex.h"
+ #include "ext/standard/php_rand.h" /* for RAND_MAX */
++#include "ext/standard/php_random.h"
+ #include "ext/standard/info.h"
+ #include "zend_smart_str.h"
+ #include "ext/standard/url.h"
+@@ -356,12 +357,9 @@ PHPAPI zend_string *php_session_create_id(PS_CREATE_SI
+ efree(buf);
+
+ if (PS(entropy_length) > 0) {
+-#ifdef PHP_WIN32
+ unsigned char rbuf[2048];
+ size_t toread = PS(entropy_length);
+-
+- if (php_win32_get_random_bytes(rbuf, MIN(toread, sizeof(rbuf))) == SUCCESS){
+-
++ if (php_random_bytes_silent(rbuf, MIN(toread, sizeof(rbuf))) == SUCCESS) {
+ switch (PS(hash_func)) {
+ case PS_HASH_FUNC_MD5:
+ PHP_MD5Update(&md5_context, rbuf, toread);
+@@ -376,37 +374,6 @@ PHPAPI zend_string *php_session_create_id(PS_CREATE_SI
+ # endif /* HAVE_HASH_EXT */
+ }
+ }
+-#else
+- int fd;
+-
+- fd = VCWD_OPEN(PS(entropy_file), O_RDONLY);
+- if (fd >= 0) {
+- unsigned char rbuf[2048];
+- int n;
+- int to_read = PS(entropy_length);
+-
+- while (to_read > 0) {
+- n = read(fd, rbuf, MIN(to_read, sizeof(rbuf)));
+- if (n <= 0) break;
+-
+- switch (PS(hash_func)) {
+- case PS_HASH_FUNC_MD5:
+- PHP_MD5Update(&md5_context, rbuf, n);
+- break;
+- case PS_HASH_FUNC_SHA1:
+- PHP_SHA1Update(&sha1_context, rbuf, n);
+- break;
+-#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
+- case PS_HASH_FUNC_OTHER:
+- PS(hash_ops)->hash_update(hash_context, rbuf, n);
+- break;
+-#endif /* HAVE_HASH_EXT */
+- }
+- to_read -= n;
+- }
+- close(fd);
+- }
+-#endif
+ }
+
+ digest = emalloc(digest_len + 1);
Index: lang/php/7.0/patches/patch-ext_sockets_sockaddr_conv_c
===================================================================
RCS file: lang/php/7.0/patches/patch-ext_sockets_sockaddr_conv_c
diff -N lang/php/7.0/patches/patch-ext_sockets_sockaddr_conv_c
--- lang/php/7.0/patches/patch-ext_sockets_sockaddr_conv_c 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$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) /* {{{ */
Index: lang/php/7.0/patches/patch-ext_spl_php_spl_c
===================================================================
RCS file: lang/php/7.0/patches/patch-ext_spl_php_spl_c
diff -N lang/php/7.0/patches/patch-ext_spl_php_spl_c
--- lang/php/7.0/patches/patch-ext_spl_php_spl_c 24 Feb 2017 09:13:12 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-ext_spl_php_spl_c,v 1.4 2017/02/24 09:13:12 robert Exp $
---- ext/spl/php_spl.c.orig.port Tue Feb 14 14:51:32 2017
-+++ ext/spl/php_spl.c Thu Feb 23 18:50:47 2017
-@@ -768,19 +768,19 @@ 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_handle   = SPL_G(hash_mask_handle)^(zend_intptr_t)Z_OBJ_HANDLE_P(obj);
- hash_handlers = SPL_G(hash_mask_handlers);
-
- return strpprintf(32, "%016lx%016lx", hash_handle, hash_handlers);
Index: lang/php/7.0/patches/patch-ext_spl_php_spl_h
===================================================================
RCS file: lang/php/7.0/patches/patch-ext_spl_php_spl_h
diff -N lang/php/7.0/patches/patch-ext_spl_php_spl_h
--- lang/php/7.0/patches/patch-ext_spl_php_spl_h 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$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)
Index: lang/php/7.0/patches/patch-ext_standard_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-ext_standard_config_m4,v
retrieving revision 1.4
diff -u -p -r1.4 patch-ext_standard_config_m4
--- lang/php/7.0/patches/patch-ext_standard_config_m4 12 Jun 2017 11:48:34 -0000 1.4
+++ lang/php/7.0/patches/patch-ext_standard_config_m4 10 Aug 2017 20:03:52 -0000
@@ -1,28 +1,36 @@
-$OpenBSD: patch-ext_standard_config_m4,v 1.4 2017/06/12 11:48:34 sthen Exp $
-Index: ext/standard/config.m4
---- ext/standard/config.m4.orig
-+++ ext/standard/config.m4
-@@ -401,17 +401,17 @@ 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(res_ndestroy, 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(res_ndestroy, 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
+$OpenBSD$
+--- ext/standard/config.m4.orig.port Wed May 24 17:25:22 2017
++++ ext/standard/config.m4 Wed May 24 17:25:34 2017
+@@ -370,31 +370,7 @@ else
+   AC_MSG_RESULT(no)
+ fi
 
--PHP_CHECK_FUNC(res_search, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_search, resolv, socket)
+-PHP_ENABLE_CHROOT_FUNC=no
+-case "$PHP_SAPI" in
+-  embed)
+-    PHP_ENABLE_CHROOT_FUNC=yes
+-  ;;
+-
+-  none)
+-    for PROG in $PHP_BINARIES; do
+-      case "$PROG" in
+-        cgi|cli)
+-          PHP_ENABLE_CHROOT_FUNC=yes
+-        ;;
+-
+-        *)
+-          PHP_ENABLE_CHROOT_FUNC=no
+-          break
+-        ;;
+-      esac
+-   done
+-  ;;
+-esac
+-
+-if test "$PHP_ENABLE_CHROOT_FUNC" = "yes"; then
+-  AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
+-fi
++AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
 
  dnl
- dnl Check if atof() accepts NAN
+ dnl Detect library functions needed by php dns_xxx functions
Index: lang/php/7.0/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
===================================================================
RCS file: lang/php/7.0/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
diff -N lang/php/7.0/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
--- lang/php/7.0/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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;
Index: lang/php/7.0/patches/patch-main_php_h
===================================================================
RCS file: lang/php/7.0/patches/patch-main_php_h
diff -N lang/php/7.0/patches/patch-main_php_h
--- lang/php/7.0/patches/patch-main_php_h 12 Jun 2017 11:48:34 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-main_php_h,v 1.2 2017/06/12 11:48:34 sthen Exp $
-Index: main/php.h
---- main/php.h.orig
-+++ main/php.h
-@@ -146,7 +146,9 @@ END_EXTERN_C()
- # ifdef PHP_WIN32
- typedef int socklen_t;
- # else
-+#   if !defined(__OpenBSD__)
- typedef unsigned int socklen_t;
-+#   endif
- # endif
- #endif
-
Index: lang/php/7.0/patches/patch-main_php_ini_c
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-main_php_ini_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-main_php_ini_c
--- lang/php/7.0/patches/patch-main_php_ini_c 22 Jan 2017 17:01:32 -0000 1.3
+++ lang/php/7.0/patches/patch-main_php_ini_c 10 Aug 2017 20:03:52 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-main_php_ini_c,v 1.3 2017/01/22 17:01:32 martijn Exp $
---- main/php_ini.c.orig.port Tue Jan 17 12:53:05 2017
-+++ main/php_ini.c Fri Jan 20 07:38:39 2017
+--- main/php_ini.c.orig.port Tue Feb 14 14:52:57 2017
++++ main/php_ini.c Wed May 24 13:41:57 2017
 @@ -572,7 +572,7 @@ int php_init_config(void)
 
  /* If still no ini file found, search for php.ini file in search path */
Index: lang/php/7.0/patches/patch-main_php_open_temporary_file_c
===================================================================
RCS file: lang/php/7.0/patches/patch-main_php_open_temporary_file_c
diff -N lang/php/7.0/patches/patch-main_php_open_temporary_file_c
--- lang/php/7.0/patches/patch-main_php_open_temporary_file_c 14 Dec 2015 17:58:46 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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;
- }
Index: lang/php/7.0/patches/patch-sapi_cgi_cgi_main_c
===================================================================
RCS file: lang/php/7.0/patches/patch-sapi_cgi_cgi_main_c
diff -N lang/php/7.0/patches/patch-sapi_cgi_cgi_main_c
--- lang/php/7.0/patches/patch-sapi_cgi_cgi_main_c 14 Dec 2015 17:58:46 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$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 */
Index: lang/php/7.0/patches/patch-sapi_cli_php_cli_c
===================================================================
RCS file: lang/php/7.0/patches/patch-sapi_cli_php_cli_c
diff -N lang/php/7.0/patches/patch-sapi_cli_php_cli_c
--- lang/php/7.0/patches/patch-sapi_cli_php_cli_c 24 Feb 2017 09:13:12 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-sapi_cli_php_cli_c,v 1.2 2017/02/24 09:13:12 robert Exp $
---- sapi/cli/php_cli.c.orig.port Tue Feb 14 14:51:10 2017
-+++ sapi/cli/php_cli.c Thu Feb 23 18:50:47 2017
-@@ -666,6 +666,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 {
-
Index: lang/php/7.0/patches/patch-sapi_fpm_php-fpm_conf_in
===================================================================
RCS file: lang/php/7.0/patches/patch-sapi_fpm_php-fpm_conf_in
diff -N lang/php/7.0/patches/patch-sapi_fpm_php-fpm_conf_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/patches/patch-sapi_fpm_php-fpm_conf_in 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,473 @@
+$OpenBSD: patch-sapi_fpm_php-fpm_conf_in,v 1.3 2015/04/03 17:53:44 sthen Exp $
+Index: sapi/fpm/php-fpm.conf.in
+--- sapi/fpm/php-fpm.conf.in.orig
++++ sapi/fpm/php-fpm.conf.in
+@@ -6,6 +6,14 @@
+ ; prefix (@prefix@). This prefix can be dynamically changed by using the
+ ; '-p' argument from the command line.
+
++; Include one or more files. If glob(3) exists, it is used to include a bunch of
++; files from a glob(3) pattern. This directive can be used everywhere in the
++; file.
++; Relative path can also be used. They will be prefixed by:
++;  - the global prefix if it's been set (-p argument)
++;  - @prefix@ otherwise
++;include=etc/fpm.d/*.conf
++
+ ;;;;;;;;;;;;;;;;;;
+ ; Global Options ;
+ ;;;;;;;;;;;;;;;;;;
+@@ -47,7 +55,7 @@
+ ; Default Value: 0
+ ;emergency_restart_threshold = 0
+
+-; Interval of time used by emergency_restart_interval to determine when
++; Interval of time used by emergency_restart_interval to determine when
+ ; a graceful restart will be initiated.  This can be useful to work around
+ ; accidental corruptions in an accelerator's shared memory.
+ ; Available Units: s(econds), m(inutes), h(ours), or d(ays)
+@@ -79,11 +87,11 @@
+ ; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
+ ; Default Value: yes
+ ;daemonize = yes
+-
++
+ ; Set open file descriptor rlimit for the master process.
+ ; Default Value: system defined value
+ ;rlimit_files = 1024
+-
++
+ ; Set max core size rlimit for the master process.
+ ; Possible Values: 'unlimited' or an integer greater or equal to 0
+ ; Default Value: system defined value
+@@ -108,7 +116,7 @@
+ ;systemd_interval = 10
+
+ ;;;;;;;;;;;;;;;;;;;;
+-; Pool Definitions ;
++; Pool Definitions ;
+ ;;;;;;;;;;;;;;;;;;;;
+
+ ; Multiple pools of child processes may be started with different listening
+@@ -116,10 +124,414 @@
+ ; used in logs and stats. There is no limitation on the number of pools which
+ ; FPM can handle. Your system will tell you anyway :)
+
+-; Include one or more files. If glob(3) exists, it is used to include a bunch of
+-; files from a glob(3) pattern. This directive can be used everywhere in the
+-; file.
+-; Relative path can also be used. They will be prefixed by:
+-;  - the global prefix if it's been set (-p argument)
+-;  - @prefix@ otherwise
+-include=@php_fpm_sysconfdir@/php-fpm.d/*.conf
++; Start a new pool named 'www'.
++; the variable $pool can we used in any directive and will be replaced by the
++; pool name ('www' here)
++[www]
++
++; Per pool prefix
++; It only applies on the following directives:
++; - 'access.log'
++; - 'slowlog'
++; - 'listen' (unixsocket)
++; - 'chroot'
++; - 'chdir'
++; - 'php_values'
++; - 'php_admin_values'
++; When not set, the global prefix (or @php_fpm_prefix@) applies instead.
++; Note: This directive can also be relative to the global prefix.
++; Default Value: none
++;prefix = /path/to/pools/$pool
++
++; Unix user/group of processes
++; Note: The user is mandatory. If the group is not set, the default user's group
++;       will be used.
++user = @php_fpm_user@
++group = @php_fpm_group@
++
++; The address on which to accept FastCGI requests.
++; Valid syntaxes are:
++;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
++;                            a specific port;
++;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
++;                            a specific port;
++;   'port'                 - to listen on a TCP socket to all IPv4 addresses on a
++;                            specific port;
++;   '[::]:port'            - to listen on a TCP socket to all addresses
++;                            (IPv6 and IPv4-mapped) on a specific port;
++;   '/path/to/unix/socket' - to listen on a unix socket.
++; Note: This value is mandatory.
++listen = /var/www/run/php-fpm.sock
++
++; Set listen(2) backlog.
++; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
++;listen.backlog = 65535
++
++; Set permissions for unix socket, if one is used. In Linux, read/write
++; permissions must be set in order to allow connections from a web server. Many
++; 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
++; 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
++;listen.acl_users =
++;listen.acl_groups =
++
++; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
++; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
++; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
++; must be separated by a comma. If this value is left blank, connections will be
++; accepted from any ip address.
++; Default Value: any
++;listen.allowed_clients = 127.0.0.1
++
++; Specify the nice(2) priority to apply to the pool processes (only if set)
++; The value can vary from -19 (highest priority) to 20 (lower priority)
++; Note: - It will only work if the FPM master process is launched as root
++;       - The pool processes will inherit the master process priority
++;         unless it specified otherwise
++; Default Value: no set
++; process.priority = -19
++
++; Choose how the process manager will control the number of child processes.
++; Possible Values:
++;   static  - a fixed number (pm.max_children) of child processes;
++;   dynamic - the number of child processes are set dynamically based on the
++;             following directives. With this process management, there will be
++;             always at least 1 children.
++;             pm.max_children      - the maximum number of children that can
++;                                    be alive at the same time.
++;             pm.start_servers     - the number of children created on startup.
++;             pm.min_spare_servers - the minimum number of children in 'idle'
++;                                    state (waiting to process). If the number
++;                                    of 'idle' processes is less than this
++;                                    number then some children will be created.
++;             pm.max_spare_servers - the maximum number of children in 'idle'
++;                                    state (waiting to process). If the number
++;                                    of 'idle' processes is greater than this
++;                                    number then some children will be killed.
++;  ondemand - no children are created at startup. Children will be forked when
++;             new requests will connect. The following parameter are used:
++;             pm.max_children           - the maximum number of children that
++;                                         can be alive at the same time.
++;             pm.process_idle_timeout   - The number of seconds after which
++;                                         an idle process will be killed.
++; Note: This value is mandatory.
++pm = dynamic
++
++; The number of child processes to be created when pm is set to 'static' and the
++; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
++; This value sets the limit on the number of simultaneous requests that will be
++; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
++; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
++; CGI. The below defaults are based on a server without much resources. Don't
++; forget to tweak pm.* to fit your needs.
++; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
++; Note: This value is mandatory.
++pm.max_children = 5
++
++; The number of child processes created on startup.
++; Note: Used only when pm is set to 'dynamic'
++; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
++pm.start_servers = 2
++
++; The desired minimum number of idle server processes.
++; Note: Used only when pm is set to 'dynamic'
++; Note: Mandatory when pm is set to 'dynamic'
++pm.min_spare_servers = 1
++
++; The desired maximum number of idle server processes.
++; Note: Used only when pm is set to 'dynamic'
++; Note: Mandatory when pm is set to 'dynamic'
++pm.max_spare_servers = 3
++
++; The number of seconds after which an idle process will be killed.
++; Note: Used only when pm is set to 'ondemand'
++; Default Value: 10s
++;pm.process_idle_timeout = 10s;
++
++; The number of requests each child process should execute before respawning.
++; This can be useful to work around memory leaks in 3rd party libraries. For
++; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
++; Default Value: 0
++;pm.max_requests = 500
++
++; The URI to view the FPM status page. If this value is not set, no URI will be
++; recognized as a status page. It shows the following informations:
++;   pool                 - the name of the pool;
++;   process manager      - static, dynamic or ondemand;
++;   start time           - the date and time FPM has started;
++;   start since          - number of seconds since FPM has started;
++;   accepted conn        - the number of request accepted by the pool;
++;   listen queue         - the number of request in the queue of pending
++;                          connections (see backlog in listen(2));
++;   max listen queue     - the maximum number of requests in the queue
++;                          of pending connections since FPM has started;
++;   listen queue len     - the size of the socket queue of pending connections;
++;   idle processes       - the number of idle processes;
++;   active processes     - the number of active processes;
++;   total processes      - the number of idle + active processes;
++;   max active processes - the maximum number of active processes since FPM
++;                          has started;
++;   max children reached - number of times, the process limit has been reached,
++;                          when pm tries to start more children (works only for
++;                          pm 'dynamic' and 'ondemand');
++; Value are updated in real time.
++; Example output:
++;   pool:                 www
++;   process manager:      static
++;   start time:           01/Jul/2011:17:53:49 +0200
++;   start since:          62636
++;   accepted conn:        190460
++;   listen queue:         0
++;   max listen queue:     1
++;   listen queue len:     42
++;   idle processes:       4
++;   active processes:     11
++;   total processes:      15
++;   max active processes: 12
++;   max children reached: 0
++;
++; By default the status page output is formatted as text/plain. Passing either
++; 'html', 'xml' or 'json' in the query string will return the corresponding
++; output syntax. Example:
++;   http://www.foo.bar/status
++;   http://www.foo.bar/status?json
++;   http://www.foo.bar/status?html
++;   http://www.foo.bar/status?xml
++;
++; By default the status page only outputs short status. Passing 'full' in the
++; query string will also return status for each pool process.
++; Example:
++;   http://www.foo.bar/status?full
++;   http://www.foo.bar/status?json&full
++;   http://www.foo.bar/status?html&full
++;   http://www.foo.bar/status?xml&full
++; The Full status returns for each process:
++;   pid                  - the PID of the process;
++;   state                - the state of the process (Idle, Running, ...);
++;   start time           - the date and time the process has started;
++;   start since          - the number of seconds since the process has started;
++;   requests             - the number of requests the process has served;
++;   request duration     - the duration in µs of the requests;
++;   request method       - the request method (GET, POST, ...);
++;   request URI          - the request URI with the query string;
++;   content length       - the content length of the request (only with POST);
++;   user                 - the user (PHP_AUTH_USER) (or '-' if not set);
++;   script               - the main script called (or '-' if not set);
++;   last request cpu     - the %cpu the last request consumed
++;                          it's always 0 if the process is not in Idle state
++;                          because CPU calculation is done when the request
++;                          processing has terminated;
++;   last request memory  - the max amount of memory the last request consumed
++;                          it's always 0 if the process is not in Idle state
++;                          because memory calculation is done when the request
++;                          processing has terminated;
++; If the process is in Idle state, then informations are related to the
++; last request the process has served. Otherwise informations are related to
++; the current request being served.
++; Example output:
++;   ************************
++;   pid:                  31330
++;   state:                Running
++;   start time:           01/Jul/2011:17:53:49 +0200
++;   start since:          63087
++;   requests:             12808
++;   request duration:     1250261
++;   request method:       GET
++;   request URI:          /test_mem.php?N=10000
++;   content length:       0
++;   user:                 -
++;   script:               /home/fat/web/docs/php/test_mem.php
++;   last request cpu:     0.00
++;   last request memory:  0
++;
++; Note: There is a real-time FPM status monitoring sample web page available
++;       It's available in: @EXPANDED_DATADIR@/fpm/status.html
++;
++; Note: The value must start with a leading slash (/). The value can be
++;       anything, but it may not be a good idea to use the .php extension or it
++;       may conflict with a real PHP file.
++; Default Value: not set
++;pm.status_path = /status
++
++; The ping URI to call the monitoring page of FPM. If this value is not set, no
++; URI will be recognized as a ping page. This could be used to test from outside
++; that FPM is alive and responding, or to
++; - create a graph of FPM availability (rrd or such);
++; - remove a server from a group if it is not responding (load balancing);
++; - trigger alerts for the operating team (24/7).
++; Note: The value must start with a leading slash (/). The value can be
++;       anything, but it may not be a good idea to use the .php extension or it
++;       may conflict with a real PHP file.
++; Default Value: not set
++;ping.path = /ping
++
++; This directive may be used to customize the response of a ping request. The
++; response is formatted as text/plain with a 200 response code.
++; Default Value: pong
++;ping.response = pong
++
++; The access log file
++; Default: not set
++;access.log = log/$pool.access.log
++
++; The access log format.
++; The following syntax is allowed
++;  %%: the '%' character
++;  %C: %CPU used by the request
++;      it can accept the following format:
++;      - %{user}C for user CPU only
++;      - %{system}C for system CPU only
++;      - %{total}C  for user + system CPU (default)
++;  %d: time taken to serve the request
++;      it can accept the following format:
++;      - %{seconds}d (default)
++;      - %{miliseconds}d
++;      - %{mili}d
++;      - %{microseconds}d
++;      - %{micro}d
++;  %e: an environment variable (same as $_ENV or $_SERVER)
++;      it must be associated with embraces to specify the name of the env
++;      variable. Some exemples:
++;      - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
++;      - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
++;  %f: script filename
++;  %l: content-length of the request (for POST request only)
++;  %m: request method
++;  %M: peak of memory allocated by PHP
++;      it can accept the following format:
++;      - %{bytes}M (default)
++;      - %{kilobytes}M
++;      - %{kilo}M
++;      - %{megabytes}M
++;      - %{mega}M
++;  %n: pool name
++;  %o: output header
++;      it must be associated with embraces to specify the name of the header:
++;      - %{Content-Type}o
++;      - %{X-Powered-By}o
++;      - %{Transfert-Encoding}o
++;      - ....
++;  %p: PID of the child that serviced the request
++;  %P: PID of the parent of the child that serviced the request
++;  %q: the query string
++;  %Q: the '?' character if query string exists
++;  %r: the request URI (without the query string, see %q and %Q)
++;  %R: remote IP address
++;  %s: status (response code)
++;  %t: server time the request was received
++;      it can accept a strftime(3) format:
++;      %d/%b/%Y:%H:%M:%S %z (default)
++;  %T: time the log has been written (the request has finished)
++;      it can accept a strftime(3) format:
++;      %d/%b/%Y:%H:%M:%S %z (default)
++;  %u: remote user
++;
++; Default: "%R - %u %t \"%m %r\" %s"
++;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
++
++; The log file for slow requests
++; Default Value: not set
++; Note: slowlog is mandatory if request_slowlog_timeout is set
++;slowlog = log/$pool.log.slow
++
++; The timeout for serving a single request after which a PHP backtrace will be
++; dumped to the 'slowlog' file. A value of '0s' means 'off'.
++; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
++; Default Value: 0
++;request_slowlog_timeout = 0
++
++; The timeout for serving a single request after which the worker process will
++; be killed. This option should be used when the 'max_execution_time' ini option
++; does not stop script execution for some reason. A value of '0' means 'off'.
++; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
++; Default Value: 0
++;request_terminate_timeout = 0
++
++; Set open file descriptor rlimit.
++; Default Value: system defined value
++;rlimit_files = 1024
++
++; Set max core size rlimit.
++; Possible Values: 'unlimited' or an integer greater or equal to 0
++; Default Value: system defined value
++;rlimit_core = 0
++
++; Chroot to this directory at the start. This value must be defined as an
++; absolute path. When this value is not set, chroot is not used.
++; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
++; of its subdirectories. If the pool prefix is not set, the global prefix
++; will be used instead.
++; Note: chrooting is a great security feature and should be used whenever
++;       possible. However, all PHP paths will be relative to the chroot
++;       (error_log, sessions.save_path, ...).
++; Default Value: not set
++chroot = /var/www
++
++; Chdir to this directory at the start.
++; Note: relative path can be used.
++; Default Value: current directory or / when chroot
++;chdir = /var/www
++
++; Redirect worker stdout and stderr into main error log. If not set, stdout and
++; stderr will be redirected to /dev/null according to FastCGI specs.
++; Note: on highloaded environement, this can cause some delay in the page
++; process time (several ms).
++; Default Value: no
++;catch_workers_output = yes
++
++; Clear environment in FPM workers
++; Prevents arbitrary environment variables from reaching FPM worker processes
++; by clearing the environment in workers before env vars specified in this
++; pool configuration are added.
++; Setting to "no" will make all environment variables available to PHP code
++; via getenv(), $_ENV and $_SERVER.
++; Default Value: yes
++;clear_env = no
++
++; Limits the extensions of the main script FPM will allow to parse. This can
++; prevent configuration mistakes on the web server side. You should only limit
++; FPM to .php extensions to prevent malicious users to use other extensions to
++; exectute php code.
++; Note: set an empty value to allow all extensions.
++; Default Value: .php
++;security.limit_extensions = .php .php3 .php4 .php5
++
++; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
++; the current environment.
++; Default Value: clean env
++;env[HOSTNAME] = $HOSTNAME
++;env[PATH] = /usr/local/bin:/usr/bin:/bin
++;env[TMP] = /tmp
++;env[TMPDIR] = /tmp
++;env[TEMP] = /tmp
++
++; Additional php.ini defines, specific to this pool of workers. These settings
++; overwrite the values previously defined in the php.ini. The directives are the
++; same as the PHP SAPI:
++;   php_value/php_flag             - you can set classic ini defines which can
++;                                    be overwritten from PHP call 'ini_set'.
++;   php_admin_value/php_admin_flag - these directives won't be overwritten by
++;                                     PHP call 'ini_set'
++; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
++
++; Defining 'extension' will load the corresponding shared extension from
++; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
++; overwrite previously defined php.ini values, but will append the new value
++; instead.
++
++; Note: path INI options can be relative and will be expanded with the prefix
++; (pool, global or @prefix@)
++
++; Default Value: nothing is defined by default except the values in php.ini and
++;                specified at startup with the -d argument
++;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f [hidden email]
++;php_flag[display_errors] = off
++;php_admin_value[error_log] = /var/log/fpm-php.www.log
++;php_admin_flag[log_errors] = on
++;php_admin_value[memory_limit] = 32M
Index: lang/php/7.0/patches/patch-sapi_fpm_www_conf_in
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-sapi_fpm_www_conf_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-sapi_fpm_www_conf_in
--- lang/php/7.0/patches/patch-sapi_fpm_www_conf_in 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ lang/php/7.0/patches/patch-sapi_fpm_www_conf_in 10 Aug 2017 20:03:52 -0000
@@ -10,19 +10,6 @@ $OpenBSD: patch-sapi_fpm_www_conf_in,v 1
 
  ; 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, ...).
Index: lang/php/7.0/patches/patch-scripts_php-config_in
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-scripts_php-config_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-scripts_php-config_in
--- lang/php/7.0/patches/patch-scripts_php-config_in 14 Dec 2015 17:58:46 -0000 1.1.1.1
+++ lang/php/7.0/patches/patch-scripts_php-config_in 10 Aug 2017 20:03:52 -0000
@@ -1,7 +1,7 @@
 $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 @@
+--- scripts/php-config.in.orig.port Tue May  9 13:40:49 2017
++++ scripts/php-config.in Sun Jun  4 20:05:53 2017
+@@ -1,13 +1,13 @@
  #! /bin/sh
 
  SED="@SED@"
@@ -12,11 +12,13 @@ $OpenBSD: patch-scripts_php-config_in,v
  version="@PHP_VERSION@"
  vernum="@PHP_VERSION_ID@"
 -include_dir="@includedir@/php"
+-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"
 +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"
++includes="-I/usr/local/include -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@"
+ extension_dir='@EXTENSION_DIR@'
+@@ -24,10 +24,10 @@ php_sapis="@PHP_INSTALLED_SAPIS@"
  for sapi in $php_sapis; do
    case $sapi in
    cli)
@@ -24,7 +26,7 @@ $OpenBSD: patch-scripts_php-config_in,v
 +    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="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}"
 +    php_cgi_binary="/usr/local/bin/php-cgi${program_suffix}"
      ;;
    esac
Index: lang/php/7.0/patches/patch-scripts_phpize_m4
===================================================================
RCS file: lang/php/7.0/patches/patch-scripts_phpize_m4
diff -N lang/php/7.0/patches/patch-scripts_phpize_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/patches/patch-scripts_phpize_m4 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- scripts/phpize.m4.orig.port Fri Jun  2 21:36:25 2017
++++ scripts/phpize.m4 Fri Jun  2 21:36:41 2017
+@@ -36,7 +36,7 @@ PHP_SHLIB_SUFFIX_NAMES
+
+ dnl Find php-config script
+ PHP_ARG_WITH(php-config,,
+-[  --with-php-config=PATH  Path to php-config [php-config]], php-config, no)
++[  --with-php-config=PATH  Path to php-config [php-config]], php-config-${PV}, no)
+
+ dnl For BC
+ PHP_CONFIG=$PHP_PHP_CONFIG
Index: lang/php/7.0/pkg/PLIST-apxs2
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-apxs2
diff -N lang/php/7.0/pkg/PLIST-apxs2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-apxs2 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-apxs2->=7.0,<7.1
+lib/php-${PV}/libphp7.so
+share/examples/php-${PV}/php.conf
+@sample /var/www/conf/modules.sample/php-${PV}.conf
Index: lang/php/7.0/pkg/PLIST-bcmath
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-bcmath
diff -N lang/php/7.0/pkg/PLIST-bcmath
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-bcmath 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-bcmath->=7.0,<7.1
+lib/php-${PV}/modules/bcmath.so
+share/examples/php-${PV}/bcmath.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/bcmath.ini
Index: lang/php/7.0/pkg/PLIST-bz2
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-bz2,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-bz2
--- lang/php/7.0/pkg/PLIST-bz2 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-bz2 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-calendar
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-calendar
diff -N lang/php/7.0/pkg/PLIST-calendar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-calendar 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-calendar->=7.0,<7.1
+lib/php-${PV}/modules/calendar.so
+share/examples/php-${PV}/calendar.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/calendar.ini
Index: lang/php/7.0/pkg/PLIST-cgi
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-cgi
diff -N lang/php/7.0/pkg/PLIST-cgi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-cgi 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-cgi->=7.0,<7.1
+@bin bin/php-cgi-${PV}
+@man man/man1/php-cgi-${PV}.1
Index: lang/php/7.0/pkg/PLIST-cli
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-cli
diff -N lang/php/7.0/pkg/PLIST-cli
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-cli 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-cli->=7.0,<7.1
+@bin bin/php-${PV}
+@man man/man1/php-${PV}.1
+share/php-${PV}/include/sapi/
+share/php-${PV}/include/sapi/cli/
+share/php-${PV}/include/sapi/cli/cli.h
Index: lang/php/7.0/pkg/PLIST-ctype
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-ctype
diff -N lang/php/7.0/pkg/PLIST-ctype
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-ctype 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-ctype->=7.0,<7.1
+lib/php-${PV}/modules/ctype.so
+share/examples/php-${PV}/ctype.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ctype.ini
Index: lang/php/7.0/pkg/PLIST-curl
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-curl,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-curl
--- lang/php/7.0/pkg/PLIST-curl 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-curl 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-dba
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-dba,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-dba
--- lang/php/7.0/pkg/PLIST-dba 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-dba 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-dbg
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-dbg
diff -N lang/php/7.0/pkg/PLIST-dbg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-dbg 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-dbg->=7.0,<7.1
+@bin bin/phpdbg-${PV}
+@man man/man1/phpdbg-${PV}.1
Index: lang/php/7.0/pkg/PLIST-dom
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-dom
diff -N lang/php/7.0/pkg/PLIST-dom
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-dom 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-dom->=7.0,<7.1
+lib/php-${PV}/modules/dom.so
+share/examples/php-${PV}/dom.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/dom.ini
+share/php-${PV}/include/ext/dom/
+share/php-${PV}/include/ext/dom/xml_common.h
Index: lang/php/7.0/pkg/PLIST-enchant
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-enchant
diff -N lang/php/7.0/pkg/PLIST-enchant
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-enchant 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-enchant->=7.0,<7.1
+lib/php-${PV}/modules/enchant.so
+share/examples/php-${PV}/enchant.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/enchant.ini
Index: lang/php/7.0/pkg/PLIST-exif
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-exif
diff -N lang/php/7.0/pkg/PLIST-exif
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-exif 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-exif->=7.0,<7.1
+lib/php-${PV}/modules/exif.so
+share/examples/php-${PV}/exif.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/exif.ini
Index: lang/php/7.0/pkg/PLIST-fastcgi
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-fastcgi
diff -N lang/php/7.0/pkg/PLIST-fastcgi
--- lang/php/7.0/pkg/PLIST-fastcgi 29 Jun 2016 16:14:42 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PLIST-fastcgi,v 1.2 2016/06/29 16:14:42 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict php-fastcgi->=7.0,<7.1
-@bin bin/php-fastcgi-${PV}
Index: lang/php/7.0/pkg/PLIST-fileinfo
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-fileinfo
diff -N lang/php/7.0/pkg/PLIST-fileinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-fileinfo 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-fileinfo->=7.0,<7.1
+lib/php-${PV}/modules/fileinfo.so
+share/examples/php-${PV}/fileinfo.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/fileinfo.ini
Index: lang/php/7.0/pkg/PLIST-fpm
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-fpm
diff -N lang/php/7.0/pkg/PLIST-fpm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-fpm 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@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
Index: lang/php/7.0/pkg/PLIST-ftp
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-ftp
diff -N lang/php/7.0/pkg/PLIST-ftp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-ftp 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-ftp->=7.0,<7.1
+lib/php-${PV}/modules/ftp.so
+share/examples/php-${PV}/ftp.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ftp.ini
Index: lang/php/7.0/pkg/PLIST-gd
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-gd,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-gd
--- lang/php/7.0/pkg/PLIST-gd 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-gd 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,23 @@
 @option no-default-conflict
 @option is-branch
 @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
+share/php-${PV}/include/ext/gd/
+share/php-${PV}/include/ext/gd/gd_compat.h
+share/php-${PV}/include/ext/gd/gdcache.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
Index: lang/php/7.0/pkg/PLIST-gettext
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-gettext
diff -N lang/php/7.0/pkg/PLIST-gettext
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-gettext 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-gettext->=7.0,<7.1
+lib/php-${PV}/modules/gettext.so
+share/examples/php-${PV}/gettext.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/gettext.ini
Index: lang/php/7.0/pkg/PLIST-gmp
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-gmp,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-gmp
--- lang/php/7.0/pkg/PLIST-gmp 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-gmp 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-iconv
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-iconv
diff -N lang/php/7.0/pkg/PLIST-iconv
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-iconv 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,19 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-iconv->=7.0,<7.1
+lib/php-${PV}/modules/iconv.so
+share/examples/php-${PV}/iconv.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/iconv.ini
+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
Index: lang/php/7.0/pkg/PLIST-imap
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-imap,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-imap
--- lang/php/7.0/pkg/PLIST-imap 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-imap 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-json
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-json
diff -N lang/php/7.0/pkg/PLIST-json
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-json 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-json->=7.0,<7.1
+lib/php-${PV}/modules/json.so
+share/examples/php-${PV}/json.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/json.ini
+share/php-${PV}/include/ext/json/
+share/php-${PV}/include/ext/json/php_json.h
Index: lang/php/7.0/pkg/PLIST-ldap
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-ldap,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-ldap
--- lang/php/7.0/pkg/PLIST-ldap 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-ldap 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-main
--- lang/php/7.0/pkg/PLIST-main 25 Apr 2017 11:21:14 -0000 1.6
+++ lang/php/7.0/pkg/PLIST-main 10 Aug 2017 20:03:52 -0000
@@ -2,13 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @conflict php->=7.0,<7.1
-@conflict php-fpm->=7.0,<7.1
-@conflict php5-core->=5.2
-@conflict php5-core-fastcgi->=5.2
-@conflict php5-pdo_sqlite->=5.2
-@pkgpath lang/php/5.4
-@pkgpath lang/php/5.4,-pdo_sqlite
-@pkgpath lang/php/7.0,-fpm
 @extraunexec rm -f ${SYSCONFDIR}/php-${PV}/php-${PV}.sample/*
 @mode 1700
 @owner www
@@ -17,31 +10,19 @@
 @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
-@man man/man8/php-fpm-${PV}.8
-@bin sbin/php-fpm-${PV}
 share/doc/pkg-readmes/${FULLPKGNAME}
 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/examples/php-${PV}/php-fpm.conf
-@sample ${SYSCONFDIR}/php-fpm.conf
 share/php-${PV}/
 share/php-${PV}/build/
 share/php-${PV}/build/Makefile.global
@@ -142,27 +123,8 @@ share/php-${PV}/include/ext/date/lib/tim
 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/gd_compat.h
-share/php-${PV}/include/ext/gd/gdcache.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
@@ -177,93 +139,14 @@ share/php-${PV}/include/ext/hash/php_has
 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/mysql_float_to_double.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/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
@@ -276,9 +159,6 @@ share/php-${PV}/include/ext/spl/spl_func
 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
@@ -344,9 +224,6 @@ share/php-${PV}/include/ext/standard/uni
 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
@@ -387,8 +264,4 @@ share/php-${PV}/include/main/streams/php
 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}/
-@rcscript ${RCDIR}/php${SV}_fpm
Index: lang/php/7.0/pkg/PLIST-mbstring
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-mbstring
diff -N lang/php/7.0/pkg/PLIST-mbstring
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-mbstring 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,29 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-mbstring->=7.0,<7.1
+lib/php-${PV}/modules/mbstring.so
+share/examples/php-${PV}/mbstring.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mbstring.ini
+share/php-${PV}/include/ext/mbstring/
+share/php-${PV}/include/ext/mbstring/mbstring.h
+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/php_mbregex.h
+share/php-${PV}/include/ext/mbstring/php_onig_compat.h
Index: lang/php/7.0/pkg/PLIST-mcrypt
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-mcrypt,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-mcrypt
--- lang/php/7.0/pkg/PLIST-mcrypt 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-mcrypt 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-mysqli
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-mysqli,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-mysqli
--- lang/php/7.0/pkg/PLIST-mysqli 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-mysqli 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,9 @@
 @option no-default-conflict
 @option is-branch
 @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
+share/php-${PV}/include/ext/mysqli/
+share/php-${PV}/include/ext/mysqli/mysqli_mysqlnd.h
+share/php-${PV}/include/ext/mysqli/php_mysqli_structs.h
Index: lang/php/7.0/pkg/PLIST-mysqlnd
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-mysqlnd
diff -N lang/php/7.0/pkg/PLIST-mysqlnd
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-mysqlnd 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,28 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-mysqlnd->=7.0,<7.1
+lib/php-${PV}/modules/mysqlnd.so
+share/examples/php-${PV}/mysqlnd.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mysqlnd.ini
+share/php-${PV}/include/ext/mysqlnd/
+share/php-${PV}/include/ext/mysqlnd/config-win.h
+share/php-${PV}/include/ext/mysqlnd/mysql_float_to_double.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/php_mysqlnd.h
Index: lang/php/7.0/pkg/PLIST-odbc
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-odbc,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-odbc
--- lang/php/7.0/pkg/PLIST-odbc 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-odbc 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-opcache
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-opcache
diff -N lang/php/7.0/pkg/PLIST-opcache
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-opcache 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-opcache->=7.0,<7.1
+lib/php-${PV}/modules/opcache.so
+share/examples/php-${PV}/opcache.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini
Index: lang/php/7.0/pkg/PLIST-pcntl
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-pcntl,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pcntl
--- lang/php/7.0/pkg/PLIST-pcntl 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-pcntl 10 Aug 2017 20:03:52 -0000
@@ -2,9 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-pdo
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-pdo
diff -N lang/php/7.0/pkg/PLIST-pdo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-pdo 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,11 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo->=7.0,<7.1
+lib/php-${PV}/modules/pdo.so
+share/examples/php-${PV}/pdo.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo.ini
+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
Index: lang/php/7.0/pkg/PLIST-pdo_dblib
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-pdo_dblib,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pdo_dblib
--- lang/php/7.0/pkg/PLIST-pdo_dblib 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-pdo_dblib 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-pdo_mysql
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-pdo_mysql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pdo_mysql
--- lang/php/7.0/pkg/PLIST-pdo_mysql 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-pdo_mysql 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-pdo_pgsql
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-pdo_pgsql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pdo_pgsql
--- lang/php/7.0/pkg/PLIST-pdo_pgsql 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-pdo_pgsql 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-pdo_sqlite
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-pdo_sqlite
diff -N lang/php/7.0/pkg/PLIST-pdo_sqlite
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-pdo_sqlite 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_sqlite->=7.0,<7.1
+lib/php-${PV}/modules/pdo_sqlite.so
+share/examples/php-${PV}/pdo_sqlite.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_sqlite.ini
Index: lang/php/7.0/pkg/PLIST-pgsql
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-pgsql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pgsql
--- lang/php/7.0/pkg/PLIST-pgsql 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-pgsql 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-phar
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-phar
diff -N lang/php/7.0/pkg/PLIST-phar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-phar 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,11 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-phar->=7.0,<7.1
+bin/phar-${PV}
+@man man/man1/phar-${PV}.1
+lib/php-${PV}/modules/phar.so
+share/examples/php-${PV}/phar.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/phar.ini
+share/php-${PV}/include/ext/phar/
+share/php-${PV}/include/ext/phar/php_phar.h
Index: lang/php/7.0/pkg/PLIST-posix
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-posix
diff -N lang/php/7.0/pkg/PLIST-posix
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-posix 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-posix->=7.0,<7.1
+lib/php-${PV}/modules/posix.so
+share/examples/php-${PV}/posix.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/posix.ini
Index: lang/php/7.0/pkg/PLIST-pspell
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-pspell,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pspell
--- lang/php/7.0/pkg/PLIST-pspell 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-pspell 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-readline
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-readline
diff -N lang/php/7.0/pkg/PLIST-readline
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-readline 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-readline->=7.0,<7.1
+lib/php-${PV}/modules/readline.so
+share/examples/php-${PV}/readline.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/readline.ini
Index: lang/php/7.0/pkg/PLIST-shmop
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-shmop,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-shmop
--- lang/php/7.0/pkg/PLIST-shmop 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-shmop 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-simplexml
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-simplexml
diff -N lang/php/7.0/pkg/PLIST-simplexml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-simplexml 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-simplexml->=7.0,<7.1
+lib/php-${PV}/modules/simplexml.so
+share/examples/php-${PV}/simplexml.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/simplexml.ini
+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
Index: lang/php/7.0/pkg/PLIST-snmp
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-snmp,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-snmp
--- lang/php/7.0/pkg/PLIST-snmp 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-snmp 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-soap
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-soap,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-soap
--- lang/php/7.0/pkg/PLIST-soap 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-soap 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-sockets
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-sockets
diff -N lang/php/7.0/pkg/PLIST-sockets
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-sockets 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sockets->=7.0,<7.1
+lib/php-${PV}/modules/sockets.so
+share/examples/php-${PV}/sockets.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sockets.ini
+share/php-${PV}/include/ext/sockets/
+share/php-${PV}/include/ext/sockets/php_sockets.h
Index: lang/php/7.0/pkg/PLIST-sqlite3
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-sqlite3
diff -N lang/php/7.0/pkg/PLIST-sqlite3
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-sqlite3 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sqlite3->=7.0,<7.1
+lib/php-${PV}/modules/sqlite3.so
+share/examples/php-${PV}/sqlite3.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sqlite3.ini
Index: lang/php/7.0/pkg/PLIST-sysvmsg
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-sysvmsg
diff -N lang/php/7.0/pkg/PLIST-sysvmsg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-sysvmsg 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvmsg->=7.0,<7.1
+lib/php-${PV}/modules/sysvmsg.so
+share/examples/php-${PV}/sysvmsg.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvmsg.ini
Index: lang/php/7.0/pkg/PLIST-sysvsem
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-sysvsem
diff -N lang/php/7.0/pkg/PLIST-sysvsem
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-sysvsem 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvsem->=7.0,<7.1
+lib/php-${PV}/modules/sysvsem.so
+share/examples/php-${PV}/sysvsem.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvsem.ini
Index: lang/php/7.0/pkg/PLIST-sysvshm
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-sysvshm
diff -N lang/php/7.0/pkg/PLIST-sysvshm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-sysvshm 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvshm->=7.0,<7.1
+lib/php-${PV}/modules/sysvshm.so
+share/examples/php-${PV}/sysvshm.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvshm.ini
Index: lang/php/7.0/pkg/PLIST-tidy
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-tidy,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-tidy
--- lang/php/7.0/pkg/PLIST-tidy 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-tidy 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-tokenizer
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-tokenizer
diff -N lang/php/7.0/pkg/PLIST-tokenizer
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-tokenizer 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-tokenizer->=7.0,<7.1
+lib/php-${PV}/modules/tokenizer.so
+share/examples/php-${PV}/tokenizer.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/tokenizer.ini
Index: lang/php/7.0/pkg/PLIST-wddx
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-wddx
diff -N lang/php/7.0/pkg/PLIST-wddx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-wddx 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-wddx->=7.0,<7.1
+lib/php-${PV}/modules/wddx.so
+share/examples/php-${PV}/wddx.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/wddx.ini
Index: lang/php/7.0/pkg/PLIST-xml
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-xml
diff -N lang/php/7.0/pkg/PLIST-xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-xml 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xml->=7.0,<7.1
+lib/php-${PV}/modules/xml.so
+share/examples/php-${PV}/xml.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xml.ini
+share/php-${PV}/include/ext/xml/
+share/php-${PV}/include/ext/xml/expat_compat.h
+share/php-${PV}/include/ext/xml/php_xml.h
Index: lang/php/7.0/pkg/PLIST-xmlreader
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-xmlreader
diff -N lang/php/7.0/pkg/PLIST-xmlreader
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-xmlreader 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlreader->=7.0,<7.1
+lib/php-${PV}/modules/xmlreader.so
+share/examples/php-${PV}/xmlreader.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlreader.ini
Index: lang/php/7.0/pkg/PLIST-xmlrpc
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-xmlrpc,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-xmlrpc
--- lang/php/7.0/pkg/PLIST-xmlrpc 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-xmlrpc 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-xmlwriter
===================================================================
RCS file: lang/php/7.0/pkg/PLIST-xmlwriter
diff -N lang/php/7.0/pkg/PLIST-xmlwriter
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.0/pkg/PLIST-xmlwriter 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlwriter->=7.0,<7.1
+lib/php-${PV}/modules/xmlwriter.so
+share/examples/php-${PV}/xmlwriter.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlwriter.ini
Index: lang/php/7.0/pkg/PLIST-xsl
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-xsl,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-xsl
--- lang/php/7.0/pkg/PLIST-xsl 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-xsl 10 Aug 2017 20:03:52 -0000
@@ -2,7 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.0/pkg/PLIST-zip
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-zip,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-zip
--- lang/php/7.0/pkg/PLIST-zip 29 Jun 2016 16:14:42 -0000 1.2
+++ lang/php/7.0/pkg/PLIST-zip 10 Aug 2017 20:03:52 -0000
@@ -2,8 +2,6 @@
 @option no-default-conflict
 @option is-branch
 @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
Index: lang/php/7.1/Makefile
===================================================================
RCS file: lang/php/7.1/Makefile
diff -N lang/php/7.1/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/Makefile 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,10 @@
+# $OpenBSD: Makefile,v 1.29 2017/04/25 11:21:14 sthen Exp $
+
+BROKEN-sparc64= SIGBUS during phar generation
+
+PV= 7.1
+V= ${PV}.8
+
+PHP_MODULES_EXTRA=
+
+.include <bsd.port.mk>
Index: lang/php/7.1/distinfo
===================================================================
RCS file: lang/php/7.1/distinfo
diff -N lang/php/7.1/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/distinfo 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,2 @@
+SHA256 (php-7.1.8.tar.bz2) = cGSgCpRQVlGQiQx6S+BOZG4L5zsuD4xGrjRBnzQ8ovg=
+SIZE (php-7.1.8.tar.bz2) = 15794023
Index: lang/php/7.1/patches/patch-acinclude_m4
===================================================================
RCS file: lang/php/7.1/patches/patch-acinclude_m4
diff -N lang/php/7.1/patches/patch-acinclude_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-acinclude_m4 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+--- acinclude.m4.orig.port Wed May 24 14:58:24 2017
++++ acinclude.m4 Wed May 24 14:58:43 2017
+@@ -2337,13 +2337,13 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+
+   dnl If pkg-config is found try using it
+   if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
+-    if $PKG_CONFIG --atleast-version=1.0.1 openssl; then
++    if $PKG_CONFIG --atleast-version=1.0.0 openssl; then
+       found_openssl=yes
+       OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`
+       OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
+       OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
+     else
+-      AC_MSG_ERROR([OpenSSL version 1.0.1 or greater required.])
++      AC_MSG_ERROR([OpenSSL version 1.0.0 or greater required.])
+     fi
+
+     if test -n "$OPENSSL_LIBS"; then
+@@ -2388,9 +2388,9 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+   yes
+ #endif
+     ],[
+-      AC_MSG_RESULT([>= 1.0.1])
++      AC_MSG_RESULT([>= 1.0.0])
+     ],[
+-      AC_MSG_ERROR([OpenSSL version 1.0.1 or greater required.])
++      AC_MSG_ERROR([OpenSSL version 1.0.0 or greater required.])
+     ])
+     CPPFLAGS=$old_CPPFLAGS
+
Index: lang/php/7.1/patches/patch-aclocal_m4
===================================================================
RCS file: lang/php/7.1/patches/patch-aclocal_m4
diff -N lang/php/7.1/patches/patch-aclocal_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-aclocal_m4 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,42 @@
+$OpenBSD: patch-aclocal_m4,v 1.1 2017/04/26 08:15:05 sthen Exp $
+--- aclocal.m4.orig.port Tue May  9 14:29:42 2017
++++ aclocal.m4 Wed May 24 15:01:47 2017
+@@ -762,7 +762,9 @@ AC_DEFUN([PHP_REQUIRE_CXX],[
+   if test -z "$php_cxx_done"; then
+     AC_PROG_CXX
+     AC_PROG_CXXCPP
+-    PHP_ADD_LIBRARY(stdc++)
++    for i in $LIBCXX; do
++      PHP_ADD_LIBRARY($i)
++    done
+     php_cxx_done=yes
+   fi
+ ])
+@@ -2337,13 +2339,13 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+
+   dnl If pkg-config is found try using it
+   if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
+-    if $PKG_CONFIG --atleast-version=1.0.1 openssl; then
++    if $PKG_CONFIG --atleast-version=1.0.0 openssl; then
+       found_openssl=yes
+       OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`
+       OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
+       OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
+     else
+-      AC_MSG_ERROR([OpenSSL version 1.0.1 or greater required.])
++      AC_MSG_ERROR([OpenSSL version 1.0.0 or greater required.])
+     fi
+
+     if test -n "$OPENSSL_LIBS"; then
+@@ -2388,9 +2390,9 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+   yes
+ #endif
+     ],[
+-      AC_MSG_RESULT([>= 1.0.1])
++      AC_MSG_RESULT([>= 1.0.0])
+     ],[
+-      AC_MSG_ERROR([OpenSSL version 1.0.1 or greater required.])
++      AC_MSG_ERROR([OpenSSL version 1.0.0 or greater required.])
+     ])
+     CPPFLAGS=$old_CPPFLAGS
+
Index: lang/php/7.1/patches/patch-ext_gd_config_m4
===================================================================
RCS file: lang/php/7.1/patches/patch-ext_gd_config_m4
diff -N lang/php/7.1/patches/patch-ext_gd_config_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-ext_gd_config_m4 10 Aug 2017 20:03:52 -0000
@@ -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
+
Index: lang/php/7.1/patches/patch-ext_imap_config_m4
===================================================================
RCS file: lang/php/7.1/patches/patch-ext_imap_config_m4
diff -N lang/php/7.1/patches/patch-ext_imap_config_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-ext_imap_config_m4 10 Aug 2017 20:03:52 -0000
@@ -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,[ ])
Index: lang/php/7.1/patches/patch-ext_mcrypt_mcrypt_c
===================================================================
RCS file: lang/php/7.1/patches/patch-ext_mcrypt_mcrypt_c
diff -N lang/php/7.1/patches/patch-ext_mcrypt_mcrypt_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-ext_mcrypt_mcrypt_c 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,59 @@
+$OpenBSD$
+--- ext/mcrypt/mcrypt.c.orig.port Tue May  9 14:29:40 2017
++++ ext/mcrypt/mcrypt.c Wed May 24 14:24:38 2017
+@@ -1375,50 +1375,12 @@ PHP_FUNCTION(mcrypt_create_iv)
+
+ iv = ecalloc(size + 1, 1);
+
+- if (source == RANDOM || source == URANDOM) {
+-#ifdef PHP_WIN32
+- /* random/urandom equivalent on Windows */
+- BYTE *iv_b = (BYTE *) iv;
+- if (php_win32_get_random_bytes(iv_b, (size_t) size) == FAILURE){
+- efree(iv);
+- php_error_docref(NULL, E_WARNING, "Could not gather sufficient random data");
+- RETURN_FALSE;
+- }
+- n = (int)size;
+-#else
+- int    *fd = &MCG(fd[source]);
+- size_t read_bytes = 0;
++ if (php_random_bytes_silent(iv, (size_t) size) == FAILURE) {
++ efree(iv);
++ php_error_docref(NULL, E_WARNING, "Could not gather sufficient random data");
++ RETURN_FALSE;
++ }
+
+- if (*fd < 0) {
+- *fd = open(source == RANDOM ? "/dev/random" : "/dev/urandom", O_RDONLY);
+- if (*fd < 0) {
+- efree(iv);
+- php_error_docref(NULL, E_WARNING, "Cannot open source device");
+- RETURN_FALSE;
+- }
+- }
+-
+- while ((zend_long)read_bytes < size) {
+- n = read(*fd, iv + read_bytes, size - read_bytes);
+- if (n <= 0) {
+- break;
+- }
+- read_bytes += n;
+- }
+- n = read_bytes;
+-
+- if (n < size) {
+- efree(iv);
+- php_error_docref(NULL, E_WARNING, "Could not gather sufficient random data");
+- RETURN_FALSE;
+- }
+-#endif
+- } else {
+- n = (int)size;
+- while (size) {
+- iv[--size] = (char) (255.0 * php_rand() / RAND_MAX);
+- }
+- }
+ RETVAL_STRINGL(iv, n);
+ efree(iv);
+ }
Index: lang/php/7.1/patches/patch-ext_odbc_config_m4
===================================================================
RCS file: lang/php/7.1/patches/patch-ext_odbc_config_m4
diff -N lang/php/7.1/patches/patch-ext_odbc_config_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-ext_odbc_config_m4 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- ext/odbc/config.m4.orig.port Mon Jun 26 22:55:51 2017
++++ ext/odbc/config.m4 Mon Jun 26 22:56:21 2017
+@@ -396,7 +396,7 @@ 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)
++      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
+       ODBC_TYPE=iodbc
+       ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
+       ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
+@@ -409,7 +409,7 @@ PHP_ARG_WITH(iodbc,,
+       if test "$PHP_IODBC" = "yes"; then
+         PHP_IODBC=/usr/local
+       fi
+-      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
+       PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
+       ODBC_TYPE=iodbc
+       ODBC_INCLUDE=-I$PHP_IODBC/include
Index: lang/php/7.1/patches/patch-ext_openssl_config0_m4
===================================================================
RCS file: lang/php/7.1/patches/patch-ext_openssl_config0_m4
diff -N lang/php/7.1/patches/patch-ext_openssl_config0_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-ext_openssl_config0_m4 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,11 @@
+--- ext/openssl/config0.m4.orig.port Wed May 24 14:54:07 2017
++++ ext/openssl/config0.m4 Wed May 24 14:54:15 2017
+@@ -3,7 +3,7 @@ dnl $Id$
+ dnl
+
+ PHP_ARG_WITH(openssl, for OpenSSL support,
+-[  --with-openssl[=DIR]      Include OpenSSL support (requires OpenSSL >= 1.0.1)])
++[  --with-openssl[=DIR]      Include OpenSSL support (requires OpenSSL >= 1.0.0)])
+
+ PHP_ARG_WITH(kerberos, for Kerberos support,
+ [  --with-kerberos[=DIR]     OPENSSL: Include Kerberos support], no, no)
Index: lang/php/7.1/patches/patch-ext_standard_config_m4
===================================================================
RCS file: lang/php/7.1/patches/patch-ext_standard_config_m4
diff -N lang/php/7.1/patches/patch-ext_standard_config_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-ext_standard_config_m4 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,36 @@
+$OpenBSD$
+--- ext/standard/config.m4.orig.port Wed May 24 17:11:41 2017
++++ ext/standard/config.m4 Wed May 24 17:12:02 2017
+@@ -310,31 +310,7 @@ else
+   AC_MSG_RESULT(no)
+ fi
+
+-PHP_ENABLE_CHROOT_FUNC=no
+-case "$PHP_SAPI" in
+-  embed)
+-    PHP_ENABLE_CHROOT_FUNC=yes
+-  ;;
+-
+-  none)
+-    for PROG in $PHP_BINARIES; do
+-      case "$PROG" in
+-        cgi|cli)
+-          PHP_ENABLE_CHROOT_FUNC=yes
+-        ;;
+-
+-        *)
+-          PHP_ENABLE_CHROOT_FUNC=no
+-          break
+-        ;;
+-      esac
+-   done
+-  ;;
+-esac
+-
+-if test "$PHP_ENABLE_CHROOT_FUNC" = "yes"; then
+-  AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
+-fi
++AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
+
+ dnl
+ dnl Detect library functions needed by php dns_xxx functions
Index: lang/php/7.1/patches/patch-ext_tidy_config_m4
===================================================================
RCS file: lang/php/7.1/patches/patch-ext_tidy_config_m4
diff -N lang/php/7.1/patches/patch-ext_tidy_config_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-ext_tidy_config_m4 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,20 @@
+$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 Tue May  9 14:29:39 2017
++++ ext/tidy/config.m4 Wed May 24 14:20:21 2017
+@@ -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
+
Index: lang/php/7.1/patches/patch-ext_tidy_tidy_c
===================================================================
RCS file: lang/php/7.1/patches/patch-ext_tidy_tidy_c
diff -N lang/php/7.1/patches/patch-ext_tidy_tidy_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-ext_tidy_tidy_c 10 Aug 2017 20:03:52 -0000
@@ -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 Tue May  9 14:29:39 2017
++++ ext/tidy/tidy.c Wed May 24 14:32:01 2017
+@@ -30,7 +30,7 @@
+ #include "php_ini.h"
+ #include "ext/standard/info.h"
+
+-#include "tidy.h"
++#include "tidyp.h"
+
+ #if HAVE_TIDYBUFFIO_H
+ #include "tidybuffio.h"
Index: lang/php/7.1/patches/patch-main_php_ini_c
===================================================================
RCS file: lang/php/7.1/patches/patch-main_php_ini_c
diff -N lang/php/7.1/patches/patch-main_php_ini_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-main_php_ini_c 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,12 @@
+$OpenBSD: patch-main_php_ini_c,v 1.3 2017/01/22 17:01:32 martijn Exp $
+--- main/php_ini.c.orig.port Tue May  9 14:29:42 2017
++++ main/php_ini.c Wed May 24 15:00:20 2017
+@@ -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);
+ }
Index: lang/php/7.1/patches/patch-main_streams_php_stream_transport_h
===================================================================
RCS file: lang/php/7.1/patches/patch-main_streams_php_stream_transport_h
diff -N lang/php/7.1/patches/patch-main_streams_php_stream_transport_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-main_streams_php_stream_transport_h 10 Aug 2017 20:03:52 -0000
@@ -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;
+
Index: lang/php/7.1/patches/patch-php_ini-development
===================================================================
RCS file: lang/php/7.1/patches/patch-php_ini-development
diff -N lang/php/7.1/patches/patch-php_ini-development
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-php_ini-development 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,59 @@
+$OpenBSD: patch-php_ini-development,v 1.5 2016/10/31 15:06:10 robert Exp $
+--- php.ini-development.orig.port Tue May  9 14:29:42 2017
++++ php.ini-development Wed May 24 14:20:21 2017
+@@ -710,11 +710,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
+
+@@ -736,6 +733,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)
+@@ -832,7 +830,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
+@@ -936,7 +934,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
+@@ -1029,16 +1027,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 = [hidden email]
+-
+ ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
+ ; http://php.net/sendmail-path
+ ;sendmail_path =
Index: lang/php/7.1/patches/patch-php_ini-production
===================================================================
RCS file: lang/php/7.1/patches/patch-php_ini-production
diff -N lang/php/7.1/patches/patch-php_ini-production
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-php_ini-production 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,42 @@
+$OpenBSD: patch-php_ini-production,v 1.4 2016/10/31 15:06:10 robert Exp $
+--- php.ini-production.orig.port Tue May  9 14:29:42 2017
++++ php.ini-production Wed May 24 14:20:21 2017
+@@ -710,11 +710,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
+
+@@ -736,6 +733,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)
+@@ -832,7 +830,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
+@@ -936,7 +934,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
Index: lang/php/7.1/patches/patch-sapi_fpm_fpm_fpm_atomic_h
===================================================================
RCS file: lang/php/7.1/patches/patch-sapi_fpm_fpm_fpm_atomic_h
diff -N lang/php/7.1/patches/patch-sapi_fpm_fpm_fpm_atomic_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-sapi_fpm_fpm_fpm_atomic_h 10 Aug 2017 20:03:52 -0000
@@ -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
+
Index: lang/php/7.1/patches/patch-sapi_fpm_php-fpm_conf_in
===================================================================
RCS file: lang/php/7.1/patches/patch-sapi_fpm_php-fpm_conf_in
diff -N lang/php/7.1/patches/patch-sapi_fpm_php-fpm_conf_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-sapi_fpm_php-fpm_conf_in 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,514 @@
+$OpenBSD: patch-sapi_fpm_php-fpm_conf_in,v 1.3 2015/04/03 17:53:44 sthen Exp $
+Index: sapi/fpm/php-fpm.conf.in
+--- sapi/fpm/php-fpm.conf.in.orig
++++ sapi/fpm/php-fpm.conf.in
+@@ -6,6 +6,14 @@
+ ; prefix (@prefix@). This prefix can be dynamically changed by using the
+ ; '-p' argument from the command line.
+
++; Include one or more files. If glob(3) exists, it is used to include a bunch of
++; files from a glob(3) pattern. This directive can be used everywhere in the
++; file.
++; Relative path can also be used. They will be prefixed by:
++;  - the global prefix if it's been set (-p argument)
++;  - @prefix@ otherwise
++;include=etc/fpm.d/*.conf
++
+ ;;;;;;;;;;;;;;;;;;
+ ; Global Options ;
+ ;;;;;;;;;;;;;;;;;;
+@@ -18,7 +26,7 @@
+
+ ; Error log file
+ ; If it's set to "syslog", log is sent to syslogd instead of being written
+-; into a local file.
++; in a local file.
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: log/php-fpm.log
+ ;error_log = log/php-fpm.log
+@@ -47,7 +55,7 @@
+ ; Default Value: 0
+ ;emergency_restart_threshold = 0
+
+-; Interval of time used by emergency_restart_interval to determine when
++; Interval of time used by emergency_restart_interval to determine when
+ ; a graceful restart will be initiated.  This can be useful to work around
+ ; accidental corruptions in an accelerator's shared memory.
+ ; Available Units: s(econds), m(inutes), h(ours), or d(ays)
+@@ -61,7 +69,7 @@
+ ; Default Value: 0
+ ;process_control_timeout = 0
+
+-; The maximum number of processes FPM will fork. This has been designed to control
++; The maximum number of processes FPM will fork. This has been design to control
+ ; the global number of processes when using dynamic PM within a lot of pools.
+ ; Use it with caution.
+ ; Note: A value of 0 indicates no limit
+@@ -69,21 +77,21 @@
+ ; process.max = 128
+
+ ; Specify the nice(2) priority to apply to the master process (only if set)
+-; The value can vary from -19 (highest priority) to 20 (lowest priority)
++; The value can vary from -19 (highest priority) to 20 (lower priority)
+ ; Note: - It will only work if the FPM master process is launched as root
+ ;       - The pool process will inherit the master process priority
+-;         unless specified otherwise
++;         unless it specified otherwise
+ ; Default Value: no set
+ ; process.priority = -19
+
+ ; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
+ ; Default Value: yes
+ ;daemonize = yes
+-
++
+ ; Set open file descriptor rlimit for the master process.
+ ; Default Value: system defined value
+ ;rlimit_files = 1024
+-
++
+ ; Set max core size rlimit for the master process.
+ ; Possible Values: 'unlimited' or an integer greater or equal to 0
+ ; Default Value: system defined value
+@@ -99,8 +107,8 @@
+ ; Default Value: not set (auto detection)
+ ;events.mechanism = epoll
+
+-; When FPM is built with systemd integration, specify the interval,
+-; in seconds, between health report notification to systemd.
++; When FPM is build with systemd integration, specify the interval,
++; in second, between health report notification to systemd.
+ ; Set to 0 to disable.
+ ; Available Units: s(econds), m(inutes), h(ours)
+ ; Default Unit: seconds
+@@ -108,7 +116,7 @@
+ ;systemd_interval = 10
+
+ ;;;;;;;;;;;;;;;;;;;;
+-; Pool Definitions ;
++; Pool Definitions ;
+ ;;;;;;;;;;;;;;;;;;;;
+
+ ; Multiple pools of child processes may be started with different listening
+@@ -116,10 +124,414 @@
+ ; used in logs and stats. There is no limitation on the number of pools which
+ ; FPM can handle. Your system will tell you anyway :)
+
+-; Include one or more files. If glob(3) exists, it is used to include a bunch of
+-; files from a glob(3) pattern. This directive can be used everywhere in the
+-; file.
+-; Relative path can also be used. They will be prefixed by:
+-;  - the global prefix if it's been set (-p argument)
+-;  - @prefix@ otherwise
+-include=@php_fpm_sysconfdir@/php-fpm.d/*.conf
++; Start a new pool named 'www'.
++; the variable $pool can we used in any directive and will be replaced by the
++; pool name ('www' here)
++[www]
++
++; Per pool prefix
++; It only applies on the following directives:
++; - 'access.log'
++; - 'slowlog'
++; - 'listen' (unixsocket)
++; - 'chroot'
++; - 'chdir'
++; - 'php_values'
++; - 'php_admin_values'
++; When not set, the global prefix (or @php_fpm_prefix@) applies instead.
++; Note: This directive can also be relative to the global prefix.
++; Default Value: none
++;prefix = /path/to/pools/$pool
++
++; Unix user/group of processes
++; Note: The user is mandatory. If the group is not set, the default user's group
++;       will be used.
++user = @php_fpm_user@
++group = @php_fpm_group@
++
++; The address on which to accept FastCGI requests.
++; Valid syntaxes are:
++;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
++;                            a specific port;
++;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
++;                            a specific port;
++;   'port'                 - to listen on a TCP socket to all IPv4 addresses on a
++;                            specific port;
++;   '[::]:port'            - to listen on a TCP socket to all addresses
++;                            (IPv6 and IPv4-mapped) on a specific port;
++;   '/path/to/unix/socket' - to listen on a unix socket.
++; Note: This value is mandatory.
++listen = /var/www/run/php-fpm.sock
++
++; Set listen(2) backlog.
++; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
++;listen.backlog = 65535
++
++; Set permissions for unix socket, if one is used. In Linux, read/write
++; permissions must be set in order to allow connections from a web server. Many
++; 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
++; 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
++;listen.acl_users =
++;listen.acl_groups =
++
++; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
++; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
++; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
++; must be separated by a comma. If this value is left blank, connections will be
++; accepted from any ip address.
++; Default Value: any
++;listen.allowed_clients = 127.0.0.1
++
++; Specify the nice(2) priority to apply to the pool processes (only if set)
++; The value can vary from -19 (highest priority) to 20 (lower priority)
++; Note: - It will only work if the FPM master process is launched as root
++;       - The pool processes will inherit the master process priority
++;         unless it specified otherwise
++; Default Value: no set
++; process.priority = -19
++
++; Choose how the process manager will control the number of child processes.
++; Possible Values:
++;   static  - a fixed number (pm.max_children) of child processes;
++;   dynamic - the number of child processes are set dynamically based on the
++;             following directives. With this process management, there will be
++;             always at least 1 children.
++;             pm.max_children      - the maximum number of children that can
++;                                    be alive at the same time.
++;             pm.start_servers     - the number of children created on startup.
++;             pm.min_spare_servers - the minimum number of children in 'idle'
++;                                    state (waiting to process). If the number
++;                                    of 'idle' processes is less than this
++;                                    number then some children will be created.
++;             pm.max_spare_servers - the maximum number of children in 'idle'
++;                                    state (waiting to process). If the number
++;                                    of 'idle' processes is greater than this
++;                                    number then some children will be killed.
++;  ondemand - no children are created at startup. Children will be forked when
++;             new requests will connect. The following parameter are used:
++;             pm.max_children           - the maximum number of children that
++;                                         can be alive at the same time.
++;             pm.process_idle_timeout   - The number of seconds after which
++;                                         an idle process will be killed.
++; Note: This value is mandatory.
++pm = dynamic
++
++; The number of child processes to be created when pm is set to 'static' and the
++; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
++; This value sets the limit on the number of simultaneous requests that will be
++; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
++; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
++; CGI. The below defaults are based on a server without much resources. Don't
++; forget to tweak pm.* to fit your needs.
++; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
++; Note: This value is mandatory.
++pm.max_children = 5
++
++; The number of child processes created on startup.
++; Note: Used only when pm is set to 'dynamic'
++; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
++pm.start_servers = 2
++
++; The desired minimum number of idle server processes.
++; Note: Used only when pm is set to 'dynamic'
++; Note: Mandatory when pm is set to 'dynamic'
++pm.min_spare_servers = 1
++
++; The desired maximum number of idle server processes.
++; Note: Used only when pm is set to 'dynamic'
++; Note: Mandatory when pm is set to 'dynamic'
++pm.max_spare_servers = 3
++
++; The number of seconds after which an idle process will be killed.
++; Note: Used only when pm is set to 'ondemand'
++; Default Value: 10s
++;pm.process_idle_timeout = 10s;
++
++; The number of requests each child process should execute before respawning.
++; This can be useful to work around memory leaks in 3rd party libraries. For
++; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
++; Default Value: 0
++;pm.max_requests = 500
++
++; The URI to view the FPM status page. If this value is not set, no URI will be
++; recognized as a status page. It shows the following informations:
++;   pool                 - the name of the pool;
++;   process manager      - static, dynamic or ondemand;
++;   start time           - the date and time FPM has started;
++;   start since          - number of seconds since FPM has started;
++;   accepted conn        - the number of request accepted by the pool;
++;   listen queue         - the number of request in the queue of pending
++;                          connections (see backlog in listen(2));
++;   max listen queue     - the maximum number of requests in the queue
++;                          of pending connections since FPM has started;
++;   listen queue len     - the size of the socket queue of pending connections;
++;   idle processes       - the number of idle processes;
++;   active processes     - the number of active processes;
++;   total processes      - the number of idle + active processes;
++;   max active processes - the maximum number of active processes since FPM
++;                          has started;
++;   max children reached - number of times, the process limit has been reached,
++;                          when pm tries to start more children (works only for
++;                          pm 'dynamic' and 'ondemand');
++; Value are updated in real time.
++; Example output:
++;   pool:                 www
++;   process manager:      static
++;   start time:           01/Jul/2011:17:53:49 +0200
++;   start since:          62636
++;   accepted conn:        190460
++;   listen queue:         0
++;   max listen queue:     1
++;   listen queue len:     42
++;   idle processes:       4
++;   active processes:     11
++;   total processes:      15
++;   max active processes: 12
++;   max children reached: 0
++;
++; By default the status page output is formatted as text/plain. Passing either
++; 'html', 'xml' or 'json' in the query string will return the corresponding
++; output syntax. Example:
++;   http://www.foo.bar/status
++;   http://www.foo.bar/status?json
++;   http://www.foo.bar/status?html
++;   http://www.foo.bar/status?xml
++;
++; By default the status page only outputs short status. Passing 'full' in the
++; query string will also return status for each pool process.
++; Example:
++;   http://www.foo.bar/status?full
++;   http://www.foo.bar/status?json&full
++;   http://www.foo.bar/status?html&full
++;   http://www.foo.bar/status?xml&full
++; The Full status returns for each process:
++;   pid                  - the PID of the process;
++;   state                - the state of the process (Idle, Running, ...);
++;   start time           - the date and time the process has started;
++;   start since          - the number of seconds since the process has started;
++;   requests             - the number of requests the process has served;
++;   request duration     - the duration in µs of the requests;
++;   request method       - the request method (GET, POST, ...);
++;   request URI          - the request URI with the query string;
++;   content length       - the content length of the request (only with POST);
++;   user                 - the user (PHP_AUTH_USER) (or '-' if not set);
++;   script               - the main script called (or '-' if not set);
++;   last request cpu     - the %cpu the last request consumed
++;                          it's always 0 if the process is not in Idle state
++;                          because CPU calculation is done when the request
++;                          processing has terminated;
++;   last request memory  - the max amount of memory the last request consumed
++;                          it's always 0 if the process is not in Idle state
++;                          because memory calculation is done when the request
++;                          processing has terminated;
++; If the process is in Idle state, then informations are related to the
++; last request the process has served. Otherwise informations are related to
++; the current request being served.
++; Example output:
++;   ************************
++;   pid:                  31330
++;   state:                Running
++;   start time:           01/Jul/2011:17:53:49 +0200
++;   start since:          63087
++;   requests:             12808
++;   request duration:     1250261
++;   request method:       GET
++;   request URI:          /test_mem.php?N=10000
++;   content length:       0
++;   user:                 -
++;   script:               /home/fat/web/docs/php/test_mem.php
++;   last request cpu:     0.00
++;   last request memory:  0
++;
++; Note: There is a real-time FPM status monitoring sample web page available
++;       It's available in: @EXPANDED_DATADIR@/fpm/status.html
++;
++; Note: The value must start with a leading slash (/). The value can be
++;       anything, but it may not be a good idea to use the .php extension or it
++;       may conflict with a real PHP file.
++; Default Value: not set
++;pm.status_path = /status
++
++; The ping URI to call the monitoring page of FPM. If this value is not set, no
++; URI will be recognized as a ping page. This could be used to test from outside
++; that FPM is alive and responding, or to
++; - create a graph of FPM availability (rrd or such);
++; - remove a server from a group if it is not responding (load balancing);
++; - trigger alerts for the operating team (24/7).
++; Note: The value must start with a leading slash (/). The value can be
++;       anything, but it may not be a good idea to use the .php extension or it
++;       may conflict with a real PHP file.
++; Default Value: not set
++;ping.path = /ping
++
++; This directive may be used to customize the response of a ping request. The
++; response is formatted as text/plain with a 200 response code.
++; Default Value: pong
++;ping.response = pong
++
++; The access log file
++; Default: not set
++;access.log = log/$pool.access.log
++
++; The access log format.
++; The following syntax is allowed
++;  %%: the '%' character
++;  %C: %CPU used by the request
++;      it can accept the following format:
++;      - %{user}C for user CPU only
++;      - %{system}C for system CPU only
++;      - %{total}C  for user + system CPU (default)
++;  %d: time taken to serve the request
++;      it can accept the following format:
++;      - %{seconds}d (default)
++;      - %{miliseconds}d
++;      - %{mili}d
++;      - %{microseconds}d
++;      - %{micro}d
++;  %e: an environment variable (same as $_ENV or $_SERVER)
++;      it must be associated with embraces to specify the name of the env
++;      variable. Some exemples:
++;      - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
++;      - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
++;  %f: script filename
++;  %l: content-length of the request (for POST request only)
++;  %m: request method
++;  %M: peak of memory allocated by PHP
++;      it can accept the following format:
++;      - %{bytes}M (default)
++;      - %{kilobytes}M
++;      - %{kilo}M
++;      - %{megabytes}M
++;      - %{mega}M
++;  %n: pool name
++;  %o: output header
++;      it must be associated with embraces to specify the name of the header:
++;      - %{Content-Type}o
++;      - %{X-Powered-By}o
++;      - %{Transfert-Encoding}o
++;      - ....
++;  %p: PID of the child that serviced the request
++;  %P: PID of the parent of the child that serviced the request
++;  %q: the query string
++;  %Q: the '?' character if query string exists
++;  %r: the request URI (without the query string, see %q and %Q)
++;  %R: remote IP address
++;  %s: status (response code)
++;  %t: server time the request was received
++;      it can accept a strftime(3) format:
++;      %d/%b/%Y:%H:%M:%S %z (default)
++;  %T: time the log has been written (the request has finished)
++;      it can accept a strftime(3) format:
++;      %d/%b/%Y:%H:%M:%S %z (default)
++;  %u: remote user
++;
++; Default: "%R - %u %t \"%m %r\" %s"
++;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
++
++; The log file for slow requests
++; Default Value: not set
++; Note: slowlog is mandatory if request_slowlog_timeout is set
++;slowlog = log/$pool.log.slow
++
++; The timeout for serving a single request after which a PHP backtrace will be
++; dumped to the 'slowlog' file. A value of '0s' means 'off'.
++; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
++; Default Value: 0
++;request_slowlog_timeout = 0
++
++; The timeout for serving a single request after which the worker process will
++; be killed. This option should be used when the 'max_execution_time' ini option
++; does not stop script execution for some reason. A value of '0' means 'off'.
++; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
++; Default Value: 0
++;request_terminate_timeout = 0
++
++; Set open file descriptor rlimit.
++; Default Value: system defined value
++;rlimit_files = 1024
++
++; Set max core size rlimit.
++; Possible Values: 'unlimited' or an integer greater or equal to 0
++; Default Value: system defined value
++;rlimit_core = 0
++
++; Chroot to this directory at the start. This value must be defined as an
++; absolute path. When this value is not set, chroot is not used.
++; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
++; of its subdirectories. If the pool prefix is not set, the global prefix
++; will be used instead.
++; Note: chrooting is a great security feature and should be used whenever
++;       possible. However, all PHP paths will be relative to the chroot
++;       (error_log, sessions.save_path, ...).
++; Default Value: not set
++chroot = /var/www
++
++; Chdir to this directory at the start.
++; Note: relative path can be used.
++; Default Value: current directory or / when chroot
++;chdir = /var/www
++
++; Redirect worker stdout and stderr into main error log. If not set, stdout and
++; stderr will be redirected to /dev/null according to FastCGI specs.
++; Note: on highloaded environement, this can cause some delay in the page
++; process time (several ms).
++; Default Value: no
++;catch_workers_output = yes
++
++; Clear environment in FPM workers
++; Prevents arbitrary environment variables from reaching FPM worker processes
++; by clearing the environment in workers before env vars specified in this
++; pool configuration are added.
++; Setting to "no" will make all environment variables available to PHP code
++; via getenv(), $_ENV and $_SERVER.
++; Default Value: yes
++;clear_env = no
++
++; Limits the extensions of the main script FPM will allow to parse. This can
++; prevent configuration mistakes on the web server side. You should only limit
++; FPM to .php extensions to prevent malicious users to use other extensions to
++; exectute php code.
++; Note: set an empty value to allow all extensions.
++; Default Value: .php
++;security.limit_extensions = .php .php3 .php4 .php5
++
++; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
++; the current environment.
++; Default Value: clean env
++;env[HOSTNAME] = $HOSTNAME
++;env[PATH] = /usr/local/bin:/usr/bin:/bin
++;env[TMP] = /tmp
++;env[TMPDIR] = /tmp
++;env[TEMP] = /tmp
++
++; Additional php.ini defines, specific to this pool of workers. These settings
++; overwrite the values previously defined in the php.ini. The directives are the
++; same as the PHP SAPI:
++;   php_value/php_flag             - you can set classic ini defines which can
++;                                    be overwritten from PHP call 'ini_set'.
++;   php_admin_value/php_admin_flag - these directives won't be overwritten by
++;                                     PHP call 'ini_set'
++; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
++
++; Defining 'extension' will load the corresponding shared extension from
++; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
++; overwrite previously defined php.ini values, but will append the new value
++; instead.
++
++; Note: path INI options can be relative and will be expanded with the prefix
++; (pool, global or @prefix@)
++
++; Default Value: nothing is defined by default except the values in php.ini and
++;                specified at startup with the -d argument
++;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f [hidden email]
++;php_flag[display_errors] = off
++;php_admin_value[error_log] = /var/log/fpm-php.www.log
++;php_admin_flag[log_errors] = on
++;php_admin_value[memory_limit] = 32M
Index: lang/php/7.1/patches/patch-sapi_fpm_www_conf_in
===================================================================
RCS file: lang/php/7.1/patches/patch-sapi_fpm_www_conf_in
diff -N lang/php/7.1/patches/patch-sapi_fpm_www_conf_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-sapi_fpm_www_conf_in 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,21 @@
+$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)
+@@ -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.
Index: lang/php/7.1/patches/patch-scripts_Makefile_frag
===================================================================
RCS file: lang/php/7.1/patches/patch-scripts_Makefile_frag
diff -N lang/php/7.1/patches/patch-scripts_Makefile_frag
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-scripts_Makefile_frag 10 Aug 2017 20:03:52 -0000
@@ -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 \
Index: lang/php/7.1/patches/patch-scripts_php-config_in
===================================================================
RCS file: lang/php/7.1/patches/patch-scripts_php-config_in
diff -N lang/php/7.1/patches/patch-scripts_php-config_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-scripts_php-config_in 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,33 @@
+$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 Tue May  9 14:29:42 2017
++++ scripts/php-config.in Sun Jun  4 20:06:49 2017
+@@ -1,13 +1,13 @@
+ #! /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"
+-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"
++include_dir="@PEAR_INSTALLDIR@/include"
++includes="-I/usr/local/include -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@"
+ extension_dir='@EXTENSION_DIR@'
+@@ -24,10 +24,10 @@ 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
Index: lang/php/7.1/patches/patch-scripts_phpize_in
===================================================================
RCS file: lang/php/7.1/patches/patch-scripts_phpize_in
diff -N lang/php/7.1/patches/patch-scripts_phpize_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-scripts_phpize_in 10 Aug 2017 20:03:52 -0000
@@ -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@"
+
Index: lang/php/7.1/patches/patch-scripts_phpize_m4
===================================================================
RCS file: lang/php/7.1/patches/patch-scripts_phpize_m4
diff -N lang/php/7.1/patches/patch-scripts_phpize_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/patches/patch-scripts_phpize_m4 10 Aug 2017 20:03:52 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- scripts/phpize.m4.orig.port Fri Jun  2 21:36:25 2017
++++ scripts/phpize.m4 Fri Jun  2 21:36:41 2017
+@@ -36,7 +36,7 @@ PHP_SHLIB_SUFFIX_NAMES
+
+ dnl Find php-config script
+ PHP_ARG_WITH(php-config,,
+-[  --with-php-config=PATH  Path to php-config [php-config]], php-config, no)
++[  --with-php-config=PATH  Path to php-config [php-config]], php-config-${PV}, no)
+
+ dnl For BC
+ PHP_CONFIG=$PHP_PHP_CONFIG
Index: lang/php/7.1/pkg/PLIST-apxs2
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-apxs2
diff -N lang/php/7.1/pkg/PLIST-apxs2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-apxs2 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-apxs2->=7.1,<7.2
+lib/php-${PV}/libphp7.so
+share/examples/php-${PV}/php.conf
+@sample /var/www/conf/modules.sample/php-${PV}.conf
Index: lang/php/7.1/pkg/PLIST-bcmath
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-bcmath
diff -N lang/php/7.1/pkg/PLIST-bcmath
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-bcmath 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-bcmath->=7.1,<7.2
+lib/php-${PV}/modules/bcmath.so
+share/examples/php-${PV}/bcmath.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/bcmath.ini
Index: lang/php/7.1/pkg/PLIST-bz2
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-bz2
diff -N lang/php/7.1/pkg/PLIST-bz2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-bz2 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-bz2,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-bz2->=7.1,<7.2
+lib/php-${PV}/modules/bz2.so
+share/examples/php-${PV}/bz2.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/bz2.ini
Index: lang/php/7.1/pkg/PLIST-calendar
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-calendar
diff -N lang/php/7.1/pkg/PLIST-calendar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-calendar 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-calendar->=7.1,<7.2
+lib/php-${PV}/modules/calendar.so
+share/examples/php-${PV}/calendar.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/calendar.ini
Index: lang/php/7.1/pkg/PLIST-cgi
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-cgi
diff -N lang/php/7.1/pkg/PLIST-cgi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-cgi 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-cgi->=7.1,<7.2
+@bin bin/php-cgi-${PV}
+@man man/man1/php-cgi-${PV}.1
Index: lang/php/7.1/pkg/PLIST-cli
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-cli
diff -N lang/php/7.1/pkg/PLIST-cli
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-cli 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-cli->=7.1,<7.2
+@bin bin/php-${PV}
+@man man/man1/php-${PV}.1
+share/php-${PV}/include/sapi/
+share/php-${PV}/include/sapi/cli/
+share/php-${PV}/include/sapi/cli/cli.h
Index: lang/php/7.1/pkg/PLIST-ctype
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-ctype
diff -N lang/php/7.1/pkg/PLIST-ctype
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-ctype 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-ctype->=7.1,<7.2
+lib/php-${PV}/modules/ctype.so
+share/examples/php-${PV}/ctype.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ctype.ini
Index: lang/php/7.1/pkg/PLIST-curl
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-curl
diff -N lang/php/7.1/pkg/PLIST-curl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-curl 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-curl,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-curl->=7.1,<7.2
+lib/php-${PV}/modules/curl.so
+share/examples/php-${PV}/curl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/curl.ini
Index: lang/php/7.1/pkg/PLIST-dba
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-dba
diff -N lang/php/7.1/pkg/PLIST-dba
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-dba 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-dba,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-dba->=7.1,<7.2
+lib/php-${PV}/modules/dba.so
+share/examples/php-${PV}/dba.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/dba.ini
Index: lang/php/7.1/pkg/PLIST-dbg
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-dbg
diff -N lang/php/7.1/pkg/PLIST-dbg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-dbg 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-dbg->=7.1,<7.2
+@bin bin/phpdbg-${PV}
+@man man/man1/phpdbg-${PV}.1
Index: lang/php/7.1/pkg/PLIST-dom
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-dom
diff -N lang/php/7.1/pkg/PLIST-dom
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-dom 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-dom->=7.1,<7.2
+lib/php-${PV}/modules/dom.so
+share/examples/php-${PV}/dom.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/dom.ini
+share/php-${PV}/include/ext/dom/
+share/php-${PV}/include/ext/dom/xml_common.h
Index: lang/php/7.1/pkg/PLIST-enchant
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-enchant
diff -N lang/php/7.1/pkg/PLIST-enchant
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-enchant 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-enchant->=7.1,<7.2
+lib/php-${PV}/modules/enchant.so
+share/examples/php-${PV}/enchant.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/enchant.ini
Index: lang/php/7.1/pkg/PLIST-exif
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-exif
diff -N lang/php/7.1/pkg/PLIST-exif
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-exif 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-exif->=7.1,<7.2
+lib/php-${PV}/modules/exif.so
+share/examples/php-${PV}/exif.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/exif.ini
Index: lang/php/7.1/pkg/PLIST-fileinfo
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-fileinfo
diff -N lang/php/7.1/pkg/PLIST-fileinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-fileinfo 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-fileinfo->=7.1,<7.2
+lib/php-${PV}/modules/fileinfo.so
+share/examples/php-${PV}/fileinfo.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/fileinfo.ini
Index: lang/php/7.1/pkg/PLIST-fpm
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-fpm
diff -N lang/php/7.1/pkg/PLIST-fpm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-fpm 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-fpm->=7.1,<7.2
+@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
Index: lang/php/7.1/pkg/PLIST-ftp
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-ftp
diff -N lang/php/7.1/pkg/PLIST-ftp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-ftp 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-ftp->=7.1,<7.2
+lib/php-${PV}/modules/ftp.so
+share/examples/php-${PV}/ftp.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ftp.ini
Index: lang/php/7.1/pkg/PLIST-gd
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-gd
diff -N lang/php/7.1/pkg/PLIST-gd
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-gd 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,24 @@
+@comment $OpenBSD: PLIST-gd,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-gd->=7.1,<7.2
+lib/php-${PV}/modules/gd.so
+share/examples/php-${PV}/gd.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/gd.ini
+share/php-${PV}/include/ext/gd/
+share/php-${PV}/include/ext/gd/gd_compat.h
+share/php-${PV}/include/ext/gd/gdcache.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
Index: lang/php/7.1/pkg/PLIST-gettext
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-gettext
diff -N lang/php/7.1/pkg/PLIST-gettext
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-gettext 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-gettext->=7.1,<7.2
+lib/php-${PV}/modules/gettext.so
+share/examples/php-${PV}/gettext.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/gettext.ini
Index: lang/php/7.1/pkg/PLIST-gmp
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-gmp
diff -N lang/php/7.1/pkg/PLIST-gmp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-gmp 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-gmp,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-gmp->=7.1,<7.2
+lib/php-${PV}/modules/gmp.so
+share/examples/php-${PV}/gmp.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/gmp.ini
Index: lang/php/7.1/pkg/PLIST-iconv
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-iconv
diff -N lang/php/7.1/pkg/PLIST-iconv
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-iconv 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,19 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-iconv->=7.1,<7.2
+lib/php-${PV}/modules/iconv.so
+share/examples/php-${PV}/iconv.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/iconv.ini
+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
Index: lang/php/7.1/pkg/PLIST-imap
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-imap
diff -N lang/php/7.1/pkg/PLIST-imap
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-imap 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD: PLIST-imap,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-imap->=7.1,<7.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
Index: lang/php/7.1/pkg/PLIST-intl
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-intl
diff -N lang/php/7.1/pkg/PLIST-intl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-intl 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-intl,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-intl->=7.1,<7.2
+lib/php-${PV}/modules/intl.so
+share/examples/php-${PV}/intl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/intl.ini
Index: lang/php/7.1/pkg/PLIST-json
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-json
diff -N lang/php/7.1/pkg/PLIST-json
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-json 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-json->=7.1,<7.2
+lib/php-${PV}/modules/json.so
+share/examples/php-${PV}/json.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/json.ini
+share/php-${PV}/include/ext/json/
+share/php-${PV}/include/ext/json/php_json.h
Index: lang/php/7.1/pkg/PLIST-ldap
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-ldap
diff -N lang/php/7.1/pkg/PLIST-ldap
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-ldap 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-ldap,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-ldap->=7.1,<7.2
+lib/php-${PV}/modules/ldap.so
+share/examples/php-${PV}/ldap.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ldap.ini
Index: lang/php/7.1/pkg/PLIST-main
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-main
diff -N lang/php/7.1/pkg/PLIST-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-main 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,267 @@
+@comment $OpenBSD: PLIST-main,v 1.6 2017/04/25 11:21:14 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php->=7.1,<7.2
+@extraunexec rm -f ${SYSCONFDIR}/php-${PV}/php-${PV}.sample/*
+@mode 1700
+@owner www
+@group www
+@sample /var/www/tmp/
+@mode
+@owner
+@group
+bin/php-config-${PV}
+bin/phpize-${PV}
+lib/php-${PV}/
+lib/php-${PV}/modules/
+@man man/man1/php-config-${PV}.1
+@man man/man1/phpize-${PV}.1
+share/doc/pkg-readmes/${FULLPKGNAME}
+share/examples/php-${PV}/
+@sample /var/www/conf/modules.sample/
+@sample ${SYSCONFDIR}/php-${PV}.sample/
+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/ax_check_compile_flag.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_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_ast.h
+share/php-${PV}/include/Zend/zend_bitset.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/filter/
+share/php-${PV}/include/ext/filter/php_filter.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/libxml/
+share/php-${PV}/include/ext/libxml/php_libxml.h
+share/php-${PV}/include/ext/pcre/
+share/php-${PV}/include/ext/pcre/php_pcre.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/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/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/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
+@sample ${SYSCONFDIR}/php-${PV}/
Index: lang/php/7.1/pkg/PLIST-mbstring
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-mbstring
diff -N lang/php/7.1/pkg/PLIST-mbstring
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-mbstring 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,29 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-mbstring->=7.1,<7.2
+lib/php-${PV}/modules/mbstring.so
+share/examples/php-${PV}/mbstring.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mbstring.ini
+share/php-${PV}/include/ext/mbstring/
+share/php-${PV}/include/ext/mbstring/mbstring.h
+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/php_mbregex.h
+share/php-${PV}/include/ext/mbstring/php_onig_compat.h
Index: lang/php/7.1/pkg/PLIST-mcrypt
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-mcrypt
diff -N lang/php/7.1/pkg/PLIST-mcrypt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-mcrypt 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-mcrypt,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-mcrypt->=7.1,<7.2
+lib/php-${PV}/modules/mcrypt.so
+share/examples/php-${PV}/mcrypt.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mcrypt.ini
Index: lang/php/7.1/pkg/PLIST-mysqli
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-mysqli
diff -N lang/php/7.1/pkg/PLIST-mysqli
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-mysqli 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD: PLIST-mysqli,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-mysqli->=7.1,<7.2
+lib/php-${PV}/modules/mysqli.so
+share/examples/php-${PV}/mysqli.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mysqli.ini
+share/php-${PV}/include/ext/mysqli/
+share/php-${PV}/include/ext/mysqli/mysqli_mysqlnd.h
+share/php-${PV}/include/ext/mysqli/php_mysqli_structs.h
Index: lang/php/7.1/pkg/PLIST-mysqlnd
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-mysqlnd
diff -N lang/php/7.1/pkg/PLIST-mysqlnd
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-mysqlnd 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,27 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-mysqlnd->=7.1,<7.2
+lib/php-${PV}/modules/mysqlnd.so
+share/examples/php-${PV}/mysqlnd.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mysqlnd.ini
+share/php-${PV}/include/ext/mysqlnd/
+share/php-${PV}/include/ext/mysqlnd/config-win.h
+share/php-${PV}/include/ext/mysqlnd/mysql_float_to_double.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_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/php_mysqlnd.h
Index: lang/php/7.1/pkg/PLIST-odbc
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-odbc
diff -N lang/php/7.1/pkg/PLIST-odbc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-odbc 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-odbc,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-odbc->=7.1,<7.2
+lib/php-${PV}/modules/odbc.so
+share/examples/php-${PV}/odbc.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/odbc.ini
Index: lang/php/7.1/pkg/PLIST-opcache
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-opcache
diff -N lang/php/7.1/pkg/PLIST-opcache
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-opcache 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-opcache->=7.1,<7.2
+lib/php-${PV}/modules/opcache.so
+share/examples/php-${PV}/opcache.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini
Index: lang/php/7.1/pkg/PLIST-pcntl
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-pcntl
diff -N lang/php/7.1/pkg/PLIST-pcntl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-pcntl 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pcntl,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pcntl->=7.1,<7.2
+lib/php-${PV}/modules/pcntl.so
+share/examples/php-${PV}/pcntl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pcntl.ini
Index: lang/php/7.1/pkg/PLIST-pdo
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-pdo
diff -N lang/php/7.1/pkg/PLIST-pdo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-pdo 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,11 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo->=7.1,<7.2
+lib/php-${PV}/modules/pdo.so
+share/examples/php-${PV}/pdo.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo.ini
+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
Index: lang/php/7.1/pkg/PLIST-pdo_dblib
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-pdo_dblib
diff -N lang/php/7.1/pkg/PLIST-pdo_dblib
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-pdo_dblib 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pdo_dblib,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_dblib->=7.1,<7.2
+lib/php-${PV}/modules/pdo_dblib.so
+share/examples/php-${PV}/pdo_dblib.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_dblib.ini
Index: lang/php/7.1/pkg/PLIST-pdo_mysql
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-pdo_mysql
diff -N lang/php/7.1/pkg/PLIST-pdo_mysql
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-pdo_mysql 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pdo_mysql,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_mysql->=7.1,<7.2
+lib/php-${PV}/modules/pdo_mysql.so
+share/examples/php-${PV}/pdo_mysql.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_mysql.ini
Index: lang/php/7.1/pkg/PLIST-pdo_pgsql
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-pdo_pgsql
diff -N lang/php/7.1/pkg/PLIST-pdo_pgsql
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-pdo_pgsql 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pdo_pgsql,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_pgsql->=7.1,<7.2
+lib/php-${PV}/modules/pdo_pgsql.so
+share/examples/php-${PV}/pdo_pgsql.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_pgsql.ini
Index: lang/php/7.1/pkg/PLIST-pdo_sqlite
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-pdo_sqlite
diff -N lang/php/7.1/pkg/PLIST-pdo_sqlite
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-pdo_sqlite 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_sqlite->=7.1,<7.2
+lib/php-${PV}/modules/pdo_sqlite.so
+share/examples/php-${PV}/pdo_sqlite.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_sqlite.ini
Index: lang/php/7.1/pkg/PLIST-pgsql
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-pgsql
diff -N lang/php/7.1/pkg/PLIST-pgsql
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-pgsql 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pgsql,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pgsql->=7.1,<7.2
+lib/php-${PV}/modules/pgsql.so
+share/examples/php-${PV}/pgsql.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pgsql.ini
Index: lang/php/7.1/pkg/PLIST-phar
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-phar
diff -N lang/php/7.1/pkg/PLIST-phar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-phar 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,11 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-phar->=7.1,<7.2
+bin/phar-${PV}
+@man man/man1/phar-${PV}.1
+lib/php-${PV}/modules/phar.so
+share/examples/php-${PV}/phar.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/phar.ini
+share/php-${PV}/include/ext/phar/
+share/php-${PV}/include/ext/phar/php_phar.h
Index: lang/php/7.1/pkg/PLIST-posix
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-posix
diff -N lang/php/7.1/pkg/PLIST-posix
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-posix 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-posix->=7.1,<7.2
+lib/php-${PV}/modules/posix.so
+share/examples/php-${PV}/posix.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/posix.ini
Index: lang/php/7.1/pkg/PLIST-pspell
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-pspell
diff -N lang/php/7.1/pkg/PLIST-pspell
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-pspell 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pspell,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pspell->=7.1,<7.2
+lib/php-${PV}/modules/pspell.so
+share/examples/php-${PV}/pspell.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pspell.ini
Index: lang/php/7.1/pkg/PLIST-readline
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-readline
diff -N lang/php/7.1/pkg/PLIST-readline
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-readline 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-readline->=7.1,<7.2
+lib/php-${PV}/modules/readline.so
+share/examples/php-${PV}/readline.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/readline.ini
Index: lang/php/7.1/pkg/PLIST-shmop
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-shmop
diff -N lang/php/7.1/pkg/PLIST-shmop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-shmop 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-shmop,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-shmop->=7.1,<7.2
+lib/php-${PV}/modules/shmop.so
+share/examples/php-${PV}/shmop.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/shmop.ini
Index: lang/php/7.1/pkg/PLIST-simplexml
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-simplexml
diff -N lang/php/7.1/pkg/PLIST-simplexml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-simplexml 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-simplexml->=7.1,<7.2
+lib/php-${PV}/modules/simplexml.so
+share/examples/php-${PV}/simplexml.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/simplexml.ini
+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
Index: lang/php/7.1/pkg/PLIST-snmp
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-snmp
diff -N lang/php/7.1/pkg/PLIST-snmp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-snmp 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-snmp,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-snmp->=7.1,<7.2
+lib/php-${PV}/modules/snmp.so
+share/examples/php-${PV}/snmp.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/snmp.ini
Index: lang/php/7.1/pkg/PLIST-soap
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-soap
diff -N lang/php/7.1/pkg/PLIST-soap
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-soap 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-soap,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-soap->=7.1,<7.2
+lib/php-${PV}/modules/soap.so
+share/examples/php-${PV}/soap.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/soap.ini
Index: lang/php/7.1/pkg/PLIST-sockets
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-sockets
diff -N lang/php/7.1/pkg/PLIST-sockets
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-sockets 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sockets->=7.1,<7.2
+lib/php-${PV}/modules/sockets.so
+share/examples/php-${PV}/sockets.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sockets.ini
+share/php-${PV}/include/ext/sockets/
+share/php-${PV}/include/ext/sockets/php_sockets.h
Index: lang/php/7.1/pkg/PLIST-sqlite3
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-sqlite3
diff -N lang/php/7.1/pkg/PLIST-sqlite3
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-sqlite3 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sqlite3->=7.1,<7.2
+lib/php-${PV}/modules/sqlite3.so
+share/examples/php-${PV}/sqlite3.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sqlite3.ini
Index: lang/php/7.1/pkg/PLIST-sysvmsg
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-sysvmsg
diff -N lang/php/7.1/pkg/PLIST-sysvmsg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-sysvmsg 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvmsg->=7.1,<7.2
+lib/php-${PV}/modules/sysvmsg.so
+share/examples/php-${PV}/sysvmsg.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvmsg.ini
Index: lang/php/7.1/pkg/PLIST-sysvsem
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-sysvsem
diff -N lang/php/7.1/pkg/PLIST-sysvsem
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-sysvsem 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvsem->=7.1,<7.2
+lib/php-${PV}/modules/sysvsem.so
+share/examples/php-${PV}/sysvsem.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvsem.ini
Index: lang/php/7.1/pkg/PLIST-sysvshm
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-sysvshm
diff -N lang/php/7.1/pkg/PLIST-sysvshm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-sysvshm 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-sysvshm->=7.1,<7.2
+lib/php-${PV}/modules/sysvshm.so
+share/examples/php-${PV}/sysvshm.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sysvshm.ini
Index: lang/php/7.1/pkg/PLIST-tidy
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-tidy
diff -N lang/php/7.1/pkg/PLIST-tidy
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-tidy 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-tidy,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-tidy->=7.1,<7.2
+lib/php-${PV}/modules/tidy.so
+share/examples/php-${PV}/tidy.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/tidy.ini
Index: lang/php/7.1/pkg/PLIST-tokenizer
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-tokenizer
diff -N lang/php/7.1/pkg/PLIST-tokenizer
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-tokenizer 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-tokenizer->=7.1,<7.2
+lib/php-${PV}/modules/tokenizer.so
+share/examples/php-${PV}/tokenizer.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/tokenizer.ini
Index: lang/php/7.1/pkg/PLIST-wddx
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-wddx
diff -N lang/php/7.1/pkg/PLIST-wddx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-wddx 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-wddx->=7.1,<7.2
+lib/php-${PV}/modules/wddx.so
+share/examples/php-${PV}/wddx.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/wddx.ini
Index: lang/php/7.1/pkg/PLIST-xml
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-xml
diff -N lang/php/7.1/pkg/PLIST-xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-xml 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xml->=7.1,<7.2
+lib/php-${PV}/modules/xml.so
+share/examples/php-${PV}/xml.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xml.ini
+share/php-${PV}/include/ext/xml/
+share/php-${PV}/include/ext/xml/expat_compat.h
+share/php-${PV}/include/ext/xml/php_xml.h
Index: lang/php/7.1/pkg/PLIST-xmlreader
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-xmlreader
diff -N lang/php/7.1/pkg/PLIST-xmlreader
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-xmlreader 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlreader->=7.1,<7.2
+lib/php-${PV}/modules/xmlreader.so
+share/examples/php-${PV}/xmlreader.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlreader.ini
Index: lang/php/7.1/pkg/PLIST-xmlrpc
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-xmlrpc
diff -N lang/php/7.1/pkg/PLIST-xmlrpc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-xmlrpc 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-xmlrpc,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlrpc->=7.1,<7.2
+lib/php-${PV}/modules/xmlrpc.so
+share/examples/php-${PV}/xmlrpc.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlrpc.ini
Index: lang/php/7.1/pkg/PLIST-xmlwriter
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-xmlwriter
diff -N lang/php/7.1/pkg/PLIST-xmlwriter
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-xmlwriter 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlwriter->=7.1,<7.2
+lib/php-${PV}/modules/xmlwriter.so
+share/examples/php-${PV}/xmlwriter.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlwriter.ini
Index: lang/php/7.1/pkg/PLIST-xsl
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-xsl
diff -N lang/php/7.1/pkg/PLIST-xsl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-xsl 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-xsl,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-xsl->=7.1,<7.2
+lib/php-${PV}/modules/xsl.so
+share/examples/php-${PV}/xsl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xsl.ini
Index: lang/php/7.1/pkg/PLIST-zip
===================================================================
RCS file: lang/php/7.1/pkg/PLIST-zip
diff -N lang/php/7.1/pkg/PLIST-zip
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/PLIST-zip 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-zip,v 1.2 2016/06/29 16:14:42 espie Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-zip->=7.1,<7.2
+lib/php-${PV}/modules/zip.so
+share/examples/php-${PV}/zip.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/zip.ini
Index: lang/php/7.1/pkg/php71_fpm.rc
===================================================================
RCS file: lang/php/7.1/pkg/php71_fpm.rc
diff -N lang/php/7.1/pkg/php71_fpm.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/7.1/pkg/php71_fpm.rc 10 Aug 2017 20:03:53 -0000
@@ -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
Index: lang/php/files/DESCR-apxs2
===================================================================
RCS file: lang/php/files/DESCR-apxs2
diff -N lang/php/files/DESCR-apxs2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/files/DESCR-apxs2 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1 @@
+This is the PHP apache2 shared module.
Index: lang/php/files/DESCR-bcmath
===================================================================
RCS file: lang/php/files/DESCR-bcmath
diff -N lang/php/files/DESCR-bcmath
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/files/DESCR-bcmath 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,3 @@
+For arbitrary precision mathematics PHP offers the Binary Calculator
+which supports numbers of any size and precision up to
+2147483647-1 (or 0x7FFFFFFF-1) decimals, represented as strings.
Index: lang/php/files/DESCR-calendar
===================================================================
RCS file: lang/php/files/DESCR-calendar
diff -N lang/php/files/DESCR-calendar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/files/DESCR-calendar 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,11 @@
+The calendar extension presents a series of functions to simplify
+converting between different calendar formats. The intermediary or
+standard it is based on is the Julian Day Count. The Julian Day Count
+is a count of days starting from January 1st, 4713 B.C. To convert
+between calendar systems, you must first convert to Julian Day Count,
+then to the calendar system of your choice. Julian Day Count is very
+different from the Julian Calendar! For more information on Julian Day
+Count, visit http://www.hermetic.ch/cal_stud/jdn.htm. For more
+information on calendar systems visit
+http://www.fourmilab.ch/documents/calendar/. Excerpts from this page
+are included in these instructions, and are in quotes.
Index: lang/php/files/DESCR-cgi
===================================================================
RCS file: lang/php/files/DESCR-cgi
diff -N lang/php/files/DESCR-cgi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/files/DESCR-cgi 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1 @@
+CGI is the PHP FastCGI and CGI implementation.
Index: lang/php/files/DESCR-cli
===================================================================
RCS file: lang/php/files/DESCR-cli
diff -N lang/php/files/DESCR-cli
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/files/DESCR-cli 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1 @@
+The standard commandline interface for PHP
Index: lang/php/files/DESCR-ctype
===================================================================
RCS file: lang/php/files/DESCR-ctype
diff -N lang/php/files/DESCR-ctype
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/php/files/DESCR-ctype 10 Aug 2017 20:03:53 -0000
@@ -0,0 +1,3 @@
+The functions provided by this extension check whether a character or
+string falls into a certain character class according to the current
+locale.
Index: lang/php/files/DESCR-curl
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-curl,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-curl
--- lang/php/files/DESCR-curl 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ lang/php/files/DESCR-curl 10 Aug 2017 20:03:53 -0000
@@ -2,7 +2,7 @@ PHP supports libcurl, a library created
 allows you to connect and communicate to many different types of
 servers with many different types of protocols. libcurl currently
 supports the http, https, ftp, gopher, telnet, dict, file, and ldap
-protocols. libcurl also supports HTTPS certificates, HTTP POST,
-HTTP PUT, FTP uploading (this can also be done with PHP's ftp
-extension), HTTP form based upload, proxies, cookies, and user+password
+protocols. libcurl also supports HTTPS certificates, HTTP POST, HTTP
+PUT, FTP uploading (this can also be done with PHP's ftp extension),
+HTTP form based upload, proxies, cookies, and user+password
 authentication.
Index: lang/php/files/DESCR-dba
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-dba,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-dba
--- lang/php/files/DESCR-dba 27 Jun 2010 20:28:45 -0000 1.1.1.1
+++ lang/php/files/DESCR-dba 10 Aug 2017 20:03:53 -0000
@@ -3,6 +3,4 @@ databases.
 
 This is a general abstraction layer for several file-based databases.
 As such, functionality is limited to a common subset of features
-supported by modern databases such as Sleepycat Software's DB2.
-(This is not to be confused with IBM's DB2 software, which is
-supported through the ODBC functions.)
+supported by modern databases such as Oracle Berkeley DB.
Index: lang/php/files/DESCR-dbase
===================================================================
RCS file: /cvs/ports/lang/php/files/DESCR-dbase,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR