diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2018-12-05 15:46:02 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2018-12-05 15:46:02 +0000 |
| commit | 1aaf1022212ac028c4fe22853aa76969437039ee (patch) | |
| tree | 5737ff9d04cf33dfa35a21f4ffa1df3be2880c55 | |
| parent | devel/py-prompt_toolkit2: create port (diff) | |
Remove expired ports:
2018-12-04 archivers/php70-bz2: Security Support ends on 3 Dec 2018
2018-12-04 archivers/php70-phar: Security Support ends on 3 Dec 2018
2018-12-04 archivers/php70-zip: Security Support ends on 3 Dec 2018
2018-12-04 archivers/php70-zlib: Security Support ends on 3 Dec 2018
2018-12-04 converters/php70-iconv: Security Support ends on 3 Dec 2018
2018-12-04 converters/php70-mbstring: Security Support ends on 3 Dec 2018
2018-12-04 converters/php70-recode: Security Support ends on 3 Dec 2018
2018-12-04 databases/php70-dba: Security Support ends on 3 Dec 2018
2018-12-04 databases/php70-interbase: Security Support ends on 3 Dec 2018
2018-12-04 databases/php70-mysqli: Security Support ends on 3 Dec 2018
2018-12-04 databases/php70-odbc: Security Support ends on 3 Dec 2018
2018-12-04 databases/php70-pdo: Security Support ends on 3 Dec 2018
2018-12-04 databases/php70-pdo_dblib: Security Support ends on 3 Dec 2018
2018-12-04 databases/php70-pdo_firebird: Security Support ends on 3 Dec 2018
2018-12-04 databases/php70-pdo_mysql: Security Support ends on 3 Dec 2018
2018-12-04 databases/php70-pdo_odbc: Security Support ends on 3 Dec 2018
2018-12-04 databases/php70-pdo_pgsql: Security Support ends on 3 Dec 2018
2018-12-04 databases/php70-pdo_sqlite: Security Support ends on 3 Dec 2018
2018-12-04 databases/php70-pgsql: Security Support ends on 3 Dec 2018
2018-12-04 databases/php70-sqlite3: Security Support ends on 3 Dec 2018
2018-12-04 devel/php70-gettext: Security Support ends on 3 Dec 2018
2018-12-04 devel/php70-intl: Security Support ends on 3 Dec 2018
2018-12-04 devel/php70-json: Security Support ends on 3 Dec 2018
2018-12-04 devel/php70-pcntl: Security Support ends on 3 Dec 2018
2018-12-04 devel/php70-readline: Security Support ends on 3 Dec 2018
2018-12-04 devel/php70-shmop: Security Support ends on 3 Dec 2018
2018-12-04 devel/php70-sysvmsg: Security Support ends on 3 Dec 2018
2018-12-04 devel/php70-sysvsem: Security Support ends on 3 Dec 2018
2018-12-04 devel/php70-sysvshm: Security Support ends on 3 Dec 2018
2018-12-04 devel/php70-tokenizer: Security Support ends on 3 Dec 2018
2018-12-04 ftp/php70-curl: Security Support ends on 3 Dec 2018
2018-12-04 ftp/php70-ftp: Security Support ends on 3 Dec 2018
2018-12-04 graphics/php70-exif: Security Support ends on 3 Dec 2018
2018-12-04 graphics/php70-gd: Security Support ends on 3 Dec 2018
2018-12-04 mail/php70-imap: Security Support ends on 3 Dec 2018
2018-12-04 misc/php70-calendar: Security Support ends on 3 Dec 2018
2018-12-04 net/php70-ldap: Security Support ends on 3 Dec 2018
2018-12-04 net/php70-soap: Security Support ends on 3 Dec 2018
2018-12-04 net/php70-sockets: Security Support ends on 3 Dec 2018
2018-12-04 net/php70-xmlrpc: Security Support ends on 3 Dec 2018
2018-12-04 net-mgmt/php70-snmp: Security Support ends on 3 Dec 2018
2018-12-04 sysutils/php70-fileinfo: Security Support ends on 3 Dec 2018
2018-12-04 sysutils/php70-posix: Security Support ends on 3 Dec 2018
2018-12-04 security/php70-filter: Security Support ends on 3 Dec 2018
2018-12-04 security/php70-hash: Security Support ends on 3 Dec 2018
2018-12-04 security/php70-mcrypt: Security Support ends on 3 Dec 2018
2018-12-04 security/php70-openssl: Security Support ends on 3 Dec 2018
2018-12-04 textproc/php70-ctype: Security Support ends on 3 Dec 2018
2018-12-04 textproc/php70-dom: Security Support ends on 3 Dec 2018
2018-12-04 textproc/php70-enchant: Security Support ends on 3 Dec 2018
2018-12-04 textproc/php70-pspell: Security Support ends on 3 Dec 2018
2018-12-04 textproc/php70-simplexml: Security Support ends on 3 Dec 2018
2018-12-04 textproc/php70-wddx: Security Support ends on 3 Dec 2018
2018-12-04 textproc/php70-xml: Security Support ends on 3 Dec 2018
2018-12-04 textproc/php70-xmlreader: Security Support ends on 3 Dec 2018
2018-12-04 textproc/php70-xmlwriter: Security Support ends on 3 Dec 2018
2018-12-04 textproc/php70-xsl: Security Support ends on 3 Dec 2018
2018-12-04 www/mod_php70: Security Support ends on 3 Dec 2018
2018-12-04 www/php70-opcache: Security Support ends on 3 Dec 2018
2018-12-04 www/php70-session: Security Support ends on 3 Dec 2018
2018-12-04 www/php70-tidy: Security Support ends on 3 Dec 2018
103 files changed, 61 insertions, 1514 deletions
@@ -10653,3 +10653,64 @@ devel/ztcl||2018-12-04|Has expired: Unfetchable, unmaintained, info page unbuild x11-toolkits/vtkfox||2018-12-05|Has expired: Depends on expiring vtk5 lang/php70-extensions|lang/php72-extensions|2018-12-05|Has expired: Works only with EOL php 7.0 math/vtk5|math/vtk6|2018-12-05|Has expired: Broken, unmaintained +archivers/php70-bz2|archivers/php72-bz2|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +archivers/php70-phar|archivers/php72-phar|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +archivers/php70-zip|archivers/php72-zip|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +archivers/php70-zlib|archivers/php72-zlib|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +converters/php70-iconv|converters/php72-iconv|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +converters/php70-mbstring|converters/php72-mbstring|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +converters/php70-recode|converters/php72-recode|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +databases/php70-dba|databases/php72-dba|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +databases/php70-interbase|databases/php72-interbase|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +databases/php70-mysqli|databases/php72-mysqli|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +databases/php70-odbc|databases/php72-odbc|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +databases/php70-pdo|databases/php72-pdo|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +databases/php70-pdo_dblib|databases/php72-pdo_dblib|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +databases/php70-pdo_firebird|databases/php72-pdo_firebird|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +databases/php70-pdo_mysql|databases/php72-pdo_mysql|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +databases/php70-pdo_odbc|databases/php72-pdo_odbc|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +databases/php70-pdo_pgsql|databases/php72-pdo_pgsql|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +databases/php70-pdo_sqlite|databases/php72-pdo_sqlite|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +databases/php70-pgsql|databases/php72-pgsql|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +databases/php70-sqlite3|databases/php72-sqlite3|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +devel/php70-gettext|devel/php72-gettext|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +devel/php70-intl|devel/php72-intl|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +devel/php70-json|devel/php72-json|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +devel/php70-pcntl|devel/php72-pcntl|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +devel/php70-readline|devel/php72-readline|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +devel/php70-shmop|devel/php72-shmop|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +devel/php70-sysvmsg|devel/php72-sysvmsg|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +devel/php70-sysvsem|devel/php72-sysvsem|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +devel/php70-sysvshm|devel/php72-sysvshm|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +devel/php70-tokenizer|devel/php72-tokenizer|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +ftp/php70-curl|ftp/php72-curl|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +ftp/php70-ftp|ftp/php72-ftp|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +graphics/php70-exif|graphics/php72-exif|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +graphics/php70-gd|graphics/php72-gd|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +mail/php70-imap|mail/php72-imap|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +misc/php70-calendar|misc/php72-calendar|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +net/php70-ldap|net/php72-ldap|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +net/php70-soap|net/php72-soap|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +net/php70-sockets|net/php72-sockets|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +net/php70-xmlrpc|net/php72-xmlrpc|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +net-mgmt/php70-snmp|net-mgmt/php72-snmp|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +sysutils/php70-fileinfo|sysutils/php72-fileinfo|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +sysutils/php70-posix|sysutils/php72-posix|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +security/php70-filter|security/php72-filter|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +security/php70-hash|security/php72-hash|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +security/php70-mcrypt|security/php72-sodium|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +security/php70-openssl|security/php72-openssl|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +textproc/php70-ctype|textproc/php72-ctype|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +textproc/php70-dom|textproc/php72-dom|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +textproc/php70-enchant|textproc/php72-enchant|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +textproc/php70-pspell|textproc/php72-pspell|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +textproc/php70-simplexml|textproc/php72-simplexml|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +textproc/php70-wddx|textproc/php72-wddx|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +textproc/php70-xml|textproc/php72-xml|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +textproc/php70-xmlreader|textproc/php72-xmlreader|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +textproc/php70-xmlwriter|textproc/php72-xmlwriter|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +textproc/php70-xsl|textproc/php72-xsl|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +www/mod_php70|www/mod_php72|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +www/php70-opcache|www/php72-opcache|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +www/php70-session|www/php72-session|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 +www/php70-tidy|www/php72-tidy|2018-12-05|Has expired: Security Support ends on 3 Dec 2018 diff --git a/archivers/Makefile b/archivers/Makefile index ad2c507c6fe5..732e3f816b7f 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -156,10 +156,6 @@ SUBDIR += php56-phar SUBDIR += php56-zip SUBDIR += php56-zlib - SUBDIR += php70-bz2 - SUBDIR += php70-phar - SUBDIR += php70-zip - SUBDIR += php70-zlib SUBDIR += php71-bz2 SUBDIR += php71-phar SUBDIR += php71-zip diff --git a/archivers/php70-bz2/Makefile b/archivers/php70-bz2/Makefile deleted file mode 100644 index aa6bad49b1a7..000000000000 --- a/archivers/php70-bz2/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -bz2 - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php70-phar/Makefile b/archivers/php70-phar/Makefile deleted file mode 100644 index 2c7881424839..000000000000 --- a/archivers/php70-phar/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -phar - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php70-phar/files/patch-config.m4 b/archivers/php70-phar/files/patch-config.m4 deleted file mode 100644 index 1aba3bd9a5a8..000000000000 --- a/archivers/php70-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/php70-phar/files/patch-phar.c b/archivers/php70-phar/files/patch-phar.c deleted file mode 100644 index e7ae6cb3328d..000000000000 --- a/archivers/php70-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/php70-zip/Makefile b/archivers/php70-zip/Makefile deleted file mode 100644 index 9b41f5cd92d8..000000000000 --- a/archivers/php70-zip/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -zip - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php70-zlib/Makefile b/archivers/php70-zlib/Makefile deleted file mode 100644 index 05853d17aaee..000000000000 --- a/archivers/php70-zlib/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -zlib - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php70-zlib/files/patch-zlib.c b/archivers/php70-zlib/files/patch-zlib.c deleted file mode 100644 index be02c50d1df6..000000000000 --- a/archivers/php70-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 03d607ece55f..27c5a276f3ec 100644 --- a/converters/Makefile +++ b/converters/Makefile @@ -143,9 +143,6 @@ SUBDIR += php56-iconv SUBDIR += php56-mbstring SUBDIR += php56-recode - SUBDIR += php70-iconv - SUBDIR += php70-mbstring - SUBDIR += php70-recode SUBDIR += php71-iconv SUBDIR += php71-mbstring SUBDIR += php71-recode diff --git a/converters/php70-iconv/Makefile b/converters/php70-iconv/Makefile deleted file mode 100644 index 89058d3eefa4..000000000000 --- a/converters/php70-iconv/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -iconv - -.include "${MASTERDIR}/Makefile" diff --git a/converters/php70-mbstring/Makefile b/converters/php70-mbstring/Makefile deleted file mode 100644 index 634120319c67..000000000000 --- a/converters/php70-mbstring/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -mbstring - -.include "${MASTERDIR}/Makefile" diff --git a/converters/php70-mbstring/files/patch-config.m4 b/converters/php70-mbstring/files/patch-config.m4 deleted file mode 100644 index 026798f26a5a..000000000000 --- a/converters/php70-mbstring/files/patch-config.m4 +++ /dev/null @@ -1,51 +0,0 @@ ---- config.m4.orig 2009-11-25 02:30:06.000000000 +0100 -+++ config.m4 2010-04-12 09:59:54.000000000 +0200 -@@ -43,6 +43,30 @@ - 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" -@@ -80,7 +104,6 @@ - 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; -@@ -347,6 +370,9 @@ - [ --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/php70-mbstring/files/patch-php__mbregex.c b/converters/php70-mbstring/files/patch-php__mbregex.c deleted file mode 100644 index c7bbf8b00f0b..000000000000 --- a/converters/php70-mbstring/files/patch-php__mbregex.c +++ /dev/null @@ -1,11 +0,0 @@ ---- php_mbregex.c.orig 2018-02-27 13:16:12 UTC -+++ php_mbregex.c -@@ -452,7 +452,7 @@ static php_mb_regex_t *php_mbregex_compi - OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN]; - - rc = zend_hash_str_find_ptr(&MBREX(ht_rc), (char *)pattern, patlen); -- if (!rc || rc->options != options || rc->enc != enc || rc->syntax != syntax) { -+ if (!rc || onig_get_options(rc) != options || onig_get_encoding(rc) != enc || onig_get_syntax(rc) != syntax) { - if ((err_code = onig_new(&retval, (OnigUChar *)pattern, (OnigUChar *)(pattern + patlen), options, enc, syntax, &err_info)) != ONIG_NORMAL) { - onig_error_code_to_str(err_str, err_code, &err_info); - php_error_docref(NULL, E_WARNING, "mbregex compile err: %s", err_str); diff --git a/converters/php70-recode/Makefile b/converters/php70-recode/Makefile deleted file mode 100644 index 5534d7173f41..000000000000 --- a/converters/php70-recode/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -recode - -.include "${MASTERDIR}/Makefile" diff --git a/databases/Makefile b/databases/Makefile index ea71d93404e0..07b4c7c1af2b 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -644,19 +644,6 @@ SUBDIR += php56-sqlite3 SUBDIR += php56-sybase_ct SUBDIR += php7-tarantool - SUBDIR += php70-dba - SUBDIR += php70-interbase - SUBDIR += php70-mysqli - SUBDIR += php70-odbc - SUBDIR += php70-pdo - SUBDIR += php70-pdo_dblib - SUBDIR += php70-pdo_firebird - SUBDIR += php70-pdo_mysql - SUBDIR += php70-pdo_odbc - SUBDIR += php70-pdo_pgsql - SUBDIR += php70-pdo_sqlite - SUBDIR += php70-pgsql - SUBDIR += php70-sqlite3 SUBDIR += php71-dba SUBDIR += php71-interbase SUBDIR += php71-mysqli diff --git a/databases/php70-dba/Makefile b/databases/php70-dba/Makefile deleted file mode 100644 index d330c3104c95..000000000000 --- a/databases/php70-dba/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -dba - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php70-dba/files/patch-config.m4 b/databases/php70-dba/files/patch-config.m4 deleted file mode 100644 index 30f662138374..000000000000 --- a/databases/php70-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/php70-interbase/Makefile b/databases/php70-interbase/Makefile deleted file mode 100644 index 2c0aa00a486c..000000000000 --- a/databases/php70-interbase/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -interbase - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php70-interbase/files/patch-interbase.c b/databases/php70-interbase/files/patch-interbase.c deleted file mode 100644 index 0f8791beb793..000000000000 --- a/databases/php70-interbase/files/patch-interbase.c +++ /dev/null @@ -1,11 +0,0 @@ ---- interbase.c.orig 2016-12-16 10:59:02 UTC -+++ interbase.c -@@ -940,7 +940,7 @@ static void _php_ibase_connect(INTERNAL_ - xlink = (zend_resource*) le->ptr; - if ((!persistent && xlink->type == le_link) || xlink->type == le_plink) { - if (IBG(default_link)) { -- zend_list_close(IBG(default_link)); -+ zend_list_delete(IBG(default_link)); - } - xlink->gc.refcount++; - xlink->gc.refcount++; diff --git a/databases/php70-mysqli/Makefile b/databases/php70-mysqli/Makefile deleted file mode 100644 index 5209eaeab888..000000000000 --- a/databases/php70-mysqli/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -mysqli - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php70-mysqli/files/patch-mysqli.c b/databases/php70-mysqli/files/patch-mysqli.c deleted file mode 100644 index 3d74731142b6..000000000000 --- a/databases/php70-mysqli/files/patch-mysqli.c +++ /dev/null @@ -1,11 +0,0 @@ ---- mysqli.c.orig 2016-12-06 18:05:01 UTC -+++ mysqli.c -@@ -703,7 +703,7 @@ PHP_MINIT_FUNCTION(mysqli) - #ifdef MYSQLND_STRING_TO_INT_CONVERSION - REGISTER_LONG_CONSTANT("MYSQLI_OPT_INT_AND_FLOAT_NATIVE", MYSQLND_OPT_INT_AND_FLOAT_NATIVE, CONST_CS | CONST_PERSISTENT); - #endif --#if MYSQL_VERSION_ID > 50110 || defined(MYSQLI_USE_MYSQLND) -+#if (MYSQL_VERSION_ID < 80000 && MYSQL_VERSION_ID > 50110) || defined(MYSQLI_USE_MYSQLND) - REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT); - #endif - diff --git a/databases/php70-mysqli/files/patch-php_mysqli_structs.h b/databases/php70-mysqli/files/patch-php_mysqli_structs.h deleted file mode 100644 index d0daeee9ee54..000000000000 --- a/databases/php70-mysqli/files/patch-php_mysqli_structs.h +++ /dev/null @@ -1,10 +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 -@@ -54,6 +54,7 @@ - #define WE_HAD_MBSTATE_T - #endif - -+#define HAVE_ULONG 1 - #include <my_global.h> - - #if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN) diff --git a/databases/php70-odbc/Makefile b/databases/php70-odbc/Makefile deleted file mode 100644 index b84c23d9d678..000000000000 --- a/databases/php70-odbc/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -odbc - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php70-odbc/files/patch-config.m4 b/databases/php70-odbc/files/patch-config.m4 deleted file mode 100644 index 742efcb7e881..000000000000 --- a/databases/php70-odbc/files/patch-config.m4 +++ /dev/null @@ -1,129 +0,0 @@ ---- config.m4.orig 2015-04-15 18:05:57.000000000 +0000 -+++ config.m4 2015-04-26 12:08:54.914235064 +0000 -@@ -100,13 +100,17 @@ - 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 0x0300. - Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300) - - 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 -@@ -135,7 +139,7 @@ - - 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 -@@ -155,7 +159,7 @@ - - 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 -@@ -182,7 +186,7 @@ - - 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 -@@ -221,7 +225,7 @@ - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(ODBCRouter,, --[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]]) -+[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]], no, no) - - AC_MSG_CHECKING(for ODBCRouter.com support) - if test "$PHP_ODBCROUTER" != "no"; then -@@ -244,7 +248,7 @@ - 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 -@@ -270,7 +274,7 @@ - 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 -@@ -310,7 +314,7 @@ - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(birdstep,, --[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]]) -+[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]], no, no) - - AC_MSG_CHECKING(for Birdstep support) - if test "$PHP_BIRDSTEP" != "no"; then -@@ -366,7 +370,7 @@ - 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 -@@ -388,7 +392,7 @@ - - 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 -@@ -426,7 +430,7 @@ - - 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 -@@ -448,7 +452,7 @@ - - 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 -@@ -471,7 +475,7 @@ - - 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/php70-pdo/Makefile b/databases/php70-pdo/Makefile deleted file mode 100644 index bc754645bb11..000000000000 --- a/databases/php70-pdo/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -pdo - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php70-pdo_dblib/Makefile b/databases/php70-pdo_dblib/Makefile deleted file mode 100644 index 07819840243e..000000000000 --- a/databases/php70-pdo_dblib/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -pdo_dblib - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php70-pdo_firebird/Makefile b/databases/php70-pdo_firebird/Makefile deleted file mode 100644 index 21bda3ad7a35..000000000000 --- a/databases/php70-pdo_firebird/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -pdo_firebird - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php70-pdo_mysql/Makefile b/databases/php70-pdo_mysql/Makefile deleted file mode 100644 index daf1a199b932..000000000000 --- a/databases/php70-pdo_mysql/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -pdo_mysql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php70-pdo_odbc/Makefile b/databases/php70-pdo_odbc/Makefile deleted file mode 100644 index c0a18286b2b7..000000000000 --- a/databases/php70-pdo_odbc/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -pdo_odbc - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php70-pdo_pgsql/Makefile b/databases/php70-pdo_pgsql/Makefile deleted file mode 100644 index 95e23d156a2e..000000000000 --- a/databases/php70-pdo_pgsql/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -pdo_pgsql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php70-pdo_sqlite/Makefile b/databases/php70-pdo_sqlite/Makefile deleted file mode 100644 index 709e3d52e341..000000000000 --- a/databases/php70-pdo_sqlite/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -pdo_sqlite - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php70-pgsql/Makefile b/databases/php70-pgsql/Makefile deleted file mode 100644 index e61c9681fa64..000000000000 --- a/databases/php70-pgsql/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -pgsql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php70-sqlite3/Makefile b/databases/php70-sqlite3/Makefile deleted file mode 100644 index 38f6b89d2080..000000000000 --- a/databases/php70-sqlite3/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -sqlite3 - -.include "${MASTERDIR}/Makefile" diff --git a/devel/Makefile b/devel/Makefile index 006ebc72380f..88682070d927 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4148,16 +4148,6 @@ SUBDIR += php56-sysvsem SUBDIR += php56-sysvshm SUBDIR += php56-tokenizer - SUBDIR += php70-gettext - SUBDIR += php70-intl - SUBDIR += php70-json - SUBDIR += php70-pcntl - SUBDIR += php70-readline - SUBDIR += php70-shmop - SUBDIR += php70-sysvmsg - SUBDIR += php70-sysvsem - SUBDIR += php70-sysvshm - SUBDIR += php70-tokenizer SUBDIR += php71-gettext SUBDIR += php71-intl SUBDIR += php71-json diff --git a/devel/php70-gettext/Makefile b/devel/php70-gettext/Makefile deleted file mode 100644 index 9d558beeaffd..000000000000 --- a/devel/php70-gettext/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -gettext - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php70-intl/Makefile b/devel/php70-intl/Makefile deleted file mode 100644 index 26d286e49a0a..000000000000 --- a/devel/php70-intl/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -PORTREVISION= 1 -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -intl - -USES= compiler:c++11-lib -USE_CXXSTD= gnu++11 - -CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php70-json/Makefile b/devel/php70-json/Makefile deleted file mode 100644 index c796d6618727..000000000000 --- a/devel/php70-json/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -json - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php70-pcntl/Makefile b/devel/php70-pcntl/Makefile deleted file mode 100644 index 88849b57c2c5..000000000000 --- a/devel/php70-pcntl/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -pcntl - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php70-readline/Makefile b/devel/php70-readline/Makefile deleted file mode 100644 index 72efa2395e67..000000000000 --- a/devel/php70-readline/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -readline - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php70-readline/files/patch-config.m4 b/devel/php70-readline/files/patch-config.m4 deleted file mode 100644 index 5edf376bf0e2..000000000000 --- a/devel/php70-readline/files/patch-config.m4 +++ /dev/null @@ -1,38 +0,0 @@ ---- config.m4.orig 2013-08-20 06:46:43.000000000 +0200 -+++ config.m4 2013-08-27 16:01:29.000000000 +0200 -@@ -5,13 +5,8 @@ - PHP_ARG_WITH(libedit,for libedit readline replacement, - [ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) - --if test "$PHP_LIBEDIT" = "no"; then - PHP_ARG_WITH(readline,for readline support, - [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) --else -- dnl "register" the --with-readline option to preven invalid "unknown configure option" warning -- php_with_readline=no --fi - - if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then - for i in $PHP_READLINE /usr/local /usr; do -@@ -67,6 +62,13 @@ - -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS - ]) - -+ PHP_CHECK_LIBRARY(readline, rl_completion_matches, -+ [ -+ AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ]) -+ ],[],[ -+ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS -+ ]) -+ - AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) - - elif test "$PHP_LIBEDIT" != "no"; then -@@ -118,7 +120,6 @@ - fi - - if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then -- AC_CHECK_FUNCS([rl_completion_matches]) - PHP_NEW_EXTENSION(readline, readline.c readline_cli.c, $ext_shared, cli) - PHP_SUBST(READLINE_SHARED_LIBADD) - fi diff --git a/devel/php70-readline/files/patch-readline_cli.c b/devel/php70-readline/files/patch-readline_cli.c deleted file mode 100644 index 02f55974f9b0..000000000000 --- a/devel/php70-readline/files/patch-readline_cli.c +++ /dev/null @@ -1,13 +0,0 @@ ---- readline_cli.c.orig 2012-03-02 16:40:26.000000000 +0100 -+++ readline_cli.c 2012-03-02 16:40:43.000000000 +0100 -@@ -19,6 +19,10 @@ - - /* $Id: readline_cli.c 321634 2012-01-01 13:15:04Z felipe $ */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "php.h" - - #ifndef HAVE_RL_COMPLETION_MATCHES diff --git a/devel/php70-shmop/Makefile b/devel/php70-shmop/Makefile deleted file mode 100644 index b4039dc94582..000000000000 --- a/devel/php70-shmop/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -shmop - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php70-sysvmsg/Makefile b/devel/php70-sysvmsg/Makefile deleted file mode 100644 index 36a827cb48ed..000000000000 --- a/devel/php70-sysvmsg/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -sysvmsg - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php70-sysvsem/Makefile b/devel/php70-sysvsem/Makefile deleted file mode 100644 index 92c9b46fe47c..000000000000 --- a/devel/php70-sysvsem/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -sysvsem - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php70-sysvshm/Makefile b/devel/php70-sysvshm/Makefile deleted file mode 100644 index b6ec845a8084..000000000000 --- a/devel/php70-sysvshm/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -sysvshm - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php70-tokenizer/Makefile b/devel/php70-tokenizer/Makefile deleted file mode 100644 index 9a4351c978b3..000000000000 --- a/devel/php70-tokenizer/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -tokenizer - -.include "${MASTERDIR}/Makefile" diff --git a/ftp/Makefile b/ftp/Makefile index 0f58d09ff8f1..d0bb70a185dc 100644 --- a/ftp/Makefile +++ b/ftp/Makefile @@ -65,8 +65,6 @@ SUBDIR += php-fastdfs SUBDIR += php56-curl SUBDIR += php56-ftp - SUBDIR += php70-curl - SUBDIR += php70-ftp SUBDIR += php71-curl SUBDIR += php71-ftp SUBDIR += php72-curl diff --git a/ftp/php70-curl/Makefile b/ftp/php70-curl/Makefile deleted file mode 100644 index 2c359ab82aca..000000000000 --- a/ftp/php70-curl/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= ftp - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -curl - -.include "${MASTERDIR}/Makefile" diff --git a/ftp/php70-ftp/Makefile b/ftp/php70-ftp/Makefile deleted file mode 100644 index 300d5b187c92..000000000000 --- a/ftp/php70-ftp/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= ftp - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -ftp - -post-patch: - @${REINPLACE_CMD} s/HAVE_OPENSSL_EXT/__FreeBSD__/ \ - ${WRKSRC}/ftp.* ${WRKSRC}/php_ftp.* - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/Makefile b/graphics/Makefile index 66e428dd4afd..4fd0fe5438fb 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -832,8 +832,6 @@ SUBDIR += php5-ffmpeg SUBDIR += php56-exif SUBDIR += php56-gd - SUBDIR += php70-exif - SUBDIR += php70-gd SUBDIR += php71-exif SUBDIR += php71-gd SUBDIR += php72-exif diff --git a/graphics/php70-exif/Makefile b/graphics/php70-exif/Makefile deleted file mode 100644 index b82d12848cce..000000000000 --- a/graphics/php70-exif/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= graphics - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -exif - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/php70-gd/Makefile b/graphics/php70-gd/Makefile deleted file mode 100644 index 66653c0ec3fe..000000000000 --- a/graphics/php70-gd/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= graphics - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -gd - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" - -LIB_DEPENDS+= libgd.so:graphics/gd diff --git a/graphics/php70-gd/files/patch-config.m4 b/graphics/php70-gd/files/patch-config.m4 deleted file mode 100644 index 2ec02bd68cdd..000000000000 --- a/graphics/php70-gd/files/patch-config.m4 +++ /dev/null @@ -1,28 +0,0 @@ ---- config.m4.orig 2018-07-17 11:06:34 UTC -+++ config.m4 -@@ -295,6 +295,7 @@ dnl enable the support in bundled GD library - - if test -n "$GD_XPM_DIR"; then - AC_DEFINE(HAVE_GD_XPM, 1, [ ]) -+ AC_DEFINE(HAVE_XPM, 1, [ ]) - GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM" - fi - -@@ -358,7 +359,7 @@ if test "$PHP_GD" != "no"; then - - if test "$GD_MODULE_TYPE" = "builtin"; then - PHP_ADD_BUILD_DIR($ext_builddir/libgd) -- GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" -+ GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS" - GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" - - PHP_TEST_BUILD(foobar, [], [ -@@ -366,7 +367,7 @@ if test "$PHP_GD" != "no"; then - ], [ $GD_SHARED_LIBADD ], [char foobar () {}]) - else - GD_HEADER_DIRS="ext/gd/" -- GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS" -+ GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS" - PHP_ADD_INCLUDE($GD_INCLUDE) - PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [ - AC_MSG_ERROR([GD build test failed. Please check the config.log for details.]) diff --git a/graphics/php70-gd/files/patch-gd.c b/graphics/php70-gd/files/patch-gd.c deleted file mode 100644 index e22089848bc1..000000000000 --- a/graphics/php70-gd/files/patch-gd.c +++ /dev/null @@ -1,83 +0,0 @@ ---- gd.c.orig 2018-07-17 11:06:34 UTC -+++ gd.c -@@ -53,7 +53,7 @@ - # include <Wingdi.h> - #endif - --#ifdef HAVE_GD_XPM -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - # include <X11/xpm.h> - #endif - -@@ -79,7 +79,7 @@ static int le_gd, le_gd_font; - # endif - #endif - --#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) - # include "X11/xpm.h" - #endif - -@@ -327,7 +327,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxbm, 0) - ZEND_ARG_INFO(0, filename) - ZEND_END_ARG_INFO() - --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0) - ZEND_ARG_INFO(0, filename) - ZEND_END_ARG_INFO() -@@ -901,7 +901,7 @@ const zend_function_entry gd_functions[] = { - #endif - PHP_FE(imagecreatefromwbmp, arginfo_imagecreatefromwbmp) - PHP_FE(imagecreatefromxbm, arginfo_imagecreatefromxbm) --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - PHP_FE(imagecreatefromxpm, arginfo_imagecreatefromxpm) - #endif - PHP_FE(imagecreatefromgd, arginfo_imagecreatefromgd) -@@ -1252,7 +1252,7 @@ PHP_MINFO_FUNCTION(gd) - php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString()); - #endif - php_info_print_table_row(2, "WBMP Support", "enabled"); --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - php_info_print_table_row(2, "XPM Support", "enabled"); - { - char tmp[12]; -@@ -1307,7 +1307,7 @@ PHP_FUNCTION(gd_info) - add_assoc_bool(return_value, "PNG Support", 0); - #endif - add_assoc_bool(return_value, "WBMP Support", 1); --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - add_assoc_bool(return_value, "XPM Support", 1); - #else - add_assoc_bool(return_value, "XPM Support", 0); -@@ -2147,7 +2147,7 @@ PHP_FUNCTION(imagetypes) - ret |= 4; - #endif - ret |= 8; --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - ret |= 16; - #endif - #ifdef HAVE_GD_WEBP -@@ -2397,7 +2397,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_P - case PHP_GDIMG_TYPE_GD2PART: - im = (*func_p)(fp, srcx, srcy, width, height); - break; --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - case PHP_GDIMG_TYPE_XPM: - im = gdImageCreateFromXpm(file); - break; -@@ -2479,7 +2479,7 @@ PHP_FUNCTION(imagecreatefromxbm) - } - /* }}} */ - --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - /* {{{ proto resource imagecreatefromxpm(string filename) - Create a new image from XPM file or URL */ - PHP_FUNCTION(imagecreatefromxpm) diff --git a/mail/Makefile b/mail/Makefile index 24db144e69d9..d5bbb59f1e8c 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -488,7 +488,6 @@ SUBDIR += pflogsumm SUBDIR += pfqueue SUBDIR += php56-imap - SUBDIR += php70-imap SUBDIR += php71-imap SUBDIR += php72-imap SUBDIR += php73-imap diff --git a/mail/php70-imap/Makefile b/mail/php70-imap/Makefile deleted file mode 100644 index 62821f877dba..000000000000 --- a/mail/php70-imap/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= mail -PORTREVISION= 1 - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -imap - -.include "${MASTERDIR}/Makefile" diff --git a/mail/php70-imap/files/patch-config.m4 b/mail/php70-imap/files/patch-config.m4 deleted file mode 100644 index ab7120b2c8c8..000000000000 --- a/mail/php70-imap/files/patch-config.m4 +++ /dev/null @@ -1,42 +0,0 @@ ---- config.m4.orig 2010-02-07 14:06:54.000000000 +0100 -+++ config.m4 2010-03-08 11:56:24.000000000 +0100 -@@ -103,6 +103,8 @@ - PHP_ARG_WITH(imap-ssl,for IMAP SSL support, - [ --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install prefix], no, no) - -+PHP_ARG_WITH(pcre-dir, pcre install prefix, -+[ --with-pcre-dir IMAP: pcre install prefix], no, no) - - if test "$PHP_IMAP" != "no"; then - PHP_SUBST(IMAP_SHARED_LIBADD) -@@ -119,6 +121,30 @@ - fi - done - -+ dnl This is PECL build, check if bundled PCRE library is used -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=$INCLUDES -+ AC_EGREP_CPP(yes,[ -+#include <main/php_config.h> -+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=yes -+ ],[ -+ AC_EGREP_CPP(yes,[ -+#include <main/php_config.h> -+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=pecl -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) -+ ],[ -+ PHP_PCRE_REGEX=no -+ ]) -+ ]) -+ - dnl Check for c-client version 2004 - AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [ - AC_DEFINE(HAVE_IMAP2004,1,[ ]) diff --git a/mail/php70-imap/files/patch-php__imap.c b/mail/php70-imap/files/patch-php__imap.c deleted file mode 100644 index faa12adafa16..000000000000 --- a/mail/php70-imap/files/patch-php__imap.c +++ /dev/null @@ -1,40 +0,0 @@ ---- php_imap.c.orig 2018-09-11 22:12:36 UTC -+++ php_imap.c -@@ -562,6 +562,15 @@ static const zend_module_dep imap_deps[] - }; - /* }}} */ - -+ -+/* {{{ PHP_INI -+ */ -+PHP_INI_BEGIN() -+STD_PHP_INI_BOOLEAN("imap.enable_insecure_rsh", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_rsh, zend_imap_globals, imap_globals) -+PHP_INI_END() -+/* }}} */ -+ -+ - /* {{{ imap_module_entry - */ - zend_module_entry imap_module_entry = { -@@ -835,6 +844,8 @@ PHP_MINIT_FUNCTION(imap) - { - unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY; - -+ REGISTER_INI_ENTRIES(); -+ - #ifndef PHP_WIN32 - mail_link(&unixdriver); /* link in the unix driver */ - mail_link(&mhdriver); /* link in the mh driver */ -@@ -1052,6 +1063,12 @@ PHP_MINIT_FUNCTION(imap) - GC_TEXTS texts - */ - -+ if (!IMAPG(enable_rsh)) { -+ /* disable SSH and RSH, see https://bugs.php.net/bug.php?id=77153 */ -+ mail_parameters (NIL, SET_RSHTIMEOUT, 0); -+ mail_parameters (NIL, SET_SSHTIMEOUT, 0); -+ } -+ - le_imap = zend_register_list_destructors_ex(mail_close_it, NULL, "imap", module_number); - return SUCCESS; - } diff --git a/mail/php70-imap/files/patch-php__imap.h b/mail/php70-imap/files/patch-php__imap.h deleted file mode 100644 index f27f888f2ee7..000000000000 --- a/mail/php70-imap/files/patch-php__imap.h +++ /dev/null @@ -1,10 +0,0 @@ ---- php_imap.h.orig 2018-09-11 22:12:36 UTC -+++ php_imap.h -@@ -214,6 +214,7 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) - #endif - /* php_stream for php_mail_gets() */ - php_stream *gets_stream; -+ zend_bool enable_rsh; - ZEND_END_MODULE_GLOBALS(imap) - - #ifdef ZTS diff --git a/misc/Makefile b/misc/Makefile index 43ef7e40a0e6..e69138ed7b93 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -400,7 +400,6 @@ SUBDIR += pecl-timezonedb SUBDIR += pfm SUBDIR += php56-calendar - SUBDIR += php70-calendar SUBDIR += php71-calendar SUBDIR += php72-calendar SUBDIR += php73-calendar diff --git a/misc/php70-calendar/Makefile b/misc/php70-calendar/Makefile deleted file mode 100644 index 2d8656e28ecb..000000000000 --- a/misc/php70-calendar/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= misc - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -calendar - -.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index 9bf3db12dd9a..acb8962307e7 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -288,7 +288,6 @@ SUBDIR += percona-monitoring-plugins SUBDIR += pftabled SUBDIR += php56-snmp - SUBDIR += php70-snmp SUBDIR += php71-snmp SUBDIR += php72-snmp SUBDIR += php73-snmp diff --git a/net-mgmt/php70-snmp/Makefile b/net-mgmt/php70-snmp/Makefile deleted file mode 100644 index 36711d739765..000000000000 --- a/net-mgmt/php70-snmp/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= net-mgmt - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -snmp - -.include "${MASTERDIR}/Makefile" diff --git a/net/Makefile b/net/Makefile index af92c172cc65..e1e54edba912 100644 --- a/net/Makefile +++ b/net/Makefile @@ -994,10 +994,6 @@ SUBDIR += php56-soap SUBDIR += php56-sockets SUBDIR += php56-xmlrpc - SUBDIR += php70-ldap - SUBDIR += php70-soap - SUBDIR += php70-sockets - SUBDIR += php70-xmlrpc SUBDIR += php71-ldap SUBDIR += php71-soap SUBDIR += php71-sockets diff --git a/net/php70-ldap/Makefile b/net/php70-ldap/Makefile deleted file mode 100644 index a268d1cbea1d..000000000000 --- a/net/php70-ldap/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -ldap - -.include "${MASTERDIR}/Makefile" diff --git a/net/php70-soap/Makefile b/net/php70-soap/Makefile deleted file mode 100644 index 1424930d27b7..000000000000 --- a/net/php70-soap/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -soap - -.include "${MASTERDIR}/Makefile" diff --git a/net/php70-sockets/Makefile b/net/php70-sockets/Makefile deleted file mode 100644 index 4afc3bfe9b47..000000000000 --- a/net/php70-sockets/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -sockets - -.include "${MASTERDIR}/Makefile" diff --git a/net/php70-xmlrpc/Makefile b/net/php70-xmlrpc/Makefile deleted file mode 100644 index 6faf6dac4808..000000000000 --- a/net/php70-xmlrpc/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -xmlrpc - -.include "${MASTERDIR}/Makefile" diff --git a/net/php70-xmlrpc/files/patch-config.m4 b/net/php70-xmlrpc/files/patch-config.m4 deleted file mode 100644 index d2dc85f26a48..000000000000 --- a/net/php70-xmlrpc/files/patch-config.m4 +++ /dev/null @@ -1,23 +0,0 @@ ---- config.m4.orig 2014-04-29 08:04:30.000000000 +0000 -+++ config.m4 2014-05-15 08:04:00.883004682 +0000 -@@ -61,11 +61,9 @@ if test "$PHP_XMLRPC" != "no"; then - fi - fi - -- dnl if iconv is shared or missing then we should build iconv ourselves -- if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then -- - if test "$PHP_ICONV_DIR" != "no"; then - PHP_ICONV=$PHP_ICONV_DIR -+ PHP_ADD_INCLUDE($PHP_ICONV_DIR/include) - fi - - if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then -@@ -75,7 +73,6 @@ if test "$PHP_XMLRPC" != "no"; then - PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ - AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) - ]) -- fi - fi - - if test "$PHP_XMLRPC" = "yes"; then diff --git a/security/Makefile b/security/Makefile index 1ededd8e1ad2..03418b800b4f 100644 --- a/security/Makefile +++ b/security/Makefile @@ -847,10 +847,6 @@ SUBDIR += php56-hash SUBDIR += php56-mcrypt SUBDIR += php56-openssl - SUBDIR += php70-filter - SUBDIR += php70-hash - SUBDIR += php70-mcrypt - SUBDIR += php70-openssl SUBDIR += php71-filter SUBDIR += php71-hash SUBDIR += php71-mcrypt diff --git a/security/php70-filter/Makefile b/security/php70-filter/Makefile deleted file mode 100644 index ccb288794c5e..000000000000 --- a/security/php70-filter/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -filter - -.include "${MASTERDIR}/Makefile" diff --git a/security/php70-filter/files/patch-config.m4 b/security/php70-filter/files/patch-config.m4 deleted file mode 100644 index ab64c6c9d5ad..000000000000 --- a/security/php70-filter/files/patch-config.m4 +++ /dev/null @@ -1,10 +0,0 @@ ---- config.m4.orig 2009-03-06 08:25:45.000000000 +0100 -+++ config.m4 2009-03-06 08:28:10.000000000 +0100 -@@ -32,6 +32,7 @@ - #endif - ],[ - PHP_PCRE_REGEX=pecl -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) - ],[ - PHP_PCRE_REGEX=no - ]) diff --git a/security/php70-hash/Makefile b/security/php70-hash/Makefile deleted file mode 100644 index 3ee94a424193..000000000000 --- a/security/php70-hash/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -hash - -.include "${MASTERDIR}/Makefile" diff --git a/security/php70-mcrypt/Makefile b/security/php70-mcrypt/Makefile deleted file mode 100644 index ac715c925209..000000000000 --- a/security/php70-mcrypt/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -mcrypt - -.include "${MASTERDIR}/Makefile" diff --git a/security/php70-openssl/Makefile b/security/php70-openssl/Makefile deleted file mode 100644 index 7759e22394e8..000000000000 --- a/security/php70-openssl/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -openssl - -.include "${MASTERDIR}/Makefile" diff --git a/security/php70-openssl/files/patch-openssl.c b/security/php70-openssl/files/patch-openssl.c deleted file mode 100644 index 7dce8bd80c65..000000000000 --- a/security/php70-openssl/files/patch-openssl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- openssl.c.orig 2018-03-27 13:10:48 UTC -+++ openssl.c -@@ -566,7 +566,7 @@ ZEND_GET_MODULE(openssl) - #endif - - /* {{{ OpenSSL compatibility functions and macros */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L ) - #define EVP_PKEY_get0_RSA(_pkey) _pkey->pkey.rsa - #define EVP_PKEY_get0_DH(_pkey) _pkey->pkey.dh - #define EVP_PKEY_get0_DSA(_pkey) _pkey->pkey.dsa diff --git a/sysutils/Makefile b/sysutils/Makefile index bc13dafdd082..1e9f8547cb59 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -910,8 +910,6 @@ SUBDIR += phantom SUBDIR += php56-fileinfo SUBDIR += php56-posix - SUBDIR += php70-fileinfo - SUBDIR += php70-posix SUBDIR += php71-fileinfo SUBDIR += php71-posix SUBDIR += php72-fileinfo diff --git a/sysutils/php70-fileinfo/Makefile b/sysutils/php70-fileinfo/Makefile deleted file mode 100644 index 2f6c293c4be9..000000000000 --- a/sysutils/php70-fileinfo/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= sysutils - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -fileinfo - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/php70-fileinfo/files/patch-config.m4 b/sysutils/php70-fileinfo/files/patch-config.m4 deleted file mode 100644 index 1348023ccf64..000000000000 --- a/sysutils/php70-fileinfo/files/patch-config.m4 +++ /dev/null @@ -1,21 +0,0 @@ ---- config.m4.orig 2010-09-07 15:45:30.000000000 +0200 -+++ config.m4 2010-09-07 15:46:50.000000000 +0200 -@@ -4,6 +4,9 @@ - PHP_ARG_ENABLE(fileinfo, for fileinfo support, - [ --disable-fileinfo Disable fileinfo support], yes) - -+PHP_ARG_WITH(pcre-dir, pcre install prefix, -+[ --with-pcre-dir FILEINFO: pcre install prefix], no, no) -+ - if test "$PHP_FILEINFO" != "no"; then - - libmagic_sources=" \ -@@ -13,6 +16,8 @@ - libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ - libmagic/readcdf.c libmagic/readelf.c libmagic/softmagic.c" - -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) -+ - PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) - PHP_ADD_BUILD_DIR($ext_builddir/libmagic) - diff --git a/sysutils/php70-posix/Makefile b/sysutils/php70-posix/Makefile deleted file mode 100644 index 45f5903d1a7f..000000000000 --- a/sysutils/php70-posix/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= sysutils - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -posix - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/php70-posix/files/patch-posix.c b/sysutils/php70-posix/files/patch-posix.c deleted file mode 100644 index d2365b249569..000000000000 --- a/sysutils/php70-posix/files/patch-posix.c +++ /dev/null @@ -1,38 +0,0 @@ ---- posix.c.orig Fri Feb 23 00:40:39 2007 -+++ posix.c Sun May 13 17:52:27 2007 -@@ -838,7 +838,7 @@ - #if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX) - buflen = sysconf(_SC_GETGR_R_SIZE_MAX); - if (buflen < 1) { -- RETURN_FALSE; -+ buflen = 1024; - } - buf = emalloc(buflen); - g = &gbuf; -@@ -888,7 +888,7 @@ - - grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX); - if (grbuflen < 1) { -- RETURN_FALSE; -+ grbuflen = 1024; - } - - grbuf = emalloc(grbuflen); -@@ -955,7 +955,7 @@ - #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R) - buflen = sysconf(_SC_GETPW_R_SIZE_MAX); - if (buflen < 1) { -- RETURN_FALSE; -+ buflen = 1024; - } - buf = emalloc(buflen); - pw = &pwbuf; -@@ -1004,7 +1004,7 @@ - #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R) - pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); - if (pwbuflen < 1) { -- RETURN_FALSE; -+ pwbuflen = 1024; - } - pwbuf = emalloc(pwbuflen); - diff --git a/textproc/Makefile b/textproc/Makefile index 65e7e0aace7f..2c82e21b44f6 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1227,16 +1227,6 @@ SUBDIR += php56-xmlreader SUBDIR += php56-xmlwriter SUBDIR += php56-xsl - SUBDIR += php70-ctype - SUBDIR += php70-dom - SUBDIR += php70-enchant - SUBDIR += php70-pspell - SUBDIR += php70-simplexml - SUBDIR += php70-wddx - SUBDIR += php70-xml - SUBDIR += php70-xmlreader - SUBDIR += php70-xmlwriter - SUBDIR += php70-xsl SUBDIR += php71-ctype SUBDIR += php71-dom SUBDIR += php71-enchant diff --git a/textproc/php70-ctype/Makefile b/textproc/php70-ctype/Makefile deleted file mode 100644 index f6833afb0e77..000000000000 --- a/textproc/php70-ctype/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -ctype - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php70-dom/Makefile b/textproc/php70-dom/Makefile deleted file mode 100644 index 9c5b18115755..000000000000 --- a/textproc/php70-dom/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -dom - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php70-enchant/Makefile b/textproc/php70-enchant/Makefile deleted file mode 100644 index 8fafbcb9f955..000000000000 --- a/textproc/php70-enchant/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -enchant - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php70-pspell/Makefile b/textproc/php70-pspell/Makefile deleted file mode 100644 index a2978e35831b..000000000000 --- a/textproc/php70-pspell/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -pspell - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php70-simplexml/Makefile b/textproc/php70-simplexml/Makefile deleted file mode 100644 index a4d88cb47a12..000000000000 --- a/textproc/php70-simplexml/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -simplexml - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php70-simplexml/files/patch-config.m4 b/textproc/php70-simplexml/files/patch-config.m4 deleted file mode 100644 index 4eeef697dc87..000000000000 --- a/textproc/php70-simplexml/files/patch-config.m4 +++ /dev/null @@ -1,43 +0,0 @@ ---- config.m4.orig 2014-05-14 10:14:22.929420181 +0000 -+++ config.m4 2014-05-14 10:15:36.967414693 +0000 -@@ -4,6 +4,9 @@ - PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support, - [ --disable-simplexml Disable SimpleXML support], yes) - -+PHP_ARG_WITH(pcre-dir, pcre install prefix, -+[ --with-pcre-dir SimpleXML: pcre install prefix], no, no) -+ - if test -z "$PHP_LIBXML_DIR"; then - PHP_ARG_WITH(libxml-dir, libxml2 install dir, - [ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no) -@@ -11,6 +14,30 @@ - - if test "$PHP_SIMPLEXML" != "no"; then - -+ dnl This is PECL build, check if bundled PCRE library is used -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=$INCLUDES -+ AC_EGREP_CPP(yes,[ -+#include <main/php_config.h> -+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=yes -+ ],[ -+ AC_EGREP_CPP(yes,[ -+#include <main/php_config.h> -+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=pecl -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) -+ ],[ -+ PHP_PCRE_REGEX=no -+ ]) -+ ]) -+ - if test "$PHP_LIBXML" = "no"; then - AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml]) - fi diff --git a/textproc/php70-wddx/Makefile b/textproc/php70-wddx/Makefile deleted file mode 100644 index 87bab097e937..000000000000 --- a/textproc/php70-wddx/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -wddx - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php70-wddx/files/patch-config.m4 b/textproc/php70-wddx/files/patch-config.m4 deleted file mode 100644 index 08787003b8f9..000000000000 --- a/textproc/php70-wddx/files/patch-config.m4 +++ /dev/null @@ -1,22 +0,0 @@ ---- config.m4.orig Mon Jul 26 09:05:10 2004 -+++ config.m4 Mon Jul 26 09:07:46 2004 -@@ -5,6 +5,9 @@ - PHP_ARG_ENABLE(wddx,whether to enable WDDX support, - [ --enable-wddx Enable WDDX support.]) - -+PHP_ARG_WITH(libxml-dir, libxml2 install dir, -+[ --with-libxml-dir=<DIR> WDDX: libxml2 install prefix], no, no) -+ - if test "$PHP_WDDX" != "no"; then - if test "$ext_shared" != "yes" && test "$enable_xml" = "no"; then - AC_MSG_WARN(Activating XML) -@@ -12,4 +15,9 @@ - fi - AC_DEFINE(HAVE_WDDX, 1, [ ]) - PHP_NEW_EXTENSION(wddx, wddx.c, $ext_shared) -+ -+ PHP_SETUP_LIBXML(WDDX_SHARED_LIBADD, [ -+ ], [ -+ AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.]) -+ ]) - fi diff --git a/textproc/php70-wddx/files/patch-wddx.c b/textproc/php70-wddx/files/patch-wddx.c deleted file mode 100644 index a8a6a79fe47f..000000000000 --- a/textproc/php70-wddx/files/patch-wddx.c +++ /dev/null @@ -1,40 +0,0 @@ ---- wddx.c.orig Sun Jan 1 13:50:16 2006 -+++ wddx.c Mon Jan 16 12:56:21 2006 -@@ -18,6 +18,10 @@ - - /* $Id: wddx.c,v 1.119.2.8 2006/01/01 12:50:16 sniper Exp $ */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include "php.h" - - #if HAVE_WDDX -@@ -223,7 +227,7 @@ - - #include "ext/session/php_session.h" - --#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) -+#if HAVE_PHP_SESSION - /* {{{ PS_SERIALIZER_ENCODE_FUNC - */ - PS_SERIALIZER_ENCODE_FUNC(wddx) -@@ -302,7 +306,7 @@ - { - le_wddx = zend_register_list_destructors_ex(release_wddx_packet_rsrc, NULL, "wddx", module_number); - --#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) -+#if HAVE_PHP_SESSION - php_session_register_serializer("wddx", - PS_SERIALIZER_ENCODE_NAME(wddx), - PS_SERIALIZER_DECODE_NAME(wddx)); -@@ -317,7 +321,7 @@ - PHP_MINFO_FUNCTION(wddx) - { - php_info_print_table_start(); --#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) -+#if HAVE_PHP_SESSION - php_info_print_table_header(2, "WDDX Support", "enabled" ); - php_info_print_table_row(2, "WDDX Session Serializer", "enabled" ); - #else diff --git a/textproc/php70-xml/Makefile b/textproc/php70-xml/Makefile deleted file mode 100644 index 6eca62cf06a7..000000000000 --- a/textproc/php70-xml/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -xml - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php70-xml/files/patch-compat.c b/textproc/php70-xml/files/patch-compat.c deleted file mode 100644 index 02125961b20c..000000000000 --- a/textproc/php70-xml/files/patch-compat.c +++ /dev/null @@ -1,13 +0,0 @@ ---- compat.c.orig Tue Jul 20 10:55:02 2004 -+++ compat.c Tue Jul 20 10:55:55 2004 -@@ -16,6 +16,10 @@ - +----------------------------------------------------------------------+ - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "php.h" - #if defined(HAVE_LIBXML) && defined(HAVE_XML) && !defined(HAVE_LIBEXPAT) - #include "expat_compat.h" diff --git a/textproc/php70-xmlreader/Makefile b/textproc/php70-xmlreader/Makefile deleted file mode 100644 index dd5701bb7584..000000000000 --- a/textproc/php70-xmlreader/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -xmlreader - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php70-xmlwriter/Makefile b/textproc/php70-xmlwriter/Makefile deleted file mode 100644 index 7827d75cd84b..000000000000 --- a/textproc/php70-xmlwriter/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -xmlwriter - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php70-xsl/Makefile b/textproc/php70-xsl/Makefile deleted file mode 100644 index 7096247682e7..000000000000 --- a/textproc/php70-xsl/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -xsl - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php70-xsl/files/patch-php_xsl.h b/textproc/php70-xsl/files/patch-php_xsl.h deleted file mode 100644 index 9777187f8748..000000000000 --- a/textproc/php70-xsl/files/patch-php_xsl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- php_xsl.h.orig Sun Jan 1 13:50:17 2006 -+++ php_xsl.h Tue Jan 17 16:23:10 2006 -@@ -43,7 +43,7 @@ - #include <libexslt/exsltconfig.h> - #endif - --#include "../dom/xml_common.h" -+#include "ext/dom/xml_common.h" - #include "xsl_fe.h" - - #include <libxslt/extensions.h> diff --git a/www/Makefile b/www/Makefile index cdc64bd5fd8c..89d6d1e8c74b 100644 --- a/www/Makefile +++ b/www/Makefile @@ -463,7 +463,6 @@ SUBDIR += mod_pagespeed SUBDIR += mod_perl2 SUBDIR += mod_php56 - SUBDIR += mod_php70 SUBDIR += mod_php71 SUBDIR += mod_php72 SUBDIR += mod_php73 @@ -1457,9 +1456,6 @@ SUBDIR += php56-opcache SUBDIR += php56-session SUBDIR += php56-tidy - SUBDIR += php70-opcache - SUBDIR += php70-session - SUBDIR += php70-tidy SUBDIR += php71-opcache SUBDIR += php71-session SUBDIR += php71-tidy diff --git a/www/mod_php70/Makefile b/www/mod_php70/Makefile deleted file mode 100644 index 39c1a642b874..000000000000 --- a/www/mod_php70/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: marcus@FreeBSD.org -# $FreeBSD$ - -CATEGORIES= www devel -PKGNAMEPREFIX= mod_ - -MAINTAINER= ports@FreeBSD.org - -PHP_PORT= lang/php70 -MASTERDIR= ${.CURDIR}/../../${PHP_PORT} - -OPTIONS_DEFINE= AP2FILTER -AP2FILTER_DESC= Use Apache 2.x filter interface (experimental) -OPTIONS_EXCLUDE= CGI CLI FPM EMBED - -.include "${MASTERDIR}/Makefile" diff --git a/www/php70-opcache/Makefile b/www/php70-opcache/Makefile deleted file mode 100644 index d05b64176a72..000000000000 --- a/www/php70-opcache/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Martin Matuska <mm@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= www - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -opcache - -USES= php:zend,noflavors - -.include "${MASTERDIR}/Makefile" diff --git a/www/php70-session/Makefile b/www/php70-session/Makefile deleted file mode 100644 index 6b20fd0eda6c..000000000000 --- a/www/php70-session/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= www - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -session - -.include "${MASTERDIR}/Makefile" diff --git a/www/php70-tidy/Makefile b/www/php70-tidy/Makefile deleted file mode 100644 index 40f6250f1d08..000000000000 --- a/www/php70-tidy/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -CATEGORIES= www - -MASTERDIR= ${.CURDIR}/../../lang/php70 - -PKGNAMESUFFIX= -tidy - -.include "${MASTERDIR}/Makefile" |