17 files changed, 326 insertions, 0 deletions
diff --git a/databases/Makefile b/databases/Makefile
index f700a21778bf..ea38bb31d24e 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -657,6 +657,18 @@
     SUBDIR += php73-pdo_sqlite
     SUBDIR += php73-pgsql
     SUBDIR += php73-sqlite3
+    SUBDIR += php74-dba
+    SUBDIR += php74-mysqli
+    SUBDIR += php74-odbc
+    SUBDIR += php74-pdo
+    SUBDIR += php74-pdo_dblib
+    SUBDIR += php74-pdo_firebird
+    SUBDIR += php74-pdo_mysql
+    SUBDIR += php74-pdo_odbc
+    SUBDIR += php74-pdo_pgsql
+    SUBDIR += php74-pdo_sqlite
+    SUBDIR += php74-pgsql
+    SUBDIR += php74-sqlite3
     SUBDIR += phpliteadmin
     SUBDIR += phpminiadmin
     SUBDIR += phpmyadmin
diff --git a/databases/php74-dba/Makefile b/databases/php74-dba/Makefile
new file mode 100644
index 000000000000..e6a93a8b8e09
--- /dev/null
+++ b/databases/php74-dba/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX=	-dba
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-dba/files/patch-config.m4 b/databases/php74-dba/files/patch-config.m4
new file mode 100644
index 000000000000..30f662138374
--- /dev/null
+++ b/databases/php74-dba/files/patch-config.m4
@@ -0,0 +1,50 @@
+--- 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)
+ 
diff --git a/databases/php74-mysqli/Makefile b/databases/php74-mysqli/Makefile
new file mode 100644
index 000000000000..40116faa5c1c
--- /dev/null
+++ b/databases/php74-mysqli/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX=	-mysqli
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-mysqli/files/patch-mysqli.c b/databases/php74-mysqli/files/patch-mysqli.c
new file mode 100644
index 000000000000..3d74731142b6
--- /dev/null
+++ b/databases/php74-mysqli/files/patch-mysqli.c
@@ -0,0 +1,11 @@
+--- mysqli.c.orig	2016-12-06 18:05:01 UTC
++++ mysqli.c
+@@ -703,7 +703,7 @@ PHP_MINIT_FUNCTION(mysqli)
+ #ifdef MYSQLND_STRING_TO_INT_CONVERSION
+ 	REGISTER_LONG_CONSTANT("MYSQLI_OPT_INT_AND_FLOAT_NATIVE", MYSQLND_OPT_INT_AND_FLOAT_NATIVE, CONST_CS | CONST_PERSISTENT);
+ #endif
+-#if MYSQL_VERSION_ID > 50110 || defined(MYSQLI_USE_MYSQLND)
++#if (MYSQL_VERSION_ID < 80000 && MYSQL_VERSION_ID > 50110) || defined(MYSQLI_USE_MYSQLND)
+ 	REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT);
+ #endif
+ 
diff --git a/databases/php74-mysqli/files/patch-php_mysqli_structs.h b/databases/php74-mysqli/files/patch-php_mysqli_structs.h
new file mode 100644
index 000000000000..d0daeee9ee54
--- /dev/null
+++ b/databases/php74-mysqli/files/patch-php_mysqli_structs.h
@@ -0,0 +1,10 @@
+--- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
++++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
+@@ -54,6 +54,7 @@
+ #define WE_HAD_MBSTATE_T
+ #endif
+ 
++#define HAVE_ULONG 1
+ #include <my_global.h>
+ 
+ #if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN)
diff --git a/databases/php74-odbc/Makefile b/databases/php74-odbc/Makefile
new file mode 100644
index 000000000000..37b986df7125
--- /dev/null
+++ b/databases/php74-odbc/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX=	-odbc
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-odbc/files/patch-config.m4 b/databases/php74-odbc/files/patch-config.m4
new file mode 100644
index 000000000000..04efc6ded7c9
--- /dev/null
+++ b/databases/php74-odbc/files/patch-config.m4
@@ -0,0 +1,111 @@
+--- config.m4.orig	2019-08-06 06:54:18 UTC
++++ config.m4
+@@ -91,6 +91,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],,
+   [AS_HELP_STRING([[--with-odbcver[=HEX]]],
+@@ -102,7 +105,7 @@ PHP_ARG_WITH([odbcver],,
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([adabas],,
+   [AS_HELP_STRING([[--with-adabas[=DIR]]],
+-    [Include Adabas D support [/usr/local]])])
++    [Include Adabas D support [/usr/local]])], [no], [no])
+ 
+   AC_MSG_CHECKING([for Adabas support])
+   if test "$PHP_ADABAS" != "no"; then
+@@ -132,7 +135,7 @@ fi
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([sapdb],,
+   [AS_HELP_STRING([[--with-sapdb[=DIR]]],
+-    [Include SAP DB support [/usr/local]])])
++    [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],,
+   [AS_HELP_STRING([[--with-solid[=DIR]]],
+-    [Include Solid support [/usr/local/solid]])])
++    [Include Solid support [/usr/local/solid]])], [no], [no])
+ 
+   AC_MSG_CHECKING(for Solid support)
+   if test "$PHP_SOLID" != "no"; then
+@@ -181,7 +184,7 @@ fi
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([ibm-db2],,
+   [AS_HELP_STRING([[--with-ibm-db2[=DIR]]],
+-    [Include IBM DB2 support [/home/db2inst1/sqllib]])])
++    [Include IBM DB2 support [/home/db2inst1/sqllib]])], [no], [no])
+ 
+   AC_MSG_CHECKING(for IBM DB2 support)
+   if test "$PHP_IBM_DB2" != "no"; then
+@@ -222,7 +225,7 @@ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([empress],,
+   [AS_HELP_STRING([[--with-empress[=DIR]]],
+     [Include Empress support $EMPRESSPATH (Empress Version >= 8.60
+-    required)])])
++    required)])], [no], [no])
+ 
+   AC_MSG_CHECKING(for Empress support)
+   if test "$PHP_EMPRESS" != "no"; then
+@@ -248,7 +251,7 @@ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([empress-bcs],,
+   [AS_HELP_STRING([[--with-empress-bcs[=DIR]]],
+     [Include Empress Local Access support $EMPRESSPATH (Empress Version >=
+-    8.60 required)])])
++    8.60 required)])], [no], [no])
+ 
+   AC_MSG_CHECKING(for Empress local access support)
+   if test "$PHP_EMPRESS_BCS" != "no"; then
+@@ -294,7 +297,7 @@ PHP_ARG_WITH([custom-odbc],,
+     your include dirs. For example, you should define following for Sybase SQL
+     Anywhere 5.5.00 on QNX, prior to 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
+@@ -317,7 +320,7 @@ fi
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([iodbc],,
+   [AS_HELP_STRING([--with-iodbc],
+-    [Include iODBC support])])
++    [Include iODBC support])], [no], [no])
+ 
+   AC_MSG_CHECKING(whether to build with iODBC support)
+   if test "$PHP_IODBC" != "no"; then
+@@ -335,7 +338,7 @@ fi
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([esoob],,
+   [AS_HELP_STRING([[--with-esoob[=DIR]]],
+-    [Include Easysoft OOB support [/usr/local/easysoft/oob/client]])])
++    [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
+@@ -358,7 +361,7 @@ fi
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([unixODBC],,
+   [AS_HELP_STRING([--with-unixODBC],
+-    [Include unixODBC support])])
++    [Include unixODBC support])], [no], [no])
+ 
+   AC_MSG_CHECKING(whether to build with unixODBC support)
+   if test "$PHP_UNIXODBC" != "no"; then
+@@ -386,7 +389,7 @@ fi
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([dbmaker],,
+   [AS_HELP_STRING([[--with-dbmaker[=DIR]]],
+-    [Include DBMaker support])])
++    [Include DBMaker support])], [no], [no])
+ 
+   AC_MSG_CHECKING(for DBMaker support)
+   if test "$PHP_DBMAKER" != "no"; then
diff --git a/databases/php74-pdo/Makefile b/databases/php74-pdo/Makefile
new file mode 100644
index 000000000000..27ae22144481
--- /dev/null
+++ b/databases/php74-pdo/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX=	-pdo
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pdo_dblib/Makefile b/databases/php74-pdo_dblib/Makefile
new file mode 100644
index 000000000000..89acda240fd7
--- /dev/null
+++ b/databases/php74-pdo_dblib/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX=	-pdo_dblib
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pdo_firebird/Makefile b/databases/php74-pdo_firebird/Makefile
new file mode 100644
index 000000000000..bf040fca0189
--- /dev/null
+++ b/databases/php74-pdo_firebird/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX=	-pdo_firebird
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pdo_mysql/Makefile b/databases/php74-pdo_mysql/Makefile
new file mode 100644
index 000000000000..df7827c7e55e
--- /dev/null
+++ b/databases/php74-pdo_mysql/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX=	-pdo_mysql
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pdo_odbc/Makefile b/databases/php74-pdo_odbc/Makefile
new file mode 100644
index 000000000000..5c06123d4482
--- /dev/null
+++ b/databases/php74-pdo_odbc/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX=	-pdo_odbc
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pdo_pgsql/Makefile b/databases/php74-pdo_pgsql/Makefile
new file mode 100644
index 000000000000..bc5b3caf30bf
--- /dev/null
+++ b/databases/php74-pdo_pgsql/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX=	-pdo_pgsql
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pdo_sqlite/Makefile b/databases/php74-pdo_sqlite/Makefile
new file mode 100644
index 000000000000..337254f85316
--- /dev/null
+++ b/databases/php74-pdo_sqlite/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX=	-pdo_sqlite
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pgsql/Makefile b/databases/php74-pgsql/Makefile
new file mode 100644
index 000000000000..e3a97f8fc405
--- /dev/null
+++ b/databases/php74-pgsql/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX=	-pgsql
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-sqlite3/Makefile b/databases/php74-sqlite3/Makefile
new file mode 100644
index 000000000000..3307bbcee4d7
--- /dev/null
+++ b/databases/php74-sqlite3/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX=	-sqlite3
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"