Attachment #130355 for bug #174253

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




# Date created:			7 Aug 2007
# Whom:				Ditesh Shashikant Gathani <ditesh@gathani.org>
#
# $FreeBSD: ports/textproc/pecl-syck/Makefile,v 1.5 2012/05/20 06:42:50 ale Exp $
#

PORTNAME=	syck
PORTVERSION=	0.9.3
PORTREVISION=	1
CATEGORIES=	textproc pear
MASTER_SITES=	http://pecl.php.net/get/
PKGNAMEPREFIX=	pecl-

USE_PHP=	spl hash
USE_PHP_BUILD=	yes
USE_PHPEXT=	yes
DEFAULT_PHP_VER=53
IGNORE_WITH_PHP=5

CONFIGURE_ARGS=	--enable-syck





--- phpext.c.orig	2012-12-05 11:19:34.767180000 +0800
+++ phpext.c	2012-12-05 11:20:01.379824000 +0800
@@ -198,7 +198,7 @@
 
 
 
-function_entry syck_functions[] = {
+zend_function_entry syck_functions[] = {
 	PHP_FE(syck_load, arginfo_syck_load)
 	PHP_FE(syck_dump, arginfo_syck_dump)
 	{NULL, NULL, NULL}	/* Must be the last line in syck_functions[] */
@@ -403,7 +403,7 @@
 
 				strncpy(classname, n->type_id + 12, classname_len + 1);
 
-				if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
+				if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
 					zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
 					efree(classname);
 					break;
@@ -439,7 +439,7 @@
 
 				strncpy(classname, n->type_id + 11, classname_len + 1);
 
-				if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
+				if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
 					zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
 					efree(classname);
 					break;
@@ -511,7 +511,7 @@
 
 				strncpy(classname, n->type_id + 10, classname_len + 1);
 
-				if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
+				if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
 					zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
 					efree(classname);
 					break;

Return to bug 174253

Lines 2-12 Link Here

(-)/amd/gcs/93/9317544/ports/textproc/pecl-syck/Makefile (-3 / +2 lines)
2	# Date created: 7 Aug 2007	2	# Date created: 7 Aug 2007
3	# Whom: Ditesh Shashikant Gathani <ditesh@gathani.org>	3	# Whom: Ditesh Shashikant Gathani <ditesh@gathani.org>
4	#	4	#
5	# $FreeBSD: ports/textproc/pecl-syck/Makefile,v 1.6 2012/11/17 06:02:15 svnexp Exp $	5	# $FreeBSD: ports/textproc/pecl-syck/Makefile,v 1.5 2012/05/20 06:42:50 ale Exp $
6	#	6	#
7		7
8	PORTNAME= syck	8	PORTNAME= syck
9	PORTVERSION= 0.9.3	9	PORTVERSION= 0.9.3
		10	PORTREVISION= 1
10	CATEGORIES= textproc pear	11	CATEGORIES= textproc pear
11	MASTER_SITES= http://pecl.php.net/get/	12	MASTER_SITES= http://pecl.php.net/get/
12	PKGNAMEPREFIX= pecl-	13	PKGNAMEPREFIX= pecl-
Lines 21-28 Link Here
21	USE_PHP= spl hash	22	USE_PHP= spl hash
22	USE_PHP_BUILD= yes	23	USE_PHP_BUILD= yes
23	USE_PHPEXT= yes	24	USE_PHPEXT= yes
24	DEFAULT_PHP_VER=53
25	IGNORE_WITH_PHP=5
26		25
27	CONFIGURE_ARGS= --enable-syck	26	CONFIGURE_ARGS= --enable-syck
28		27

Line 0 Link Here

(-)/amd/gcs/93/9317544/ports/textproc/pecl-syck/files/patch-phpext.c (+38 lines)
	1	--- phpext.c.orig 2012-12-05 11:19:34.767180000 +0800
	2	+++ phpext.c 2012-12-05 11:20:01.379824000 +0800
	3	@@ -198,7 +198,7 @@
	4
	5
	6
	7	-function_entry syck_functions[] = {
	8	+zend_function_entry syck_functions[] = {
	9	PHP_FE(syck_load, arginfo_syck_load)
	10	PHP_FE(syck_dump, arginfo_syck_dump)
	11	{NULL, NULL, NULL} /* Must be the last line in syck_functions[] */
	12	@@ -403,7 +403,7 @@
	13
	14	strncpy(classname, n->type_id + 12, classname_len + 1);
	15
	16	- if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
	17	+ if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
	18	zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
	19	efree(classname);
	20	break;
	21	@@ -439,7 +439,7 @@
	22
	23	strncpy(classname, n->type_id + 11, classname_len + 1);
	24
	25	- if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
	26	+ if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
	27	zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
	28	efree(classname);
	29	break;
	30	@@ -511,7 +511,7 @@
	31
	32	strncpy(classname, n->type_id + 10, classname_len + 1);
	33
	34	- if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
	35	+ if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
	36	zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
	37	efree(classname);
	38	break;