Index: head/lang/php74/files/patch-Makefile.global =================================================================== --- head/lang/php74/files/patch-Makefile.global (revision 512436) +++ head/lang/php74/files/patch-Makefile.global (nonexistent) @@ -1,19 +0,0 @@ ---- Makefile.global.orig 2016-08-17 19:50:48 UTC -+++ 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`; \ - if test "$$INI_FILE"; then \ -- $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ -+ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini || :; \ - else \ - echo > $(top_builddir)/tmp-php.ini; \ - fi; \ - INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \ - if test "$$INI_SCANNED_PATH"; then \ - INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \ -- $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \ -+ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini || :; \ - fi; \ - TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ - TEST_PHP_SRCDIR=$(top_srcdir) \ Property changes on: head/lang/php74/files/patch-Makefile.global ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/php74/files/patch-configure.in =================================================================== --- head/lang/php74/files/patch-configure.in (revision 512436) +++ head/lang/php74/files/patch-configure.in (nonexistent) @@ -1,61 +0,0 @@ ---- configure.ac.orig 2018-01-02 22:35:55 UTC -+++ configure.ac -@@ -102,6 +102,7 @@ int zend_sprintf(char *buffer, const char *format, ... - - #undef PTHREADS - -+#include - #endif /* PHP_CONFIG_H */ - ]) - -@@ -339,7 +340,6 @@ sinclude(TSRM/tsrm.m4) - dnl . - 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 --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` - 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"` --INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR -+INCLUDE_PATH=.:${prefix}/share/pear - - exec_prefix=$old_exec_prefix - libdir=$old_libdir -@@ -1434,7 +1428,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) - Property changes on: head/lang/php74/files/patch-configure.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/php74/files/patch-acinclude.m4 =================================================================== --- head/lang/php74/files/patch-acinclude.m4 (revision 512436) +++ head/lang/php74/files/patch-acinclude.m4 (nonexistent) @@ -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< /dev/null`; \ + if test "$$INI_FILE"; then \ +- $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ ++ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini || :; \ + else \ + echo > $(top_builddir)/tmp-php.ini; \ + fi; \ + INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \ + if test "$$INI_SCANNED_PATH"; then \ + INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \ +- $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \ ++ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini || :; \ + fi; \ + TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ + TEST_PHP_SRCDIR=$(top_srcdir) \ Property changes on: head/lang/php74/files/patch-build_Makefile.global ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/php74/files/patch-configure.ac =================================================================== --- head/lang/php74/files/patch-configure.ac (nonexistent) +++ head/lang/php74/files/patch-configure.ac (revision 512437) @@ -0,0 +1,45 @@ +--- configure.ac.orig 2019-08-06 06:54:06 UTC ++++ configure.ac +@@ -105,6 +105,7 @@ extern "C++" { + #endif + #endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */ + ++#include + #endif /* PHP_CONFIG_H */ + ]) + +@@ -313,7 +314,6 @@ sinclude(Zend/Zend.m4) + + dnl ---------------------------------------------------------------------------- + +-PTHREADS_CHECK + PHP_HELP_SEPARATOR([SAPI modules:]) + PHP_SHLIB_SUFFIX_NAMES + PHP_BUILD_PROGRAM +@@ -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... 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"` +-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR ++INCLUDE_PATH=.:${prefix}/share/pear + + exec_prefix=$old_exec_prefix + libdir=$old_libdir +@@ -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, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + Property changes on: head/lang/php74/files/patch-configure.ac ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property