Import PHP 5.6 branch!

13 files changed, 167 insertions, 0 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 1496498080f2..794389210864 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -3444,6 +3444,15 @@
     SUBDIR += php55-sysvsem
     SUBDIR += php55-sysvshm
     SUBDIR += php55-tokenizer
+    SUBDIR += php56-gettext
+    SUBDIR += php56-json
+    SUBDIR += php56-pcntl
+    SUBDIR += php56-readline
+    SUBDIR += php56-shmop 
+    SUBDIR += php56-sysvmsg
+    SUBDIR += php56-sysvsem
+    SUBDIR += php56-sysvshm
+    SUBDIR += php56-tokenizer
     SUBDIR += phpbt
     SUBDIR += phpsh
     SUBDIR += phptags
diff --git a/devel/php56-gettext/Makefile b/devel/php56-gettext/Makefile
new file mode 100644
index 000000000000..81c6411df45c
--- /dev/null
+++ b/devel/php56-gettext/Makefile
@@ -0,0 +1,10 @@
+# Created by: Alex Dupre <ale@FreeBSD.org>
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php56
+
+PKGNAMESUFFIX=	-gettext
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php56-gettext/files/patch-config.m4 b/devel/php56-gettext/files/patch-config.m4
new file mode 100644
index 000000000000..2b497d366574
--- /dev/null
+++ b/devel/php56-gettext/files/patch-config.m4
@@ -0,0 +1,17 @@
+--- config.m4.orig	Tue Jul 27 23:58:02 2004
++++ config.m4	Tue Jul 27 23:59:44 2004
+@@ -30,7 +30,6 @@
+ 		AC_MSG_ERROR(Unable to find required gettext library)
+ 	])
+   )
+-  LDFLAGS=$O_LDFLAGS
+ 
+   AC_DEFINE(HAVE_LIBINTL,1,[ ])
+   PHP_NEW_EXTENSION(gettext, gettext.c, $ext_shared)
+@@ -46,5 +45,6 @@
+   AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, dngettext,  [AC_DEFINE(HAVE_DNGETTEXT, 1, [ ])])
+   AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, dcngettext,  [AC_DEFINE(HAVE_DCNGETTEXT, 1, [ ])])
+   AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, bind_textdomain_codeset,  [AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET, 1, [ ])])
++  LDFLAGS=$O_LDFLAGS
+   
+ fi
diff --git a/devel/php56-json/Makefile b/devel/php56-json/Makefile
new file mode 100644
index 000000000000..3a93d4b7b0b0
--- /dev/null
+++ b/devel/php56-json/Makefile
@@ -0,0 +1,10 @@
+# Created by: Alex Dupre <ale@FreeBSD.org>
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php56
+
+PKGNAMESUFFIX=	-json
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php56-pcntl/Makefile b/devel/php56-pcntl/Makefile
new file mode 100644
index 000000000000..5039ad10a1be
--- /dev/null
+++ b/devel/php56-pcntl/Makefile
@@ -0,0 +1,10 @@
+# Created by: Alex Dupre <ale@FreeBSD.org>
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php56
+
+PKGNAMESUFFIX=	-pcntl
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php56-readline/Makefile b/devel/php56-readline/Makefile
new file mode 100644
index 000000000000..f60893571692
--- /dev/null
+++ b/devel/php56-readline/Makefile
@@ -0,0 +1,10 @@
+# Created by: Alex Dupre <ale@FreeBSD.org>
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php56
+
+PKGNAMESUFFIX=	-readline
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php56-readline/files/patch-config.m4 b/devel/php56-readline/files/patch-config.m4
new file mode 100644
index 000000000000..5edf376bf0e2
--- /dev/null
+++ b/devel/php56-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/php56-readline/files/patch-readline_cli.c b/devel/php56-readline/files/patch-readline_cli.c
new file mode 100644
index 000000000000..02f55974f9b0
--- /dev/null
+++ b/devel/php56-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
diff --git a/devel/php56-shmop/Makefile b/devel/php56-shmop/Makefile
new file mode 100644
index 000000000000..f0e90e8b7d67
--- /dev/null
+++ b/devel/php56-shmop/Makefile
@@ -0,0 +1,10 @@
+# Created by: Alex Dupre <ale@FreeBSD.org>
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php56
+
+PKGNAMESUFFIX=	-shmop
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php56-sysvmsg/Makefile b/devel/php56-sysvmsg/Makefile
new file mode 100644
index 000000000000..2b2c27c0282e
--- /dev/null
+++ b/devel/php56-sysvmsg/Makefile
@@ -0,0 +1,10 @@
+# Created by: Alex Dupre <ale@FreeBSD.org>
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php56
+
+PKGNAMESUFFIX=	-sysvmsg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php56-sysvsem/Makefile b/devel/php56-sysvsem/Makefile
new file mode 100644
index 000000000000..06cdd72bd3d9
--- /dev/null
+++ b/devel/php56-sysvsem/Makefile
@@ -0,0 +1,10 @@
+# Created by: Alex Dupre <ale@FreeBSD.org>
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php56
+
+PKGNAMESUFFIX=	-sysvsem
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php56-sysvshm/Makefile b/devel/php56-sysvshm/Makefile
new file mode 100644
index 000000000000..fa8d46132875
--- /dev/null
+++ b/devel/php56-sysvshm/Makefile
@@ -0,0 +1,10 @@
+# Created by: Alex Dupre <ale@FreeBSD.org>
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php56
+
+PKGNAMESUFFIX=	-sysvshm
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php56-tokenizer/Makefile b/devel/php56-tokenizer/Makefile
new file mode 100644
index 000000000000..9d48e6757f7d
--- /dev/null
+++ b/devel/php56-tokenizer/Makefile
@@ -0,0 +1,10 @@
+# Created by: Alex Dupre <ale@FreeBSD.org>
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php56
+
+PKGNAMESUFFIX=	-tokenizer
+
+.include "${MASTERDIR}/Makefile"