From 8c60cffc902f73b2bc9b35a2c90cccb663bb1260 Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Fri, 12 Jan 2018 12:57:18 +0000
Subject: - Replace USE_AUTOTOOLS with USES=autoreconf:build and run an
 upstream   script in pre-configure to regenerate configure scripts.  Because
 this   regenerates php_config.h.in, merge a patch for that file into the
 patch   for configure.in. - Remove redundant --localstatedir=/var (added by
 bsd.port.mk).

---
 lang/php56/files/patch-configure.in | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'lang/php56/files/patch-configure.in')

diff --git a/lang/php56/files/patch-configure.in b/lang/php56/files/patch-configure.in
index f30e9d392594..0f743bd09899 100644
--- a/lang/php56/files/patch-configure.in
+++ b/lang/php56/files/patch-configure.in
@@ -1,6 +1,14 @@
---- 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	2017-10-25 01:48:22 UTC
++++ configure.in
+@@ -115,6 +115,7 @@ int zend_sprintf(char *buffer, const char *format, ...
+ #endif
+ 
+ #undef PTHREADS
++#include <ext/php_config.h>
+ ])
+ 
+ PHP_MAJOR_VERSION=5
+@@ -370,7 +371,6 @@ sinclude(TSRM/tsrm.m4)
  dnl .
  dnl -------------------------------------------------------------------------
  
@@ -8,7 +16,7 @@
  PHP_HELP_SEPARATOR([SAPI modules:])
  PHP_SHLIB_SUFFIX_NAMES
  PHP_BUILD_PROGRAM
-@@ -401,15 +400,9 @@
+@@ -401,15 +401,9 @@ else
    AC_MSG_RESULT([none])
  fi
  
@@ -24,7 +32,7 @@
  fi
  
  dnl Starting system checks.
-@@ -688,7 +681,7 @@
+@@ -691,7 +685,7 @@ nanosleep \
  )
  
  dnl Some systems (like OpenSolaris) do not have nanosleep in libc
@@ -33,7 +41,7 @@
  
  dnl Check for getaddrinfo, should be a better way, but...
  dnl Also check for working getaddrinfo
-@@ -1225,7 +1218,7 @@
+@@ -1242,7 +1236,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
  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 +50,12 @@
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir
-@@ -1435,7 +1428,7 @@
+@@ -1452,7 +1446,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)
  
-- 
cgit v1.2.3