diff options
author | Torsten Zuehlsdorff <tz@FreeBSD.org> | 2020-10-21 22:58:51 +0000 |
---|---|---|
committer | Torsten Zuehlsdorff <tz@FreeBSD.org> | 2020-10-21 22:58:51 +0000 |
commit | 1061308ba7160b89e64adf0349a3a297137e9a8b (patch) | |
tree | 7759eddebe7bd2de031762b7cab386e48e4b52b4 /devel/php80-readline/files | |
parent | - Update to 0.10.1.0.0 (diff) |
Welcome PHP 8.0 RC 2 to the ports tree
There are many greater changes including:
- json is now part of core
- xmlrpc is removed
- More than 150 backward incompatible changes
Have a look at: https://github.com/php/php-src/blob/php-8.0.0RC2/UPGRADING
Reviewed by: ale, mfechner, Pascal Christen
Sponsored by: PHP Update Service
Differential Revision: https://reviews.freebsd.org/D26848
Diffstat (limited to 'devel/php80-readline/files')
-rw-r--r-- | devel/php80-readline/files/patch-config.m4 | 33 | ||||
-rw-r--r-- | devel/php80-readline/files/patch-readline_cli.c | 13 |
2 files changed, 46 insertions, 0 deletions
diff --git a/devel/php80-readline/files/patch-config.m4 b/devel/php80-readline/files/patch-config.m4 new file mode 100644 index 000000000000..93799734a3e3 --- /dev/null +++ b/devel/php80-readline/files/patch-config.m4 @@ -0,0 +1,33 @@ +--- config.m4.orig 2019-08-06 06:54:14 UTC ++++ config.m4 +@@ -3,16 +3,10 @@ PHP_ARG_WITH([libedit], + [AS_HELP_STRING([--with-libedit], + [Include libedit readline replacement (CLI/CGI only)])]) + +-if test "$PHP_LIBEDIT" = "no"; then + PHP_ARG_WITH([readline], + [for readline support], + [AS_HELP_STRING([[--with-readline[=DIR]]], + [Include readline support (CLI/CGI only)])]) +-else +- dnl "register" the --with-readline option to prevent invalid "unknown +- dnl 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 +@@ -78,6 +72,13 @@ if test "$PHP_READLINE" && test "$PHP_RE + AC_DEFINE(HAVE_HISTORY_LIST, 1, [ ]) + AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) + ++ PHP_CHECK_LIBRARY(readline, rl_completion_matches, ++ [ ++ AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ]) ++ ],[],[ ++ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ++ ]) ++ + elif test "$PHP_LIBEDIT" != "no"; then + if test "$PHP_LIBEDIT" != "yes"; then + AC_MSG_WARN([libedit directory ignored, rely on pkg-config]) diff --git a/devel/php80-readline/files/patch-readline_cli.c b/devel/php80-readline/files/patch-readline_cli.c new file mode 100644 index 000000000000..02f55974f9b0 --- /dev/null +++ b/devel/php80-readline/files/patch-readline_cli.c @@ -0,0 +1,13 @@ +--- 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 |