diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2019-12-17 20:21:15 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2019-12-17 20:21:15 +0000 |
| commit | b51b839969daf3b42232476460514c9cccc9053e (patch) | |
| tree | 8c19b30b436d791294a59eca8ba267af39c6b719 | |
| parent | 51169c8152bd75f8ab3bee9e0bc7245f2f0223af (diff) | |
Remove PHP 7.1 ports, upstream security support ended on 2019-12-01 :
2019-12-01 archivers/php71-bz2
2019-12-01 archivers/php71-phar
2019-12-01 archivers/php71-zip
2019-12-01 archivers/php71-zlib
2019-12-01 converters/php71-iconv
2019-12-01 converters/php71-mbstring
2019-12-01 converters/php71-recode
2019-12-01 databases/php71-dba
2019-12-01 databases/php71-interbase
2019-12-01 databases/php71-mysqli
2019-12-01 databases/php71-odbc
2019-12-01 databases/php71-pdo
2019-12-01 databases/php71-pdo_dblib
2019-12-01 databases/php71-pdo_firebird
2019-12-01 databases/php71-pdo_mysql
2019-12-01 databases/php71-pdo_odbc
2019-12-01 databases/php71-pdo_pgsql
2019-12-01 databases/php71-pdo_sqlite
2019-12-01 databases/php71-pgsql
2019-12-01 databases/php71-sqlite3
2019-12-01 devel/php71-gettext
2019-12-01 devel/php71-intl
2019-12-01 devel/php71-json
2019-12-01 devel/php71-pcntl
2019-12-01 devel/php71-readline
2019-12-01 devel/php71-shmop
2019-12-01 devel/php71-sysvmsg
2019-12-01 devel/php71-sysvsem
2019-12-01 devel/php71-sysvshm
2019-12-01 devel/php71-tokenizer
2019-12-01 ftp/php71-curl
2019-12-01 ftp/php71-ftp
2019-12-01 graphics/php71-exif
2019-12-01 graphics/php71-gd
2019-12-01 lang/php71
2019-12-01 mail/php71-imap
2019-12-01 math/php71-bcmath
2019-12-01 math/php71-gmp
2019-12-01 misc/php71-calendar
2019-12-01 net/php71-ldap
2019-12-01 net/php71-soap
2019-12-01 net/php71-sockets
2019-12-01 net/php71-xmlrpc
2019-12-01 net-mgmt/php71-snmp
2019-12-01 security/php71-filter
2019-12-01 security/php71-hash
2019-12-01 security/php71-mcrypt
2019-12-01 security/php71-openssl
2019-12-01 sysutils/php71-fileinfo
2019-12-01 sysutils/php71-posix
2019-12-01 textproc/php71-ctype
2019-12-01 textproc/php71-dom
2019-12-01 textproc/php71-enchant
2019-12-01 textproc/php71-pspell
2019-12-01 textproc/php71-simplexml
2019-12-01 textproc/php71-wddx
2019-12-01 textproc/php71-xml
2019-12-01 textproc/php71-xmlreader
2019-12-01 textproc/php71-xmlwriter
2019-12-01 textproc/php71-xsl
2019-12-01 www/mod_php71
2019-12-01 www/php71-opcache
2019-12-01 www/php71-session
2019-12-01 www/php71-tidy
Notes
Notes:
svn path=/head/; revision=520344
119 files changed, 64 insertions, 2866 deletions
@@ -13533,3 +13533,67 @@ sysutils/warden||2019-12-15|Has expired: Abandoned upstream devel/glade3|devel/glade|2019-12-16|Overcome by newer version devel/glade2|devel/glade|2019-12-16|Overcome by newer version devel/goffice010|devel/goffice|2019-12-16|Main port updated to latest version +archivers/php71-bz2|archivers/php72-bz2|2019-12-17|Has expired: upstream security support ended +archivers/php71-phar|archivers/php72-phar|2019-12-17|Has expired: upstream security support ended +archivers/php71-zip|archivers/php72-zip|2019-12-17|Has expired: upstream security support ended +archivers/php71-zlib|archivers/php72-zlib|2019-12-17|Has expired: upstream security support ended +converters/php71-iconv|converters/php72-iconv|2019-12-17|Has expired: upstream security support ended +converters/php71-mbstring|converters/php72-mbstring|2019-12-17|Has expired: upstream security support ended +converters/php71-recode|converters/php72-recode|2019-12-17|Has expired: upstream security support ended +databases/php71-dba|databases/php72-dba|2019-12-17|Has expired: upstream security support ended +databases/php71-interbase|databases/php72-interbase|2019-12-17|Has expired: upstream security support ended +databases/php71-mysqli|databases/php72-mysqli|2019-12-17|Has expired: upstream security support ended +databases/php71-odbc|databases/php72-odbc|2019-12-17|Has expired: upstream security support ended +databases/php71-pdo|databases/php72-pdo|2019-12-17|Has expired: upstream security support ended +databases/php71-pdo_dblib|databases/php72-pdo_dblib|2019-12-17|Has expired: upstream security support ended +databases/php71-pdo_firebird|databases/php72-pdo_firebird|2019-12-17|Has expired: upstream security support ended +databases/php71-pdo_mysql|databases/php72-pdo_mysql|2019-12-17|Has expired: upstream security support ended +databases/php71-pdo_odbc|databases/php72-pdo_odbc|2019-12-17|Has expired: upstream security support ended +databases/php71-pdo_pgsql|databases/php72-pdo_pgsql|2019-12-17|Has expired: upstream security support ended +databases/php71-pdo_sqlite|databases/php72-pdo_sqlite|2019-12-17|Has expired: upstream security support ended +databases/php71-pgsql|databases/php72-pgsql|2019-12-17|Has expired: upstream security support ended +databases/php71-sqlite3|databases/php72-sqlite3|2019-12-17|Has expired: upstream security support ended +devel/php71-gettext|devel/php72-gettext|2019-12-17|Has expired: upstream security support ended +devel/php71-intl|devel/php72-intl|2019-12-17|Has expired: upstream security support ended +devel/php71-json|devel/php72-json|2019-12-17|Has expired: upstream security support ended +devel/php71-pcntl|devel/php72-pcntl|2019-12-17|Has expired: upstream security support ended +devel/php71-readline|devel/php72-readline|2019-12-17|Has expired: upstream security support ended +devel/php71-shmop|devel/php72-shmop|2019-12-17|Has expired: upstream security support ended +devel/php71-sysvmsg|devel/php72-sysvmsg|2019-12-17|Has expired: upstream security support ended +devel/php71-sysvsem|devel/php72-sysvsem|2019-12-17|Has expired: upstream security support ended +devel/php71-sysvshm|devel/php72-sysvshm|2019-12-17|Has expired: upstream security support ended +devel/php71-tokenizer|devel/php72-tokenizer|2019-12-17|Has expired: upstream security support ended +ftp/php71-curl|ftp/php72-curl|2019-12-17|Has expired: upstream security support ended +ftp/php71-ftp|ftp/php72-ftp|2019-12-17|Has expired: upstream security support ended +graphics/php71-exif|graphics/php72-exif|2019-12-17|Has expired: upstream security support ended +graphics/php71-gd|graphics/php72-gd|2019-12-17|Has expired: upstream security support ended +lang/php71|lang/php72|2019-12-17|Has expired: upstream security support ended +mail/php71-imap|mail/php72-imap|2019-12-17|Has expired: upstream security support ended +math/php71-bcmath|math/php72-bcmath|2019-12-17|Has expired: upstream security support ended +math/php71-gmp|math/php72-gmp|2019-12-17|Has expired: upstream security support ended +misc/php71-calendar|misc/php72-calendar|2019-12-17|Has expired: upstream security support ended +net/php71-ldap|net/php72-ldap|2019-12-17|Has expired: upstream security support ended +net/php71-soap|net/php72-soap|2019-12-17|Has expired: upstream security support ended +net/php71-sockets|net/php72-sockets|2019-12-17|Has expired: upstream security support ended +net/php71-xmlrpc|net/php72-xmlrpc|2019-12-17|Has expired: upstream security support ended +net-mgmt/php71-snmp|net-mgmt/php72-snmp|2019-12-17|Has expired: upstream security support ended +security/php71-filter|security/php72-filter|2019-12-17|Has expired: upstream security support ended +security/php71-hash|security/php72-hash|2019-12-17|Has expired: upstream security support ended +security/php71-mcrypt|security/php72-mcrypt|2019-12-17|Has expired: upstream security support ended +security/php71-openssl|security/php72-openssl|2019-12-17|Has expired: upstream security support ended +sysutils/php71-fileinfo|sysutils/php72-fileinfo|2019-12-17|Has expired: upstream security support ended +sysutils/php71-posix|sysutils/php72-posix|2019-12-17|Has expired: upstream security support ended +textproc/php71-ctype|textproc/php72-ctype|2019-12-17|Has expired: upstream security support ended +textproc/php71-dom|textproc/php72-dom|2019-12-17|Has expired: upstream security support ended +textproc/php71-enchant|textproc/php72-enchant|2019-12-17|Has expired: upstream security support ended +textproc/php71-pspell|textproc/php72-pspell|2019-12-17|Has expired: upstream security support ended +textproc/php71-simplexml|textproc/php72-simplexml|2019-12-17|Has expired: upstream security support ended +textproc/php71-wddx|textproc/php72-wddx|2019-12-17|Has expired: upstream security support ended +textproc/php71-xml|textproc/php72-xml|2019-12-17|Has expired: upstream security support ended +textproc/php71-xmlreader|textproc/php72-xmlreader|2019-12-17|Has expired: upstream security support ended +textproc/php71-xmlwriter|textproc/php72-xmlwriter|2019-12-17|Has expired: upstream security support ended +textproc/php71-xsl|textproc/php72-xsl|2019-12-17|Has expired: upstream security support ended +www/mod_php71|www/mod_php72|2019-12-17|Has expired: upstream security support ended +www/php71-opcache|www/php72-opcache|2019-12-17|Has expired: upstream security support ended +www/php71-session|www/php72-session|2019-12-17|Has expired: upstream security support ended +www/php71-tidy|www/php72-tidy|2019-12-17|Has expired: upstream security support ended diff --git a/archivers/Makefile b/archivers/Makefile index 75cace3e3c85..d780042d26de 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -147,10 +147,6 @@ SUBDIR += php-lz4 SUBDIR += php-snappy SUBDIR += php-zstd - SUBDIR += php71-bz2 - SUBDIR += php71-phar - SUBDIR += php71-zip - SUBDIR += php71-zlib SUBDIR += php72-bz2 SUBDIR += php72-phar SUBDIR += php72-zip diff --git a/archivers/php71-bz2/Makefile b/archivers/php71-bz2/Makefile deleted file mode 100644 index b2172c21b897..000000000000 --- a/archivers/php71-bz2/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -bz2 - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php71-phar/Makefile b/archivers/php71-phar/Makefile deleted file mode 100644 index 7ddc5051bef3..000000000000 --- a/archivers/php71-phar/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -phar - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php71-phar/files/patch-config.m4 b/archivers/php71-phar/files/patch-config.m4 deleted file mode 100644 index 1aba3bd9a5a8..000000000000 --- a/archivers/php71-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/php71-phar/files/patch-phar.c b/archivers/php71-phar/files/patch-phar.c deleted file mode 100644 index e7ae6cb3328d..000000000000 --- a/archivers/php71-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/php71-zip/Makefile b/archivers/php71-zip/Makefile deleted file mode 100644 index 4728bf25a24f..000000000000 --- a/archivers/php71-zip/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -zip - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php71-zlib/Makefile b/archivers/php71-zlib/Makefile deleted file mode 100644 index 045af271f1f5..000000000000 --- a/archivers/php71-zlib/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -zlib - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php71-zlib/files/patch-zlib.c b/archivers/php71-zlib/files/patch-zlib.c deleted file mode 100644 index be02c50d1df6..000000000000 --- a/archivers/php71-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 2958a52259ff..bc12808b3cb6 100644 --- a/converters/Makefile +++ b/converters/Makefile @@ -139,9 +139,6 @@ SUBDIR += pear-Services_JSON SUBDIR += pecl-igbinary SUBDIR += php-bsdconv - SUBDIR += php71-iconv - SUBDIR += php71-mbstring - SUBDIR += php71-recode SUBDIR += php72-iconv SUBDIR += php72-mbstring SUBDIR += php72-recode diff --git a/converters/php71-iconv/Makefile b/converters/php71-iconv/Makefile deleted file mode 100644 index bc64697b0458..000000000000 --- a/converters/php71-iconv/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -iconv - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/converters/php71-mbstring/Makefile b/converters/php71-mbstring/Makefile deleted file mode 100644 index 3bb35c966931..000000000000 --- a/converters/php71-mbstring/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -mbstring - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/converters/php71-mbstring/files/patch-config.m4 b/converters/php71-mbstring/files/patch-config.m4 deleted file mode 100644 index 3e299951c999..000000000000 --- a/converters/php71-mbstring/files/patch-config.m4 +++ /dev/null @@ -1,51 +0,0 @@ ---- config.m4.orig 2018-11-10 15:21:47.103604000 +0100 -+++ config.m4 2018-11-10 15:24:23.615118000 +0100 -@@ -42,6 +42,30 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ - PHP_ADD_INCLUDE([$ext_srcdir/$dir]) - 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) -@@ -85,7 +109,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [ - int foo(int x, ...) { - va_list va; - va_start(va, x); -- va_arg(va, int); - va_arg(va, char *); - va_arg(va, double); - return 0; -@@ -367,6 +390,9 @@ PHP_ARG_WITH(onig, [for external oniguru - [ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. - If DIR is not set, the bundled oniguruma will be used], no, no) - -+PHP_ARG_WITH(pcre-dir, pcre install prefix, -+[ --with-pcre-dir MBSTRING: pcre install prefix], no, no) -+ - if test "$PHP_MBSTRING" != "no"; then - AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support]) - diff --git a/converters/php71-recode/Makefile b/converters/php71-recode/Makefile deleted file mode 100644 index eba1fe298b84..000000000000 --- a/converters/php71-recode/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -recode - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/databases/Makefile b/databases/Makefile index 57c9fbb6f4f3..e8dfec7d602e 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -618,19 +618,6 @@ SUBDIR += php-memcache SUBDIR += php-tarantool SUBDIR += php-xapian - SUBDIR += php71-dba - SUBDIR += php71-interbase - SUBDIR += php71-mysqli - SUBDIR += php71-odbc - SUBDIR += php71-pdo - SUBDIR += php71-pdo_dblib - SUBDIR += php71-pdo_firebird - SUBDIR += php71-pdo_mysql - SUBDIR += php71-pdo_odbc - SUBDIR += php71-pdo_pgsql - SUBDIR += php71-pdo_sqlite - SUBDIR += php71-pgsql - SUBDIR += php71-sqlite3 SUBDIR += php72-dba SUBDIR += php72-interbase SUBDIR += php72-mysqli diff --git a/databases/php71-dba/Makefile b/databases/php71-dba/Makefile deleted file mode 100644 index e0d822ad7be4..000000000000 --- a/databases/php71-dba/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -dba - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php71-dba/files/patch-config.m4 b/databases/php71-dba/files/patch-config.m4 deleted file mode 100644 index 30f662138374..000000000000 --- a/databases/php71-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/php71-interbase/Makefile b/databases/php71-interbase/Makefile deleted file mode 100644 index a7b6e6fbc66a..000000000000 --- a/databases/php71-interbase/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -interbase - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php71-interbase/files/patch-interbase.c b/databases/php71-interbase/files/patch-interbase.c deleted file mode 100644 index 0f8791beb793..000000000000 --- a/databases/php71-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/php71-mysqli/Makefile b/databases/php71-mysqli/Makefile deleted file mode 100644 index 1b3021e5dcaf..000000000000 --- a/databases/php71-mysqli/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -mysqli - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php71-mysqli/files/patch-mysqli.c b/databases/php71-mysqli/files/patch-mysqli.c deleted file mode 100644 index 3d74731142b6..000000000000 --- a/databases/php71-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/php71-mysqli/files/patch-php_mysqli_structs.h b/databases/php71-mysqli/files/patch-php_mysqli_structs.h deleted file mode 100644 index d0daeee9ee54..000000000000 --- a/databases/php71-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/php71-odbc/Makefile b/databases/php71-odbc/Makefile deleted file mode 100644 index 714f00c9be1e..000000000000 --- a/databases/php71-odbc/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -odbc - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php71-odbc/files/patch-config.m4 b/databases/php71-odbc/files/patch-config.m4 deleted file mode 100644 index 6479cf0f531d..000000000000 --- a/databases/php71-odbc/files/patch-config.m4 +++ /dev/null @@ -1,128 +0,0 @@ ---- config.m4.orig 2018-11-10 15:32:27.031531000 +0100 -+++ config.m4 2018-11-10 15:37:40.815007000 +0100 -@@ -100,13 +100,16 @@ dnl - dnl configure options - dnl - -+PHP_ARG_ENABLE(odbc,, -+[ --enable-odbc Enable ODBC support with selected driver]) -+ - PHP_ARG_WITH(odbcver,, - [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0350. - Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0350) - - 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 +138,7 @@ fi - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(sapdb,, --[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]]) -+[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]], no, no) - - AC_MSG_CHECKING([for SAP DB support]) - if test "$PHP_SAPDB" != "no"; then -@@ -155,7 +158,7 @@ fi - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(solid,, --[ --with-solid[=DIR] Include Solid support [/usr/local/solid]]) -+[ --with-solid[=DIR] Include Solid support [/usr/local/solid]], no, no) - - AC_MSG_CHECKING(for Solid support) - if test "$PHP_SOLID" != "no"; then -@@ -182,7 +185,7 @@ fi - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(ibm-db2,, --[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]]) -+[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]], no, no) - - AC_MSG_CHECKING(for IBM DB2 support) - if test "$PHP_IBM_DB2" != "no"; then -@@ -221,7 +224,7 @@ fi - - 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 +247,7 @@ fi - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(empress,, - [ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH] -- (Empress Version >= 8.60 required)]) -+ (Empress Version >= 8.60 required)], no, no) - - AC_MSG_CHECKING(for Empress support) - if test "$PHP_EMPRESS" != "no"; then -@@ -270,7 +273,7 @@ if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(empress-bcs,, - [ --with-empress-bcs[=DIR] - Include Empress Local Access support [\$EMPRESSPATH] -- (Empress Version >= 8.60 required)]) -+ (Empress Version >= 8.60 required)], no, no) - - AC_MSG_CHECKING(for Empress local access support) - if test "$PHP_EMPRESS_BCS" != "no"; then -@@ -310,7 +313,7 @@ fi - - 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 +369,7 @@ PHP_ARG_WITH(custom-odbc,, - running this configure script: - CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" - LDFLAGS=-lunix -- CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"]) -+ CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no) - - AC_MSG_CHECKING(for a custom ODBC support) - if test "$PHP_CUSTOM_ODBC" != "no"; then -@@ -388,7 +391,7 @@ fi - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(iodbc,, --[ --with-iodbc[=DIR] Include iODBC support [/usr/local]]) -+[ --with-iodbc[=DIR] Include iODBC support [/usr/local]], no, no) - - AC_MSG_CHECKING(for iODBC support) - if test "$PHP_IODBC" != "no"; then -@@ -426,7 +429,7 @@ fi - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(esoob,, --[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]]) -+[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no) - - AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) - if test "$PHP_ESOOB" != "no"; then -@@ -448,7 +451,7 @@ fi - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(unixODBC,, --[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]]) -+[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]], no, no) - - AC_MSG_CHECKING(for unixODBC support) - if test "$PHP_UNIXODBC" != "no"; then -@@ -471,7 +474,7 @@ fi - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(dbmaker,, --[ --with-dbmaker[=DIR] Include DBMaker support]) -+[ --with-dbmaker[=DIR] Include DBMaker support], no, no) - - AC_MSG_CHECKING(for DBMaker support) - if test "$PHP_DBMAKER" != "no"; then diff --git a/databases/php71-pdo/Makefile b/databases/php71-pdo/Makefile deleted file mode 100644 index 2934de548b82..000000000000 --- a/databases/php71-pdo/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -pdo - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php71-pdo_dblib/Makefile b/databases/php71-pdo_dblib/Makefile deleted file mode 100644 index dcdc7bf5bc55..000000000000 --- a/databases/php71-pdo_dblib/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -pdo_dblib - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php71-pdo_firebird/Makefile b/databases/php71-pdo_firebird/Makefile deleted file mode 100644 index fef55a44ab41..000000000000 --- a/databases/php71-pdo_firebird/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -pdo_firebird - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php71-pdo_mysql/Makefile b/databases/php71-pdo_mysql/Makefile deleted file mode 100644 index cd17b9d2ad8a..000000000000 --- a/databases/php71-pdo_mysql/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -pdo_mysql - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php71-pdo_odbc/Makefile b/databases/php71-pdo_odbc/Makefile deleted file mode 100644 index ca035c0f36e5..000000000000 --- a/databases/php71-pdo_odbc/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -pdo_odbc - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php71-pdo_pgsql/Makefile b/databases/php71-pdo_pgsql/Makefile deleted file mode 100644 index e2253cf27bfa..000000000000 --- a/databases/php71-pdo_pgsql/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -pdo_pgsql - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php71-pdo_sqlite/Makefile b/databases/php71-pdo_sqlite/Makefile deleted file mode 100644 index 602712bd1460..000000000000 --- a/databases/php71-pdo_sqlite/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -pdo_sqlite - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php71-pgsql/Makefile b/databases/php71-pgsql/Makefile deleted file mode 100644 index 9bdb2b928cc9..000000000000 --- a/databases/php71-pgsql/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -pgsql - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php71-sqlite3/Makefile b/databases/php71-sqlite3/Makefile deleted file mode 100644 index 25ce98e0f744..000000000000 --- a/databases/php71-sqlite3/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -sqlite3 - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/Makefile b/devel/Makefile index 7751f82e7291..e077ebf90269 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -3901,16 +3901,6 @@ SUBDIR += php-ice37 SUBDIR += php-libawl SUBDIR += php-maxminddb - SUBDIR += php71-gettext - SUBDIR += php71-intl - SUBDIR += php71-json - SUBDIR += php71-pcntl - SUBDIR += php71-readline - SUBDIR += php71-shmop - SUBDIR += php71-sysvmsg - SUBDIR += php71-sysvsem - SUBDIR += php71-sysvshm - SUBDIR += php71-tokenizer SUBDIR += php72-gettext SUBDIR += php72-intl SUBDIR += php72-json diff --git a/devel/php71-gettext/Makefile b/devel/php71-gettext/Makefile deleted file mode 100644 index 03d21122f547..000000000000 --- a/devel/php71-gettext/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -gettext - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php71-intl/Makefile b/devel/php71-intl/Makefile deleted file mode 100644 index 65630203cbb1..000000000000 --- a/devel/php71-intl/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -intl - -USES= compiler:c++11-lib -USE_CXXSTD= gnu++11 - -CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php71-json/Makefile b/devel/php71-json/Makefile deleted file mode 100644 index a10deaa389c0..000000000000 --- a/devel/php71-json/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -json - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php71-pcntl/Makefile b/devel/php71-pcntl/Makefile deleted file mode 100644 index 73ee358fde77..000000000000 --- a/devel/php71-pcntl/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -pcntl - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php71-readline/Makefile b/devel/php71-readline/Makefile deleted file mode 100644 index 489fbbd9c85d..000000000000 --- a/devel/php71-readline/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -readline - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php71-readline/files/patch-config.m4 b/devel/php71-readline/files/patch-config.m4 deleted file mode 100644 index 5edf376bf0e2..000000000000 --- a/devel/php71-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/php71-readline/files/patch-readline_cli.c b/devel/php71-readline/files/patch-readline_cli.c deleted file mode 100644 index 02f55974f9b0..000000000000 --- a/devel/php71-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/php71-shmop/Makefile b/devel/php71-shmop/Makefile deleted file mode 100644 index 75bdb33f9f35..000000000000 --- a/devel/php71-shmop/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -shmop - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php71-sysvmsg/Makefile b/devel/php71-sysvmsg/Makefile deleted file mode 100644 index f35ca65bc059..000000000000 --- a/devel/php71-sysvmsg/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -sysvmsg - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php71-sysvsem/Makefile b/devel/php71-sysvsem/Makefile deleted file mode 100644 index c7837e64b3cd..000000000000 --- a/devel/php71-sysvsem/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -sysvsem - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php71-sysvshm/Makefile b/devel/php71-sysvshm/Makefile deleted file mode 100644 index 3a50797bfbfa..000000000000 --- a/devel/php71-sysvshm/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -sysvshm - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php71-tokenizer/Makefile b/devel/php71-tokenizer/Makefile deleted file mode 100644 index fb900296747b..000000000000 --- a/devel/php71-tokenizer/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -tokenizer - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/ftp/Makefile b/ftp/Makefile index 07d6fce249c0..d8a3d2772ff9 100644 --- a/ftp/Makefile +++ b/ftp/Makefile @@ -59,8 +59,6 @@ SUBDIR += pear-Net_FTP SUBDIR += pftpd SUBDIR += php-fastdfs - SUBDIR += php71-curl - SUBDIR += php71-ftp SUBDIR += php72-curl SUBDIR += php72-ftp SUBDIR += php73-curl diff --git a/ftp/php71-curl/Makefile b/ftp/php71-curl/Makefile deleted file mode 100644 index 48433d380894..000000000000 --- a/ftp/php71-curl/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= ftp - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -curl - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/ftp/php71-ftp/Makefile b/ftp/php71-ftp/Makefile deleted file mode 100644 index a386ccca011f..000000000000 --- a/ftp/php71-ftp/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= ftp - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -ftp - -TEST_TARGET= test - -post-patch: - @${REINPLACE_CMD} s/HAVE_OPENSSL_EXT/__FreeBSD__/ \ - ${WRKSRC}/ftp.* ${WRKSRC}/php_ftp.* - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/Makefile b/graphics/Makefile index b4047422a3aa..7a27f3618bae 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -742,8 +742,6 @@ SUBDIR += phototonic SUBDIR += php-facedetect SUBDIR += php-geos - SUBDIR += php71-exif - SUBDIR += php71-gd SUBDIR += php72-exif SUBDIR += php72-gd SUBDIR += php73-exif diff --git a/graphics/php71-exif/Makefile b/graphics/php71-exif/Makefile deleted file mode 100644 index c155c0b1ff45..000000000000 --- a/graphics/php71-exif/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= graphics - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -exif - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/php71-gd/Makefile b/graphics/php71-gd/Makefile deleted file mode 100644 index 85af14550515..000000000000 --- a/graphics/php71-gd/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= graphics - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -gd - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" - -LIB_DEPENDS+= libgd.so:graphics/gd diff --git a/graphics/php71-gd/files/patch-config.m4 b/graphics/php71-gd/files/patch-config.m4 deleted file mode 100644 index 5e7e2d14203d..000000000000 --- a/graphics/php71-gd/files/patch-config.m4 +++ /dev/null @@ -1,28 +0,0 @@ ---- config.m4.orig 2018-07-19 06:17:29 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/php71-gd/files/patch-gd.c b/graphics/php71-gd/files/patch-gd.c deleted file mode 100644 index 8787085ee304..000000000000 --- a/graphics/php71-gd/files/patch-gd.c +++ /dev/null @@ -1,83 +0,0 @@ ---- gd.c.orig 2018-07-19 06:17:30 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/lang/Makefile b/lang/Makefile index 8da5ffc7b5f9..3bc795de0860 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -273,7 +273,6 @@ SUBDIR += pharo SUBDIR += phc SUBDIR += php-mode.el - SUBDIR += php71 SUBDIR += php71-extensions SUBDIR += php72 SUBDIR += php72-extensions diff --git a/lang/php71/Makefile b/lang/php71/Makefile deleted file mode 100644 index 58dbb6368e40..000000000000 --- a/lang/php71/Makefile +++ /dev/null @@ -1,196 +0,0 @@ -# Created by: Torsten Zuehlsdorff <tz@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= php71 -PORTVERSION= 7.1.33 -PORTREVISION?= 0 -CATEGORIES?= lang devel www -MASTER_SITES= PHP/distributions -DISTNAME= php-${PORTVERSION} - -MAINTAINER= tz@FreeBSD.org -COMMENT= PHP Scripting Language - -LICENSE= PHP301 - -USES+= cpe gnome tar:xz -CPE_PRODUCT= php -NO_OPTIONS_SORT=yes - -.if !defined(PKGNAMESUFFIX) -LIB_DEPENDS= libpcre.so:devel/pcre - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-layout=GNU \ - --with-config-file-scan-dir=${PREFIX}/etc/php \ - --disable-all \ - --enable-libxml \ - --with-libxml-dir=${LOCALBASE} \ - --with-pcre-regex=${LOCALBASE} \ - --program-prefix="" -USES+= autoreconf:build -USE_GNOME= libxml2 - -# PR230207 Allow relocations against read-only segments (override lld default) -LDFLAGS_i386= -Wl,-z,notext - -OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD MYSQLND LINKTHR ZTS -OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE -OPTIONS_EXCLUDE_DragonFly= DTRACE -# ld(1) fails to link probes: Relocations in generic ELF (EM: 0) -OPTIONS_EXCLUDE_aarch64= DTRACE -OPTIONS_EXCLUDE_powerpc64= DTRACE -# dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented -OPTIONS_EXCLUDE_armv6= DTRACE -OPTIONS_EXCLUDE_armv7= DTRACE -# Bug 197128: No ASM code for MIPS/MIPS64, disable FPM -OPTIONS_EXCLUDE_mips= DTRACE FPM -OPTIONS_EXCLUDE_mips64= DTRACE FPM -OPTIONS_EXCLUDE_sparc64= DTRACE -OPTIONS_SUB= yes - -CLI_DESC= Build CLI version -CGI_DESC= Build CGI version -FPM_DESC= Build FPM version -EMBED_DESC= Build embedded library -PHPDBG_DESC= Interactive PHP debugger -MAILHEAD_DESC= Enable mail header patch -MYSQLND_DESC= Build with MySQL Native Driver -LINKTHR_DESC= Link thread lib (for threaded extensions) -ZTS_DESC= Force Zend Thread Safety (ZTS) build - -CONFLICTS= php56-* php70-* php72-* php73-* - -DESTDIRNAME= INSTALL_ROOT - -.include <bsd.port.pre.mk> - -PATCH_DIST_STRIP= -p1 - -.if ${PORT_OPTIONS:MMAILHEAD} -PATCHFILES+= php-7.1.x-mail-header.patch:mail -PATCH_SITES+= http://choon.net/opensource/php/:mail -.endif - -.if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--enable-mysqlnd -.endif - -.if ${PORT_OPTIONS:MCLI} -PHP_SAPI+= cli -.else -CONFIGURE_ARGS+=--disable-cli -.endif - -.if ${PORT_OPTIONS:MCGI} -PHP_SAPI+= cgi -.else -CONFIGURE_ARGS+=--disable-cgi -.endif - -.if ${PORT_OPTIONS:MFPM} -PHP_SAPI+= fpm -USE_RC_SUBR+= php-fpm -CONFIGURE_ARGS+=--enable-fpm \ - --with-fpm-user=${WWWOWN} \ - --with-fpm-group=${WWWGRP} -.endif - -.if defined(PKGNAMEPREFIX) -USES+= apache:2.2+ -.include "${PORTSDIR}/Mk/Uses/apache.mk" -.if ${PORT_OPTIONS:MAP2FILTER} -CONFIGURE_ARGS+=--with-apxs2filter=${APXS} -.else -CONFIGURE_ARGS+=--with-apxs2=${APXS} -.endif -PLIST= ${PKGDIR}/pkg-plist.mod -PKGMESSAGE= ${PKGDIR}/pkg-message.mod -MODULENAME= libphp7 -SHORTMODNAME= php7 -WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!" -.endif - -.if ${PORT_OPTIONS:MEMBED} -PHP_SAPI+= embed -CONFIGURE_ARGS+=--enable-embed -.endif - -.if ${PORT_OPTIONS:MPHPDBG} -PHP_SAPI+= phpdbg -CONFIGURE_ARGS+=--enable-phpdbg -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-phpdbg-debug -.endif -.endif - -.if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED} -PLIST_SUB+= SAPI_INC="" -.else -PLIST_SUB+= SAPI_INC="@comment " -.endif - -CONFIGURE_ENV+= ac_cv_decimal_fp_supported="no" \ - lt_cv_path_SED="sed" - -.if ${PORT_OPTIONS:MLINKTHR} -LIBS+= -lpthread -.endif - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -.endif - -.if ${PORT_OPTIONS:MZTS} -CONFIGURE_ARGS+=--enable-maintainer-zts -CONFIGURE_ENV+= pthreads_working="yes" -.endif - -.if ${PORT_OPTIONS:MDTRACE} -CONFIGURE_ARGS+=--enable-dtrace -PLIST_SUB+= DTRACE="" -.else -PLIST_SUB+= DTRACE="@comment " -.endif - -.if empty(PORT_OPTIONS:MIPV6) -CONFIGURE_ARGS+=--disable-ipv6 -.endif - -post-patch: - @${TOUCH} ${WRKSRC}/ext/php_config.h - @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* -.if ${PORT_OPTIONS:MFPM} - @${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \ - ${WRKSRC}/sapi/fpm/php-fpm.conf.in -.endif - -pre-configure: - @(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force) - -.if !defined(PKGNAMEPREFIX) -post-build: - @${ECHO_CMD} "PHP_VER=71" > ${WRKDIR}/php.conf - @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf - @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf - @${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf - @${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf - @${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf - -test: build - @(cd ${WRKSRC} && ${MAKE} test) - -post-install: - ${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ - ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc -.else -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} - ${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \ - ${STAGEDIR}${PREFIX}/${APACHEMODDIR} -.endif - -.else -.include "${MASTERDIR}/Makefile.ext" -.endif -.include <bsd.port.post.mk> diff --git a/lang/php71/Makefile.ext b/lang/php71/Makefile.ext deleted file mode 100644 index e1e28ee6665f..000000000000 --- a/lang/php71/Makefile.ext +++ /dev/null @@ -1,570 +0,0 @@ -# $FreeBSD$ - -COMMENT= The ${PHP_MODNAME} shared extension for php - -USES+= php:ext,noflavors -PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} -PHP_VER= 71 -IGNORE_WITH_PHP= 72 73 - -EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} -WRKSRC= ${WRKDIR}/${EXTSUBDIR} -PATCHDIR= ${.CURDIR}/files -PLIST= ${NONEXISTENT} - -EXTRACT_AFTER_ARGS?= ${EXTSUBDIR} - -.if ${PHP_MODNAME} == "bcmath" -CONFIGURE_ARGS+=--enable-bcmath - -PHP_HEADER_DIRS=libbcmath libbcmath/src -.endif - -.if ${PHP_MODNAME} == "bz2" -CONFIGURE_ARGS+=--with-bz2=/usr -.endif - -.if ${PHP_MODNAME} == "calendar" -CONFIGURE_ARGS+=--enable-calendar -.endif - -.if ${PHP_MODNAME} == "ctype" -CONFIGURE_ARGS+=--enable-ctype -.endif - -.if ${PHP_MODNAME} == "curl" -LIB_DEPENDS+= libcurl.so:ftp/curl - -CONFIGURE_ARGS+=--with-curl=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "dba" -CONFIGURE_ARGS+=--enable-dba - -OPTIONS_DEFINE= CDB DB4 GDBM QDBM TOKYO INIFILE FLATFILE -OPTIONS_DEFAULT=CDB INIFILE FLATFILE - -CDB_DESC= cdb database support -DB4_DESC= Berkeley DB4 support -GDBM_DESC= GDBM database support -QDBM_DESC= QDBM database support -TOKYO_DESC= Tokyo Cabinet database support -INIFILE_DESC= INI file support -FLATFILE_DESC= flatfile support - -PHP_HEADER_DIRS= libcdb libflatfile libinifile -.endif - -.if ${PHP_MODNAME} == "dom" -CONFIGURE_ARGS+=--enable-dom \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 -.endif - -.if ${PHP_MODNAME} == "enchant" -LIB_DEPENDS+= libenchant.so:textproc/enchant -CONFIGURE_ARGS+=--with-enchant=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "exif" -CONFIGURE_ARGS+=--enable-exif -.endif - -.if ${PHP_MODNAME} == "fileinfo" -CONFIGURE_ARGS+=--enable-fileinfo \ - --with-pcre-dir=${LOCALBASE} - -PHP_HEADER_DIRS= libmagic -.endif - -.if ${PHP_MODNAME} == "filter" -CONFIGURE_ARGS+=--enable-filter \ - --with-pcre-dir=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "ftp" -CONFIGURE_ARGS+=--enable-ftp \ - --with-openssl-dir=${OPENSSLBASE} - -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USES+= ssl -.endif - -.if ${PHP_MODNAME} == "gd" -LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libpng.so:graphics/png -USES+= jpeg - -CONFIGURE_ARGS+=--with-gd=${LOCALBASE} \ - --with-freetype-dir=${LOCALBASE} \ - --with-jpeg-dir=${LOCALBASE} \ - --with-png-dir=${LOCALBASE} \ - --with-zlib-dir=/usr - -EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude libgd \ - php-${PORTVERSION}/ext/gd - -OPTIONS_DEFINE=TRUETYPE JIS WEBP X11 -OPTIONS_DEFAULT=TRUETYPE X11 - -TRUETYPE_DESC= Enable TrueType string function -JIS_DESC= Enable JIS-mapped Japanese font support -WEBP_DESC= Enable WebP image format support -X11_DESC= Enable XPM support - -.endif - -.if ${PHP_MODNAME} == "gettext" -CONFIGURE_ARGS+=--with-gettext=${LOCALBASE} - -USES+= gettext -.endif - -.if ${PHP_MODNAME} == "gmp" -LIB_DEPENDS+= libgmp.so:math/gmp - -CONFIGURE_ARGS+=--with-gmp=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "hash" -CONFIGURE_ARGS+=--enable-hash \ - --with-mhash -.endif - -.if ${PHP_MODNAME} == "iconv" -CONFIGURE_ARGS+=--with-iconv=${LOCALBASE} - -USES+= iconv:translit -.endif - -.if ${PHP_MODNAME} == "imap" -OPTIONS_DEFINE= PANDA -PANDA_DESC= Uses the forked panda-cclient instead of the original cclient - -CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ - --with-pcre-dir=${LOCALBASE} \ - --with-imap-ssl=${OPENSSLBASE} - -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USES+= ssl -.endif - -.if ${PHP_MODNAME} == "interbase" -CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} - -USES+= firebird -.endif - -.if ${PHP_MODNAME} == "intl" -CONFIGURE_ARGS+=--with-intl=${LOCALBASE} -LIB_DEPENDS= libicui18n.so:devel/icu -.endif - -.if ${PHP_MODNAME} == "json" -CONFIGURE_ARGS+=--enable-json -.endif - -.if ${PHP_MODNAME} == "ldap" -CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} - -USE_OPENLDAP= yes - -. ifdef(WANT_OPENLDAP_SASL) -CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE} -. endif -.endif - -.if ${PHP_MODNAME} == "mbstring" - -CONFIGURE_ARGS+=--enable-mbstring \ - --with-pcre-dir=${LOCALBASE} - -OPTIONS_DEFINE= REGEX -OPTIONS_DEFAULT=REGEX - -REGEX_DESC= Enable multibyte regex support - -PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls -.endif - -.if ${PHP_MODNAME} == "mcrypt" -LIB_DEPENDS+= libltdl.so:devel/libltdl \ - libmcrypt.so:security/libmcrypt - -CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "mysqli" -OPTIONS_DEFINE= MYSQLND -OPTIONS_DEFAULT=MYSQLND - -MYSQLND_DESC= Use MySQL Native Driver -.endif - -.if ${PHP_MODNAME} == "odbc" -LIB_DEPENDS+= libodbc.so:databases/unixODBC - -CONFIGURE_ARGS+=--enable-odbc \ - --with-unixODBC=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "openssl" -CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} - -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USES+= ssl -.endif - -.if ${PHP_MODNAME} == "opcache" -# This is needed by Zend extensions, keep before everything. -PHP_MOD_PRIO= 10 -CONFIGURE_ARGS+=--enable-opcache -USES+= localbase -.endif - -.if ${PHP_MODNAME} == "pcntl" -CONFIGURE_ARGS+=--enable-pcntl -.endif - -.if ${PHP_MODNAME} == "pdo" -CONFIGURE_ARGS+=--enable-pdo -.endif - -.if ${PHP_MODNAME} == "pdo_dblib" -CONFIGURE_ARGS+=--with-pdo-dblib=${LOCALBASE} - -USE_PHP= pdo:build - -OPTIONS_DEFINE= MSSQL - -MSSQL_DESC= Enable Microsoft SQL Server support -.endif - -.if ${PHP_MODNAME} == "pdo_firebird" -CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE} - -USES+= firebird -USE_PHP= pdo:build -.endif - -.if ${PHP_MODNAME} == "pdo_odbc" -LIB_DEPENDS+= libodbc.so:databases/unixODBC -CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE} - -USE_PHP= pdo:build -.endif - -.if ${PHP_MODNAME} == "pdo_mysql" -OPTIONS_DEFINE= MYSQLND -OPTIONS_DEFAULT=MYSQLND - -MYSQLND_DESC= Use MySQL Native Driver - -USE_PHP= pdo:build -.endif - -.if ${PHP_MODNAME} == "pdo_pgsql" -USES+= pgsql - -CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE} - -USE_PHP= pdo:build -.endif - -.if ${PHP_MODNAME} == "pdo_sqlite" -USES+= sqlite -CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE} - -USE_PHP= pdo:build -.endif - -.if ${PHP_MODNAME} == "pgsql" -USES+= pgsql - -CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "phar" -CONFIGURE_ARGS+=--enable-phar \ - --with-pcre-dir=${LOCALBASE} - -USE_PHP= hash:build -.endif - -.if ${PHP_MODNAME} == "posix" -CONFIGURE_ARGS+=--enable-posix -.endif - -.if ${PHP_MODNAME} == "pspell" -LIB_DEPENDS+= libaspell.so:textproc/aspell - -CONFIGURE_ARGS+=--with-pspell=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "readline" -CONFIGURE_ARGS+=--with-readline=/usr -USES+= readline -.endif - -.if ${PHP_MODNAME} == "recode" -LIB_DEPENDS+= librecode.so:converters/recode - -CONFIGURE_ARGS+=--with-recode=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "session" -CONFIGURE_ARGS+=--enable-session -PHP_MOD_PRIO= 18 -.endif - -.if ${PHP_MODNAME} == "shmop" -CONFIGURE_ARGS+=--enable-shmop -.endif - -.if ${PHP_MODNAME} == "simplexml" -CONFIGURE_ARGS+=--enable-simplexml \ - --with-pcre-dir=${LOCALBASE} \ - --with-libxml-dir=${LOCALBASE} - -USES+= pkgconfig -USE_GNOME= libxml2 -.endif - -.if ${PHP_MODNAME} == "snmp" -CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \ - --with-openssl-dir=${OPENSSLBASE} - -CONFIGURE_ENV+= ac_cv_buggy_snprint_value="no" - -LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net-snmp -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USES+= ssl -.endif - -.if ${PHP_MODNAME} == "soap" -CONFIGURE_ARGS+=--enable-soap \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 -.endif - -.if ${PHP_MODNAME} == "sockets" -CONFIGURE_ARGS+=--enable-sockets -.endif - -.if ${PHP_MODNAME} == "sqlite3" -USES+= sqlite -CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "sybase_ct" -LIB_DEPENDS+= libct.so:databases/freetds - -CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "sysvmsg" -CONFIGURE_ARGS+=--enable-sysvmsg -.endif - -.if ${PHP_MODNAME} == "sysvsem" -CONFIGURE_ARGS+=--enable-sysvsem -.endif - -.if ${PHP_MODNAME} == "sysvshm" -CONFIGURE_ARGS+=--enable-sysvshm -.endif - -.if ${PHP_MODNAME} == "tidy" -CONFIGURE_ARGS+=--with-tidy=${LOCALBASE} - -LIB_DEPENDS+= libtidy.so:www/tidy-lib -.endif - -.if ${PHP_MODNAME} == "tokenizer" -CONFIGURE_ARGS+=--enable-tokenizer -.endif - -.if ${PHP_MODNAME} == "wddx" -CONFIGURE_ARGS+=--enable-wddx \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 - -USE_PHP= xml:build session:build -.endif - -.if ${PHP_MODNAME} == "xml" -CONFIGURE_ARGS+=--enable-xml \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 -.endif - -.if ${PHP_MODNAME} == "xmlreader" -CONFIGURE_ARGS+=--enable-xmlreader \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 - -USE_PHP= dom:build -.endif - -.if ${PHP_MODNAME} == "xmlrpc" -CONFIGURE_ARGS+=--with-xmlrpc \ - --with-libxml-dir=${LOCALBASE} \ - --with-iconv-dir=${LOCALBASE} - -USES+= iconv:translit -USE_GNOME= libxml2 - -PHP_HEADER_DIRS=libxmlrpc - -USE_PHP= xml:build -.endif - -.if ${PHP_MODNAME} == "xmlwriter" -CONFIGURE_ARGS+=--enable-xmlwriter \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 -.endif - -.if ${PHP_MODNAME} == "xsl" -CONFIGURE_ARGS+=--with-xsl=${LOCALBASE} - -USE_GNOME= libxslt -USE_PHP= dom:build xml:build -.endif - -.if ${PHP_MODNAME} == "zip" -LIB_DEPENDS+= libzip.so:archivers/libzip - -CONFIGURE_ARGS+=--enable-zip \ - --with-zlib-dir=/usr \ - --with-pcre-dir=${LOCALBASE} \ - --with-libzip=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "zlib" -CONFIGURE_ARGS+=--with-zlib=/usr -.endif - -.include <bsd.port.options.mk> - -.if ${PHP_MODNAME} == "dba" -. if empty(PORT_OPTIONS:MCDB) -CONFIGURE_ARGS+=--without-cdb -. endif -. if ${PORT_OPTIONS:MDB4} -CONFIGURE_ARGS+=--with-db4=${LOCALBASE} - -USES+= bdb -WITH_BDB_HIGHEST= yes -. endif -. if ${PORT_OPTIONS:MGDBM} -LIB_DEPENDS+= libgdbm.so:databases/gdbm - -CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE} -. endif -. if ${PORT_OPTIONS:MQDBM} -LIB_DEPENDS+= libqdbm.so:databases/qdbm - -CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE} -. endif -. if ${PORT_OPTIONS:MTOKYO} -LIB_DEPENDS+= libtokyocabinet.so:databases/tokyocabinet - -CONFIGURE_ARGS+=--with-tcadb=${LOCALBASE} -. endif -. if empty(PORT_OPTIONS:MINIFILE) -CONFIGURE_ARGS+=--disable-inifile -. endif -. if empty(PORT_OPTIONS:MFLATFILE) -CONFIGURE_ARGS+=--disable-flatfile -. endif -.endif - -.if ${PHP_MODNAME} == "mysqli" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysqli=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config -USES+= mysql -. endif -.endif - -.if ${PHP_MODNAME} == "pdo_mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd -. else -CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr -USES+= mysql -. endif -.endif - -.if ${PHP_MODNAME} == "gd" -. if ${PORT_OPTIONS:MTRUETYPE} -CONFIGURE_ARGS+=--enable-gd-native-ttf -. endif -. if ${PORT_OPTIONS:MJIS} -CONFIGURE_ARGS+=--enable-gd-jis-conv -. endif -. if ${PORT_OPTIONS:MWEBP} -LIB_DEPENDS+= libwebp.so:graphics/webp - -CONFIGURE_ARGS+=--with-webp-dir=${LOCALBASE} -. endif -. if ${PORT_OPTIONS:MX11} -USES+= xorg -USE_XORG= x11 xpm - -CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} -. endif -.endif - -.include <bsd.port.pre.mk> - -.if ${PHP_MODNAME} == "imap" -PHP_MOD_PRIO= 30 -. if ${PORT_OPTIONS:MPANDA} -LIB_DEPENDS+= libc-client4.so.10:mail/panda-cclient -. else -LIB_DEPENDS+= libc-client4.so.9:mail/cclient -. endif -.endif - -.if ${PHP_MODNAME} == "mbstring" -. if ${PORT_OPTIONS:MREGEX} -LIB_DEPENDS+= libonig.so:devel/oniguruma -CONFIGURE_ARGS+=--with-onig=${LOCALBASE} -. else -CONFIGURE_ARGS+=--disable-mbregex -. endif -.endif - -.if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3" -post-extract: - @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 -.endif - -.if ${PHP_MODNAME} == "pdo_dblib" -. if ${PORT_OPTIONS:MMSSQL} -LIB_DEPENDS+= libsybdb.so:databases/freetds -. else -LIB_DEPENDS+= libct.so:databases/freetds -. endif -.endif - -.if ${PHP_MODNAME} == "xml" -post-extract: - @${MKDIR} ${WRKSRC}/ext/xml - @${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml -.endif - -.if ${PHP_MODNAME} == "zlib" -post-extract: - @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 -.endif diff --git a/lang/php71/distinfo b/lang/php71/distinfo deleted file mode 100644 index 93b8fe98ca7f..000000000000 --- a/lang/php71/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1571995551 -SHA256 (php-7.1.33.tar.xz) = bd7c0a9bd5433289ee01fd440af3715309faf583f75832b64fe169c100d52968 -SIZE (php-7.1.33.tar.xz) = 12370228 -SHA256 (php-7.1.x-mail-header.patch) = 8f173d89672f7ebfabfcc3c5d7f8dec1c4243aba665db4b4046e67c34d9d4dc7 -SIZE (php-7.1.x-mail-header.patch) = 4504 diff --git a/lang/php71/files/patch-Makefile.global b/lang/php71/files/patch-Makefile.global deleted file mode 100644 index dda63ac4508e..000000000000 --- a/lang/php71/files/patch-Makefile.global +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile.global.orig 2016-08-17 19:50:48 UTC -+++ Makefile.global -@@ -89,14 +89,14 @@ test: all - @if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ - INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \ - if test "$$INI_FILE"; then \ -- $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ -+ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini || :; \ - else \ - echo > $(top_builddir)/tmp-php.ini; \ - fi; \ - INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \ - if test "$$INI_SCANNED_PATH"; then \ - INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \ -- $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \ -+ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini || :; \ - fi; \ - TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ - TEST_PHP_SRCDIR=$(top_srcdir) \ diff --git a/lang/php71/files/patch-Zend_zend__hash.c b/lang/php71/files/patch-Zend_zend__hash.c deleted file mode 100644 index fd92c31802ae..000000000000 --- a/lang/php71/files/patch-Zend_zend__hash.c +++ /dev/null @@ -1,11 +0,0 @@ ---- Zend/zend_hash.c.orig 2017-12-13 20:22:03 UTC -+++ Zend/zend_hash.c -@@ -1544,7 +1544,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_ap - } - - --ZEND_API void ZEND_FASTCALL zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int num_args, ...) -+ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int num_args, ...) - { - uint32_t idx; - Bucket *p; diff --git a/lang/php71/files/patch-Zend_zend__hash.h b/lang/php71/files/patch-Zend_zend__hash.h deleted file mode 100644 index ba3f8fd157fd..000000000000 --- a/lang/php71/files/patch-Zend_zend__hash.h +++ /dev/null @@ -1,11 +0,0 @@ ---- Zend/zend_hash.h.orig 2017-12-13 20:15:42 UTC -+++ Zend/zend_hash.h -@@ -138,7 +138,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_gr - ZEND_API void ZEND_FASTCALL zend_hash_graceful_reverse_destroy(HashTable *ht); - ZEND_API void ZEND_FASTCALL zend_hash_apply(HashTable *ht, apply_func_t apply_func); - ZEND_API void ZEND_FASTCALL zend_hash_apply_with_argument(HashTable *ht, apply_func_arg_t apply_func, void *); --ZEND_API void ZEND_FASTCALL zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int, ...); -+ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int, ...); - - /* This function should be used with special care (in other words, - * it should usually not be used). When used with the ZEND_HASH_APPLY_STOP diff --git a/lang/php71/files/patch-acinclude.m4 b/lang/php71/files/patch-acinclude.m4 deleted file mode 100644 index 859880c2c676..000000000000 --- a/lang/php71/files/patch-acinclude.m4 +++ /dev/null @@ -1,68 +0,0 @@ ---- acinclude.m4.orig 2016-07-20 13:11:26 UTC -+++ acinclude.m4 -@@ -985,15 +985,9 @@ dnl ------------------------------------ - if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then - dnl ---------------------------------------------- CLI static module - [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no -- case "$PHP_SAPI" in -- cgi|embed[)] -- PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,) -- EXT_STATIC="$EXT_STATIC $1;$ext_dir" -- ;; -- *[)] -- PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,cli) -- ;; -- esac -+ -+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi) -+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm) - EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir" - fi - PHP_ADD_BUILD_DIR($ext_builddir) -@@ -1043,12 +1037,6 @@ You either need to build $1 shared or bu - build to be successful. - ]) - fi -- if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then -- AC_MSG_ERROR([ --You've configured extension $1, which depends on extension $2, --but you've either not enabled $2, or have disabled it. --]) -- fi - dnl Some systems require that we link $2 to $1 when building - ]) - -@@ -2975,8 +2963,7 @@ dnl in GNU Make which causes the .d file - $abs_srcdir/$ac_provsrc:; - - $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc -- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ -- -+ CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ - \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj - - EOF -@@ -2995,12 +2982,12 @@ dnl Always attempt to create both PIC an - $ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS) - echo "[#] Generated by Makefile for libtool" > \$[]@ - @test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir -- if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\] -+ if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\] - echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\] - else [\\] - echo "pic_object='none'" >> \$[]@ [;\\] - fi -- if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\] -+ if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\] - echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\] - else [\\] - echo "non_pic_object='none'" >> \$[]@ [;\\] -@@ -3012,7 +2999,7 @@ EOF - *) - cat>>Makefile.objects<<EOF - $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS) -- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs -+ CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs - - EOF - ;; diff --git a/lang/php71/files/patch-configure.in b/lang/php71/files/patch-configure.in deleted file mode 100644 index 92624d582af5..000000000000 --- a/lang/php71/files/patch-configure.in +++ /dev/null @@ -1,61 +0,0 @@ ---- configure.in.orig 2018-01-03 02:32:22 UTC -+++ configure.in -@@ -115,6 +115,7 @@ int zend_sprintf(char *buffer, const char *format, ... - #endif - - #undef PTHREADS -+#include <ext/php_config.h> - ]) - - PHP_MAJOR_VERSION=7 -@@ -370,7 +371,6 @@ sinclude(TSRM/tsrm.m4) - dnl . - dnl ------------------------------------------------------------------------- - --PTHREADS_CHECK - PHP_HELP_SEPARATOR([SAPI modules:]) - PHP_SHLIB_SUFFIX_NAMES - PHP_BUILD_PROGRAM -@@ -401,15 +401,9 @@ else - AC_MSG_RESULT([none]) - fi - --dnl Exit early --if test -z "$PHP_INSTALLED_SAPIS"; then -- AC_MSG_ERROR([Nothing to build.]) --fi -- - dnl force ZTS - if test "$enable_maintainer_zts" = "yes"; then - PTHREADS_ASSIGN_VARS -- PTHREADS_FLAGS - fi - - dnl Starting system checks. -@@ -701,7 +695,7 @@ nanosleep \ - ) - - dnl Some systems (like OpenSolaris) do not have nanosleep in libc --PHP_CHECK_FUNC_LIB(nanosleep, rt) -+PHP_CHECK_FUNC(nanosleep, rt) - - dnl Check for getaddrinfo, should be a better way, but... - dnl Also check for working getaddrinfo -@@ -1252,7 +1246,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` - EXPANDED_DATADIR=$datadir - EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` - EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` --INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR -+INCLUDE_PATH=.:${prefix}/share/pear - - exec_prefix=$old_exec_prefix - libdir=$old_libdir -@@ -1461,7 +1455,7 @@ PHP_SUBST(all_targets) - PHP_SUBST(install_targets) - PHP_SUBST(install_binary_targets) - --PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/]) -+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/]) - - PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) - diff --git a/lang/php71/files/patch-sapi_apache2handler_config.m4 b/lang/php71/files/patch-sapi_apache2handler_config.m4 deleted file mode 100644 index a81062805840..000000000000 --- a/lang/php71/files/patch-sapi_apache2handler_config.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- sapi/apache2handler/config.m4.orig 2016-07-20 13:11:37 UTC -+++ sapi/apache2handler/config.m4 -@@ -67,7 +67,7 @@ if test "$PHP_APXS2" != "no"; then - fi - - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` -- if test -z `$APXS -q SYSCONFDIR`; then -+ if true; then - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -i -n php7" diff --git a/lang/php71/files/patch-sapi_fpm_config.m4 b/lang/php71/files/patch-sapi_fpm_config.m4 deleted file mode 100644 index 69797ccb8aa3..000000000000 --- a/lang/php71/files/patch-sapi_fpm_config.m4 +++ /dev/null @@ -1,19 +0,0 @@ ---- sapi/fpm/config.m4.orig 2016-07-20 13:11:36 UTC -+++ sapi/fpm/config.m4 -@@ -317,14 +317,14 @@ AC_DEFUN([AC_FPM_LQ], - - AC_MSG_CHECKING([for TCP_INFO]) - -- AC_TRY_COMPILE([ #include <netinet/tcp.h> ], [struct tcp_info ti; int x = TCP_INFO;], [ -+ AC_TRY_COMPILE([ #include <netinet/tcp.h> ], [struct tcp_info ti; ti.tcpi_sacked = 0; int x = TCP_INFO;], [ - have_lq=tcp_info - AC_MSG_RESULT([yes]) - ], [ - AC_MSG_RESULT([no]) - ]) - -- if test "$have_lq" = "tcp_info"; then -+ if test "$have_lq" = "so_listenq"; then - AC_DEFINE([HAVE_LQ_TCP_INFO], 1, [do we have TCP_INFO?]) - fi - diff --git a/lang/php71/files/php-fpm.in b/lang/php71/files/php-fpm.in deleted file mode 100644 index 1c9d7f5c81ba..000000000000 --- a/lang/php71/files/php-fpm.in +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: php-fpm -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable php-fpm: -# php_fpm_enable="YES" -# - -. /etc/rc.subr - -name="php_fpm" -rcvar=php_fpm_enable - -start_precmd="php_fpm_prestart" -restart_precmd="php_fpm_checkconfig" -reload_precmd="php_fpm_checkconfig" -configtest_cmd="php_fpm_checkconfig" - -load_rc_config "$name" - -: ${php_fpm_enable="NO"} -: ${php_fpm_umask=""} - -extra_commands="reload configtest logrotate" - -command="%%PREFIX%%/sbin/php-fpm" -pidfile="/var/run/php-fpm.pid" -sig_stop="QUIT" -sig_reload="USR2" -logrotate_cmd="php_fpm_logrotate" - -required_files="%%PREFIX%%/etc/php-fpm.conf" - -php_fpm_logrotate() { - if [ -z "$rc_pid" ]; then - _run_rc_notrunning - return 1 - fi - echo "Rotating logs $name." - kill -USR1 $rc_pid -} - -php_fpm_checkconfig() -{ - echo "Performing sanity check on php-fpm configuration:" - eval ${command} -t -} - -php_fpm_prestart() -{ - php_fpm_checkconfig - checkconfig=$? - if [ $checkconfig -ne 0 ]; then - return $checkconfig - fi - - if [ ! -z "$php_fpm_umask" ]; then - echo "Setting umask to: ${php_fpm_umask}" - umask $php_fpm_umask - fi -} - -run_rc_command "$1" diff --git a/lang/php71/pkg-descr b/lang/php71/pkg-descr deleted file mode 100644 index ea14e767e1c9..000000000000 --- a/lang/php71/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -PHP, which stands for "PHP: Hypertext Preprocessor" is a widely-used Open -Source general-purpose scripting language that is especially suited for -Web development and can be embedded into HTML. Its syntax draws upon C, -Java, and Perl, and is easy to learn. The main goal of the language is to -allow web developers to write dynamically generated webpages quickly, but -you can do much more with PHP. - -WWW: https://www.php.net/ diff --git a/lang/php71/pkg-message.mod b/lang/php71/pkg-message.mod deleted file mode 100644 index b936fbfd2e2d..000000000000 --- a/lang/php71/pkg-message.mod +++ /dev/null @@ -1,19 +0,0 @@ -[ -{ type: install - message: <<EOM -Make sure index.php is part of your DirectoryIndex. - -You should add the following to your Apache configuration file: - -<FilesMatch "\.php$"> - SetHandler application/x-httpd-php -</FilesMatch> -<FilesMatch "\.phps$"> - SetHandler application/x-httpd-php-source -</FilesMatch> - -If you are building PHP-based ports in poudriere(8) or Synth with ZTS enabled, -add WITH_MPM=event to /etc/make.conf to prevent build failures. -EOM -} -] diff --git a/lang/php71/pkg-plist b/lang/php71/pkg-plist deleted file mode 100644 index a4e82b80f7db..000000000000 --- a/lang/php71/pkg-plist +++ /dev/null @@ -1,259 +0,0 @@ -%%CLI%%bin/php -%%CGI%%bin/php-cgi -bin/php-config -%%PHPDBG%%bin/phpdbg -bin/phpize -%%FPM%%sbin/php-fpm -etc/php.conf -etc/php.ini-development -etc/php.ini-production -%%FPM%%@sample etc/php-fpm.conf.default etc/php-fpm.conf -%%FPM%%@sample etc/php-fpm.d/www.conf.default etc/php-fpm.d/www.conf -include/php/TSRM/TSRM.h -include/php/TSRM/readdir.h -include/php/TSRM/tsrm_config.h -include/php/TSRM/tsrm_config.w32.h -include/php/TSRM/tsrm_config_common.h -include/php/TSRM/tsrm_nw.h -include/php/TSRM/tsrm_strtok_r.h -include/php/TSRM/tsrm_win32.h -include/php/Zend/zend.h -include/php/Zend/zend_API.h -include/php/Zend/zend_alloc.h -include/php/Zend/zend_alloc_sizes.h -include/php/Zend/zend_arena.h -include/php/Zend/zend_ast.h -include/php/Zend/zend_bitset.h -include/php/Zend/zend_build.h -include/php/Zend/zend_builtin_functions.h -include/php/Zend/zend_closures.h -include/php/Zend/zend_compile.h -include/php/Zend/zend_config.h -include/php/Zend/zend_config.nw.h -include/php/Zend/zend_config.w32.h -include/php/Zend/zend_constants.h -include/php/Zend/zend_dtrace.h -%%DTRACE%%include/php/Zend/zend_dtrace_gen.h -include/php/Zend/zend_errors.h -include/php/Zend/zend_exceptions.h -include/php/Zend/zend_execute.h -include/php/Zend/zend_extensions.h -include/php/Zend/zend_float.h -include/php/Zend/zend_gc.h -include/php/Zend/zend_generators.h -include/php/Zend/zend_globals.h -include/php/Zend/zend_globals_macros.h -include/php/Zend/zend_hash.h -include/php/Zend/zend_highlight.h -include/php/Zend/zend_inheritance.h -include/php/Zend/zend_ini.h -include/php/Zend/zend_ini_parser.h -include/php/Zend/zend_ini_scanner.h -include/php/Zend/zend_ini_scanner_defs.h -include/php/Zend/zend_interfaces.h -include/php/Zend/zend_istdiostream.h -include/php/Zend/zend_iterators.h -include/php/Zend/zend_language_parser.h -include/php/Zend/zend_language_scanner.h -include/php/Zend/zend_language_scanner_defs.h -include/php/Zend/zend_list.h -include/php/Zend/zend_llist.h -include/php/Zend/zend_long.h -include/php/Zend/zend_modules.h -include/php/Zend/zend_multibyte.h -include/php/Zend/zend_multiply.h -include/php/Zend/zend_object_handlers.h -include/php/Zend/zend_objects.h -include/php/Zend/zend_objects_API.h -include/php/Zend/zend_operators.h -include/php/Zend/zend_portability.h -include/php/Zend/zend_ptr_stack.h -include/php/Zend/zend_range_check.h -include/php/Zend/zend_signal.h -include/php/Zend/zend_smart_str.h -include/php/Zend/zend_smart_str_public.h -include/php/Zend/zend_sort.h -include/php/Zend/zend_stack.h -include/php/Zend/zend_stream.h -include/php/Zend/zend_string.h -include/php/Zend/zend_strtod.h -include/php/Zend/zend_strtod_int.h -include/php/Zend/zend_ts_hash.h -include/php/Zend/zend_types.h -include/php/Zend/zend_type_info.h -include/php/Zend/zend_variables.h -include/php/Zend/zend_virtual_cwd.h -include/php/Zend/zend_vm.h -include/php/Zend/zend_vm_def.h -include/php/Zend/zend_vm_execute.h -include/php/Zend/zend_vm_opcodes.h -include/php/ext/date/lib/timelib.h -include/php/ext/date/lib/timelib_config.h -include/php/ext/date/lib/timelib_structs.h -include/php/ext/date/php_date.h -include/php/ext/libxml/php_libxml.h -%%MYSQLND%%include/php/ext/mysqlnd/config-win.h -%%MYSQLND%%include/php/ext/mysqlnd/mysql_float_to_double.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_alloc.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_auth.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_block_alloc.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_charset.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_commands.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_connection.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_debug.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_enum_n_def.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_ext_plugin.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_plugin.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_portability.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_priv.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_ps.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_read_buffer.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_result.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_result_meta.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_reverse_api.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_statistics.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_structs.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_wireprotocol.h -%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_vio.h -%%MYSQLND%%include/php/ext/mysqlnd/php_mysqlnd.h -include/php/ext/pcre/php_pcre.h -include/php/ext/spl/php_spl.h -include/php/ext/spl/spl_array.h -include/php/ext/spl/spl_directory.h -include/php/ext/spl/spl_dllist.h -include/php/ext/spl/spl_engine.h -include/php/ext/spl/spl_exceptions.h -include/php/ext/spl/spl_fixedarray.h -include/php/ext/spl/spl_functions.h -include/php/ext/spl/spl_heap.h -include/php/ext/spl/spl_iterators.h -include/php/ext/spl/spl_observer.h -include/php/ext/standard/base64.h -include/php/ext/standard/basic_functions.h -include/php/ext/standard/crc32.h -include/php/ext/standard/credits.h -include/php/ext/standard/credits_ext.h -include/php/ext/standard/credits_sapi.h -include/php/ext/standard/crypt_blowfish.h -include/php/ext/standard/crypt_freesec.h -include/php/ext/standard/css.h -include/php/ext/standard/cyr_convert.h -include/php/ext/standard/datetime.h -include/php/ext/standard/dl.h -include/php/ext/standard/exec.h -include/php/ext/standard/file.h -include/php/ext/standard/flock_compat.h -include/php/ext/standard/fsock.h -include/php/ext/standard/head.h -include/php/ext/standard/html.h -include/php/ext/standard/html_tables.h -include/php/ext/standard/info.h -include/php/ext/standard/md5.h -include/php/ext/standard/microtime.h -include/php/ext/standard/pack.h -include/php/ext/standard/pageinfo.h -include/php/ext/standard/php_array.h -include/php/ext/standard/php_assert.h -include/php/ext/standard/php_browscap.h -include/php/ext/standard/php_crypt.h -include/php/ext/standard/php_crypt_r.h -include/php/ext/standard/php_dir.h -include/php/ext/standard/php_dns.h -include/php/ext/standard/php_ext_syslog.h -include/php/ext/standard/php_filestat.h -include/php/ext/standard/php_fopen_wrappers.h -include/php/ext/standard/php_ftok.h -include/php/ext/standard/php_http.h -include/php/ext/standard/php_image.h -include/php/ext/standard/php_incomplete_class.h -include/php/ext/standard/php_iptc.h -include/php/ext/standard/php_lcg.h -include/php/ext/standard/php_link.h -include/php/ext/standard/php_mail.h -include/php/ext/standard/php_math.h -include/php/ext/standard/php_metaphone.h -include/php/ext/standard/php_mt_rand.h -include/php/ext/standard/php_password.h -include/php/ext/standard/php_rand.h -include/php/ext/standard/php_random.h -include/php/ext/standard/php_smart_string.h -include/php/ext/standard/php_smart_string_public.h -include/php/ext/standard/php_standard.h -include/php/ext/standard/php_string.h -include/php/ext/standard/php_type.h -include/php/ext/standard/php_uuencode.h -include/php/ext/standard/php_var.h -include/php/ext/standard/php_versioning.h -include/php/ext/standard/proc_open.h -include/php/ext/standard/quot_print.h -include/php/ext/standard/scanf.h -include/php/ext/standard/sha1.h -include/php/ext/standard/streamsfuncs.h -include/php/ext/standard/uniqid.h -include/php/ext/standard/url.h -include/php/ext/standard/url_scanner_ex.h -include/php/ext/standard/winver.h -@postexec touch %D/include/php/ext/php_config.h -@postunexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h -include/php/main/SAPI.h -include/php/main/build-defs.h -include/php/main/fastcgi.h -include/php/main/fopen_wrappers.h -include/php/main/http_status_codes.h -include/php/main/php.h -include/php/main/php_compat.h -include/php/main/php_config.h -include/php/main/php_content_types.h -include/php/main/php_getopt.h -include/php/main/php_globals.h -include/php/main/php_ini.h -include/php/main/php_main.h -include/php/main/php_memory_streams.h -include/php/main/php_network.h -include/php/main/php_open_temporary_file.h -include/php/main/php_output.h -include/php/main/php_reentrancy.h -include/php/main/php_scandir.h -include/php/main/php_stdint.h -include/php/main/php_streams.h -include/php/main/php_syslog.h -include/php/main/php_ticks.h -include/php/main/php_variables.h -include/php/main/php_version.h -include/php/main/rfc1867.h -include/php/main/snprintf.h -include/php/main/spprintf.h -include/php/main/streams/php_stream_context.h -include/php/main/streams/php_stream_filter_api.h -include/php/main/streams/php_stream_glob_wrapper.h -include/php/main/streams/php_stream_mmap.h -include/php/main/streams/php_stream_plain_wrapper.h -include/php/main/streams/php_stream_transport.h -include/php/main/streams/php_stream_userspace.h -include/php/main/streams/php_streams_int.h -%%CLI%%include/php/sapi/cli/cli.h -%%EMBED%%include/php/sapi/embed/php_embed.h -include/php/main/win95nt.h -%%EMBED%%lib/libphp7.so -lib/php/build/Makefile.global -lib/php/build/ax_check_compile_flag.m4 -lib/php/build/acinclude.m4 -lib/php/build/config.guess -lib/php/build/config.sub -lib/php/build/libtool.m4 -lib/php/build/ltmain.sh -lib/php/build/mkdep.awk -lib/php/build/phpize.m4 -lib/php/build/run-tests.php -lib/php/build/scan_makefile_in.awk -lib/php/build/shtool -%%CGI%%man/man1/php-cgi.1.gz -man/man1/php-config.1.gz -%%CLI%%man/man1/php.1.gz -%%PHPDBG%%man/man1/phpdbg.1.gz -man/man1/phpize.1.gz -%%FPM%%man/man8/php-fpm.8.gz -%%FPM%%share/php/fpm/status.html diff --git a/lang/php71/pkg-plist.mod b/lang/php71/pkg-plist.mod deleted file mode 100644 index 8939be6d3d5e..000000000000 --- a/lang/php71/pkg-plist.mod +++ /dev/null @@ -1,3 +0,0 @@ -%%APACHEMODDIR%%/%%AP_MODULE%% -@postexec %D/sbin/apxs -e -a -n %%AP_NAME%% %f -@preunexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f diff --git a/mail/Makefile b/mail/Makefile index d633ec066cf0..45d6f6875e10 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -463,7 +463,6 @@ SUBDIR += perdition SUBDIR += pflogsumm SUBDIR += pfqueue - SUBDIR += php71-imap SUBDIR += php72-imap SUBDIR += php73-imap SUBDIR += php74-imap diff --git a/mail/php71-imap/Makefile b/mail/php71-imap/Makefile deleted file mode 100644 index 7c56e35e9865..000000000000 --- a/mail/php71-imap/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= mail - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -imap - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/mail/php71-imap/files/patch-config.m4 b/mail/php71-imap/files/patch-config.m4 deleted file mode 100644 index ab7120b2c8c8..000000000000 --- a/mail/php71-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/math/Makefile b/math/Makefile index 53bcf86da098..1322c1af3675 100644 --- a/math/Makefile +++ b/math/Makefile @@ -654,8 +654,6 @@ SUBDIR += pecl-bitset SUBDIR += pecl-stats2 SUBDIR += petiga - SUBDIR += php71-bcmath - SUBDIR += php71-gmp SUBDIR += php72-bcmath SUBDIR += php72-gmp SUBDIR += php73-bcmath diff --git a/math/php71-bcmath/Makefile b/math/php71-bcmath/Makefile deleted file mode 100644 index f2fd416bb333..000000000000 --- a/math/php71-bcmath/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= math - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -bcmath - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/math/php71-gmp/Makefile b/math/php71-gmp/Makefile deleted file mode 100644 index 781f536d1824..000000000000 --- a/math/php71-gmp/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= math - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -gmp - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/misc/Makefile b/misc/Makefile index 36fa8e59d0e3..75b7efb721d4 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -358,7 +358,6 @@ SUBDIR += pecl-timezonedb SUBDIR += perkeep SUBDIR += pfm - SUBDIR += php71-calendar SUBDIR += php72-calendar SUBDIR += php73-calendar SUBDIR += php74-calendar diff --git a/misc/php71-calendar/Makefile b/misc/php71-calendar/Makefile deleted file mode 100644 index f6da89c85800..000000000000 --- a/misc/php71-calendar/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= misc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -calendar - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index e038a259154d..6dc156b21788 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -284,7 +284,6 @@ SUBDIR += pdagent-integrations SUBDIR += percona-monitoring-plugins SUBDIR += pftabled - SUBDIR += php71-snmp SUBDIR += php72-snmp SUBDIR += php73-snmp SUBDIR += php74-snmp diff --git a/net-mgmt/php71-snmp/Makefile b/net-mgmt/php71-snmp/Makefile deleted file mode 100644 index d21707e175fb..000000000000 --- a/net-mgmt/php71-snmp/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= net-mgmt - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -snmp - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/net/Makefile b/net/Makefile index 7b1cc8885380..1cb65f9dc791 100644 --- a/net/Makefile +++ b/net/Makefile @@ -964,10 +964,6 @@ SUBDIR += pen SUBDIR += pfinger SUBDIR += phamm - SUBDIR += php71-ldap - SUBDIR += php71-soap - SUBDIR += php71-sockets - SUBDIR += php71-xmlrpc SUBDIR += php72-ldap SUBDIR += php72-soap SUBDIR += php72-sockets diff --git a/net/php71-ldap/Makefile b/net/php71-ldap/Makefile deleted file mode 100644 index 4f318bb213ab..000000000000 --- a/net/php71-ldap/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -ldap - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/net/php71-soap/Makefile b/net/php71-soap/Makefile deleted file mode 100644 index 55c2013f0164..000000000000 --- a/net/php71-soap/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -soap - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/net/php71-sockets/Makefile b/net/php71-sockets/Makefile deleted file mode 100644 index 1a26abfa436b..000000000000 --- a/net/php71-sockets/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -sockets - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/net/php71-xmlrpc/Makefile b/net/php71-xmlrpc/Makefile deleted file mode 100644 index f1c28d03e6c0..000000000000 --- a/net/php71-xmlrpc/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -xmlrpc - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/net/php71-xmlrpc/files/patch-config.m4 b/net/php71-xmlrpc/files/patch-config.m4 deleted file mode 100644 index d2dc85f26a48..000000000000 --- a/net/php71-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 9adcd4073f45..167b9c332e0d 100644 --- a/security/Makefile +++ b/security/Makefile @@ -787,10 +787,6 @@ SUBDIR += pgpdump SUBDIR += pgpgpg SUBDIR += pgpin - SUBDIR += php71-filter - SUBDIR += php71-hash - SUBDIR += php71-mcrypt - SUBDIR += php71-openssl SUBDIR += php72-filter SUBDIR += php72-hash SUBDIR += php72-openssl diff --git a/security/php71-filter/Makefile b/security/php71-filter/Makefile deleted file mode 100644 index 372eeac3e2a1..000000000000 --- a/security/php71-filter/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -filter - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/security/php71-filter/files/patch-config.m4 b/security/php71-filter/files/patch-config.m4 deleted file mode 100644 index ab64c6c9d5ad..000000000000 --- a/security/php71-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/php71-hash/Makefile b/security/php71-hash/Makefile deleted file mode 100644 index e007b2cf9f51..000000000000 --- a/security/php71-hash/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -hash - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/security/php71-mcrypt/Makefile b/security/php71-mcrypt/Makefile deleted file mode 100644 index 7753cdc08f4c..000000000000 --- a/security/php71-mcrypt/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -mcrypt - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/security/php71-openssl/Makefile b/security/php71-openssl/Makefile deleted file mode 100644 index 9f3275642b9d..000000000000 --- a/security/php71-openssl/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -openssl - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/Makefile b/sysutils/Makefile index b948c6bcdc13..8a1ab0a8ec35 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -890,8 +890,6 @@ SUBDIR += pftables SUBDIR += pftop SUBDIR += phantom - SUBDIR += php71-fileinfo - SUBDIR += php71-posix SUBDIR += php72-fileinfo SUBDIR += php72-posix SUBDIR += php73-fileinfo diff --git a/sysutils/php71-fileinfo/Makefile b/sysutils/php71-fileinfo/Makefile deleted file mode 100644 index 78fb5f5dc4a0..000000000000 --- a/sysutils/php71-fileinfo/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= sysutils - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -fileinfo - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/php71-fileinfo/files/patch-config.m4 b/sysutils/php71-fileinfo/files/patch-config.m4 deleted file mode 100644 index 1348023ccf64..000000000000 --- a/sysutils/php71-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/php71-posix/Makefile b/sysutils/php71-posix/Makefile deleted file mode 100644 index d9a039822936..000000000000 --- a/sysutils/php71-posix/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= sysutils - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -posix - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/php71-posix/files/patch-posix.c b/sysutils/php71-posix/files/patch-posix.c deleted file mode 100644 index d2365b249569..000000000000 --- a/sysutils/php71-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 6345c2f48e28..7342368e61ea 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1168,16 +1168,6 @@ SUBDIR += perl2html SUBDIR += permute SUBDIR += php-mecab - SUBDIR += php71-ctype - SUBDIR += php71-dom - SUBDIR += php71-enchant - SUBDIR += php71-pspell - SUBDIR += php71-simplexml - SUBDIR += php71-wddx - SUBDIR += php71-xml - SUBDIR += php71-xmlreader - SUBDIR += php71-xmlwriter - SUBDIR += php71-xsl SUBDIR += php72-ctype SUBDIR += php72-dom SUBDIR += php72-enchant diff --git a/textproc/php71-ctype/Makefile b/textproc/php71-ctype/Makefile deleted file mode 100644 index e5495e2dfcbc..000000000000 --- a/textproc/php71-ctype/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -ctype - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php71-dom/Makefile b/textproc/php71-dom/Makefile deleted file mode 100644 index 12b78c9dfda0..000000000000 --- a/textproc/php71-dom/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -dom - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php71-enchant/Makefile b/textproc/php71-enchant/Makefile deleted file mode 100644 index 0adf665ba5ae..000000000000 --- a/textproc/php71-enchant/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -enchant - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php71-pspell/Makefile b/textproc/php71-pspell/Makefile deleted file mode 100644 index ed11ff89817b..000000000000 --- a/textproc/php71-pspell/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -pspell - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php71-simplexml/Makefile b/textproc/php71-simplexml/Makefile deleted file mode 100644 index 804990e003c0..000000000000 --- a/textproc/php71-simplexml/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -simplexml - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php71-simplexml/files/patch-config.m4 b/textproc/php71-simplexml/files/patch-config.m4 deleted file mode 100644 index ab12da0527e4..000000000000 --- a/textproc/php71-simplexml/files/patch-config.m4 +++ /dev/null @@ -1,43 +0,0 @@ ---- config.m4.orig 2018-11-09 21:17:02.404698000 +0100 -+++ config.m4 2018-11-09 21:18:57.799985000 +0100 -@@ -4,6 +4,9 @@ dnl config.m4 for extension simplexml - 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 @@ fi - - 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/php71-wddx/Makefile b/textproc/php71-wddx/Makefile deleted file mode 100644 index 88878fd98c79..000000000000 --- a/textproc/php71-wddx/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -wddx - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php71-wddx/files/patch-config.m4 b/textproc/php71-wddx/files/patch-config.m4 deleted file mode 100644 index 08787003b8f9..000000000000 --- a/textproc/php71-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/php71-wddx/files/patch-wddx.c b/textproc/php71-wddx/files/patch-wddx.c deleted file mode 100644 index a8a6a79fe47f..000000000000 --- a/textproc/php71-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/php71-xml/Makefile b/textproc/php71-xml/Makefile deleted file mode 100644 index 153a2760626a..000000000000 --- a/textproc/php71-xml/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -xml - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php71-xml/files/patch-compat.c b/textproc/php71-xml/files/patch-compat.c deleted file mode 100644 index 02125961b20c..000000000000 --- a/textproc/php71-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/php71-xmlreader/Makefile b/textproc/php71-xmlreader/Makefile deleted file mode 100644 index 8728ef004470..000000000000 --- a/textproc/php71-xmlreader/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -xmlreader - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php71-xmlwriter/Makefile b/textproc/php71-xmlwriter/Makefile deleted file mode 100644 index f8ff86d144f0..000000000000 --- a/textproc/php71-xmlwriter/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -xmlwriter - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php71-xsl/Makefile b/textproc/php71-xsl/Makefile deleted file mode 100644 index 2a2ad0760e0e..000000000000 --- a/textproc/php71-xsl/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -xsl - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php71-xsl/files/patch-php_xsl.h b/textproc/php71-xsl/files/patch-php_xsl.h deleted file mode 100644 index 9777187f8748..000000000000 --- a/textproc/php71-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 49b3826ddf08..9a5f84441fe5 100644 --- a/www/Makefile +++ b/www/Makefile @@ -392,7 +392,6 @@ SUBDIR += mod_mpm_itk SUBDIR += mod_pagespeed SUBDIR += mod_perl2 - SUBDIR += mod_php71 SUBDIR += mod_php72 SUBDIR += mod_php73 SUBDIR += mod_php74 @@ -1367,9 +1366,6 @@ SUBDIR += phalcon SUBDIR += phalcon4 SUBDIR += photo_gallery - SUBDIR += php71-opcache - SUBDIR += php71-session - SUBDIR += php71-tidy SUBDIR += php72-opcache SUBDIR += php72-session SUBDIR += php72-tidy diff --git a/www/mod_php71/Makefile b/www/mod_php71/Makefile deleted file mode 100644 index d7acbd2ba6ed..000000000000 --- a/www/mod_php71/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/php71 -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/php71-opcache/Makefile b/www/php71-opcache/Makefile deleted file mode 100644 index 416a3540249f..000000000000 --- a/www/php71-opcache/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= www - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -opcache - -TEST_TARGET= test - -USES= php:zend,noflavors - -.include "${MASTERDIR}/Makefile" diff --git a/www/php71-opcache/files/patch-zend__file__cache.c b/www/php71-opcache/files/patch-zend__file__cache.c deleted file mode 100644 index 937290216eef..000000000000 --- a/www/php71-opcache/files/patch-zend__file__cache.c +++ /dev/null @@ -1,14 +0,0 @@ ---- zend_file_cache.c.orig 2017-07-05 13:48:27 UTC -+++ zend_file_cache.c -@@ -24,9 +24,10 @@ - - #include "php.h" - -+#include "ZendAccelerator.h" -+ - #ifdef HAVE_OPCACHE_FILE_CACHE - --#include "ZendAccelerator.h" - #include "zend_file_cache.h" - #include "zend_shared_alloc.h" - #include "zend_accelerator_util_funcs.h" diff --git a/www/php71-session/Makefile b/www/php71-session/Makefile deleted file mode 100644 index 555b487453f0..000000000000 --- a/www/php71-session/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= www - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -session - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/www/php71-tidy/Makefile b/www/php71-tidy/Makefile deleted file mode 100644 index a22fe3945fc2..000000000000 --- a/www/php71-tidy/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= www - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -tidy - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" |