Update to 4.0.0

Changes:	https://github.com/websupport-sk/pecl-memcache/releases

4 files changed, 17 insertions, 44 deletions

diff --git a/databases/php-memcache/Makefile b/databases/php-memcache/Makefile
index 0daf17566ed4..0e195329f58a 100644
--- a/databases/php-memcache/Makefile
+++ b/databases/php-memcache/Makefile
@@ -2,7 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	memcache
-PORTVERSION=	3.0.9
+PORTVERSION=	4.0.0
+DISTVERSIONPREFIX=	v
+DISTVERSIONSUFFIX=	-php73
 CATEGORIES=	databases
 PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
@@ -20,11 +22,9 @@ USES=		dos2unix php:ext
 USE_PHP=	session:build zlib:build
 
 CONFIGURE_ARGS=	--with-zlib-dir=/usr
-USE_CSTD=	gnu89
 
 GH_ACCOUNT=	websupport-sk
 GH_PROJECT=	pecl-${PORTNAME}
-GH_TAGNAME=	e702b5f
 USE_GITHUB=	yes
 
 post-install-EXAMPLES-on:
diff --git a/databases/php-memcache/distinfo b/databases/php-memcache/distinfo
index f4f854a98d92..cb38663057fe 100644
--- a/databases/php-memcache/distinfo
+++ b/databases/php-memcache/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512806606
-SHA256 (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = a7be1b96f4a57acb5808644c6e4b16bb03097ab46a97a576f02750627fcdf854
-SIZE (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = 110689
+TIMESTAMP = 1551383238
+SHA256 (websupport-sk-pecl-memcache-v4.0.0-php73_GH0.tar.gz) = 6302bc1d8f9e43a754a17e6f15ae905419de0ca2e25c72988cb141e2c1d01e14
+SIZE (websupport-sk-pecl-memcache-v4.0.0-php73_GH0.tar.gz) = 112516
diff --git a/databases/php-memcache/files/patch-php7-memcache.c b/databases/php-memcache/files/patch-php7-memcache.c
deleted file mode 100644
index 0262e8887e29..000000000000
--- a/databases/php-memcache/files/patch-php7-memcache.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- php7/memcache.c.orig	2017-08-02 09:38:18 UTC
-+++ php7/memcache.c
-@@ -728,7 +728,11 @@ mmc_t *mmc_find_persistent(const char *h
- 		mmc = mmc_server_new(host, host_len, port, udp_port, 1, timeout, retry_interval);
- 		le->type = le_memcache_server;
- 		le->ptr  = mmc;
-+#if PHP_VERSION_ID >= 70300
-+		GC_SET_REFCOUNT(le, 1);
-+#else
- 		GC_REFCOUNT(le) = 1;
-+#endif
- 
- 		/* register new persistent connection */
- 		if (zend_hash_str_update_mem(&EG(persistent_list), key, key_len, le, sizeof(*le)) == NULL) {
-@@ -786,7 +790,11 @@ static mmc_t *php_mmc_pool_addserver(
- 		pool->failure_callback = &php_mmc_failure_callback;
- 		list_res = zend_register_resource(pool, le_memcache_pool);
- 		add_property_resource(mmc_object, "connection", list_res);
-+#if PHP_VERSION_ID >= 70300
-+		GC_ADDREF(list_res);
-+#else
- 		GC_REFCOUNT(list_res)++;
-+#endif
- 	}
- 	else {
- 		pool = zend_fetch_resource_ex(connection, "connection", le_memcache_pool);
-@@ -870,7 +878,11 @@ static void php_mmc_connect(INTERNAL_FUN
- 		mmc_object = return_value;
- 		object_init_ex(mmc_object, memcache_ce);
- 		add_property_resource(mmc_object, "connection", list_res);
-+#if PHP_VERSION_ID >= 70300
-+		GC_ADDREF(list_res);
-+#else
- 		GC_REFCOUNT(list_res)++;
-+#endif
- 	} else {
- 		RETVAL_TRUE;
- 	}
diff --git a/databases/php-memcache/files/patch-php7-memcache_pool.h b/databases/php-memcache/files/patch-php7-memcache_pool.h
new file mode 100644
index 000000000000..1ea33e6e2c05
--- /dev/null
+++ b/databases/php-memcache/files/patch-php7-memcache_pool.h
@@ -0,0 +1,11 @@
+--- php7/memcache_pool.h.orig	2019-02-27 20:19:05 UTC
++++ php7/memcache_pool.h
+@@ -396,7 +396,7 @@ int mmc_unpack_value(mmc_t *, mmc_reques
+ double timeval_to_double(struct timeval tv);
+ struct timeval double_to_timeval(double sec);
+ 
+-int mmc_prepare_key_ex(const char *, unsigned int, char *, unsigned int *);
++int mmc_prepare_key_ex(const char *, unsigned int, char *, unsigned int *, char *);
+ int mmc_prepare_key(zval *, char *, unsigned int *);
+ 
+ #define mmc_str_left(h, n, hlen, nlen) ((hlen) >= (nlen) ? memcmp((h), (n), (nlen)) == 0 : 0)