From e630e52bb5f688a26b92533f2f2b0e17e3b85f33 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Mon, 15 Feb 2016 14:34:26 +0000 Subject: Welcome php 7.0.3 Changelog: http://php.net/ChangeLog-7.php#7.0.0 http://php.net/ChangeLog-7.php#7.0.1 http://php.net/ChangeLog-7.php#7.0.2 http://php.net/ChangeLog-7.php#7.0.3 I'd like to thanks: Kurt Jaeger Matthias Breddin Rainer Duffner Victor van Vlaardingen Torsten Zuehlsdorff Franco Fichtner and all helpers and testers from ports@. --- devel/php70-readline/Makefile | 10 +++++++ devel/php70-readline/files/patch-config.m4 | 38 +++++++++++++++++++++++++ devel/php70-readline/files/patch-readline_cli.c | 13 +++++++++ 3 files changed, 61 insertions(+) create mode 100644 devel/php70-readline/Makefile create mode 100644 devel/php70-readline/files/patch-config.m4 create mode 100644 devel/php70-readline/files/patch-readline_cli.c (limited to 'devel/php70-readline') diff --git a/devel/php70-readline/Makefile b/devel/php70-readline/Makefile new file mode 100644 index 000000000000..72efa2395e67 --- /dev/null +++ b/devel/php70-readline/Makefile @@ -0,0 +1,10 @@ +# Created by: Alex Dupre +# $FreeBSD$ + +CATEGORIES= devel + +MASTERDIR= ${.CURDIR}/../../lang/php70 + +PKGNAMESUFFIX= -readline + +.include "${MASTERDIR}/Makefile" diff --git a/devel/php70-readline/files/patch-config.m4 b/devel/php70-readline/files/patch-config.m4 new file mode 100644 index 000000000000..5edf376bf0e2 --- /dev/null +++ b/devel/php70-readline/files/patch-config.m4 @@ -0,0 +1,38 @@ +--- config.m4.orig 2013-08-20 06:46:43.000000000 +0200 ++++ config.m4 2013-08-27 16:01:29.000000000 +0200 +@@ -5,13 +5,8 @@ + PHP_ARG_WITH(libedit,for libedit readline replacement, + [ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) + +-if test "$PHP_LIBEDIT" = "no"; then + PHP_ARG_WITH(readline,for readline support, + [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) +-else +- dnl "register" the --with-readline option to preven invalid "unknown configure option" warning +- php_with_readline=no +-fi + + if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then + for i in $PHP_READLINE /usr/local /usr; do +@@ -67,6 +62,13 @@ + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS + ]) + ++ PHP_CHECK_LIBRARY(readline, rl_completion_matches, ++ [ ++ AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ]) ++ ],[],[ ++ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ++ ]) ++ + AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) + + elif test "$PHP_LIBEDIT" != "no"; then +@@ -118,7 +120,6 @@ + fi + + if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then +- AC_CHECK_FUNCS([rl_completion_matches]) + PHP_NEW_EXTENSION(readline, readline.c readline_cli.c, $ext_shared, cli) + PHP_SUBST(READLINE_SHARED_LIBADD) + fi diff --git a/devel/php70-readline/files/patch-readline_cli.c b/devel/php70-readline/files/patch-readline_cli.c new file mode 100644 index 000000000000..02f55974f9b0 --- /dev/null +++ b/devel/php70-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