svn commit: r519383 - in head/devel/pecl-zookeeper: . files

[Sunpoet Po-Chuan Hsieh]

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

Log:
  Fix build with PHP 7.4 and unbreak this port

Added:
  head/devel/pecl-zookeeper/files/
  head/devel/pecl-zookeeper/files/patch-php_zookeeper.c   (contents, props changed)
  head/devel/pecl-zookeeper/files/patch-php_zookeeper_callback.h   (contents, props changed)
Modified:
  head/devel/pecl-zookeeper/Makefile

Modified: head/devel/pecl-zookeeper/Makefile
==============================================================================
--- head/devel/pecl-zookeeper/Makefile	Sun Dec  8 16:59:41 2019	(r519382)
+++ head/devel/pecl-zookeeper/Makefile	Sun Dec  8 16:59:46 2019	(r519383)
@@ -15,7 +15,6 @@ LIB_DEPENDS=	libzookeeper_mt.so:devel/libzookeeper
 
 USES=		php:pecl
 USE_PHP=	session:build
-IGNORE_WITH_PHP=	74
 
 PORTDATA=	zookeeper-api.php
 

Added: head/devel/pecl-zookeeper/files/patch-php_zookeeper.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/pecl-zookeeper/files/patch-php_zookeeper.c	Sun Dec  8 16:59:46 2019	(r519383)
@@ -0,0 +1,11 @@
+--- php_zookeeper.c.orig	2019-03-08 00:37:59 UTC
++++ php_zookeeper.c
+@@ -1068,7 +1068,7 @@ static void php_parse_acl_list(zval *z_a
+ {
+ 	int size = 0;
+ 	int i = 0;
+-	ulong index = 0;
++	zend_ulong index = 0;
+ 	zend_string *key;
+ 	zval *entry = NULL;
+ 	zval *perms = NULL;

Added: head/devel/pecl-zookeeper/files/patch-php_zookeeper_callback.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/pecl-zookeeper/files/patch-php_zookeeper_callback.h	Sun Dec  8 16:59:46 2019	(r519383)
@@ -0,0 +1,18 @@
+--- php_zookeeper_callback.h.orig	2019-03-08 00:37:59 UTC
++++ php_zookeeper_callback.h
+@@ -24,7 +24,7 @@ typedef struct _php_cb_data_t {
+     zend_fcall_info fci;
+     zend_fcall_info_cache fcc;
+     zend_bool oneshot;
+-    ulong h;
++    zend_ulong h;
+     HashTable *ht;
+ #if ZTS
+     void ***ctx;
+@@ -34,4 +34,4 @@ typedef struct _php_cb_data_t {
+ php_cb_data_t* php_cb_data_new(HashTable *ht, zend_fcall_info *fci, zend_fcall_info_cache *fcc, zend_bool oneshot TSRMLS_DC);
+ void php_cb_data_destroy(php_cb_data_t **entry);
+ 
+-#endif  /* PHP_ZOOKEEPER_CALLBACK */
+\ No newline at end of file
++#endif  /* PHP_ZOOKEEPER_CALLBACK */