4 files changed, 4 insertions, 102 deletions

diff --git a/databases/pecl-memcache/Makefile b/databases/pecl-memcache/Makefile
index 9107a58466c2..06037d2dfb9e 100644
--- a/databases/pecl-memcache/Makefile
+++ b/databases/pecl-memcache/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	pecl-memcache
-# Date created:			10 August 2004
-# Whom:				Gerrit Beine <tux@pinguru.net>
-#
+# Created by: Gerrit Beine <tux@pinguru.net>
 # $FreeBSD$
-#
 
 PORTNAME=	memcache
-PORTVERSION=	3.0.6
+PORTVERSION=	3.0.7
 CATEGORIES=	databases
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
diff --git a/databases/pecl-memcache/distinfo b/databases/pecl-memcache/distinfo
index 774c89a6aa0e..6a82254a3688 100644
--- a/databases/pecl-memcache/distinfo
+++ b/databases/pecl-memcache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PECL/memcache-3.0.6.tgz) = cf6871f0944ee38022c5f84910f306d83b0f51564bbc08624a215e06d8486618
-SIZE (PECL/memcache-3.0.6.tgz) = 54717
+SHA256 (PECL/memcache-3.0.7.tgz) = f34e2ef42dd8f1f7e6a2cfbb9417a9e58e3bfd7f5db7227ca5afab686cefdd1f
+SIZE (PECL/memcache-3.0.7.tgz) = 55300
diff --git a/databases/pecl-memcache/files/patch-memcache.c b/databases/pecl-memcache/files/patch-memcache.c
deleted file mode 100644
index a7c75dff2253..000000000000
--- a/databases/pecl-memcache/files/patch-memcache.c
+++ /dev/null
@@ -1,74 +0,0 @@
---- memcache.c.orig	2011-04-11 12:56:53.000000000 +0800
-+++ memcache.c	2012-05-17 02:00:58.108724781 +0800
-@@ -718,7 +718,7 @@
- 			mmc_server_free(mmc TSRMLS_CC);
- 			mmc = NULL;
- 		} else {
--			zend_list_insert(mmc, le_memcache_server);
-+			MEMCACHE_LIST_INSERT(mmc, le_memcache_server);
- 		}
- 	}
- 	else if (le->type != le_memcache_server || le->ptr == NULL) {
-@@ -735,7 +735,7 @@
- 			mmc = NULL;
- 		}
- 		else {
--			zend_list_insert(mmc, le_memcache_server);
-+			MEMCACHE_LIST_INSERT(mmc, le_memcache_server);
- 		}
- 	}
- 	else {
-@@ -775,7 +775,7 @@
- 	if (zend_hash_find(Z_OBJPROP_P(mmc_object), "connection", sizeof("connection"), (void **)&connection) == FAILURE) {
- 		pool = mmc_pool_new(TSRMLS_C);
- 		pool->failure_callback = &php_mmc_failure_callback;
--		list_id = zend_list_insert(pool, le_memcache_pool);
-+		list_id = MEMCACHE_LIST_INSERT(pool, le_memcache_pool);
- 		add_property_resource(mmc_object, "connection", list_id);
- 	}
- 	else {
-@@ -836,7 +836,7 @@
- 		int list_id;
- 		mmc_pool_t *pool = mmc_pool_new(TSRMLS_C);
- 		pool->failure_callback = &php_mmc_failure_callback;
--		list_id = zend_list_insert(pool, le_memcache_pool);
-+		list_id = MEMCACHE_LIST_INSERT(pool, le_memcache_pool);
- 		mmc_object = return_value;
- 		object_init_ex(mmc_object, memcache_ce);
- 		add_property_resource(mmc_object, "connection", list_id);
-@@ -986,7 +986,7 @@
- 
- 	/* check for userspace callback */
- 	if (param != NULL && zend_hash_find(Z_OBJPROP_P((zval *)param), "_failureCallback", sizeof("_failureCallback"), (void **)&callback) == SUCCESS && Z_TYPE_PP(callback) != IS_NULL) {
--		if (IS_CALLABLE(*callback, 0, NULL)) {
-+		if (MEMCACHE_IS_CALLABLE(*callback, 0, NULL)) {
- 			zval *retval = NULL;
- 			zval *host, *tcp_port, *udp_port, *error, *errnum;
- 			zval **params[5];
-@@ -1213,7 +1213,7 @@
- 	}
- 
- 	if (failure_callback != NULL && Z_TYPE_P(failure_callback) != IS_NULL) {
--		if (!IS_CALLABLE(failure_callback, 0, NULL)) {
-+		if (!MEMCACHE_IS_CALLABLE(failure_callback, 0, NULL)) {
- 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");
- 			RETURN_FALSE;
- 		}
-@@ -1275,7 +1275,7 @@
- 	}
- 
- 	if (failure_callback != NULL && Z_TYPE_P(failure_callback) != IS_NULL) {
--		if (!IS_CALLABLE(failure_callback, 0, NULL)) {
-+		if (!MEMCACHE_IS_CALLABLE(failure_callback, 0, NULL)) {
- 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");
- 			RETURN_FALSE;
- 		}
-@@ -1340,7 +1340,7 @@
- 	}
- 
- 	if (Z_TYPE_P(failure_callback) != IS_NULL) {
--		if (!IS_CALLABLE(failure_callback, 0, NULL)) {
-+		if (!MEMCACHE_IS_CALLABLE(failure_callback, 0, NULL)) {
- 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");
- 			RETURN_FALSE;
- 		}
diff --git a/databases/pecl-memcache/files/patch-php_memcache.h b/databases/pecl-memcache/files/patch-php_memcache.h
deleted file mode 100644
index 8d9b73cda41d..000000000000
--- a/databases/pecl-memcache/files/patch-php_memcache.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- php_memcache.h.orig	2012-05-17 02:01:32.293725097 +0800
-+++ php_memcache.h	2012-05-17 02:03:47.294725872 +0800
-@@ -72,9 +72,15 @@
- #define MMC_DEFAULT_CACHEDUMP_LIMIT	100		/* number of entries */
- 
- #if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)
--#   define IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp) TSRMLS_CC)
-+#   define MEMCACHE_IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp) TSRMLS_CC)
- #else
--#   define IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp))
-+#   define MEMCACHE_IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp))
-+#endif
-+
-+#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 4)
-+#    define MEMCACHE_LIST_INSERT(item, list) zend_list_insert(item, list TSRMLS_CC);
-+#else
-+#    define MEMCACHE_LIST_INSERT(item, list) zend_list_insert(item, list);
- #endif
- 
- /* internal functions */