diff options
author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2022-12-25 19:34:18 +0000 |
---|---|---|
committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2022-12-25 19:36:42 +0000 |
commit | 0d310d700aa060b02feec9c7487893a983bf7098 (patch) | |
tree | 3d35d698e9c13e27e41a8cd9de8ff7839dcd7b66 | |
parent | 036685c034ba77a67fcdb0b7a18ed6ef5994d945 (diff) | |
download | ports-0d310d700aa060b02feec9c7487893a983bf7098.tar.gz ports-0d310d700aa060b02feec9c7487893a983bf7098.zip |
*/*php74*: Sunset php 7.4
As per upstream php 7.4 has reached it's EOL on 2022-11-22. Remove php74
from the tree. Default version of php has already been switched to 8.1.
Approved by: portmgr (blanket infrastructure)
Sponsored by: Bounce Experts
118 files changed, 65 insertions, 2840 deletions
@@ -17641,3 +17641,65 @@ graphics/opencoloriov1|graphics/opencolorio|2022-12-20|Used by blender-lts28 whi graphics/openimageio-ociov1|graphics/openimageio|2022-12-20|Used by blender-lts28 which is EOL'd textproc/retext|editors/retext|2022-12-21|Moved to a better category math/vtk6||2022-12-24|Has expired: Old version not used anywhere in the ports tree +misc/php74-calendar|misc/php80-calendar|2022-12-25|Has expired: Security support ended on 2022-11-22 +graphics/php74-gd|graphics/php80-gd|2022-12-25|Has expired: Security support ended on 2022-11-22 +graphics/php74-exif|graphics/php80-exif|2022-12-25|Has expired: Security support ended on 2022-11-22 +textproc/php74-xmlreader|textproc/php80-xmlreader|2022-12-25|Has expired: Security support ended on 2022-11-22 +textproc/php74-simplexml|textproc/php80-simplexml|2022-12-25|Has expired: Security support ended on 2022-11-22 +textproc/php74-enchant|textproc/php80-enchant|2022-12-25|Has expired: Security support ended on 2022-11-22 +textproc/php74-xml|textproc/php80-xml|2022-12-25|Has expired: Security support ended on 2022-11-22 +textproc/php74-xmlwriter|textproc/php80-xmlwriter|2022-12-25|Has expired: Security support ended on 2022-11-22 +textproc/php74-pspell|textproc/php80-pspell|2022-12-25|Has expired: Security support ended on 2022-11-22 +textproc/php74-ctype|textproc/php80-ctype|2022-12-25|Has expired: Security support ended on 2022-11-22 +textproc/php74-dom|textproc/php80-dom|2022-12-25|Has expired: Security support ended on 2022-11-22 +textproc/php74-xsl|textproc/php80-xsl|2022-12-25|Has expired: Security support ended on 2022-11-22 +mail/php74-imap|mail/php80-imap|2022-12-25|Has expired: Security support ended on 2022-11-22 +databases/php74-odbc|databases/php80-odbc|2022-12-25|Has expired: Security support ended on 2022-11-22 +databases/php74-pdo_dblib|databases/php80-pdo_dblib|2022-12-25|Has expired: Security support ended on 2022-11-22 +databases/php74-dba|databases/php80-dba|2022-12-25|Has expired: Security support ended on 2022-11-22 +databases/php74-pdo|databases/php80-pdo|2022-12-25|Has expired: Security support ended on 2022-11-22 +databases/php74-pdo_firebird|databases/php80-pdo_firebird|2022-12-25|Has expired: Security support ended on 2022-11-22 +databases/php74-pgsql|databases/php80-pgsql|2022-12-25|Has expired: Security support ended on 2022-11-22 +databases/php74-mysqli|databases/php80-mysqli|2022-12-25|Has expired: Security support ended on 2022-11-22 +databases/php74-pdo_pgsql|databases/php80-pdo_pgsql|2022-12-25|Has expired: Security support ended on 2022-11-22 +databases/php74-pdo_odbc|databases/php80-pdo_odbc|2022-12-25|Has expired: Security support ended on 2022-11-22 +databases/php74-pdo_mysql|databases/php80-pdo_mysql|2022-12-25|Has expired: Security support ended on 2022-11-22 +databases/php74-pdo_sqlite|databases/php80-pdo_sqlite|2022-12-25|Has expired: Security support ended on 2022-11-22 +databases/php74-sqlite3|databases/php80-sqlite3|2022-12-25|Has expired: Security support ended on 2022-11-22 +security/php74-sodium|security/php80-sodium|2022-12-25|Has expired: Security support ended on 2022-11-22 +security/php74-filter|security/php80-filter|2022-12-25|Has expired: Security support ended on 2022-11-22 +security/php74-openssl||2022-12-25|Has expired: Security support ended on 2022-11-22 +net-mgmt/php74-snmp|net-mgmt/php80-snmp|2022-12-25|Has expired: Security support ended on 2022-11-22 +net/php74-ldap|net/php80-ldap|2022-12-25|Has expired: Security support ended on 2022-11-22 +net/php74-sockets|net/php80-sockets|2022-12-25|Has expired: Security support ended on 2022-11-22 +net/php74-xmlrpc||2022-12-25|Has expired: Security support ended on 2022-11-22 +net/php74-soap|net/php80-soap|2022-12-25|Has expired: Security support ended on 2022-11-22 +converters/php74-mbstring|converters/php80-mbstring|2022-12-25|Has expired: Security support ended on 2022-11-22 +converters/php74-iconv|converters/php80-iconv|2022-12-25|Has expired: Security support ended on 2022-11-22 +lang/php74-extensions|lang/php80-extensions|2022-12-25|Has expired: Security support ended on 2022-11-22 +lang/php74|lang/php80|2022-12-25|Has expired: Security support ended on 2022-11-22 +archivers/php74-zip|archivers/php80-zip|2022-12-25|Has expired: Security support ended on 2022-11-22 +archivers/php74-zlib|archivers/php80-zlib|2022-12-25|Has expired: Security support ended on 2022-11-22 +archivers/php74-bz2|archivers/php80-bz2|2022-12-25|Has expired: Security support ended on 2022-11-22 +archivers/php74-phar|archivers/php80-phar|2022-12-25|Has expired: Security support ended on 2022-11-22 +ftp/php74-ftp|ftp/php80-ftp|2022-12-25|Has expired: Security support ended on 2022-11-22 +ftp/php74-curl|ftp/php80-curl|2022-12-25|Has expired: Security support ended on 2022-11-22 +sysutils/php74-posix|sysutils/php80-posix|2022-12-25|Has expired: Security support ended on 2022-11-22 +sysutils/php74-fileinfo|sysutils/php80-fileinfo|2022-12-25|Has expired: Security support ended on 2022-11-22 +math/php74-bcmath|math/php80-bcmath|2022-12-25|Has expired: Security support ended on 2022-11-22 +math/php74-gmp|math/php80-gmp|2022-12-25|Has expired: Security support ended on 2022-11-22 +www/php74-opcache|www/php80-opcache|2022-12-25|Has expired: Security support ended on 2022-11-22 +www/mod_php74|www/mod_php80|2022-12-25|Has expired: Security support ended on 2022-11-22 +www/php74-tidy|www/php80-tidy|2022-12-25|Has expired: Security support ended on 2022-11-22 +www/php74-session|www/php80-session|2022-12-25|Has expired: Security support ended on 2022-11-22 +devel/php74-shmop|devel/php80-shmop|2022-12-25|Has expired: Security support ended on 2022-11-22 +devel/php74-sysvsem|devel/php80-sysvsem|2022-12-25|Has expired: Security support ended on 2022-11-22 +devel/php74-json||2022-12-25|Has expired: Security support ended on 2022-11-22 +devel/php74-sysvmsg|devel/php80-sysvmsg|2022-12-25|Has expired: Security support ended on 2022-11-22 +devel/php74-intl|devel/php80-intl|2022-12-25|Has expired: Security support ended on 2022-11-22 +devel/php74-tokenizer|devel/php80-tokenizer|2022-12-25|Has expired: Security support ended on 2022-11-22 +devel/php74-ffi|devel/php80-ffi|2022-12-25|Has expired: Security support ended on 2022-11-22 +devel/php74-pcntl|devel/php80-pcntl|2022-12-25|Has expired: Security support ended on 2022-11-22 +devel/php74-sysvshm|devel/php80-sysvshm|2022-12-25|Has expired: Security support ended on 2022-11-22 +devel/php74-gettext|devel/php80-gettext|2022-12-25|Has expired: Security support ended on 2022-11-22 +devel/php74-readline|devel/php80-readline|2022-12-25|Has expired: Security support ended on 2022-11-22 diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index 38dfccedc1a2..19d335abe400 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -110,7 +110,7 @@ DIST_SUBDIR= PECL PHPBASE?= ${LOCALBASE} -_ALL_PHP_VERSIONS= 74 80 81 82 +_ALL_PHP_VERSIONS= 80 81 82 # Make the already installed PHP the default one. . if exists(${PHPBASE}/etc/php.conf) @@ -164,10 +164,6 @@ FLAVOR= ${FLAVORS:[1]} . endif . endif -. if ${PHP_VER} == 74 && (${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)) || ${ARCH} == sparc64) -USE_GCC= yes -. endif - # This variable is for dependencies lines, so you write: # ${PHP_PKGNAMEPREFIX}foo:devel/php-foo@${PHP_FLAVOR} PHP_FLAVOR= php${PHP_VER} @@ -192,9 +188,6 @@ PHP_EXT_INC= hash json openssl pcre spl . elif ${PHP_VER} == 80 PHP_EXT_DIR= 20200930 PHP_EXT_INC= hash json openssl pcre spl -. elif ${PHP_VER} == 74 -PHP_EXT_DIR= 20190902 -PHP_EXT_INC= hash pcre spl . else # (rene) default to DEFAULT_VERSIONS PHP_EXT_DIR= 20210902 @@ -231,7 +224,7 @@ PECL_PKGNAMEPREFIX= php${PHP_VER}-pecl- . if ${PHP_VER} == "${VER}" _IGNORE_PHP_SET= IGNORE= cannot be installed: doesn't work with lang/php${PHP_VER} port\ - (doesn't support PHP ${IGNORE_WITH_PHP:C/^(7)/\1./}) + (doesn't support PHP ${IGNORE_WITH_PHP:C/^(8)/\1./}) . endif . endfor . endif @@ -391,7 +384,6 @@ _USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \ soap sockets sodium spl sqlite3 sysvmsg sysvsem sysvshm \ tidy tokenizer xml xmlreader xmlrpc xmlwriter xsl zip zlib # version specific components -_USE_PHP_VER74= ${_USE_PHP_ALL} zephir_parser _USE_PHP_VER80= ${_USE_PHP_ALL} zephir_parser _USE_PHP_VER81= ${_USE_PHP_ALL} zephir_parser _USE_PHP_VER82= ${_USE_PHP_ALL} @@ -417,9 +409,6 @@ iconv_DEPENDS= converters/php${PHP_VER}-iconv igbinary_DEPENDS= converters/pecl-igbinary@${PHP_FLAVOR} imap_DEPENDS= mail/php${PHP_VER}-imap intl_DEPENDS= devel/php${PHP_VER}-intl -. if ${PHP_VER} < 80 -json_DEPENDS= devel/php${PHP_VER}-json -. endif ldap_DEPENDS= net/php${PHP_VER}-ldap mbstring_DEPENDS= converters/php${PHP_VER}-mbstring mcrypt_DEPENDS= security/pecl-mcrypt@${PHP_FLAVOR} @@ -428,9 +417,6 @@ memcached_DEPENDS= databases/pecl-memcached@${PHP_FLAVOR} mysqli_DEPENDS= databases/php${PHP_VER}-mysqli odbc_DEPENDS= databases/php${PHP_VER}-odbc opcache_DEPENDS= www/php${PHP_VER}-opcache -. if ${PHP_VER} < 80 -openssl_DEPENDS=security/php${PHP_VER}-openssl -. endif pcntl_DEPENDS= devel/php${PHP_VER}-pcntl pdo_DEPENDS= databases/php${PHP_VER}-pdo pdo_dblib_DEPENDS= databases/php${PHP_VER}-pdo_dblib @@ -461,11 +447,7 @@ tidy_DEPENDS= www/php${PHP_VER}-tidy tokenizer_DEPENDS= devel/php${PHP_VER}-tokenizer xml_DEPENDS= textproc/php${PHP_VER}-xml xmlreader_DEPENDS= textproc/php${PHP_VER}-xmlreader -. if ${PHP_VER} >= 80 xmlrpc_DEPENDS= net/pecl-xmlrpc@${PHP_FLAVOR} -. else -xmlrpc_DEPENDS= net/php${PHP_VER}-xmlrpc -. endif xmlwriter_DEPENDS= textproc/php${PHP_VER}-xmlwriter xsl_DEPENDS= textproc/php${PHP_VER}-xsl zephir_parser_DEPENDS= textproc/pecl-zephir_parser@${PHP_FLAVOR} diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 8c3c149fb906..404eb375a39f 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -118,7 +118,7 @@ PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} . endif # Possible values: 10, 11, 12, 13, 14, 15 PGSQL_DEFAULT?= 13 -# Possible values: 7.4, 8.0, 8.1, 8.2 +# Possible values: 8.0, 8.1, 8.2 PHP_DEFAULT?= 8.1 # Possible values: 2.7, 3.7, 3.8, 3.9, 3.10, 3.11 PYTHON_DEFAULT?= 3.9 diff --git a/archivers/Makefile b/archivers/Makefile index dabcf0a44367..26e2a98d1a47 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -155,10 +155,6 @@ SUBDIR += php-lz4 SUBDIR += php-snappy SUBDIR += php-zstd - SUBDIR += php74-bz2 - SUBDIR += php74-phar - SUBDIR += php74-zip - SUBDIR += php74-zlib SUBDIR += php80-bz2 SUBDIR += php80-phar SUBDIR += php80-zip diff --git a/archivers/php74-bz2/Makefile b/archivers/php74-bz2/Makefile deleted file mode 100644 index 74ce0fc2c80d..000000000000 --- a/archivers/php74-bz2/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -bz2 - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php74-phar/Makefile b/archivers/php74-phar/Makefile deleted file mode 100644 index 9fb86946351d..000000000000 --- a/archivers/php74-phar/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -phar - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php74-phar/files/patch-config.m4 b/archivers/php74-phar/files/patch-config.m4 deleted file mode 100644 index 1aba3bd9a5a8..000000000000 --- a/archivers/php74-phar/files/patch-config.m4 +++ /dev/null @@ -1,41 +0,0 @@ ---- 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 diff --git a/archivers/php74-zip/Makefile b/archivers/php74-zip/Makefile deleted file mode 100644 index 251a2fbca8e2..000000000000 --- a/archivers/php74-zip/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -zip - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php74-zlib/Makefile b/archivers/php74-zlib/Makefile deleted file mode 100644 index a86c1cb24603..000000000000 --- a/archivers/php74-zlib/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -zlib - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php74-zlib/files/patch-zlib.c b/archivers/php74-zlib/files/patch-zlib.c deleted file mode 100644 index be02c50d1df6..000000000000 --- a/archivers/php74-zlib/files/patch-zlib.c +++ /dev/null @@ -1,10 +0,0 @@ ---- zlib.c.orig 2016-06-21 19:57:08 UTC -+++ zlib.c -@@ -1480,6 +1480,7 @@ static PHP_MSHUTDOWN_FUNCTION(zlib) - /* {{{ PHP_RINIT_FUNCTION */ - static PHP_RINIT_FUNCTION(zlib) - { -+ ZLIBG(output_compression) = 0; - ZLIBG(compression_coding) = 0; - if (!ZLIBG(handler_registered)) { - ZLIBG(output_compression) = ZLIBG(output_compression_default); diff --git a/converters/Makefile b/converters/Makefile index 43254ded5824..f67512d5479d 100644 --- a/converters/Makefile +++ b/converters/Makefile @@ -136,8 +136,6 @@ SUBDIR += pear-Services_JSON SUBDIR += pecl-igbinary SUBDIR += php-bsdconv - SUBDIR += php74-iconv - SUBDIR += php74-mbstring SUBDIR += php80-iconv SUBDIR += php80-mbstring SUBDIR += php81-iconv diff --git a/converters/php74-iconv/Makefile b/converters/php74-iconv/Makefile deleted file mode 100644 index 2b4dc3a9388d..000000000000 --- a/converters/php74-iconv/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -iconv - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/converters/php74-mbstring/Makefile b/converters/php74-mbstring/Makefile deleted file mode 100644 index c91f47b6cf47..000000000000 --- a/converters/php74-mbstring/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -mbstring - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/converters/php74-mbstring/files/patch-config.m4 b/converters/php74-mbstring/files/patch-config.m4 deleted file mode 100644 index a3e5c14477a3..000000000000 --- a/converters/php74-mbstring/files/patch-config.m4 +++ /dev/null @@ -1,44 +0,0 @@ ---- config.m4.orig 2019-08-06 06:54:10 UTC -+++ config.m4 -@@ -37,6 +37,31 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ - - out="php_config.h" - -+ 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" && test -f "$ext_builddir/config.h.in"; then - out="$abs_builddir/config.h" - fi -@@ -200,6 +225,9 @@ PHP_ARG_ENABLE([mbregex], - [yes], - [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]) - diff --git a/databases/Makefile b/databases/Makefile index 6d86bdab2f43..733c7875b9c4 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -597,18 +597,6 @@ SUBDIR += pguri SUBDIR += php-tarantool SUBDIR += php-xapian - 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 += php80-dba SUBDIR += php80-mysqli SUBDIR += php80-odbc diff --git a/databases/php74-dba/Makefile b/databases/php74-dba/Makefile deleted file mode 100644 index af5519aeea97..000000000000 --- a/databases/php74-dba/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 30f662138374..000000000000 --- a/databases/php74-dba/files/patch-config.m4 +++ /dev/null @@ -1,50 +0,0 @@ ---- 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 deleted file mode 100644 index 3d39ef5e7667..000000000000 --- a/databases/php74-mysqli/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -mysqli - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php74-mysqli/files/patch-mysqli__api.c b/databases/php74-mysqli/files/patch-mysqli__api.c deleted file mode 100644 index 2d88e061f9da..000000000000 --- a/databases/php74-mysqli/files/patch-mysqli__api.c +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 */ diff --git a/databases/php74-mysqli/files/patch-php_mysqli_structs.h b/databases/php74-mysqli/files/patch-php_mysqli_structs.h deleted file mode 100644 index 68568dd214fd..000000000000 --- a/databases/php74-mysqli/files/patch-php_mysqli_structs.h +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 -@@ -36,7 +36,7 @@ - #define FALSE 0 - #endif - --#ifdef MYSQLI_USE_MYSQLND -+#if defined(MYSQLI_USE_MYSQLND) - #include "ext/mysqlnd/mysqlnd.h" - #include "mysqli_mysqlnd.h" - #else -@@ -53,6 +53,8 @@ - #undef HAVE_MBSTATE_T - #define WE_HAD_MBSTATE_T - #endif -+ -+typedef zend_ulong ulong; - - #if defined(ulong) && !defined(HAVE_ULONG) - #define HAVE_ULONG diff --git a/databases/php74-odbc/Makefile b/databases/php74-odbc/Makefile deleted file mode 100644 index 309218574011..000000000000 --- a/databases/php74-odbc/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 04efc6ded7c9..000000000000 --- a/databases/php74-odbc/files/patch-config.m4 +++ /dev/null @@ -1,111 +0,0 @@ ---- 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 deleted file mode 100644 index da1ba1f12714..000000000000 --- a/databases/php74-pdo/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index f319c420097b..000000000000 --- a/databases/php74-pdo_dblib/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 429a9336cf6e..000000000000 --- a/databases/php74-pdo_firebird/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index d78142f112d3..000000000000 --- a/databases/php74-pdo_mysql/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 10736c1e7992..000000000000 --- a/databases/php74-pdo_odbc/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 6232942c69de..000000000000 --- a/databases/php74-pdo_pgsql/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 923f35f0e15e..000000000000 --- a/databases/php74-pdo_sqlite/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 3e262a5c5f30..000000000000 --- a/databases/php74-pgsql/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 6fcaf4533b6c..000000000000 --- a/databases/php74-sqlite3/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -sqlite3 - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/Makefile b/devel/Makefile index 703ab61e64d4..78e3fcc4e59b 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4015,17 +4015,6 @@ SUBDIR += php-ice37 SUBDIR += php-libawl SUBDIR += php-maxminddb - SUBDIR += php74-ffi - SUBDIR += php74-gettext - SUBDIR += php74-intl - SUBDIR += php74-json - SUBDIR += php74-pcntl - SUBDIR += php74-readline - SUBDIR += php74-shmop - SUBDIR += php74-sysvmsg - SUBDIR += php74-sysvsem - SUBDIR += php74-sysvshm - SUBDIR += php74-tokenizer SUBDIR += php80-ffi SUBDIR += php80-gettext SUBDIR += php80-intl diff --git a/devel/php74-ffi/Makefile b/devel/php74-ffi/Makefile deleted file mode 100644 index 4e685e0b1352..000000000000 --- a/devel/php74-ffi/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -ffi - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php74-gettext/Makefile b/devel/php74-gettext/Makefile deleted file mode 100644 index 96bd22e84ff9..000000000000 --- a/devel/php74-gettext/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -gettext - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php74-intl/Makefile b/devel/php74-intl/Makefile deleted file mode 100644 index 482d1fced016..000000000000 --- a/devel/php74-intl/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -intl - -USES= compiler:c++11-lib -USE_CXXSTD= gnu++11 - -CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php74-intl/files/patch-icu68 b/devel/php74-intl/files/patch-icu68 deleted file mode 100644 index 3199a78daadb..000000000000 --- a/devel/php74-intl/files/patch-icu68 +++ /dev/null @@ -1,213 +0,0 @@ -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 10:17:14 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 10:17:14 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 10:17:13 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 10:17:14 UTC -+++ normalizer/normalizer_normalize.c -@@ -90,7 +90,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); -@@ -261,7 +261,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 10:17:14 UTC -+++ timezone/timezone_class.cpp -@@ -325,7 +325,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 10:17:14 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(); diff --git a/devel/php74-json/Makefile b/devel/php74-json/Makefile deleted file mode 100644 index 6de1c886bb80..000000000000 --- a/devel/php74-json/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -json - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php74-json/files/patch-Makefile.frag b/devel/php74-json/files/patch-Makefile.frag deleted file mode 100644 index 514a41aa61f4..000000000000 --- a/devel/php74-json/files/patch-Makefile.frag +++ /dev/null @@ -1,9 +0,0 @@ ---- Makefile.frag.orig 2020-03-23 21:54:17 UTC -+++ Makefile.frag -@@ -1,5 +1,5 @@ - $(srcdir)/json_scanner.c: $(srcdir)/json_scanner.re -- @$(RE2C) $(RE2C_FLAGS) -t $(srcdir)/php_json_scanner_defs.h --no-generation-date -bci -o $@ $(srcdir)/json_scanner.re -+ $(LOCALBASE)/bin/re2c $(RE2C_FLAGS) -t $(srcdir)/php_json_scanner_defs.h --no-generation-date -bci -o $@ $(srcdir)/json_scanner.re - - $(srcdir)/json_parser.tab.c: $(srcdir)/json_parser.y - @$(YACC) --defines -l $(srcdir)/json_parser.y -o $@ diff --git a/devel/php74-pcntl/Makefile b/devel/php74-pcntl/Makefile deleted file mode 100644 index f60c93a1f907..000000000000 --- a/devel/php74-pcntl/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -pcntl - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php74-readline/Makefile b/devel/php74-readline/Makefile deleted file mode 100644 index 31b0038c3e3e..000000000000 --- a/devel/php74-readline/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -readline - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php74-readline/files/patch-config.m4 b/devel/php74-readline/files/patch-config.m4 deleted file mode 100644 index 93799734a3e3..000000000000 --- a/devel/php74-readline/files/patch-config.m4 +++ /dev/null @@ -1,33 +0,0 @@ ---- config.m4.orig 2019-08-06 06:54:14 UTC -+++ config.m4 -@@ -3,16 +3,10 @@ PHP_ARG_WITH([libedit], - [AS_HELP_STRING([--with-libedit], - [Include libedit readline replacement (CLI/CGI only)])]) - --if test "$PHP_LIBEDIT" = "no"; then - PHP_ARG_WITH([readline], - [for readline support], - [AS_HELP_STRING([[--with-readline[=DIR]]], - [Include readline support (CLI/CGI only)])]) --else -- dnl "register" the --with-readline option to prevent invalid "unknown -- dnl 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 -@@ -78,6 +72,13 @@ if test "$PHP_READLINE" && test "$PHP_RE - AC_DEFINE(HAVE_HISTORY_LIST, 1, [ ]) - AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) - -+ PHP_CHECK_LIBRARY(readline, rl_completion_matches, -+ [ -+ AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ]) -+ ],[],[ -+ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS -+ ]) -+ - elif test "$PHP_LIBEDIT" != "no"; then - if test "$PHP_LIBEDIT" != "yes"; then - AC_MSG_WARN([libedit directory ignored, rely on pkg-config]) diff --git a/devel/php74-readline/files/patch-readline_cli.c b/devel/php74-readline/files/patch-readline_cli.c deleted file mode 100644 index 02f55974f9b0..000000000000 --- a/devel/php74-readline/files/patch-readline_cli.c +++ /dev/null @@ -1,13 +0,0 @@ ---- readline_cli.c.orig 2012-03-02 16:40:26.000000000 +0100 -+++ readline_cli.c 2012-03-02 16:40:43.000000000 +0100 -@@ -19,6 +19,10 @@ - - /* $Id: readline_cli.c 321634 2012-01-01 13:15:04Z felipe $ */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "php.h" - - #ifndef HAVE_RL_COMPLETION_MATCHES diff --git a/devel/php74-shmop/Makefile b/devel/php74-shmop/Makefile deleted file mode 100644 index db20089bc219..000000000000 --- a/devel/php74-shmop/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -shmop - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php74-sysvmsg/Makefile b/devel/php74-sysvmsg/Makefile deleted file mode 100644 index 94d3747bc991..000000000000 --- a/devel/php74-sysvmsg/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -sysvmsg - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php74-sysvsem/Makefile b/devel/php74-sysvsem/Makefile deleted file mode 100644 index 654e51ff652e..000000000000 --- a/devel/php74-sysvsem/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -sysvsem - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php74-sysvshm/Makefile b/devel/php74-sysvshm/Makefile deleted file mode 100644 index b1f7d5b7e728..000000000000 --- a/devel/php74-sysvshm/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -sysvshm - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php74-tokenizer/Makefile b/devel/php74-tokenizer/Makefile deleted file mode 100644 index 124fee382706..000000000000 --- a/devel/php74-tokenizer/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -tokenizer - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/ftp/Makefile b/ftp/Makefile index 17697900ac5b..c7d3ac07cc13 100644 --- a/ftp/Makefile +++ b/ftp/Makefile @@ -53,8 +53,6 @@ SUBDIR += pavuk SUBDIR += pear-Net_FTP SUBDIR += pftpd - SUBDIR += php74-curl - SUBDIR += php74-ftp SUBDIR += php80-curl SUBDIR += php80-ftp SUBDIR += php81-curl diff --git a/ftp/php74-curl/Makefile b/ftp/php74-curl/Makefile deleted file mode 100644 index 5a51352ce414..000000000000 --- a/ftp/php74-curl/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= ftp - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -curl - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/ftp/php74-ftp/Makefile b/ftp/php74-ftp/Makefile deleted file mode 100644 index 2ef031372434..000000000000 --- a/ftp/php74-ftp/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -CATEGORIES= ftp - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -ftp - -TEST_TARGET= test - -post-patch: - @${REINPLACE_CMD} s/HAVE_OPENSSL_EXT/__FreeBSD__/ \ - ${WRKSRC}/ftp.* ${WRKSRC}/php_ftp.* - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/Makefile b/graphics/Makefile index 3728c47cfc06..1a6034c73440 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -773,8 +773,6 @@ SUBDIR += phototonic SUBDIR += php-facedetect SUBDIR += php-geos - SUBDIR += php74-exif - SUBDIR += php74-gd SUBDIR += php80-exif SUBDIR += php80-gd SUBDIR += php81-exif diff --git a/graphics/php74-exif/Makefile b/graphics/php74-exif/Makefile deleted file mode 100644 index 4e88085cf16f..000000000000 --- a/graphics/php74-exif/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= graphics - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -exif - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/php74-gd/Makefile b/graphics/php74-gd/Makefile deleted file mode 100644 index 613476c6cec0..000000000000 --- a/graphics/php74-gd/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -CATEGORIES= graphics - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -gd - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" - -LIB_DEPENDS+= libgd.so:graphics/gd diff --git a/graphics/php74-gd/files/patch-gd.c b/graphics/php74-gd/files/patch-gd.c deleted file mode 100644 index 63f7727d1df6..000000000000 --- a/graphics/php74-gd/files/patch-gd.c +++ /dev/null @@ -1,74 +0,0 @@ ---- gd.c.orig 2019-08-06 06:54:09 UTC -+++ gd.c -@@ -73,7 +73,7 @@ static int le_gd, le_gd_font; - # include FT_FREETYPE_H - #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() -@@ -935,7 +935,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) -@@ -1312,7 +1312,7 @@ PHP_MINFO_FUNCTION(gd) - #endif - #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"); - #if defined(HAVE_GD_BUNDLED) - { -@@ -1371,7 +1371,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); -@@ -2213,7 +2213,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 -@@ -2487,7 +2487,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; -@@ -2569,7 +2569,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) diff --git a/lang/Makefile b/lang/Makefile index 5c1b5afea914..cc6581d41d2e 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -259,8 +259,6 @@ SUBDIR += pfe SUBDIR += pharo SUBDIR += php-mode.el - SUBDIR += php74 - SUBDIR += php74-extensions SUBDIR += php80 SUBDIR += php80-extensions SUBDIR += php81 diff --git a/lang/php74-extensions/Makefile b/lang/php74-extensions/Makefile deleted file mode 100644 index 8299af3b4520..000000000000 --- a/lang/php74-extensions/Makefile +++ /dev/null @@ -1,113 +0,0 @@ -PORTNAME= php74 -PORTVERSION= 1.0 -CATEGORIES= lang -PKGNAMESUFFIX= -extensions - -MAINTAINER= tz@FreeBSD.org -COMMENT= "meta-port" to install PHP extensions -WWW= https://www.php.net/ - -DEPRECATED=Upstream Security Support ends on 2022-11-28 -EXPIRATION_DATE=2022-11-29 - -USES= metaport php -PHP_VER= 74 -IGNORE_WITH_PHP= 80 81 82 - -OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \ - DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \ - GMP ICONV INTL IMAP 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 SESSION SHMOP SIMPLEXML SNMP SOAP \ - SOCKETS SODIUM SQLITE3 SYSVMSG SYSVSEM SYSVSHM \ - TIDY TOKENIZER 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 -ICONV_DESC= iconv support -IMAP_DESC= IMAP support -INTL_DESC= Internationalization(ICU) -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) -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 -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 \ - 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> diff --git a/lang/php74-extensions/pkg-descr b/lang/php74-extensions/pkg-descr deleted file mode 100644 index e3d50e8bbf2f..000000000000 --- a/lang/php74-extensions/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -This is a "meta-port" to install the extensions for PHP 7.4. - -Defaults to: -ctype, dom, filter, iconv, json, opcache, pdo, pdo_sqlite, phar, posix, -session, simplexml, sqlite3, tokenizer, xml, xmlreader and xmlwriter. diff --git a/lang/php74/Makefile b/lang/php74/Makefile deleted file mode 100644 index c709e7e3f216..000000000000 --- a/lang/php74/Makefile +++ /dev/null @@ -1,160 +0,0 @@ -PORTNAME= php74 -DISTVERSION= 7.4.33 -PORTREVISION?= 0 -CATEGORIES?= lang devel www -MASTER_SITES= PHP -DISTNAME= php-${DISTVERSION} -DIST_SUBDIR= php - -MAINTAINER= tz@FreeBSD.org -COMMENT= PHP Scripting Language -WWW= https://www.php.net/ - -LICENSE= PHP301 - -DEPRECATED=Upstream Security Support ends on 2022-11-28 -EXPIRATION_DATE=2022-11-29 - -USES+= compiler:c11 tar:xz cpe gnome pkgconfig -CPE_PRODUCT= php -NO_OPTIONS_SORT=yes - -CONFLICTS_INSTALL?= php[0-9][0-9]${PKGNAMESUFFIX} - -.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 \ - --with-libxml \ - --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 -OPTIONS_EXCLUDE_powerpc64= ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}} -OPTIONS_EXCLUDE_powerpc64_12= DTRACE -OPTIONS_EXCLUDE_riscv64= DTRACE -OPTIONS_EXCLUDE_sparc64= DTRACE -OPTIONS_SUB= yes - -CGI_DESC= Build CGI version -CLI_DESC= Build CLI version -EMBED_DESC= Build embedded library -FPM_DESC= Build FPM version -LINKTHR_DESC= Link thread lib (for threaded extensions) -MYSQLND_DESC= Build with MySQL Native Driver -PHPDBG_DESC= Interactive PHP debugger -ZTS_DESC= Force Zend Thread Safety (ZTS) build - -CGI_CONFIGURE_OFF=--disable-cgi -CGI_VARS= PHP_SAPI+=cgi -CLI_CONFIGURE_OFF=--disable-cli -CLI_VARS= PHP_SAPI+=cli -DEBUG_CONFIGURE_ON=--enable-debug -DTRACE_CONFIGURE_ON=--enable-dtrace -EMBED_CONFIGURE_ON=--enable-embed -EMBED_VARS= PHP_SAPI+=embed -FPM_CONFIGURE_ON=--enable-fpm \ - --with-fpm-user=${WWWOWN} \ - --with-fpm-group=${WWWGRP} -FPM_VARS= PHP_SAPI+=fpm USE_RC_SUBR+=php-fpm -IPV6_CONFIGURE_OFF=--disable-ipv6 -LINKTHR_LIBS= -lpthread -MYSQLND_CONFIGURE_ON=--enable-mysqlnd -PHPDBG_CONFIGURE_ON=--enable-phpdbg -PHPDBG_VARS= PHP_SAPI+=phpdbg -ZTS_CONFIGURE_ENV= pthreads_working="yes" -ZTS_CONFIGURE_ON=--enable-maintainer-zts - -DESTDIRNAME= INSTALL_ROOT - -.include <bsd.port.pre.mk> - -.if ${ARCH} == riscv64 -CONFIGURE_ARGS+=--without-pcre-jit -.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:MPHPDBG} && ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-phpdbg-debug -.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" - -post-patch: - @${TOUCH} ${WRKSRC}/ext/php_config.h - @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* - -post-patch-FPM-on: - @${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \ - ${WRKSRC}/sapi/fpm/php-fpm.conf.in - -pre-configure: - @(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force) - -.if !defined(PKGNAMEPREFIX) -post-build: - @${ECHO_CMD} "PHP_VER=74" > ${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=hash 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> diff --git a/lang/php74/Makefile.ext b/lang/php74/Makefile.ext deleted file mode 100644 index 6a5a8dabe8df..000000000000 --- a/lang/php74/Makefile.ext +++ /dev/null @@ -1,553 +0,0 @@ -COMMENT= The ${PHP_MODNAME} shared extension for php - -USES+= php:ext,noflavors -PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} -PHP_VER= 74 -IGNORE_WITH_PHP= 72 73 - -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} -USES+= pkgconfig -.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} - -USES+= pkgconfig -USE_GNOME= libxml2 -.endif - -.if ${PHP_MODNAME} == "enchant" -LIB_DEPENDS+= libenchant.so:textproc/enchant -CONFIGURE_ARGS+=--with-enchant=${LOCALBASE} -USES+= pkgconfig -.endif - -.if ${PHP_MODNAME} == "exif" -CONFIGURE_ARGS+=--enable-exif -.endif - -.if ${PHP_MODNAME} == "ffi" -LIB_DEPENDS= libffi.so:devel/libffi -CONFIGURE_ARGS+=--enable-ffi -.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 - -CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ - OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \ - PHP_OPENSSL=yes - -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USES+= ssl pkgconfig -.endif - -.if ${PHP_MODNAME} == "gd" -LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libpng.so:graphics/png -USES+= jpeg - -CONFIGURE_ARGS+=--enable-gd \ - --with-external-gd - -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} == "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} - -CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ - OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \ - PHP_OPENSSL=yes - -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USES+= ssl -.endif - -.if ${PHP_MODNAME} == "intl" -CONFIGURE_ARGS+=--with-intl=${LOCALBASE} -LIB_DEPENDS= libicui18n.so:devel/icu -USES+= pkgconfig -.endif - -.if ${PHP_MODNAME} == "json" -CONFIGURE_ARGS+=--enable-json -BUILD_DEPENDS= re2c:devel/re2c -.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" -USES+= ssl -CONFIGURE_ARGS+= --with-openssl -CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ - OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" -.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+= localbase 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} -.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} == "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} - -USES+= pkgconfig -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+= localbase pkgconfig 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} == "xml" -CONFIGURE_ARGS+=--enable-xml \ - --with-libxml-dir=${LOCALBASE} - -USES+= pkgconfig -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} - -USES+= pkgconfig -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} -USES+= pkgconfig -.endif - -.if ${PHP_MODNAME} == "zlib" -CONFIGURE_ARGS+=--with-zlib=/usr -USES+= pkgconfig -.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:MJIS} -CONFIGURE_ARGS+=--enable-gd-jis-conv -. endif -. if ${PORT_OPTIONS:MWEBP} -LIB_DEPENDS+= libwebp.so:graphics/webp - -CONFIGURE_ARGS+=--with-webp -. endif -. if ${PORT_OPTIONS:MX11} -USES+= xorg -USE_XORG= xpm - -CONFIGURE_ARGS+=--with-xpm -. endif -.endif - -.include <bsd.port.pre.mk> - -.if ${PHP_MODNAME} == "imap" -. if ${PORT_OPTIONS:MPANDA} -LIB_DEPENDS+= libc-client.so.2010: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 diff --git a/lang/php74/distinfo b/lang/php74/distinfo deleted file mode 100644 index f6e9a778b8b0..000000000000 --- a/lang/php74/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1667595170 -SHA256 (php/php-7.4.33.tar.xz) = 924846abf93bc613815c55dd3f5809377813ac62a9ec4eb3778675b82a27b927 -SIZE (php/php-7.4.33.tar.xz) = 10420144 diff --git a/lang/php74/files/patch-build_Makefile.global b/lang/php74/files/patch-build_Makefile.global deleted file mode 100644 index 4b838d157941..000000000000 --- a/lang/php74/files/patch-build_Makefile.global +++ /dev/null @@ -1,19 +0,0 @@ ---- build/Makefile.global.orig 2019-08-06 06:54:07 UTC -+++ build/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) \ diff --git a/lang/php74/files/patch-configure.ac b/lang/php74/files/patch-configure.ac deleted file mode 100644 index d213622d5475..000000000000 --- a/lang/php74/files/patch-configure.ac +++ /dev/null @@ -1,45 +0,0 @@ ---- configure.ac.orig 2019-08-06 06:54:06 UTC -+++ configure.ac -@@ -105,6 +105,7 @@ extern "C++" { - #endif - #endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */ - -+#include <ext/php_config.h> - #endif /* PHP_CONFIG_H */ - ]) - -@@ -313,7 +314,6 @@ sinclude(Zend/Zend.m4) - - dnl ---------------------------------------------------------------------------- - --PTHREADS_CHECK - PHP_HELP_SEPARATOR([SAPI modules:]) - PHP_SHLIB_SUFFIX_NAMES - PHP_BUILD_PROGRAM -@@ -654,7 +654,7 @@ memmem \ - AX_FUNC_WHICH_GETHOSTBYNAME_R - - 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... Also check for working - dnl getaddrinfo. -@@ -1308,7 +1308,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd - 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 -@@ -1493,7 +1493,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, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) - diff --git a/lang/php74/files/patch-ext_mysqli_mysqli__api.c b/lang/php74/files/patch-ext_mysqli_mysqli__api.c deleted file mode 100644 index f97d9f40b1c8..000000000000 --- a/lang/php74/files/patch-ext_mysqli_mysqli__api.c +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 */ diff --git a/lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c b/lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c deleted file mode 100644 index 9baa04218bf9..000000000000 --- a/lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c +++ /dev/null @@ -1,12 +0,0 @@ ---- 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:"") diff --git a/lang/php74/files/patch-ext_mysqli_mysqli__prop.c b/lang/php74/files/patch-ext_mysqli_mysqli__prop.c deleted file mode 100644 index 37d47a304440..000000000000 --- a/lang/php74/files/patch-ext_mysqli_mysqli__prop.c +++ /dev/null @@ -1,12 +0,0 @@ ---- 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) \ diff --git a/lang/php74/files/patch-ext_mysqli_php__mysqli__structs.h b/lang/php74/files/patch-ext_mysqli_php__mysqli__structs.h deleted file mode 100644 index f0e33efd03aa..000000000000 --- a/lang/php74/files/patch-ext_mysqli_php__mysqli__structs.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/mysqli/php_mysqli_structs.h.orig 2019-12-17 10:29:23 UTC -+++ ext/mysqli/php_mysqli_structs.h -@@ -36,7 +36,7 @@ - #define FALSE 0 - #endif - --#ifdef MYSQLI_USE_MYSQLND -+#if defined(MYSQLI_USE_MYSQLND) - #include "ext/mysqlnd/mysqlnd.h" - #include "mysqli_mysqlnd.h" - #else diff --git a/lang/php74/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h b/lang/php74/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h deleted file mode 100644 index 9a75bc3e86c1..000000000000 --- a/lang/php74/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/pcre/pcre2lib/sljit/sljitConfigInternal.h.orig 2022-03-25 09:54:56 UTC -+++ ext/pcre/pcre2lib/sljit/sljitConfigInternal.h -@@ -283,7 +283,7 @@ - /* Instruction cache flush. */ - /****************************/ - --#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin) -+#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin && !defined SLJIT_CONFIG_PPC_32) - #if __has_builtin(__builtin___clear_cache) - - #define SLJIT_CACHE_FLUSH(from, to) \ diff --git a/lang/php74/files/patch-sapi_apache2handler_config.m4 b/lang/php74/files/patch-sapi_apache2handler_config.m4 deleted file mode 100644 index 5b0cfb9d4591..000000000000 --- a/lang/php74/files/patch-sapi_apache2handler_config.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- sapi/apache2handler/config.m4.orig 2018-08-14 11:39:14 UTC -+++ sapi/apache2handler/config.m4 -@@ -65,7 +65,7 @@ if test "$PHP_APXS2" != "no"; then - fi - - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` -- if test -z `$APXS -q SYSCONFDIR`; then -+ if true; then - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -i -n php7" diff --git a/lang/php74/files/patch-sapi_fpm_config.m4 b/lang/php74/files/patch-sapi_fpm_config.m4 deleted file mode 100644 index e88c204384ae..000000000000 --- a/lang/php74/files/patch-sapi_fpm_config.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- sapi/fpm/config.m4.orig 2018-08-14 11:39:14 UTC -+++ sapi/fpm/config.m4 -@@ -319,7 +319,7 @@ AC_DEFUN([AC_FPM_LQ], - AC_MSG_RESULT([no]) - ]) - -- if test "$have_lq" = "tcp_info"; then -+ if test "$have_lq" = "so_listenq"; then - AC_DEFINE([HAVE_LQ_TCP_INFO], 1, [do we have TCP_INFO?]) - fi - diff --git a/lang/php74/files/patch-sapi_fpm_www.conf.in b/lang/php74/files/patch-sapi_fpm_www.conf.in deleted file mode 100644 index c7e7fe399854..000000000000 --- a/lang/php74/files/patch-sapi_fpm_www.conf.in +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 diff --git a/lang/php74/files/php-fpm.in b/lang/php74/files/php-fpm.in deleted file mode 100644 index c234856b0e54..000000000000 --- a/lang/php74/files/php-fpm.in +++ /dev/null @@ -1,66 +0,0 @@ -#!/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" diff --git a/lang/php74/pkg-descr b/lang/php74/pkg-descr deleted file mode 100644 index 60a2137716fb..000000000000 --- a/lang/php74/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -PHP, which stands for "PHP: Hypertext Preprocessor" is a widely-used Open -Source general-purpose scripting language that is especially suited for -Web development and can be embedded into HTML. Its syntax draws upon C, -Java, and Perl, and is easy to learn. The main goal of the language is to -allow web developers to write dynamically generated webpages quickly, but -you can do much more with PHP. diff --git a/lang/php74/pkg-message.mod b/lang/php74/pkg-message.mod deleted file mode 100644 index a0c2c87889a7..000000000000 --- a/lang/php74/pkg-message.mod +++ /dev/null @@ -1,19 +0,0 @@ -****************************************************************************** - -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. - -****************************************************************************** diff --git a/lang/php74/pkg-plist b/lang/php74/pkg-plist deleted file mode 100644 index 4ec254303ef1..000000000000 --- a/lang/php74/pkg-plist +++ /dev/null @@ -1,282 +0,0 @@ -%%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/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.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_map_ptr.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/Zend/zend_weakrefs.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 -include/php/ext/hash/php_hash.h -include/php/ext/hash/php_hash_adler32.h -include/php/ext/hash/php_hash_crc32.h -include/php/ext/hash/php_hash_fnv.h -include/php/ext/hash/php_hash_gost.h -include/php/ext/hash/php_hash_haval.h -include/php/ext/hash/php_hash_joaat.h -include/php/ext/hash/php_hash_md.h -include/php/ext/hash/php_hash_ripemd.h -include/php/ext/hash/php_hash_sha.h -include/php/ext/hash/php_hash_sha3.h -include/php/ext/hash/php_hash_snefru.h -include/php/ext/hash/php_hash_tiger.h -include/php/ext/hash/php_hash_whirlpool.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/pcre2lib/config.h -include/php/ext/pcre/pcre2lib/pcre2.h -include/php/ext/pcre/pcre2lib/pcre2_internal.h -include/php/ext/pcre/pcre2lib/pcre2_intmodedep.h -include/php/ext/pcre/pcre2lib/pcre2_jit_neon_inc.h -include/php/ext/pcre/pcre2lib/pcre2_jit_simd_inc.h -include/php/ext/pcre/pcre2lib/pcre2_ucp.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/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/php.m4 -lib/php/build/php_cxx_compile_stdcxx.m4 -lib/php/build/phpize.m4 -lib/php/build/pkg.m4 -lib/php/build/run-tests.php -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 diff --git a/lang/php74/pkg-plist.mod b/lang/php74/pkg-plist.mod deleted file mode 100644 index 8939be6d3d5e..000000000000 --- a/lang/php74/pkg-plist.mod +++ /dev/null @@ -1,3 +0,0 @@ -%%APACHEMODDIR%%/%%AP_MODULE%% -@postexec %D/sbin/apxs -e -a -n %%AP_NAME%% %f -@preunexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f diff --git a/mail/Makefile b/mail/Makefile index 270d09d95a14..285f1c29d3d1 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -455,7 +455,6 @@ SUBDIR += perdition SUBDIR += pflogsumm SUBDIR += pfqueue - SUBDIR += php74-imap SUBDIR += php80-imap SUBDIR += php81-imap SUBDIR += php82-imap diff --git a/mail/php74-imap/Makefile b/mail/php74-imap/Makefile deleted file mode 100644 index f6e7d148e028..000000000000 --- a/mail/php74-imap/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= mail - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -imap - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/mail/php74-imap/files/patch-config.m4 b/mail/php74-imap/files/patch-config.m4 deleted file mode 100644 index b2a153543fe3..000000000000 --- a/mail/php74-imap/files/patch-config.m4 +++ /dev/null @@ -1,47 +0,0 @@ ---- config.m4.orig 2019-08-20 14:09:27 UTC -+++ config.m4 -@@ -105,6 +105,13 @@ PHP_ARG_WITH([imap-ssl], - [no], - [no]) - -+PHP_ARG_WITH([pcre-dir], -+ [pcre install prefix], -+ [AS_HELP_STRING([[--with-pcre-dir]], -+ [IMAP: pcre install prefix])], -+ [no], -+ [no]) -+ - if test "$PHP_IMAP" != "no"; then - PHP_SUBST(IMAP_SHARED_LIBADD) - PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) -@@ -120,6 +127,30 @@ if test "$PHP_IMAP" != "no"; then - 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,[ ]) diff --git a/math/Makefile b/math/Makefile index d9c4cf2ec743..852c866cff0c 100644 --- a/math/Makefile +++ b/math/Makefile @@ -825,8 +825,6 @@ SUBDIR += petanque SUBDIR += petiga SUBDIR += pffft - SUBDIR += php74-bcmath - SUBDIR += php74-gmp SUBDIR += php80-bcmath SUBDIR += php80-gmp SUBDIR += php81-bcmath diff --git a/math/php74-bcmath/Makefile b/math/php74-bcmath/Makefile deleted file mode 100644 index 72e8ce97116c..000000000000 --- a/math/php74-bcmath/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= math - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -bcmath - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/math/php74-gmp/Makefile b/math/php74-gmp/Makefile deleted file mode 100644 index f7dab85d28b1..000000000000 --- a/math/php74-gmp/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= math - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -gmp - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/misc/Makefile b/misc/Makefile index e6f71973c56f..a3a882914063 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -360,7 +360,6 @@ SUBDIR += pecl-timezonedb SUBDIR += perkeep SUBDIR += pfm - SUBDIR += php74-calendar SUBDIR += php80-calendar SUBDIR += php81-calendar SUBDIR += php82-calendar diff --git a/misc/php74-calendar/Makefile b/misc/php74-calendar/Makefile deleted file mode 100644 index 421ac95ab754..000000000000 --- a/misc/php74-calendar/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= misc - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -calendar - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index 47c8e25ad5db..f1afa268f780 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -285,7 +285,6 @@ SUBDIR += pandorafms_server SUBDIR += pftabled SUBDIR += php-fpm_exporter - SUBDIR += php74-snmp SUBDIR += php80-snmp SUBDIR += php81-snmp SUBDIR += php82-snmp diff --git a/net-mgmt/php74-snmp/Makefile b/net-mgmt/php74-snmp/Makefile deleted file mode 100644 index c7a3f06a9d1a..000000000000 --- a/net-mgmt/php74-snmp/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= net-mgmt - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -snmp - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/net/Makefile b/net/Makefile index d8c67f61b311..4f23c835befd 100644 --- a/net/Makefile +++ b/net/Makefile @@ -983,10 +983,6 @@ SUBDIR += pecl-smbclient SUBDIR += pecl-xmlrpc SUBDIR += pen - SUBDIR += php74-ldap - SUBDIR += php74-soap - SUBDIR += php74-sockets - SUBDIR += php74-xmlrpc SUBDIR += php80-ldap SUBDIR += php80-soap SUBDIR += php80-sockets diff --git a/net/php74-ldap/Makefile b/net/php74-ldap/Makefile deleted file mode 100644 index dba16a4f1d56..000000000000 --- a/net/php74-ldap/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -ldap - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/net/php74-soap/Makefile b/net/php74-soap/Makefile deleted file mode 100644 index cdca75318587..000000000000 --- a/net/php74-soap/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -soap - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/net/php74-sockets/Makefile b/net/php74-sockets/Makefile deleted file mode 100644 index 8ce16626f14a..000000000000 --- a/net/php74-sockets/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -sockets - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/net/php74-xmlrpc/Makefile b/net/php74-xmlrpc/Makefile deleted file mode 100644 index 2c8c17a3ac06..000000000000 --- a/net/php74-xmlrpc/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -xmlrpc - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/net/php74-xmlrpc/files/patch-config.m4 b/net/php74-xmlrpc/files/patch-config.m4 deleted file mode 100644 index d2dc85f26a48..000000000000 --- a/net/php74-xmlrpc/files/patch-config.m4 +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 diff --git a/security/Makefile b/security/Makefile index fac5e5b6805e..7bd983bb100b 100644 --- a/security/Makefile +++ b/security/Makefile @@ -776,9 +776,6 @@ SUBDIR += pgpdump SUBDIR += pgpgpg SUBDIR += pgpin - SUBDIR += php74-filter - SUBDIR += php74-openssl - SUBDIR += php74-sodium SUBDIR += php80-filter SUBDIR += php80-sodium SUBDIR += php81-filter diff --git a/security/php74-filter/Makefile b/security/php74-filter/Makefile deleted file mode 100644 index 31825e3d804b..000000000000 --- a/security/php74-filter/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -filter - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/security/php74-openssl/Makefile b/security/php74-openssl/Makefile deleted file mode 100644 index 1360069129c2..000000000000 --- a/security/php74-openssl/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -openssl - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/security/php74-sodium/Makefile b/security/php74-sodium/Makefile deleted file mode 100644 index 6258484c4db7..000000000000 --- a/security/php74-sodium/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -sodium - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/Makefile b/sysutils/Makefile index 52af7baa39d1..4cd767fcd00e 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -989,8 +989,6 @@ SUBDIR += pfstat SUBDIR += pftables SUBDIR += pftop - SUBDIR += php74-fileinfo - SUBDIR += php74-posix SUBDIR += php80-fileinfo SUBDIR += php80-posix SUBDIR += php81-fileinfo diff --git a/sysutils/php74-fileinfo/Makefile b/sysutils/php74-fileinfo/Makefile deleted file mode 100644 index 9339dea4780e..000000000000 --- a/sysutils/php74-fileinfo/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= sysutils - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -fileinfo - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/php74-fileinfo/files/patch-config.m4 b/sysutils/php74-fileinfo/files/patch-config.m4 deleted file mode 100644 index 1348023ccf64..000000000000 --- a/sysutils/php74-fileinfo/files/patch-config.m4 +++ /dev/null @@ -1,21 +0,0 @@ ---- 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) - diff --git a/sysutils/php74-posix/Makefile b/sysutils/php74-posix/Makefile deleted file mode 100644 index ec8ac5660dc8..000000000000 --- a/sysutils/php74-posix/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= sysutils - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -posix - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/php74-posix/files/patch-posix.c b/sysutils/php74-posix/files/patch-posix.c deleted file mode 100644 index d2365b249569..000000000000 --- a/sysutils/php74-posix/files/patch-posix.c +++ /dev/null @@ -1,38 +0,0 @@ ---- 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); - diff --git a/textproc/Makefile b/textproc/Makefile index 651719f13cbf..6dfe402c7852 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1227,15 +1227,6 @@ SUBDIR += peco SUBDIR += peg SUBDIR += perl2html - SUBDIR += php74-ctype - SUBDIR += php74-dom - SUBDIR += php74-enchant - SUBDIR += php74-pspell - SUBDIR += php74-simplexml - SUBDIR += php74-xml - SUBDIR += php74-xmlreader - SUBDIR += php74-xmlwriter - SUBDIR += php74-xsl SUBDIR += php80-ctype SUBDIR += php80-dom SUBDIR += php80-enchant diff --git a/textproc/php74-ctype/Makefile b/textproc/php74-ctype/Makefile deleted file mode 100644 index c7bcb834f651..000000000000 --- a/textproc/php74-ctype/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -ctype - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php74-dom/Makefile b/textproc/php74-dom/Makefile deleted file mode 100644 index c8e8d81d938c..000000000000 --- a/textproc/php74-dom/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -dom - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php74-enchant/Makefile b/textproc/php74-enchant/Makefile deleted file mode 100644 index 679fc31334ce..000000000000 --- a/textproc/php74-enchant/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -enchant - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php74-pspell/Makefile b/textproc/php74-pspell/Makefile deleted file mode 100644 index 6f501ca4cda5..000000000000 --- a/textproc/php74-pspell/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -pspell - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php74-simplexml/Makefile b/textproc/php74-simplexml/Makefile deleted file mode 100644 index 504a24dd3fa3..000000000000 --- a/textproc/php74-simplexml/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -simplexml - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php74-simplexml/files/patch-config.m4 b/textproc/php74-simplexml/files/patch-config.m4 deleted file mode 100644 index 88638f7dccf4..000000000000 --- a/textproc/php74-simplexml/files/patch-config.m4 +++ /dev/null @@ -1,42 +0,0 @@ ---- config.m4.orig 2019-08-06 06:54:07 UTC -+++ config.m4 -@@ -4,8 +4,39 @@ PHP_ARG_ENABLE([simplexml], - [Disable SimpleXML support])], - [yes]) - -+PHP_ARG_ENABLE([pcre-dir], -+ [pcre install prefix], -+ [AS_HELP_STRING([--with-pcre-dir], -+ [SimpleXML: pcre install dir])], -+ [no], -+ [no]) -+ - 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 --with-libxml]) - fi diff --git a/textproc/php74-xml/Makefile b/textproc/php74-xml/Makefile deleted file mode 100644 index 5de8bb1dff1d..000000000000 --- a/textproc/php74-xml/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -xml - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php74-xml/files/patch-compat.c b/textproc/php74-xml/files/patch-compat.c deleted file mode 100644 index 02125961b20c..000000000000 --- a/textproc/php74-xml/files/patch-compat.c +++ /dev/null @@ -1,13 +0,0 @@ ---- compat.c.orig Tue Jul 20 10:55:02 2004 -+++ compat.c Tue Jul 20 10:55:55 2004 -@@ -16,6 +16,10 @@ - +----------------------------------------------------------------------+ - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "php.h" - #if defined(HAVE_LIBXML) && defined(HAVE_XML) && !defined(HAVE_LIBEXPAT) - #include "expat_compat.h" diff --git a/textproc/php74-xmlreader/Makefile b/textproc/php74-xmlreader/Makefile deleted file mode 100644 index 9a52d8b7a275..000000000000 --- a/textproc/php74-xmlreader/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -xmlreader - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php74-xmlwriter/Makefile b/textproc/php74-xmlwriter/Makefile deleted file mode 100644 index 8bfe0bbcab59..000000000000 --- a/textproc/php74-xmlwriter/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -xmlwriter - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php74-xsl/Makefile b/textproc/php74-xsl/Makefile deleted file mode 100644 index d86ab265bfce..000000000000 --- a/textproc/php74-xsl/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -xsl - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php74-xsl/files/patch-php_xsl.h b/textproc/php74-xsl/files/patch-php_xsl.h deleted file mode 100644 index 9777187f8748..000000000000 --- a/textproc/php74-xsl/files/patch-php_xsl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- php_xsl.h.orig Sun Jan 1 13:50:17 2006 -+++ php_xsl.h Tue Jan 17 16:23:10 2006 -@@ -43,7 +43,7 @@ - #include <libexslt/exsltconfig.h> - #endif - --#include "../dom/xml_common.h" -+#include "ext/dom/xml_common.h" - #include "xsl_fe.h" - - #include <libxslt/extensions.h> diff --git a/www/Makefile b/www/Makefile index eb030ff47aa2..48a69e98cb62 100644 --- a/www/Makefile +++ b/www/Makefile @@ -386,7 +386,6 @@ SUBDIR += mod_mono SUBDIR += mod_mpm_itk SUBDIR += mod_perl2 - SUBDIR += mod_php74 SUBDIR += mod_php80 SUBDIR += mod_php81 SUBDIR += mod_php82 @@ -1373,9 +1372,6 @@ SUBDIR += persepolis SUBDIR += pglogd SUBDIR += phalcon - SUBDIR += php74-opcache - SUBDIR += php74-session - SUBDIR += php74-tidy SUBDIR += php80-opcache SUBDIR += php80-session SUBDIR += php80-tidy diff --git a/www/mod_php74/Makefile b/www/mod_php74/Makefile deleted file mode 100644 index 14d327545e78..000000000000 --- a/www/mod_php74/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -CATEGORIES= www devel -PKGNAMEPREFIX= mod_ - -MAINTAINER= bofh@FreeBSD.org - -CONFLICTS_INSTALL= mod_php[0-9][0-9] - -PHP_PORT= lang/php74 -MASTERDIR= ${.CURDIR}/../../${PHP_PORT} - -OPTIONS_DEFINE= AP2FILTER -OPTIONS_EXCLUDE= CGI CLI EMBED FPM -AP2FILTER_DESC= Use Apache 2.x filter interface (experimental) - -.include "${MASTERDIR}/Makefile" diff --git a/www/php74-opcache/Makefile b/www/php74-opcache/Makefile deleted file mode 100644 index d80f730d5249..000000000000 --- a/www/php74-opcache/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -CATEGORIES= www - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -opcache - -TEST_TARGET= test - -USES= php:zend,noflavors - -.include "${MASTERDIR}/Makefile" diff --git a/www/php74-session/Makefile b/www/php74-session/Makefile deleted file mode 100644 index 8bcbe5d4d1b6..000000000000 --- a/www/php74-session/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= www - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -session - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/www/php74-tidy/Makefile b/www/php74-tidy/Makefile deleted file mode 100644 index 2891df106ced..000000000000 --- a/www/php74-tidy/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CATEGORIES= www - -MASTERDIR= ${.CURDIR}/../../lang/php74 - -PKGNAMESUFFIX= -tidy - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" |