Date: Wed, 31 Dec 2025 14:50:22 +0000 From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 95b3559914b3 - main - */*php81*: Sunset Message-ID: <6955382e.44461.1306cf5f@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=95b3559914b367ce29a7b7e23dffbe3cdb2ccdfc commit 95b3559914b367ce29a7b7e23dffbe3cdb2ccdfc Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2025-12-31 11:10:12 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2025-12-31 14:48:01 +0000 */*php81*: Sunset --- MOVED | 59 ++ Mk/Uses/pear.mk | 2 +- Mk/Uses/php.mk | 6 +- Mk/bsd.default-versions.mk | 2 +- archivers/Makefile | 4 - archivers/php81-bz2/Makefile | 7 - archivers/php81-phar/Makefile | 7 - archivers/php81-phar/files/patch-config.m4 | 41 -- archivers/php81-zip/Makefile | 7 - archivers/php81-zlib/Makefile | 7 - archivers/php81-zlib/files/patch-zlib.c | 10 - converters/Makefile | 2 - converters/php81-iconv/Makefile | 7 - converters/php81-mbstring/Makefile | 7 - converters/php81-mbstring/files/patch-config.m4 | 44 -- databases/Makefile | 12 - databases/php81-dba/Makefile | 7 - databases/php81-dba/files/patch-config.m4 | 50 -- databases/php81-mysqli/Makefile | 7 - databases/php81-mysqli/files/patch-mysqli__api.c | 12 - .../php81-mysqli/files/patch-php_mysqli_structs.h | 20 - databases/php81-odbc/Makefile | 7 - databases/php81-odbc/files/patch-config.m4 | 111 ---- databases/php81-pdo/Makefile | 7 - databases/php81-pdo_dblib/Makefile | 7 - databases/php81-pdo_firebird/Makefile | 7 - databases/php81-pdo_mysql/Makefile | 7 - databases/php81-pdo_odbc/Makefile | 7 - databases/php81-pdo_pgsql/Makefile | 7 - databases/php81-pdo_sqlite/Makefile | 7 - databases/php81-pgsql/Makefile | 7 - databases/php81-sqlite3/Makefile | 7 - devel/Makefile | 10 - devel/php81-ffi/Makefile | 7 - devel/php81-gettext/Makefile | 7 - devel/php81-intl/Makefile | 7 - devel/php81-pcntl/Makefile | 7 - devel/php81-readline/Makefile | 7 - devel/php81-shmop/Makefile | 7 - devel/php81-sysvmsg/Makefile | 7 - devel/php81-sysvsem/Makefile | 7 - devel/php81-sysvshm/Makefile | 7 - devel/php81-tokenizer/Makefile | 7 - devel/phpunit11/Makefile | 1 - devel/phpunit12/Makefile | 2 +- ftp/Makefile | 2 - ftp/php81-curl/Makefile | 7 - ftp/php81-ftp/Makefile | 7 - graphics/Makefile | 2 - graphics/php81-exif/Makefile | 7 - graphics/php81-gd/Makefile | 7 - graphics/php81-gd/files/patch-gd.c | 11 - lang/Makefile | 2 - lang/php81-extensions/Makefile | 91 --- lang/php81-extensions/pkg-descr | 5 - lang/php81/Makefile | 616 --------------------- lang/php81/distinfo | 3 - lang/php81/files/patch-TSRM_TSRM.c | 11 - lang/php81/files/patch-build_Makefile.global | 19 - lang/php81/files/patch-configure.ac | 45 -- lang/php81/files/patch-ext_hash_xxhash_xxhash.h | 46 -- lang/php81/files/patch-ext_mysqli_mysqli__api.c | 12 - lang/php81/files/patch-ext_mysqli_mysqli__nonapi.c | 12 - lang/php81/files/patch-ext_mysqli_mysqli__prop.c | 12 - .../files/patch-ext_mysqli_php__mysqli__structs.h | 11 - ...h-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h | 11 - .../files/patch-sapi_apache2handler_config.m4 | 11 - lang/php81/files/patch-sapi_fpm_config.m4 | 11 - lang/php81/files/patch-sapi_fpm_www.conf.in | 17 - lang/php81/files/php_fpm.in | 102 ---- lang/php81/pkg-descr | 6 - lang/php81/pkg-message.mod | 24 - lang/php81/pkg-plist | 309 ----------- lang/php81/pkg-plist.mod | 3 - lang/php82-extensions/Makefile | 2 +- lang/php82/Makefile | 2 +- lang/php83-extensions/Makefile | 2 +- lang/php83/Makefile | 2 +- lang/php84-extensions/Makefile | 2 +- lang/php84/Makefile | 2 +- lang/php85-extensions/Makefile | 2 +- lang/php85/Makefile | 2 +- mail/Makefile | 1 - mail/pecl-imap/Makefile | 2 +- mail/php81-imap/Makefile | 7 - mail/php81-imap/files/patch-config.m4 | 47 -- mail/phplist/Makefile | 1 - mail/squirrelmail-change_sqlpass-plugin/Makefile | 2 +- mail/squirrelmail-sasql-plugin/Makefile | 2 +- math/Makefile | 2 - math/php81-bcmath/Makefile | 7 - math/php81-gmp/Makefile | 7 - misc/Makefile | 1 - misc/php81-calendar/Makefile | 7 - net-mgmt/Makefile | 1 - net-mgmt/icinga-php-library/Makefile | 1 - net-mgmt/icinga-php-thirdparty/Makefile | 1 - .../icingaweb2-module-businessprocess/Makefile | 1 - net-mgmt/icingaweb2-module-cube/Makefile | 1 - net-mgmt/icingaweb2-module-director/Makefile | 1 - net-mgmt/icingaweb2-module-elasticsearch/Makefile | 1 - net-mgmt/icingaweb2-module-fileshipper/Makefile | 1 - net-mgmt/icingaweb2-module-generictts/Makefile | 1 - net-mgmt/icingaweb2-module-grafana/Makefile | 1 - net-mgmt/icingaweb2-module-graphite/Makefile | 1 - net-mgmt/icingaweb2-module-icingadb/Makefile | 1 - net-mgmt/icingaweb2-module-idoreports/Makefile | 1 - net-mgmt/icingaweb2-module-jira/Makefile | 1 - net-mgmt/icingaweb2-module-map/Makefile | 1 - net-mgmt/icingaweb2-module-pdfexport/Makefile | 1 - net-mgmt/icingaweb2-module-reactbundle/Makefile | 1 - net-mgmt/icingaweb2-module-reporting/Makefile | 1 - net-mgmt/icingaweb2-module-vsphere/Makefile | 1 - net-mgmt/icingaweb2-module-vspheredb/Makefile | 1 - net-mgmt/icingaweb2-module-x509/Makefile | 1 - net-mgmt/icingaweb2/Makefile | 1 - net-mgmt/observium/Makefile | 1 - net-mgmt/php81-snmp/Makefile | 7 - net/Makefile | 3 - net/php81-ldap/Makefile | 7 - net/php81-soap/Makefile | 7 - net/php81-sockets/Makefile | 7 - security/Makefile | 2 - security/mailzu/Makefile | 1 - security/php81-filter/Makefile | 7 - security/php81-sodium/Makefile | 7 - sysutils/Makefile | 2 - sysutils/php81-fileinfo/Makefile | 7 - sysutils/php81-fileinfo/files/patch-config.m4 | 21 - sysutils/php81-posix/Makefile | 7 - sysutils/tarbsd-builder/Makefile | 1 - textproc/Makefile | 9 - textproc/pecl-pspell/Makefile | 2 +- textproc/php81-ctype/Makefile | 7 - textproc/php81-dom/Makefile | 7 - textproc/php81-enchant/Makefile | 7 - textproc/php81-enchant/files/patch-enchant.c | 11 - textproc/php81-pspell/Makefile | 7 - textproc/php81-simplexml/Makefile | 7 - textproc/php81-simplexml/files/patch-config.m4 | 42 -- textproc/php81-xml/Makefile | 8 - textproc/php81-xml/files/patch-compat.c | 22 - textproc/php81-xmlreader/Makefile | 7 - textproc/php81-xmlwriter/Makefile | 7 - textproc/php81-xsl/Makefile | 7 - textproc/php81-xsl/files/patch-php_xsl.h | 11 - www/Makefile | 4 - www/ilias/Makefile | 1 - www/mod_php81/Makefile | 19 - www/php81-opcache/Makefile | 9 - www/php81-session/Makefile | 7 - www/php81-tidy/Makefile | 7 - www/phpmyfaq/Makefile | 1 - www/typo3-13/Makefile | 1 - www/webtrees22/Makefile | 2 +- 155 files changed, 76 insertions(+), 2353 deletions(-) diff --git a/MOVED b/MOVED index 59ce1a1d2f57..0f33de48eb31 100644 --- a/MOVED +++ b/MOVED @@ -5003,3 +5003,62 @@ databases/cockroach||2025-12-31|Has expired: Current versions are fully-propriet java/springframework31||2025-12-31|Has expired: Superseded upstream by newer versions many years ago java/springframework||2025-12-31|Has expired: Superseded upstream by newer versions many years ago devel/llvm11||2025-12-31|Has expired: obsolete with few dependencies +archivers/php81-zip|archivers/php82-zip|2025-12-31|Has expired: Security support ended on 2025-12-31 +archivers/php81-phar|archivers/php82-phar|2025-12-31|Has expired: Security support ended on 2025-12-31 +archivers/php81-bz2|archivers/php82-bz2|2025-12-31|Has expired: Security support ended on 2025-12-31 +archivers/php81-zlib|archivers/php82-zlib|2025-12-31|Has expired: Security support ended on 2025-12-31 +converters/php81-mbstring|converters/php82-mbstring|2025-12-31|Has expired: Security support ended on 2025-12-31 +converters/php81-iconv|converters/php82-iconv|2025-12-31|Has expired: Security support ended on 2025-12-31 +net-mgmt/php81-snmp|net-mgmt/php82-snmp|2025-12-31|Has expired: Security support ended on 2025-12-31 +lang/php81|lang/php82|2025-12-31|Has expired: Security support ended on 2025-12-31 +lang/php81-extensions|lang/php82-extensions|2025-12-31|Has expired: Security support ended on 2025-12-31 +devel/php81-sysvsem|devel/php82-sysvsem|2025-12-31|Has expired: Security support ended on 2025-12-31 +devel/php81-intl|devel/php82-intl|2025-12-31|Has expired: Security support ended on 2025-12-31 +devel/php81-tokenizer|devel/php82-tokenizer|2025-12-31|Has expired: Security support ended on 2025-12-31 +devel/php81-readline|devel/php82-readline|2025-12-31|Has expired: Security support ended on 2025-12-31 +devel/php81-sysvmsg|devel/php82-sysvmsg|2025-12-31|Has expired: Security support ended on 2025-12-31 +devel/php81-gettext|devel/php82-gettext|2025-12-31|Has expired: Security support ended on 2025-12-31 +devel/php81-ffi|devel/php82-ffi|2025-12-31|Has expired: Security support ended on 2025-12-31 +devel/php81-shmop|devel/php82-shmop|2025-12-31|Has expired: Security support ended on 2025-12-31 +devel/php81-sysvshm|devel/php82-sysvshm|2025-12-31|Has expired: Security support ended on 2025-12-31 +devel/php81-pcntl|devel/php82-pcntl|2025-12-31|Has expired: Security support ended on 2025-12-31 +math/php81-gmp|math/php82-gmp|2025-12-31|Has expired: Security support ended on 2025-12-31 +math/php81-bcmath|math/php82-bcmath|2025-12-31|Has expired: Security support ended on 2025-12-31 +sysutils/php81-posix|sysutils/php82-posix|2025-12-31|Has expired: Security support ended on 2025-12-31 +sysutils/php81-fileinfo|sysutils/php82-fileinfo|2025-12-31|Has expired: Security support ended on 2025-12-31 +graphics/php81-exif|graphics/php82-exif|2025-12-31|Has expired: Security support ended on 2025-12-31 +graphics/php81-gd|graphics/php82-gd|2025-12-31|Has expired: Security support ended on 2025-12-31 +mail/php81-imap|mail/php82-imap|2025-12-31|Has expired: Security support ended on 2025-12-31 +www/php81-opcache|www/php82-opcache|2025-12-31|Has expired: Security support ended on 2025-12-31 +www/mod_php81|www/mod_php82|2025-12-31|Has expired: Security support ended on 2025-12-31 +www/php81-tidy|www/php82-tidy|2025-12-31|Has expired: Security support ended on 2025-12-31 +www/php81-session|www/php82-session|2025-12-31|Has expired: Security support ended on 2025-12-31 +textproc/php81-enchant|textproc/php82-enchant|2025-12-31|Has expired: Security support ended on 2025-12-31 +textproc/php81-pspell|textproc/php82-pspell|2025-12-31|Has expired: Security support ended on 2025-12-31 +textproc/php81-xmlwriter|textproc/php82-xmlwriter|2025-12-31|Has expired: Security support ended on 2025-12-31 +textproc/php81-simplexml|textproc/php82-simplexml|2025-12-31|Has expired: Security support ended on 2025-12-31 +textproc/php81-xmlreader|textproc/php82-xmlreader|2025-12-31|Has expired: Security support ended on 2025-12-31 +textproc/php81-ctype|textproc/php82-ctype|2025-12-31|Has expired: Security support ended on 2025-12-31 +textproc/php81-xsl|textproc/php82-xsl|2025-12-31|Has expired: Security support ended on 2025-12-31 +textproc/php81-dom|textproc/php82-dom|2025-12-31|Has expired: Security support ended on 2025-12-31 +textproc/php81-xml|textproc/php82-xml|2025-12-31|Has expired: Security support ended on 2025-12-31 +ftp/php81-ftp|ftp/php82-ftp|2025-12-31|Has expired: Security support ended on 2025-12-31 +ftp/php81-curl|ftp/php82-curl|2025-12-31|Has expired: Security support ended on 2025-12-31 +misc/php81-calendar|misc/php82-calendar|2025-12-31|Has expired: Security support ended on 2025-12-31 +net/php81-ldap|net/php82-ldap|2025-12-31|Has expired: Security support ended on 2025-12-31 +net/php81-sockets|net/php82-sockets|2025-12-31|Has expired: Security support ended on 2025-12-31 +net/php81-soap|net/php82-soap|2025-12-31|Has expired: Security support ended on 2025-12-31 +databases/php81-pdo_pgsql|databases/php82-pdo_pgsql|2025-12-31|Has expired: Security support ended on 2025-12-31 +databases/php81-pdo_sqlite|databases/php82-pdo_sqlite|2025-12-31|Has expired: Security support ended on 2025-12-31 +databases/php81-pdo_odbc|databases/php82-pdo_odbc|2025-12-31|Has expired: Security support ended on 2025-12-31 +databases/php81-pdo|databases/php82-pdo|2025-12-31|Has expired: Security support ended on 2025-12-31 +databases/php81-sqlite3|databases/php82-sqlite3|2025-12-31|Has expired: Security support ended on 2025-12-31 +databases/php81-pdo_firebird|databases/php82-pdo_firebird|2025-12-31|Has expired: Security support ended on 2025-12-31 +databases/php81-pgsql|databases/php82-pgsql|2025-12-31|Has expired: Security support ended on 2025-12-31 +databases/php81-mysqli|databases/php82-mysqli|2025-12-31|Has expired: Security support ended on 2025-12-31 +databases/php81-pdo_dblib|databases/php82-pdo_dblib|2025-12-31|Has expired: Security support ended on 2025-12-31 +databases/php81-dba|databases/php82-dba|2025-12-31|Has expired: Security support ended on 2025-12-31 +databases/php81-pdo_mysql|databases/php82-pdo_mysql|2025-12-31|Has expired: Security support ended on 2025-12-31 +databases/php81-odbc|databases/php82-odbc|2025-12-31|Has expired: Security support ended on 2025-12-31 +security/php81-sodium|security/php82-sodium|2025-12-31|Has expired: Security support ended on 2025-12-31 +security/php81-filter|security/php82-filter|2025-12-31|Has expired: Security support ended on 2025-12-31 diff --git a/Mk/Uses/pear.mk b/Mk/Uses/pear.mk index cbea5a6fe5f7..d0a2a852dd5f 100644 --- a/Mk/Uses/pear.mk +++ b/Mk/Uses/pear.mk @@ -22,7 +22,7 @@ IGNORE= Incorrect 'USES+= pear:${pear_ARGS}' usage: argument [${arg}] is not rec . endif . endfor -_pear_IGNORE_WITH_PHP=81 +_pear_IGNORE_WITH_PHP= IGNORE_WITH_PHP+= ${_pear_IGNORE_WITH_PHP} php_ARGS+= flavors .include "${USESDIR}/php.mk" diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index f3798824b2be..d853fb43f3f3 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -110,7 +110,7 @@ DIST_SUBDIR= PECL PHPBASE?= ${LOCALBASE} -_ALL_PHP_VERSIONS= 81 82 83 84 85 +_ALL_PHP_VERSIONS= 82 83 84 85 # Make the already installed PHP the default one. . if exists(${PHPBASE}/etc/php.conf) @@ -191,9 +191,6 @@ PHP_EXT_INC= hash json openssl pcre random spl . elif ${PHP_VER} == 82 PHP_EXT_DIR= 20220829 PHP_EXT_INC= hash json openssl pcre random spl -. elif ${PHP_VER} == 81 -PHP_EXT_DIR= 20210902 -PHP_EXT_INC= hash json openssl pcre spl . else # (rene) default to DEFAULT_VERSIONS PHP_EXT_DIR= 20240924 @@ -386,7 +383,6 @@ _USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \ tidy tokenizer xml xmlreader xmlrpc xmlwriter xsl zephir_parser \ zip zlib # version specific components -_USE_PHP_VER81= ${_USE_PHP_ALL} opcache _USE_PHP_VER82= ${_USE_PHP_ALL} opcache _USE_PHP_VER83= ${_USE_PHP_ALL} opcache _USE_PHP_VER84= ${_USE_PHP_ALL} opcache diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 605b2fd703df..7a9e237f47e8 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -132,7 +132,7 @@ PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} . endif # Possible values: 13, 14, 15, 16, 17, 18 PGSQL_DEFAULT?= 17 -# Possible values: 8.1, 8.2, 8.3, 8.4, 8.5 +# Possible values: 8.2, 8.3, 8.4, 8.5 PHP_DEFAULT?= 8.4 # Possible values: rust, legacy . if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64) diff --git a/archivers/Makefile b/archivers/Makefile index 24354c6c0a03..3e63395115ce 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -161,10 +161,6 @@ SUBDIR += php-lz4 SUBDIR += php-snappy SUBDIR += php-zstd - SUBDIR += php81-bz2 - SUBDIR += php81-phar - SUBDIR += php81-zip - SUBDIR += php81-zlib SUBDIR += php82-bz2 SUBDIR += php82-phar SUBDIR += php82-zip diff --git a/archivers/php81-bz2/Makefile b/archivers/php81-bz2/Makefile deleted file mode 100644 index acda1fa77a92..000000000000 --- a/archivers/php81-bz2/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -bz2 - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php81-phar/Makefile b/archivers/php81-phar/Makefile deleted file mode 100644 index 810e19ae4e32..000000000000 --- a/archivers/php81-phar/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -phar - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php81-phar/files/patch-config.m4 b/archivers/php81-phar/files/patch-config.m4 deleted file mode 100644 index 1aba3bd9a5a8..000000000000 --- a/archivers/php81-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/php81-zip/Makefile b/archivers/php81-zip/Makefile deleted file mode 100644 index 448cb8fad537..000000000000 --- a/archivers/php81-zip/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -zip - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php81-zlib/Makefile b/archivers/php81-zlib/Makefile deleted file mode 100644 index 751ffb1ae6b5..000000000000 --- a/archivers/php81-zlib/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -zlib - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php81-zlib/files/patch-zlib.c b/archivers/php81-zlib/files/patch-zlib.c deleted file mode 100644 index be02c50d1df6..000000000000 --- a/archivers/php81-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 6b251b3bec48..b2314213ffbf 100644 --- a/converters/Makefile +++ b/converters/Makefile @@ -138,8 +138,6 @@ SUBDIR += pear-Services_JSON SUBDIR += pecl-igbinary SUBDIR += php-bsdconv - SUBDIR += php81-iconv - SUBDIR += php81-mbstring SUBDIR += php82-iconv SUBDIR += php82-mbstring SUBDIR += php83-iconv diff --git a/converters/php81-iconv/Makefile b/converters/php81-iconv/Makefile deleted file mode 100644 index cd797676267b..000000000000 --- a/converters/php81-iconv/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -iconv - -.include "${MASTERDIR}/Makefile" diff --git a/converters/php81-mbstring/Makefile b/converters/php81-mbstring/Makefile deleted file mode 100644 index 5ec26ef20ab5..000000000000 --- a/converters/php81-mbstring/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -mbstring - -.include "${MASTERDIR}/Makefile" diff --git a/converters/php81-mbstring/files/patch-config.m4 b/converters/php81-mbstring/files/patch-config.m4 deleted file mode 100644 index a3e5c14477a3..000000000000 --- a/converters/php81-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 9dcf45f95d22..d0dd25c3e6df 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -585,18 +585,6 @@ SUBDIR += pgvector SUBDIR += php-tarantool SUBDIR += php-xapian - SUBDIR += php81-dba - SUBDIR += php81-mysqli - SUBDIR += php81-odbc - SUBDIR += php81-pdo - SUBDIR += php81-pdo_dblib - SUBDIR += php81-pdo_firebird - SUBDIR += php81-pdo_mysql - SUBDIR += php81-pdo_odbc - SUBDIR += php81-pdo_pgsql - SUBDIR += php81-pdo_sqlite - SUBDIR += php81-pgsql - SUBDIR += php81-sqlite3 SUBDIR += php82-dba SUBDIR += php82-mysqli SUBDIR += php82-odbc diff --git a/databases/php81-dba/Makefile b/databases/php81-dba/Makefile deleted file mode 100644 index 5c5380de17df..000000000000 --- a/databases/php81-dba/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -dba - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php81-dba/files/patch-config.m4 b/databases/php81-dba/files/patch-config.m4 deleted file mode 100644 index 30f662138374..000000000000 --- a/databases/php81-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/php81-mysqli/Makefile b/databases/php81-mysqli/Makefile deleted file mode 100644 index 26619c0bed72..000000000000 --- a/databases/php81-mysqli/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -mysqli - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php81-mysqli/files/patch-mysqli__api.c b/databases/php81-mysqli/files/patch-mysqli__api.c deleted file mode 100644 index a100e8205fb6..000000000000 --- a/databases/php81-mysqli/files/patch-mysqli__api.c +++ /dev/null @@ -1,12 +0,0 @@ ---- mysqli_api.c.orig 2020-09-29 22:36:51 UTC -+++ mysqli_api.c -@@ -29,7 +29,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 - - #define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num)) - diff --git a/databases/php81-mysqli/files/patch-php_mysqli_structs.h b/databases/php81-mysqli/files/patch-php_mysqli_structs.h deleted file mode 100644 index 68568dd214fd..000000000000 --- a/databases/php81-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/php81-odbc/Makefile b/databases/php81-odbc/Makefile deleted file mode 100644 index 8bc4a42dd7ce..000000000000 --- a/databases/php81-odbc/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -odbc - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php81-odbc/files/patch-config.m4 b/databases/php81-odbc/files/patch-config.m4 deleted file mode 100644 index 04efc6ded7c9..000000000000 --- a/databases/php81-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/php81-pdo/Makefile b/databases/php81-pdo/Makefile deleted file mode 100644 index 436a6554b434..000000000000 --- a/databases/php81-pdo/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -pdo - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php81-pdo_dblib/Makefile b/databases/php81-pdo_dblib/Makefile deleted file mode 100644 index 1634ef611565..000000000000 --- a/databases/php81-pdo_dblib/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -pdo_dblib - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php81-pdo_firebird/Makefile b/databases/php81-pdo_firebird/Makefile deleted file mode 100644 index 3d8a88b9eb21..000000000000 --- a/databases/php81-pdo_firebird/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -pdo_firebird - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php81-pdo_mysql/Makefile b/databases/php81-pdo_mysql/Makefile deleted file mode 100644 index 2f00ba00c8b9..000000000000 --- a/databases/php81-pdo_mysql/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -pdo_mysql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php81-pdo_odbc/Makefile b/databases/php81-pdo_odbc/Makefile deleted file mode 100644 index ea600d80a450..000000000000 --- a/databases/php81-pdo_odbc/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -pdo_odbc - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php81-pdo_pgsql/Makefile b/databases/php81-pdo_pgsql/Makefile deleted file mode 100644 index f13461131114..000000000000 --- a/databases/php81-pdo_pgsql/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -pdo_pgsql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php81-pdo_sqlite/Makefile b/databases/php81-pdo_sqlite/Makefile deleted file mode 100644 index c18088284a0b..000000000000 --- a/databases/php81-pdo_sqlite/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -pdo_sqlite - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php81-pgsql/Makefile b/databases/php81-pgsql/Makefile deleted file mode 100644 index f23a2e371612..000000000000 --- a/databases/php81-pgsql/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -pgsql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php81-sqlite3/Makefile b/databases/php81-sqlite3/Makefile deleted file mode 100644 index c68eab2dfba2..000000000000 --- a/databases/php81-sqlite3/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -sqlite3 - -.include "${MASTERDIR}/Makefile" diff --git a/devel/Makefile b/devel/Makefile index 7ac668b620f9..923b3d975a3f 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4254,16 +4254,6 @@ SUBDIR += php-ice37 SUBDIR += php-libawl SUBDIR += php-maxminddb - SUBDIR += php81-ffi - SUBDIR += php81-gettext - SUBDIR += php81-intl - SUBDIR += php81-pcntl - SUBDIR += php81-readline - SUBDIR += php81-shmop - SUBDIR += php81-sysvmsg - SUBDIR += php81-sysvsem - SUBDIR += php81-sysvshm - SUBDIR += php81-tokenizer SUBDIR += php82-ffi SUBDIR += php82-gettext SUBDIR += php82-intl diff --git a/devel/php81-ffi/Makefile b/devel/php81-ffi/Makefile deleted file mode 100644 index 2ba98dacbc5c..000000000000 --- a/devel/php81-ffi/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -ffi - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php81-gettext/Makefile b/devel/php81-gettext/Makefile deleted file mode 100644 index 7ad00f9b0532..000000000000 --- a/devel/php81-gettext/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -gettext - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php81-intl/Makefile b/devel/php81-intl/Makefile deleted file mode 100644 index 1ccc80b52ca4..000000000000 --- a/devel/php81-intl/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -intl - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php81-pcntl/Makefile b/devel/php81-pcntl/Makefile deleted file mode 100644 index 44c3828b245a..000000000000 --- a/devel/php81-pcntl/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php81 - -PKGNAMESUFFIX= -pcntl - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php81-readline/Makefile b/devel/php81-readline/Makefile deleted file mode 100644 index ea2fa08b26b4..000000000000 --- a/devel/php81-readline/Makefile +++ /dev/null @@ -1,7 +0,0 @@ *** 2874 LINES SKIPPED ***home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6955382e.44461.1306cf5f>
