From 0926c2d68184815a02f5cca31272552ad7775ce9 Mon Sep 17 00:00:00 2001 From: Alex Dupre Date: Wed, 16 May 2012 07:36:13 +0000 Subject: Update to 5.4.3 release: - add support for embedded php library - add support for dtrace Re-organize bsd.php.mk: - add WANT_PHP_EMD - fix handling of WANT_PHP_* - remove php4 extensions From UPDATING: Suhosin patch has been disabled until the new version will be released (soon). Suhosing extension will take more time. LINKTHR option is now enabled by default, be sure to flag it if you are updating using an old saved configuration. sqlite2 extension has been permanently removed. If you want to remain at PHP 5.3, a new port (lang/php53) will be committed soon. --- devel/php5-readline/files/patch-config.m4 | 10 +++++----- devel/php5-readline/files/patch-readline_cli.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 devel/php5-readline/files/patch-readline_cli.c (limited to 'devel/php5-readline/files') diff --git a/devel/php5-readline/files/patch-config.m4 b/devel/php5-readline/files/patch-config.m4 index b0b2bb521bc7..9c0d4fc95033 100644 --- a/devel/php5-readline/files/patch-config.m4 +++ b/devel/php5-readline/files/patch-config.m4 @@ -1,5 +1,5 @@ ---- config.m4.orig 2009-08-04 13:20:49.000000000 +0200 -+++ config.m4 2009-09-22 11:13:12.000000000 +0200 +--- config.m4.orig 2011-09-06 17:07:24.000000000 +0200 ++++ config.m4 2012-03-02 14:29:51.000000000 +0100 @@ -5,13 +5,8 @@ PHP_ARG_WITH(libedit,for libedit readline replacement, [ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) @@ -14,7 +14,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then for i in $PHP_READLINE /usr/local /usr; do -@@ -60,6 +55,13 @@ +@@ -67,6 +62,13 @@ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) @@ -28,11 +28,11 @@ AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) elif test "$PHP_LIBEDIT" != "no"; then -@@ -97,7 +99,6 @@ +@@ -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, $ext_shared, cli) + PHP_NEW_EXTENSION(readline, readline.c readline_cli.c, $ext_shared, cli) PHP_SUBST(READLINE_SHARED_LIBADD) fi diff --git a/devel/php5-readline/files/patch-readline_cli.c b/devel/php5-readline/files/patch-readline_cli.c new file mode 100644 index 000000000000..02f55974f9b0 --- /dev/null +++ b/devel/php5-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 -- cgit v1.2.3