Import PHP 5.6 branch!

5 files changed, 81 insertions, 0 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 19da80bd74c6..13cc15836c8a 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -673,6 +673,8 @@
     SUBDIR += php53-posix
     SUBDIR += php55-fileinfo
     SUBDIR += php55-posix
+    SUBDIR += php56-fileinfo
+    SUBDIR += php56-posix
     SUBDIR += pidof
     SUBDIR += pipemeter
     SUBDIR += plasma-applet-apcups
diff --git a/sysutils/php56-fileinfo/Makefile b/sysutils/php56-fileinfo/Makefile
new file mode 100644
index 000000000000..77372f0bdbf7
--- /dev/null
+++ b/sysutils/php56-fileinfo/Makefile
@@ -0,0 +1,10 @@
+# Created by: Alex Dupre <ale@FreeBSD.org>
+# $FreeBSD$
+
+CATEGORIES=	sysutils
+
+MASTERDIR=	${.CURDIR}/../../lang/php56
+
+PKGNAMESUFFIX=	-fileinfo
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/php56-fileinfo/files/patch-config.m4 b/sysutils/php56-fileinfo/files/patch-config.m4
new file mode 100644
index 000000000000..1348023ccf64
--- /dev/null
+++ b/sysutils/php56-fileinfo/files/patch-config.m4
@@ -0,0 +1,21 @@
+--- config.m4.orig	2010-09-07 15:45:30.000000000 +0200
++++ config.m4	2010-09-07 15:46:50.000000000 +0200
+@@ -4,6 +4,9 @@
+ PHP_ARG_ENABLE(fileinfo, for fileinfo support,
+ [  --disable-fileinfo      Disable fileinfo support], yes)
+ 
++PHP_ARG_WITH(pcre-dir, pcre install prefix,
++[  --with-pcre-dir           FILEINFO: pcre install prefix], no, no)
++
+ if test "$PHP_FILEINFO" != "no"; then
+ 
+   libmagic_sources=" \
+@@ -13,6 +16,8 @@
+     libmagic/is_tar.c libmagic/magic.c libmagic/print.c \
+     libmagic/readcdf.c libmagic/readelf.c libmagic/softmagic.c"
+ 
++  PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
++
+   PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic)
+   PHP_ADD_BUILD_DIR($ext_builddir/libmagic)
+ 
diff --git a/sysutils/php56-posix/Makefile b/sysutils/php56-posix/Makefile
new file mode 100644
index 000000000000..da38a7e1ba66
--- /dev/null
+++ b/sysutils/php56-posix/Makefile
@@ -0,0 +1,10 @@
+# Created by: Alex Dupre <ale@FreeBSD.org>
+# $FreeBSD$
+
+CATEGORIES=	sysutils
+
+MASTERDIR=	${.CURDIR}/../../lang/php56
+
+PKGNAMESUFFIX=	-posix
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/php56-posix/files/patch-posix.c b/sysutils/php56-posix/files/patch-posix.c
new file mode 100644
index 000000000000..d2365b249569
--- /dev/null
+++ b/sysutils/php56-posix/files/patch-posix.c
@@ -0,0 +1,38 @@
+--- posix.c.orig	Fri Feb 23 00:40:39 2007
++++ posix.c	Sun May 13 17:52:27 2007
+@@ -838,7 +838,7 @@
+ #if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX)
+ 	buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+ 	if (buflen < 1) {
+-		RETURN_FALSE;
++		buflen = 1024;
+ 	}
+ 	buf = emalloc(buflen);
+ 	g = &gbuf;
+@@ -888,7 +888,7 @@
+ 	
+ 	grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+ 	if (grbuflen < 1) {
+-		RETURN_FALSE;
++		grbuflen = 1024;
+ 	}
+ 
+ 	grbuf = emalloc(grbuflen);
+@@ -955,7 +955,7 @@
+ #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
+ 	buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+ 	if (buflen < 1) {
+-		RETURN_FALSE;
++		buflen = 1024;
+ 	}
+ 	buf = emalloc(buflen);
+ 	pw = &pwbuf;
+@@ -1004,7 +1004,7 @@
+ #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R)
+ 	pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+ 	if (pwbuflen < 1) {
+-		RETURN_FALSE;
++		pwbuflen = 1024;
+ 	}
+ 	pwbuf = emalloc(pwbuflen);
+