git: cc378fb60bd6 - main - lang/php73: Remove port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 26 Jan 2022 00:20:10 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=cc378fb60bd6ff39ac810093b5fc83cf330c1d92
commit cc378fb60bd6ff39ac810093b5fc83cf330c1d92
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2022-01-26 00:06:01 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2022-01-26 00:20:01 +0000
lang/php73: Remove port
- EOL reached on 2021-12-06
https://www.php.net/eol.php
PR: 260624
Approved by: tz (private email) ale portmgr (blanket)
Sponsored by: Bounce Experts
---
MOVED | 65 +++
Mk/Uses/php.mk | 19 +-
Mk/bsd.default-versions.mk | 2 +-
archivers/Makefile | 4 -
archivers/php73-bz2/Makefile | 9 -
archivers/php73-phar/Makefile | 9 -
archivers/php73-phar/files/patch-config.m4 | 41 --
archivers/php73-phar/files/patch-phar.c | 11 -
archivers/php73-zip/Makefile | 9 -
archivers/php73-zlib/Makefile | 9 -
archivers/php73-zlib/files/patch-zlib.c | 10 -
converters/Makefile | 3 -
converters/php73-iconv/Makefile | 9 -
converters/php73-mbstring/Makefile | 9 -
converters/php73-mbstring/files/patch-config.m4 | 51 --
converters/php73-recode/Makefile | 9 -
databases/Makefile | 13 -
databases/php73-dba/Makefile | 9 -
databases/php73-dba/files/patch-config.m4 | 50 --
databases/php73-interbase/Makefile | 9 -
databases/php73-mysqli/Makefile | 9 -
databases/php73-mysqli/files/patch-mysqli__api.c | 13 -
databases/php73-odbc/Makefile | 9 -
databases/php73-odbc/files/patch-config.m4 | 111 ----
databases/php73-pdo/Makefile | 9 -
databases/php73-pdo_dblib/Makefile | 9 -
databases/php73-pdo_firebird/Makefile | 9 -
databases/php73-pdo_mysql/Makefile | 9 -
databases/php73-pdo_odbc/Makefile | 9 -
databases/php73-pdo_pgsql/Makefile | 9 -
databases/php73-pdo_sqlite/Makefile | 9 -
databases/php73-pgsql/Makefile | 9 -
databases/php73-sqlite3/Makefile | 9 -
devel/Makefile | 10 -
devel/php73-gettext/Makefile | 9 -
devel/php73-intl/Makefile | 14 -
devel/php73-intl/files/patch-icu68 | 213 --------
devel/php73-intl/files/patch-icu70 | 38 --
devel/php73-json/Makefile | 9 -
devel/php73-pcntl/Makefile | 9 -
devel/php73-readline/Makefile | 9 -
devel/php73-readline/files/patch-config.m4 | 30 --
devel/php73-readline/files/patch-readline_cli.c | 13 -
devel/php73-shmop/Makefile | 9 -
devel/php73-sysvmsg/Makefile | 9 -
devel/php73-sysvsem/Makefile | 9 -
devel/php73-sysvshm/Makefile | 9 -
devel/php73-tokenizer/Makefile | 9 -
ftp/Makefile | 2 -
ftp/php73-curl/Makefile | 9 -
ftp/php73-ftp/Makefile | 13 -
graphics/Makefile | 2 -
graphics/php73-exif/Makefile | 9 -
graphics/php73-gd/Makefile | 11 -
graphics/php73-gd/files/patch-config.m4 | 63 ---
graphics/php73-gd/files/patch-gd.c | 83 ---
lang/Makefile | 2 -
lang/php73-extensions/Makefile | 114 -----
lang/php73-extensions/pkg-descr | 7 -
lang/php73/Makefile | 193 -------
lang/php73/Makefile.ext | 570 ---------------------
lang/php73/distinfo | 3 -
lang/php73/files/patch-Makefile.global | 19 -
lang/php73/files/patch-acinclude.m4 | 68 ---
lang/php73/files/patch-configure.in | 61 ---
lang/php73/files/patch-ext_mysqli_mysqli__api.c | 13 -
lang/php73/files/patch-ext_mysqli_mysqli__nonapi.c | 12 -
lang/php73/files/patch-ext_mysqli_mysqli__prop.c | 12 -
.../files/patch-ext_mysqli_php__mysqli__structs.h | 11 -
.../files/patch-sapi_apache2handler_config.m4 | 11 -
lang/php73/files/patch-sapi_fpm_config.m4 | 11 -
lang/php73/files/patch-sapi_fpm_www.conf.in | 17 -
lang/php73/files/php-fpm.in | 66 ---
lang/php73/pkg-descr | 8 -
lang/php73/pkg-message.mod | 19 -
lang/php73/pkg-plist | 265 ----------
lang/php73/pkg-plist.mod | 3 -
mail/Makefile | 1 -
mail/php73-imap/Makefile | 9 -
mail/php73-imap/files/patch-config.m4 | 42 --
math/Makefile | 2 -
math/php73-bcmath/Makefile | 9 -
math/php73-gmp/Makefile | 9 -
misc/Makefile | 1 -
misc/php73-calendar/Makefile | 9 -
net-mgmt/Makefile | 1 -
net-mgmt/php73-snmp/Makefile | 9 -
net/Makefile | 4 -
net/php73-ldap/Makefile | 9 -
net/php73-soap/Makefile | 9 -
net/php73-sockets/Makefile | 9 -
net/php73-xmlrpc/Makefile | 9 -
net/php73-xmlrpc/files/patch-config.m4 | 23 -
security/Makefile | 4 -
security/php73-filter/Makefile | 9 -
security/php73-filter/files/patch-config.m4 | 10 -
security/php73-hash/Makefile | 9 -
security/php73-openssl/Makefile | 9 -
security/php73-sodium/Makefile | 9 -
security/php73-sodium/files/patch-config.m4 | 17 -
sysutils/Makefile | 2 -
sysutils/php73-fileinfo/Makefile | 9 -
sysutils/php73-fileinfo/files/patch-config.m4 | 21 -
sysutils/php73-posix/Makefile | 9 -
sysutils/php73-posix/files/patch-posix.c | 38 --
textproc/Makefile | 10 -
textproc/php73-ctype/Makefile | 9 -
textproc/php73-dom/Makefile | 9 -
textproc/php73-enchant/Makefile | 9 -
textproc/php73-pspell/Makefile | 9 -
textproc/php73-simplexml/Makefile | 9 -
textproc/php73-simplexml/files/patch-config.m4 | 43 --
textproc/php73-wddx/Makefile | 9 -
textproc/php73-wddx/files/patch-config.m4 | 22 -
textproc/php73-wddx/files/patch-wddx.c | 40 --
textproc/php73-xml/Makefile | 9 -
textproc/php73-xml/files/patch-compat.c | 13 -
textproc/php73-xmlreader/Makefile | 9 -
textproc/php73-xmlwriter/Makefile | 9 -
textproc/php73-xsl/Makefile | 9 -
textproc/php73-xsl/files/patch-php_xsl.h | 11 -
www/Makefile | 4 -
www/mod_php73/Makefile | 13 -
www/php73-opcache/Makefile | 11 -
www/php73-opcache/files/patch-zend__file__cache.c | 14 -
www/php73-session/Makefile | 9 -
www/php73-tidy/Makefile | 9 -
127 files changed, 72 insertions(+), 3167 deletions(-)
diff --git a/MOVED b/MOVED
index 68f9a8ddfe4e..0a61f829c421 100644
--- a/MOVED
+++ b/MOVED
@@ -16778,3 +16778,68 @@ security/truecrypt|security/veracrypt|2022-01-23|Has expired: Development and su
graphics/radiance||2022-01-23|Has expired: Application uses deprecated OpenGL support in libmpv, see the comment in https://github.com/zbanks/radiance/issues/118
databases/postgis25||2022-01-25|Has expired: Deprecated in favour of databases/postgis3x
www/zend-framework1|www/zend-framework|2022-01-25|Has expired: Fails to work with current active PHP versions
+archivers/php73-bz2|archivers/php74-bz2|2022-01-26|Has expired: Security support ended on 2021-12-06
+archivers/php73-zlib|archivers/php74-zlib|2022-01-26|Has expired: Security support ended on 2021-12-06
+archivers/php73-zip|archivers/php74-zip|2022-01-26|Has expired: Security support ended on 2021-12-06
+archivers/php73-phar|archivers/php74-phar|2022-01-26|Has expired: Security support ended on 2021-12-06
+math/php73-gmp|math/php74-gmp|2022-01-26|Has expired: Security support ended on 2021-12-06
+math/php73-bcmath|math/php74-bcmath|2022-01-26|Has expired: Security support ended on 2021-12-06
+net-mgmt/php73-snmp|net-mgmt/php74-snmp|2022-01-26|Has expired: Security support ended on 2021-12-06
+converters/php73-iconv|converters/php74-iconv|2022-01-26|Has expired: Security support ended on 2021-12-06
+converters/php73-mbstring|converters/php74-mbstring|2022-01-26|Has expired: Security support ended on 2021-12-06
+converters/php73-recode||2022-01-26|Has expired: Security support ended on 2021-12-06
+lang/php73|lang/php74|2022-01-26|Has expired: Security support ended on 2021-12-06
+lang/php73-extensions|lang/php74-extensions|2022-01-26|Has expired: Security support ended on 2021-12-06
+sysutils/php73-posix|sysutils/php74-posix|2022-01-26|Has expired: Security support ended on 2021-12-06
+sysutils/php73-fileinfo|sysutils/php74-fileinfo|2022-01-26|Has expired: Security support ended on 2021-12-06
+textproc/php73-xmlreader|textproc/php74-xmlreader|2022-01-26|Has expired: Security support ended on 2021-12-06
+textproc/php73-ctype|textproc/php74-ctype|2022-01-26|Has expired: Security support ended on 2021-12-06
+textproc/php73-simplexml|textproc/php74-simplexml|2022-01-26|Has expired: Security support ended on 2021-12-06
+textproc/php73-xsl|textproc/php74-xsl|2022-01-26|Has expired: Security support ended on 2021-12-06
+textproc/php73-dom|textproc/php74-dom|2022-01-26|Has expired: Security support ended on 2021-12-06
+textproc/php73-xml|textproc/php74-xml|2022-01-26|Has expired: Security support ended on 2021-12-06
+textproc/php73-enchant|textproc/php74-enchant|2022-01-26|Has expired: Security support ended on 2021-12-06
+textproc/php73-pspell|textproc/php74-pspell|2022-01-26|Has expired: Security support ended on 2021-12-06
+textproc/php73-xmlwriter|textproc/php74-xmlwriter|2022-01-26|Has expired: Security support ended on 2021-12-06
+textproc/php73-wddx||2022-01-26|Has expired: Security support ended on 2021-12-06
+ftp/php73-curl|ftp/php74-curl|2022-01-26|Has expired: Security support ended on 2021-12-06
+ftp/php73-ftp|ftp/php74-ftp|2022-01-26|Has expired: Security support ended on 2021-12-06
+devel/php73-shmop|devel/php74-shmop|2022-01-26|Has expired: Security support ended on 2021-12-06
+devel/php73-readline|devel/php74-readline|2022-01-26|Has expired: Security support ended on 2021-12-06
+devel/php73-sysvsem|devel/php74-sysvsem|2022-01-26|Has expired: Security support ended on 2021-12-06
+devel/php73-sysvmsg|devel/php74-sysvmsg|2022-01-26|Has expired: Security support ended on 2021-12-06
+devel/php73-pcntl|devel/php74-pcntl|2022-01-26|Has expired: Security support ended on 2021-12-06
+devel/php73-tokenizer|devel/php74-tokenizer|2022-01-26|Has expired: Security support ended on 2021-12-06
+devel/php73-json|devel/php74-json|2022-01-26|Has expired: Security support ended on 2021-12-06
+devel/php73-sysvshm|devel/php74-sysvshm|2022-01-26|Has expired: Security support ended on 2021-12-06
+devel/php73-gettext|devel/php74-gettext|2022-01-26|Has expired: Security support ended on 2021-12-06
+devel/php73-intl|devel/php74-intl|2022-01-26|Has expired: Security support ended on 2021-12-06
+www/php73-opcache|www/php74-opcache|2022-01-26|Has expired: Security support ended on 2021-12-06
+www/mod_php73|www/mod_php74|2022-01-26|Has expired: Security support ended on 2021-12-06
+www/php73-tidy|www/php74-tidy|2022-01-26|Has expired: Security support ended on 2021-12-06
+www/php73-session|www/php74-session|2022-01-26|Has expired: Security support ended on 2021-12-06
+graphics/php73-gd|graphics/php74-gd|2022-01-26|Has expired: Security support ended on 2021-12-06
+graphics/php73-exif|graphics/php74-exif|2022-01-26|Has expired: Security support ended on 2021-12-06
+security/php73-sodium|security/php74-sodium|2022-01-26|Has expired: Security support ended on 2021-12-06
+security/php73-openssl|security/php74-openssl|2022-01-26|Has expired: Security support ended on 2021-12-06
+security/php73-filter|security/php74-filter|2022-01-26|Has expired: Security support ended on 2021-12-06
+security/php73-hash||2022-01-26|Has expired: Security support ended on 2021-12-06
+databases/php73-pdo_dblib|databases/php74-pdo_dblib|2022-01-26|Has expired: Security support ended on 2021-12-06
+databases/php73-pdo|databases/php74-pdo|2022-01-26|Has expired: Security support ended on 2021-12-06
+databases/php73-dba|databases/php74-dba|2022-01-26|Has expired: Security support ended on 2021-12-06
+databases/php73-pgsql|databases/php74-pgsql|2022-01-26|Has expired: Security support ended on 2021-12-06
+databases/php73-odbc|databases/php74-odbc|2022-01-26|Has expired: Security support ended on 2021-12-06
+databases/php73-interbase||2022-01-26|Has expired: Security support ended on 2021-12-06
+databases/php73-pdo_sqlite|databases/php74-pdo_sqlite|2022-01-26|Has expired: Security support ended on 2021-12-06
+databases/php73-sqlite3|databases/php74-sqlite3|2022-01-26|Has expired: Security support ended on 2021-12-06
+databases/php73-pdo_pgsql|databases/php74-pdo_pgsql|2022-01-26|Has expired: Security support ended on 2021-12-06
+databases/php73-pdo_odbc|databases/php74-pdo_odbc|2022-01-26|Has expired: Security support ended on 2021-12-06
+databases/php73-mysqli|databases/php74-mysqli|2022-01-26|Has expired: Security support ended on 2021-12-06
+databases/php73-pdo_mysql|databases/php74-pdo_mysql|2022-01-26|Has expired: Security support ended on 2021-12-06
+databases/php73-pdo_firebird|databases/php74-pdo_firebird|2022-01-26|Has expired: Security support ended on 2021-12-06
+misc/php73-calendar|misc/php74-calendar|2022-01-26|Has expired: Security support ended on 2021-12-06
+mail/php73-imap|mail/php74-imap|2022-01-26|Has expired: Security support ended on 2021-12-06
+net/php73-sockets|net/php74-sockets|2022-01-26|Has expired: Security support ended on 2021-12-06
+net/php73-xmlrpc|net/php74-xmlrpc|2022-01-26|Has expired: Security support ended on 2021-12-06
+net/php73-ldap|net/php74-ldap|2022-01-26|Has expired: Security support ended on 2021-12-06
+net/php73-soap|net/php74-soap|2022-01-26|Has expired: Security support ended on 2021-12-06
diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk
index bf3a48b3bd71..baad1f7790a3 100644
--- a/Mk/Uses/php.mk
+++ b/Mk/Uses/php.mk
@@ -40,7 +40,7 @@
# For example:
#
# USES= php:ext
-# USE_PHP= xml wddx
+# USE_PHP= xml
# PHP_MOD_PRIO= 40
#
# The port can set these options in its Makefile before bsd.port.pre.mk:
@@ -108,7 +108,7 @@ DIST_SUBDIR= PECL
PHPBASE?= ${LOCALBASE}
-_ALL_PHP_VERSIONS= 73 74 80 81
+_ALL_PHP_VERSIONS= 74 80 81
# Make the already installed PHP the default one.
. if exists(${PHPBASE}/etc/php.conf)
@@ -185,9 +185,6 @@ PHP_EXT_INC= hash json pcre spl
. elif ${PHP_VER} == 74
PHP_EXT_DIR= 20190902
PHP_EXT_INC= hash pcre spl
-. elif ${PHP_VER} == 73
-PHP_EXT_DIR= 20180731
-PHP_EXT_INC= pcre spl
. else
# (rene) default to DEFAULT_VERSIONS
PHP_EXT_DIR= 20200930
@@ -375,7 +372,7 @@ add-plist-phpext:
. if defined(USE_PHP) && ${USE_PHP:tl} != "yes"
# non-version specific components
_USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \
- enchant exif fileinfo filter ftp gd gettext gmp \
+ enchant exif ffi fileinfo filter ftp gd gettext gmp \
hash iconv igbinary imap intl json ldap mbstring mcrypt \
memcache memcached mysqli odbc opcache \
openssl pcntl pcre pdo pdo_dblib pdo_firebird pdo_mysql \
@@ -384,10 +381,9 @@ _USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \
sockets sodium spl sqlite3 sysvmsg sysvsem sysvshm \
tidy tokenizer xml xmlreader xmlrpc xmlwriter xsl zip zlib
# version specific components
-_USE_PHP_VER73= ${_USE_PHP_ALL} interbase pdf recode wddx
-_USE_PHP_VER74= ${_USE_PHP_ALL} ffi pdf
-_USE_PHP_VER80= ${_USE_PHP_ALL} ffi
-_USE_PHP_VER81= ${_USE_PHP_ALL} ffi
+_USE_PHP_VER74= ${_USE_PHP_ALL} pdf
+_USE_PHP_VER80= ${_USE_PHP_ALL}
+_USE_PHP_VER81= ${_USE_PHP_ALL}
bcmath_DEPENDS= math/php${PHP_VER}-bcmath
bitset_DEPENDS= math/pecl-bitset@${PHP_FLAVOR}
@@ -411,7 +407,6 @@ hash_DEPENDS= security/php${PHP_VER}-hash
iconv_DEPENDS= converters/php${PHP_VER}-iconv
igbinary_DEPENDS= converters/pecl-igbinary@${PHP_FLAVOR}
imap_DEPENDS= mail/php${PHP_VER}-imap
-interbase_DEPENDS= databases/php${PHP_VER}-interbase
intl_DEPENDS= devel/php${PHP_VER}-intl
json_DEPENDS= devel/php${PHP_VER}-json
ldap_DEPENDS= net/php${PHP_VER}-ldap
@@ -439,7 +434,6 @@ posix_DEPENDS= sysutils/php${PHP_VER}-posix
pspell_DEPENDS= textproc/php${PHP_VER}-pspell
radius_DEPENDS= net/pecl-radius@${PHP_FLAVOR}
readline_DEPENDS= devel/php${PHP_VER}-readline
-recode_DEPENDS= converters/php${PHP_VER}-recode
redis_DEPENDS= databases/pecl-redis@${PHP_FLAVOR}
session_DEPENDS=www/php${PHP_VER}-session
shmop_DEPENDS= devel/php${PHP_VER}-shmop
@@ -455,7 +449,6 @@ sysvsem_DEPENDS=devel/php${PHP_VER}-sysvsem
sysvshm_DEPENDS=devel/php${PHP_VER}-sysvshm
tidy_DEPENDS= www/php${PHP_VER}-tidy
tokenizer_DEPENDS= devel/php${PHP_VER}-tokenizer
-wddx_DEPENDS= textproc/php${PHP_VER}-wddx
xml_DEPENDS= textproc/php${PHP_VER}-xml
xmlreader_DEPENDS= textproc/php${PHP_VER}-xmlreader
.if ${PHP_VER} >= 80
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 327b477fe180..ce3c5fca1587 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -107,7 +107,7 @@ PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R}
.endif
# Possible values: 9.6, 10, 11, 12, 13, 14
PGSQL_DEFAULT?= 13
-# Possible values: 7.3, 7.4, 8.0, 8.1
+# Possible values: 7.4, 8.0, 8.1
PHP_DEFAULT?= 8.0
# Possible values: 2.7, 3.7, 3.8, 3.9, 3.10, 3.11
PYTHON_DEFAULT?= 3.8
diff --git a/archivers/Makefile b/archivers/Makefile
index 6e08a110e69d..2137d7ba25e3 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -153,10 +153,6 @@
SUBDIR += php-lz4
SUBDIR += php-snappy
SUBDIR += php-zstd
- SUBDIR += php73-bz2
- SUBDIR += php73-phar
- SUBDIR += php73-zip
- SUBDIR += php73-zlib
SUBDIR += php74-bz2
SUBDIR += php74-phar
SUBDIR += php74-zip
diff --git a/archivers/php73-bz2/Makefile b/archivers/php73-bz2/Makefile
deleted file mode 100644
index 43bada9fd835..000000000000
--- a/archivers/php73-bz2/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= archivers
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -bz2
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/archivers/php73-phar/Makefile b/archivers/php73-phar/Makefile
deleted file mode 100644
index adebc143dc7f..000000000000
--- a/archivers/php73-phar/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= archivers
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -phar
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/archivers/php73-phar/files/patch-config.m4 b/archivers/php73-phar/files/patch-config.m4
deleted file mode 100644
index 1aba3bd9a5a8..000000000000
--- a/archivers/php73-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/php73-phar/files/patch-phar.c b/archivers/php73-phar/files/patch-phar.c
deleted file mode 100644
index e7ae6cb3328d..000000000000
--- a/archivers/php73-phar/files/patch-phar.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- phar.c.orig 2016-06-21 19:56:49 UTC
-+++ phar.c
-@@ -3589,7 +3589,7 @@ static const zend_module_dep phar_deps[]
- ZEND_MOD_OPTIONAL("openssl")
- ZEND_MOD_OPTIONAL("zlib")
- ZEND_MOD_OPTIONAL("standard")
--#if defined(HAVE_HASH) && !defined(COMPILE_DL_HASH)
-+#if defined(HAVE_HASH)
- ZEND_MOD_REQUIRED("hash")
- #endif
- #if HAVE_SPL
diff --git a/archivers/php73-zip/Makefile b/archivers/php73-zip/Makefile
deleted file mode 100644
index 16f7d48fddc6..000000000000
--- a/archivers/php73-zip/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= archivers
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -zip
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/archivers/php73-zlib/Makefile b/archivers/php73-zlib/Makefile
deleted file mode 100644
index b0b5572ce809..000000000000
--- a/archivers/php73-zlib/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= archivers
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -zlib
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/archivers/php73-zlib/files/patch-zlib.c b/archivers/php73-zlib/files/patch-zlib.c
deleted file mode 100644
index be02c50d1df6..000000000000
--- a/archivers/php73-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 623ab95ef3b7..52da4c01f1db 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -136,9 +136,6 @@
SUBDIR += pear-Services_JSON
SUBDIR += pecl-igbinary
SUBDIR += php-bsdconv
- SUBDIR += php73-iconv
- SUBDIR += php73-mbstring
- SUBDIR += php73-recode
SUBDIR += php74-iconv
SUBDIR += php74-mbstring
SUBDIR += php80-iconv
diff --git a/converters/php73-iconv/Makefile b/converters/php73-iconv/Makefile
deleted file mode 100644
index 8888797b1c60..000000000000
--- a/converters/php73-iconv/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= converters
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -iconv
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/converters/php73-mbstring/Makefile b/converters/php73-mbstring/Makefile
deleted file mode 100644
index 53ced797e0e1..000000000000
--- a/converters/php73-mbstring/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= converters
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -mbstring
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/converters/php73-mbstring/files/patch-config.m4 b/converters/php73-mbstring/files/patch-config.m4
deleted file mode 100644
index 77777ccdb9db..000000000000
--- a/converters/php73-mbstring/files/patch-config.m4
+++ /dev/null
@@ -1,51 +0,0 @@
---- config.m4.orig 2018-09-25 09:08:02 UTC
-+++ config.m4
-@@ -41,6 +41,30 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
- PHP_ADD_INCLUDE([$ext_builddir/$dir])
- done
-
-+ dnl This is PECL build, check if bundled PCRE library is used
-+ old_CPPFLAGS=$CPPFLAGS
-+ CPPFLAGS=$INCLUDES
-+ AC_EGREP_CPP(yes,[
-+#include <main/php_config.h>
-+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
-+yes
-+#endif
-+ ],[
-+ PHP_PCRE_REGEX=yes
-+ ],[
-+ AC_EGREP_CPP(yes,[
-+#include <main/php_config.h>
-+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
-+yes
-+#endif
-+ ],[
-+ PHP_PCRE_REGEX=pecl
-+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
-+ ],[
-+ PHP_PCRE_REGEX=no
-+ ])
-+ ])
-+
- if test "$ext_shared" = "no"; then
- PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES)
- out="php_config.h"
-@@ -83,7 +107,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
- int foo(int x, ...) {
- va_list va;
- va_start(va, x);
-- va_arg(va, int);
- va_arg(va, char *);
- va_arg(va, double);
- return 0;
-@@ -334,6 +357,9 @@ PHP_ARG_WITH(onig, [for external oniguru
- [ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
- If DIR is not set, the bundled oniguruma will be used], no, no)
-
-+PHP_ARG_WITH(pcre-dir, pcre install prefix,
-+[ --with-pcre-dir MBSTRING: pcre install prefix], no, no)
-+
- if test "$PHP_MBSTRING" != "no"; then
- AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support])
-
diff --git a/converters/php73-recode/Makefile b/converters/php73-recode/Makefile
deleted file mode 100644
index 4da221ba4dd2..000000000000
--- a/converters/php73-recode/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= converters
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -recode
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/Makefile b/databases/Makefile
index 16f6d6545717..32118712a0fe 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -611,19 +611,6 @@
SUBDIR += pguri
SUBDIR += php-tarantool
SUBDIR += php-xapian
- SUBDIR += php73-dba
- SUBDIR += php73-interbase
- SUBDIR += php73-mysqli
- SUBDIR += php73-odbc
- SUBDIR += php73-pdo
- SUBDIR += php73-pdo_dblib
- SUBDIR += php73-pdo_firebird
- SUBDIR += php73-pdo_mysql
- SUBDIR += php73-pdo_odbc
- SUBDIR += php73-pdo_pgsql
- SUBDIR += php73-pdo_sqlite
- SUBDIR += php73-pgsql
- SUBDIR += php73-sqlite3
SUBDIR += php74-dba
SUBDIR += php74-mysqli
SUBDIR += php74-odbc
diff --git a/databases/php73-dba/Makefile b/databases/php73-dba/Makefile
deleted file mode 100644
index 67ed60156443..000000000000
--- a/databases/php73-dba/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -dba
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-dba/files/patch-config.m4 b/databases/php73-dba/files/patch-config.m4
deleted file mode 100644
index 30f662138374..000000000000
--- a/databases/php73-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/php73-interbase/Makefile b/databases/php73-interbase/Makefile
deleted file mode 100644
index 0f68cf2debdb..000000000000
--- a/databases/php73-interbase/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -interbase
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-mysqli/Makefile b/databases/php73-mysqli/Makefile
deleted file mode 100644
index 58bee3cb2049..000000000000
--- a/databases/php73-mysqli/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -mysqli
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-mysqli/files/patch-mysqli__api.c b/databases/php73-mysqli/files/patch-mysqli__api.c
deleted file mode 100644
index 2d88e061f9da..000000000000
--- a/databases/php73-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/php73-odbc/Makefile b/databases/php73-odbc/Makefile
deleted file mode 100644
index 7029e192cd95..000000000000
--- a/databases/php73-odbc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -odbc
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-odbc/files/patch-config.m4 b/databases/php73-odbc/files/patch-config.m4
deleted file mode 100644
index 46e76eeaab8e..000000000000
--- a/databases/php73-odbc/files/patch-config.m4
+++ /dev/null
@@ -1,111 +0,0 @@
---- config.m4.orig 2018-09-25 09:07:57 UTC
-+++ config.m4
-@@ -97,6 +97,9 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS
- dnl
- dnl configure options
- dnl
-+PHP_ARG_ENABLE(odbc,,
-+[ --enable-odbc Enable ODBC support with selected driver])
-+
-
- PHP_ARG_WITH(odbcver,,
- [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0350.
-@@ -104,7 +107,7 @@ PHP_ARG_WITH(odbcver,,
-
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(adabas,,
--[ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
-+[ --with-adabas[=DIR] Include Adabas D support [/usr/local]], no, no)
-
- AC_MSG_CHECKING([for Adabas support])
- if test "$PHP_ADABAS" != "no"; then
-@@ -133,7 +136,7 @@ fi
-
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(sapdb,,
--[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]])
-+[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]], no, no)
-
- AC_MSG_CHECKING([for SAP DB support])
- if test "$PHP_SAPDB" != "no"; then
-@@ -153,7 +156,7 @@ fi
-
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(solid,,
--[ --with-solid[=DIR] Include Solid support [/usr/local/solid]])
-+[ --with-solid[=DIR] Include Solid support [/usr/local/solid]], no, no)
-
- AC_MSG_CHECKING(for Solid support)
- if test "$PHP_SOLID" != "no"; then
-@@ -180,7 +183,7 @@ fi
-
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(ibm-db2,,
--[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]])
-+[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]], no, no)
-
- AC_MSG_CHECKING(for IBM DB2 support)
- if test "$PHP_IBM_DB2" != "no"; then
-@@ -220,7 +223,7 @@ fi
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(empress,,
- [ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH]
-- (Empress Version >= 8.60 required)])
-+ (Empress Version >= 8.60 required)], no, no)
-
- AC_MSG_CHECKING(for Empress support)
- if test "$PHP_EMPRESS" != "no"; then
-@@ -245,7 +248,7 @@ fi
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(empress-bcs,,
- [ --with-empress-bcs[=DIR] Include Empress Local Access support [\$EMPRESSPATH]
-- (Empress Version >= 8.60 required)])
-+ (Empress Version >= 8.60 required)], no, no)
-
- AC_MSG_CHECKING(for Empress local access support)
- if test "$PHP_EMPRESS_BCS" != "no"; then
-@@ -292,7 +295,7 @@ PHP_ARG_WITH(custom-odbc,,
- running this configure script:
- CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
- LDFLAGS=-lunix
-- CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"])
-+ CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no)
-
- AC_MSG_CHECKING(for a custom ODBC support)
- if test "$PHP_CUSTOM_ODBC" != "no"; then
-@@ -314,7 +317,7 @@ fi
-
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(iodbc,,
--[ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
-+[ --with-iodbc[=DIR] Include iODBC support [/usr/local]], no, no)
-
- AC_MSG_CHECKING(for iODBC support)
- if test "$PHP_IODBC" != "no"; then
-@@ -352,7 +355,7 @@ fi
-
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(esoob,,
--[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]])
-+[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no)
-
- AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
- if test "$PHP_ESOOB" != "no"; then
-@@ -374,7 +377,7 @@ fi
-
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(unixODBC,,
--[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]])
-+[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]], no, no)
-
- AC_MSG_CHECKING(for unixODBC support)
- if test "$PHP_UNIXODBC" != "no"; then
-@@ -397,7 +400,7 @@ fi
-
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(dbmaker,,
--[ --with-dbmaker[=DIR] Include DBMaker support])
-+[ --with-dbmaker[=DIR] Include DBMaker support], no, no)
-
- AC_MSG_CHECKING(for DBMaker support)
- if test "$PHP_DBMAKER" != "no"; then
diff --git a/databases/php73-pdo/Makefile b/databases/php73-pdo/Makefile
deleted file mode 100644
index 175be7b29c4e..000000000000
--- a/databases/php73-pdo/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -pdo
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-pdo_dblib/Makefile b/databases/php73-pdo_dblib/Makefile
deleted file mode 100644
index 5f41c6770941..000000000000
--- a/databases/php73-pdo_dblib/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -pdo_dblib
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-pdo_firebird/Makefile b/databases/php73-pdo_firebird/Makefile
deleted file mode 100644
index 307adfda9332..000000000000
--- a/databases/php73-pdo_firebird/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -pdo_firebird
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-pdo_mysql/Makefile b/databases/php73-pdo_mysql/Makefile
deleted file mode 100644
index ac7815140256..000000000000
--- a/databases/php73-pdo_mysql/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -pdo_mysql
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-pdo_odbc/Makefile b/databases/php73-pdo_odbc/Makefile
deleted file mode 100644
index f4f0cf9586a2..000000000000
--- a/databases/php73-pdo_odbc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -pdo_odbc
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-pdo_pgsql/Makefile b/databases/php73-pdo_pgsql/Makefile
deleted file mode 100644
index a9858d7b558b..000000000000
--- a/databases/php73-pdo_pgsql/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -pdo_pgsql
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-pdo_sqlite/Makefile b/databases/php73-pdo_sqlite/Makefile
deleted file mode 100644
index 8f1a48880e24..000000000000
--- a/databases/php73-pdo_sqlite/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -pdo_sqlite
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-pgsql/Makefile b/databases/php73-pgsql/Makefile
deleted file mode 100644
index 6b1dfe27ca05..000000000000
--- a/databases/php73-pgsql/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -pgsql
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-sqlite3/Makefile b/databases/php73-sqlite3/Makefile
deleted file mode 100644
index ab24fa4a69c9..000000000000
--- a/databases/php73-sqlite3/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= databases
*** 3310 LINES SKIPPED ***