Provide PHP 7.4 packages.

The default version for use in PHP-based ports remains at 7.3.

lang/php/7.4/Makefile

@@ -0,0 +1,16 @@
+# $OpenBSD: Makefile,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+PORTROACH=	limit:^7\.4
+PHP_VERSION=	7.4.5
+PHP_PKGSPEC=	>=7.4,<7.5
+
+DEBUG_PACKAGES=		${BUILD_PACKAGES}
+
+BUILD_DEPENDS+=		devel/bison
+YACC=			bison
+
+#BUILD_DEPENDS+=		shells/bash
+#CONFIGURE_SCRIPT=	${LOCALBASE}/bin/bash configure
+CONFIGURE_ARGS+=	--without-valgrind
+
+.include <bsd.port.mk>

lang/php/7.4/distinfo

@@ -0,0 +1,2 @@
+SHA256 (php-7.4.5.tar.xz) = 0Fn9f1W9xNLq2hWgCil2aXAQ02Me9vgxScxSieHyPCw=
+SIZE (php-7.4.5.tar.xz) = 10271296

lang/php/7.4/patches/patch-build_php_m4

@@ -0,0 +1,16 @@
+$OpenBSD: patch-build_php_m4,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+bogus version in pkgconfig file
+
+Index: build/php.m4
+--- build/php.m4.orig
++++ build/php.m4
+@@ -1917,7 +1917,7 @@ dnl
+ AC_DEFUN([PHP_SETUP_OPENSSL],[
+   found_openssl=no
+ 
+-  PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0.1], [found_openssl=yes])
++  PKG_CHECK_MODULES([OPENSSL], [openssl], [found_openssl=yes])
+ 
+   if test "$found_openssl" = "yes"; then
+     PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)

lang/php/7.4/patches/patch-configure_ac

@@ -0,0 +1,50 @@
+$OpenBSD: patch-configure_ac,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+hunk 1: disable cpu opt; runtime crashes in at least the optimized
+avx2 b64decode and sse4.2 addslashes
+
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -542,12 +542,6 @@ PHP_CHECK_BUILTIN_CPU_INIT
+ dnl Check __builtin_cpu_supports
+ PHP_CHECK_BUILTIN_CPU_SUPPORTS
+ 
+-dnl Check instructions.
+-PHP_CHECK_CPU_SUPPORTS([ssse3])
+-PHP_CHECK_CPU_SUPPORTS([sse4.2])
+-PHP_CHECK_CPU_SUPPORTS([avx])
+-PHP_CHECK_CPU_SUPPORTS([avx2])
+-
+ dnl Check for structure members.
+ AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include <time.h>])
+ AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_rdev])
+@@ -1081,16 +1075,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
+@@ -1276,7 +1270,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

lang/php/7.4/patches/patch-ext_mysqlnd_config9_m4

@@ -0,0 +1,13 @@
+$OpenBSD: patch-ext_mysqlnd_config9_m4,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+Index: ext/mysqlnd/config9.m4
+--- ext/mysqlnd/config9.m4.orig
++++ ext/mysqlnd/config9.m4
+@@ -14,6 +14,7 @@ PHP_ARG_ENABLE([mysqlnd_compression_support],
+   [no])
+ 
+ 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_connection.c mysqlnd_alloc.c mysqlnd_charset.c mysqlnd_wireprotocol.c \

lang/php/7.4/patches/patch-main_php_h

@@ -0,0 +1,15 @@
+$OpenBSD: patch-main_php_h,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+Index: main/php.h
+--- main/php.h.orig
++++ main/php.h
+@@ -199,7 +199,9 @@ END_EXTERN_C()
+ # ifdef PHP_WIN32
+ typedef int socklen_t;
+ # else
++#   if !defined(__OpenBSD__)
+ typedef unsigned int socklen_t;
++#   endif
+ # endif
+ #endif
+ 

lang/php/7.4/patches/patch-main_php_ini_c

@@ -0,0 +1,14 @@
+$OpenBSD: patch-main_php_ini_c,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+Index: main/php_ini.c
+--- main/php_ini.c.orig
++++ main/php_ini.c
+@@ -609,7 +609,7 @@ int php_init_config(void)
+ 
+ 		/* If still no ini file found, search for php.ini file in search path */
+ 		if (!fp) {
+-			fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &opened_path);
++			fp = php_fopen_with_path("php-7.4.ini", "r", php_ini_search_path, &opened_path);
+ 			if (fp) {
+ 				filename = ZSTR_VAL(opened_path);
+ 			}

lang/php/7.4/patches/patch-php_ini-development

@@ -0,0 +1,61 @@
+$OpenBSD: patch-php_ini-development,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+Index: php.ini-development
+--- php.ini-development.orig
++++ php.ini-development
+@@ -729,11 +729,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
+ 
+@@ -755,6 +752,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)
+@@ -850,7 +848,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
+@@ -955,7 +953,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
+@@ -1061,16 +1059,6 @@ pdo_mysql.default_socket=
+ ;phar.cache_list =
+ 
+ [mail function]
+-; For Win32 only.
+-; http://php.net/smtp
+-SMTP = localhost
+-; http://php.net/smtp-port
+-smtp_port = 25
+-
+-; For Win32 only.
+-; http://php.net/sendmail-from
+-;sendmail_from = me@example.com
+-
+ ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
+ ; http://php.net/sendmail-path
+ ;sendmail_path =

lang/php/7.4/patches/patch-php_ini-production

@@ -0,0 +1,44 @@
+$OpenBSD: patch-php_ini-production,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+Index: php.ini-production
+--- php.ini-production.orig
++++ php.ini-production
+@@ -733,11 +733,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
+ 
+@@ -759,6 +756,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)
+@@ -854,7 +852,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
+@@ -959,7 +957,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

lang/php/7.4/patches/patch-sapi_cgi_cgi_main_c

@@ -0,0 +1,27 @@
+$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+Index: sapi/cgi/cgi_main.c
+--- sapi/cgi/cgi_main.c.orig
++++ sapi/cgi/cgi_main.c
+@@ -1752,6 +1752,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;
+@@ -1801,7 +1802,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 */

lang/php/7.4/patches/patch-sapi_cli_php_cli_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-sapi_cli_php_cli_c,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+Index: sapi/cli/php_cli.c
+--- sapi/cli/php_cli.c.orig
++++ sapi/cli/php_cli.c
+@@ -626,6 +626,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
+ 	int interactive=0;
+ 	const char *param_error=NULL;
+ 	int hide_argv = 0;
++	char *ini;
+ 
+ 	zend_try {
+ 

lang/php/7.4/patches/patch-sapi_fpm_fpm_fpm_atomic_h

@@ -0,0 +1,104 @@
+$OpenBSD: patch-sapi_fpm_fpm_fpm_atomic_h,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+Add support for mips
+Fix types for sparc64
+
+Index: sapi/fpm/fpm/fpm_atomic.h
+--- sapi/fpm/fpm/fpm_atomic.h.orig
++++ sapi/fpm/fpm/fpm_atomic.h
+@@ -75,10 +75,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;
+@@ -99,7 +99,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");
+ 
+@@ -116,7 +116,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");
+ 
+@@ -134,6 +134,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
+ 

lang/php/7.4/patches/patch-sapi_fpm_fpm_fpm_children_c

@@ -0,0 +1,17 @@
+$OpenBSD: patch-sapi_fpm_fpm_fpm_children_c,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+Index: sapi/fpm/fpm/fpm_children.c
+--- sapi/fpm/fpm/fpm_children.c.orig
++++ sapi/fpm/fpm/fpm_children.c
+@@ -256,9 +256,9 @@ void fpm_children_bury() /* {{{ */
+ 				if (!fpm_pctl_can_spawn_children()) {
+ 					severity = ZLOG_DEBUG;
+ 				}
+-				zlog(severity, "[pool %s] child %d exited %s after %ld.%06d seconds from start", child->wp->config->name, (int) pid, buf, tv2.tv_sec, (int) tv2.tv_usec);
++				zlog(severity, "[pool %s] child %d exited %s after %lld.%06d seconds from start", child->wp->config->name, (int) pid, buf, (long long)tv2.tv_sec, (int) tv2.tv_usec);
+ 			} else {
+-				zlog(ZLOG_DEBUG, "[pool %s] child %d has been killed by the process management after %ld.%06d seconds from start", child->wp->config->name, (int) pid, tv2.tv_sec, (int) tv2.tv_usec);
++				zlog(ZLOG_DEBUG, "[pool %s] child %d has been killed by the process management after %lld.%06d seconds from start", child->wp->config->name, (int) pid, (long long)tv2.tv_sec, (int) tv2.tv_usec);
+ 			}
+ 
+ 			fpm_child_close(child, 1 /* in event_loop */);

lang/php/7.4/patches/patch-sapi_fpm_www_conf_in

@@ -0,0 +1,37 @@
+$OpenBSD: patch-sapi_fpm_www_conf_in,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+Index: sapi/fpm/www.conf.in
+--- sapi/fpm/www.conf.in.orig
++++ sapi/fpm/www.conf.in
+@@ -33,7 +33,8 @@ 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
++; If using a TCP port, never expose this to a public network.
++listen = /var/www/run/php-fpm.sock
+ 
+ ; Set listen(2) backlog.
+ ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
+@@ -45,9 +46,9 @@ listen = 127.0.0.1:9000
+ ; and group can be specified either by name or by their numeric IDs.
+ ; 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
+@@ -366,7 +367,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.

lang/php/7.4/patches/patch-scripts_Makefile_frag

@@ -0,0 +1,16 @@
+$OpenBSD: patch-scripts_Makefile_frag,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+Index: scripts/Makefile.frag
+--- scripts/Makefile.frag.orig
++++ scripts/Makefile.frag
+@@ -2,8 +2,8 @@
+ # Build environment install
+ #
+ 
+-phpincludedir = $(includedir)/php
+-phpbuilddir = $(libdir)/build
++phpincludedir = $(peardir)/include
++phpbuilddir = $(peardir)/build
+ 
+ BUILD_FILES = \
+ 	scripts/phpize.m4 \

lang/php/7.4/patches/patch-scripts_php-config_in

@@ -0,0 +1,33 @@
+$OpenBSD: patch-scripts_php-config_in,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+Index: scripts/php-config.in
+--- scripts/php-config.in.orig
++++ scripts/php-config.in
+@@ -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@"
+@@ -26,10 +26,11 @@ ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@"
+ 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

lang/php/7.4/patches/patch-scripts_phpize_in

@@ -0,0 +1,20 @@
+$OpenBSD: patch-scripts_phpize_in,v 1.1 2020/04/21 20:38:31 sthen Exp $
+
+Index: scripts/phpize.in
+--- scripts/phpize.in.orig
++++ scripts/phpize.in
+@@ -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@"
+ 

lang/php/7.4/pkg/PLIST-apache

@@ -0,0 +1,8 @@
+@comment $OpenBSD: PLIST-apache,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-apache->=7.4,<7.5
+@so lib/php-${PV}/libphp7.so
+@sample ${MODPHP_CONFIG_PATH}/modules.sample/
+share/examples/php-${PV}/modphp.conf
+@sample ${MODPHP_CONFIG_PATH}/modules.sample/php-${PV}.conf

lang/php/7.4/pkg/PLIST-bz2

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-bz2,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-bz2->=7.4,<7.5
+@so lib/php-${PV}/modules/bz2.so
+share/examples/php-${PV}/bz2.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/bz2.ini

lang/php/7.4/pkg/PLIST-cgi

@@ -0,0 +1,6 @@
+@comment $OpenBSD: PLIST-cgi,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-cgi->=7.4,<7.5
+@bin bin/php-cgi-${PV}
+@man man/man1/php-cgi-${PV}.1

lang/php/7.4/pkg/PLIST-curl

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-curl,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-curl->=7.4,<7.5
+@so lib/php-${PV}/modules/curl.so
+share/examples/php-${PV}/curl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/curl.ini

lang/php/7.4/pkg/PLIST-dba

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-dba,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-dba->=7.4,<7.5
+@so lib/php-${PV}/modules/dba.so
+share/examples/php-${PV}/dba.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/dba.ini

lang/php/7.4/pkg/PLIST-dbg

@@ -0,0 +1,6 @@
+@comment $OpenBSD: PLIST-dbg,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-dbg->=7.4,<7.5
+@bin bin/phpdbg-${PV}
+@man man/man1/phpdbg-${PV}.1

lang/php/7.4/pkg/PLIST-enchant

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-enchant,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-enchant->=7.4,<7.5
+@so lib/php-${PV}/modules/enchant.so
+share/examples/php-${PV}/enchant.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/enchant.ini

lang/php/7.4/pkg/PLIST-gd

@@ -0,0 +1,10 @@
+@comment $OpenBSD: PLIST-gd,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-gd->=7.4,<7.5
+@so 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/php_gd.h

lang/php/7.4/pkg/PLIST-gmp

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-gmp,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-gmp->=7.4,<7.5
+@so lib/php-${PV}/modules/gmp.so
+share/examples/php-${PV}/gmp.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/gmp.ini

lang/php/7.4/pkg/PLIST-imap

@@ -0,0 +1,9 @@
+@comment $OpenBSD: PLIST-imap,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-imap->=7.4,<7.5
+@so 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

lang/php/7.4/pkg/PLIST-intl

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-intl,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-intl->=7.4,<7.5
+@so lib/php-${PV}/modules/intl.so
+share/examples/php-${PV}/intl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/intl.ini

lang/php/7.4/pkg/PLIST-ldap

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-ldap,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-ldap->=7.4,<7.5
+@so lib/php-${PV}/modules/ldap.so
+share/examples/php-${PV}/ldap.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/ldap.ini

lang/php/7.4/pkg/PLIST-main

@@ -0,0 +1,375 @@
+@comment $OpenBSD: PLIST-main,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php->=7.4,<7.5
+@extraunexec rm -f ${SYSCONFDIR}/php-${PV}.sample/*
+@extraunexec rm -f ${SYSCONFDIR}/php-fpm.d/*
+@mode 1700
+@owner www
+@group www
+@sample ${CHROOT_DIR}/tmp/
+@mode
+@owner
+@group
+@rcscript ${RCDIR}/php${SV}_fpm
+bin/phar-${PV}
+@bin bin/php-${PV}
+bin/php-config-${PV}
+bin/phpize-${PV}
+lib/php-${PV}/
+lib/php-${PV}/modules/
+@so lib/php-${PV}/modules/opcache.so
+@man man/man1/phar-${PV}.1
+@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/${PKGSTEM}
+share/examples/php-${PV}/
+@sample ${SYSCONFDIR}/php-${PV}.sample/
+@sample ${SYSCONFDIR}/php-fpm.d/
+share/examples/php-${PV}/opcache.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini
+share/examples/php-${PV}/php-fpm.conf
+@sample ${SYSCONFDIR}/php-fpm.conf
+share/examples/php-${PV}/php.ini-development
+share/examples/php-${PV}/php.ini-production
+@sample ${SYSCONFDIR}/php-${PV}.ini
+share/php-${PV}/
+share/php-${PV}/build/
+share/php-${PV}/build/Makefile.global
+share/php-${PV}/build/ax_check_compile_flag.m4
+share/php-${PV}/build/ax_gcc_func_attribute.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/php.m4
+share/php-${PV}/build/php_cxx_compile_stdcxx.m4
+share/php-${PV}/build/phpize.m4
+share/php-${PV}/build/pkg.m4
+share/php-${PV}/build/run-tests.php
+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/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.w32.h
+share/php-${PV}/include/Zend/zend_constants.h
+share/php-${PV}/include/Zend/zend_cpuinfo.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_map_ptr.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_smart_string.h
+share/php-${PV}/include/Zend/zend_smart_string_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_type_info.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_handlers.h
+share/php-${PV}/include/Zend/zend_vm_opcodes.h
+share/php-${PV}/include/Zend/zend_vm_trace_handlers.h
+share/php-${PV}/include/Zend/zend_vm_trace_map.h
+share/php-${PV}/include/Zend/zend_weakrefs.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/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/gmp/
+share/php-${PV}/include/ext/gmp/php_gmp_int.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_sha3.h
+share/php-${PV}/include/ext/hash/php_hash_snefru.h
+share/php-${PV}/include/ext/hash/php_hash_tiger.h
+share/php-${PV}/include/ext/hash/php_hash_whirlpool.h
+share/php-${PV}/include/ext/iconv/
+share/php-${PV}/include/ext/iconv/php_have_bsd_iconv.h
+share/php-${PV}/include/ext/iconv/php_have_glibc_iconv.h
+share/php-${PV}/include/ext/iconv/php_have_ibm_iconv.h
+share/php-${PV}/include/ext/iconv/php_have_iconv.h
+share/php-${PV}/include/ext/iconv/php_have_libiconv.h
+share/php-${PV}/include/ext/iconv/php_iconv.h
+share/php-${PV}/include/ext/iconv/php_iconv_aliased_libiconv.h
+share/php-${PV}/include/ext/iconv/php_iconv_broken_ignore.h
+share/php-${PV}/include/ext/iconv/php_iconv_supports_errno.h
+share/php-${PV}/include/ext/iconv/php_php_iconv_h_path.h
+share/php-${PV}/include/ext/iconv/php_php_iconv_impl.h
+share/php-${PV}/include/ext/json/
+share/php-${PV}/include/ext/json/php_json.h
+share/php-${PV}/include/ext/json/php_json_parser.h
+share/php-${PV}/include/ext/json/php_json_scanner.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/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_mysqlnd.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_auth.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_commands.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_connection.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_plugin.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_protocol_frame_codec.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_ps.h
+share/php-${PV}/include/ext/mysqlnd/mysqlnd_read_buffer.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_vio.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/php_pcre.h
+share/php-${PV}/include/ext/pdo/
+share/php-${PV}/include/ext/pdo/php_pdo.h
+share/php-${PV}/include/ext/pdo/php_pdo_driver.h
+share/php-${PV}/include/ext/pdo/php_pdo_error.h
+share/php-${PV}/include/ext/phar/
+share/php-${PV}/include/ext/phar/php_phar.h
+share/php-${PV}/include/ext/session/
+share/php-${PV}/include/ext/session/mod_files.h
+share/php-${PV}/include/ext/session/mod_user.h
+share/php-${PV}/include/ext/session/php_session.h
+share/php-${PV}/include/ext/simplexml/
+share/php-${PV}/include/ext/simplexml/php_simplexml.h
+share/php-${PV}/include/ext/simplexml/php_simplexml_exports.h
+share/php-${PV}/include/ext/sockets/
+share/php-${PV}/include/ext/sockets/php_sockets.h
+share/php-${PV}/include/ext/spl/
+share/php-${PV}/include/ext/spl/php_spl.h
+share/php-${PV}/include/ext/spl/spl_array.h
+share/php-${PV}/include/ext/spl/spl_directory.h
+share/php-${PV}/include/ext/spl/spl_dllist.h
+share/php-${PV}/include/ext/spl/spl_engine.h
+share/php-${PV}/include/ext/spl/spl_exceptions.h
+share/php-${PV}/include/ext/spl/spl_fixedarray.h
+share/php-${PV}/include/ext/spl/spl_functions.h
+share/php-${PV}/include/ext/spl/spl_heap.h
+share/php-${PV}/include/ext/spl/spl_iterators.h
+share/php-${PV}/include/ext/spl/spl_observer.h
+share/php-${PV}/include/ext/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/hrtime.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_mt_rand.h
+share/php-${PV}/include/ext/standard/php_net.h
+share/php-${PV}/include/ext/standard/php_password.h
+share/php-${PV}/include/ext/standard/php_rand.h
+share/php-${PV}/include/ext/standard/php_random.h
+share/php-${PV}/include/ext/standard/php_smart_string.h
+share/php-${PV}/include/ext/standard/php_smart_string_public.h
+share/php-${PV}/include/ext/standard/php_standard.h
+share/php-${PV}/include/ext/standard/php_string.h
+share/php-${PV}/include/ext/standard/php_type.h
+share/php-${PV}/include/ext/standard/php_uuencode.h
+share/php-${PV}/include/ext/standard/php_var.h
+share/php-${PV}/include/ext/standard/php_versioning.h
+share/php-${PV}/include/ext/standard/proc_open.h
+share/php-${PV}/include/ext/standard/quot_print.h
+share/php-${PV}/include/ext/standard/scanf.h
+share/php-${PV}/include/ext/standard/sha1.h
+share/php-${PV}/include/ext/standard/streamsfuncs.h
+share/php-${PV}/include/ext/standard/uniqid.h
+share/php-${PV}/include/ext/standard/url.h
+share/php-${PV}/include/ext/standard/url_scanner_ex.h
+share/php-${PV}/include/ext/standard/winver.h
+share/php-${PV}/include/ext/xml/
+share/php-${PV}/include/ext/xml/expat_compat.h
+share/php-${PV}/include/ext/xml/php_xml.h
+share/php-${PV}/include/include/
+share/php-${PV}/include/main/
+share/php-${PV}/include/main/SAPI.h
+share/php-${PV}/include/main/build-defs.h
+share/php-${PV}/include/main/fastcgi.h
+share/php-${PV}/include/main/fopen_wrappers.h
+share/php-${PV}/include/main/http_status_codes.h
+share/php-${PV}/include/main/php.h
+share/php-${PV}/include/main/php_compat.h
+share/php-${PV}/include/main/php_config.h
+share/php-${PV}/include/main/php_content_types.h
+share/php-${PV}/include/main/php_getopt.h
+share/php-${PV}/include/main/php_globals.h
+share/php-${PV}/include/main/php_ini.h
+share/php-${PV}/include/main/php_main.h
+share/php-${PV}/include/main/php_memory_streams.h
+share/php-${PV}/include/main/php_network.h
+share/php-${PV}/include/main/php_open_temporary_file.h
+share/php-${PV}/include/main/php_output.h
+share/php-${PV}/include/main/php_reentrancy.h
+share/php-${PV}/include/main/php_scandir.h
+share/php-${PV}/include/main/php_stdint.h
+share/php-${PV}/include/main/php_streams.h
+share/php-${PV}/include/main/php_syslog.h
+share/php-${PV}/include/main/php_ticks.h
+share/php-${PV}/include/main/php_variables.h
+share/php-${PV}/include/main/php_version.h
+share/php-${PV}/include/main/rfc1867.h
+share/php-${PV}/include/main/snprintf.h
+share/php-${PV}/include/main/spprintf.h
+share/php-${PV}/include/main/streams/
+share/php-${PV}/include/main/streams/php_stream_context.h
+share/php-${PV}/include/main/streams/php_stream_filter_api.h
+share/php-${PV}/include/main/streams/php_stream_glob_wrapper.h
+share/php-${PV}/include/main/streams/php_stream_mmap.h
+share/php-${PV}/include/main/streams/php_stream_plain_wrapper.h
+share/php-${PV}/include/main/streams/php_stream_transport.h
+share/php-${PV}/include/main/streams/php_stream_userspace.h
+share/php-${PV}/include/main/streams/php_streams_int.h
+share/php-${PV}/include/sapi/
+share/php-${PV}/include/sapi/cli/
+share/php-${PV}/include/sapi/cli/cli.h
+@sample ${SYSCONFDIR}/php-${PV}/

lang/php/7.4/pkg/PLIST-mysqli

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-mysqli,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-mysqli->=7.4,<7.5
+@so lib/php-${PV}/modules/mysqli.so
+share/examples/php-${PV}/mysqli.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/mysqli.ini

lang/php/7.4/pkg/PLIST-odbc

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-odbc,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-odbc->=7.4,<7.5
+@so lib/php-${PV}/modules/odbc.so
+share/examples/php-${PV}/odbc.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/odbc.ini

lang/php/7.4/pkg/PLIST-pcntl

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pcntl,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pcntl->=7.4,<7.5
+@so lib/php-${PV}/modules/pcntl.so
+share/examples/php-${PV}/pcntl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pcntl.ini

lang/php/7.4/pkg/PLIST-pdo_dblib

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pdo_dblib,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_dblib->=7.4,<7.5
+@so lib/php-${PV}/modules/pdo_dblib.so
+share/examples/php-${PV}/pdo_dblib.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_dblib.ini

lang/php/7.4/pkg/PLIST-pdo_mysql

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pdo_mysql,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_mysql->=7.4,<7.5
+@so lib/php-${PV}/modules/pdo_mysql.so
+share/examples/php-${PV}/pdo_mysql.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_mysql.ini

lang/php/7.4/pkg/PLIST-pdo_odbc

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pdo_odbc,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_odbc->=7.4,<7.5
+@so lib/php-${PV}/modules/pdo_odbc.so
+share/examples/php-${PV}/pdo_odbc.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_odbc.ini

lang/php/7.4/pkg/PLIST-pdo_pgsql

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pdo_pgsql,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_pgsql->=7.4,<7.5
+@so lib/php-${PV}/modules/pdo_pgsql.so
+share/examples/php-${PV}/pdo_pgsql.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_pgsql.ini

lang/php/7.4/pkg/PLIST-pdo_sqlite

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pdo_sqlite,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pdo_sqlite->=7.4,<7.5
+@so lib/php-${PV}/modules/pdo_sqlite.so
+share/examples/php-${PV}/pdo_sqlite.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_sqlite.ini

lang/php/7.4/pkg/PLIST-pgsql

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pgsql,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pgsql->=7.4,<7.5
+@so lib/php-${PV}/modules/pgsql.so
+share/examples/php-${PV}/pgsql.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pgsql.ini

lang/php/7.4/pkg/PLIST-pspell

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-pspell,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-pspell->=7.4,<7.5
+@so lib/php-${PV}/modules/pspell.so
+share/examples/php-${PV}/pspell.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/pspell.ini

lang/php/7.4/pkg/PLIST-shmop

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-shmop,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-shmop->=7.4,<7.5
+@so lib/php-${PV}/modules/shmop.so
+share/examples/php-${PV}/shmop.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/shmop.ini

lang/php/7.4/pkg/PLIST-snmp

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-snmp,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-snmp->=7.4,<7.5
+@so lib/php-${PV}/modules/snmp.so
+share/examples/php-${PV}/snmp.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/snmp.ini

lang/php/7.4/pkg/PLIST-soap

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-soap,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-soap->=7.4,<7.5
+@so lib/php-${PV}/modules/soap.so
+share/examples/php-${PV}/soap.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/soap.ini

lang/php/7.4/pkg/PLIST-sqlite3

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-sqlite3,v 1.1 2020/04/21 20:38:31 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-sqlite3->=7.4,<7.5
+@so lib/php-${PV}/modules/sqlite3.so
+share/examples/php-${PV}/sqlite3.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/sqlite3.ini

lang/php/7.4/pkg/PLIST-tidy

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-tidy,v 1.1 2020/04/21 20:38:32 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-tidy->=7.4,<7.5
+@so lib/php-${PV}/modules/tidy.so
+share/examples/php-${PV}/tidy.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/tidy.ini

lang/php/7.4/pkg/PLIST-xmlrpc

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-xmlrpc,v 1.1 2020/04/21 20:38:32 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-xmlrpc->=7.4,<7.5
+@so lib/php-${PV}/modules/xmlrpc.so
+share/examples/php-${PV}/xmlrpc.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xmlrpc.ini

lang/php/7.4/pkg/PLIST-xsl

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-xsl,v 1.1 2020/04/21 20:38:32 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-xsl->=7.4,<7.5
+@so lib/php-${PV}/modules/xsl.so
+share/examples/php-${PV}/xsl.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/xsl.ini

lang/php/7.4/pkg/PLIST-zip

@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-zip,v 1.1 2020/04/21 20:38:32 sthen Exp $
+@option no-default-conflict
+@option is-branch
+@conflict php-zip->=7.4,<7.5
+@so lib/php-${PV}/modules/zip.so
+share/examples/php-${PV}/zip.ini
+@sample ${SYSCONFDIR}/php-${PV}.sample/zip.ini

lang/php/7.4/pkg/php74_fpm.rc

@@ -0,0 +1,12 @@
+#!/bin/ksh
+#
+# $OpenBSD: php74_fpm.rc,v 1.1 2020/04/21 20:38:32 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

lang/php/Makefile

@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.21 2019/12/11 14:47:54 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2020/04/21 20:38:31 sthen Exp $
 
 SUBDIR =
 SUBDIR += 7.2
 SUBDIR += 7.3
+SUBDIR += 7.4
 
 .include <bsd.port.subdir.mk>

lang/php/Makefile.inc

@@ -1,9 +1,13 @@
-# $OpenBSD: Makefile.inc,v 1.150 2020/04/12 14:26:02 sthen Exp $
+# $OpenBSD: Makefile.inc,v 1.151 2020/04/21 20:38:31 sthen Exp $
 
 BROKEN-hppa=	no __sync_bool_compare_and_swap support nor asm fallback
 
 COMMENT-main=		server-side HTML-embedded scripting language
 
+PV=		${PHP_VERSION:R}
+MV=		${PV:R}
+SV=		${PV:S/.//}
+
 PKGNAME-main?=		php-${PHP_VERSION}
 PKGSTEM=		php-${PV}
 PKGSTEM-main=		php-${PV}
@@ -77,10 +81,8 @@ CONFIGURE_ARGS+=	--enable-opcache
 # default included php extensions
 CONFIGURE_ARGS+=	--with-gettext=${LOCALBASE} \
 			--with-iconv=${LOCALBASE} \
-			--with-onig=${LOCALBASE} \
 			--with-openssl \
 			--with-password-argon2=${LOCALBASE} \
-			--with-pcre-regex \
 			--with-sodium=${LOCALBASE} \
 			--with-zlib \
 			--enable-bcmath \
@@ -95,9 +97,17 @@ CONFIGURE_ARGS+=	--with-gettext=${LOCALBASE} \
 			--enable-sysvmsg \
 			--enable-sysvsem \
 			--enable-sysvshm \
-			--enable-wddx \
 			--enable-xml
 
+.if ${PV:M7.2} || ${PV:M7.3}
+CONFIGURE_ARGS+=	--enable-wddx \
+			--with-onig=${LOCALBASE} \
+			--with-pcre-regex
+.else
+# wddx moved to pecl in 7.4
+CONFIGURE_ARGS+=	--with-external-pcre
+.endif
+
 RUN_DEPENDS-main=	mail/femail,-chroot
 
 TEST_TARGET=		test
@@ -157,6 +167,10 @@ LIB_DEPENDS$i +=	devel/gettext,-runtime \
 			security/libsodium \
 			textproc/libxml \
 			textproc/oniguruma
+.  if !${PV:M7.2} && !${PV:M7.3}
+WANTLIB$i +=		${COMPILER_LIBCXX} pcre2-8
+LIB_DEPENDS$i +=	devel/pcre2
+.  endif
 .endfor
 
 #
@@ -205,15 +219,30 @@ CONFIGURE_ARGS+=	--with-enchant=shared,${LOCALBASE}
 COMMENT-gd=		image manipulation extensions for php
 HOMEPAGE-gd=		https://www.php.net/image
 LIB_DEPENDS-gd=		graphics/jpeg \
+			graphics/libwebp \
 			graphics/png
-WANTLIB-gd+=		X11 Xpm freetype jpeg m png pthread xcb z
+WANTLIB-gd+=		freetype jpeg m png pthread webp z
+# for bundled gd
+WANTLIB-gd+=		X11 Xpm xcb
+# for standalone gd (needs more testing, defer to post 6.7)
+#WANTLIB-gd+=		expat fontconfig iconv lzma tiff zstd
+#LIB_DEPENDS-gd=	graphics/gd
 .if ${BUILD_PACKAGES:M-gd}
+.  if ${PV:M7.2} || ${PV:M7.3}
 CONFIGURE_ARGS+=	--with-gd=shared \
+			--with-freetype-dir=${X11BASE} \
 			--with-jpeg-dir=${LOCALBASE} \
 			--with-png-dir=${LOCALBASE} \
-			--with-zlib-dir=/usr \
-			--with-freetype-dir=${X11BASE} \
-			--with-xpm-dir=${X11BASE}
+			--with-webp-dir=${LOCALBASE} \
+			--with-xpm-dir=${X11BASE} \
+			--with-zlib-dir=/usr
+.  else
+CONFIGURE_ARGS+=	--enable-gd=shared \
+			--with-freetype=${X11BASE} \
+			--with-jpeg=${LOCALBASE} \
+			--with-webp=${LOCALBASE} \
+			--with-xpm=${X11BASE}
+.  endif
 .endif
 
 # gmp
@@ -242,8 +271,12 @@ LIB_DEPENDS-intl=	textproc/icu4c
 RUN_DEPENDS-intl=	textproc/icu4c,-wwwdata
 WANTLIB-intl=		${COMPILER_LIBCXX} icudata icui18n icuio icuuc m
 .if ${BUILD_PACKAGES:M-intl}
+.  if ${PV:M7.2} || ${PV:M7.3}
 CONFIGURE_ARGS+=	--enable-intl=shared \
 			--with-icu-dir=${LOCALBASE}
+.  else
+CONFIGURE_ARGS+=	--enable-intl=shared
+.  endif
 .endif
 
 # ldap
@@ -409,8 +442,12 @@ CONFIGURE_ARGS+=	--with-xsl=shared --enable-dom
 # zip
 COMMENT-zip=		zip functions for php
 HOMEPAGE-zip=		https://www.php.net/zip
+.if ${PV:M7.2} || ${PV:M7.3}
 CONFIGURE_ARGS+=	--enable-zip=shared,${LOCALBASE}
 CONFIGURE_ARGS+=	--with-libzip=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--with-zip=shared
+.endif
 LIB_DEPENDS-zip=	archivers/bzip2 \
 			archivers/libzip
 WANTLIB-zip=		bz2 crypto lzma pthread ssl z zip
@@ -418,9 +455,6 @@ WANTLIB-zip=		bz2 crypto lzma pthread ssl z zip
 # some variables to substitute
 SUBST_VARS+=	CHROOT_DIR MODPHP_CONFIG_PATH SV PV MV
 UPDATE_PLIST_ARGS+= -i MV
-PV=		${PHP_VERSION:R}
-MV=		${PV:R}
-SV=		${PV:S/.//}
 DEFAULT_PHP?=	No
 
 .for i in TRUEPREFIX MODULES_DIR PHP_VERSION APACHE_MODULE_DIR

lang/php/pecl/pecl.port.mk

@@ -1,9 +1,9 @@
-# $OpenBSD: pecl.port.mk,v 1.16 2019/12/18 20:22:05 sthen Exp $
+# $OpenBSD: pecl.port.mk,v 1.17 2020/04/21 20:38:32 sthen Exp $
 # PHP PECL module
 
 MODULES +=	lang/php
 
-FLAVORS ?= php72 php73
+FLAVORS ?= php72 php73 php74
 FLAVOR ?= php73
 
 # MODPECL_DEFAULTV is used in PLISTs so that @pkgpath markers are only

lang/php/php.port.mk

@@ -1,4 +1,4 @@
-# $OpenBSD: php.port.mk,v 1.28 2019/12/11 16:08:29 sthen Exp $
+# $OpenBSD: php.port.mk,v 1.29 2020/04/21 20:38:31 sthen Exp $
 
 CATEGORIES+=		lang/php
 
@@ -10,6 +10,9 @@ MODPHP_VSPEC = >=7.2,<7.3
 .elif ${MODPHP_VERSION} == 7.3
 MODPHP_FLAVOR = ,php73
 MODPHP_VSPEC = >=7.3,<7.4
+.elif ${MODPHP_VERSION} == 7.4
+MODPHP_FLAVOR = ,php74
+MODPHP_VSPEC = >=7.4,<7.5
 .endif
 MODPHPSPEC = php-${MODPHP_VSPEC}