- Update to 2.1.0

- Convert Header
This commit is contained in:
Martin Wilke 2013-02-01 16:24:41 +00:00
parent 9ea6cc8ebc
commit 2ccb5369f7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=311388
4 changed files with 4 additions and 95 deletions

View file

@ -1,12 +1,8 @@
# New ports collection makefile for: pecl-automap
# Date created: 21 Jan 2007
# Whom: Ditesh Shashikant Gathani <ditesh@gathani.org>
#
# Created by: Ditesh Shashikant Gathani <ditesh@gathani.org>
# $FreeBSD$
#
PORTNAME= automap
PORTVERSION= 1.1.0
PORTVERSION= 2.1.0
CATEGORIES= devel pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@ -22,8 +18,6 @@ USE_PHP= spl
USE_PHP_BUILD= yes
USE_PHPEXT= yes
PHP_MODNAME= automap
DEFAULT_PHP_VER=53
IGNORE_WITH_PHP=5
CONFIGURE_ARGS= --enable-automap

View file

@ -1,2 +1,2 @@
SHA256 (PECL/automap-1.1.0.tgz) = ec2fb8405dbf7204968a7c7c0f47eea50ba758ca4a08440cbc1ebdcb493ae7b3
SIZE (PECL/automap-1.1.0.tgz) = 22822
SHA256 (PECL/automap-2.1.0.tgz) = b7346e98e6cb9fd5f7b65a152ebb64df1e3d4d810ca59a6be8be0d66832ed004
SIZE (PECL/automap-2.1.0.tgz) = 27437

View file

@ -1,19 +0,0 @@
--- ./Automap.c.orig 2010-04-12 16:58:59.000000000 -0400
+++ ./Automap.c 2010-04-12 18:59:40.000000000 -0400
@@ -1617,14 +1617,14 @@
/* }}} */
/*---------------------------------------------------------------*/
-static ZEND_BEGIN_ARG_INFO_EX(Automap_mount_arginfo, 0, 1, 1)
+ZEND_BEGIN_ARG_INFO_EX(Automap_mount_arginfo, 0, 1, 1)
ZEND_ARG_INFO(0, path)
ZEND_ARG_INFO(0, base_dir)
ZEND_ARG_INFO(0, mnt)
ZEND_ARG_INFO(0, flags)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(Automap_autoload_hook_arginfo, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(Automap_autoload_hook_arginfo, 0, 0, 1)
ZEND_ARG_INFO(0, symbol)
ZEND_ARG_INFO(0, type)
ZEND_END_ARG_INFO()

View file

@ -1,66 +0,0 @@
--- ./utils.c.orig 2008-01-18 22:07:09.000000000 -0500
+++ ./utils.c 2010-04-12 19:04:13.000000000 -0400
@@ -65,37 +65,37 @@
/*============================================================================*/
/* Generic arginfo structures */
-static ZEND_BEGIN_ARG_INFO_EX(UT_noarg_arginfo, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(UT_noarg_arginfo, 0, 0, 0)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(UT_noarg_ref_arginfo, 0, 1, 0)
+ZEND_BEGIN_ARG_INFO_EX(UT_noarg_ref_arginfo, 0, 1, 0)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(UT_1arg_arginfo, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(UT_1arg_arginfo, 0, 0, 1)
ZEND_ARG_INFO(0, arg1)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(UT_1arg_ref_arginfo, 0, 1, 1)
+ZEND_BEGIN_ARG_INFO_EX(UT_1arg_ref_arginfo, 0, 1, 1)
ZEND_ARG_INFO(0, arg1)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(UT_2args_arginfo, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(UT_2args_arginfo, 0, 0, 2)
ZEND_ARG_INFO(0, arg1)
ZEND_ARG_INFO(0, arg2)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(UT_2args_ref_arginfo, 0, 1, 2)
+ZEND_BEGIN_ARG_INFO_EX(UT_2args_ref_arginfo, 0, 1, 2)
ZEND_ARG_INFO(0, arg1)
ZEND_ARG_INFO(0, arg2)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(UT_3args_arginfo, 0, 0, 3)
+ZEND_BEGIN_ARG_INFO_EX(UT_3args_arginfo, 0, 0, 3)
ZEND_ARG_INFO(0, arg1)
ZEND_ARG_INFO(0, arg2)
ZEND_ARG_INFO(0, arg3)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(UT_3args_ref_arginfo, 0, 1, 3)
+ZEND_BEGIN_ARG_INFO_EX(UT_3args_ref_arginfo, 0, 1, 3)
ZEND_ARG_INFO(0, arg1)
ZEND_ARG_INFO(0, arg2)
ZEND_ARG_INFO(0, arg3)
@@ -234,13 +234,13 @@
static void ut_persistent_zval_ptr_dtor(zval ** zval_ptr)
{
- (*zval_ptr)->refcount--;
- if ((*zval_ptr)->refcount == 0) {
+ Z_DELREF_P((*zval_ptr));
+ if (Z_REFCOUNT_P((*zval_ptr)) == 0) {
ut_persistent_zval_dtor(*zval_ptr);
pefree(*zval_ptr, 1);
} else {
- if ((*zval_ptr)->refcount == 1)
- (*zval_ptr)->is_ref = 0;
+ if (Z_REFCOUNT_P((*zval_ptr)) == 1)
+ Z_UNSET_ISREF_P((*zval_ptr));
}
}