View | Details | Raw Unified | Return to bug 167994
Collapse All | Expand All

(-)./Makefile (-4 / +3 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	intl
8
PORTNAME=	intl
9
PORTVERSION=	1.1.2
9
PORTVERSION=	2.0.0
10
PORTREVISION=	3
11
CATEGORIES=	devel pear
10
CATEGORIES=	devel pear
12
MASTER_SITES=	http://pecl.php.net/get/
11
MASTER_SITES=	http://pecl.php.net/get/
13
PKGNAMEPREFIX=	pecl-
12
PKGNAMEPREFIX=	pecl-
Lines 17-26 Link Here
17
MAINTAINER=	miwi@FreeBSD.org
16
MAINTAINER=	miwi@FreeBSD.org
18
COMMENT=	A PECL extension to support Internationalization(ICU)
17
COMMENT=	A PECL extension to support Internationalization(ICU)
19
18
20
LIB_DEPENDS=	icui18n.48:${PORTSDIR}/devel/icu
21
22
LICENSE=	PHP301
19
LICENSE=	PHP301
23
20
21
LIB_DEPENDS=	icui18n.48:${PORTSDIR}/devel/icu
22
24
USE_PHP=	yes
23
USE_PHP=	yes
25
USE_PHPEXT=	yes
24
USE_PHPEXT=	yes
26
IGNORE_WITH_PHP=4 52
25
IGNORE_WITH_PHP=4 52
(-)./distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (PECL/intl-1.1.2.tgz) = 5737698b16489e7fec4376520a20db960b64295d53bceabd16b8e59a5b2b90eb
1
SHA256 (PECL/intl-2.0.0.tgz) = 03a197e1ed9537594e829936c9b95eb234f49ed05d81c3d177f5a4a7a7728feb
2
SIZE (PECL/intl-1.1.2.tgz) = 142511
2
SIZE (PECL/intl-2.0.0.tgz) = 145979
(-)./files/patch-collator__collator_class.c (-25 lines)
Lines 1-25 Link Here
1
--- ./collator/collator_class.c.orig	2010-03-15 18:03:30.000000000 -0400
2
+++ ./collator/collator_class.c	2010-04-13 10:31:54.000000000 -0400
3
@@ -88,22 +88,18 @@
4
        modify approptiate 'collator_XX_args' for
5
        the procedural API.
6
 */
7
-static
8
 ZEND_BEGIN_ARG_INFO_EX( collator_0_args, 0, 0, 0 )
9
 ZEND_END_ARG_INFO()
10
 
11
-static
12
 ZEND_BEGIN_ARG_INFO_EX( collator_1_arg, 0, 0, 1 )
13
 	ZEND_ARG_INFO( 0, arg1 )
14
 ZEND_END_ARG_INFO()
15
 
16
-static
17
 ZEND_BEGIN_ARG_INFO_EX( collator_2_args, 0, 0, 2 )
18
 	ZEND_ARG_INFO( 0, arg1 )
19
 	ZEND_ARG_INFO( 0, arg2 )
20
 ZEND_END_ARG_INFO()
21
 
22
-static
23
 ZEND_BEGIN_ARG_INFO_EX( collator_sort_args, 0, 0, 1 )
24
 	ZEND_ARG_ARRAY_INFO( 1, arr, 0 )
25
 	ZEND_ARG_INFO( 0, flags )
(-)./files/patch-dateformat__dateformat_class.c (-46 lines)
Lines 1-46 Link Here
1
--- ./dateformat/dateformat_class.c.orig	2010-04-13 10:34:55.000000000 -0400
2
+++ ./dateformat/dateformat_class.c	2010-04-13 10:35:14.000000000 -0400
3
@@ -84,42 +84,35 @@
4
  */
5
 
6
 /* {{{ arginfo */
7
-static ZEND_BEGIN_ARG_INFO_EX(datefmt_parse_args, 0, 0, 1)
8
+ZEND_BEGIN_ARG_INFO_EX(datefmt_parse_args, 0, 0, 1)
9
 		ZEND_ARG_INFO(0, string)
10
 		ZEND_ARG_INFO(1, position)
11
 ZEND_END_ARG_INFO()
12
 
13
-static
14
 ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_format, 0, 0, 0)
15
 	ZEND_ARG_INFO(0, args)
16
 	ZEND_ARG_INFO(0, array)
17
 ZEND_END_ARG_INFO()
18
 
19
-static
20
 ZEND_BEGIN_ARG_INFO(arginfo_intldateformatter_getdatetype, 0)
21
 ZEND_END_ARG_INFO()
22
 
23
-static
24
 ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_settimezoneid, 0, 0, 1)
25
 	ZEND_ARG_INFO(0, zone)
26
 ZEND_END_ARG_INFO()
27
 
28
-static
29
 ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_setpattern, 0, 0, 1)
30
 	ZEND_ARG_INFO(0, pattern)
31
 ZEND_END_ARG_INFO()
32
 
33
-static
34
 ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_setlenient, 0, 0, 1)
35
 	ZEND_ARG_INFO(0, lenient)
36
 ZEND_END_ARG_INFO()
37
 
38
-static
39
 ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_setcalendar, 0, 0, 1)
40
 	ZEND_ARG_INFO(0, which)
41
 ZEND_END_ARG_INFO()
42
 
43
-static
44
 ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter___construct, 0, 0, 3)
45
 	ZEND_ARG_INFO(0, locale)
46
 	ZEND_ARG_INFO(0, datetype)
(-)./files/patch-formatter__formatter_class.c (-68 lines)
Lines 1-68 Link Here
1
--- ./formatter/formatter_class.c.orig	2010-03-15 18:03:30.000000000 -0400
2
+++ ./formatter/formatter_class.c	2010-04-13 10:31:54.000000000 -0400
3
@@ -80,63 +80,54 @@
4
  */
5
 
6
 /* {{{ arginfo */
7
-static ZEND_BEGIN_ARG_INFO_EX(number_parse_arginfo, 0, 0, 1)
8
+ZEND_BEGIN_ARG_INFO_EX(number_parse_arginfo, 0, 0, 1)
9
 	ZEND_ARG_INFO(0, string)
10
 	ZEND_ARG_INFO(0, type)
11
 	ZEND_ARG_INFO(1, position)
12
 ZEND_END_ARG_INFO()
13
 
14
-static ZEND_BEGIN_ARG_INFO_EX(number_parse_currency_arginfo, 0, 0, 2)
15
+ZEND_BEGIN_ARG_INFO_EX(number_parse_currency_arginfo, 0, 0, 2)
16
 	ZEND_ARG_INFO(0, string)
17
 	ZEND_ARG_INFO(1, currency)
18
 	ZEND_ARG_INFO(1, position)
19
 ZEND_END_ARG_INFO()
20
 
21
-static
22
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_getattribute, 0, 0, 1)
23
 	ZEND_ARG_INFO(0, attr)
24
 ZEND_END_ARG_INFO()
25
 
26
-static
27
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_setattribute, 0, 0, 2)
28
 	ZEND_ARG_INFO(0, attr)
29
 	ZEND_ARG_INFO(0, value)
30
 ZEND_END_ARG_INFO()
31
 
32
-static
33
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_setsymbol, 0, 0, 2)
34
 	ZEND_ARG_INFO(0, attr)
35
 	ZEND_ARG_INFO(0, symbol)
36
 ZEND_END_ARG_INFO()
37
 
38
-static
39
 ZEND_BEGIN_ARG_INFO(arginfo_numberformatter_getpattern, 0)
40
 ZEND_END_ARG_INFO()
41
 
42
-static
43
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_setpattern, 0, 0, 1)
44
 	ZEND_ARG_INFO(0, pattern)
45
 ZEND_END_ARG_INFO()
46
 
47
-static
48
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_getlocale, 0, 0, 0)
49
 	ZEND_ARG_INFO(0, type)
50
 ZEND_END_ARG_INFO()
51
 
52
-static
53
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter___construct, 0, 0, 2)
54
 	ZEND_ARG_INFO(0, locale)
55
 	ZEND_ARG_INFO(0, style)
56
 	ZEND_ARG_INFO(0, pattern)
57
 ZEND_END_ARG_INFO()
58
 
59
-static
60
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_formatcurrency, 0, 0, 2)
61
 	ZEND_ARG_INFO(0, num)
62
 	ZEND_ARG_INFO(0, currency)
63
 ZEND_END_ARG_INFO()
64
 
65
-static
66
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_format, 0, 0, 1)
67
 	ZEND_ARG_INFO(0, num)
68
 	ZEND_ARG_INFO(0, type)
(-)./files/patch-locale__locale_class.c (-32 lines)
Lines 1-32 Link Here
1
--- ./locale/locale_class.c.orig	2010-04-13 10:34:14.000000000 -0400
2
+++ ./locale/locale_class.c	2010-04-13 10:34:27.000000000 -0400
3
@@ -35,29 +35,24 @@
4
  *        approptiate 'locale_XX_args' for the procedural API!
5
  */
6
 
7
-static
8
 ZEND_BEGIN_ARG_INFO_EX( locale_0_args, 0, 0, 0 )
9
 ZEND_END_ARG_INFO()
10
 
11
-static
12
 ZEND_BEGIN_ARG_INFO_EX( locale_1_arg, 0, 0, 1 )
13
 	ZEND_ARG_INFO( 0, arg1 )
14
 ZEND_END_ARG_INFO()
15
 
16
-static
17
 ZEND_BEGIN_ARG_INFO_EX( locale_2_args, 0, 0, 2 )
18
 	ZEND_ARG_INFO( 0, arg1 )
19
 	ZEND_ARG_INFO( 0, arg2 )
20
 ZEND_END_ARG_INFO()
21
 
22
-static
23
 ZEND_BEGIN_ARG_INFO_EX( locale_3_args, 0, 0, 3 )
24
         ZEND_ARG_INFO( 0, arg1 )
25
         ZEND_ARG_INFO( 0, arg2 )
26
         ZEND_ARG_INFO( 0, arg3 )
27
 ZEND_END_ARG_INFO()
28
 
29
-static
30
 ZEND_BEGIN_ARG_INFO_EX( locale_4_args, 0, 0, 4 )
31
         ZEND_ARG_INFO( 0, arg1 )
32
         ZEND_ARG_INFO( 0, arg2 )
(-)./files/patch-msgformat__msgformat_class.c (-37 lines)
Lines 1-37 Link Here
1
--- ./msgformat/msgformat_class.c.orig	2010-04-13 10:35:58.000000000 -0400
2
+++ ./msgformat/msgformat_class.c	2010-04-13 10:36:15.000000000 -0400
3
@@ -77,34 +77,28 @@
4
  */
5
 
6
 /* {{{ arginfo */
7
-static
8
 ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter___construct, 0, 0, 2)
9
 	ZEND_ARG_INFO(0, locale)
10
 	ZEND_ARG_INFO(0, pattern)
11
 ZEND_END_ARG_INFO()
12
 
13
-static
14
 ZEND_BEGIN_ARG_INFO(arginfo_messageformatter_geterrormessage, 0)
15
 ZEND_END_ARG_INFO()
16
 
17
-static
18
 ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter_formatmessage, 0, 0, 3)
19
 	ZEND_ARG_INFO(0, locale)
20
 	ZEND_ARG_INFO(0, pattern)
21
 	ZEND_ARG_INFO(0, args)
22
 ZEND_END_ARG_INFO()
23
 
24
-static
25
 ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter_format, 0, 0, 1)
26
 	ZEND_ARG_INFO(0, args)
27
 ZEND_END_ARG_INFO()
28
 
29
-static
30
 ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter_setpattern, 0, 0, 1)
31
 	ZEND_ARG_INFO(0, pattern)
32
 ZEND_END_ARG_INFO()
33
 
34
-static
35
 ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter_parse, 0, 0, 1)
36
 	ZEND_ARG_INFO(0, source)
37
 ZEND_END_ARG_INFO()
(-)./files/patch-normalizer__normalizer_class.c (-10 lines)
Lines 1-10 Link Here
1
--- ./normalizer/normalizer_class.c.orig	2010-04-13 10:33:36.000000000 -0400
2
+++ ./normalizer/normalizer_class.c	2010-04-13 10:33:47.000000000 -0400
3
@@ -29,7 +29,6 @@
4
 
5
 /* {{{ Normalizer methods arguments info */
6
 
7
-static
8
 ZEND_BEGIN_ARG_INFO_EX( normalizer_3_args, 0, 0, 3 )
9
 	ZEND_ARG_INFO( 0, arg1 )
10
 	ZEND_ARG_INFO( 0, arg2 )
(-)./files/patch-resourcebundle__resourcebundle_class.c (-11 lines)
Lines 1-11 Link Here
1
--- ./resourcebundle/resourcebundle_class.c.orig	2010-04-13 10:38:08.000000000 -0400
2
+++ ./resourcebundle/resourcebundle_class.c	2010-04-13 10:38:25.000000000 -0400
3
@@ -212,7 +212,7 @@
4
 	MAKE_STD_ZVAL(retval);
5
 
6
 	resourcebundle_array_fetch(object, offset, retval, 1 TSRMLS_CC);
7
-	retval->refcount--;
8
+	Z_DELREF_P(retval);
9
 	return retval;
10
 }
11
 /* }}} */
(-)./files/patch-resourcebundle__resourcebundle_iterator.c (-20 lines)
Lines 1-20 Link Here
1
--- ./resourcebundle/resourcebundle_iterator.c.orig	2010-04-13 10:38:51.000000000 -0400
2
+++ ./resourcebundle/resourcebundle_iterator.c	2010-04-13 10:39:13.000000000 -0400
3
@@ -75,7 +75,7 @@
4
 
5
 	resourcebundle_iterator_invalidate( iter TSRMLS_CC );
6
 
7
-	object->refcount--;
8
+	Z_DELREF_P(object);
9
 
10
 	efree(iterator);
11
 }
12
@@ -162,7 +162,7 @@
13
 	     php_error( E_ERROR, "ResourceBundle does not support writable iterators" );
14
 	}
15
 
16
-	object->refcount++;
17
+	Z_ADDREF_P(object);
18
 	iterator->intern.data = (void *) object;
19
 	iterator->intern.funcs = &resourcebundle_iterator_funcs;
20
 

Return to bug 167994