lang/php74: fix the broken patches

The same error cause from r512431 caused some patches missing or undeleted.
Now commit the missing changes in order to unbreak PHP.

Sponsored by:	PHP Update Service

3 files changed, 18 insertions, 102 deletions

diff --git a/lang/php74/files/patch-acinclude.m4 b/lang/php74/files/patch-acinclude.m4
deleted file mode 100644
index 0613cec83899..000000000000
--- a/lang/php74/files/patch-acinclude.m4
+++ /dev/null
@@ -1,68 +0,0 @@
---- acinclude.m4.orig	2018-12-04 16:12:30 UTC
-+++ acinclude.m4
-@@ -971,15 +971,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
--    case "$PHP_SAPI" in
--      cgi|embed|phpdbg[)]
--        PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,)
--        EXT_STATIC="$EXT_STATIC $1;$ext_dir"
--        ;;
--      *[)]
--        PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,cli)
--        ;;
--    esac
-+
-+	PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
-+	PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
-     EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir"
-   fi
-   PHP_ADD_BUILD_DIR($ext_builddir)
-@@ -1029,12 +1023,6 @@ You either need to build $1 shared or bu
- build to be successful.
- ])
-   fi
--  if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then
--    AC_MSG_ERROR([
--You've configured extension $1, which depends on extension $2,
--but you've either not enabled $2, or have disabled it.
--])
--  fi
-   dnl Some systems require that we link $2 to $1 when building
- ])
- 
-@@ -2970,8 +2958,7 @@ dnl in GNU Make which causes the .d file
- $abs_srcdir/$ac_provsrc:;
- 
- $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
--	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
--
-+	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
- \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
- 
- EOF
-@@ -2990,12 +2977,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
--	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
-+	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
- 	  echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\]
- 	else [\\]
- 	  echo "pic_object='none'" >> \$[]@ [;\\]
- 	fi
--	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
-+	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
- 	  echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
- 	else [\\]
- 	  echo "non_pic_object='none'" >> \$[]@ [;\\]
-@@ -3007,7 +2994,7 @@ EOF
-   *)
- cat>>Makefile.objects<<EOF
- $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
--	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
-+	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
- 
- EOF
-     ;;
diff --git a/lang/php74/files/patch-Makefile.global b/lang/php74/files/patch-build_Makefile.global
index dda63ac4508e..4b838d157941 100644
--- a/lang/php74/files/patch-Makefile.global
+++ b/lang/php74/files/patch-build_Makefile.global
@@ -1,5 +1,5 @@
---- Makefile.global.orig	2016-08-17 19:50:48 UTC
-+++ Makefile.global
+--- build/Makefile.global.orig	2019-08-06 06:54:07 UTC
++++ build/Makefile.global
 @@ -89,14 +89,14 @@ test: all
  	@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
  		INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
diff --git a/lang/php74/files/patch-configure.in b/lang/php74/files/patch-configure.ac
index 539cfd1d4997..d213622d5475 100644
--- a/lang/php74/files/patch-configure.in
+++ b/lang/php74/files/patch-configure.ac
@@ -1,47 +1,31 @@
---- configure.ac.orig	2018-01-02 22:35:55 UTC
+--- configure.ac.orig	2019-08-06 06:54:06 UTC
 +++ configure.ac
-@@ -102,6 +102,7 @@ int zend_sprintf(char *buffer, const char *format, ...
- 
- #undef PTHREADS
+@@ -105,6 +105,7 @@ extern "C++" {
+ #endif
+ #endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
  
 +#include <ext/php_config.h>
  #endif /* PHP_CONFIG_H */
  ])
  
-@@ -339,7 +340,6 @@ sinclude(TSRM/tsrm.m4)
- dnl .
- dnl -------------------------------------------------------------------------
+@@ -313,7 +314,6 @@ sinclude(Zend/Zend.m4)
+ 
+ dnl ----------------------------------------------------------------------------
  
 -PTHREADS_CHECK
  PHP_HELP_SEPARATOR([SAPI modules:])
  PHP_SHLIB_SUFFIX_NAMES
  PHP_BUILD_PROGRAM
-@@ -370,15 +370,9 @@ else
-   AC_MSG_RESULT([none])
- fi
- 
--dnl Exit early
--if test -z "$PHP_INSTALLED_SAPIS"; then
--  AC_MSG_ERROR([Nothing to build.])
--fi
--
- dnl force ZTS
- if test "$enable_maintainer_zts" = "yes"; then
-   PTHREADS_ASSIGN_VARS
--  PTHREADS_FLAGS
- fi
- 
- dnl Starting system checks.
-@@ -682,7 +676,7 @@ nanosleep \
- )
- 
- dnl Some systems (like OpenSolaris) do not have nanosleep in libc
+@@ -654,7 +654,7 @@ memmem \
+ AX_FUNC_WHICH_GETHOSTBYNAME_R
+ 
+ dnl Some systems (like OpenSolaris) do not have nanosleep in libc.
 -PHP_CHECK_FUNC_LIB(nanosleep, rt)
 +PHP_CHECK_FUNC(nanosleep, rt)
  
- dnl Check for getaddrinfo, should be a better way, but...
- dnl Also check for working getaddrinfo
-@@ -1235,7 +1229,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
+ dnl Check for getaddrinfo, should be a better way, but... Also check for working
+ dnl getaddrinfo.
+@@ -1308,7 +1308,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"`
@@ -50,12 +34,12 @@
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir
-@@ -1434,7 +1428,7 @@ PHP_SUBST(all_targets)
+@@ -1493,7 +1493,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, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+ PHP_ADD_SOURCES(TSRM, TSRM.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)