From owner-svn-ports-all@freebsd.org Mon Mar 19 23:01:51 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6BE7F51BD3; Mon, 19 Mar 2018 23:01:51 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 58A1B6AD74; Mon, 19 Mar 2018 23:01:51 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 539A314C23; Mon, 19 Mar 2018 23:01:51 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2JN1pHm085269; Mon, 19 Mar 2018 23:01:51 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2JN1oSF085265; Mon, 19 Mar 2018 23:01:50 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201803192301.w2JN1oSF085265@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Mon, 19 Mar 2018 23:01:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465040 - in head/converters: php56-mbstring/files php70-mbstring/files php71-mbstring/files php72-mbstring/files X-SVN-Group: ports-head X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in head/converters: php56-mbstring/files php70-mbstring/files php71-mbstring/files php72-mbstring/files X-SVN-Commit-Revision: 465040 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Mar 2018 23:01:52 -0000 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);