1
0
Fork 0
Browse Source

lang/php73: Remove port

- EOL reached on 2021-12-06
  https://www.php.net/eol.php

PR:             260624
Approved by:	tz (private email) ale portmgr (blanket)
Sponsored by:	Bounce Experts
main
Muhammad Moinur Rahman 7 months ago
parent
commit
cc378fb60b
  1. 65
      MOVED
  2. 19
      Mk/Uses/php.mk
  3. 2
      Mk/bsd.default-versions.mk
  4. 4
      archivers/Makefile
  5. 9
      archivers/php73-bz2/Makefile
  6. 9
      archivers/php73-phar/Makefile
  7. 41
      archivers/php73-phar/files/patch-config.m4
  8. 11
      archivers/php73-phar/files/patch-phar.c
  9. 9
      archivers/php73-zip/Makefile
  10. 9
      archivers/php73-zlib/Makefile
  11. 10
      archivers/php73-zlib/files/patch-zlib.c
  12. 3
      converters/Makefile
  13. 9
      converters/php73-iconv/Makefile
  14. 9
      converters/php73-mbstring/Makefile
  15. 51
      converters/php73-mbstring/files/patch-config.m4
  16. 9
      converters/php73-recode/Makefile
  17. 13
      databases/Makefile
  18. 9
      databases/php73-dba/Makefile
  19. 50
      databases/php73-dba/files/patch-config.m4
  20. 9
      databases/php73-interbase/Makefile
  21. 9
      databases/php73-mysqli/Makefile
  22. 13
      databases/php73-mysqli/files/patch-mysqli__api.c
  23. 9
      databases/php73-odbc/Makefile
  24. 111
      databases/php73-odbc/files/patch-config.m4
  25. 9
      databases/php73-pdo/Makefile
  26. 9
      databases/php73-pdo_dblib/Makefile
  27. 9
      databases/php73-pdo_firebird/Makefile
  28. 9
      databases/php73-pdo_mysql/Makefile
  29. 9
      databases/php73-pdo_odbc/Makefile
  30. 9
      databases/php73-pdo_pgsql/Makefile
  31. 9
      databases/php73-pdo_sqlite/Makefile
  32. 9
      databases/php73-pgsql/Makefile
  33. 9
      databases/php73-sqlite3/Makefile
  34. 10
      devel/Makefile
  35. 9
      devel/php73-gettext/Makefile
  36. 14
      devel/php73-intl/Makefile
  37. 213
      devel/php73-intl/files/patch-icu68
  38. 38
      devel/php73-intl/files/patch-icu70
  39. 9
      devel/php73-json/Makefile
  40. 9
      devel/php73-pcntl/Makefile
  41. 9
      devel/php73-readline/Makefile
  42. 30
      devel/php73-readline/files/patch-config.m4
  43. 13
      devel/php73-readline/files/patch-readline_cli.c
  44. 9
      devel/php73-shmop/Makefile
  45. 9
      devel/php73-sysvmsg/Makefile
  46. 9
      devel/php73-sysvsem/Makefile
  47. 9
      devel/php73-sysvshm/Makefile
  48. 9
      devel/php73-tokenizer/Makefile
  49. 2
      ftp/Makefile
  50. 9
      ftp/php73-curl/Makefile
  51. 13
      ftp/php73-ftp/Makefile
  52. 2
      graphics/Makefile
  53. 9
      graphics/php73-exif/Makefile
  54. 11
      graphics/php73-gd/Makefile
  55. 63
      graphics/php73-gd/files/patch-config.m4
  56. 83
      graphics/php73-gd/files/patch-gd.c
  57. 2
      lang/Makefile
  58. 114
      lang/php73-extensions/Makefile
  59. 7
      lang/php73-extensions/pkg-descr
  60. 193
      lang/php73/Makefile
  61. 570
      lang/php73/Makefile.ext
  62. 3
      lang/php73/distinfo
  63. 19
      lang/php73/files/patch-Makefile.global
  64. 68
      lang/php73/files/patch-acinclude.m4
  65. 61
      lang/php73/files/patch-configure.in
  66. 13
      lang/php73/files/patch-ext_mysqli_mysqli__api.c
  67. 12
      lang/php73/files/patch-ext_mysqli_mysqli__nonapi.c
  68. 12
      lang/php73/files/patch-ext_mysqli_mysqli__prop.c
  69. 11
      lang/php73/files/patch-ext_mysqli_php__mysqli__structs.h
  70. 11
      lang/php73/files/patch-sapi_apache2handler_config.m4
  71. 11
      lang/php73/files/patch-sapi_fpm_config.m4
  72. 17
      lang/php73/files/patch-sapi_fpm_www.conf.in
  73. 66
      lang/php73/files/php-fpm.in
  74. 8
      lang/php73/pkg-descr
  75. 19
      lang/php73/pkg-message.mod
  76. 265
      lang/php73/pkg-plist
  77. 3
      lang/php73/pkg-plist.mod
  78. 1
      mail/Makefile
  79. 9
      mail/php73-imap/Makefile
  80. 42
      mail/php73-imap/files/patch-config.m4
  81. 2
      math/Makefile
  82. 9
      math/php73-bcmath/Makefile
  83. 9
      math/php73-gmp/Makefile
  84. 1
      misc/Makefile
  85. 9
      misc/php73-calendar/Makefile
  86. 1
      net-mgmt/Makefile
  87. 9
      net-mgmt/php73-snmp/Makefile
  88. 4
      net/Makefile
  89. 9
      net/php73-ldap/Makefile
  90. 9
      net/php73-soap/Makefile
  91. 9
      net/php73-sockets/Makefile
  92. 9
      net/php73-xmlrpc/Makefile
  93. 23
      net/php73-xmlrpc/files/patch-config.m4
  94. 4
      security/Makefile
  95. 9
      security/php73-filter/Makefile
  96. 10
      security/php73-filter/files/patch-config.m4
  97. 9
      security/php73-hash/Makefile
  98. 9
      security/php73-openssl/Makefile
  99. 9
      security/php73-sodium/Makefile
  100. 17
      security/php73-sodium/files/patch-config.m4
  101. Some files were not shown because too many files have changed in this diff Show More

65
MOVED

@ -16778,3 +16778,68 @@ security/truecrypt|security/veracrypt|2022-01-23|Has expired: Development and su
graphics/radiance||2022-01-23|Has expired: Application uses deprecated OpenGL support in libmpv, see the comment in https://github.com/zbanks/radiance/issues/118
databases/postgis25||2022-01-25|Has expired: Deprecated in favour of databases/postgis3x
www/zend-framework1|www/zend-framework|2022-01-25|Has expired: Fails to work with current active PHP versions
archivers/php73-bz2|archivers/php74-bz2|2022-01-26|Has expired: Security support ended on 2021-12-06
archivers/php73-zlib|archivers/php74-zlib|2022-01-26|Has expired: Security support ended on 2021-12-06
archivers/php73-zip|archivers/php74-zip|2022-01-26|Has expired: Security support ended on 2021-12-06
archivers/php73-phar|archivers/php74-phar|2022-01-26|Has expired: Security support ended on 2021-12-06
math/php73-gmp|math/php74-gmp|2022-01-26|Has expired: Security support ended on 2021-12-06
math/php73-bcmath|math/php74-bcmath|2022-01-26|Has expired: Security support ended on 2021-12-06
net-mgmt/php73-snmp|net-mgmt/php74-snmp|2022-01-26|Has expired: Security support ended on 2021-12-06
converters/php73-iconv|converters/php74-iconv|2022-01-26|Has expired: Security support ended on 2021-12-06
converters/php73-mbstring|converters/php74-mbstring|2022-01-26|Has expired: Security support ended on 2021-12-06
converters/php73-recode||2022-01-26|Has expired: Security support ended on 2021-12-06
lang/php73|lang/php74|2022-01-26|Has expired: Security support ended on 2021-12-06
lang/php73-extensions|lang/php74-extensions|2022-01-26|Has expired: Security support ended on 2021-12-06
sysutils/php73-posix|sysutils/php74-posix|2022-01-26|Has expired: Security support ended on 2021-12-06
sysutils/php73-fileinfo|sysutils/php74-fileinfo|2022-01-26|Has expired: Security support ended on 2021-12-06
textproc/php73-xmlreader|textproc/php74-xmlreader|2022-01-26|Has expired: Security support ended on 2021-12-06
textproc/php73-ctype|textproc/php74-ctype|2022-01-26|Has expired: Security support ended on 2021-12-06
textproc/php73-simplexml|textproc/php74-simplexml|2022-01-26|Has expired: Security support ended on 2021-12-06
textproc/php73-xsl|textproc/php74-xsl|2022-01-26|Has expired: Security support ended on 2021-12-06
textproc/php73-dom|textproc/php74-dom|2022-01-26|Has expired: Security support ended on 2021-12-06
textproc/php73-xml|textproc/php74-xml|2022-01-26|Has expired: Security support ended on 2021-12-06
textproc/php73-enchant|textproc/php74-enchant|2022-01-26|Has expired: Security support ended on 2021-12-06
textproc/php73-pspell|textproc/php74-pspell|2022-01-26|Has expired: Security support ended on 2021-12-06
textproc/php73-xmlwriter|textproc/php74-xmlwriter|2022-01-26|Has expired: Security support ended on 2021-12-06
textproc/php73-wddx||2022-01-26|Has expired: Security support ended on 2021-12-06
ftp/php73-curl|ftp/php74-curl|2022-01-26|Has expired: Security support ended on 2021-12-06
ftp/php73-ftp|ftp/php74-ftp|2022-01-26|Has expired: Security support ended on 2021-12-06
devel/php73-shmop|devel/php74-shmop|2022-01-26|Has expired: Security support ended on 2021-12-06
devel/php73-readline|devel/php74-readline|2022-01-26|Has expired: Security support ended on 2021-12-06
devel/php73-sysvsem|devel/php74-sysvsem|2022-01-26|Has expired: Security support ended on 2021-12-06
devel/php73-sysvmsg|devel/php74-sysvmsg|2022-01-26|Has expired: Security support ended on 2021-12-06
devel/php73-pcntl|devel/php74-pcntl|2022-01-26|Has expired: Security support ended on 2021-12-06
devel/php73-tokenizer|devel/php74-tokenizer|2022-01-26|Has expired: Security support ended on 2021-12-06
devel/php73-json|devel/php74-json|2022-01-26|Has expired: Security support ended on 2021-12-06
devel/php73-sysvshm|devel/php74-sysvshm|2022-01-26|Has expired: Security support ended on 2021-12-06
devel/php73-gettext|devel/php74-gettext|2022-01-26|Has expired: Security support ended on 2021-12-06
devel/php73-intl|devel/php74-intl|2022-01-26|Has expired: Security support ended on 2021-12-06
www/php73-opcache|www/php74-opcache|2022-01-26|Has expired: Security support ended on 2021-12-06
www/mod_php73|www/mod_php74|2022-01-26|Has expired: Security support ended on 2021-12-06
www/php73-tidy|www/php74-tidy|2022-01-26|Has expired: Security support ended on 2021-12-06
www/php73-session|www/php74-session|2022-01-26|Has expired: Security support ended on 2021-12-06
graphics/php73-gd|graphics/php74-gd|2022-01-26|Has expired: Security support ended on 2021-12-06
graphics/php73-exif|graphics/php74-exif|2022-01-26|Has expired: Security support ended on 2021-12-06
security/php73-sodium|security/php74-sodium|2022-01-26|Has expired: Security support ended on 2021-12-06
security/php73-openssl|security/php74-openssl|2022-01-26|Has expired: Security support ended on 2021-12-06
security/php73-filter|security/php74-filter|2022-01-26|Has expired: Security support ended on 2021-12-06
security/php73-hash||2022-01-26|Has expired: Security support ended on 2021-12-06
databases/php73-pdo_dblib|databases/php74-pdo_dblib|2022-01-26|Has expired: Security support ended on 2021-12-06
databases/php73-pdo|databases/php74-pdo|2022-01-26|Has expired: Security support ended on 2021-12-06
databases/php73-dba|databases/php74-dba|2022-01-26|Has expired: Security support ended on 2021-12-06
databases/php73-pgsql|databases/php74-pgsql|2022-01-26|Has expired: Security support ended on 2021-12-06
databases/php73-odbc|databases/php74-odbc|2022-01-26|Has expired: Security support ended on 2021-12-06
databases/php73-interbase||2022-01-26|Has expired: Security support ended on 2021-12-06
databases/php73-pdo_sqlite|databases/php74-pdo_sqlite|2022-01-26|Has expired: Security support ended on 2021-12-06
databases/php73-sqlite3|databases/php74-sqlite3|2022-01-26|Has expired: Security support ended on 2021-12-06
databases/php73-pdo_pgsql|databases/php74-pdo_pgsql|2022-01-26|Has expired: Security support ended on 2021-12-06
databases/php73-pdo_odbc|databases/php74-pdo_odbc|2022-01-26|Has expired: Security support ended on 2021-12-06
databases/php73-mysqli|databases/php74-mysqli|2022-01-26|Has expired: Security support ended on 2021-12-06
databases/php73-pdo_mysql|databases/php74-pdo_mysql|2022-01-26|Has expired: Security support ended on 2021-12-06
databases/php73-pdo_firebird|databases/php74-pdo_firebird|2022-01-26|Has expired: Security support ended on 2021-12-06
misc/php73-calendar|misc/php74-calendar|2022-01-26|Has expired: Security support ended on 2021-12-06
mail/php73-imap|mail/php74-imap|2022-01-26|Has expired: Security support ended on 2021-12-06
net/php73-sockets|net/php74-sockets|2022-01-26|Has expired: Security support ended on 2021-12-06
net/php73-xmlrpc|net/php74-xmlrpc|2022-01-26|Has expired: Security support ended on 2021-12-06
net/php73-ldap|net/php74-ldap|2022-01-26|Has expired: Security support ended on 2021-12-06
net/php73-soap|net/php74-soap|2022-01-26|Has expired: Security support ended on 2021-12-06

19
Mk/Uses/php.mk

@ -40,7 +40,7 @@
# For example:
#
# USES= php:ext
# USE_PHP= xml wddx
# USE_PHP= xml
# PHP_MOD_PRIO= 40
#
# The port can set these options in its Makefile before bsd.port.pre.mk:
@ -108,7 +108,7 @@ DIST_SUBDIR= PECL
PHPBASE?= ${LOCALBASE}
_ALL_PHP_VERSIONS= 73 74 80 81
_ALL_PHP_VERSIONS= 74 80 81
# Make the already installed PHP the default one.
. if exists(${PHPBASE}/etc/php.conf)
@ -185,9 +185,6 @@ PHP_EXT_INC= hash json pcre spl
. elif ${PHP_VER} == 74
PHP_EXT_DIR= 20190902
PHP_EXT_INC= hash pcre spl
. elif ${PHP_VER} == 73
PHP_EXT_DIR= 20180731
PHP_EXT_INC= pcre spl
. else
# (rene) default to DEFAULT_VERSIONS
PHP_EXT_DIR= 20200930
@ -375,7 +372,7 @@ add-plist-phpext:
. if defined(USE_PHP) && ${USE_PHP:tl} != "yes"
# non-version specific components
_USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \
enchant exif fileinfo filter ftp gd gettext gmp \
enchant exif ffi fileinfo filter ftp gd gettext gmp \
hash iconv igbinary imap intl json ldap mbstring mcrypt \
memcache memcached mysqli odbc opcache \
openssl pcntl pcre pdo pdo_dblib pdo_firebird pdo_mysql \
@ -384,10 +381,9 @@ _USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \
sockets sodium spl sqlite3 sysvmsg sysvsem sysvshm \
tidy tokenizer xml xmlreader xmlrpc xmlwriter xsl zip zlib
# version specific components
_USE_PHP_VER73= ${_USE_PHP_ALL} interbase pdf recode wddx
_USE_PHP_VER74= ${_USE_PHP_ALL} ffi pdf
_USE_PHP_VER80= ${_USE_PHP_ALL} ffi
_USE_PHP_VER81= ${_USE_PHP_ALL} ffi
_USE_PHP_VER74= ${_USE_PHP_ALL} pdf
_USE_PHP_VER80= ${_USE_PHP_ALL}
_USE_PHP_VER81= ${_USE_PHP_ALL}
bcmath_DEPENDS= math/php${PHP_VER}-bcmath
bitset_DEPENDS= math/pecl-bitset@${PHP_FLAVOR}
@ -411,7 +407,6 @@ hash_DEPENDS= security/php${PHP_VER}-hash
iconv_DEPENDS= converters/php${PHP_VER}-iconv
igbinary_DEPENDS= converters/pecl-igbinary@${PHP_FLAVOR}
imap_DEPENDS= mail/php${PHP_VER}-imap
interbase_DEPENDS= databases/php${PHP_VER}-interbase
intl_DEPENDS= devel/php${PHP_VER}-intl
json_DEPENDS= devel/php${PHP_VER}-json
ldap_DEPENDS= net/php${PHP_VER}-ldap
@ -439,7 +434,6 @@ posix_DEPENDS= sysutils/php${PHP_VER}-posix
pspell_DEPENDS= textproc/php${PHP_VER}-pspell
radius_DEPENDS= net/pecl-radius@${PHP_FLAVOR}
readline_DEPENDS= devel/php${PHP_VER}-readline
recode_DEPENDS= converters/php${PHP_VER}-recode
redis_DEPENDS= databases/pecl-redis@${PHP_FLAVOR}
session_DEPENDS=www/php${PHP_VER}-session
shmop_DEPENDS= devel/php${PHP_VER}-shmop
@ -455,7 +449,6 @@ sysvsem_DEPENDS=devel/php${PHP_VER}-sysvsem
sysvshm_DEPENDS=devel/php${PHP_VER}-sysvshm
tidy_DEPENDS= www/php${PHP_VER}-tidy
tokenizer_DEPENDS= devel/php${PHP_VER}-tokenizer
wddx_DEPENDS= textproc/php${PHP_VER}-wddx
xml_DEPENDS= textproc/php${PHP_VER}-xml
xmlreader_DEPENDS= textproc/php${PHP_VER}-xmlreader
.if ${PHP_VER} >= 80

2
Mk/bsd.default-versions.mk

@ -107,7 +107,7 @@ PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R}
.endif
# Possible values: 9.6, 10, 11, 12, 13, 14
PGSQL_DEFAULT?= 13
# Possible values: 7.3, 7.4, 8.0, 8.1
# Possible values: 7.4, 8.0, 8.1
PHP_DEFAULT?= 8.0
# Possible values: 2.7, 3.7, 3.8, 3.9, 3.10, 3.11
PYTHON_DEFAULT?= 3.8

4
archivers/Makefile

@ -153,10 +153,6 @@
SUBDIR += php-lz4
SUBDIR += php-snappy
SUBDIR += php-zstd
SUBDIR += php73-bz2
SUBDIR += php73-phar
SUBDIR += php73-zip
SUBDIR += php73-zlib
SUBDIR += php74-bz2
SUBDIR += php74-phar
SUBDIR += php74-zip

9
archivers/php73-bz2/Makefile

@ -1,9 +0,0 @@
CATEGORIES= archivers
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -bz2
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
archivers/php73-phar/Makefile

@ -1,9 +0,0 @@
CATEGORIES= archivers
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -phar
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

41
archivers/php73-phar/files/patch-config.m4

@ -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

11
archivers/php73-phar/files/patch-phar.c

@ -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

9
archivers/php73-zip/Makefile

@ -1,9 +0,0 @@
CATEGORIES= archivers
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -zip
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
archivers/php73-zlib/Makefile

@ -1,9 +0,0 @@
CATEGORIES= archivers
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -zlib
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

10
archivers/php73-zlib/files/patch-zlib.c

@ -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);

3
converters/Makefile

@ -136,9 +136,6 @@
SUBDIR += pear-Services_JSON
SUBDIR += pecl-igbinary
SUBDIR += php-bsdconv
SUBDIR += php73-iconv
SUBDIR += php73-mbstring
SUBDIR += php73-recode
SUBDIR += php74-iconv
SUBDIR += php74-mbstring
SUBDIR += php80-iconv

9
converters/php73-iconv/Makefile

@ -1,9 +0,0 @@
CATEGORIES= converters
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -iconv
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
converters/php73-mbstring/Makefile

@ -1,9 +0,0 @@
CATEGORIES= converters
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -mbstring
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

51
converters/php73-mbstring/files/patch-config.m4

@ -1,51 +0,0 @@
--- config.m4.orig 2018-09-25 09:08:02 UTC
+++ config.m4
@@ -41,6 +41,30 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
PHP_ADD_INCLUDE([$ext_builddir/$dir])
done
+ dnl This is PECL build, check if bundled PCRE library is used
+ old_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS=$INCLUDES
+ AC_EGREP_CPP(yes,[
+#include <main/php_config.h>
+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
+yes
+#endif
+ ],[
+ PHP_PCRE_REGEX=yes
+ ],[
+ AC_EGREP_CPP(yes,[
+#include <main/php_config.h>
+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
+yes
+#endif
+ ],[
+ PHP_PCRE_REGEX=pecl
+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
+ ],[
+ PHP_PCRE_REGEX=no
+ ])
+ ])
+
if test "$ext_shared" = "no"; then
PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES)
out="php_config.h"
@@ -83,7 +107,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
int foo(int x, ...) {
va_list va;
va_start(va, x);
- va_arg(va, int);
va_arg(va, char *);
va_arg(va, double);
return 0;
@@ -334,6 +357,9 @@ PHP_ARG_WITH(onig, [for external oniguru
[ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
If DIR is not set, the bundled oniguruma will be used], no, no)
+PHP_ARG_WITH(pcre-dir, pcre install prefix,
+[ --with-pcre-dir MBSTRING: pcre install prefix], no, no)
+
if test "$PHP_MBSTRING" != "no"; then
AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support])

9
converters/php73-recode/Makefile

@ -1,9 +0,0 @@
CATEGORIES= converters
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -recode
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

13
databases/Makefile

@ -611,19 +611,6 @@
SUBDIR += pguri
SUBDIR += php-tarantool
SUBDIR += php-xapian
SUBDIR += php73-dba
SUBDIR += php73-interbase
SUBDIR += php73-mysqli
SUBDIR += php73-odbc
SUBDIR += php73-pdo
SUBDIR += php73-pdo_dblib
SUBDIR += php73-pdo_firebird
SUBDIR += php73-pdo_mysql
SUBDIR += php73-pdo_odbc
SUBDIR += php73-pdo_pgsql
SUBDIR += php73-pdo_sqlite
SUBDIR += php73-pgsql
SUBDIR += php73-sqlite3
SUBDIR += php74-dba
SUBDIR += php74-mysqli
SUBDIR += php74-odbc

9
databases/php73-dba/Makefile

@ -1,9 +0,0 @@
CATEGORIES= databases
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -dba
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

50
databases/php73-dba/files/patch-config.m4

@ -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)

9
databases/php73-interbase/Makefile

@ -1,9 +0,0 @@
CATEGORIES= databases
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -interbase
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
databases/php73-mysqli/Makefile

@ -1,9 +0,0 @@
CATEGORIES= databases
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -mysqli
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

13
databases/php73-mysqli/files/patch-mysqli__api.c

@ -1,13 +0,0 @@
--- mysqli_api.c.orig 2019-12-17 10:29:23 UTC
+++ mysqli_api.c
@@ -31,8 +31,9 @@
#include "zend_smart_str.h"
#include "php_mysqli_structs.h"
#include "mysqli_priv.h"
+#if defined(MYSQLI_USE_MYSQLND)
#include "ext/mysqlnd/mysql_float_to_double.h"
-
+#endif
#if !defined(MYSQLI_USE_MYSQLND)
/* {{{ mysqli_tx_cor_options_to_string */

9
databases/php73-odbc/Makefile

@ -1,9 +0,0 @@
CATEGORIES= databases
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -odbc
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

111
databases/php73-odbc/files/patch-config.m4

@ -1,111 +0,0 @@
--- config.m4.orig 2018-09-25 09:07:57 UTC
+++ config.m4
@@ -97,6 +97,9 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS
dnl
dnl configure options
dnl
+PHP_ARG_ENABLE(odbc,,
+[ --enable-odbc Enable ODBC support with selected driver])
+
PHP_ARG_WITH(odbcver,,
[ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0350.
@@ -104,7 +107,7 @@ PHP_ARG_WITH(odbcver,,
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(adabas,,
-[ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
+[ --with-adabas[=DIR] Include Adabas D support [/usr/local]], no, no)
AC_MSG_CHECKING([for Adabas support])
if test "$PHP_ADABAS" != "no"; then
@@ -133,7 +136,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(sapdb,,
-[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]])
+[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]], no, no)
AC_MSG_CHECKING([for SAP DB support])
if test "$PHP_SAPDB" != "no"; then
@@ -153,7 +156,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(solid,,
-[ --with-solid[=DIR] Include Solid support [/usr/local/solid]])
+[ --with-solid[=DIR] Include Solid support [/usr/local/solid]], no, no)
AC_MSG_CHECKING(for Solid support)
if test "$PHP_SOLID" != "no"; then
@@ -180,7 +183,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(ibm-db2,,
-[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]])
+[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]], no, no)
AC_MSG_CHECKING(for IBM DB2 support)
if test "$PHP_IBM_DB2" != "no"; then
@@ -220,7 +223,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(empress,,
[ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH]
- (Empress Version >= 8.60 required)])
+ (Empress Version >= 8.60 required)], no, no)
AC_MSG_CHECKING(for Empress support)
if test "$PHP_EMPRESS" != "no"; then
@@ -245,7 +248,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(empress-bcs,,
[ --with-empress-bcs[=DIR] Include Empress Local Access support [\$EMPRESSPATH]
- (Empress Version >= 8.60 required)])
+ (Empress Version >= 8.60 required)], no, no)
AC_MSG_CHECKING(for Empress local access support)
if test "$PHP_EMPRESS_BCS" != "no"; then
@@ -292,7 +295,7 @@ PHP_ARG_WITH(custom-odbc,,
running this configure script:
CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
LDFLAGS=-lunix
- CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"])
+ CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no)
AC_MSG_CHECKING(for a custom ODBC support)
if test "$PHP_CUSTOM_ODBC" != "no"; then
@@ -314,7 +317,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(iodbc,,
-[ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
+[ --with-iodbc[=DIR] Include iODBC support [/usr/local]], no, no)
AC_MSG_CHECKING(for iODBC support)
if test "$PHP_IODBC" != "no"; then
@@ -352,7 +355,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(esoob,,
-[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]])
+[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no)
AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
if test "$PHP_ESOOB" != "no"; then
@@ -374,7 +377,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(unixODBC,,
-[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]])
+[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]], no, no)
AC_MSG_CHECKING(for unixODBC support)
if test "$PHP_UNIXODBC" != "no"; then
@@ -397,7 +400,7 @@ fi
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(dbmaker,,
-[ --with-dbmaker[=DIR] Include DBMaker support])
+[ --with-dbmaker[=DIR] Include DBMaker support], no, no)
AC_MSG_CHECKING(for DBMaker support)
if test "$PHP_DBMAKER" != "no"; then

9
databases/php73-pdo/Makefile

@ -1,9 +0,0 @@
CATEGORIES= databases
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -pdo
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
databases/php73-pdo_dblib/Makefile

@ -1,9 +0,0 @@
CATEGORIES= databases
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -pdo_dblib
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
databases/php73-pdo_firebird/Makefile

@ -1,9 +0,0 @@
CATEGORIES= databases
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -pdo_firebird
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
databases/php73-pdo_mysql/Makefile

@ -1,9 +0,0 @@
CATEGORIES= databases
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -pdo_mysql
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
databases/php73-pdo_odbc/Makefile

@ -1,9 +0,0 @@
CATEGORIES= databases
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -pdo_odbc
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
databases/php73-pdo_pgsql/Makefile

@ -1,9 +0,0 @@
CATEGORIES= databases
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -pdo_pgsql
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
databases/php73-pdo_sqlite/Makefile

@ -1,9 +0,0 @@
CATEGORIES= databases
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -pdo_sqlite
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
databases/php73-pgsql/Makefile

@ -1,9 +0,0 @@
CATEGORIES= databases
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -pgsql
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
databases/php73-sqlite3/Makefile

@ -1,9 +0,0 @@
CATEGORIES= databases
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -sqlite3
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

10
devel/Makefile

@ -4017,16 +4017,6 @@
SUBDIR += php-ice37
SUBDIR += php-libawl
SUBDIR += php-maxminddb
SUBDIR += php73-gettext
SUBDIR += php73-intl
SUBDIR += php73-json
SUBDIR += php73-pcntl
SUBDIR += php73-readline
SUBDIR += php73-shmop
SUBDIR += php73-sysvmsg
SUBDIR += php73-sysvsem
SUBDIR += php73-sysvshm
SUBDIR += php73-tokenizer
SUBDIR += php74-ffi
SUBDIR += php74-gettext
SUBDIR += php74-intl

9
devel/php73-gettext/Makefile

@ -1,9 +0,0 @@
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -gettext
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

14
devel/php73-intl/Makefile

@ -1,14 +0,0 @@
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -intl
USES= compiler:c++11-lib
USE_CXXSTD= gnu++11
CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

213
devel/php73-intl/files/patch-icu68

@ -1,213 +0,0 @@
Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
ext/intl/breakiterator/codepointiterator_internal.cpp:60:53: error: use of undeclared identifier 'FALSE'
this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
^
ext/intl/breakiterator/codepointiterator_internal.cpp:60:60: error: use of undeclared identifier 'TRUE'
this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
^
ext/intl/breakiterator/codepointiterator_internal.cpp:80:10: error: use of undeclared identifier 'FALSE'
return FALSE;
^
ext/intl/breakiterator/codepointiterator_internal.cpp:87:10: error: use of undeclared identifier 'FALSE'
return FALSE;
^
ext/intl/breakiterator/codepointiterator_internal.cpp:90:9: error: use of undeclared identifier 'TRUE'
return TRUE;
^
ext/intl/breakiterator/codepointiterator_internal.cpp:111:42: error: use of undeclared identifier 'FALSE'
return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
^
ext/intl/breakiterator/codepointiterator_internal.cpp:111:49: error: use of undeclared identifier 'TRUE'
return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
^
ext/intl/breakiterator/codepointiterator_internal.cpp:130:47: error: use of undeclared identifier 'FALSE'
this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
^
ext/intl/breakiterator/codepointiterator_internal.cpp:130:54: error: use of undeclared identifier 'TRUE'
this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
^
ext/intl/breakiterator/codepointiterator_internal.cpp:282:48: error: use of undeclared identifier 'FALSE'
this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
^
ext/intl/breakiterator/codepointiterator_internal.cpp:282:55: error: use of undeclared identifier 'TRUE'
this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
^
ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE'
collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
^
ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE'
collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
^
ext/intl/dateformat/dateformat_attr.c:91:36: error: use of undeclared identifier 'FALSE'
zend_bool is_pattern_localized =FALSE;
^
ext/intl/dateformat/dateformat_attr.c:134:36: error: use of undeclared identifier 'FALSE'
zend_bool is_pattern_localized =FALSE;
^
ext/intl/dateformat/dateformat_attr.c:230:25: error: use of undeclared identifier 'FALSE'
zend_bool isLenient = FALSE;
^
ext/intl/normalizer/normalizer_normalize.c:95:10: error: use of undeclared identifier 'FALSE'
return FALSE;
^
ext/intl/normalizer/normalizer_normalize.c:181:16: error: use of undeclared identifier 'FALSE'
UBool uret = FALSE;
^
ext/intl/timezone/timezone_class.cpp:324:21: error: use of undeclared identifier 'FALSE'
tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
^
ext/intl/timezone/timezone_methods.cpp:94:57: error: use of undeclared identifier 'FALSE'
tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
^
--- breakiterator/codepointiterator_internal.cpp.orig 2020-09-29 08:33:05 UTC
+++ breakiterator/codepointiterator_internal.cpp
@@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIterator::operat
return *this;
}
- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
+ this->fText = utext_clone(this->fText, that.fText, false, true, &uec);
//don't bother copying the character iterator, getText() is deprecated
clearCurrentCharIter();
@@ -78,17 +78,17 @@ CodePointBreakIterator::~CodePointBreakIterator()
UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
{
if (typeid(*this) != typeid(that)) {
- return FALSE;
+ return false;
}
const CodePointBreakIterator& that2 =
static_cast<const CodePointBreakIterator&>(that);
if (!utext_equals(this->fText, that2.fText)) {
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
CodePointBreakIterator* CodePointBreakIterator::clone(void) const
@@ -109,7 +109,7 @@ CharacterIterator& CodePointBreakIterator::getText(voi
UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const
{
- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
+ return utext_clone(fillIn, this->fText, false, true, &status);
}
void CodePointBreakIterator::setText(const UnicodeString &text)
@@ -128,7 +128,7 @@ void CodePointBreakIterator::setText(UText *text, UErr
return;
}
- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
+ this->fText = utext_clone(this->fText, text, false, true, &status);
clearCurrentCharIter();
}
@@ -280,7 +280,7 @@ CodePointBreakIterator &CodePointBreakIterator::refres
}
int64_t pos = utext_getNativeIndex(this->fText);
- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
+ this->fText = utext_clone(this->fText, input, false, true, &status);
if (U_FAILURE(status)) {
return *this;
}
--- collator/collator_sort.c.orig 2020-09-29 08:33:05 UTC
+++ collator/collator_sort.c
@@ -346,7 +346,7 @@ static void collator_sort_internal( int renumber, INTE
*/
PHP_FUNCTION( collator_sort )
{
- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU );
}
/* }}} */
@@ -540,7 +540,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys )
*/
PHP_FUNCTION( collator_asort )
{
- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU );
}
/* }}} */
--- dateformat/dateformat_attr.c.orig 2020-09-29 08:33:05 UTC
+++ dateformat/dateformat_attr.c
@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern )
UChar value_buf[64];
uint32_t length = USIZE( value_buf );
UChar* value = value_buf;
- zend_bool is_pattern_localized =FALSE;
+ zend_bool is_pattern_localized = false;
DATE_FORMAT_METHOD_INIT_VARS;
@@ -131,7 +131,7 @@ PHP_FUNCTION( datefmt_set_pattern )
size_t value_len = 0;
int32_t slength = 0;
UChar* svalue = NULL;
- zend_bool is_pattern_localized =FALSE;
+ zend_bool is_pattern_localized = false;
DATE_FORMAT_METHOD_INIT_VARS;
@@ -227,7 +227,7 @@ PHP_FUNCTION( datefmt_is_lenient )
*/
PHP_FUNCTION( datefmt_set_lenient )
{
- zend_bool isLenient = FALSE;
+ zend_bool isLenient = false;
DATE_FORMAT_METHOD_INIT_VARS;
--- normalizer/normalizer_normalize.c.orig 2020-09-29 08:33:05 UTC
+++ normalizer/normalizer_normalize.c
@@ -92,7 +92,7 @@ static UBool intl_is_normalized(zend_long form, const
const UNormalizer2 *norm = intl_get_normalizer(form, err);
if(U_FAILURE(*err)) {
- return FALSE;
+ return false;
}
return unorm2_isNormalized(norm, uinput, uinput_len, err);
@@ -263,7 +263,7 @@ PHP_FUNCTION( normalizer_is_normalized )
int uinput_len = 0;
UErrorCode status = U_ZERO_ERROR;
- UBool uret = FALSE;
+ UBool uret = false;
intl_error_reset( NULL );
--- timezone/timezone_class.cpp.orig 2020-09-29 08:33:05 UTC
+++ timezone/timezone_class.cpp
@@ -322,7 +322,7 @@ static HashTable *TimeZone_get_debug_info(zval *object
int32_t rawOffset, dstOffset;
UDate now = Calendar::getNow();
- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
+ tz->getOffset(now, false, rawOffset, dstOffset, uec);
if (U_FAILURE(uec)) {
return debug_info;
}
--- timezone/timezone_methods.cpp.orig 2020-09-29 08:33:05 UTC
+++ timezone/timezone_methods.cpp
@@ -95,7 +95,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)
RETURN_NULL();
}
- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
+ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL,
"intltz_from_date_time_zone");
if (tz == NULL) {
RETURN_NULL();

38
devel/php73-intl/files/patch-icu70

@ -1,38 +0,0 @@
Regressed by https://github.com/unicode-org/icu/commit/633438f8da99
In file included from breakiterator/breakiterator_class.cpp:23:
breakiterator/codepointiterator_internal.h:42:17: error: virtual function 'operator==' has a different return type ('UBool' (aka 'signed char')) than the function it overrides (which has return type 'bool')
virtual UBool operator==(const BreakIterator& that) const;
~~~~~ ^
/usr/local/include/unicode/brkiter.h:127:18: note: overridden virtual function is here
virtual bool operator==(const BreakIterator&) const = 0;
~~~~ ^
--- breakiterator/codepointiterator_internal.cpp.orig 2021-09-21 10:24:05 UTC
+++ breakiterator/codepointiterator_internal.cpp
@@ -75,7 +75,11 @@ CodePointBreakIterator::~CodePointBreakIterator()
clearCurrentCharIter();
}
+#if U_ICU_VERSION_MAJOR_NUM < 70
UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
+#else
+bool CodePointBreakIterator::operator==(const BreakIterator& that) const
+#endif
{
if (typeid(*this) != typeid(that)) {
return FALSE;
--- breakiterator/codepointiterator_internal.h.orig 2021-09-21 10:24:05 UTC
+++ breakiterator/codepointiterator_internal.h
@@ -39,7 +39,11 @@ namespace PHP {
virtual ~CodePointBreakIterator();
+#if U_ICU_VERSION_MAJOR_NUM < 70
virtual UBool operator==(const BreakIterator& that) const;
+#else
+ virtual bool operator==(const BreakIterator& that) const;
+#endif
virtual CodePointBreakIterator* clone(void) const;

9
devel/php73-json/Makefile

@ -1,9 +0,0 @@
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -json
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
devel/php73-pcntl/Makefile

@ -1,9 +0,0 @@
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -pcntl
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
devel/php73-readline/Makefile

@ -1,9 +0,0 @@
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -readline
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

30
devel/php73-readline/files/patch-config.m4

@ -1,30 +0,0 @@
--- config.m4.orig 2019-02-05 13:10:04 UTC
+++ config.m4
@@ -3,13 +3,8 @@ dnl config.m4 for extension readline
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
@@ -72,6 +67,13 @@ if test "$PHP_READLINE" && test "$PHP_RE
-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

13
devel/php73-readline/files/patch-readline_cli.c

@ -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

9
devel/php73-shmop/Makefile

@ -1,9 +0,0 @@
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -shmop
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
devel/php73-sysvmsg/Makefile

@ -1,9 +0,0 @@
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -sysvmsg
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
devel/php73-sysvsem/Makefile

@ -1,9 +0,0 @@
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -sysvsem
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
devel/php73-sysvshm/Makefile

@ -1,9 +0,0 @@
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -sysvshm
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

9
devel/php73-tokenizer/Makefile

@ -1,9 +0,0 @@
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -tokenizer
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

2
ftp/Makefile

@ -55,8 +55,6 @@
SUBDIR += pear-Net_FTP
SUBDIR += pftpd
SUBDIR += php-fastdfs
SUBDIR += php73-curl
SUBDIR += php73-ftp
SUBDIR += php74-curl
SUBDIR += php74-ftp
SUBDIR += php80-curl

9
ftp/php73-curl/Makefile

@ -1,9 +0,0 @@
CATEGORIES= ftp
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -curl
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

13
ftp/php73-ftp/Makefile

@ -1,13 +0,0 @@
CATEGORIES= ftp
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -ftp
TEST_TARGET= test
post-patch:
@${REINPLACE_CMD} s/HAVE_OPENSSL_EXT/__FreeBSD__/ \
${WRKSRC}/ftp.* ${WRKSRC}/php_ftp.*
.include "${MASTERDIR}/Makefile"

2
graphics/Makefile

@ -761,8 +761,6 @@
SUBDIR += phototonic
SUBDIR += php-facedetect
SUBDIR += php-geos
SUBDIR += php73-exif
SUBDIR += php73-gd
SUBDIR += php74-exif
SUBDIR += php74-gd
SUBDIR += php80-exif

9
graphics/php73-exif/Makefile

@ -1,9 +0,0 @@
CATEGORIES= graphics
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -exif
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"

11
graphics/php73-gd/Makefile

@ -1,11 +0,0 @@
CATEGORIES= graphics
MASTERDIR= ${.CURDIR}/../../lang/php73
PKGNAMESUFFIX= -gd
TEST_TARGET= test
.include "${MASTERDIR}/Makefile"
LIB_DEPENDS+= libgd.so:graphics/gd

63
graphics/php73-gd/files/patch-config.m4

@ -1,63 +0,0 @@
--- config.m4.orig 2020-11-24 11:10:57 UTC
+++ config.m4
@@ -184,6 +184,9 @@ AC_DEFUN([PHP_GD_XPM],[
AC_DEFUN([PHP_GD_FREETYPE2],[
if test "$PHP_FREETYPE_DIR" != "no"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+ AC_MSG_CHECKING([for freetype])
for i in $PHP_FREETYPE_DIR /usr/local /usr; do
if test -f "$i/bin/freetype-config"; then
FREETYPE2_DIR=$i
@@ -192,13 +195,20 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
fi
done
- if test -z "$FREETYPE2_DIR"; then
+ if test -n "$FREETYPE2_CONFIG"; then
+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
+ AC_MSG_RESULT([found in $FREETYPE2_DIR])
+ elif test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists freetype2; then
+ FREETYPE2_DIR=pkg-config
+ FREETYPE2_CFLAGS=`$PKG_CONFIG freetype2 --cflags`
+ FREETYPE2_LIBS=`$PKG_CONFIG freetype2 --libs`
+ AC_MSG_RESULT([found by pkg-config])
+ else
+ AC_MSG_RESULT([not found])
AC_MSG_ERROR([freetype-config not found.])
fi
- FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
- FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-
PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
@@ -285,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
@@ -347,7 +358,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, [], [
@@ -355,7 +366,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.])

83
graphics/php73-gd/files/patch-gd.c

@ -1,83 +0,0 @@
--- gd.c.orig 2018-09-25 09:07:58 UTC
+++ gd.c
@@ -51,7 +51,7 @@
# include <Wingdi.h>
#endif
-#ifdef HAVE_GD_XPM
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
# include <X11/xpm.h>
#endif
@@ -75,7 +75,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
@@ -322,7 +322,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatef
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()
@@ -931,7 +931,7 @@ static const zend_function_entry gd_func
#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)
@@ -1296,7 +1296,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];
@@ -1351,7 +1351,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);
@@ -2178,7 +2178,7 @@ PHP_FUNCTION(imagetypes)
ret |= PHP_IMG_PNG;
#endif
ret |= PHP_IMG_WBMP;
-#if defined(HAVE_GD_XPM)
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
ret |= PHP_IMG_XPM;
#endif
#ifdef HAVE_GD_WEBP
@@ -2446,7 +2446,7 @@ static void _php_image_create_from(INTER
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;
@@ -2528,7 +2528,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)

2
lang/Makefile

@ -258,8 +258,6 @@
SUBDIR += pfe
SUBDIR += pharo
SUBDIR += php-mode.el