From owner-svn-ports-all@freebsd.org Sun Oct 14 16:28:20 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
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 47B3510D9CAC;
Sun, 14 Oct 2018 16:28:20 +0000 (UTC)
(envelope-from sunpoet@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 ED97B8F24F;
Sun, 14 Oct 2018 16:28:19 +0000 (UTC)
(envelope-from sunpoet@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 CF6F220B36;
Sun, 14 Oct 2018 16:28:19 +0000 (UTC)
(envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9EGSJhw006561;
Sun, 14 Oct 2018 16:28:19 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9EGSJCv006559;
Sun, 14 Oct 2018 16:28:19 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201810141628.w9EGSJCv006559@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to
sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sun, 14 Oct 2018 16:28:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r482056 - in head/databases/php-memcache: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: sunpoet
X-SVN-Commit-Paths: in head/databases/php-memcache: . files
X-SVN-Commit-Revision: 482056
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.27
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Oct 2018 16:28:20 -0000
Author: sunpoet
Date: Sun Oct 14 16:28:19 2018
New Revision: 482056
URL: https://svnweb.freebsd.org/changeset/ports/482056
Log:
Fix build with PHP 7.3
Added:
head/databases/php-memcache/files/
head/databases/php-memcache/files/patch-php7-memcache.c (contents, props changed)
Modified:
head/databases/php-memcache/Makefile
Modified: head/databases/php-memcache/Makefile
==============================================================================
--- head/databases/php-memcache/Makefile Sun Oct 14 16:28:10 2018 (r482055)
+++ head/databases/php-memcache/Makefile Sun Oct 14 16:28:19 2018 (r482056)
@@ -16,11 +16,12 @@ OPTIONS_DEFINE= EXAMPLES
PORTSCOUT= skipv:start
+USES= dos2unix php:ext
+USE_PHP= session:build zlib:build
+
CONFIGURE_ARGS= --with-zlib-dir=/usr
IGNORE_WITH_PHP=56
USE_CSTD= gnu89
-USE_PHP= session:build zlib:build
-USES= dos2unix php:ext
GH_ACCOUNT= websupport-sk
GH_PROJECT= pecl-${PORTNAME}
Added: head/databases/php-memcache/files/patch-php7-memcache.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/php-memcache/files/patch-php7-memcache.c Sun Oct 14 16:28:19 2018 (r482056)
@@ -0,0 +1,38 @@
+--- 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;
+ }