6 files changed, 26 insertions, 26 deletions

diff --git a/lang/php70/Makefile b/lang/php70/Makefile
index 92b13568f960..ab6e5440290f 100644
--- a/lang/php70/Makefile
+++ b/lang/php70/Makefile
@@ -15,7 +15,7 @@ LICENSE=	PHP301
 
 BROKEN_powerpc64=	Does not build
 
-USES+=		tar:bzip2 cpe
+USES+=		tar:xz cpe
 CPE_PRODUCT=	php
 NO_OPTIONS_SORT=yes
 .if !defined(PKGNAMESUFFIX)
@@ -183,13 +183,13 @@ post-build:
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf
-	@${SH} ${WRKSRC}/scripts/php-config --extension-dir | sed -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf
+	@${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
+	${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 .else
 do-install:
diff --git a/lang/php70/files/patch-acinclude.m4 b/lang/php70/files/patch-acinclude.m4
index 7bdef6d75080..859880c2c676 100644
--- a/lang/php70/files/patch-acinclude.m4
+++ b/lang/php70/files/patch-acinclude.m4
@@ -1,6 +1,6 @@
---- acinclude.m4.orig	2016-02-16 19:01:10.026983000 +0800
-+++ acinclude.m4	2016-02-16 19:05:00.294501000 +0800
-@@ -985,15 +985,9 @@
+--- acinclude.m4.orig	2016-07-20 13:11:26 UTC
++++ acinclude.m4
+@@ -985,15 +985,9 @@ dnl ------------------------------------
    if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
  dnl ---------------------------------------------- CLI static module
      [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
@@ -19,7 +19,7 @@
      EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir"
    fi
    PHP_ADD_BUILD_DIR($ext_builddir)
-@@ -1043,12 +1037,6 @@
+@@ -1043,12 +1037,6 @@ You either need to build $1 shared or bu
  build to be successful.
  ])
    fi
@@ -32,7 +32,7 @@
    dnl Some systems require that we link $2 to $1 when building
  ])
  
-@@ -2970,8 +2958,7 @@
+@@ -2975,8 +2963,7 @@ dnl in GNU Make which causes the .d file
  $abs_srcdir/$ac_provsrc:;
  
  $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
@@ -42,7 +42,7 @@
  \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
  
  EOF
-@@ -2990,12 +2977,12 @@
+@@ -2995,12 +2982,12 @@ dnl Always attempt to create both PIC an
  $ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
  	echo "[#] Generated by Makefile for libtool" > \$[]@
  	@test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir
@@ -57,7 +57,7 @@
  	  echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
  	else [\\]
  	  echo "non_pic_object='none'" >> \$[]@ [;\\]
-@@ -3007,7 +2994,7 @@
+@@ -3012,7 +2999,7 @@ EOF
    *)
  cat>>Makefile.objects<<EOF
  $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
diff --git a/lang/php70/files/patch-configure.in b/lang/php70/files/patch-configure.in
index f30e9d392594..0b7a9f6a00e4 100644
--- a/lang/php70/files/patch-configure.in
+++ b/lang/php70/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	2014-04-01 12:32:03.000000000 +0000
-+++ configure.in	2014-04-09 07:56:27.824397653 +0000
-@@ -370,7 +370,6 @@
+--- configure.in.orig	2016-07-20 13:11:23 UTC
++++ configure.in
+@@ -370,7 +370,6 @@ sinclude(TSRM/tsrm.m4)
  dnl .
  dnl -------------------------------------------------------------------------
  
@@ -8,7 +8,7 @@
  PHP_HELP_SEPARATOR([SAPI modules:])
  PHP_SHLIB_SUFFIX_NAMES
  PHP_BUILD_PROGRAM
-@@ -401,15 +400,9 @@
+@@ -401,15 +400,9 @@ else
    AC_MSG_RESULT([none])
  fi
  
@@ -24,7 +24,7 @@
  fi
  
  dnl Starting system checks.
-@@ -688,7 +681,7 @@
+@@ -700,7 +693,7 @@ nanosleep \
  )
  
  dnl Some systems (like OpenSolaris) do not have nanosleep in libc
@@ -33,7 +33,7 @@
  
  dnl Check for getaddrinfo, should be a better way, but...
  dnl Also check for working getaddrinfo
-@@ -1225,7 +1218,7 @@
+@@ -1251,7 +1244,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
  EXPANDED_DATADIR=$datadir
  EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
  EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
@@ -42,12 +42,12 @@
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir
-@@ -1435,7 +1428,7 @@
+@@ -1460,7 +1453,7 @@ PHP_SUBST(all_targets)
  PHP_SUBST(install_targets)
  PHP_SUBST(install_binary_targets)
  
 -PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
 +PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/])
  
- PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
+ PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
  
diff --git a/lang/php70/files/patch-main__php_config.h.in b/lang/php70/files/patch-main__php_config.h.in
index 421a576bce11..7a1d7db40d78 100644
--- a/lang/php70/files/patch-main__php_config.h.in
+++ b/lang/php70/files/patch-main__php_config.h.in
@@ -1,6 +1,6 @@
---- main/php_config.h.in.orig	2015-12-01 16:36:43.000000000 +0300
-+++ main/php_config.h.in	2015-12-09 21:45:32.033676604 +0300
-@@ -2405,6 +2405,9 @@
+--- main/php_config.h.in.orig	2016-07-20 13:12:32 UTC
++++ main/php_config.h.in
+@@ -2426,6 +2426,9 @@
  /* Define if processor uses big-endian word */
  #undef WORDS_BIGENDIAN
  
diff --git a/lang/php70/files/patch-sapi_apache2handler_config.m4 b/lang/php70/files/patch-sapi_apache2handler_config.m4
index dcd79e12117f..a81062805840 100644
--- a/lang/php70/files/patch-sapi_apache2handler_config.m4
+++ b/lang/php70/files/patch-sapi_apache2handler_config.m4
@@ -1,5 +1,5 @@
---- sapi/apache2handler/config.m4.orig	2013-12-10 23:31:06.000000000 +0000
-+++ sapi/apache2handler/config.m4	2013-12-13 21:50:25.488258534 +0000
+--- sapi/apache2handler/config.m4.orig	2016-07-20 13:11:37 UTC
++++ sapi/apache2handler/config.m4
 @@ -67,7 +67,7 @@ if test "$PHP_APXS2" != "no"; then
    fi
  
diff --git a/lang/php70/files/patch-sapi_fpm_config.m4 b/lang/php70/files/patch-sapi_fpm_config.m4
index 3c13d5e9ecf7..69797ccb8aa3 100644
--- a/lang/php70/files/patch-sapi_fpm_config.m4
+++ b/lang/php70/files/patch-sapi_fpm_config.m4
@@ -1,6 +1,6 @@
---- sapi/fpm/config.m4.orig	2015-12-01 16:36:27.000000000 +0300
-+++ sapi/fpm/config.m4	2015-12-09 21:34:18.665722795 +0300
-@@ -317,14 +317,14 @@
+--- sapi/fpm/config.m4.orig	2016-07-20 13:11:36 UTC
++++ sapi/fpm/config.m4
+@@ -317,14 +317,14 @@ AC_DEFUN([AC_FPM_LQ],
  
    AC_MSG_CHECKING([for TCP_INFO])