php: Update from 7.1 RC5 to RC6

[termux-packages] / packages / php / pear-Makefile.frag.patch

diff --git a/packages/php/pear-Makefile.frag.patch b/packages/php/pear-Makefile.frag.patch
index 5a2b678..a998cdc 100644 (file)
--- a/packages/php/pear-Makefile.frag.patch
+++ b/packages/php/pear-Makefile.frag.patch
@@ -1,8 +1,8 @@
-diff -u -r ../php-5.6.15/pear/Makefile.frag ./pear/Makefile.frag
---- ../php-5.6.15/pear/Makefile.frag   2015-10-29 05:55:01.000000000 -0400
-+++ ./pear/Makefile.frag       2015-11-10 16:27:03.754982330 -0500
-@@ -11,7 +11,7 @@
- PEAR_SUFFIX = -ds a$(program_suffix)
+diff -u -r ../php-7.1.0RC3/pear/Makefile.frag ./pear/Makefile.frag
+--- ../php-7.1.0RC3/pear/Makefile.frag 2016-09-28 22:15:47.000000000 -0400
++++ ./pear/Makefile.frag       2016-10-03 05:53:02.793555471 -0400
+@@ -12,7 +12,7 @@
+ PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
  
  install-pear-installer: $(SAPI_CLI_PATH)
 -      @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
@@ -10,12 +10,12 @@ diff -u -r ../php-5.6.15/pear/Makefile.frag ./pear/Makefile.frag
  
  install-pear:
        @echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
-@@ -24,7 +24,7 @@
+@@ -25,7 +25,7 @@
                        elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
-                               "$(FETCH)" -o $(builddir)/ http://pear.php.net/install-pear-nozlib.phar; \
+                               "$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \
                        else \
--                              $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php http://pear.php.net/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
-+                              php -n $(srcdir)/fetch.php http://pear.php.net/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
+-                              $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
++                              php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
                        fi \
                fi \
        fi