Date: Fri, 21 Dec 2018 10:11:51 +0000 (UTC) From: Torsten Zuehlsdorff <tz@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r487972 - in branches/2018Q4: converters/php72-mbstring/files databases/php72-odbc/files textproc/php72-simplexml/files Message-ID: <201812211011.wBLABpOs078348@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tz Date: Fri Dec 21 10:11:51 2018 New Revision: 487972 URL: https://svnweb.freebsd.org/changeset/ports/487972 Log: php72-mbstring, php72-odbc and php72-simplexml: Fix broken patches Through the MFH from 7.2.10 to 7.2.13 whitespace-only changes in the patches were not covered and broke the build. Adjust all patches accordingly to unbreak the build. PR: 234220 234218 Submitted by: <wolfgang@lyxys.ka.sub.org> Approved by: portmgr (blanket) Modified: branches/2018Q4/converters/php72-mbstring/files/patch-config.m4 branches/2018Q4/databases/php72-odbc/files/patch-config.m4 branches/2018Q4/textproc/php72-simplexml/files/patch-config.m4 Modified: branches/2018Q4/converters/php72-mbstring/files/patch-config.m4 ============================================================================== --- branches/2018Q4/converters/php72-mbstring/files/patch-config.m4 Fri Dec 21 09:34:36 2018 (r487971) +++ branches/2018Q4/converters/php72-mbstring/files/patch-config.m4 Fri Dec 21 10:11:51 2018 (r487972) @@ -1,6 +1,6 @@ ---- config.m4.orig 2009-11-25 02:30:06.000000000 +0100 -+++ config.m4 2010-04-12 09:59:54.000000000 +0200 -@@ -43,6 +43,30 @@ +--- config.m4.orig 2018-12-04 18:06:11 UTC ++++ config.m4 +@@ -43,6 +43,30 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ PHP_ADD_INCLUDE([$ext_builddir/$dir]) done @@ -31,7 +31,7 @@ if test "$ext_shared" = "no"; then PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES) out="php_config.h" -@@ -80,7 +104,6 @@ +@@ -85,7 +109,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [ int foo(int x, ...) { va_list va; va_start(va, x); @@ -39,13 +39,13 @@ va_arg(va, char *); va_arg(va, double); return 0; -@@ -347,6 +370,9 @@ +@@ -367,6 +390,9 @@ PHP_ARG_WITH(onig, [for external oniguru [ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. - If DIR is not set, the bundled oniguruma will be used], no, no) + If DIR is not set, the bundled oniguruma will be used], no, no) +PHP_ARG_WITH(pcre-dir, pcre install prefix, +[ --with-pcre-dir MBSTRING: pcre install prefix], no, no) + - if test "$PHP_MBSTRING" != "no"; then + if test "$PHP_MBSTRING" != "no"; then AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support]) Modified: branches/2018Q4/databases/php72-odbc/files/patch-config.m4 ============================================================================== --- branches/2018Q4/databases/php72-odbc/files/patch-config.m4 Fri Dec 21 09:34:36 2018 (r487971) +++ branches/2018Q4/databases/php72-odbc/files/patch-config.m4 Fri Dec 21 10:11:51 2018 (r487972) @@ -1,4 +1,4 @@ ---- config.m4.orig 2016-10-25 15:23:21 UTC +--- config.m4.orig 2018-12-04 18:06:13 UTC +++ config.m4 @@ -100,13 +100,17 @@ dnl dnl configure options @@ -79,7 +79,7 @@ PHP_ARG_WITH(birdstep,, -[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]]) +[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]], no, no) - + AC_MSG_CHECKING(for Birdstep support) if test "$PHP_BIRDSTEP" != "no"; then @@ -366,7 +370,7 @@ PHP_ARG_WITH(custom-odbc,, Modified: branches/2018Q4/textproc/php72-simplexml/files/patch-config.m4 ============================================================================== --- branches/2018Q4/textproc/php72-simplexml/files/patch-config.m4 Fri Dec 21 09:34:36 2018 (r487971) +++ branches/2018Q4/textproc/php72-simplexml/files/patch-config.m4 Fri Dec 21 10:11:51 2018 (r487972) @@ -1,6 +1,6 @@ ---- config.m4.orig 2014-05-14 10:14:22.929420181 +0000 -+++ config.m4 2014-05-14 10:15:36.967414693 +0000 -@@ -4,6 +4,9 @@ +--- config.m4.orig 2018-12-04 18:06:11 UTC ++++ config.m4 +@@ -4,6 +4,9 @@ dnl config.m4 for extension simplexml PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support, [ --disable-simplexml Disable SimpleXML support], yes) @@ -9,8 +9,8 @@ + if test -z "$PHP_LIBXML_DIR"; then PHP_ARG_WITH(libxml-dir, libxml2 install dir, - [ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no) -@@ -11,6 +14,30 @@ + [ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no) +@@ -11,6 +14,30 @@ fi if test "$PHP_SIMPLEXML" != "no"; then @@ -38,6 +38,6 @@ + ]) + ]) + - if test "$PHP_LIBXML" = "no"; then - AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml]) + if test "$PHP_LIBXML" = "no"; then + AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml]) fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812211011.wBLABpOs078348>