Attachment #230329 for bug #260624





PHPBASE?=	${LOCALBASE}

_ALL_PHP_VERSIONS=	74 80

# Make the already installed PHP the default one.
.  if exists(${PHPBASE}/etc/php.conf)

.    elif ${PHP_VER} == 74
PHP_EXT_DIR=   20190902
PHP_EXT_INC=    hash pcre spl
.    elif ${PHP_VER} == 73
PHP_EXT_DIR=   20180731
PHP_EXT_INC=    pcre spl
.    else
# (rene) default to DEFAULT_VERSIONS
PHP_EXT_DIR=	20190902

		sockets spl sqlite3 sysvmsg sysvsem sysvshm \
		tidy tokenizer xml xmlreader xmlrpc xmlwriter xsl zip zlib
# version specific components
_USE_PHP_VER73=	${_USE_PHP_ALL} interbase pdf recode sodium wddx
_USE_PHP_VER74=	${_USE_PHP_ALL} ffi pdf sodium
_USE_PHP_VER80=	${_USE_PHP_ALL} ffi sodium


iconv_DEPENDS=	converters/php${PHP_VER}-iconv
igbinary_DEPENDS=	converters/pecl-igbinary@${PHP_FLAVOR}
imap_DEPENDS=	mail/php${PHP_VER}-imap
interbase_DEPENDS=	databases/php${PHP_VER}-interbase
intl_DEPENDS=	devel/php${PHP_VER}-intl
json_DEPENDS=	devel/php${PHP_VER}-json
ldap_DEPENDS=	net/php${PHP_VER}-ldap

pspell_DEPENDS=	textproc/php${PHP_VER}-pspell
radius_DEPENDS=	net/pecl-radius@${PHP_FLAVOR}
readline_DEPENDS=	devel/php${PHP_VER}-readline
recode_DEPENDS=	converters/php${PHP_VER}-recode
redis_DEPENDS=	databases/pecl-redis@${PHP_FLAVOR}
session_DEPENDS=www/php${PHP_VER}-session
shmop_DEPENDS=	devel/php${PHP_VER}-shmop

sysvshm_DEPENDS=devel/php${PHP_VER}-sysvshm
tidy_DEPENDS=	www/php${PHP_VER}-tidy
tokenizer_DEPENDS=	devel/php${PHP_VER}-tokenizer
wddx_DEPENDS=	textproc/php${PHP_VER}-wddx
xml_DEPENDS=	textproc/php${PHP_VER}-xml
xmlreader_DEPENDS=	textproc/php${PHP_VER}-xmlreader
.if ${PHP_VER} >= 80

Lines 107-113 PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} Link Here

(-)b/Mk/bsd.default-versions.mk (-1 / +1 lines)
107	.endif	107	.endif
108	# Possible values: 9.6, 10, 11, 12, 13, 14	108	# Possible values: 9.6, 10, 11, 12, 13, 14
109	PGSQL_DEFAULT?= 13	109	PGSQL_DEFAULT?= 13
110	# Possible values: 7.3, 7.4, 8.0	110	# Possible values: 7.4, 8.0
111	PHP_DEFAULT?= 7.4	111	PHP_DEFAULT?= 7.4
112	# Possible values: 2.7, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11	112	# Possible values: 2.7, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11
113	PYTHON_DEFAULT?= 3.8	113	PYTHON_DEFAULT?= 3.8

Lines 153-162 Link Here

(-)b/archivers/Makefile (-4 lines)
153	SUBDIR += php-lz4	153	SUBDIR += php-lz4
154	SUBDIR += php-snappy	154	SUBDIR += php-snappy
155	SUBDIR += php-zstd	155	SUBDIR += php-zstd
156	SUBDIR += php73-bz2
157	SUBDIR += php73-phar
158	SUBDIR += php73-zip
159	SUBDIR += php73-zlib
160	SUBDIR += php74-bz2	156	SUBDIR += php74-bz2
161	SUBDIR += php74-phar	157	SUBDIR += php74-phar
162	SUBDIR += php74-zip	158	SUBDIR += php74-zip

Removed Link Here

(-)a/archivers/php73-bz2/Makefile (-9 lines)
1	CATEGORIES= archivers
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -bz2
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/archivers/php73-phar/Makefile (-9 lines)
1	CATEGORIES= archivers
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -phar
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




--- config.m4.orig	2016-06-21 19:56:50 UTC
+++ config.m4
@@ -4,8 +4,38 @@ dnl config.m4 for extension phar
 PHP_ARG_ENABLE(phar, for phar archive support,
 [  --disable-phar          Disable phar support], yes)
 
+PHP_ARG_WITH(pcre-dir, pcre install prefix,
+[  --with-pcre-dir           PHAR: pcre install prefix], no, no)
+
+
 if test "$PHP_PHAR" != "no"; then
+
+  dnl This is PECL build, check if bundled PCRE library is used
+  old_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS=$INCLUDES
+  AC_EGREP_CPP(yes,[
+#include <main/php_config.h>
+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
+yes
+#endif
+  ],[
+    PHP_PCRE_REGEX=yes
+  ],[
+    AC_EGREP_CPP(yes,[
+#include <main/php_config.h>
+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
+yes
+#endif
+    ],[
+      PHP_PCRE_REGEX=pecl
+      PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
+    ],[
+      PHP_PCRE_REGEX=no
+    ])
+  ])
+
   PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+  PHP_HASH=yes
   AC_MSG_CHECKING([for phar openssl support])
   if test "$PHP_HASH_SHARED" != "yes"; then
     if test "$PHP_HASH" != "no"; then

Removed Link Here

(-)a/archivers/php73-phar/files/patch-phar.c (-11 lines)
1	--- phar.c.orig 2016-06-21 19:56:49 UTC
2	+++ phar.c
3	@@ -3589,7 +3589,7 @@ static const zend_module_dep phar_deps[]
4	ZEND_MOD_OPTIONAL("openssl")
5	ZEND_MOD_OPTIONAL("zlib")
6	ZEND_MOD_OPTIONAL("standard")
7	-#if defined(HAVE_HASH) && !defined(COMPILE_DL_HASH)
8	+#if defined(HAVE_HASH)
9	ZEND_MOD_REQUIRED("hash")
10	#endif
11	#if HAVE_SPL

Removed Link Here

(-)a/archivers/php73-zip/Makefile (-9 lines)
1	CATEGORIES= archivers
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -zip
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/archivers/php73-zlib/Makefile (-9 lines)
1	CATEGORIES= archivers
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -zlib
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/archivers/php73-zlib/files/patch-zlib.c (-10 lines)
1	--- zlib.c.orig 2016-06-21 19:57:08 UTC
2	+++ zlib.c
3	@@ -1480,6 +1480,7 @@ static PHP_MSHUTDOWN_FUNCTION(zlib)
4	/* {{{ PHP_RINIT_FUNCTION */
5	static PHP_RINIT_FUNCTION(zlib)
6	{
7	+ ZLIBG(output_compression) = 0;
8	ZLIBG(compression_coding) = 0;
9	if (!ZLIBG(handler_registered)) {
10	ZLIBG(output_compression) = ZLIBG(output_compression_default);

Lines 14-20 LICENSE= AGPLv3+ Link Here

(-)b/audio/ampache/Makefile (-1 / +1 lines)
14		14
15	USES= cpe zip gettext php:flavors mysql	15	USES= cpe zip gettext php:flavors mysql
16	USE_PHP= pdo pdo_mysql hash session json intl simplexml curl dom xml	16	USE_PHP= pdo pdo_mysql hash session json intl simplexml curl dom xml
17	IGNORE_WITH_PHP=73 80	17	IGNORE_WITH_PHP=80
18		18
19	NO_WRKSUBDIR= yes	19	NO_WRKSUBDIR= yes
20	NO_BUILD= yes	20	NO_BUILD= yes

Lines 135-143 Link Here

(-)b/converters/Makefile (-3 lines)
135	SUBDIR += pear-Services_JSON	135	SUBDIR += pear-Services_JSON
136	SUBDIR += pecl-igbinary	136	SUBDIR += pecl-igbinary
137	SUBDIR += php-bsdconv	137	SUBDIR += php-bsdconv
138	SUBDIR += php73-iconv
139	SUBDIR += php73-mbstring
140	SUBDIR += php73-recode
141	SUBDIR += php74-iconv	138	SUBDIR += php74-iconv
142	SUBDIR += php74-mbstring	139	SUBDIR += php74-mbstring
143	SUBDIR += php80-iconv	140	SUBDIR += php80-iconv

Removed Link Here

(-)a/converters/php73-iconv/Makefile (-9 lines)
1	CATEGORIES= converters
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -iconv
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/converters/php73-mbstring/Makefile (-9 lines)
1	CATEGORIES= converters
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -mbstring
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




--- config.m4.orig	2018-09-25 09:08:02 UTC
+++ config.m4
@@ -41,6 +41,30 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
     PHP_ADD_INCLUDE([$ext_builddir/$dir])
   done
 
+  dnl This is PECL build, check if bundled PCRE library is used
+  old_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS=$INCLUDES
+  AC_EGREP_CPP(yes,[
+#include <main/php_config.h>
+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
+yes
+#endif
+  ],[
+    PHP_PCRE_REGEX=yes
+  ],[
+    AC_EGREP_CPP(yes,[
+#include <main/php_config.h>
+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
+yes
+#endif
+    ],[
+      PHP_PCRE_REGEX=pecl
+      PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
+    ],[
+      PHP_PCRE_REGEX=no
+    ])
+  ])
+
   if test "$ext_shared" = "no"; then
     PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES)
     out="php_config.h"
@@ -83,7 +107,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
 int foo(int x, ...) {
   va_list va;
   va_start(va, x);
-  va_arg(va, int);
   va_arg(va, char *);
   va_arg(va, double);
   return 0;
@@ -334,6 +357,9 @@ PHP_ARG_WITH(onig, [for external oniguru
 [  --with-onig[=DIR]         MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
                           If DIR is not set, the bundled oniguruma will be used], no, no)
 
+PHP_ARG_WITH(pcre-dir, pcre install prefix,
+[  --with-pcre-dir           MBSTRING: pcre install prefix], no, no)
+
 if test "$PHP_MBSTRING" != "no"; then
   AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support])
 

Removed Link Here

(-)a/converters/php73-recode/Makefile (-9 lines)
1	CATEGORIES= converters
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -recode
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




    SUBDIR += pguri
    SUBDIR += php-tarantool
    SUBDIR += php-xapian
    SUBDIR += php73-dba
    SUBDIR += php73-interbase
    SUBDIR += php73-mysqli
    SUBDIR += php73-odbc
    SUBDIR += php73-pdo
    SUBDIR += php73-pdo_dblib
    SUBDIR += php73-pdo_firebird
    SUBDIR += php73-pdo_mysql
    SUBDIR += php73-pdo_odbc
    SUBDIR += php73-pdo_pgsql
    SUBDIR += php73-pdo_sqlite
    SUBDIR += php73-pgsql
    SUBDIR += php73-sqlite3
    SUBDIR += php74-dba
    SUBDIR += php74-mysqli
    SUBDIR += php74-odbc

Removed Link Here

(-)a/databases/php73-dba/Makefile (-9 lines)
1	CATEGORIES= databases
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -dba
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




--- config.m4.orig	2016-01-06 15:14:47 UTC
+++ config.m4
@@ -324,6 +324,38 @@ if test "$PHP_DB4" != "no"; then
       THIS_PREFIX=$i
       THIS_INCLUDE=$i/include/db5.3/db.h
       break
+    elif test -f "$i/include/db5/db.h"; then
+      THIS_PREFIX=$i
+      THIS_INCLUDE=$i/include/db5/db.h
+      break
+    elif test -f "$i/include/db48/db.h"; then
+      THIS_PREFIX=$i
+      THIS_INCLUDE=$i/include/db48/db.h
+      break
+    elif test -f "$i/include/db47/db.h"; then
+      THIS_PREFIX=$i
+      THIS_INCLUDE=$i/include/db47/db.h
+      break
+    elif test -f "$i/include/db46/db.h"; then
+      THIS_PREFIX=$i
+      THIS_INCLUDE=$i/include/db46/db.h
+      break
+    elif test -f "$i/include/db44/db.h"; then
+      THIS_PREFIX=$i
+      THIS_INCLUDE=$i/include/db44/db.h
+      break
+    elif test -f "$i/include/db43/db.h"; then
+      THIS_PREFIX=$i
+      THIS_INCLUDE=$i/include/db43/db.h
+      break
+    elif test -f "$i/include/db42/db.h"; then
+      THIS_PREFIX=$i
+      THIS_INCLUDE=$i/include/db42/db.h
+      break
+    elif test -f "$i/include/db41/db.h"; then
+      THIS_PREFIX=$i
+      THIS_INCLUDE=$i/include/db41/db.h
+      break
     elif test -f "$i/include/db5.1/db.h"; then
       THIS_PREFIX=$i
       THIS_INCLUDE=$i/include/db5.1/db.h
@@ -366,7 +398,7 @@ if test "$PHP_DB4" != "no"; then
       break
     fi
   done
-  PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+  PHP_DBA_DB_CHECK(4, db-5 db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
 fi
 PHP_DBA_STD_RESULT(db4,Berkeley DB4)
 

Removed Link Here

(-)a/databases/php73-interbase/Makefile (-9 lines)
1	CATEGORIES= databases
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -interbase
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/databases/php73-mysqli/Makefile (-9 lines)
1	CATEGORIES= databases
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -mysqli
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




--- mysqli_api.c.orig	2019-12-17 10:29:23 UTC
+++ mysqli_api.c
@@ -31,8 +31,9 @@
 #include "zend_smart_str.h"
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
+#if defined(MYSQLI_USE_MYSQLND)
 #include "ext/mysqlnd/mysql_float_to_double.h"
-
+#endif
 
 #if !defined(MYSQLI_USE_MYSQLND)
 /* {{{ mysqli_tx_cor_options_to_string */

Removed Link Here

(-)a/databases/php73-odbc/Makefile (-9 lines)
1	CATEGORIES= databases
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -odbc
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




--- config.m4.orig	2018-09-25 09:07:57 UTC
+++ config.m4
@@ -97,6 +97,9 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS
 dnl
 dnl configure options
 dnl
+PHP_ARG_ENABLE(odbc,,
+[  --enable-odbc             Enable ODBC support with selected driver])
+
 
 PHP_ARG_WITH(odbcver,,
 [  --with-odbcver[=HEX]      Force support for the passed ODBC version. A hex number is expected, default 0x0350.
@@ -104,7 +107,7 @@ PHP_ARG_WITH(odbcver,,
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(adabas,,
-[  --with-adabas[=DIR]       Include Adabas D support [/usr/local]])
+[  --with-adabas[=DIR]       Include Adabas D support [/usr/local]], no, no)
 
   AC_MSG_CHECKING([for Adabas support])
   if test "$PHP_ADABAS" != "no"; then
@@ -133,7 +136,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(sapdb,,
-[  --with-sapdb[=DIR]        Include SAP DB support [/usr/local]])
+[  --with-sapdb[=DIR]        Include SAP DB support [/usr/local]], no, no)
 
   AC_MSG_CHECKING([for SAP DB support])
   if test "$PHP_SAPDB" != "no"; then
@@ -153,7 +156,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(solid,,
-[  --with-solid[=DIR]        Include Solid support [/usr/local/solid]])
+[  --with-solid[=DIR]        Include Solid support [/usr/local/solid]], no, no)
 
   AC_MSG_CHECKING(for Solid support)
   if test "$PHP_SOLID" != "no"; then
@@ -180,7 +183,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(ibm-db2,,
-[  --with-ibm-db2[=DIR]      Include IBM DB2 support [/home/db2inst1/sqllib]])
+[  --with-ibm-db2[=DIR]      Include IBM DB2 support [/home/db2inst1/sqllib]], no, no)
 
   AC_MSG_CHECKING(for IBM DB2 support)
   if test "$PHP_IBM_DB2" != "no"; then
@@ -220,7 +223,7 @@ fi
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(empress,,
 [  --with-empress[=DIR]      Include Empress support [\$EMPRESSPATH]
-                          (Empress Version >= 8.60 required)])
+                          (Empress Version >= 8.60 required)], no, no)
 
   AC_MSG_CHECKING(for Empress support)
   if test "$PHP_EMPRESS" != "no"; then
@@ -245,7 +248,7 @@ fi
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(empress-bcs,,
 [  --with-empress-bcs[=DIR]  Include Empress Local Access support [\$EMPRESSPATH]
-                          (Empress Version >= 8.60 required)])
+                          (Empress Version >= 8.60 required)], no, no)
 
   AC_MSG_CHECKING(for Empress local access support)
   if test "$PHP_EMPRESS_BCS" != "no"; then
@@ -292,7 +295,7 @@ PHP_ARG_WITH(custom-odbc,,
                           running this configure script:
                             CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
                             LDFLAGS=-lunix
-                            CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"])
+                            CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no)
 
   AC_MSG_CHECKING(for a custom ODBC support)
   if test "$PHP_CUSTOM_ODBC" != "no"; then
@@ -314,7 +317,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(iodbc,,
-[  --with-iodbc[=DIR]        Include iODBC support [/usr/local]])
+[  --with-iodbc[=DIR]        Include iODBC support [/usr/local]], no, no)
 
   AC_MSG_CHECKING(for iODBC support)
   if test "$PHP_IODBC" != "no"; then
@@ -352,7 +355,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(esoob,,
-[  --with-esoob[=DIR]        Include Easysoft OOB support [/usr/local/easysoft/oob/client]])
+[  --with-esoob[=DIR]        Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no)
 
   AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
   if test "$PHP_ESOOB" != "no"; then
@@ -374,7 +377,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(unixODBC,,
-[  --with-unixODBC[=DIR]     Include unixODBC support [/usr/local]])
+[  --with-unixODBC[=DIR]     Include unixODBC support [/usr/local]], no, no)
 
   AC_MSG_CHECKING(for unixODBC support)
   if test "$PHP_UNIXODBC" != "no"; then
@@ -397,7 +400,7 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(dbmaker,,
-[  --with-dbmaker[=DIR]      Include DBMaker support])
+[  --with-dbmaker[=DIR]      Include DBMaker support], no, no)
 
   AC_MSG_CHECKING(for DBMaker support)
   if test "$PHP_DBMAKER" != "no"; then

Removed Link Here

(-)a/databases/php73-pdo/Makefile (-9 lines)
1	CATEGORIES= databases
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -pdo
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/databases/php73-pdo_dblib/Makefile (-9 lines)
1	CATEGORIES= databases
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -pdo_dblib
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/databases/php73-pdo_firebird/Makefile (-9 lines)
1	CATEGORIES= databases
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -pdo_firebird
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/databases/php73-pdo_mysql/Makefile (-9 lines)
1	CATEGORIES= databases
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -pdo_mysql
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/databases/php73-pdo_odbc/Makefile (-9 lines)
1	CATEGORIES= databases
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -pdo_odbc
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/databases/php73-pdo_pgsql/Makefile (-9 lines)
1	CATEGORIES= databases
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -pdo_pgsql
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/databases/php73-pdo_sqlite/Makefile (-9 lines)
1	CATEGORIES= databases
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -pdo_sqlite
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/databases/php73-pgsql/Makefile (-9 lines)
1	CATEGORIES= databases
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -pgsql
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/databases/php73-sqlite3/Makefile (-9 lines)
1	CATEGORIES= databases
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -sqlite3
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




    SUBDIR += php-ice37
    SUBDIR += php-libawl
    SUBDIR += php-maxminddb
    SUBDIR += php73-gettext
    SUBDIR += php73-intl
    SUBDIR += php73-json
    SUBDIR += php73-pcntl
    SUBDIR += php73-readline
    SUBDIR += php73-shmop
    SUBDIR += php73-sysvmsg
    SUBDIR += php73-sysvsem
    SUBDIR += php73-sysvshm
    SUBDIR += php73-tokenizer
    SUBDIR += php74-ffi
    SUBDIR += php74-gettext
    SUBDIR += php74-intl

Removed Link Here

(-)a/devel/php73-gettext/Makefile (-9 lines)
1	CATEGORIES= devel
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -gettext
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




CATEGORIES=	devel

MASTERDIR=	${.CURDIR}/../../lang/php73

PKGNAMESUFFIX=	-intl

USES=		compiler:c++11-lib
USE_CXXSTD=	gnu++11

CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1

TEST_TARGET=	test

.include "${MASTERDIR}/Makefile"




Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844

ext/intl/breakiterator/codepointiterator_internal.cpp:60:53: error: use of undeclared identifier 'FALSE'
        this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
                                                           ^
ext/intl/breakiterator/codepointiterator_internal.cpp:60:60: error: use of undeclared identifier 'TRUE'
        this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
                                                                  ^
ext/intl/breakiterator/codepointiterator_internal.cpp:80:10: error: use of undeclared identifier 'FALSE'
                return FALSE;
                       ^
ext/intl/breakiterator/codepointiterator_internal.cpp:87:10: error: use of undeclared identifier 'FALSE'
                return FALSE;
                       ^
ext/intl/breakiterator/codepointiterator_internal.cpp:90:9: error: use of undeclared identifier 'TRUE'
        return TRUE;
               ^
ext/intl/breakiterator/codepointiterator_internal.cpp:111:42: error: use of undeclared identifier 'FALSE'
        return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
                                                ^
ext/intl/breakiterator/codepointiterator_internal.cpp:111:49: error: use of undeclared identifier 'TRUE'
        return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
                                                       ^
ext/intl/breakiterator/codepointiterator_internal.cpp:130:47: error: use of undeclared identifier 'FALSE'
        this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
                                                     ^
ext/intl/breakiterator/codepointiterator_internal.cpp:130:54: error: use of undeclared identifier 'TRUE'
        this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
                                                            ^
ext/intl/breakiterator/codepointiterator_internal.cpp:282:48: error: use of undeclared identifier 'FALSE'
        this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
                                                      ^
ext/intl/breakiterator/codepointiterator_internal.cpp:282:55: error: use of undeclared identifier 'TRUE'
        this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
                                                             ^
ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE'
        collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
                                ^
ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE'
        collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
                                ^
ext/intl/dateformat/dateformat_attr.c:91:36: error: use of undeclared identifier 'FALSE'
        zend_bool   is_pattern_localized =FALSE;
                                          ^
ext/intl/dateformat/dateformat_attr.c:134:36: error: use of undeclared identifier 'FALSE'
        zend_bool   is_pattern_localized =FALSE;
                                          ^
ext/intl/dateformat/dateformat_attr.c:230:25: error: use of undeclared identifier 'FALSE'
        zend_bool isLenient  = FALSE;
                               ^
ext/intl/normalizer/normalizer_normalize.c:95:10: error: use of undeclared identifier 'FALSE'
                return FALSE;
                       ^
ext/intl/normalizer/normalizer_normalize.c:181:16: error: use of undeclared identifier 'FALSE'
        UBool           uret = FALSE;
                               ^
ext/intl/timezone/timezone_class.cpp:324:21: error: use of undeclared identifier 'FALSE'
        tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
                           ^
ext/intl/timezone/timezone_methods.cpp:94:57: error: use of undeclared identifier 'FALSE'
        tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
                                                               ^

--- breakiterator/codepointiterator_internal.cpp.orig	2020-09-29 08:33:05 UTC
+++ breakiterator/codepointiterator_internal.cpp
@@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIterator::operat
 		return *this;
 	}
 
-	this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
+	this->fText = utext_clone(this->fText, that.fText, false, true, &uec);
 
 	//don't bother copying the character iterator, getText() is deprecated
 	clearCurrentCharIter();
@@ -78,17 +78,17 @@ CodePointBreakIterator::~CodePointBreakIterator()
 UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
 {
 	if (typeid(*this) != typeid(that)) {
-		return FALSE;
+		return false;
 	}
 
 	const CodePointBreakIterator& that2 =
 		static_cast<const CodePointBreakIterator&>(that);
 
 	if (!utext_equals(this->fText, that2.fText)) {
-		return FALSE;
+		return false;
 	}
 
-	return TRUE;
+	return true;
 }
 
 CodePointBreakIterator* CodePointBreakIterator::clone(void) const
@@ -109,7 +109,7 @@ CharacterIterator& CodePointBreakIterator::getText(voi
 
 UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const
 {
-	return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
+	return utext_clone(fillIn, this->fText, false, true, &status);
 }
 
 void CodePointBreakIterator::setText(const UnicodeString &text)
@@ -128,7 +128,7 @@ void CodePointBreakIterator::setText(UText *text, UErr
 		return;
 	}
 
-	this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
+	this->fText = utext_clone(this->fText, text, false, true, &status);
 
 	clearCurrentCharIter();
 }
@@ -280,7 +280,7 @@ CodePointBreakIterator &CodePointBreakIterator::refres
 	}
 
 	int64_t pos = utext_getNativeIndex(this->fText);
-	this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
+	this->fText = utext_clone(this->fText, input, false, true, &status);
 	if (U_FAILURE(status)) {
 		return *this;
 	}
--- collator/collator_sort.c.orig	2020-09-29 08:33:05 UTC
+++ collator/collator_sort.c
@@ -346,7 +346,7 @@ static void collator_sort_internal( int renumber, INTE
  */
 PHP_FUNCTION( collator_sort )
 {
-	collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+	collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU );
 }
 /* }}} */
 
@@ -540,7 +540,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys )
  */
 PHP_FUNCTION( collator_asort )
 {
-	collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+	collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU );
 }
 /* }}} */
 
--- dateformat/dateformat_attr.c.orig	2020-09-29 08:33:05 UTC
+++ dateformat/dateformat_attr.c
@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern )
 	UChar  value_buf[64];
 	uint32_t    length = USIZE( value_buf );
 	UChar* value  = value_buf;
-	zend_bool   is_pattern_localized =FALSE;
+	zend_bool   is_pattern_localized = false;
 
 	DATE_FORMAT_METHOD_INIT_VARS;
 
@@ -131,7 +131,7 @@ PHP_FUNCTION( datefmt_set_pattern )
 	size_t      value_len = 0;
 	int32_t     slength = 0;
 	UChar*	    svalue  = NULL;
-	zend_bool   is_pattern_localized =FALSE;
+	zend_bool   is_pattern_localized = false;
 
 
 	DATE_FORMAT_METHOD_INIT_VARS;
@@ -227,7 +227,7 @@ PHP_FUNCTION( datefmt_is_lenient )
  */
 PHP_FUNCTION( datefmt_set_lenient )
 {
-	zend_bool isLenient  = FALSE;
+	zend_bool isLenient  = false;
 
 	DATE_FORMAT_METHOD_INIT_VARS;
 
--- normalizer/normalizer_normalize.c.orig	2020-09-29 08:33:05 UTC
+++ normalizer/normalizer_normalize.c
@@ -92,7 +92,7 @@ static UBool intl_is_normalized(zend_long form, const 
 	const UNormalizer2 *norm = intl_get_normalizer(form, err);
 
 	if(U_FAILURE(*err)) {
-		return FALSE;
+		return false;
 	}
 
 	return unorm2_isNormalized(norm, uinput, uinput_len, err);
@@ -263,7 +263,7 @@ PHP_FUNCTION( normalizer_is_normalized )
 	int		uinput_len = 0;
 	UErrorCode	status = U_ZERO_ERROR;
 
-	UBool		uret = FALSE;
+	UBool		uret = false;
 
 	intl_error_reset( NULL );
 
--- timezone/timezone_class.cpp.orig	2020-09-29 08:33:05 UTC
+++ timezone/timezone_class.cpp
@@ -322,7 +322,7 @@ static HashTable *TimeZone_get_debug_info(zval *object
 
 	int32_t rawOffset, dstOffset;
 	UDate now = Calendar::getNow();
-	tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
+	tz->getOffset(now, false, rawOffset, dstOffset, uec);
 	if (U_FAILURE(uec)) {
 		return debug_info;
 	}
--- timezone/timezone_methods.cpp.orig	2020-09-29 08:33:05 UTC
+++ timezone/timezone_methods.cpp
@@ -95,7 +95,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)
 		RETURN_NULL();
 	}
 
-	tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
+	tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL,
 		"intltz_from_date_time_zone");
 	if (tz == NULL) {
 		RETURN_NULL();




Regressed by https://github.com/unicode-org/icu/commit/633438f8da99

In file included from breakiterator/breakiterator_class.cpp:23:
breakiterator/codepointiterator_internal.h:42:17: error: virtual function 'operator==' has a different return type ('UBool' (aka 'signed char')) than the function it overrides (which has return type 'bool')
                virtual UBool operator==(const BreakIterator& that) const;
                        ~~~~~ ^
/usr/local/include/unicode/brkiter.h:127:18: note: overridden virtual function is here
    virtual bool operator==(const BreakIterator&) const = 0;
            ~~~~ ^

--- breakiterator/codepointiterator_internal.cpp.orig	2021-09-21 10:24:05 UTC
+++ breakiterator/codepointiterator_internal.cpp
@@ -75,7 +75,11 @@ CodePointBreakIterator::~CodePointBreakIterator()
 	clearCurrentCharIter();
 }
 
+#if U_ICU_VERSION_MAJOR_NUM < 70
 UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
+#else
+bool CodePointBreakIterator::operator==(const BreakIterator& that) const
+#endif
 {
 	if (typeid(*this) != typeid(that)) {
 		return FALSE;
--- breakiterator/codepointiterator_internal.h.orig	2021-09-21 10:24:05 UTC
+++ breakiterator/codepointiterator_internal.h
@@ -39,7 +39,11 @@ namespace PHP {
 
 		virtual ~CodePointBreakIterator();
 
+#if U_ICU_VERSION_MAJOR_NUM < 70
 		virtual UBool operator==(const BreakIterator& that) const;
+#else
+		virtual bool operator==(const BreakIterator& that) const;
+#endif
 
 		virtual CodePointBreakIterator* clone(void) const;
 

Removed Link Here

(-)a/devel/php73-json/Makefile (-9 lines)
1	CATEGORIES= devel
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -json
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/devel/php73-pcntl/Makefile (-9 lines)
1	CATEGORIES= devel
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -pcntl
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/devel/php73-readline/Makefile (-9 lines)
1	CATEGORIES= devel
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -readline
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




--- config.m4.orig	2019-02-05 13:10:04 UTC
+++ config.m4
@@ -3,13 +3,8 @@ dnl config.m4 for extension readline
 PHP_ARG_WITH(libedit,for libedit readline replacement,
 [  --with-libedit[=DIR]      Include libedit readline replacement (CLI/CGI only)])
 
-if test "$PHP_LIBEDIT" = "no"; then
   PHP_ARG_WITH(readline,for readline support,
   [  --with-readline[=DIR]     Include readline support (CLI/CGI only)])
-else
-  dnl "register" the --with-readline option to preven invalid "unknown configure option" warning
-  php_with_readline=no
-fi
 
 if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
   for i in $PHP_READLINE /usr/local /usr; do
@@ -72,6 +67,13 @@ if test "$PHP_READLINE" && test "$PHP_RE
     -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
   ])
 
+  PHP_CHECK_LIBRARY(readline, rl_completion_matches,
+  [
+    AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ])
+  ],[],[
+    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
+  ])
+
   AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
 
 elif test "$PHP_LIBEDIT" != "no"; then

Removed Link Here

(-)a/devel/php73-readline/files/patch-readline_cli.c (-13 lines)
1	--- readline_cli.c.orig 2012-03-02 16:40:26.000000000 +0100
2	+++ readline_cli.c 2012-03-02 16:40:43.000000000 +0100
3	@@ -19,6 +19,10 @@
4
5	/* $Id: readline_cli.c 321634 2012-01-01 13:15:04Z felipe $ */
6
7	+#ifdef HAVE_CONFIG_H
8	+#include "config.h"
9	+#endif
10	+
11	#include "php.h"
12
13	#ifndef HAVE_RL_COMPLETION_MATCHES

Removed Link Here

(-)a/devel/php73-shmop/Makefile (-9 lines)
1	CATEGORIES= devel
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -shmop
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/devel/php73-sysvmsg/Makefile (-9 lines)
1	CATEGORIES= devel
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -sysvmsg
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/devel/php73-sysvsem/Makefile (-9 lines)
1	CATEGORIES= devel
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -sysvsem
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/devel/php73-sysvshm/Makefile (-9 lines)
1	CATEGORIES= devel
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -sysvshm
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/devel/php73-tokenizer/Makefile (-9 lines)
1	CATEGORIES= devel
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -tokenizer
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Lines 55-62 Link Here

(-)b/ftp/Makefile (-2 lines)
55	SUBDIR += pear-Net_FTP	55	SUBDIR += pear-Net_FTP
56	SUBDIR += pftpd	56	SUBDIR += pftpd
57	SUBDIR += php-fastdfs	57	SUBDIR += php-fastdfs
58	SUBDIR += php73-curl
59	SUBDIR += php73-ftp
60	SUBDIR += php74-curl	58	SUBDIR += php74-curl
61	SUBDIR += php74-ftp	59	SUBDIR += php74-ftp
62	SUBDIR += php80-curl	60	SUBDIR += php80-curl

Removed Link Here

(-)a/ftp/php73-curl/Makefile (-9 lines)
1	CATEGORIES= ftp
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -curl
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




CATEGORIES=	ftp

MASTERDIR=	${.CURDIR}/../../lang/php73

PKGNAMESUFFIX=	-ftp

TEST_TARGET=	test

post-patch:
	@${REINPLACE_CMD} s/HAVE_OPENSSL_EXT/__FreeBSD__/ \
		${WRKSRC}/ftp.* ${WRKSRC}/php_ftp.*

.include "${MASTERDIR}/Makefile"

Lines 761-768 Link Here

(-)b/graphics/Makefile (-2 lines)
761	SUBDIR += phototonic	761	SUBDIR += phototonic
762	SUBDIR += php-facedetect	762	SUBDIR += php-facedetect
763	SUBDIR += php-geos	763	SUBDIR += php-geos
764	SUBDIR += php73-exif
765	SUBDIR += php73-gd
766	SUBDIR += php74-exif	764	SUBDIR += php74-exif
767	SUBDIR += php74-gd	765	SUBDIR += php74-gd
768	SUBDIR += php80-exif	766	SUBDIR += php80-exif

Removed Link Here

(-)a/graphics/php73-exif/Makefile (-9 lines)
1	CATEGORIES= graphics
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -exif
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/graphics/php73-gd/Makefile (-11 lines)
1	CATEGORIES= graphics
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -gd
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"
10
11	LIB_DEPENDS+= libgd.so:graphics/gd




--- config.m4.orig	2020-11-24 11:10:57 UTC
+++ config.m4
@@ -184,6 +184,9 @@ AC_DEFUN([PHP_GD_XPM],[
 AC_DEFUN([PHP_GD_FREETYPE2],[
   if test "$PHP_FREETYPE_DIR" != "no"; then
 
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+    AC_MSG_CHECKING([for freetype])
     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
       if test -f "$i/bin/freetype-config"; then
         FREETYPE2_DIR=$i
@@ -192,13 +195,20 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
       fi
     done
 
-    if test -z "$FREETYPE2_DIR"; then
+    if test -n "$FREETYPE2_CONFIG"; then
+      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
+      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
+      AC_MSG_RESULT([found in $FREETYPE2_DIR])
+    elif test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists freetype2; then
+      FREETYPE2_DIR=pkg-config
+      FREETYPE2_CFLAGS=`$PKG_CONFIG freetype2 --cflags`
+      FREETYPE2_LIBS=`$PKG_CONFIG freetype2 --libs`
+      AC_MSG_RESULT([found by pkg-config])
+    else
+      AC_MSG_RESULT([not found])
       AC_MSG_ERROR([freetype-config not found.])
     fi
 
-    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
-    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-
     PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
     PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
     AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
@@ -285,6 +295,7 @@ dnl enable the support in bundled GD library
 
   if test -n "$GD_XPM_DIR"; then
     AC_DEFINE(HAVE_GD_XPM, 1, [ ])
+    AC_DEFINE(HAVE_XPM, 1, [ ])
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM"
   fi
 
@@ -347,7 +358,7 @@ if test "$PHP_GD" != "no"; then
 
   if test "$GD_MODULE_TYPE" = "builtin"; then
     PHP_ADD_BUILD_DIR($ext_builddir/libgd)
-    GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
+    GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS"
     GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"
 
     PHP_TEST_BUILD(foobar, [], [
@@ -355,7 +366,7 @@ if test "$PHP_GD" != "no"; then
     ], [ $GD_SHARED_LIBADD ], [char foobar () {}])
   else
     GD_HEADER_DIRS="ext/gd/"
-    GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS"
+    GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS"
     PHP_ADD_INCLUDE($GD_INCLUDE)
     PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [
       AC_MSG_ERROR([GD build test failed. Please check the config.log for details.])




--- gd.c.orig	2018-09-25 09:07:58 UTC
+++ gd.c
@@ -51,7 +51,7 @@
 # include <Wingdi.h>
 #endif
 
-#ifdef HAVE_GD_XPM
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
 # include <X11/xpm.h>
 #endif
 
@@ -75,7 +75,7 @@ static int le_gd, le_gd_font;
 # endif
 #endif
 
-#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
 # include "X11/xpm.h"
 #endif
 
@@ -322,7 +322,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatef
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-#if defined(HAVE_GD_XPM)
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0)
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
@@ -931,7 +931,7 @@ static const zend_function_entry gd_func
 #endif
 	PHP_FE(imagecreatefromwbmp,						arginfo_imagecreatefromwbmp)
 	PHP_FE(imagecreatefromxbm,						arginfo_imagecreatefromxbm)
-#if defined(HAVE_GD_XPM)
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
 	PHP_FE(imagecreatefromxpm,						arginfo_imagecreatefromxpm)
 #endif
 	PHP_FE(imagecreatefromgd,						arginfo_imagecreatefromgd)
@@ -1296,7 +1296,7 @@ PHP_MINFO_FUNCTION(gd)
 	php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString());
 #endif
 	php_info_print_table_row(2, "WBMP Support", "enabled");
-#if defined(HAVE_GD_XPM)
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
 	php_info_print_table_row(2, "XPM Support", "enabled");
 	{
 		char tmp[12];
@@ -1351,7 +1351,7 @@ PHP_FUNCTION(gd_info)
 	add_assoc_bool(return_value, "PNG Support", 0);
 #endif
 	add_assoc_bool(return_value, "WBMP Support", 1);
-#if defined(HAVE_GD_XPM)
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
 	add_assoc_bool(return_value, "XPM Support", 1);
 #else
 	add_assoc_bool(return_value, "XPM Support", 0);
@@ -2178,7 +2178,7 @@ PHP_FUNCTION(imagetypes)
 	ret |= PHP_IMG_PNG;
 #endif
 	ret |= PHP_IMG_WBMP;
-#if defined(HAVE_GD_XPM)
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
 	ret |= PHP_IMG_XPM;
 #endif
 #ifdef HAVE_GD_WEBP
@@ -2446,7 +2446,7 @@ static void _php_image_create_from(INTER
 			case PHP_GDIMG_TYPE_GD2PART:
 				im = (*func_p)(fp, srcx, srcy, width, height);
 				break;
-#if defined(HAVE_GD_XPM)
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
 			case PHP_GDIMG_TYPE_XPM:
 				im = gdImageCreateFromXpm(file);
 				break;
@@ -2528,7 +2528,7 @@ PHP_FUNCTION(imagecreatefromxbm)
 }
 /* }}} */
 
-#if defined(HAVE_GD_XPM)
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
 /* {{{ proto resource imagecreatefromxpm(string filename)
    Create a new image from XPM file or URL */
 PHP_FUNCTION(imagecreatefromxpm)

Lines 258-265 Link Here

(-)b/lang/Makefile (-2 lines)
258	SUBDIR += pfe	258	SUBDIR += pfe
259	SUBDIR += pharo	259	SUBDIR += pharo
260	SUBDIR += php-mode.el	260	SUBDIR += php-mode.el
261	SUBDIR += php73
262	SUBDIR += php73-extensions
263	SUBDIR += php74	261	SUBDIR += php74
264	SUBDIR += php74-extensions	262	SUBDIR += php74-extensions
265	SUBDIR += php80	263	SUBDIR += php80




PORTNAME=	php73
PORTVERSION=	1.0
CATEGORIES=	lang
PKGNAMESUFFIX=	-extensions

MAINTAINER=	tz@FreeBSD.org
COMMENT=	"meta-port" to install PHP extensions

USES=		metaport php
PHP_VER=	73
IGNORE_WITH_PHP=	72 74

OPTIONS_DEFINE=	BCMATH BZ2 CALENDAR CTYPE CURL DBA \
		DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \
		GMP HASH ICONV INTL IMAP INTERBASE JSON LDAP MBSTRING \
		MYSQLI \
		ODBC OPCACHE OPENSSL PCNTL PDF PDO PDO_DBLIB PDO_FIREBIRD \
		PDO_MYSQL PDO_ODBC PDO_PGSQL PDO_SQLITE PGSQL PHAR POSIX \
		PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOAP \
		SOCKETS SODIUM SQLITE3 SYSVMSG SYSVSEM SYSVSHM \
		TIDY TOKENIZER WDDX XML XMLREADER XMLRPC XMLWRITER XSL \
		ZIP ZLIB

BCMATH_DESC=		bc style precision math functions
BZ2_DESC=		bzip2 library support
CALENDAR_DESC=		calendar conversion support
CTYPE_DESC=		ctype functions
CURL_DESC=		CURL support
DBA_DESC=		dba support
DOM_DESC=		DOM support
ENCHANT_DESC=		Enchant spelling support
EXIF_DESC=		EXIF support
FILEINFO_DESC=		fileinfo support
FILTER_DESC=		input filter support
FTP_DESC=		FTP support
GD_DESC=		GD library support
GETTEXT_DESC=		gettext library support
GMP_DESC=		GNU MP support
HASH_DESC=		HASH Message Digest Framework
ICONV_DESC=		iconv support
IMAP_DESC=		IMAP support
INTL_DESC=		Internationalization(ICU)
INTERBASE_DESC=		Interbase 6 database support (Firebird)
JSON_DESC=		JavaScript Object Serialization support
LDAP_DESC=		OpenLDAP support
MBSTRING_DESC=		multibyte string support
MYSQLI_DESC=		MySQLi database support
ODBC_DESC=		ODBC support
OPCACHE_DESC=		OPcache support
OPENSSL_DESC=		OpenSSL support
PCNTL_DESC=		pcntl support (CLI only)
PDF_DESC=		PDFlib support (implies GD)
PDO_DESC=		PHP Data Objects Interface (PDO)
PDO_DBLIB_DESC=		PDO DBLIB-DB driver
PDO_FIREBIRD_DESC=	PDO Firebird driver
PDO_MYSQL_DESC=		PDO MySQL driver
PDO_ODBC_DESC=		PDO ODBC driver
PDO_PGSQL_DESC=		PDO PostgreSQL driver
PDO_SQLITE_DESC=	PDO sqlite driver
PHAR_DESC=		phar support
POSIX_DESC=		POSIX-like functions
PSPELL_DESC=		pspell support
READLINE_DESC=		readline support (CLI only)
RECODE_DESC=		recode support
SESSION_DESC=		session support
SHMOP_DESC=		shmop support
SIMPLEXML_DESC=		simplexml support
SNMP_DESC=		SNMP support
SOAP_DESC=		SOAP support
SOCKETS_DESC=		sockets support
SODIUM_DESC=		Sodium encryption support
SQLITE3_DESC=		sqlite3 support
SYSVMSG_DESC=		System V message support
SYSVSEM_DESC=		System V semaphore support
SYSVSHM_DESC=		System V shared memory support
TIDY_DESC=		TIDY support
TOKENIZER_DESC=		tokenizer support
WDDX_DESC=		WDDX support (implies XML)
XML_DESC=		XML support
XMLREADER_DESC=		XMLReader support
XMLRPC_DESC=		XMLRPC-EPI support
XMLWRITER_DESC=		XMLWriter support
XSL_DESC=		XSL support (Implies DOM)
ZIP_DESC=		ZIP support
ZLIB_DESC=		ZLIB support

OPTIONS_DEFAULT=	CTYPE \
			DOM \
			FILTER \
			HASH \
			ICONV \
			JSON \
			OPCACHE \
			PDO \
			PDO_SQLITE \
			PHAR \
			POSIX \
			SESSION \
			SIMPLEXML \
			SQLITE3 \
			TOKENIZER \
			XML \
			XMLREADER \
			XMLWRITER

.include <bsd.port.options.mk>

.for opt in ${OPTIONS_DEFINE}
.	if ${PORT_OPTIONS:M${opt}}
USE_PHP+=	${opt:tl}
.	endif
.endfor

.include <bsd.port.mk>

Removed Link Here

(-)a/lang/php73-extensions/pkg-descr (-7 lines)
1	This is a "meta-port" to install the extensions for PHP 7.3.
2
3	Defaults to:
4	ctype, dom, filter, hash, iconv, json, pdo, pdo_sqlite, phar, posix,
5	session, simplexml, sqlite3, tokenizer, xml, xmlreader and xmlwriter.
6
7	WWW: https://www.php.net/




PORTNAME=	php73
DISTVERSION=	7.3.33
PORTREVISION?=	0
CATEGORIES?=	lang devel www
MASTER_SITES=	PHP/distributions
DISTNAME=	php-${DISTVERSION}

MAINTAINER=	tz@FreeBSD.org
COMMENT=	PHP Scripting Language

LICENSE=	PHP301

DEPRECATED=	Upstream active support expired on 2021-12-06
EXPIRATION_DATE=	2021-01-25

USES+=		tar:xz cpe gnome
CPE_PRODUCT=	php
NO_OPTIONS_SORT=yes

.if !defined(PKGNAMESUFFIX)
LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
		libargon2.so:security/libargon2

GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=--with-layout=GNU \
		--with-config-file-scan-dir=${PREFIX}/etc/php \
		--disable-all \
		--enable-libxml \
		--with-libxml-dir=${LOCALBASE} \
		--with-pcre-regex=${LOCALBASE} \
		--with-password-argon2=${LOCALBASE} \
		--program-prefix=""
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
USES+=		autoreconf:build
USE_GNOME=	libxml2

# PR230207 Allow relocations against read-only segments (override lld default)
LDFLAGS_i386=	-Wl,-z,notext

OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQLND LINKTHR ZTS
OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE
OPTIONS_EXCLUDE_DragonFly=	DTRACE
# ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
OPTIONS_EXCLUDE_aarch64=	DTRACE
# dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented
OPTIONS_EXCLUDE_armv6=		DTRACE
OPTIONS_EXCLUDE_armv7=		DTRACE
# Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
OPTIONS_EXCLUDE_mips=		DTRACE FPM
OPTIONS_EXCLUDE_mips64=		DTRACE FPM
# dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: RISC-V implementation required
OPTIONS_EXCLUDE_riscv64=	DTRACE
OPTIONS_EXCLUDE_sparc64=	DTRACE
OPTIONS_SUB=	yes

CLI_DESC=	Build CLI version
CGI_DESC=	Build CGI version
FPM_DESC=	Build FPM version
EMBED_DESC=	Build embedded library
PHPDBG_DESC=	Interactive PHP debugger
MYSQLND_DESC=	Build with MySQL Native Driver
LINKTHR_DESC=	Link thread lib (for threaded extensions)
ZTS_DESC=	Force Zend Thread Safety (ZTS) build

CONFLICTS=	php74 php80

DESTDIRNAME=	INSTALL_ROOT

.include <bsd.port.pre.mk>

.if ${PORT_OPTIONS:MMYSQLND}
CONFIGURE_ARGS+=--enable-mysqlnd
.endif

.if ${PORT_OPTIONS:MCLI}
PHP_SAPI+=	cli
.else
CONFIGURE_ARGS+=--disable-cli
.endif

.if ${PORT_OPTIONS:MCGI}
PHP_SAPI+=	cgi
.else
CONFIGURE_ARGS+=--disable-cgi
.endif

.if ${PORT_OPTIONS:MFPM}
PHP_SAPI+=	fpm
USE_RC_SUBR+=	php-fpm
CONFIGURE_ARGS+=--enable-fpm \
		--with-fpm-user=${WWWOWN} \
		--with-fpm-group=${WWWGRP}
.endif

.if defined(PKGNAMEPREFIX)
USES+=		apache:2.2+
.include "${PORTSDIR}/Mk/Uses/apache.mk"
.if ${PORT_OPTIONS:MAP2FILTER}
CONFIGURE_ARGS+=--with-apxs2filter=${APXS}
.else
CONFIGURE_ARGS+=--with-apxs2=${APXS}
.endif
PLIST=		${PKGDIR}/pkg-plist.mod
PKGMESSAGE=	${PKGDIR}/pkg-message.mod
MODULENAME=	libphp7
SHORTMODNAME=	php7
WARNING=	"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
.endif

.if ${PORT_OPTIONS:MEMBED}
PHP_SAPI+=	embed
CONFIGURE_ARGS+=--enable-embed
.endif

.if ${PORT_OPTIONS:MPHPDBG}
PHP_SAPI+=	phpdbg
CONFIGURE_ARGS+=--enable-phpdbg
.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-phpdbg-debug
.endif
.endif

.if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
PLIST_SUB+=	SAPI_INC=""
.else
PLIST_SUB+=	SAPI_INC="@comment "
.endif

CONFIGURE_ENV+=	ac_cv_decimal_fp_supported="no" \
		lt_cv_path_SED="sed"

.if ${PORT_OPTIONS:MLINKTHR}
LIBS+=		-lpthread
.endif

.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-debug
.endif

.if ${PORT_OPTIONS:MZTS}
CONFIGURE_ARGS+=--enable-maintainer-zts
CONFIGURE_ENV+=	pthreads_working="yes"
.endif

.if ${PORT_OPTIONS:MDTRACE}
CONFIGURE_ARGS+=--enable-dtrace
PLIST_SUB+=	DTRACE=""
.else
PLIST_SUB+=	DTRACE="@comment "
.endif

.if empty(PORT_OPTIONS:MIPV6)
CONFIGURE_ARGS+=--disable-ipv6
.endif

post-patch:
	@${TOUCH} ${WRKSRC}/ext/php_config.h
	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
.if ${PORT_OPTIONS:MFPM}
	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
		${WRKSRC}/sapi/fpm/php-fpm.conf.in
.endif

pre-configure:
	@(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force)

.if !defined(PKGNAMEPREFIX)
post-build:
	@${ECHO_CMD} "PHP_VER=73" > ${WRKDIR}/php.conf
	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
	@${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf
	@${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf
	@${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf

test: build
	@(cd ${WRKSRC} && ${MAKE} test)

post-install:
	${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
.else
do-install:
	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
.endif

.else
.include "${MASTERDIR}/Makefile.ext"
.endif
.include <bsd.port.post.mk>




COMMENT=	The ${PHP_MODNAME} shared extension for php

USES+=	php:ext,noflavors
PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
PHP_VER=	73
IGNORE_WITH_PHP= 72 74

EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
WRKSRC=		${WRKDIR}/${EXTSUBDIR}
PATCHDIR=	${.CURDIR}/files
PLIST=		${NONEXISTENT}

EXTRACT_AFTER_ARGS?=	${EXTSUBDIR}

.if ${PHP_MODNAME} == "bcmath"
CONFIGURE_ARGS+=--enable-bcmath

PHP_HEADER_DIRS=libbcmath/src
.endif

.if ${PHP_MODNAME} == "bz2"
CONFIGURE_ARGS+=--with-bz2=/usr
.endif

.if ${PHP_MODNAME} == "calendar"
CONFIGURE_ARGS+=--enable-calendar
.endif

.if ${PHP_MODNAME} == "ctype"
CONFIGURE_ARGS+=--enable-ctype
.endif

.if ${PHP_MODNAME} == "curl"
LIB_DEPENDS+=	libcurl.so:ftp/curl

CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
.endif

.if ${PHP_MODNAME} == "dba"
CONFIGURE_ARGS+=--enable-dba

OPTIONS_DEFINE=	CDB DB4 GDBM QDBM TOKYO INIFILE FLATFILE LMDB
OPTIONS_DEFAULT=CDB INIFILE FLATFILE

CDB_DESC=	cdb database support
DB4_DESC=	Berkeley DB4 support
GDBM_DESC=	GDBM database support
QDBM_DESC=	QDBM database support
TOKYO_DESC=	Tokyo Cabinet database support
INIFILE_DESC=	INI file support
FLATFILE_DESC=	flatfile support
LMDB_DESC=	LMDB database support

PHP_HEADER_DIRS=	libcdb libflatfile libinifile
.endif

.if ${PHP_MODNAME} == "dom"
CONFIGURE_ARGS+=--enable-dom \
		--with-libxml-dir=${LOCALBASE}

USE_GNOME=	libxml2
.endif

.if ${PHP_MODNAME} == "enchant"
LIB_DEPENDS+=   libenchant.so:textproc/enchant
CONFIGURE_ARGS+=--with-enchant=${LOCALBASE}
.endif

.if ${PHP_MODNAME} == "exif"
CONFIGURE_ARGS+=--enable-exif
.endif

.if ${PHP_MODNAME} == "fileinfo"
CONFIGURE_ARGS+=--enable-fileinfo \
		--with-pcre-dir=${LOCALBASE}

PHP_HEADER_DIRS=	libmagic
.endif

.if ${PHP_MODNAME} == "filter"
CONFIGURE_ARGS+=--enable-filter \
		--with-pcre-dir=${LOCALBASE}
.endif

.if ${PHP_MODNAME} == "ftp"
CONFIGURE_ARGS+=--enable-ftp \
		--with-openssl-dir=${OPENSSLBASE}

LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
USES+=		ssl
.endif

.if ${PHP_MODNAME} == "gd"
LIB_DEPENDS=	libfreetype.so:print/freetype2 \
		libpng.so:graphics/png
USES+=		jpeg pkgconfig

CONFIGURE_ARGS+=--with-gd=${LOCALBASE} \
		--with-freetype-dir=${LOCALBASE} \
		--with-jpeg-dir=${LOCALBASE} \
		--with-png-dir=${LOCALBASE} \
		--with-zlib-dir=/usr

EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude libgd \
		php-${DISTVERSION}/ext/gd

OPTIONS_DEFINE=TRUETYPE JIS WEBP X11
OPTIONS_DEFAULT=TRUETYPE

TRUETYPE_DESC=	Enable TrueType string function
JIS_DESC=	Enable JIS-mapped Japanese font support
WEBP_DESC=  Enable WebP image format support
X11_DESC=	Enable XPM support

.endif

.if ${PHP_MODNAME} == "gettext"
CONFIGURE_ARGS+=--with-gettext=${LOCALBASE}

USES+=		gettext
.endif

.if ${PHP_MODNAME} == "gmp"
LIB_DEPENDS+=	libgmp.so:math/gmp

CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
.endif

.if ${PHP_MODNAME} == "hash"
CONFIGURE_ARGS+=--enable-hash \
		--with-mhash
CFLAGS_mips64=		-DHAVE_SLOW_HASH3
CFLAGS_powerpc64=	-DHAVE_SLOW_HASH3
CFLAGS_powerpc= 	-DHAVE_SLOW_HASH3
CFLAGS_powerpcspe=	-DHAVE_SLOW_HASH3
CFLAGS_sparc64=		-DHAVE_SLOW_HASH3
.endif

.if ${PHP_MODNAME} == "iconv"
CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}

USES+=	iconv:translit
.endif

.if ${PHP_MODNAME} == "imap"
PHP_MOD_PRIO=	30
OPTIONS_RADIO=  CLIENT
OPTIONS_RADIO_CLIENT=	CCLIENT PANDA
OPTIONS_DEFAULT=PANDA
CCLIENT_DESC=	Uses the original but unmaintained cclient
PANDA_DESC=	Uses the forked panda-cclient instead of the original cclient

CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
		--with-pcre-dir=${LOCALBASE} \
		--with-imap-ssl=${OPENSSLBASE}

LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
USES+=	ssl
.endif

.if ${PHP_MODNAME} == "interbase"
CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}

USES+=	firebird
.endif

.if ${PHP_MODNAME} == "intl"
CONFIGURE_ARGS+=--with-intl=${LOCALBASE}
LIB_DEPENDS=	libicui18n.so:devel/icu
.endif

.if ${PHP_MODNAME} == "json"
CONFIGURE_ARGS+=--enable-json
.endif

.if ${PHP_MODNAME} == "ldap"
CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}

USE_OPENLDAP=	yes
.endif

.if ${PHP_MODNAME} == "mbstring"

CONFIGURE_ARGS+=--enable-mbstring \
		--with-pcre-dir=${LOCALBASE}

OPTIONS_DEFINE=	REGEX
OPTIONS_DEFAULT=REGEX

REGEX_DESC=	Enable multibyte regex support

PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
.endif

.if ${PHP_MODNAME} == "mysqli"
OPTIONS_DEFINE=	MYSQLND
OPTIONS_DEFAULT=MYSQLND

MYSQLND_DESC=	Use MySQL Native Driver
.endif

.if ${PHP_MODNAME} == "odbc"
LIB_DEPENDS+=	libodbc.so:databases/unixODBC

CONFIGURE_ARGS+=--enable-odbc \
		--with-unixODBC=${LOCALBASE}
.endif

.if ${PHP_MODNAME} == "openssl"
CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}

LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
USES+=	ssl
.endif

.if ${PHP_MODNAME} == "opcache"
# This is needed by Zend extensions, keep before everything.
PHP_MOD_PRIO=	10
CONFIGURE_ARGS+=--enable-opcache
USES+=	localbase
.endif

.if ${PHP_MODNAME} == "pcntl"
CONFIGURE_ARGS+=--enable-pcntl
.endif

.if ${PHP_MODNAME} == "pdo"
CONFIGURE_ARGS+=--enable-pdo
.endif

.if ${PHP_MODNAME} == "pdo_dblib"
CONFIGURE_ARGS+=--with-pdo-dblib=${LOCALBASE}

USE_PHP=	pdo:build

OPTIONS_DEFINE=	MSSQL

MSSQL_DESC=	Enable Microsoft SQL Server support
.endif

.if ${PHP_MODNAME} == "pdo_firebird"
CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE}

USES+=	firebird
USE_PHP=	pdo:build
.endif

.if ${PHP_MODNAME} == "pdo_odbc"
LIB_DEPENDS+=	libodbc.so:databases/unixODBC
CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}

USE_PHP=	pdo:build
.endif

.if ${PHP_MODNAME} == "pdo_mysql"
OPTIONS_DEFINE=	MYSQLND
OPTIONS_DEFAULT=MYSQLND

MYSQLND_DESC=	Use MySQL Native Driver

USE_PHP=	pdo:build
.endif

.if ${PHP_MODNAME} == "pdo_pgsql"
USES+=		pgsql

CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE}

USE_PHP=	pdo:build
.endif

.if ${PHP_MODNAME} == "pdo_sqlite"
USES+=		sqlite
CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE}

USE_PHP=	pdo:build
.endif

.if ${PHP_MODNAME} == "pgsql"
USES+=		pgsql

CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
.endif

.if ${PHP_MODNAME} == "phar"
CONFIGURE_ARGS+=--enable-phar \
		--with-pcre-dir=${LOCALBASE}

USE_PHP=	hash:build
.endif

.if ${PHP_MODNAME} == "posix"
CONFIGURE_ARGS+=--enable-posix
.endif

.if ${PHP_MODNAME} == "pspell"
LIB_DEPENDS+=	libaspell.so:textproc/aspell

CONFIGURE_ARGS+=--with-pspell=${LOCALBASE}
.endif

.if ${PHP_MODNAME} == "readline"
CONFIGURE_ARGS+=--with-readline=/usr
USES+=		readline
.endif

.if ${PHP_MODNAME} == "recode"
LIB_DEPENDS+=	librecode.so:converters/recode

CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
.endif

.if ${PHP_MODNAME} == "session"
CONFIGURE_ARGS+=--enable-session
PHP_MOD_PRIO=	18
.endif

.if ${PHP_MODNAME} == "shmop"
CONFIGURE_ARGS+=--enable-shmop
.endif

.if ${PHP_MODNAME} == "simplexml"
CONFIGURE_ARGS+=--enable-simplexml \
		--with-pcre-dir=${LOCALBASE} \
		--with-libxml-dir=${LOCALBASE}

USES+=		pkgconfig
USE_GNOME=	libxml2
.endif

.if ${PHP_MODNAME} == "snmp"
CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \
		--with-openssl-dir=${OPENSSLBASE}

CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"

LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
USES+=	ssl
.endif

.if ${PHP_MODNAME} == "soap"
CONFIGURE_ARGS+=--enable-soap \
		--with-libxml-dir=${LOCALBASE}

USE_GNOME=	libxml2
.endif

.if ${PHP_MODNAME} == "sockets"
CONFIGURE_ARGS+=--enable-sockets
.endif

.if ${PHP_MODNAME} == "sodium"
CONFIGURE_ARGS+=	--with-sodium=${LOCALBASE}
LIB_DEPENDS+=	libsodium.so:security/libsodium
.endif

.if ${PHP_MODNAME} == "sqlite3"
USES+=		sqlite
CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE}
.endif

.if ${PHP_MODNAME} == "sysvmsg"
CONFIGURE_ARGS+=--enable-sysvmsg
.endif

.if ${PHP_MODNAME} == "sysvsem"
CONFIGURE_ARGS+=--enable-sysvsem
.endif

.if ${PHP_MODNAME} == "sysvshm"
CONFIGURE_ARGS+=--enable-sysvshm
.endif

.if ${PHP_MODNAME} == "tidy"
CONFIGURE_ARGS+=--with-tidy=${LOCALBASE}

LIB_DEPENDS+=	libtidy.so:www/tidy-lib
.endif

.if ${PHP_MODNAME} == "tokenizer"
CONFIGURE_ARGS+=--enable-tokenizer
.endif

.if ${PHP_MODNAME} == "wddx"
CONFIGURE_ARGS+=--enable-wddx \
		--with-libxml-dir=${LOCALBASE}

USE_GNOME=	libxml2

USE_PHP=	xml:build session:build
.endif

.if ${PHP_MODNAME} == "xml"
CONFIGURE_ARGS+=--enable-xml \
		--with-libxml-dir=${LOCALBASE}

USE_GNOME=	libxml2
.endif

.if ${PHP_MODNAME} == "xmlreader"
CONFIGURE_ARGS+=--enable-xmlreader \
		--with-libxml-dir=${LOCALBASE}

USE_GNOME=	libxml2

USE_PHP=	dom:build
.endif

.if ${PHP_MODNAME} == "xmlrpc"
CONFIGURE_ARGS+=--with-xmlrpc \
		--with-libxml-dir=${LOCALBASE} \
		--with-iconv-dir=${LOCALBASE}

USES+=		iconv:translit
USE_GNOME=	libxml2

PHP_HEADER_DIRS=libxmlrpc

USE_PHP=	xml:build
.endif

.if ${PHP_MODNAME} == "xmlwriter"
CONFIGURE_ARGS+=--enable-xmlwriter \
                --with-libxml-dir=${LOCALBASE}

USE_GNOME=      libxml2
.endif

.if ${PHP_MODNAME} == "xsl"
CONFIGURE_ARGS+=--with-xsl=${LOCALBASE}

USE_GNOME=	libxslt
USE_PHP=	dom:build xml:build
.endif

.if ${PHP_MODNAME} == "zip"
LIB_DEPENDS+=	libzip.so:archivers/libzip

CONFIGURE_ARGS+=--enable-zip \
		--with-zlib-dir=/usr \
		--with-pcre-dir=${LOCALBASE} \
		--with-libzip=${LOCALBASE}
.endif

.if ${PHP_MODNAME} == "zlib"
CONFIGURE_ARGS+=--with-zlib=/usr
.endif

.include <bsd.port.options.mk>

.if ${PHP_MODNAME} == "dba"
.	if empty(PORT_OPTIONS:MCDB)
CONFIGURE_ARGS+=--without-cdb
.	endif
.	if ${PORT_OPTIONS:MDB4}
CONFIGURE_ARGS+=--with-db4=${LOCALBASE}

USES+=			bdb
WITH_BDB_HIGHEST=	yes
.	endif
.	if ${PORT_OPTIONS:MGDBM}
LIB_DEPENDS+=	libgdbm.so:databases/gdbm

CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
.	endif
.	if ${PORT_OPTIONS:MQDBM}
LIB_DEPENDS+=	libqdbm.so:databases/qdbm

CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
.	endif
.	if ${PORT_OPTIONS:MTOKYO}
LIB_DEPENDS+=	libtokyocabinet.so:databases/tokyocabinet

CONFIGURE_ARGS+=--with-tcadb=${LOCALBASE}
.	endif
.	if empty(PORT_OPTIONS:MINIFILE)
CONFIGURE_ARGS+=--disable-inifile
.	endif
.	if empty(PORT_OPTIONS:MFLATFILE)
CONFIGURE_ARGS+=--disable-flatfile
.	endif

.	if ${PORT_OPTIONS:MLMDB}
LIB_DEPENDS+=	liblmdb.so:databases/lmdb
CONFIGURE_ARGS+=	--with-lmdb=${LOCALBASE}
.endif
.endif

.if ${PHP_MODNAME} == "mysqli"
.	if ${PORT_OPTIONS:MMYSQLND}
CONFIGURE_ARGS+=--with-mysqli=mysqlnd
.	else
CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config
USES+=	mysql
.	endif
.endif

.if ${PHP_MODNAME} == "pdo_mysql"
.	if ${PORT_OPTIONS:MMYSQLND}
CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd
.	else
CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \
		--with-zlib-dir=/usr
USES+=	mysql
.	endif
.endif

.if ${PHP_MODNAME} == "gd"
.	if ${PORT_OPTIONS:MTRUETYPE}
CONFIGURE_ARGS+=--enable-gd-native-ttf
.	endif
.	if ${PORT_OPTIONS:MJIS}
CONFIGURE_ARGS+=--enable-gd-jis-conv
.	endif
.   if ${PORT_OPTIONS:MWEBP}
LIB_DEPENDS+=   libwebp.so:graphics/webp

CONFIGURE_ARGS+=--with-webp-dir=${LOCALBASE}
.   endif
.	if ${PORT_OPTIONS:MX11}
USES+=		xorg
USE_XORG=	xpm

CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
.	endif
.endif

.include <bsd.port.pre.mk>

.if ${PHP_MODNAME} == "imap"
.	if ${PORT_OPTIONS:MPANDA}
LIB_DEPENDS+=	libc-client4.so.10:mail/panda-cclient
.	else
LIB_DEPENDS+=	libc-client4.so.9:mail/cclient
.	endif
.endif

.if ${PHP_MODNAME} == "mbstring"
.	if ${PORT_OPTIONS:MREGEX}
LIB_DEPENDS+=	libonig.so:devel/oniguruma
CONFIGURE_ARGS+=--with-onig=${LOCALBASE}
.	else
CONFIGURE_ARGS+=--disable-mbregex
.	endif
.endif

.if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3"
post-extract:
	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
.endif

.if ${PHP_MODNAME} == "pdo_dblib"
.	if ${PORT_OPTIONS:MMSSQL}
LIB_DEPENDS+=	libsybdb.so:databases/freetds
.	else
LIB_DEPENDS+=	libct.so:databases/freetds
.	endif
.endif

.if ${PHP_MODNAME} == "xml"
post-extract:
	@${MKDIR} ${WRKSRC}/ext/xml
	@${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml
.endif

.if ${PHP_MODNAME} == "zlib"
post-extract:
	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
.endif

Removed Link Here

(-)a/lang/php73/distinfo (-3 lines)
1	TIMESTAMP = 1637348769
2	SHA256 (php-7.3.33.tar.xz) = 166eaccde933381da9516a2b70ad0f447d7cec4b603d07b9a916032b215b90cc
3	SIZE (php-7.3.33.tar.xz) = 12143820




--- Makefile.global.orig	2016-08-17 19:50:48 UTC
+++ Makefile.global
@@ -89,14 +89,14 @@ test: all
 	@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
 		INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
 		if test "$$INI_FILE"; then \
-			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
+			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini || :; \
 		else \
 			echo > $(top_builddir)/tmp-php.ini; \
 		fi; \
 		INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
 		if test "$$INI_SCANNED_PATH"; then \
 			INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \
-			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
+			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini || :; \
 		fi; \
 		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \




--- acinclude.m4.orig	2018-12-04 16:12:30 UTC
+++ acinclude.m4
@@ -971,15 +971,9 @@ dnl ------------------------------------
   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|phpdbg[)]
-        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(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;$ext_dir"
   fi
   PHP_ADD_BUILD_DIR($ext_builddir)
@@ -1029,12 +1023,6 @@ You either need to build $1 shared or bu
 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
 ])
 
@@ -2970,8 +2958,7 @@ dnl in GNU Make which causes the .d file
 $abs_srcdir/$ac_provsrc:;
 
 $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
-	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
-
+	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
 \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
 
 EOF
@@ -2990,12 +2977,12 @@ dnl Always attempt to create both PIC an
 $ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
 	echo "[#] Generated by Makefile for libtool" > \$[]@
 	@test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir
-	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
+	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
 	  echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\]
 	else [\\]
 	  echo "pic_object='none'" >> \$[]@ [;\\]
 	fi
-	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
+	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
 	  echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
 	else [\\]
 	  echo "non_pic_object='none'" >> \$[]@ [;\\]
@@ -3007,7 +2994,7 @@ EOF
   *)
 cat>>Makefile.objects<<EOF
 $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
-	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
+	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
 
 EOF
     ;;




--- configure.ac.orig	2018-01-02 22:35:55 UTC
+++ configure.ac
@@ -102,6 +102,7 @@ int zend_sprintf(char *buffer, const char *format, ...
 
 #undef PTHREADS
 
+#include <ext/php_config.h>
 #endif /* PHP_CONFIG_H */
 ])
 
@@ -339,7 +340,6 @@ sinclude(TSRM/tsrm.m4)
 dnl .
 dnl -------------------------------------------------------------------------
 
-PTHREADS_CHECK
 PHP_HELP_SEPARATOR([SAPI modules:])
 PHP_SHLIB_SUFFIX_NAMES
 PHP_BUILD_PROGRAM
@@ -370,15 +370,9 @@ else
   AC_MSG_RESULT([none])
 fi
 
-dnl Exit early
-if test -z "$PHP_INSTALLED_SAPIS"; then
-  AC_MSG_ERROR([Nothing to build.])
-fi
-
 dnl force ZTS
 if test "$enable_maintainer_zts" = "yes"; then
   PTHREADS_ASSIGN_VARS
-  PTHREADS_FLAGS
 fi
 
 dnl Starting system checks.
@@ -682,7 +676,7 @@ nanosleep \
 )
 
 dnl Some systems (like OpenSolaris) do not have nanosleep in libc
-PHP_CHECK_FUNC_LIB(nanosleep, rt)
+PHP_CHECK_FUNC(nanosleep, rt)
 
 dnl Check for getaddrinfo, should be a better way, but...
 dnl Also check for working getaddrinfo
@@ -1235,7 +1229,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=.:${prefix}/share/pear
 
 exec_prefix=$old_exec_prefix
 libdir=$old_libdir
@@ -1434,7 +1428,7 @@ PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)
 PHP_SUBST(install_binary_targets)
 
-PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/])
 
 PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 




--- ext/mysqli/mysqli_api.c.orig	2019-12-17 10:29:23 UTC
+++ ext/mysqli/mysqli_api.c
@@ -31,8 +31,9 @@
 #include "zend_smart_str.h"
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
+#if defined(MYSQLI_USE_MYSQLND)
 #include "ext/mysqlnd/mysql_float_to_double.h"
-
+#endif
 
 #if !defined(MYSQLI_USE_MYSQLND)
 /* {{{ mysqli_tx_cor_options_to_string */




--- ext/mysqli/mysqli_nonapi.c.orig	2020-01-09 11:40:57 UTC
+++ ext/mysqli/mysqli_nonapi.c
@@ -28,7 +28,9 @@
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "zend_smart_str.h"
+#if defined(MYSQLI_USE_MYSQLND)
 #include "php_mysqli_structs.h"
+#endif
 #include "mysqli_priv.h"
 
 #define SAFE_STR(a) ((a)?a:"")




--- ext/mysqli/mysqli_prop.c.orig	2020-01-09 11:40:11 UTC
+++ ext/mysqli/mysqli_prop.c
@@ -26,7 +26,9 @@
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
+#if defined(MYSQLI_USE_MYSQLND)
 #include "php_mysqli_structs.h"
+#endif
 #include "mysqli_priv.h"
 
 #define CHECK_STATUS(value) \

Removed Link Here

(-)a/lang/php73/files/patch-ext_mysqli_php__mysqli__structs.h (-11 lines)
1	--- ext/mysqli/php_mysqli_structs.h.orig 2019-12-17 10:29:23 UTC
2	+++ ext/mysqli/php_mysqli_structs.h
3	@@ -36,7 +36,7 @@
4	#define FALSE 0
5	#endif
6
7	-#ifdef MYSQLI_USE_MYSQLND
8	+#if defined(MYSQLI_USE_MYSQLND)
9	#include "ext/mysqlnd/mysqlnd.h"
10	#include "mysqli_mysqlnd.h"
11	#else

Removed Link Here

(-)a/lang/php73/files/patch-sapi_apache2handler_config.m4 (-11 lines)
1	--- sapi/apache2handler/config.m4.orig 2018-08-14 11:39:14 UTC
2	+++ sapi/apache2handler/config.m4
3	@@ -65,7 +65,7 @@ if test "$PHP_APXS2" != "no"; then
4	fi
5
6	APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
7	- if test -z `$APXS -q SYSCONFDIR`; then
8	+ if true; then
9	INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
10	$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
11	-i -n php7"

Removed Link Here

(-)a/lang/php73/files/patch-sapi_fpm_config.m4 (-11 lines)
1	--- sapi/fpm/config.m4.orig 2018-08-14 11:39:14 UTC
2	+++ sapi/fpm/config.m4
3	@@ -319,7 +319,7 @@ AC_DEFUN([AC_FPM_LQ],
4	AC_MSG_RESULT([no])
5	])
6
7	- if test "$have_lq" = "tcp_info"; then
8	+ if test "$have_lq" = "so_listenq"; then
9	AC_DEFINE([HAVE_LQ_TCP_INFO], 1, [do we have TCP_INFO?])
10	fi
11




--- sapi/fpm/www.conf.in.orig	2019-01-26 15:54:27 UTC
+++ sapi/fpm/www.conf.in
@@ -27,10 +27,14 @@ group = @php_fpm_group@
 ; Valid syntaxes are:
 ;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
 ;                            a specific port;
+;   '0.0.0.0:port'         - to listen on a TCP socket to all IPv4 addresses 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 addresses
 ;                            (IPv6 and IPv4-mapped) on a specific port;
+;                            Note: IPv4-mapped addresses are disabled by-default in
+;                                  FreeBSD for security reasons;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
 listen = 127.0.0.1:9000




#!/bin/sh

# PROVIDE: php-fpm
# REQUIRE: LOGIN
# KEYWORD: shutdown

#
# Add the following line to /etc/rc.conf to enable php-fpm:
# php_fpm_enable="YES"
#

. /etc/rc.subr

name="php_fpm"
rcvar=php_fpm_enable

start_precmd="php_fpm_prestart"
restart_precmd="php_fpm_checkconfig"
reload_precmd="php_fpm_checkconfig"
configtest_cmd="php_fpm_checkconfig"

load_rc_config "$name"

: ${php_fpm_enable="NO"}
: ${php_fpm_umask=""}

extra_commands="reload configtest logrotate"

command="%%PREFIX%%/sbin/php-fpm"
pidfile="/var/run/php-fpm.pid"
sig_stop="QUIT"
sig_reload="USR2"
logrotate_cmd="php_fpm_logrotate"

required_files="%%PREFIX%%/etc/php-fpm.conf"

php_fpm_logrotate() {
        if [ -z "$rc_pid" ]; then
                _run_rc_notrunning
                return 1
        fi
        echo "Rotating logs $name."
        kill -USR1 $rc_pid
}

php_fpm_checkconfig()
{
        echo "Performing sanity check on php-fpm configuration:"
        eval ${command} -t
}

php_fpm_prestart()
{
	php_fpm_checkconfig
	checkconfig=$?
	if [ $checkconfig -ne 0  ]; then
		return $checkconfig
	fi

	if [ ! -z "$php_fpm_umask"  ]; then
		echo "Setting umask to: ${php_fpm_umask}"
		umask $php_fpm_umask
	fi
}

run_rc_command "$1"

Removed Link Here

(-)a/lang/php73/pkg-descr (-8 lines)
1	PHP, which stands for "PHP: Hypertext Preprocessor" is a widely-used Open
2	Source general-purpose scripting language that is especially suited for
3	Web development and can be embedded into HTML. Its syntax draws upon C,
4	Java, and Perl, and is easy to learn. The main goal of the language is to
5	allow web developers to write dynamically generated webpages quickly, but
6	you can do much more with PHP.
7
8	WWW: https://www.php.net/




[
{ type: install
  message: <<EOM
Make sure index.php is part of your DirectoryIndex.

You should add the following to your Apache configuration file:

<FilesMatch "\.php$">
    SetHandler application/x-httpd-php
</FilesMatch>
<FilesMatch "\.phps$">
    SetHandler application/x-httpd-php-source
</FilesMatch>

If you are building PHP-based ports in poudriere(8) or Synth with ZTS enabled,
add WITH_MPM=event to /etc/make.conf to prevent build failures.
EOM
}
]




%%CLI%%bin/php
%%CGI%%bin/php-cgi
bin/php-config
%%PHPDBG%%bin/phpdbg
bin/phpize
%%FPM%%sbin/php-fpm
etc/php.conf
etc/php.ini-development
etc/php.ini-production
%%FPM%%@sample etc/php-fpm.conf.default etc/php-fpm.conf
%%FPM%%@sample etc/php-fpm.d/www.conf.default etc/php-fpm.d/www.conf
include/php/TSRM/TSRM.h
include/php/TSRM/readdir.h
include/php/TSRM/tsrm_config.h
include/php/TSRM/tsrm_config.w32.h
include/php/TSRM/tsrm_config_common.h
include/php/TSRM/tsrm_strtok_r.h
include/php/TSRM/tsrm_win32.h
include/php/Zend/zend.h
include/php/Zend/zend_API.h
include/php/Zend/zend_alloc.h
include/php/Zend/zend_alloc_sizes.h
include/php/Zend/zend_arena.h
include/php/Zend/zend_ast.h
include/php/Zend/zend_bitset.h
include/php/Zend/zend_build.h
include/php/Zend/zend_builtin_functions.h
include/php/Zend/zend_closures.h
include/php/Zend/zend_compile.h
include/php/Zend/zend_config.h
include/php/Zend/zend_config.nw.h
include/php/Zend/zend_config.w32.h
include/php/Zend/zend_constants.h
include/php/Zend/zend_cpuinfo.h
include/php/Zend/zend_dtrace.h
%%DTRACE%%include/php/Zend/zend_dtrace_gen.h
include/php/Zend/zend_errors.h
include/php/Zend/zend_exceptions.h
include/php/Zend/zend_execute.h
include/php/Zend/zend_extensions.h
include/php/Zend/zend_float.h
include/php/Zend/zend_gc.h
include/php/Zend/zend_generators.h
include/php/Zend/zend_globals.h
include/php/Zend/zend_globals_macros.h
include/php/Zend/zend_hash.h
include/php/Zend/zend_highlight.h
include/php/Zend/zend_inheritance.h
include/php/Zend/zend_ini.h
include/php/Zend/zend_ini_parser.h
include/php/Zend/zend_ini_scanner.h
include/php/Zend/zend_ini_scanner_defs.h
include/php/Zend/zend_interfaces.h
include/php/Zend/zend_istdiostream.h
include/php/Zend/zend_iterators.h
include/php/Zend/zend_language_parser.h
include/php/Zend/zend_language_scanner.h
include/php/Zend/zend_language_scanner_defs.h
include/php/Zend/zend_list.h
include/php/Zend/zend_llist.h
include/php/Zend/zend_long.h
include/php/Zend/zend_modules.h
include/php/Zend/zend_multibyte.h
include/php/Zend/zend_multiply.h
include/php/Zend/zend_object_handlers.h
include/php/Zend/zend_objects.h
include/php/Zend/zend_objects_API.h
include/php/Zend/zend_operators.h
include/php/Zend/zend_portability.h
include/php/Zend/zend_ptr_stack.h
include/php/Zend/zend_range_check.h
include/php/Zend/zend_signal.h
include/php/Zend/zend_smart_str.h
include/php/Zend/zend_smart_str_public.h
include/php/Zend/zend_smart_string.h
include/php/Zend/zend_smart_string_public.h
include/php/Zend/zend_sort.h
include/php/Zend/zend_stack.h
include/php/Zend/zend_stream.h
include/php/Zend/zend_string.h
include/php/Zend/zend_strtod.h
include/php/Zend/zend_strtod_int.h
include/php/Zend/zend_ts_hash.h
include/php/Zend/zend_type_info.h
include/php/Zend/zend_types.h
include/php/Zend/zend_variables.h
include/php/Zend/zend_virtual_cwd.h
include/php/Zend/zend_vm.h
include/php/Zend/zend_vm_def.h
include/php/Zend/zend_vm_execute.h
include/php/Zend/zend_vm_handlers.h
include/php/Zend/zend_vm_opcodes.h
include/php/Zend/zend_vm_trace_handlers.h
include/php/Zend/zend_vm_trace_map.h
include/php/ext/date/lib/timelib.h
include/php/ext/date/lib/timelib_config.h
include/php/ext/date/php_date.h
include/php/ext/libxml/php_libxml.h
%%MYSQLND%%include/php/ext/mysqlnd/config-win.h
%%MYSQLND%%include/php/ext/mysqlnd/mysql_float_to_double.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_alloc.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_auth.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_block_alloc.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_charset.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_commands.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_connection.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_debug.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_plugin.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_portability.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_priv.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_ps.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_read_buffer.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_result.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_result_meta.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_reverse_api.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_statistics.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_structs.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_vio.h
%%MYSQLND%%include/php/ext/mysqlnd/php_mysqlnd.h
include/php/ext/pcre/php_pcre.h
include/php/ext/spl/php_spl.h
include/php/ext/spl/spl_array.h
include/php/ext/spl/spl_directory.h
include/php/ext/spl/spl_dllist.h
include/php/ext/spl/spl_engine.h
include/php/ext/spl/spl_exceptions.h
include/php/ext/spl/spl_fixedarray.h
include/php/ext/spl/spl_functions.h
include/php/ext/spl/spl_heap.h
include/php/ext/spl/spl_iterators.h
include/php/ext/spl/spl_observer.h
include/php/ext/standard/base64.h
include/php/ext/standard/basic_functions.h
include/php/ext/standard/crc32.h
include/php/ext/standard/credits.h
include/php/ext/standard/credits_ext.h
include/php/ext/standard/credits_sapi.h
include/php/ext/standard/crypt_blowfish.h
include/php/ext/standard/crypt_freesec.h
include/php/ext/standard/css.h
include/php/ext/standard/cyr_convert.h
include/php/ext/standard/datetime.h
include/php/ext/standard/dl.h
include/php/ext/standard/exec.h
include/php/ext/standard/file.h
include/php/ext/standard/flock_compat.h
include/php/ext/standard/fsock.h
include/php/ext/standard/head.h
include/php/ext/standard/hrtime.h
include/php/ext/standard/html.h
include/php/ext/standard/html_tables.h
include/php/ext/standard/info.h
include/php/ext/standard/md5.h
include/php/ext/standard/microtime.h
include/php/ext/standard/pack.h
include/php/ext/standard/pageinfo.h
include/php/ext/standard/php_array.h
include/php/ext/standard/php_assert.h
include/php/ext/standard/php_browscap.h
include/php/ext/standard/php_crypt.h
include/php/ext/standard/php_crypt_r.h
include/php/ext/standard/php_dir.h
include/php/ext/standard/php_dns.h
include/php/ext/standard/php_ext_syslog.h
include/php/ext/standard/php_filestat.h
include/php/ext/standard/php_fopen_wrappers.h
include/php/ext/standard/php_ftok.h
include/php/ext/standard/php_http.h
include/php/ext/standard/php_image.h
include/php/ext/standard/php_incomplete_class.h
include/php/ext/standard/php_iptc.h
include/php/ext/standard/php_lcg.h
include/php/ext/standard/php_link.h
include/php/ext/standard/php_mail.h
include/php/ext/standard/php_math.h
include/php/ext/standard/php_metaphone.h
include/php/ext/standard/php_mt_rand.h
include/php/ext/standard/php_net.h
include/php/ext/standard/php_password.h
include/php/ext/standard/php_rand.h
include/php/ext/standard/php_random.h
include/php/ext/standard/php_smart_string.h
include/php/ext/standard/php_smart_string_public.h
include/php/ext/standard/php_standard.h
include/php/ext/standard/php_string.h
include/php/ext/standard/php_type.h
include/php/ext/standard/php_uuencode.h
include/php/ext/standard/php_var.h
include/php/ext/standard/php_versioning.h
include/php/ext/standard/proc_open.h
include/php/ext/standard/quot_print.h
include/php/ext/standard/scanf.h
include/php/ext/standard/sha1.h
include/php/ext/standard/streamsfuncs.h
include/php/ext/standard/uniqid.h
include/php/ext/standard/url.h
include/php/ext/standard/url_scanner_ex.h
include/php/ext/standard/winver.h
@touch include/php/ext/php_config.h
@rmempty include/php/ext/php_config.h
include/php/main/SAPI.h
include/php/main/build-defs.h
include/php/main/fastcgi.h
include/php/main/fopen_wrappers.h
include/php/main/http_status_codes.h
include/php/main/php.h
include/php/main/php_compat.h
include/php/main/php_config.h
include/php/main/php_content_types.h
include/php/main/php_getopt.h
include/php/main/php_globals.h
include/php/main/php_ini.h
include/php/main/php_main.h
include/php/main/php_memory_streams.h
include/php/main/php_network.h
include/php/main/php_open_temporary_file.h
include/php/main/php_output.h
include/php/main/php_reentrancy.h
include/php/main/php_scandir.h
include/php/main/php_stdint.h
include/php/main/php_streams.h
include/php/main/php_syslog.h
include/php/main/php_ticks.h
include/php/main/php_variables.h
include/php/main/php_version.h
include/php/main/rfc1867.h
include/php/main/snprintf.h
include/php/main/spprintf.h
include/php/main/streams/php_stream_context.h
include/php/main/streams/php_stream_filter_api.h
include/php/main/streams/php_stream_glob_wrapper.h
include/php/main/streams/php_stream_mmap.h
include/php/main/streams/php_stream_plain_wrapper.h
include/php/main/streams/php_stream_transport.h
include/php/main/streams/php_stream_userspace.h
include/php/main/streams/php_streams_int.h
%%CLI%%include/php/sapi/cli/cli.h
%%EMBED%%include/php/sapi/embed/php_embed.h
%%EMBED%%lib/libphp7.so
lib/php/build/Makefile.global
lib/php/build/acinclude.m4
lib/php/build/ax_check_compile_flag.m4
lib/php/build/ax_gcc_func_attribute.m4
lib/php/build/config.guess
lib/php/build/config.sub
lib/php/build/libtool.m4
lib/php/build/ltmain.sh
lib/php/build/mkdep.awk
lib/php/build/phpize.m4
lib/php/build/run-tests.php
lib/php/build/scan_makefile_in.awk
lib/php/build/shtool
%%CGI%%man/man1/php-cgi.1.gz
man/man1/php-config.1.gz
%%CLI%%man/man1/php.1.gz
%%PHPDBG%%man/man1/phpdbg.1.gz
man/man1/phpize.1.gz
%%FPM%%man/man8/php-fpm.8.gz
%%FPM%%share/php/fpm/status.html

Removed Link Here

(-)a/lang/php73/pkg-plist.mod (-3 lines)
1	%%APACHEMODDIR%%/%%AP_MODULE%%
2	@postexec %D/sbin/apxs -e -a -n %%AP_NAME%% %f
3	@preunexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f

Lines 8-14 COMMENT= "meta-port" to install PHP extensions Link Here

(-)b/lang/php74-extensions/Makefile (-1 lines)
8		8
9	USES= metaport php	9	USES= metaport php
10	PHP_VER= 74	10	PHP_VER= 74
11	IGNORE_WITH_PHP= 72 73
12		11
13	OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \	12	OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \
14	DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \	13	DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \

Lines 8-14 COMMENT= "meta-port" to install PHP extensions Link Here

(-)b/lang/php80-extensions/Makefile (-1 / +1 lines)
8		8
9	USES= metaport php	9	USES= metaport php
10	PHP_VER= 80	10	PHP_VER= 80
11	IGNORE_WITH_PHP= 72 73 74	11	IGNORE_WITH_PHP= 74
12		12
13	OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \	13	OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \
14	DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \	14	DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \

Lines 448-454 Link Here

(-)b/mail/Makefile (-1 lines)
448	SUBDIR += perdition	448	SUBDIR += perdition
449	SUBDIR += pflogsumm	449	SUBDIR += pflogsumm
450	SUBDIR += pfqueue	450	SUBDIR += pfqueue
451	SUBDIR += php73-imap
452	SUBDIR += php74-imap	451	SUBDIR += php74-imap
453	SUBDIR += php80-imap	452	SUBDIR += php80-imap
454	SUBDIR += phplist	453	SUBDIR += phplist

Removed Link Here

(-)a/mail/php73-imap/Makefile (-9 lines)
1	CATEGORIES= mail
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -imap
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




--- config.m4.orig	2010-02-07 14:06:54.000000000 +0100
+++ config.m4	2010-03-08 11:56:24.000000000 +0100
@@ -103,6 +103,8 @@
 PHP_ARG_WITH(imap-ssl,for IMAP SSL support,
 [  --with-imap-ssl[=DIR]     IMAP: Include SSL support. DIR is the OpenSSL install prefix], no, no)
 
+PHP_ARG_WITH(pcre-dir, pcre install prefix,
+[  --with-pcre-dir           IMAP: pcre install prefix], no, no)
 
 if test "$PHP_IMAP" != "no"; then  
     PHP_SUBST(IMAP_SHARED_LIBADD)
@@ -119,6 +121,30 @@
       fi
     done
 
+  dnl This is PECL build, check if bundled PCRE library is used
+  old_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS=$INCLUDES
+  AC_EGREP_CPP(yes,[
+#include <main/php_config.h>
+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
+yes
+#endif
+  ],[
+    PHP_PCRE_REGEX=yes
+  ],[
+    AC_EGREP_CPP(yes,[
+#include <main/php_config.h>
+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
+yes
+#endif
+    ],[
+      PHP_PCRE_REGEX=pecl
+      PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
+    ],[
+      PHP_PCRE_REGEX=no
+    ])
+  ])
+
     dnl Check for c-client version 2004
     AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [
       AC_DEFINE(HAVE_IMAP2004,1,[ ])

Lines 761-768 Link Here

(-)b/math/Makefile (-2 lines)
761	SUBDIR += permlib	761	SUBDIR += permlib
762	SUBDIR += petanque	762	SUBDIR += petanque
763	SUBDIR += petiga	763	SUBDIR += petiga
764	SUBDIR += php73-bcmath
765	SUBDIR += php73-gmp
766	SUBDIR += php74-bcmath	764	SUBDIR += php74-bcmath
767	SUBDIR += php74-gmp	765	SUBDIR += php74-gmp
768	SUBDIR += php80-bcmath	766	SUBDIR += php80-bcmath

Removed Link Here

(-)a/math/php73-bcmath/Makefile (-9 lines)
1	CATEGORIES= math
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -bcmath
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/math/php73-gmp/Makefile (-9 lines)
1	CATEGORIES= math
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -gmp
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Lines 355-361 Link Here

(-)b/misc/Makefile (-1 lines)
355	SUBDIR += pecl-timezonedb	355	SUBDIR += pecl-timezonedb
356	SUBDIR += perkeep	356	SUBDIR += perkeep
357	SUBDIR += pfm	357	SUBDIR += pfm
358	SUBDIR += php73-calendar
359	SUBDIR += php74-calendar	358	SUBDIR += php74-calendar
360	SUBDIR += php80-calendar	359	SUBDIR += php80-calendar
361	SUBDIR += pinfo	360	SUBDIR += pinfo

Removed Link Here

(-)a/misc/php73-calendar/Makefile (-9 lines)
1	CATEGORIES= misc
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -calendar
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Lines 278-284 Link Here

(-)b/net-mgmt/Makefile (-1 lines)
278	SUBDIR += percona-monitoring-plugins	278	SUBDIR += percona-monitoring-plugins
279	SUBDIR += pftabled	279	SUBDIR += pftabled
280	SUBDIR += php-fpm_exporter	280	SUBDIR += php-fpm_exporter
281	SUBDIR += php73-snmp
282	SUBDIR += php74-snmp	281	SUBDIR += php74-snmp
283	SUBDIR += php80-snmp	282	SUBDIR += php80-snmp
284	SUBDIR += phpfpm_exporter	283	SUBDIR += phpfpm_exporter

Removed Link Here

(-)a/net-mgmt/php73-snmp/Makefile (-9 lines)
1	CATEGORIES= net-mgmt
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -snmp
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Lines 974-983 Link Here

(-)b/net/Makefile (-4 lines)
974	SUBDIR += pecl-zmq	974	SUBDIR += pecl-zmq
975	SUBDIR += pen	975	SUBDIR += pen
976	SUBDIR += pfinger	976	SUBDIR += pfinger
977	SUBDIR += php73-ldap
978	SUBDIR += php73-soap
979	SUBDIR += php73-sockets
980	SUBDIR += php73-xmlrpc
981	SUBDIR += php74-ldap	977	SUBDIR += php74-ldap
982	SUBDIR += php74-soap	978	SUBDIR += php74-soap
983	SUBDIR += php74-sockets	979	SUBDIR += php74-sockets

Lines 11-17 COMMENT= PHP extension for XML-RPC servers and clients Link Here

(-)b/net/pecl-xmlrpc/Makefile (-1 / +1 lines)
11	LICENSE= PHP301	11	LICENSE= PHP301
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
14	IGNORE_WITH_PHP= 73 74	14	IGNORE_WITH_PHP= 74
15		15
16	USES= iconv:translit gnome php:pecl pkgconfig	16	USES= iconv:translit gnome php:pecl pkgconfig
17	USE_PHP= xml:build	17	USE_PHP= xml:build

Removed Link Here

(-)a/net/php73-ldap/Makefile (-9 lines)
1	CATEGORIES= net
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -ldap
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/net/php73-soap/Makefile (-9 lines)
1	CATEGORIES= net
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -soap
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/net/php73-sockets/Makefile (-9 lines)
1	CATEGORIES= net
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -sockets
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/net/php73-xmlrpc/Makefile (-9 lines)
1	CATEGORIES= net
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -xmlrpc
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




--- config.m4.orig	2014-04-29 08:04:30.000000000 +0000
+++ config.m4	2014-05-15 08:04:00.883004682 +0000
@@ -61,11 +61,9 @@ if test "$PHP_XMLRPC" != "no"; then
     fi
   fi
 
-  dnl if iconv is shared or missing then we should build iconv ourselves
-  if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then
-
     if test "$PHP_ICONV_DIR" != "no"; then
       PHP_ICONV=$PHP_ICONV_DIR
+      PHP_ADD_INCLUDE($PHP_ICONV_DIR/include)
     fi
   
     if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then
@@ -75,7 +73,6 @@ if test "$PHP_XMLRPC" != "no"; then
     PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [
       AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library])
     ])
-  fi
 fi
 
 if test "$PHP_XMLRPC" = "yes"; then

Lines 798-807 Link Here

(-)b/security/Makefile (-4 lines)
798	SUBDIR += pgpdump	798	SUBDIR += pgpdump
799	SUBDIR += pgpgpg	799	SUBDIR += pgpgpg
800	SUBDIR += pgpin	800	SUBDIR += pgpin
801	SUBDIR += php73-filter
802	SUBDIR += php73-hash
803	SUBDIR += php73-openssl
804	SUBDIR += php73-sodium
805	SUBDIR += php74-filter	801	SUBDIR += php74-filter
806	SUBDIR += php74-openssl	802	SUBDIR += php74-openssl
807	SUBDIR += php74-sodium	803	SUBDIR += php74-sodium

Lines 13-19 LIB_DEPENDS= libsodium.so:security/libsodium Link Here

(-)b/security/pecl-libsodium/Makefile (-1 lines)
13		13
14	USES= localbase php:pecl	14	USES= localbase php:pecl
15		15
16	#IGNORE_WITH_PHP=72 73 74
17	PHP_MODNAME= sodium	16	PHP_MODNAME= sodium
18		17
19	.include <bsd.port.mk>	18	.include <bsd.port.mk>

Lines 12-17 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here

(-)b/security/pecl-pkcs11/Makefile (-2 lines)
12		12
13	USES= localbase php:pecl	13	USES= localbase php:pecl
14		14
15	IGNORE_WITH_PHP=73
16
17	.include <bsd.port.mk>	15	.include <bsd.port.mk>

Removed Link Here

(-)a/security/php73-filter/Makefile (-9 lines)
1	CATEGORIES= security
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -filter
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/security/php73-filter/files/patch-config.m4 (-10 lines)
1	--- config.m4.orig 2009-03-06 08:25:45.000000000 +0100
2	+++ config.m4 2009-03-06 08:28:10.000000000 +0100
3	@@ -32,6 +32,7 @@
4	#endif
5	],[
6	PHP_PCRE_REGEX=pecl
7	+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
8	],[
9	PHP_PCRE_REGEX=no
10	])

Removed Link Here

(-)a/security/php73-hash/Makefile (-9 lines)
1	CATEGORIES= security
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -hash
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/security/php73-openssl/Makefile (-9 lines)
1	CATEGORIES= security
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -openssl
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/security/php73-sodium/Makefile (-9 lines)
1	CATEGORIES= security
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -sodium
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




--- config.m4.orig	2017-11-03 18:32:08 UTC
+++ config.m4
@@ -50,14 +50,6 @@ if test "$PHP_SODIUM" != "no"; then
     PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $LIBSODIUM_DIR/$PHP_LIBDIR, SODIUM_SHARED_LIBADD)
   fi
 
-  PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
-  [
-    AC_DEFINE(HAVE_LIBSODIUMLIB,1,[ ])
-  ],[
-    AC_MSG_ERROR([wrong libsodium lib version (< 1.0.8) or lib not found])
-  ],[
-  ])
-
   PHP_SUBST(SODIUM_SHARED_LIBADD)
 
   PHP_NEW_EXTENSION(sodium, libsodium.c, $ext_shared)

Lines 952-959 Link Here

(-)b/sysutils/Makefile (-2 lines)
952	SUBDIR += pfstat	952	SUBDIR += pfstat
953	SUBDIR += pftables	953	SUBDIR += pftables
954	SUBDIR += pftop	954	SUBDIR += pftop
955	SUBDIR += php73-fileinfo
956	SUBDIR += php73-posix
957	SUBDIR += php74-fileinfo	955	SUBDIR += php74-fileinfo
958	SUBDIR += php74-posix	956	SUBDIR += php74-posix
959	SUBDIR += php80-fileinfo	957	SUBDIR += php80-fileinfo

Removed Link Here

(-)a/sysutils/php73-fileinfo/Makefile (-9 lines)
1	CATEGORIES= sysutils
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -fileinfo
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




--- config.m4.orig	2010-09-07 15:45:30.000000000 +0200
+++ config.m4	2010-09-07 15:46:50.000000000 +0200
@@ -4,6 +4,9 @@
 PHP_ARG_ENABLE(fileinfo, for fileinfo support,
 [  --disable-fileinfo      Disable fileinfo support], yes)
 
+PHP_ARG_WITH(pcre-dir, pcre install prefix,
+[  --with-pcre-dir           FILEINFO: pcre install prefix], no, no)
+
 if test "$PHP_FILEINFO" != "no"; then
 
   libmagic_sources=" \
@@ -13,6 +16,8 @@
     libmagic/is_tar.c libmagic/magic.c libmagic/print.c \
     libmagic/readcdf.c libmagic/readelf.c libmagic/softmagic.c"
 
+  PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
+
   PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic)
   PHP_ADD_BUILD_DIR($ext_builddir/libmagic)
 

Removed Link Here

(-)a/sysutils/php73-posix/Makefile (-9 lines)
1	CATEGORIES= sysutils
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -posix
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




--- posix.c.orig	Fri Feb 23 00:40:39 2007
+++ posix.c	Sun May 13 17:52:27 2007
@@ -838,7 +838,7 @@
 #if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX)
 	buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
 	if (buflen < 1) {
-		RETURN_FALSE;
+		buflen = 1024;
 	}
 	buf = emalloc(buflen);
 	g = &gbuf;
@@ -888,7 +888,7 @@
 	
 	grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
 	if (grbuflen < 1) {
-		RETURN_FALSE;
+		grbuflen = 1024;
 	}
 
 	grbuf = emalloc(grbuflen);
@@ -955,7 +955,7 @@
 #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
 	buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
 	if (buflen < 1) {
-		RETURN_FALSE;
+		buflen = 1024;
 	}
 	buf = emalloc(buflen);
 	pw = &pwbuf;
@@ -1004,7 +1004,7 @@
 #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R)
 	pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
 	if (pwbuflen < 1) {
-		RETURN_FALSE;
+		pwbuflen = 1024;
 	}
 	pwbuf = emalloc(pwbuflen);
 




    SUBDIR += peco
    SUBDIR += perl2html
    SUBDIR += php-mecab
    SUBDIR += php73-ctype
    SUBDIR += php73-dom
    SUBDIR += php73-enchant
    SUBDIR += php73-pspell
    SUBDIR += php73-simplexml
    SUBDIR += php73-wddx
    SUBDIR += php73-xml
    SUBDIR += php73-xmlreader
    SUBDIR += php73-xmlwriter
    SUBDIR += php73-xsl
    SUBDIR += php74-ctype
    SUBDIR += php74-dom
    SUBDIR += php74-enchant

Removed Link Here

(-)a/textproc/php73-ctype/Makefile (-9 lines)
1	CATEGORIES= textproc
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -ctype
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/textproc/php73-dom/Makefile (-9 lines)
1	CATEGORIES= textproc
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -dom
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/textproc/php73-enchant/Makefile (-9 lines)
1	CATEGORIES= textproc
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -enchant
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/textproc/php73-pspell/Makefile (-9 lines)
1	CATEGORIES= textproc
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -pspell
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/textproc/php73-simplexml/Makefile (-9 lines)
1	CATEGORIES= textproc
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -simplexml
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




--- config.m4.orig	2018-09-25 09:08:02 UTC
+++ config.m4
@@ -3,6 +3,9 @@ dnl config.m4 for extension simplexml
 PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support,
 [  --disable-simplexml     Disable SimpleXML support], yes)
 
+PHP_ARG_WITH(pcre-dir, pcre install prefix,
+[  --with-pcre-dir           SimpleXML: pcre install prefix], no, no)
+
 if test -z "$PHP_LIBXML_DIR"; then
   PHP_ARG_WITH(libxml-dir, libxml2 install dir,
   [  --with-libxml-dir=DIR   SimpleXML: libxml2 install prefix], no, no)
@@ -10,6 +13,30 @@ fi
 
 if test "$PHP_SIMPLEXML" != "no"; then
 
+  dnl This is PECL build, check if bundled PCRE library is used
+  old_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS=$INCLUDES
+  AC_EGREP_CPP(yes,[
+#include <main/php_config.h>
+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
+yes
+#endif
+  ],[
+    PHP_PCRE_REGEX=yes
+  ],[
+    AC_EGREP_CPP(yes,[
+#include <main/php_config.h>
+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
+yes
+#endif
+    ],[
+      PHP_PCRE_REGEX=pecl
+      PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
+    ],[
+      PHP_PCRE_REGEX=no
+    ])
+  ])
+
   if test "$PHP_LIBXML" = "no"; then
     AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml])
   fi

Removed Link Here

(-)a/textproc/php73-wddx/Makefile (-9 lines)
1	CATEGORIES= textproc
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -wddx
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"




--- config.m4.orig	Mon Jul 26 09:05:10 2004
+++ config.m4	Mon Jul 26 09:07:46 2004
@@ -5,6 +5,9 @@
 PHP_ARG_ENABLE(wddx,whether to enable WDDX support,
 [  --enable-wddx           Enable WDDX support.])
 
+PHP_ARG_WITH(libxml-dir, libxml2 install dir,
+[  --with-libxml-dir=<DIR>    WDDX: libxml2 install prefix], no, no)
+
 if test "$PHP_WDDX" != "no"; then
   if test "$ext_shared" != "yes" && test "$enable_xml" = "no"; then
     AC_MSG_WARN(Activating XML)
@@ -12,4 +15,9 @@
   fi
   AC_DEFINE(HAVE_WDDX, 1, [ ])
   PHP_NEW_EXTENSION(wddx, wddx.c, $ext_shared)
+
+  PHP_SETUP_LIBXML(WDDX_SHARED_LIBADD, [
+  ], [
+    AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
+  ])
 fi




--- wddx.c.orig	Sun Jan  1 13:50:16 2006
+++ wddx.c	Mon Jan 16 12:56:21 2006
@@ -18,6 +18,10 @@
 
 /* $Id: wddx.c,v 1.119.2.8 2006/01/01 12:50:16 sniper Exp $ */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "php.h"
 
 #if HAVE_WDDX
@@ -223,7 +227,7 @@
 
 #include "ext/session/php_session.h"
 
-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
+#if HAVE_PHP_SESSION
 /* {{{ PS_SERIALIZER_ENCODE_FUNC
  */
 PS_SERIALIZER_ENCODE_FUNC(wddx)
@@ -302,7 +306,7 @@
 {
 	le_wddx = zend_register_list_destructors_ex(release_wddx_packet_rsrc, NULL, "wddx", module_number);
 
-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
+#if HAVE_PHP_SESSION
 	php_session_register_serializer("wddx",
 									PS_SERIALIZER_ENCODE_NAME(wddx),
 									PS_SERIALIZER_DECODE_NAME(wddx));
@@ -317,7 +321,7 @@
 PHP_MINFO_FUNCTION(wddx)
 {
 	php_info_print_table_start();
-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
+#if HAVE_PHP_SESSION
 	php_info_print_table_header(2, "WDDX Support", "enabled" );
 	php_info_print_table_row(2, "WDDX Session Serializer", "enabled" );
 #else

Removed Link Here

(-)a/textproc/php73-xml/Makefile (-9 lines)
1	CATEGORIES= textproc
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -xml
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/textproc/php73-xml/files/patch-compat.c (-13 lines)
1	--- compat.c.orig Tue Jul 20 10:55:02 2004
2	+++ compat.c Tue Jul 20 10:55:55 2004
3	@@ -16,6 +16,10 @@
4	+----------------------------------------------------------------------+
5	*/
6
7	+#ifdef HAVE_CONFIG_H
8	+#include "config.h"
9	+#endif
10	+
11	#include "php.h"
12	#if defined(HAVE_LIBXML) && defined(HAVE_XML) && !defined(HAVE_LIBEXPAT)
13	#include "expat_compat.h"

Removed Link Here

(-)a/textproc/php73-xmlreader/Makefile (-9 lines)
1	CATEGORIES= textproc
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -xmlreader
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/textproc/php73-xmlwriter/Makefile (-9 lines)
1	CATEGORIES= textproc
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -xmlwriter
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/textproc/php73-xsl/Makefile (-9 lines)
1	CATEGORIES= textproc
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -xsl
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/textproc/php73-xsl/files/patch-php_xsl.h (-11 lines)
1	--- php_xsl.h.orig Sun Jan 1 13:50:17 2006
2	+++ php_xsl.h Tue Jan 17 16:23:10 2006
3	@@ -43,7 +43,7 @@
4	#include <libexslt/exsltconfig.h>
5	#endif
6
7	-#include "../dom/xml_common.h"
8	+#include "ext/dom/xml_common.h"
9	#include "xsl_fe.h"
10
11	#include <libxslt/extensions.h>




    SUBDIR += mod_mono
    SUBDIR += mod_mpm_itk
    SUBDIR += mod_perl2
    SUBDIR += mod_php73
    SUBDIR += mod_php74
    SUBDIR += mod_php80
    SUBDIR += mod_proctitle

    SUBDIR += pglogd
    SUBDIR += phalcon
    SUBDIR += phalcon4
    SUBDIR += php73-opcache
    SUBDIR += php73-session
    SUBDIR += php73-tidy
    SUBDIR += php74-opcache
    SUBDIR += php74-session
    SUBDIR += php74-tidy




CATEGORIES=	www devel
PKGNAMEPREFIX=	mod_

MAINTAINER=	ports@FreeBSD.org

PHP_PORT=	lang/php73
MASTERDIR=	${.CURDIR}/../../${PHP_PORT}

OPTIONS_DEFINE=	AP2FILTER
AP2FILTER_DESC=	Use Apache 2.x filter interface (experimental)
OPTIONS_EXCLUDE=CGI CLI FPM EMBED

.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/www/php73-opcache/Makefile (-11 lines)
1	CATEGORIES= www
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -opcache
6
7	TEST_TARGET= test
8
9	USES= php:zend,noflavors
10
11	.include "${MASTERDIR}/Makefile"




--- zend_file_cache.c.orig	2017-07-05 13:48:27 UTC
+++ zend_file_cache.c
@@ -24,9 +24,10 @@
 
 #include "php.h"
 
+#include "ZendAccelerator.h"
+
 #ifdef HAVE_OPCACHE_FILE_CACHE
 
-#include "ZendAccelerator.h"
 #include "zend_file_cache.h"
 #include "zend_shared_alloc.h"
 #include "zend_accelerator_util_funcs.h"

Removed Link Here

(-)a/www/php73-session/Makefile (-9 lines)
1	CATEGORIES= www
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -session
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/www/php73-tidy/Makefile (-9 lines)
1	CATEGORIES= www
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -tidy
6
7	TEST_TARGET= test
8
9	.include "${MASTERDIR}/Makefile"

Return to bug 260624

Lines 4012-4027 Link Here

(-)b/devel/Makefile (-10 lines)
4012	SUBDIR += php-ice37	4012	SUBDIR += php-ice37
4013	SUBDIR += php-libawl	4013	SUBDIR += php-libawl
4014	SUBDIR += php-maxminddb	4014	SUBDIR += php-maxminddb
4015	SUBDIR += php73-gettext
4016	SUBDIR += php73-intl
4017	SUBDIR += php73-json
4018	SUBDIR += php73-pcntl
4019	SUBDIR += php73-readline
4020	SUBDIR += php73-shmop
4021	SUBDIR += php73-sysvmsg
4022	SUBDIR += php73-sysvsem
4023	SUBDIR += php73-sysvshm
4024	SUBDIR += php73-tokenizer
4025	SUBDIR += php74-ffi	4015	SUBDIR += php74-ffi
4026	SUBDIR += php74-gettext	4016	SUBDIR += php74-gettext
4027	SUBDIR += php74-intl	4017	SUBDIR += php74-intl

Lines 108-114 DIST_SUBDIR= PECL Link Here

(-)b/Mk/Uses/php.mk (-8 / +1 lines)
108		108
109	PHPBASE?= ${LOCALBASE}	109	PHPBASE?= ${LOCALBASE}
110		110
111	_ALL_PHP_VERSIONS= 73 74 80	111	_ALL_PHP_VERSIONS= 74 80
112		112
113	# Make the already installed PHP the default one.	113	# Make the already installed PHP the default one.
114	. if exists(${PHPBASE}/etc/php.conf)	114	. if exists(${PHPBASE}/etc/php.conf)
Lines 182-190 PHP_EXT_INC= hash json pcre spl Link Here
182	. elif ${PHP_VER} == 74	182	. elif ${PHP_VER} == 74
183	PHP_EXT_DIR= 20190902	183	PHP_EXT_DIR= 20190902
184	PHP_EXT_INC= hash pcre spl	184	PHP_EXT_INC= hash pcre spl
185	. elif ${PHP_VER} == 73
186	PHP_EXT_DIR= 20180731
187	PHP_EXT_INC= pcre spl
188	. else	185	. else
189	# (rene) default to DEFAULT_VERSIONS	186	# (rene) default to DEFAULT_VERSIONS
190	PHP_EXT_DIR= 20190902	187	PHP_EXT_DIR= 20190902
Lines 377-383 _USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \ Link Here
377	sockets spl sqlite3 sysvmsg sysvsem sysvshm \	374	sockets spl sqlite3 sysvmsg sysvsem sysvshm \
378	tidy tokenizer xml xmlreader xmlrpc xmlwriter xsl zip zlib	375	tidy tokenizer xml xmlreader xmlrpc xmlwriter xsl zip zlib
379	# version specific components	376	# version specific components
380	_USE_PHP_VER73= ${_USE_PHP_ALL} interbase pdf recode sodium wddx
381	_USE_PHP_VER74= ${_USE_PHP_ALL} ffi pdf sodium	377	_USE_PHP_VER74= ${_USE_PHP_ALL} ffi pdf sodium
382	_USE_PHP_VER80= ${_USE_PHP_ALL} ffi sodium	378	_USE_PHP_VER80= ${_USE_PHP_ALL} ffi sodium
383		379
Lines 403-409 hash_DEPENDS= security/php${PHP_VER}-hash Link Here
403	iconv_DEPENDS= converters/php${PHP_VER}-iconv	399	iconv_DEPENDS= converters/php${PHP_VER}-iconv
404	igbinary_DEPENDS= converters/pecl-igbinary@${PHP_FLAVOR}	400	igbinary_DEPENDS= converters/pecl-igbinary@${PHP_FLAVOR}
405	imap_DEPENDS= mail/php${PHP_VER}-imap	401	imap_DEPENDS= mail/php${PHP_VER}-imap
406	interbase_DEPENDS= databases/php${PHP_VER}-interbase
407	intl_DEPENDS= devel/php${PHP_VER}-intl	402	intl_DEPENDS= devel/php${PHP_VER}-intl
408	json_DEPENDS= devel/php${PHP_VER}-json	403	json_DEPENDS= devel/php${PHP_VER}-json
409	ldap_DEPENDS= net/php${PHP_VER}-ldap	404	ldap_DEPENDS= net/php${PHP_VER}-ldap
Lines 431-437 posix_DEPENDS= sysutils/php${PHP_VER}-posix Link Here
431	pspell_DEPENDS= textproc/php${PHP_VER}-pspell	426	pspell_DEPENDS= textproc/php${PHP_VER}-pspell
432	radius_DEPENDS= net/pecl-radius@${PHP_FLAVOR}	427	radius_DEPENDS= net/pecl-radius@${PHP_FLAVOR}
433	readline_DEPENDS= devel/php${PHP_VER}-readline	428	readline_DEPENDS= devel/php${PHP_VER}-readline
434	recode_DEPENDS= converters/php${PHP_VER}-recode
435	redis_DEPENDS= databases/pecl-redis@${PHP_FLAVOR}	429	redis_DEPENDS= databases/pecl-redis@${PHP_FLAVOR}
436	session_DEPENDS=www/php${PHP_VER}-session	430	session_DEPENDS=www/php${PHP_VER}-session
437	shmop_DEPENDS= devel/php${PHP_VER}-shmop	431	shmop_DEPENDS= devel/php${PHP_VER}-shmop
Lines 447-453 sysvsem_DEPENDS=devel/php${PHP_VER}-sysvsem Link Here
447	sysvshm_DEPENDS=devel/php${PHP_VER}-sysvshm	441	sysvshm_DEPENDS=devel/php${PHP_VER}-sysvshm
448	tidy_DEPENDS= www/php${PHP_VER}-tidy	442	tidy_DEPENDS= www/php${PHP_VER}-tidy
449	tokenizer_DEPENDS= devel/php${PHP_VER}-tokenizer	443	tokenizer_DEPENDS= devel/php${PHP_VER}-tokenizer
450	wddx_DEPENDS= textproc/php${PHP_VER}-wddx
451	xml_DEPENDS= textproc/php${PHP_VER}-xml	444	xml_DEPENDS= textproc/php${PHP_VER}-xml
452	xmlreader_DEPENDS= textproc/php${PHP_VER}-xmlreader	445	xmlreader_DEPENDS= textproc/php${PHP_VER}-xmlreader
453	.if ${PHP_VER} >= 80	446	.if ${PHP_VER} >= 80

Removed Link Here

(-)a/archivers/php73-phar/files/patch-config.m4 (-41 lines)
1	--- config.m4.orig 2016-06-21 19:56:50 UTC
2	+++ config.m4
3	@@ -4,8 +4,38 @@ dnl config.m4 for extension phar
4	PHP_ARG_ENABLE(phar, for phar archive support,
5	[ --disable-phar Disable phar support], yes)
6
7	+PHP_ARG_WITH(pcre-dir, pcre install prefix,
8	+[ --with-pcre-dir PHAR: pcre install prefix], no, no)
9	+
10	+
11	if test "$PHP_PHAR" != "no"; then
12	+
13	+ dnl This is PECL build, check if bundled PCRE library is used
14	+ old_CPPFLAGS=$CPPFLAGS
15	+ CPPFLAGS=$INCLUDES
16	+ AC_EGREP_CPP(yes,[
17	+#include <main/php_config.h>
18	+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
19	+yes
20	+#endif
21	+ ],[
22	+ PHP_PCRE_REGEX=yes
23	+ ],[
24	+ AC_EGREP_CPP(yes,[
25	+#include <main/php_config.h>
26	+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
27	+yes
28	+#endif
29	+ ],[
30	+ PHP_PCRE_REGEX=pecl
31	+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
32	+ ],[
33	+ PHP_PCRE_REGEX=no
34	+ ])
35	+ ])
36	+
37	PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
38	+ PHP_HASH=yes
39	AC_MSG_CHECKING([for phar openssl support])
40	if test "$PHP_HASH_SHARED" != "yes"; then
41	if test "$PHP_HASH" != "no"; then

Removed Link Here

(-)a/converters/php73-mbstring/files/patch-config.m4 (-51 lines)
1	--- config.m4.orig 2018-09-25 09:08:02 UTC
2	+++ config.m4
3	@@ -41,6 +41,30 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
4	PHP_ADD_INCLUDE([$ext_builddir/$dir])
5	done
6
7	+ dnl This is PECL build, check if bundled PCRE library is used
8	+ old_CPPFLAGS=$CPPFLAGS
9	+ CPPFLAGS=$INCLUDES
10	+ AC_EGREP_CPP(yes,[
11	+#include <main/php_config.h>
12	+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
13	+yes
14	+#endif
15	+ ],[
16	+ PHP_PCRE_REGEX=yes
17	+ ],[
18	+ AC_EGREP_CPP(yes,[
19	+#include <main/php_config.h>
20	+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
21	+yes
22	+#endif
23	+ ],[
24	+ PHP_PCRE_REGEX=pecl
25	+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
26	+ ],[
27	+ PHP_PCRE_REGEX=no
28	+ ])
29	+ ])
30	+
31	if test "$ext_shared" = "no"; then
32	PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES)
33	out="php_config.h"
34	@@ -83,7 +107,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
35	int foo(int x, ...) {
36	va_list va;
37	va_start(va, x);
38	- va_arg(va, int);
39	va_arg(va, char *);
40	va_arg(va, double);
41	return 0;
42	@@ -334,6 +357,9 @@ PHP_ARG_WITH(onig, [for external oniguru
43	[ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
44	If DIR is not set, the bundled oniguruma will be used], no, no)
45
46	+PHP_ARG_WITH(pcre-dir, pcre install prefix,
47	+[ --with-pcre-dir MBSTRING: pcre install prefix], no, no)
48	+
49	if test "$PHP_MBSTRING" != "no"; then
50	AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support])
51

Lines 609-627 Link Here

(-)b/databases/Makefile (-13 lines)
609	SUBDIR += pguri	609	SUBDIR += pguri
610	SUBDIR += php-tarantool	610	SUBDIR += php-tarantool
611	SUBDIR += php-xapian	611	SUBDIR += php-xapian
612	SUBDIR += php73-dba
613	SUBDIR += php73-interbase
614	SUBDIR += php73-mysqli
615	SUBDIR += php73-odbc
616	SUBDIR += php73-pdo
617	SUBDIR += php73-pdo_dblib
618	SUBDIR += php73-pdo_firebird
619	SUBDIR += php73-pdo_mysql
620	SUBDIR += php73-pdo_odbc
621	SUBDIR += php73-pdo_pgsql
622	SUBDIR += php73-pdo_sqlite
623	SUBDIR += php73-pgsql
624	SUBDIR += php73-sqlite3
625	SUBDIR += php74-dba	612	SUBDIR += php74-dba
626	SUBDIR += php74-mysqli	613	SUBDIR += php74-mysqli
627	SUBDIR += php74-odbc	614	SUBDIR += php74-odbc

Removed Link Here

(-)a/databases/php73-dba/files/patch-config.m4 (-50 lines)
1	--- config.m4.orig 2016-01-06 15:14:47 UTC
2	+++ config.m4
3	@@ -324,6 +324,38 @@ if test "$PHP_DB4" != "no"; then
4	THIS_PREFIX=$i
5	THIS_INCLUDE=$i/include/db5.3/db.h
6	break
7	+ elif test -f "$i/include/db5/db.h"; then
8	+ THIS_PREFIX=$i
9	+ THIS_INCLUDE=$i/include/db5/db.h
10	+ break
11	+ elif test -f "$i/include/db48/db.h"; then
12	+ THIS_PREFIX=$i
13	+ THIS_INCLUDE=$i/include/db48/db.h
14	+ break
15	+ elif test -f "$i/include/db47/db.h"; then
16	+ THIS_PREFIX=$i
17	+ THIS_INCLUDE=$i/include/db47/db.h
18	+ break
19	+ elif test -f "$i/include/db46/db.h"; then
20	+ THIS_PREFIX=$i
21	+ THIS_INCLUDE=$i/include/db46/db.h
22	+ break
23	+ elif test -f "$i/include/db44/db.h"; then
24	+ THIS_PREFIX=$i
25	+ THIS_INCLUDE=$i/include/db44/db.h
26	+ break
27	+ elif test -f "$i/include/db43/db.h"; then
28	+ THIS_PREFIX=$i
29	+ THIS_INCLUDE=$i/include/db43/db.h
30	+ break
31	+ elif test -f "$i/include/db42/db.h"; then
32	+ THIS_PREFIX=$i
33	+ THIS_INCLUDE=$i/include/db42/db.h
34	+ break
35	+ elif test -f "$i/include/db41/db.h"; then
36	+ THIS_PREFIX=$i
37	+ THIS_INCLUDE=$i/include/db41/db.h
38	+ break
39	elif test -f "$i/include/db5.1/db.h"; then
40	THIS_PREFIX=$i
41	THIS_INCLUDE=$i/include/db5.1/db.h
42	@@ -366,7 +398,7 @@ if test "$PHP_DB4" != "no"; then
43	break
44	fi
45	done
46	- PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB*)0, (DB_ENV)0, 0)])
47	+ PHP_DBA_DB_CHECK(4, db-5 db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB*)0, (DB_ENV)0, 0)])
48	fi
49	PHP_DBA_STD_RESULT(db4,Berkeley DB4)
50

Removed Link Here

(-)a/databases/php73-mysqli/files/patch-mysqli__api.c (-13 lines)
1	--- mysqli_api.c.orig 2019-12-17 10:29:23 UTC
2	+++ mysqli_api.c
3	@@ -31,8 +31,9 @@
4	#include "zend_smart_str.h"
5	#include "php_mysqli_structs.h"
6	#include "mysqli_priv.h"
7	+#if defined(MYSQLI_USE_MYSQLND)
8	#include "ext/mysqlnd/mysql_float_to_double.h"
9	-
10	+#endif
11
12	#if !defined(MYSQLI_USE_MYSQLND)
13	/* {{{ mysqli_tx_cor_options_to_string */

Removed Link Here

(-)a/databases/php73-odbc/files/patch-config.m4 (-111 lines)
1	--- config.m4.orig 2018-09-25 09:07:57 UTC
2	+++ config.m4
3	@@ -97,6 +97,9 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS
4	dnl
5	dnl configure options
6	dnl
7	+PHP_ARG_ENABLE(odbc,,
8	+[ --enable-odbc Enable ODBC support with selected driver])
9	+
10
11	PHP_ARG_WITH(odbcver,,
12	[ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0350.
13	@@ -104,7 +107,7 @@ PHP_ARG_WITH(odbcver,,
14
15	if test -z "$ODBC_TYPE"; then
16	PHP_ARG_WITH(adabas,,
17	-[ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
18	+[ --with-adabas[=DIR] Include Adabas D support [/usr/local]], no, no)
19
20	AC_MSG_CHECKING([for Adabas support])
21	if test "$PHP_ADABAS" != "no"; then
22	@@ -133,7 +136,7 @@ fi
23
24	if test -z "$ODBC_TYPE"; then
25	PHP_ARG_WITH(sapdb,,
26	-[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]])
27	+[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]], no, no)
28
29	AC_MSG_CHECKING([for SAP DB support])
30	if test "$PHP_SAPDB" != "no"; then
31	@@ -153,7 +156,7 @@ fi
32
33	if test -z "$ODBC_TYPE"; then
34	PHP_ARG_WITH(solid,,
35	-[ --with-solid[=DIR] Include Solid support [/usr/local/solid]])
36	+[ --with-solid[=DIR] Include Solid support [/usr/local/solid]], no, no)
37
38	AC_MSG_CHECKING(for Solid support)
39	if test "$PHP_SOLID" != "no"; then
40	@@ -180,7 +183,7 @@ fi
41
42	if test -z "$ODBC_TYPE"; then
43	PHP_ARG_WITH(ibm-db2,,
44	-[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]])
45	+[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]], no, no)
46
47	AC_MSG_CHECKING(for IBM DB2 support)
48	if test "$PHP_IBM_DB2" != "no"; then
49	@@ -220,7 +223,7 @@ fi
50	if test -z "$ODBC_TYPE"; then
51	PHP_ARG_WITH(empress,,
52	[ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH]
53	- (Empress Version >= 8.60 required)])
54	+ (Empress Version >= 8.60 required)], no, no)
55
56	AC_MSG_CHECKING(for Empress support)
57	if test "$PHP_EMPRESS" != "no"; then
58	@@ -245,7 +248,7 @@ fi
59	if test -z "$ODBC_TYPE"; then
60	PHP_ARG_WITH(empress-bcs,,
61	[ --with-empress-bcs[=DIR] Include Empress Local Access support [\$EMPRESSPATH]
62	- (Empress Version >= 8.60 required)])
63	+ (Empress Version >= 8.60 required)], no, no)
64
65	AC_MSG_CHECKING(for Empress local access support)
66	if test "$PHP_EMPRESS_BCS" != "no"; then
67	@@ -292,7 +295,7 @@ PHP_ARG_WITH(custom-odbc,,
68	running this configure script:
69	CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
70	LDFLAGS=-lunix
71	- CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"])
72	+ CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no)
73
74	AC_MSG_CHECKING(for a custom ODBC support)
75	if test "$PHP_CUSTOM_ODBC" != "no"; then
76	@@ -314,7 +317,7 @@ fi
77
78	if test -z "$ODBC_TYPE"; then
79	PHP_ARG_WITH(iodbc,,
80	-[ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
81	+[ --with-iodbc[=DIR] Include iODBC support [/usr/local]], no, no)
82
83	AC_MSG_CHECKING(for iODBC support)
84	if test "$PHP_IODBC" != "no"; then
85	@@ -352,7 +355,7 @@ fi
86
87	if test -z "$ODBC_TYPE"; then
88	PHP_ARG_WITH(esoob,,
89	-[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]])
90	+[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no)
91
92	AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
93	if test "$PHP_ESOOB" != "no"; then
94	@@ -374,7 +377,7 @@ fi
95
96	if test -z "$ODBC_TYPE"; then
97	PHP_ARG_WITH(unixODBC,,
98	-[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]])
99	+[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]], no, no)
100
101	AC_MSG_CHECKING(for unixODBC support)
102	if test "$PHP_UNIXODBC" != "no"; then
103	@@ -397,7 +400,7 @@ fi
104
105	if test -z "$ODBC_TYPE"; then
106	PHP_ARG_WITH(dbmaker,,
107	-[ --with-dbmaker[=DIR] Include DBMaker support])
108	+[ --with-dbmaker[=DIR] Include DBMaker support], no, no)
109
110	AC_MSG_CHECKING(for DBMaker support)
111	if test "$PHP_DBMAKER" != "no"; then

Removed Link Here

(-)a/devel/php73-intl/Makefile (-14 lines)
1	CATEGORIES= devel
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -intl
6
7	USES= compiler:c++11-lib
8	USE_CXXSTD= gnu++11
9
10	CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1
11
12	TEST_TARGET= test
13
14	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/devel/php73-intl/files/patch-icu68 (-213 lines)
1	Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
2
3	ext/intl/breakiterator/codepointiterator_internal.cpp:60:53: error: use of undeclared identifier 'FALSE'
4	this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
5	^
6	ext/intl/breakiterator/codepointiterator_internal.cpp:60:60: error: use of undeclared identifier 'TRUE'
7	this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
8	^
9	ext/intl/breakiterator/codepointiterator_internal.cpp:80:10: error: use of undeclared identifier 'FALSE'
10	return FALSE;
11	^
12	ext/intl/breakiterator/codepointiterator_internal.cpp:87:10: error: use of undeclared identifier 'FALSE'
13	return FALSE;
14	^
15	ext/intl/breakiterator/codepointiterator_internal.cpp:90:9: error: use of undeclared identifier 'TRUE'
16	return TRUE;
17	^
18	ext/intl/breakiterator/codepointiterator_internal.cpp:111:42: error: use of undeclared identifier 'FALSE'
19	return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
20	^
21	ext/intl/breakiterator/codepointiterator_internal.cpp:111:49: error: use of undeclared identifier 'TRUE'
22	return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
23	^
24	ext/intl/breakiterator/codepointiterator_internal.cpp:130:47: error: use of undeclared identifier 'FALSE'
25	this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
26	^
27	ext/intl/breakiterator/codepointiterator_internal.cpp:130:54: error: use of undeclared identifier 'TRUE'
28	this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
29	^
30	ext/intl/breakiterator/codepointiterator_internal.cpp:282:48: error: use of undeclared identifier 'FALSE'
31	this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
32	^
33	ext/intl/breakiterator/codepointiterator_internal.cpp:282:55: error: use of undeclared identifier 'TRUE'
34	this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
35	^
36	ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE'
37	collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
38	^
39	ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE'
40	collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
41	^
42	ext/intl/dateformat/dateformat_attr.c:91:36: error: use of undeclared identifier 'FALSE'
43	zend_bool is_pattern_localized =FALSE;
44	^
45	ext/intl/dateformat/dateformat_attr.c:134:36: error: use of undeclared identifier 'FALSE'
46	zend_bool is_pattern_localized =FALSE;
47	^
48	ext/intl/dateformat/dateformat_attr.c:230:25: error: use of undeclared identifier 'FALSE'
49	zend_bool isLenient = FALSE;
50	^
51	ext/intl/normalizer/normalizer_normalize.c:95:10: error: use of undeclared identifier 'FALSE'
52	return FALSE;
53	^
54	ext/intl/normalizer/normalizer_normalize.c:181:16: error: use of undeclared identifier 'FALSE'
55	UBool uret = FALSE;
56	^
57	ext/intl/timezone/timezone_class.cpp:324:21: error: use of undeclared identifier 'FALSE'
58	tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
59	^
60	ext/intl/timezone/timezone_methods.cpp:94:57: error: use of undeclared identifier 'FALSE'
61	tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
62	^
63
64	--- breakiterator/codepointiterator_internal.cpp.orig 2020-09-29 08:33:05 UTC
65	+++ breakiterator/codepointiterator_internal.cpp
66	@@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIterator::operat
67	return *this;
68	}
69
70	- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
71	+ this->fText = utext_clone(this->fText, that.fText, false, true, &uec);
72
73	//don't bother copying the character iterator, getText() is deprecated
74	clearCurrentCharIter();
75	@@ -78,17 +78,17 @@ CodePointBreakIterator::~CodePointBreakIterator()
76	UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
77	{
78	if (typeid(*this) != typeid(that)) {
79	- return FALSE;
80	+ return false;
81	}
82
83	const CodePointBreakIterator& that2 =
84	static_cast<const CodePointBreakIterator&>(that);
85
86	if (!utext_equals(this->fText, that2.fText)) {
87	- return FALSE;
88	+ return false;
89	}
90
91	- return TRUE;
92	+ return true;
93	}
94
95	CodePointBreakIterator* CodePointBreakIterator::clone(void) const
96	@@ -109,7 +109,7 @@ CharacterIterator& CodePointBreakIterator::getText(voi
97
98	UText CodePointBreakIterator::getUText(UText fillIn, UErrorCode &status) const
99	{
100	- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
101	+ return utext_clone(fillIn, this->fText, false, true, &status);
102	}
103
104	void CodePointBreakIterator::setText(const UnicodeString &text)
105	@@ -128,7 +128,7 @@ void CodePointBreakIterator::setText(UText *text, UErr
106	return;
107	}
108
109	- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
110	+ this->fText = utext_clone(this->fText, text, false, true, &status);
111
112	clearCurrentCharIter();
113	}
114	@@ -280,7 +280,7 @@ CodePointBreakIterator &CodePointBreakIterator::refres
115	}
116
117	int64_t pos = utext_getNativeIndex(this->fText);
118	- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
119	+ this->fText = utext_clone(this->fText, input, false, true, &status);
120	if (U_FAILURE(status)) {
121	return *this;
122	}
123	--- collator/collator_sort.c.orig 2020-09-29 08:33:05 UTC
124	+++ collator/collator_sort.c
125	@@ -346,7 +346,7 @@ static void collator_sort_internal( int renumber, INTE
126	*/
127	PHP_FUNCTION( collator_sort )
128	{
129	- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
130	+ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU );
131	}
132	/* }}} */
133
134	@@ -540,7 +540,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys )
135	*/
136	PHP_FUNCTION( collator_asort )
137	{
138	- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
139	+ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU );
140	}
141	/* }}} */
142
143	--- dateformat/dateformat_attr.c.orig 2020-09-29 08:33:05 UTC
144	+++ dateformat/dateformat_attr.c
145	@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern )
146	UChar value_buf[64];
147	uint32_t length = USIZE( value_buf );
148	UChar* value = value_buf;
149	- zend_bool is_pattern_localized =FALSE;
150	+ zend_bool is_pattern_localized = false;
151
152	DATE_FORMAT_METHOD_INIT_VARS;
153
154	@@ -131,7 +131,7 @@ PHP_FUNCTION( datefmt_set_pattern )
155	size_t value_len = 0;
156	int32_t slength = 0;
157	UChar* svalue = NULL;
158	- zend_bool is_pattern_localized =FALSE;
159	+ zend_bool is_pattern_localized = false;
160
161
162	DATE_FORMAT_METHOD_INIT_VARS;
163	@@ -227,7 +227,7 @@ PHP_FUNCTION( datefmt_is_lenient )
164	*/
165	PHP_FUNCTION( datefmt_set_lenient )
166	{
167	- zend_bool isLenient = FALSE;
168	+ zend_bool isLenient = false;
169
170	DATE_FORMAT_METHOD_INIT_VARS;
171
172	--- normalizer/normalizer_normalize.c.orig 2020-09-29 08:33:05 UTC
173	+++ normalizer/normalizer_normalize.c
174	@@ -92,7 +92,7 @@ static UBool intl_is_normalized(zend_long form, const
175	const UNormalizer2 *norm = intl_get_normalizer(form, err);
176
177	if(U_FAILURE(*err)) {
178	- return FALSE;
179	+ return false;
180	}
181
182	return unorm2_isNormalized(norm, uinput, uinput_len, err);
183	@@ -263,7 +263,7 @@ PHP_FUNCTION( normalizer_is_normalized )
184	int uinput_len = 0;
185	UErrorCode status = U_ZERO_ERROR;
186
187	- UBool uret = FALSE;
188	+ UBool uret = false;
189
190	intl_error_reset( NULL );
191
192	--- timezone/timezone_class.cpp.orig 2020-09-29 08:33:05 UTC
193	+++ timezone/timezone_class.cpp
194	@@ -322,7 +322,7 @@ static HashTable TimeZone_get_debug_info(zval object
195
196	int32_t rawOffset, dstOffset;
197	UDate now = Calendar::getNow();
198	- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
199	+ tz->getOffset(now, false, rawOffset, dstOffset, uec);
200	if (U_FAILURE(uec)) {
201	return debug_info;
202	}
203	--- timezone/timezone_methods.cpp.orig 2020-09-29 08:33:05 UTC
204	+++ timezone/timezone_methods.cpp
205	@@ -95,7 +95,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)
206	RETURN_NULL();
207	}
208
209	- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
210	+ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL,
211	"intltz_from_date_time_zone");
212	if (tz == NULL) {
213	RETURN_NULL();

Removed Link Here

(-)a/devel/php73-intl/files/patch-icu70 (-38 lines)
1	Regressed by https://github.com/unicode-org/icu/commit/633438f8da99
2
3	In file included from breakiterator/breakiterator_class.cpp:23:
4	breakiterator/codepointiterator_internal.h:42:17: error: virtual function 'operator==' has a different return type ('UBool' (aka 'signed char')) than the function it overrides (which has return type 'bool')
5	virtual UBool operator==(const BreakIterator& that) const;
6	~~~~~ ^
7	/usr/local/include/unicode/brkiter.h:127:18: note: overridden virtual function is here
8	virtual bool operator==(const BreakIterator&) const = 0;
9	~~~~ ^
10
11	--- breakiterator/codepointiterator_internal.cpp.orig 2021-09-21 10:24:05 UTC
12	+++ breakiterator/codepointiterator_internal.cpp
13	@@ -75,7 +75,11 @@ CodePointBreakIterator::~CodePointBreakIterator()
14	clearCurrentCharIter();
15	}
16
17	+#if U_ICU_VERSION_MAJOR_NUM < 70
18	UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
19	+#else
20	+bool CodePointBreakIterator::operator==(const BreakIterator& that) const
21	+#endif
22	{
23	if (typeid(*this) != typeid(that)) {
24	return FALSE;
25	--- breakiterator/codepointiterator_internal.h.orig 2021-09-21 10:24:05 UTC
26	+++ breakiterator/codepointiterator_internal.h
27	@@ -39,7 +39,11 @@ namespace PHP {
28
29	virtual ~CodePointBreakIterator();
30
31	+#if U_ICU_VERSION_MAJOR_NUM < 70
32	virtual UBool operator==(const BreakIterator& that) const;
33	+#else
34	+ virtual bool operator==(const BreakIterator& that) const;
35	+#endif
36
37	virtual CodePointBreakIterator* clone(void) const;
38

Removed Link Here

(-)a/devel/php73-readline/files/patch-config.m4 (-30 lines)
1	--- config.m4.orig 2019-02-05 13:10:04 UTC
2	+++ config.m4
3	@@ -3,13 +3,8 @@ dnl config.m4 for extension readline
4	PHP_ARG_WITH(libedit,for libedit readline replacement,
5	[ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)])
6
7	-if test "$PHP_LIBEDIT" = "no"; then
8	PHP_ARG_WITH(readline,for readline support,
9	[ --with-readline[=DIR] Include readline support (CLI/CGI only)])
10	-else
11	- dnl "register" the --with-readline option to preven invalid "unknown configure option" warning
12	- php_with_readline=no
13	-fi
14
15	if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
16	for i in $PHP_READLINE /usr/local /usr; do
17	@@ -72,6 +67,13 @@ if test "$PHP_READLINE" && test "$PHP_RE
18	-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
19	])
20
21	+ PHP_CHECK_LIBRARY(readline, rl_completion_matches,
22	+ [
23	+ AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ])
24	+ ],[],[
25	+ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
26	+ ])
27	+
28	AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
29
30	elif test "$PHP_LIBEDIT" != "no"; then

Removed Link Here

(-)a/ftp/php73-ftp/Makefile (-13 lines)
1	CATEGORIES= ftp
2
3	MASTERDIR= ${.CURDIR}/../../lang/php73
4
5	PKGNAMESUFFIX= -ftp
6
7	TEST_TARGET= test
8
9	post-patch:
10	@${REINPLACE_CMD} s/HAVE_OPENSSL_EXT/__FreeBSD__/ \
11	${WRKSRC}/ftp.* ${WRKSRC}/php_ftp.*
12
13	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/graphics/php73-gd/files/patch-config.m4 (-63 lines)
1	--- config.m4.orig 2020-11-24 11:10:57 UTC
2	+++ config.m4
3	@@ -184,6 +184,9 @@ AC_DEFUN([PHP_GD_XPM],[
4	AC_DEFUN([PHP_GD_FREETYPE2],[
5	if test "$PHP_FREETYPE_DIR" != "no"; then
6
7	+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
8	+
9	+ AC_MSG_CHECKING([for freetype])
10	for i in $PHP_FREETYPE_DIR /usr/local /usr; do
11	if test -f "$i/bin/freetype-config"; then
12	FREETYPE2_DIR=$i
13	@@ -192,13 +195,20 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
14	fi
15	done
16
17	- if test -z "$FREETYPE2_DIR"; then
18	+ if test -n "$FREETYPE2_CONFIG"; then
19	+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
20	+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
21	+ AC_MSG_RESULT([found in $FREETYPE2_DIR])
22	+ elif test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists freetype2; then
23	+ FREETYPE2_DIR=pkg-config
24	+ FREETYPE2_CFLAGS=`$PKG_CONFIG freetype2 --cflags`
25	+ FREETYPE2_LIBS=`$PKG_CONFIG freetype2 --libs`
26	+ AC_MSG_RESULT([found by pkg-config])
27	+ else
28	+ AC_MSG_RESULT([not found])
29	AC_MSG_ERROR([freetype-config not found.])
30	fi
31
32	- FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
33	- FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
34	-
35	PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
36	PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
37	AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
38	@@ -285,6 +295,7 @@ dnl enable the support in bundled GD library
39
40	if test -n "$GD_XPM_DIR"; then
41	AC_DEFINE(HAVE_GD_XPM, 1, [ ])
42	+ AC_DEFINE(HAVE_XPM, 1, [ ])
43	GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM"
44	fi
45
46	@@ -347,7 +358,7 @@ if test "$PHP_GD" != "no"; then
47
48	if test "$GD_MODULE_TYPE" = "builtin"; then
49	PHP_ADD_BUILD_DIR($ext_builddir/libgd)
50	- GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
51	+ GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS"
52	GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"
53
54	PHP_TEST_BUILD(foobar, [], [
55	@@ -355,7 +366,7 @@ if test "$PHP_GD" != "no"; then
56	], [ $GD_SHARED_LIBADD ], [char foobar () {}])
57	else
58	GD_HEADER_DIRS="ext/gd/"
59	- GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS"
60	+ GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS"
61	PHP_ADD_INCLUDE($GD_INCLUDE)
62	PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [
63	AC_MSG_ERROR([GD build test failed. Please check the config.log for details.])

Removed Link Here

(-)a/graphics/php73-gd/files/patch-gd.c (-83 lines)
1	--- gd.c.orig 2018-09-25 09:07:58 UTC
2	+++ gd.c
3	@@ -51,7 +51,7 @@
4	# include <Wingdi.h>
5	#endif
6
7	-#ifdef HAVE_GD_XPM
8	+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
9	# include <X11/xpm.h>
10	#endif
11
12	@@ -75,7 +75,7 @@ static int le_gd, le_gd_font;
13	# endif
14	#endif
15
16	-#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
17	+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
18	# include "X11/xpm.h"
19	#endif
20
21	@@ -322,7 +322,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatef
22	ZEND_ARG_INFO(0, filename)
23	ZEND_END_ARG_INFO()
24
25	-#if defined(HAVE_GD_XPM)
26	+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
27	ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0)
28	ZEND_ARG_INFO(0, filename)
29	ZEND_END_ARG_INFO()
30	@@ -931,7 +931,7 @@ static const zend_function_entry gd_func
31	#endif
32	PHP_FE(imagecreatefromwbmp, arginfo_imagecreatefromwbmp)
33	PHP_FE(imagecreatefromxbm, arginfo_imagecreatefromxbm)
34	-#if defined(HAVE_GD_XPM)
35	+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
36	PHP_FE(imagecreatefromxpm, arginfo_imagecreatefromxpm)
37	#endif
38	PHP_FE(imagecreatefromgd, arginfo_imagecreatefromgd)
39	@@ -1296,7 +1296,7 @@ PHP_MINFO_FUNCTION(gd)
40	php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString());
41	#endif
42	php_info_print_table_row(2, "WBMP Support", "enabled");
43	-#if defined(HAVE_GD_XPM)
44	+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
45	php_info_print_table_row(2, "XPM Support", "enabled");
46	{
47	char tmp[12];
48	@@ -1351,7 +1351,7 @@ PHP_FUNCTION(gd_info)
49	add_assoc_bool(return_value, "PNG Support", 0);
50	#endif
51	add_assoc_bool(return_value, "WBMP Support", 1);
52	-#if defined(HAVE_GD_XPM)
53	+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
54	add_assoc_bool(return_value, "XPM Support", 1);
55	#else
56	add_assoc_bool(return_value, "XPM Support", 0);
57	@@ -2178,7 +2178,7 @@ PHP_FUNCTION(imagetypes)
58	ret \|= PHP_IMG_PNG;
59	#endif
60	ret \|= PHP_IMG_WBMP;
61	-#if defined(HAVE_GD_XPM)
62	+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
63	ret \|= PHP_IMG_XPM;
64	#endif
65	#ifdef HAVE_GD_WEBP
66	@@ -2446,7 +2446,7 @@ static void _php_image_create_from(INTER
67	case PHP_GDIMG_TYPE_GD2PART:
68	im = (*func_p)(fp, srcx, srcy, width, height);
69	break;
70	-#if defined(HAVE_GD_XPM)
71	+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
72	case PHP_GDIMG_TYPE_XPM:
73	im = gdImageCreateFromXpm(file);
74	break;
75	@@ -2528,7 +2528,7 @@ PHP_FUNCTION(imagecreatefromxbm)
76	}
77	/* }}} */
78
79	-#if defined(HAVE_GD_XPM)
80	+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
81	/* {{{ proto resource imagecreatefromxpm(string filename)
82	Create a new image from XPM file or URL */
83	PHP_FUNCTION(imagecreatefromxpm)

Removed Link Here

(-)a/lang/php73-extensions/Makefile (-114 lines)
1	PORTNAME= php73
2	PORTVERSION= 1.0
3	CATEGORIES= lang
4	PKGNAMESUFFIX= -extensions
5
6	MAINTAINER= tz@FreeBSD.org
7	COMMENT= "meta-port" to install PHP extensions
8
9	USES= metaport php
10	PHP_VER= 73
11	IGNORE_WITH_PHP= 72 74
12
13	OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \
14	DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \
15	GMP HASH ICONV INTL IMAP INTERBASE JSON LDAP MBSTRING \
16	MYSQLI \
17	ODBC OPCACHE OPENSSL PCNTL PDF PDO PDO_DBLIB PDO_FIREBIRD \
18	PDO_MYSQL PDO_ODBC PDO_PGSQL PDO_SQLITE PGSQL PHAR POSIX \
19	PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOAP \
20	SOCKETS SODIUM SQLITE3 SYSVMSG SYSVSEM SYSVSHM \
21	TIDY TOKENIZER WDDX XML XMLREADER XMLRPC XMLWRITER XSL \
22	ZIP ZLIB
23
24	BCMATH_DESC= bc style precision math functions
25	BZ2_DESC= bzip2 library support
26	CALENDAR_DESC= calendar conversion support
27	CTYPE_DESC= ctype functions
28	CURL_DESC= CURL support
29	DBA_DESC= dba support
30	DOM_DESC= DOM support
31	ENCHANT_DESC= Enchant spelling support
32	EXIF_DESC= EXIF support
33	FILEINFO_DESC= fileinfo support
34	FILTER_DESC= input filter support
35	FTP_DESC= FTP support
36	GD_DESC= GD library support
37	GETTEXT_DESC= gettext library support
38	GMP_DESC= GNU MP support
39	HASH_DESC= HASH Message Digest Framework
40	ICONV_DESC= iconv support
41	IMAP_DESC= IMAP support
42	INTL_DESC= Internationalization(ICU)
43	INTERBASE_DESC= Interbase 6 database support (Firebird)
44	JSON_DESC= JavaScript Object Serialization support
45	LDAP_DESC= OpenLDAP support
46	MBSTRING_DESC= multibyte string support
47	MYSQLI_DESC= MySQLi database support
48	ODBC_DESC= ODBC support
49	OPCACHE_DESC= OPcache support
50	OPENSSL_DESC= OpenSSL support
51	PCNTL_DESC= pcntl support (CLI only)
52	PDF_DESC= PDFlib support (implies GD)
53	PDO_DESC= PHP Data Objects Interface (PDO)
54	PDO_DBLIB_DESC= PDO DBLIB-DB driver
55	PDO_FIREBIRD_DESC= PDO Firebird driver
56	PDO_MYSQL_DESC= PDO MySQL driver
57	PDO_ODBC_DESC= PDO ODBC driver
58	PDO_PGSQL_DESC= PDO PostgreSQL driver
59	PDO_SQLITE_DESC= PDO sqlite driver
60	PHAR_DESC= phar support
61	POSIX_DESC= POSIX-like functions
62	PSPELL_DESC= pspell support
63	READLINE_DESC= readline support (CLI only)
64	RECODE_DESC= recode support
65	SESSION_DESC= session support
66	SHMOP_DESC= shmop support
67	SIMPLEXML_DESC= simplexml support
68	SNMP_DESC= SNMP support
69	SOAP_DESC= SOAP support
70	SOCKETS_DESC= sockets support
71	SODIUM_DESC= Sodium encryption support
72	SQLITE3_DESC= sqlite3 support
73	SYSVMSG_DESC= System V message support
74	SYSVSEM_DESC= System V semaphore support
75	SYSVSHM_DESC= System V shared memory support
76	TIDY_DESC= TIDY support
77	TOKENIZER_DESC= tokenizer support
78	WDDX_DESC= WDDX support (implies XML)
79	XML_DESC= XML support
80	XMLREADER_DESC= XMLReader support
81	XMLRPC_DESC= XMLRPC-EPI support
82	XMLWRITER_DESC= XMLWriter support
83	XSL_DESC= XSL support (Implies DOM)
84	ZIP_DESC= ZIP support
85	ZLIB_DESC= ZLIB support
86
87	OPTIONS_DEFAULT= CTYPE \
88	DOM \
89	FILTER \
90	HASH \
91	ICONV \
92	JSON \
93	OPCACHE \
94	PDO \
95	PDO_SQLITE \
96	PHAR \
97	POSIX \
98	SESSION \
99	SIMPLEXML \
100	SQLITE3 \
101	TOKENIZER \
102	XML \
103	XMLREADER \
104	XMLWRITER
105
106	.include <bsd.port.options.mk>
107
108	.for opt in ${OPTIONS_DEFINE}
109	. if ${PORT_OPTIONS:M${opt}}
110	USE_PHP+= ${opt:tl}
111	. endif
112	.endfor
113
114	.include <bsd.port.mk>

Removed Link Here

(-)a/lang/php73/Makefile (-192 lines)
1	PORTNAME= php73
2	DISTVERSION= 7.3.33
3	PORTREVISION?= 0
4	CATEGORIES?= lang devel www
5	MASTER_SITES= PHP/distributions
6	DISTNAME= php-${DISTVERSION}
7
8	MAINTAINER= tz@FreeBSD.org
9	COMMENT= PHP Scripting Language
10
11	LICENSE= PHP301
12
13	DEPRECATED= Upstream active support expired on 2021-12-06
14	EXPIRATION_DATE= 2021-01-25
15
16	USES+= tar:xz cpe gnome
17	CPE_PRODUCT= php
18	NO_OPTIONS_SORT=yes
19
20	.if !defined(PKGNAMESUFFIX)
21	LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \
22	libargon2.so:security/libargon2
23
24	GNU_CONFIGURE= yes
25	CONFIGURE_ARGS+=--with-layout=GNU \
26	--with-config-file-scan-dir=${PREFIX}/etc/php \
27	--disable-all \
28	--enable-libxml \
29	--with-libxml-dir=${LOCALBASE} \
30	--with-pcre-regex=${LOCALBASE} \
31	--with-password-argon2=${LOCALBASE} \
32	--program-prefix=""
33	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
34	USES+= autoreconf:build
35	USE_GNOME= libxml2
36
37	# PR230207 Allow relocations against read-only segments (override lld default)
38	LDFLAGS_i386= -Wl,-z,notext
39
40	OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQLND LINKTHR ZTS
41	OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE
42	OPTIONS_EXCLUDE_DragonFly= DTRACE
43	# ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
44	OPTIONS_EXCLUDE_aarch64= DTRACE
45	# dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented
46	OPTIONS_EXCLUDE_armv6= DTRACE
47	OPTIONS_EXCLUDE_armv7= DTRACE
48	# Bug 197128: No ASM code for MIPS/MIPS64, disable FPM
49	OPTIONS_EXCLUDE_mips= DTRACE FPM
50	OPTIONS_EXCLUDE_mips64= DTRACE FPM
51	# dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: RISC-V implementation required
52	OPTIONS_EXCLUDE_riscv64= DTRACE
53	OPTIONS_EXCLUDE_sparc64= DTRACE
54	OPTIONS_SUB= yes
55
56	CLI_DESC= Build CLI version
57	CGI_DESC= Build CGI version
58	FPM_DESC= Build FPM version
59	EMBED_DESC= Build embedded library
60	PHPDBG_DESC= Interactive PHP debugger
61	MYSQLND_DESC= Build with MySQL Native Driver
62	LINKTHR_DESC= Link thread lib (for threaded extensions)
63	ZTS_DESC= Force Zend Thread Safety (ZTS) build
64
65	CONFLICTS= php74 php80
66
67	DESTDIRNAME= INSTALL_ROOT
68
69	.include <bsd.port.pre.mk>
70
71	.if ${PORT_OPTIONS:MMYSQLND}
72	CONFIGURE_ARGS+=--enable-mysqlnd
73	.endif
74
75	.if ${PORT_OPTIONS:MCLI}
76	PHP_SAPI+= cli
77	.else
78	CONFIGURE_ARGS+=--disable-cli
79	.endif
80
81	.if ${PORT_OPTIONS:MCGI}
82	PHP_SAPI+= cgi
83	.else
84	CONFIGURE_ARGS+=--disable-cgi
85	.endif
86
87	.if ${PORT_OPTIONS:MFPM}
88	PHP_SAPI+= fpm
89	USE_RC_SUBR+= php-fpm
90	CONFIGURE_ARGS+=--enable-fpm \
91	--with-fpm-user=${WWWOWN} \
92	--with-fpm-group=${WWWGRP}
93	.endif
94
95	.if defined(PKGNAMEPREFIX)
96	USES+= apache:2.2+
97	.include "${PORTSDIR}/Mk/Uses/apache.mk"
98	.if ${PORT_OPTIONS:MAP2FILTER}
99	CONFIGURE_ARGS+=--with-apxs2filter=${APXS}
100	.else
101	CONFIGURE_ARGS+=--with-apxs2=${APXS}
102	.endif
103	PLIST= ${PKGDIR}/pkg-plist.mod
104	PKGMESSAGE= ${PKGDIR}/pkg-message.mod
105	MODULENAME= libphp7
106	SHORTMODNAME= php7
107	WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
108	.endif
109
110	.if ${PORT_OPTIONS:MEMBED}
111	PHP_SAPI+= embed
112	CONFIGURE_ARGS+=--enable-embed
113	.endif
114
115	.if ${PORT_OPTIONS:MPHPDBG}
116	PHP_SAPI+= phpdbg
117	CONFIGURE_ARGS+=--enable-phpdbg
118	.if ${PORT_OPTIONS:MDEBUG}
119	CONFIGURE_ARGS+=--enable-phpdbg-debug
120	.endif
121	.endif
122
123	.if ${PORT_OPTIONS:MCLI} \|\| ${PORT_OPTIONS:MEMBED}
124	PLIST_SUB+= SAPI_INC=""
125	.else
126	PLIST_SUB+= SAPI_INC="@comment "
127	.endif
128
129	CONFIGURE_ENV+= ac_cv_decimal_fp_supported="no" \
130	lt_cv_path_SED="sed"
131
132	.if ${PORT_OPTIONS:MLINKTHR}
133	LIBS+= -lpthread
134	.endif
135
136	.if ${PORT_OPTIONS:MDEBUG}
137	CONFIGURE_ARGS+=--enable-debug
138	.endif
139
140	.if ${PORT_OPTIONS:MZTS}
141	CONFIGURE_ARGS+=--enable-maintainer-zts
142	CONFIGURE_ENV+= pthreads_working="yes"
143	.endif
144
145	.if ${PORT_OPTIONS:MDTRACE}
146	CONFIGURE_ARGS+=--enable-dtrace
147	PLIST_SUB+= DTRACE=""
148	.else
149	PLIST_SUB+= DTRACE="@comment "
150	.endif
151
152	.if empty(PORT_OPTIONS:MIPV6)
153	CONFIGURE_ARGS+=--disable-ipv6
154	.endif
155
156	post-patch:
157	@${TOUCH} ${WRKSRC}/ext/php_config.h
158	@${REINPLACE_CMD} "s\|^\(extension_dir\)\|; \1\|" ${WRKSRC}/php.ini-*
159	.if ${PORT_OPTIONS:MFPM}
160	@${REINPLACE_CMD} -e "s\|^;\(pid\)\|\1\|;s\|^;\(pm\.[a-z_]*_servers\)\|\1\|" \
161	${WRKSRC}/sapi/fpm/php-fpm.conf.in
162	.endif
163
164	pre-configure:
165	@(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force)
166
167	.if !defined(PKGNAMEPREFIX)
168	post-build:
169	@${ECHO_CMD} "PHP_VER=73" > ${WRKDIR}/php.conf
170	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
171	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
172	@${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf
173	@${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf
174	@${SH} ${WRKSRC}/scripts/php-config --extension-dir \| ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf
175
176	test: build
177	@(cd ${WRKSRC} && ${MAKE} test)
178
179	post-install:
180	${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
181	${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
182	.else
183	do-install:
184	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
185	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
186	${STAGEDIR}${PREFIX}/${APACHEMODDIR}
187	.endif
188
189	.else
190	.include "${MASTERDIR}/Makefile.ext"
191	.endif
192	.include <bsd.port.post.mk>

Removed Link Here

(-)a/lang/php73/Makefile.ext (-570 lines)
1	COMMENT= The ${PHP_MODNAME} shared extension for php
2
3	USES+= php:ext,noflavors
4	PHP_MODNAME= ${PKGNAMESUFFIX:S/-//}
5	PHP_VER= 73
6	IGNORE_WITH_PHP= 72 74
7
8	EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME}
9	WRKSRC= ${WRKDIR}/${EXTSUBDIR}
10	PATCHDIR= ${.CURDIR}/files
11	PLIST= ${NONEXISTENT}
12
13	EXTRACT_AFTER_ARGS?= ${EXTSUBDIR}
14
15	.if ${PHP_MODNAME} == "bcmath"
16	CONFIGURE_ARGS+=--enable-bcmath
17
18	PHP_HEADER_DIRS=libbcmath/src
19	.endif
20
21	.if ${PHP_MODNAME} == "bz2"
22	CONFIGURE_ARGS+=--with-bz2=/usr
23	.endif
24
25	.if ${PHP_MODNAME} == "calendar"
26	CONFIGURE_ARGS+=--enable-calendar
27	.endif
28
29	.if ${PHP_MODNAME} == "ctype"
30	CONFIGURE_ARGS+=--enable-ctype
31	.endif
32
33	.if ${PHP_MODNAME} == "curl"
34	LIB_DEPENDS+= libcurl.so:ftp/curl
35
36	CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
37	.endif
38
39	.if ${PHP_MODNAME} == "dba"
40	CONFIGURE_ARGS+=--enable-dba
41
42	OPTIONS_DEFINE= CDB DB4 GDBM QDBM TOKYO INIFILE FLATFILE LMDB
43	OPTIONS_DEFAULT=CDB INIFILE FLATFILE
44
45	CDB_DESC= cdb database support
46	DB4_DESC= Berkeley DB4 support
47	GDBM_DESC= GDBM database support
48	QDBM_DESC= QDBM database support
49	TOKYO_DESC= Tokyo Cabinet database support
50	INIFILE_DESC= INI file support
51	FLATFILE_DESC= flatfile support
52	LMDB_DESC= LMDB database support
53
54	PHP_HEADER_DIRS= libcdb libflatfile libinifile
55	.endif
56
57	.if ${PHP_MODNAME} == "dom"
58	CONFIGURE_ARGS+=--enable-dom \
59	--with-libxml-dir=${LOCALBASE}
60
61	USE_GNOME= libxml2
62	.endif
63
64	.if ${PHP_MODNAME} == "enchant"
65	LIB_DEPENDS+= libenchant.so:textproc/enchant
66	CONFIGURE_ARGS+=--with-enchant=${LOCALBASE}
67	.endif
68
69	.if ${PHP_MODNAME} == "exif"
70	CONFIGURE_ARGS+=--enable-exif
71	.endif
72
73	.if ${PHP_MODNAME} == "fileinfo"
74	CONFIGURE_ARGS+=--enable-fileinfo \
75	--with-pcre-dir=${LOCALBASE}
76
77	PHP_HEADER_DIRS= libmagic
78	.endif
79
80	.if ${PHP_MODNAME} == "filter"
81	CONFIGURE_ARGS+=--enable-filter \
82	--with-pcre-dir=${LOCALBASE}
83	.endif
84
85	.if ${PHP_MODNAME} == "ftp"
86	CONFIGURE_ARGS+=--enable-ftp \
87	--with-openssl-dir=${OPENSSLBASE}
88
89	LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
90	USES+= ssl
91	.endif
92
93	.if ${PHP_MODNAME} == "gd"
94	LIB_DEPENDS= libfreetype.so:print/freetype2 \
95	libpng.so:graphics/png
96	USES+= jpeg pkgconfig
97
98	CONFIGURE_ARGS+=--with-gd=${LOCALBASE} \
99	--with-freetype-dir=${LOCALBASE} \
100	--with-jpeg-dir=${LOCALBASE} \
101	--with-png-dir=${LOCALBASE} \
102	--with-zlib-dir=/usr
103
104	EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude libgd \
105	php-${DISTVERSION}/ext/gd
106
107	OPTIONS_DEFINE=TRUETYPE JIS WEBP X11
108	OPTIONS_DEFAULT=TRUETYPE
109
110	TRUETYPE_DESC= Enable TrueType string function
111	JIS_DESC= Enable JIS-mapped Japanese font support
112	WEBP_DESC= Enable WebP image format support
113	X11_DESC= Enable XPM support
114
115	.endif
116
117	.if ${PHP_MODNAME} == "gettext"
118	CONFIGURE_ARGS+=--with-gettext=${LOCALBASE}
119
120	USES+= gettext
121	.endif
122
123	.if ${PHP_MODNAME} == "gmp"
124	LIB_DEPENDS+= libgmp.so:math/gmp
125
126	CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
127	.endif
128
129	.if ${PHP_MODNAME} == "hash"
130	CONFIGURE_ARGS+=--enable-hash \
131	--with-mhash
132	CFLAGS_mips64= -DHAVE_SLOW_HASH3
133	CFLAGS_powerpc64= -DHAVE_SLOW_HASH3
134	CFLAGS_powerpc= -DHAVE_SLOW_HASH3
135	CFLAGS_powerpcspe= -DHAVE_SLOW_HASH3
136	CFLAGS_sparc64= -DHAVE_SLOW_HASH3
137	.endif
138
139	.if ${PHP_MODNAME} == "iconv"
140	CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
141
142	USES+= iconv:translit
143	.endif
144
145	.if ${PHP_MODNAME} == "imap"
146	PHP_MOD_PRIO= 30
147	OPTIONS_RADIO= CLIENT
148	OPTIONS_RADIO_CLIENT= CCLIENT PANDA
149	OPTIONS_DEFAULT=PANDA
150	CCLIENT_DESC= Uses the original but unmaintained cclient
151	PANDA_DESC= Uses the forked panda-cclient instead of the original cclient
152
153	CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
154	--with-pcre-dir=${LOCALBASE} \
155	--with-imap-ssl=${OPENSSLBASE}
156
157	LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
158	USES+= ssl
159	.endif
160
161	.if ${PHP_MODNAME} == "interbase"
162	CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}
163
164	USES+= firebird
165	.endif
166
167	.if ${PHP_MODNAME} == "intl"
168	CONFIGURE_ARGS+=--with-intl=${LOCALBASE}
169	LIB_DEPENDS= libicui18n.so:devel/icu
170	.endif
171
172	.if ${PHP_MODNAME} == "json"
173	CONFIGURE_ARGS+=--enable-json
174	.endif
175
176	.if ${PHP_MODNAME} == "ldap"
177	CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
178
179	USE_OPENLDAP= yes
180	.endif
181
182	.if ${PHP_MODNAME} == "mbstring"
183
184	CONFIGURE_ARGS+=--enable-mbstring \
185	--with-pcre-dir=${LOCALBASE}
186
187	OPTIONS_DEFINE= REGEX
188	OPTIONS_DEFAULT=REGEX
189
190	REGEX_DESC= Enable multibyte regex support
191
192	PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
193	.endif
194
195	.if ${PHP_MODNAME} == "mysqli"
196	OPTIONS_DEFINE= MYSQLND
197	OPTIONS_DEFAULT=MYSQLND
198
199	MYSQLND_DESC= Use MySQL Native Driver
200	.endif
201
202	.if ${PHP_MODNAME} == "odbc"
203	LIB_DEPENDS+= libodbc.so:databases/unixODBC
204
205	CONFIGURE_ARGS+=--enable-odbc \
206	--with-unixODBC=${LOCALBASE}
207	.endif
208
209	.if ${PHP_MODNAME} == "openssl"
210	CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
211
212	LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
213	USES+= ssl
214	.endif
215
216	.if ${PHP_MODNAME} == "opcache"
217	# This is needed by Zend extensions, keep before everything.
218	PHP_MOD_PRIO= 10
219	CONFIGURE_ARGS+=--enable-opcache
220	USES+= localbase
221	.endif
222
223	.if ${PHP_MODNAME} == "pcntl"
224	CONFIGURE_ARGS+=--enable-pcntl
225	.endif
226
227	.if ${PHP_MODNAME} == "pdo"
228	CONFIGURE_ARGS+=--enable-pdo
229	.endif
230
231	.if ${PHP_MODNAME} == "pdo_dblib"
232	CONFIGURE_ARGS+=--with-pdo-dblib=${LOCALBASE}
233
234	USE_PHP= pdo:build
235
236	OPTIONS_DEFINE= MSSQL
237
238	MSSQL_DESC= Enable Microsoft SQL Server support
239	.endif
240
241	.if ${PHP_MODNAME} == "pdo_firebird"
242	CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE}
243
244	USES+= firebird
245	USE_PHP= pdo:build
246	.endif
247
248	.if ${PHP_MODNAME} == "pdo_odbc"
249	LIB_DEPENDS+= libodbc.so:databases/unixODBC
250	CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
251
252	USE_PHP= pdo:build
253	.endif
254
255	.if ${PHP_MODNAME} == "pdo_mysql"
256	OPTIONS_DEFINE= MYSQLND
257	OPTIONS_DEFAULT=MYSQLND
258
259	MYSQLND_DESC= Use MySQL Native Driver
260
261	USE_PHP= pdo:build
262	.endif
263
264	.if ${PHP_MODNAME} == "pdo_pgsql"
265	USES+= pgsql
266
267	CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE}
268
269	USE_PHP= pdo:build
270	.endif
271
272	.if ${PHP_MODNAME} == "pdo_sqlite"
273	USES+= sqlite
274	CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE}
275
276	USE_PHP= pdo:build
277	.endif
278
279	.if ${PHP_MODNAME} == "pgsql"
280	USES+= pgsql
281
282	CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
283	.endif
284
285	.if ${PHP_MODNAME} == "phar"
286	CONFIGURE_ARGS+=--enable-phar \
287	--with-pcre-dir=${LOCALBASE}
288
289	USE_PHP= hash:build
290	.endif
291
292	.if ${PHP_MODNAME} == "posix"
293	CONFIGURE_ARGS+=--enable-posix
294	.endif
295
296	.if ${PHP_MODNAME} == "pspell"
297	LIB_DEPENDS+= libaspell.so:textproc/aspell
298
299	CONFIGURE_ARGS+=--with-pspell=${LOCALBASE}
300	.endif
301
302	.if ${PHP_MODNAME} == "readline"
303	CONFIGURE_ARGS+=--with-readline=/usr
304	USES+= readline
305	.endif
306
307	.if ${PHP_MODNAME} == "recode"
308	LIB_DEPENDS+= librecode.so:converters/recode
309
310	CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
311	.endif
312
313	.if ${PHP_MODNAME} == "session"
314	CONFIGURE_ARGS+=--enable-session
315	PHP_MOD_PRIO= 18
316	.endif
317
318	.if ${PHP_MODNAME} == "shmop"
319	CONFIGURE_ARGS+=--enable-shmop
320	.endif
321
322	.if ${PHP_MODNAME} == "simplexml"
323	CONFIGURE_ARGS+=--enable-simplexml \
324	--with-pcre-dir=${LOCALBASE} \
325	--with-libxml-dir=${LOCALBASE}
326
327	USES+= pkgconfig
328	USE_GNOME= libxml2
329	.endif
330
331	.if ${PHP_MODNAME} == "snmp"
332	CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \
333	--with-openssl-dir=${OPENSSLBASE}
334
335	CONFIGURE_ENV+= ac_cv_buggy_snprint_value="no"
336
337	LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net-snmp
338	LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
339	USES+= ssl
340	.endif
341
342	.if ${PHP_MODNAME} == "soap"
343	CONFIGURE_ARGS+=--enable-soap \
344	--with-libxml-dir=${LOCALBASE}
345
346	USE_GNOME= libxml2
347	.endif
348
349	.if ${PHP_MODNAME} == "sockets"
350	CONFIGURE_ARGS+=--enable-sockets
351	.endif
352
353	.if ${PHP_MODNAME} == "sodium"
354	CONFIGURE_ARGS+= --with-sodium=${LOCALBASE}
355	LIB_DEPENDS+= libsodium.so:security/libsodium
356	.endif
357
358	.if ${PHP_MODNAME} == "sqlite3"
359	USES+= sqlite
360	CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE}
361	.endif
362
363	.if ${PHP_MODNAME} == "sysvmsg"
364	CONFIGURE_ARGS+=--enable-sysvmsg
365	.endif
366
367	.if ${PHP_MODNAME} == "sysvsem"
368	CONFIGURE_ARGS+=--enable-sysvsem
369	.endif
370
371	.if ${PHP_MODNAME} == "sysvshm"
372	CONFIGURE_ARGS+=--enable-sysvshm
373	.endif
374
375	.if ${PHP_MODNAME} == "tidy"
376	CONFIGURE_ARGS+=--with-tidy=${LOCALBASE}
377
378	LIB_DEPENDS+= libtidy.so:www/tidy-lib
379	.endif
380
381	.if ${PHP_MODNAME} == "tokenizer"
382	CONFIGURE_ARGS+=--enable-tokenizer
383	.endif
384
385	.if ${PHP_MODNAME} == "wddx"
386	CONFIGURE_ARGS+=--enable-wddx \
387	--with-libxml-dir=${LOCALBASE}
388
389	USE_GNOME= libxml2
390
391	USE_PHP= xml:build session:build
392	.endif
393
394	.if ${PHP_MODNAME} == "xml"
395	CONFIGURE_ARGS+=--enable-xml \
396	--with-libxml-dir=${LOCALBASE}
397
398	USE_GNOME= libxml2
399	.endif
400
401	.if ${PHP_MODNAME} == "xmlreader"
402	CONFIGURE_ARGS+=--enable-xmlreader \
403	--with-libxml-dir=${LOCALBASE}
404
405	USE_GNOME= libxml2
406
407	USE_PHP= dom:build
408	.endif
409
410	.if ${PHP_MODNAME} == "xmlrpc"
411	CONFIGURE_ARGS+=--with-xmlrpc \
412	--with-libxml-dir=${LOCALBASE} \
413	--with-iconv-dir=${LOCALBASE}
414
415	USES+= iconv:translit
416	USE_GNOME= libxml2
417
418	PHP_HEADER_DIRS=libxmlrpc
419
420	USE_PHP= xml:build
421	.endif
422
423	.if ${PHP_MODNAME} == "xmlwriter"
424	CONFIGURE_ARGS+=--enable-xmlwriter \
425	--with-libxml-dir=${LOCALBASE}
426
427	USE_GNOME= libxml2
428	.endif
429
430	.if ${PHP_MODNAME} == "xsl"
431	CONFIGURE_ARGS+=--with-xsl=${LOCALBASE}
432
433	USE_GNOME= libxslt
434	USE_PHP= dom:build xml:build
435	.endif
436
437	.if ${PHP_MODNAME} == "zip"
438	LIB_DEPENDS+= libzip.so:archivers/libzip
439
440	CONFIGURE_ARGS+=--enable-zip \
441	--with-zlib-dir=/usr \
442	--with-pcre-dir=${LOCALBASE} \
443	--with-libzip=${LOCALBASE}
444	.endif
445
446	.if ${PHP_MODNAME} == "zlib"
447	CONFIGURE_ARGS+=--with-zlib=/usr
448	.endif
449
450	.include <bsd.port.options.mk>
451
452	.if ${PHP_MODNAME} == "dba"
453	. if empty(PORT_OPTIONS:MCDB)
454	CONFIGURE_ARGS+=--without-cdb
455	. endif
456	. if ${PORT_OPTIONS:MDB4}
457	CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
458
459	USES+= bdb
460	WITH_BDB_HIGHEST= yes
461	. endif
462	. if ${PORT_OPTIONS:MGDBM}
463	LIB_DEPENDS+= libgdbm.so:databases/gdbm
464
465	CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
466	. endif
467	. if ${PORT_OPTIONS:MQDBM}
468	LIB_DEPENDS+= libqdbm.so:databases/qdbm
469
470	CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
471	. endif
472	. if ${PORT_OPTIONS:MTOKYO}
473	LIB_DEPENDS+= libtokyocabinet.so:databases/tokyocabinet
474
475	CONFIGURE_ARGS+=--with-tcadb=${LOCALBASE}
476	. endif
477	. if empty(PORT_OPTIONS:MINIFILE)
478	CONFIGURE_ARGS+=--disable-inifile
479	. endif
480	. if empty(PORT_OPTIONS:MFLATFILE)
481	CONFIGURE_ARGS+=--disable-flatfile
482	. endif
483
484	. if ${PORT_OPTIONS:MLMDB}
485	LIB_DEPENDS+= liblmdb.so:databases/lmdb
486	CONFIGURE_ARGS+= --with-lmdb=${LOCALBASE}
487	.endif
488	.endif
489
490	.if ${PHP_MODNAME} == "mysqli"
491	. if ${PORT_OPTIONS:MMYSQLND}
492	CONFIGURE_ARGS+=--with-mysqli=mysqlnd
493	. else
494	CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config
495	USES+= mysql
496	. endif
497	.endif
498
499	.if ${PHP_MODNAME} == "pdo_mysql"
500	. if ${PORT_OPTIONS:MMYSQLND}
501	CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd
502	. else
503	CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \
504	--with-zlib-dir=/usr
505	USES+= mysql
506	. endif
507	.endif
508
509	.if ${PHP_MODNAME} == "gd"
510	. if ${PORT_OPTIONS:MTRUETYPE}
511	CONFIGURE_ARGS+=--enable-gd-native-ttf
512	. endif
513	. if ${PORT_OPTIONS:MJIS}
514	CONFIGURE_ARGS+=--enable-gd-jis-conv
515	. endif
516	. if ${PORT_OPTIONS:MWEBP}
517	LIB_DEPENDS+= libwebp.so:graphics/webp
518
519	CONFIGURE_ARGS+=--with-webp-dir=${LOCALBASE}
520	. endif
521	. if ${PORT_OPTIONS:MX11}
522	USES+= xorg
523	USE_XORG= xpm
524
525	CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
526	. endif
527	.endif
528
529	.include <bsd.port.pre.mk>
530
531	.if ${PHP_MODNAME} == "imap"
532	. if ${PORT_OPTIONS:MPANDA}
533	LIB_DEPENDS+= libc-client4.so.10:mail/panda-cclient
534	. else
535	LIB_DEPENDS+= libc-client4.so.9:mail/cclient
536	. endif
537	.endif
538
539	.if ${PHP_MODNAME} == "mbstring"
540	. if ${PORT_OPTIONS:MREGEX}
541	LIB_DEPENDS+= libonig.so:devel/oniguruma
542	CONFIGURE_ARGS+=--with-onig=${LOCALBASE}
543	. else
544	CONFIGURE_ARGS+=--disable-mbregex
545	. endif
546	.endif
547
548	.if ${PHP_MODNAME} == "openssl" \|\| ${PHP_MODNAME} == "sqlite3"
549	post-extract:
550	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
551	.endif
552
553	.if ${PHP_MODNAME} == "pdo_dblib"
554	. if ${PORT_OPTIONS:MMSSQL}
555	LIB_DEPENDS+= libsybdb.so:databases/freetds
556	. else
557	LIB_DEPENDS+= libct.so:databases/freetds
558	. endif
559	.endif
560
561	.if ${PHP_MODNAME} == "xml"
562	post-extract:
563	@${MKDIR} ${WRKSRC}/ext/xml
564	@${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml
565	.endif
566
567	.if ${PHP_MODNAME} == "zlib"
568	post-extract:
569	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
570	.endif

Removed Link Here

(-)a/lang/php73/files/patch-Makefile.global (-19 lines)
1	--- Makefile.global.orig 2016-08-17 19:50:48 UTC
2	+++ Makefile.global
3	@@ -89,14 +89,14 @@ test: all
4	@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
5	INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
6	if test "$$INI_FILE"; then \
7	- $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
8	+ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini \|\| :; \
9	else \
10	echo > $(top_builddir)/tmp-php.ini; \
11	fi; \
12	INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
13	if test "$$INI_SCANNED_PATH"; then \
14	INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \
15	- $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
16	+ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini \|\| :; \
17	fi; \
18	TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
19	TEST_PHP_SRCDIR=$(top_srcdir) \

Removed Link Here

(-)a/lang/php73/files/patch-acinclude.m4 (-68 lines)
1	--- acinclude.m4.orig 2018-12-04 16:12:30 UTC
2	+++ acinclude.m4
3	@@ -971,15 +971,9 @@ dnl ------------------------------------
4	if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
5	dnl ---------------------------------------------- CLI static module
6	[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
7	- case "$PHP_SAPI" in
8	- cgi\|embed\|phpdbg[)]
9	- PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,)
10	- EXT_STATIC="$EXT_STATIC $1;$ext_dir"
11	- ;;
12	- *[)]
13	- PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,cli)
14	- ;;
15	- esac
16	+
17	+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
18	+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
19	EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir"
20	fi
21	PHP_ADD_BUILD_DIR($ext_builddir)
22	@@ -1029,12 +1023,6 @@ You either need to build $1 shared or bu
23	build to be successful.
24	])
25	fi
26	- if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then
27	- AC_MSG_ERROR([
28	-You've configured extension $1, which depends on extension $2,
29	-but you've either not enabled $2, or have disabled it.
30	-])
31	- fi
32	dnl Some systems require that we link $2 to $1 when building
33	])
34
35	@@ -2970,8 +2958,7 @@ dnl in GNU Make which causes the .d file
36	$abs_srcdir/$ac_provsrc:;
37
38	$ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
39	- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
40	-
41	+ CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
42	\$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
43
44	EOF
45	@@ -2990,12 +2977,12 @@ dnl Always attempt to create both PIC an
46	$ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
47	echo "[#] Generated by Makefile for libtool" > \$[]@
48	@test -d "$dtrace_lib_dir" \|\| mkdir $dtrace_lib_dir
49	- if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
50	+ if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
51	echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\]
52	else [\\]
53	echo "pic_object='none'" >> \$[]@ [;\\]
54	fi
55	- if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
56	+ if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
57	echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
58	else [\\]
59	echo "non_pic_object='none'" >> \$[]@ [;\\]
60	@@ -3007,7 +2994,7 @@ EOF
61	*)
62	cat>>Makefile.objects<<EOF
63	$ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
64	- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
65	+ CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
66
67	EOF
68	;;

Removed Link Here

(-)a/lang/php73/files/patch-configure.in (-61 lines)
1	--- configure.ac.orig 2018-01-02 22:35:55 UTC
2	+++ configure.ac
3	@@ -102,6 +102,7 @@ int zend_sprintf(char buffer, const char format, ...
4
5	#undef PTHREADS
6
7	+#include <ext/php_config.h>
8	#endif /* PHP_CONFIG_H */
9	])
10
11	@@ -339,7 +340,6 @@ sinclude(TSRM/tsrm.m4)
12	dnl .
13	dnl -------------------------------------------------------------------------
14
15	-PTHREADS_CHECK
16	PHP_HELP_SEPARATOR([SAPI modules:])
17	PHP_SHLIB_SUFFIX_NAMES
18	PHP_BUILD_PROGRAM
19	@@ -370,15 +370,9 @@ else
20	AC_MSG_RESULT([none])
21	fi
22
23	-dnl Exit early
24	-if test -z "$PHP_INSTALLED_SAPIS"; then
25	- AC_MSG_ERROR([Nothing to build.])
26	-fi
27	-
28	dnl force ZTS
29	if test "$enable_maintainer_zts" = "yes"; then
30	PTHREADS_ASSIGN_VARS
31	- PTHREADS_FLAGS
32	fi
33
34	dnl Starting system checks.
35	@@ -682,7 +676,7 @@ nanosleep \
36	)
37
38	dnl Some systems (like OpenSolaris) do not have nanosleep in libc
39	-PHP_CHECK_FUNC_LIB(nanosleep, rt)
40	+PHP_CHECK_FUNC(nanosleep, rt)
41
42	dnl Check for getaddrinfo, should be a better way, but...
43	dnl Also check for working getaddrinfo
44	@@ -1235,7 +1229,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
45	EXPANDED_DATADIR=$datadir
46	EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
47	EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
48	-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
49	+INCLUDE_PATH=.:${prefix}/share/pear
50
51	exec_prefix=$old_exec_prefix
52	libdir=$old_libdir
53	@@ -1434,7 +1428,7 @@ PHP_SUBST(all_targets)
54	PHP_SUBST(install_targets)
55	PHP_SUBST(install_binary_targets)
56
57	-PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
58	+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/])
59
60	PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
61

Removed Link Here

(-)a/lang/php73/files/patch-ext_mysqli_mysqli__api.c (-13 lines)
1	--- ext/mysqli/mysqli_api.c.orig 2019-12-17 10:29:23 UTC
2	+++ ext/mysqli/mysqli_api.c
3	@@ -31,8 +31,9 @@
4	#include "zend_smart_str.h"
5	#include "php_mysqli_structs.h"
6	#include "mysqli_priv.h"
7	+#if defined(MYSQLI_USE_MYSQLND)
8	#include "ext/mysqlnd/mysql_float_to_double.h"
9	-
10	+#endif
11
12	#if !defined(MYSQLI_USE_MYSQLND)
13	/* {{{ mysqli_tx_cor_options_to_string */

Removed Link Here

(-)a/lang/php73/files/patch-ext_mysqli_mysqli__nonapi.c (-12 lines)
1	--- ext/mysqli/mysqli_nonapi.c.orig 2020-01-09 11:40:57 UTC
2	+++ ext/mysqli/mysqli_nonapi.c
3	@@ -28,7 +28,9 @@
4	#include "php_ini.h"
5	#include "ext/standard/info.h"
6	#include "zend_smart_str.h"
7	+#if defined(MYSQLI_USE_MYSQLND)
8	#include "php_mysqli_structs.h"
9	+#endif
10	#include "mysqli_priv.h"
11
12	#define SAFE_STR(a) ((a)?a:"")

Removed Link Here

(-)a/lang/php73/files/patch-ext_mysqli_mysqli__prop.c (-12 lines)
1	--- ext/mysqli/mysqli_prop.c.orig 2020-01-09 11:40:11 UTC
2	+++ ext/mysqli/mysqli_prop.c
3	@@ -26,7 +26,9 @@
4	#include "php.h"
5	#include "php_ini.h"
6	#include "ext/standard/info.h"
7	+#if defined(MYSQLI_USE_MYSQLND)
8	#include "php_mysqli_structs.h"
9	+#endif
10	#include "mysqli_priv.h"
11
12	#define CHECK_STATUS(value) \

Removed Link Here

(-)a/lang/php73/files/patch-sapi_fpm_www.conf.in (-17 lines)
1	--- sapi/fpm/www.conf.in.orig 2019-01-26 15:54:27 UTC
2	+++ sapi/fpm/www.conf.in
3	@@ -27,10 +27,14 @@ group = @php_fpm_group@
4	; Valid syntaxes are:
5	; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on
6	; a specific port;
7	+; '0.0.0.0:port' - to listen on a TCP socket to all IPv4 addresses on
8	+; a specific port;
9	; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
10	; a specific port;
11	; 'port' - to listen on a TCP socket to all addresses
12	; (IPv6 and IPv4-mapped) on a specific port;
13	+; Note: IPv4-mapped addresses are disabled by-default in
14	+; FreeBSD for security reasons;
15	; '/path/to/unix/socket' - to listen on a unix socket.
16	; Note: This value is mandatory.
17	listen = 127.0.0.1:9000

Removed Link Here

(-)a/lang/php73/files/php-fpm.in (-66 lines)
1	#!/bin/sh
2
3	# PROVIDE: php-fpm
4	# REQUIRE: LOGIN
5	# KEYWORD: shutdown
6
7	#
8	# Add the following line to /etc/rc.conf to enable php-fpm:
9	# php_fpm_enable="YES"
10	#
11
12	. /etc/rc.subr
13
14	name="php_fpm"
15	rcvar=php_fpm_enable
16
17	start_precmd="php_fpm_prestart"
18	restart_precmd="php_fpm_checkconfig"
19	reload_precmd="php_fpm_checkconfig"
20	configtest_cmd="php_fpm_checkconfig"
21
22	load_rc_config "$name"
23
24	: ${php_fpm_enable="NO"}
25	: ${php_fpm_umask=""}
26
27	extra_commands="reload configtest logrotate"
28
29	command="%%PREFIX%%/sbin/php-fpm"
30	pidfile="/var/run/php-fpm.pid"
31	sig_stop="QUIT"
32	sig_reload="USR2"
33	logrotate_cmd="php_fpm_logrotate"
34
35	required_files="%%PREFIX%%/etc/php-fpm.conf"
36
37	php_fpm_logrotate() {
38	if [ -z "$rc_pid" ]; then
39	_run_rc_notrunning
40	return 1
41	fi
42	echo "Rotating logs $name."
43	kill -USR1 $rc_pid
44	}
45
46	php_fpm_checkconfig()
47	{
48	echo "Performing sanity check on php-fpm configuration:"
49	eval ${command} -t
50	}
51
52	php_fpm_prestart()
53	{
54	php_fpm_checkconfig
55	checkconfig=$?
56	if [ $checkconfig -ne 0 ]; then
57	return $checkconfig
58	fi
59
60	if [ ! -z "$php_fpm_umask" ]; then
61	echo "Setting umask to: ${php_fpm_umask}"
62	umask $php_fpm_umask
63	fi
64	}
65
66	run_rc_command "$1"

Removed Link Here

(-)a/lang/php73/pkg-message.mod (-19 lines)
1	[
2	{ type: install
3	message: <<EOM
4	Make sure index.php is part of your DirectoryIndex.
5
6	You should add the following to your Apache configuration file:
7
8	<FilesMatch "\.php$">
9	SetHandler application/x-httpd-php
10	</FilesMatch>
11	<FilesMatch "\.phps$">
12	SetHandler application/x-httpd-php-source
13	</FilesMatch>
14
15	If you are building PHP-based ports in poudriere(8) or Synth with ZTS enabled,
16	add WITH_MPM=event to /etc/make.conf to prevent build failures.
17	EOM
18	}
19	]

Removed Link Here

(-)a/lang/php73/pkg-plist (-265 lines)
1	%%CLI%%bin/php
2	%%CGI%%bin/php-cgi
3	bin/php-config
4	%%PHPDBG%%bin/phpdbg
5	bin/phpize
6	%%FPM%%sbin/php-fpm
7	etc/php.conf
8	etc/php.ini-development
9	etc/php.ini-production
10	%%FPM%%@sample etc/php-fpm.conf.default etc/php-fpm.conf
11	%%FPM%%@sample etc/php-fpm.d/www.conf.default etc/php-fpm.d/www.conf
12	include/php/TSRM/TSRM.h
13	include/php/TSRM/readdir.h
14	include/php/TSRM/tsrm_config.h
15	include/php/TSRM/tsrm_config.w32.h
16	include/php/TSRM/tsrm_config_common.h
17	include/php/TSRM/tsrm_strtok_r.h
18	include/php/TSRM/tsrm_win32.h
19	include/php/Zend/zend.h
20	include/php/Zend/zend_API.h
21	include/php/Zend/zend_alloc.h
22	include/php/Zend/zend_alloc_sizes.h
23	include/php/Zend/zend_arena.h
24	include/php/Zend/zend_ast.h
25	include/php/Zend/zend_bitset.h
26	include/php/Zend/zend_build.h
27	include/php/Zend/zend_builtin_functions.h
28	include/php/Zend/zend_closures.h
29	include/php/Zend/zend_compile.h
30	include/php/Zend/zend_config.h
31	include/php/Zend/zend_config.nw.h
32	include/php/Zend/zend_config.w32.h
33	include/php/Zend/zend_constants.h
34	include/php/Zend/zend_cpuinfo.h
35	include/php/Zend/zend_dtrace.h
36	%%DTRACE%%include/php/Zend/zend_dtrace_gen.h
37	include/php/Zend/zend_errors.h
38	include/php/Zend/zend_exceptions.h
39	include/php/Zend/zend_execute.h
40	include/php/Zend/zend_extensions.h
41	include/php/Zend/zend_float.h
42	include/php/Zend/zend_gc.h
43	include/php/Zend/zend_generators.h
44	include/php/Zend/zend_globals.h
45	include/php/Zend/zend_globals_macros.h
46	include/php/Zend/zend_hash.h
47	include/php/Zend/zend_highlight.h
48	include/php/Zend/zend_inheritance.h
49	include/php/Zend/zend_ini.h
50	include/php/Zend/zend_ini_parser.h
51	include/php/Zend/zend_ini_scanner.h
52	include/php/Zend/zend_ini_scanner_defs.h
53	include/php/Zend/zend_interfaces.h
54	include/php/Zend/zend_istdiostream.h
55	include/php/Zend/zend_iterators.h
56	include/php/Zend/zend_language_parser.h
57	include/php/Zend/zend_language_scanner.h
58	include/php/Zend/zend_language_scanner_defs.h
59	include/php/Zend/zend_list.h
60	include/php/Zend/zend_llist.h
61	include/php/Zend/zend_long.h
62	include/php/Zend/zend_modules.h
63	include/php/Zend/zend_multibyte.h
64	include/php/Zend/zend_multiply.h
65	include/php/Zend/zend_object_handlers.h
66	include/php/Zend/zend_objects.h
67	include/php/Zend/zend_objects_API.h
68	include/php/Zend/zend_operators.h
69	include/php/Zend/zend_portability.h
70	include/php/Zend/zend_ptr_stack.h
71	include/php/Zend/zend_range_check.h
72	include/php/Zend/zend_signal.h
73	include/php/Zend/zend_smart_str.h
74	include/php/Zend/zend_smart_str_public.h
75	include/php/Zend/zend_smart_string.h
76	include/php/Zend/zend_smart_string_public.h
77	include/php/Zend/zend_sort.h
78	include/php/Zend/zend_stack.h
79	include/php/Zend/zend_stream.h
80	include/php/Zend/zend_string.h
81	include/php/Zend/zend_strtod.h
82	include/php/Zend/zend_strtod_int.h
83	include/php/Zend/zend_ts_hash.h
84	include/php/Zend/zend_type_info.h
85	include/php/Zend/zend_types.h
86	include/php/Zend/zend_variables.h
87	include/php/Zend/zend_virtual_cwd.h
88	include/php/Zend/zend_vm.h
89	include/php/Zend/zend_vm_def.h
90	include/php/Zend/zend_vm_execute.h
91	include/php/Zend/zend_vm_handlers.h
92	include/php/Zend/zend_vm_opcodes.h
93	include/php/Zend/zend_vm_trace_handlers.h
94	include/php/Zend/zend_vm_trace_map.h
95	include/php/ext/date/lib/timelib.h
96	include/php/ext/date/lib/timelib_config.h
97	include/php/ext/date/php_date.h
98	include/php/ext/libxml/php_libxml.h
99	%%MYSQLND%%include/php/ext/mysqlnd/config-win.h
100	%%MYSQLND%%include/php/ext/mysqlnd/mysql_float_to_double.h
101	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd.h
102	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_alloc.h
103	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_auth.h
104	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_block_alloc.h
105	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_charset.h
106	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_commands.h
107	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_connection.h
108	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_debug.h
109	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
110	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
111	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
112	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_plugin.h
113	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_portability.h
114	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_priv.h
115	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
116	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_ps.h
117	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_read_buffer.h
118	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_result.h
119	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_result_meta.h
120	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_reverse_api.h
121	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_statistics.h
122	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_structs.h
123	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
124	%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_vio.h
125	%%MYSQLND%%include/php/ext/mysqlnd/php_mysqlnd.h
126	include/php/ext/pcre/php_pcre.h
127	include/php/ext/spl/php_spl.h
128	include/php/ext/spl/spl_array.h
129	include/php/ext/spl/spl_directory.h
130	include/php/ext/spl/spl_dllist.h
131	include/php/ext/spl/spl_engine.h
132	include/php/ext/spl/spl_exceptions.h
133	include/php/ext/spl/spl_fixedarray.h
134	include/php/ext/spl/spl_functions.h
135	include/php/ext/spl/spl_heap.h
136	include/php/ext/spl/spl_iterators.h
137	include/php/ext/spl/spl_observer.h
138	include/php/ext/standard/base64.h
139	include/php/ext/standard/basic_functions.h
140	include/php/ext/standard/crc32.h
141	include/php/ext/standard/credits.h
142	include/php/ext/standard/credits_ext.h
143	include/php/ext/standard/credits_sapi.h
144	include/php/ext/standard/crypt_blowfish.h
145	include/php/ext/standard/crypt_freesec.h
146	include/php/ext/standard/css.h
147	include/php/ext/standard/cyr_convert.h
148	include/php/ext/standard/datetime.h
149	include/php/ext/standard/dl.h
150	include/php/ext/standard/exec.h
151	include/php/ext/standard/file.h
152	include/php/ext/standard/flock_compat.h
153	include/php/ext/standard/fsock.h
154	include/php/ext/standard/head.h
155	include/php/ext/standard/hrtime.h
156	include/php/ext/standard/html.h
157	include/php/ext/standard/html_tables.h
158	include/php/ext/standard/info.h
159	include/php/ext/standard/md5.h
160	include/php/ext/standard/microtime.h
161	include/php/ext/standard/pack.h
162	include/php/ext/standard/pageinfo.h
163	include/php/ext/standard/php_array.h
164	include/php/ext/standard/php_assert.h
165	include/php/ext/standard/php_browscap.h
166	include/php/ext/standard/php_crypt.h
167	include/php/ext/standard/php_crypt_r.h
168	include/php/ext/standard/php_dir.h
169	include/php/ext/standard/php_dns.h
170	include/php/ext/standard/php_ext_syslog.h
171	include/php/ext/standard/php_filestat.h
172	include/php/ext/standard/php_fopen_wrappers.h
173	include/php/ext/standard/php_ftok.h
174	include/php/ext/standard/php_http.h
175	include/php/ext/standard/php_image.h
176	include/php/ext/standard/php_incomplete_class.h
177	include/php/ext/standard/php_iptc.h
178	include/php/ext/standard/php_lcg.h
179	include/php/ext/standard/php_link.h
180	include/php/ext/standard/php_mail.h
181	include/php/ext/standard/php_math.h
182	include/php/ext/standard/php_metaphone.h
183	include/php/ext/standard/php_mt_rand.h
184	include/php/ext/standard/php_net.h
185	include/php/ext/standard/php_password.h
186	include/php/ext/standard/php_rand.h
187	include/php/ext/standard/php_random.h
188	include/php/ext/standard/php_smart_string.h
189	include/php/ext/standard/php_smart_string_public.h
190	include/php/ext/standard/php_standard.h
191	include/php/ext/standard/php_string.h
192	include/php/ext/standard/php_type.h
193	include/php/ext/standard/php_uuencode.h
194	include/php/ext/standard/php_var.h
195	include/php/ext/standard/php_versioning.h
196	include/php/ext/standard/proc_open.h
197	include/php/ext/standard/quot_print.h
198	include/php/ext/standard/scanf.h
199	include/php/ext/standard/sha1.h
200	include/php/ext/standard/streamsfuncs.h
201	include/php/ext/standard/uniqid.h
202	include/php/ext/standard/url.h
203	include/php/ext/standard/url_scanner_ex.h
204	include/php/ext/standard/winver.h
205	@touch include/php/ext/php_config.h
206	@rmempty include/php/ext/php_config.h
207	include/php/main/SAPI.h
208	include/php/main/build-defs.h
209	include/php/main/fastcgi.h
210	include/php/main/fopen_wrappers.h
211	include/php/main/http_status_codes.h
212	include/php/main/php.h
213	include/php/main/php_compat.h
214	include/php/main/php_config.h
215	include/php/main/php_content_types.h
216	include/php/main/php_getopt.h
217	include/php/main/php_globals.h
218	include/php/main/php_ini.h
219	include/php/main/php_main.h
220	include/php/main/php_memory_streams.h
221	include/php/main/php_network.h
222	include/php/main/php_open_temporary_file.h
223	include/php/main/php_output.h
224	include/php/main/php_reentrancy.h
225	include/php/main/php_scandir.h
226	include/php/main/php_stdint.h
227	include/php/main/php_streams.h
228	include/php/main/php_syslog.h
229	include/php/main/php_ticks.h
230	include/php/main/php_variables.h
231	include/php/main/php_version.h
232	include/php/main/rfc1867.h
233	include/php/main/snprintf.h
234	include/php/main/spprintf.h
235	include/php/main/streams/php_stream_context.h
236	include/php/main/streams/php_stream_filter_api.h
237	include/php/main/streams/php_stream_glob_wrapper.h
238	include/php/main/streams/php_stream_mmap.h
239	include/php/main/streams/php_stream_plain_wrapper.h
240	include/php/main/streams/php_stream_transport.h
241	include/php/main/streams/php_stream_userspace.h
242	include/php/main/streams/php_streams_int.h
243	%%CLI%%include/php/sapi/cli/cli.h
244	%%EMBED%%include/php/sapi/embed/php_embed.h
245	%%EMBED%%lib/libphp7.so
246	lib/php/build/Makefile.global
247	lib/php/build/acinclude.m4
248	lib/php/build/ax_check_compile_flag.m4
249	lib/php/build/ax_gcc_func_attribute.m4
250	lib/php/build/config.guess
251	lib/php/build/config.sub
252	lib/php/build/libtool.m4
253	lib/php/build/ltmain.sh
254	lib/php/build/mkdep.awk
255	lib/php/build/phpize.m4
256	lib/php/build/run-tests.php
257	lib/php/build/scan_makefile_in.awk
258	lib/php/build/shtool
259	%%CGI%%man/man1/php-cgi.1.gz
260	man/man1/php-config.1.gz
261	%%CLI%%man/man1/php.1.gz
262	%%PHPDBG%%man/man1/phpdbg.1.gz
263	man/man1/phpize.1.gz
264	%%FPM%%man/man8/php-fpm.8.gz
265	%%FPM%%share/php/fpm/status.html

Removed Link Here

(-)a/mail/php73-imap/files/patch-config.m4 (-42 lines)
1	--- config.m4.orig 2010-02-07 14:06:54.000000000 +0100
2	+++ config.m4 2010-03-08 11:56:24.000000000 +0100
3	@@ -103,6 +103,8 @@
4	PHP_ARG_WITH(imap-ssl,for IMAP SSL support,
5	[ --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install prefix], no, no)
6
7	+PHP_ARG_WITH(pcre-dir, pcre install prefix,
8	+[ --with-pcre-dir IMAP: pcre install prefix], no, no)
9
10	if test "$PHP_IMAP" != "no"; then
11	PHP_SUBST(IMAP_SHARED_LIBADD)
12	@@ -119,6 +121,30 @@
13	fi
14	done
15
16	+ dnl This is PECL build, check if bundled PCRE library is used
17	+ old_CPPFLAGS=$CPPFLAGS
18	+ CPPFLAGS=$INCLUDES
19	+ AC_EGREP_CPP(yes,[
20	+#include <main/php_config.h>
21	+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
22	+yes
23	+#endif
24	+ ],[
25	+ PHP_PCRE_REGEX=yes
26	+ ],[
27	+ AC_EGREP_CPP(yes,[
28	+#include <main/php_config.h>
29	+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
30	+yes
31	+#endif
32	+ ],[
33	+ PHP_PCRE_REGEX=pecl
34	+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
35	+ ],[
36	+ PHP_PCRE_REGEX=no
37	+ ])
38	+ ])
39	+
40	dnl Check for c-client version 2004
41	AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [
42	AC_DEFINE(HAVE_IMAP2004,1,[ ])

Removed Link Here

(-)a/net/php73-xmlrpc/files/patch-config.m4 (-23 lines)
1	--- config.m4.orig 2014-04-29 08:04:30.000000000 +0000
2	+++ config.m4 2014-05-15 08:04:00.883004682 +0000
3	@@ -61,11 +61,9 @@ if test "$PHP_XMLRPC" != "no"; then
4	fi
5	fi
6
7	- dnl if iconv is shared or missing then we should build iconv ourselves
8	- if test "$PHP_ICONV_SHARED" = "yes" \|\| test "$PHP_ICONV" = "no"; then
9	-
10	if test "$PHP_ICONV_DIR" != "no"; then
11	PHP_ICONV=$PHP_ICONV_DIR
12	+ PHP_ADD_INCLUDE($PHP_ICONV_DIR/include)
13	fi
14
15	if test -z "$PHP_ICONV" \|\| test "$PHP_ICONV" = "no"; then
16	@@ -75,7 +73,6 @@ if test "$PHP_XMLRPC" != "no"; then
17	PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [
18	AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library])
19	])
20	- fi
21	fi
22
23	if test "$PHP_XMLRPC" = "yes"; then

Removed Link Here

(-)a/security/php73-sodium/files/patch-config.m4 (-17 lines)
1	--- config.m4.orig 2017-11-03 18:32:08 UTC
2	+++ config.m4
3	@@ -50,14 +50,6 @@ if test "$PHP_SODIUM" != "no"; then
4	PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $LIBSODIUM_DIR/$PHP_LIBDIR, SODIUM_SHARED_LIBADD)
5	fi
6
7	- PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
8	- [
9	- AC_DEFINE(HAVE_LIBSODIUMLIB,1,[ ])
10	- ],[
11	- AC_MSG_ERROR([wrong libsodium lib version (< 1.0.8) or lib not found])
12	- ],[
13	- ])
14	-
15	PHP_SUBST(SODIUM_SHARED_LIBADD)
16
17	PHP_NEW_EXTENSION(sodium, libsodium.c, $ext_shared)