svn commit: r519381 - in head/devel/pecl-mustache: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sun Dec  8 16:59:35 2019
New Revision: 519381
URL: https://svnweb.freebsd.org/changeset/ports/519381

Log:
  Fix build with PHP 7.4 and unbreak this port
  
  It has merged by upstream.
  
  Reference:	https://github.com/jbboehr/php-mustache/commit/1b66fdaecb3923922aecbbd0c0393ed4648abe25

Added:
  head/devel/pecl-mustache/files/
  head/devel/pecl-mustache/files/patch-mustache_data.cpp   (contents, props changed)
  head/devel/pecl-mustache/files/patch-mustache_mustache.cpp   (contents, props changed)
Modified:
  head/devel/pecl-mustache/Makefile

Modified: head/devel/pecl-mustache/Makefile
==============================================================================
--- head/devel/pecl-mustache/Makefile	Sun Dec  8 16:59:30 2019	(r519380)
+++ head/devel/pecl-mustache/Makefile	Sun Dec  8 16:59:35 2019	(r519381)
@@ -15,7 +15,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
 LIB_DEPENDS=	libmustache.so:devel/libmustache
 
 USES=		compiler:c++11-lang php:pecl
-IGNORE_WITH_PHP=	74
 
 USE_CXXSTD=	c++11
 

Added: head/devel/pecl-mustache/files/patch-mustache_data.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/pecl-mustache/files/patch-mustache_data.cpp	Sun Dec  8 16:59:35 2019	(r519381)
@@ -0,0 +1,29 @@
+--- mustache_data.cpp.orig	2019-05-27 21:52:06 UTC
++++ mustache_data.cpp
+@@ -136,7 +136,7 @@ static zend_always_inline void mustache_
+ {
+   HashTable * data_hash = NULL;
+   long data_count = 0;
+-  ulong key_nindex = 0;
++  zend_ulong key_nindex = 0;
+   zend_string * key;
+   std::string ckey;
+   zval * data_entry = NULL;
+@@ -228,7 +228,7 @@ static zend_always_inline void mustache_
+ static zend_always_inline void mustache_data_from_object_properties_zval(mustache::Data * node, zval * current)
+ {
+   HashTable * data_hash = NULL;
+-  ulong key_nindex = 0;
++  zend_ulong key_nindex = 0;
+   zend_string * key;
+   std::string ckey;
+   zval * data_entry = NULL;
+@@ -311,7 +311,7 @@ static zend_always_inline void mustache_
+ static zend_always_inline void mustache_data_from_object_functions_zval(mustache::Data * node, zval * current)
+ {
+   HashTable * data_hash = NULL;
+-  ulong key_nindex = 0;
++  zend_ulong key_nindex = 0;
+   zend_string * key;
+   std::string ckey;
+   zval * data_entry = NULL;

Added: head/devel/pecl-mustache/files/patch-mustache_mustache.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/pecl-mustache/files/patch-mustache_mustache.cpp	Sun Dec  8 16:59:35 2019	(r519381)
@@ -0,0 +1,11 @@
+--- mustache_mustache.cpp.orig	2019-05-27 21:52:06 UTC
++++ mustache_mustache.cpp
+@@ -231,7 +231,7 @@ bool mustache_parse_partials_param(zval 
+         mustache::Node::Partials * partials)
+ {
+     HashTable * data_hash = NULL;
+-    ulong key_nindex = 0;
++    zend_ulong key_nindex = 0;
+ 
+     // Ignore if not an array
+     if( array == NULL || Z_TYPE_P(array) != IS_ARRAY ) {