svn commit: r465040 - in head/converters: php56-mbstring/files php70-mbstring/files php71-mbstring/files php72-mbstring/files

[Antoine Brodin]

Author: antoine
Date: Mon Mar 19 23:01:50 2018
New Revision: 465040
URL: https://svnweb.freebsd.org/changeset/ports/465040

Log:
  Fix build with oniguruma 6.8.1
  
  PR:		226717
  Submitted by:	Christian Ullrich, madpilot
  With hat:	portmgr

Added:
  head/converters/php56-mbstring/files/patch-php__mbregex.c   (contents, props changed)
  head/converters/php70-mbstring/files/patch-php__mbregex.c   (contents, props changed)
  head/converters/php71-mbstring/files/patch-php__mbregex.c   (contents, props changed)
  head/converters/php72-mbstring/files/patch-php__mbregex.c   (contents, props changed)

Added: head/converters/php56-mbstring/files/patch-php__mbregex.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/converters/php56-mbstring/files/patch-php__mbregex.c	Mon Mar 19 23:01:50 2018	(r465040)
@@ -0,0 +1,11 @@
+--- php_mbregex.c.orig	2018-02-27 23:15:25 UTC
++++ php_mbregex.c
+@@ -454,7 +454,7 @@ static php_mb_regex_t *php_mbregex_compi
+ 	OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN];
+ 
+ 	found = zend_hash_find(&MBREX(ht_rc), (char *)pattern, patlen+1, (void **) &rc);
+-	if (found == FAILURE || (*rc)->options != options || (*rc)->enc != enc || (*rc)->syntax != syntax) {
++	if (found == FAILURE || onig_get_options(*rc) != options || onig_get_encoding(*rc) != enc || onig_get_syntax(*rc) != syntax) {
+ 		if ((err_code = onig_new(&retval, (OnigUChar *)pattern, (OnigUChar *)(pattern + patlen), options, enc, syntax, &err_info)) != ONIG_NORMAL) {
+ 			onig_error_code_to_str(err_str, err_code, &err_info);
+ 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "mbregex compile err: %s", err_str);

Added: head/converters/php70-mbstring/files/patch-php__mbregex.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/converters/php70-mbstring/files/patch-php__mbregex.c	Mon Mar 19 23:01:50 2018	(r465040)
@@ -0,0 +1,11 @@
+--- php_mbregex.c.orig	2018-02-27 13:16:12 UTC
++++ php_mbregex.c
+@@ -452,7 +452,7 @@ static php_mb_regex_t *php_mbregex_compi
+ 	OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN];
+ 
+ 	rc = zend_hash_str_find_ptr(&MBREX(ht_rc), (char *)pattern, patlen);
+-	if (!rc || rc->options != options || rc->enc != enc || rc->syntax != syntax) {
++	if (!rc || onig_get_options(rc) != options || onig_get_encoding(rc) != enc || onig_get_syntax(rc) != syntax) {
+ 		if ((err_code = onig_new(&retval, (OnigUChar *)pattern, (OnigUChar *)(pattern + patlen), options, enc, syntax, &err_info)) != ONIG_NORMAL) {
+ 			onig_error_code_to_str(err_str, err_code, &err_info);
+ 			php_error_docref(NULL, E_WARNING, "mbregex compile err: %s", err_str);

Added: head/converters/php71-mbstring/files/patch-php__mbregex.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/converters/php71-mbstring/files/patch-php__mbregex.c	Mon Mar 19 23:01:50 2018	(r465040)
@@ -0,0 +1,11 @@
+--- php_mbregex.c.orig	2018-02-28 11:19:22 UTC
++++ php_mbregex.c
+@@ -452,7 +452,7 @@ static php_mb_regex_t *php_mbregex_compi
+ 	OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN];
+ 
+ 	rc = zend_hash_str_find_ptr(&MBREX(ht_rc), (char *)pattern, patlen);
+-	if (!rc || rc->options != options || rc->enc != enc || rc->syntax != syntax) {
++	if (!rc || onig_get_options(rc) != options || onig_get_encoding(rc) != enc || onig_get_syntax(rc) != syntax) {
+ 		if ((err_code = onig_new(&retval, (OnigUChar *)pattern, (OnigUChar *)(pattern + patlen), options, enc, syntax, &err_info)) != ONIG_NORMAL) {
+ 			onig_error_code_to_str(err_str, err_code, &err_info);
+ 			php_error_docref(NULL, E_WARNING, "mbregex compile err: %s", err_str);

Added: head/converters/php72-mbstring/files/patch-php__mbregex.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/converters/php72-mbstring/files/patch-php__mbregex.c	Mon Mar 19 23:01:50 2018	(r465040)
@@ -0,0 +1,11 @@
+--- php_mbregex.c.orig	2018-02-27 16:33:04 UTC
++++ php_mbregex.c
+@@ -449,7 +449,7 @@ static php_mb_regex_t *php_mbregex_compi
+ 	OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN];
+ 
+ 	rc = zend_hash_str_find_ptr(&MBREX(ht_rc), (char *)pattern, patlen);
+-	if (!rc || rc->options != options || rc->enc != enc || rc->syntax != syntax) {
++	if (!rc || onig_get_options(rc) != options || onig_get_encoding(rc) != enc || onig_get_syntax(rc) != syntax) {
+ 		if ((err_code = onig_new(&retval, (OnigUChar *)pattern, (OnigUChar *)(pattern + patlen), options, enc, syntax, &err_info)) != ONIG_NORMAL) {
+ 			onig_error_code_to_str(err_str, err_code, &err_info);
+ 			php_error_docref(NULL, E_WARNING, "mbregex compile err: %s", err_str);