Date: Sun, 25 Dec 2022 19:36:48 GMT 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: 0d310d700aa0 - main - */*php74*: Sunset php 7.4 Message-ID: <202212251936.2BPJamUV086309@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d310d700aa060b02feec9c7487893a983bf7098 commit 0d310d700aa060b02feec9c7487893a983bf7098 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2022-12-25 19:34:18 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2022-12-25 19:36:42 +0000 */*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 --- MOVED | 62 +++ Mk/Uses/php.mk | 22 +- Mk/bsd.default-versions.mk | 2 +- archivers/Makefile | 4 - archivers/php74-bz2/Makefile | 9 - archivers/php74-phar/Makefile | 9 - archivers/php74-phar/files/patch-config.m4 | 41 -- archivers/php74-zip/Makefile | 9 - archivers/php74-zlib/Makefile | 9 - archivers/php74-zlib/files/patch-zlib.c | 10 - converters/Makefile | 2 - converters/php74-iconv/Makefile | 9 - converters/php74-mbstring/Makefile | 9 - converters/php74-mbstring/files/patch-config.m4 | 44 -- databases/Makefile | 12 - databases/php74-dba/Makefile | 9 - databases/php74-dba/files/patch-config.m4 | 50 -- databases/php74-mysqli/Makefile | 9 - databases/php74-mysqli/files/patch-mysqli__api.c | 13 - .../php74-mysqli/files/patch-php_mysqli_structs.h | 20 - databases/php74-odbc/Makefile | 9 - databases/php74-odbc/files/patch-config.m4 | 111 ----- databases/php74-pdo/Makefile | 9 - databases/php74-pdo_dblib/Makefile | 9 - databases/php74-pdo_firebird/Makefile | 9 - databases/php74-pdo_mysql/Makefile | 9 - databases/php74-pdo_odbc/Makefile | 9 - databases/php74-pdo_pgsql/Makefile | 9 - databases/php74-pdo_sqlite/Makefile | 9 - databases/php74-pgsql/Makefile | 9 - databases/php74-sqlite3/Makefile | 9 - devel/Makefile | 11 - devel/php74-ffi/Makefile | 9 - devel/php74-gettext/Makefile | 9 - devel/php74-intl/Makefile | 14 - devel/php74-intl/files/patch-icu68 | 213 -------- devel/php74-json/Makefile | 9 - devel/php74-json/files/patch-Makefile.frag | 9 - devel/php74-pcntl/Makefile | 9 - devel/php74-readline/Makefile | 9 - devel/php74-readline/files/patch-config.m4 | 33 -- devel/php74-readline/files/patch-readline_cli.c | 13 - devel/php74-shmop/Makefile | 9 - devel/php74-sysvmsg/Makefile | 9 - devel/php74-sysvsem/Makefile | 9 - devel/php74-sysvshm/Makefile | 9 - devel/php74-tokenizer/Makefile | 9 - ftp/Makefile | 2 - ftp/php74-curl/Makefile | 9 - ftp/php74-ftp/Makefile | 13 - graphics/Makefile | 2 - graphics/php74-exif/Makefile | 9 - graphics/php74-gd/Makefile | 11 - graphics/php74-gd/files/patch-gd.c | 74 --- lang/Makefile | 2 - lang/php74-extensions/Makefile | 113 ----- lang/php74-extensions/pkg-descr | 5 - lang/php74/Makefile | 160 ------ lang/php74/Makefile.ext | 553 --------------------- lang/php74/distinfo | 3 - lang/php74/files/patch-build_Makefile.global | 19 - lang/php74/files/patch-configure.ac | 45 -- lang/php74/files/patch-ext_mysqli_mysqli__api.c | 13 - lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c | 12 - lang/php74/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/php74/files/patch-sapi_fpm_config.m4 | 11 - lang/php74/files/patch-sapi_fpm_www.conf.in | 17 - lang/php74/files/php-fpm.in | 66 --- lang/php74/pkg-descr | 6 - lang/php74/pkg-message.mod | 19 - lang/php74/pkg-plist | 282 ----------- lang/php74/pkg-plist.mod | 3 - mail/Makefile | 1 - mail/php74-imap/Makefile | 9 - mail/php74-imap/files/patch-config.m4 | 47 -- math/Makefile | 2 - math/php74-bcmath/Makefile | 9 - math/php74-gmp/Makefile | 9 - misc/Makefile | 1 - misc/php74-calendar/Makefile | 9 - net-mgmt/Makefile | 1 - net-mgmt/php74-snmp/Makefile | 9 - net/Makefile | 4 - net/php74-ldap/Makefile | 9 - net/php74-soap/Makefile | 9 - net/php74-sockets/Makefile | 9 - net/php74-xmlrpc/Makefile | 9 - net/php74-xmlrpc/files/patch-config.m4 | 23 - security/Makefile | 3 - security/php74-filter/Makefile | 9 - security/php74-openssl/Makefile | 9 - security/php74-sodium/Makefile | 9 - sysutils/Makefile | 2 - sysutils/php74-fileinfo/Makefile | 9 - sysutils/php74-fileinfo/files/patch-config.m4 | 21 - sysutils/php74-posix/Makefile | 9 - sysutils/php74-posix/files/patch-posix.c | 38 -- textproc/Makefile | 9 - textproc/php74-ctype/Makefile | 9 - textproc/php74-dom/Makefile | 9 - textproc/php74-enchant/Makefile | 9 - textproc/php74-pspell/Makefile | 9 - textproc/php74-simplexml/Makefile | 9 - textproc/php74-simplexml/files/patch-config.m4 | 42 -- textproc/php74-xml/Makefile | 9 - textproc/php74-xml/files/patch-compat.c | 13 - textproc/php74-xmlreader/Makefile | 9 - textproc/php74-xmlwriter/Makefile | 9 - textproc/php74-xsl/Makefile | 9 - textproc/php74-xsl/files/patch-php_xsl.h | 11 - www/Makefile | 4 - www/mod_php74/Makefile | 15 - www/php74-opcache/Makefile | 11 - www/php74-session/Makefile | 9 - www/php74-tidy/Makefile | 9 - 118 files changed, 65 insertions(+), 2840 deletions(-) diff --git a/MOVED b/MOVED index 61931af07ada..af727ba51662 100644 --- a/MOVED +++ b/MOVED @@ -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 *** 2913 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212251936.2BPJamUV086309>