aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Zuehlsdorff <tz@FreeBSD.org>2018-12-21 10:11:51 +0000
committerTorsten Zuehlsdorff <tz@FreeBSD.org>2018-12-21 10:11:51 +0000
commitb15a95bc2f39f87b0333b41212ff7378e8067443 (patch)
treeca0a876f9247f49e0a4dbb574d2ce94ac2503bce
parentd562b50386deaaf41a7867c345d86a78fd9a5a5b (diff)
downloadports-b15a95bc2f39f87b0333b41212ff7378e8067443.tar.gz
ports-b15a95bc2f39f87b0333b41212ff7378e8067443.zip
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)
Notes
Notes: svn path=/branches/2018Q4/; revision=487972
-rw-r--r--converters/php72-mbstring/files/patch-config.m414
-rw-r--r--databases/php72-odbc/files/patch-config.m44
-rw-r--r--textproc/php72-simplexml/files/patch-config.m414
3 files changed, 16 insertions, 16 deletions
diff --git a/converters/php72-mbstring/files/patch-config.m4 b/converters/php72-mbstring/files/patch-config.m4
index 026798f26a5a..4164b65fd70e 100644
--- a/converters/php72-mbstring/files/patch-config.m4
+++ b/converters/php72-mbstring/files/patch-config.m4
@@ -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])
diff --git a/databases/php72-odbc/files/patch-config.m4 b/databases/php72-odbc/files/patch-config.m4
index cf68ac678e4c..a1a245aa1e0c 100644
--- a/databases/php72-odbc/files/patch-config.m4
+++ b/databases/php72-odbc/files/patch-config.m4
@@ -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,,
diff --git a/textproc/php72-simplexml/files/patch-config.m4 b/textproc/php72-simplexml/files/patch-config.m4
index 4eeef697dc87..aa53738b144a 100644
--- a/textproc/php72-simplexml/files/patch-config.m4
+++ b/textproc/php72-simplexml/files/patch-config.m4
@@ -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