[93080] trunk/dports/php

[ryandesign at macports.org]

Revision: 93080
          https://trac.macports.org/changeset/93080
Author:   ryandesign at macports.org
Date:     2012-05-14 15:37:51 -0700 (Mon, 14 May 2012)
Log Message:
-----------
php-syck: unified port; add patch to fix build with php 5.4

Modified Paths:
--------------
    trunk/dports/php/php-syck/Portfile

Added Paths:
-----------
    trunk/dports/php/php-syck/
    trunk/dports/php/php-syck/files/
    trunk/dports/php/php-syck/files/patch-phpext.c.diff

Modified: trunk/dports/php/php-syck/Portfile
===================================================================
--- trunk/dports/php/php5-syck/Portfile	2012-05-14 22:23:14 UTC (rev 93079)
+++ trunk/dports/php/php-syck/Portfile	2012-05-14 22:37:51 UTC (rev 93080)
@@ -1,16 +1,16 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem              1.0
-PortGroup               php5extension 1.0
+PortGroup               php 1.0
 
-epoch                   1
-php5extension.setup     syck 0.9.3 pecl
-revision                2
+php.setup               syck 0.9.3 pecl
+php.branches            5.3 5.4
 categories-append       net devel
 platforms               darwin freebsd openbsd
 maintainers             nomaintainer
 
-description             PHP5 bindings for syck
+description             PHP bindings for syck
 
 long_description        Syck is a parser for YAML -- this package installs \
                         the syck php extension, allowing php code to \
@@ -20,9 +20,13 @@
                         sha1    c015f8527a6dea2644c122f085a2598939f63920 \
                         rmd160  b1f3c8a0e537feedd2a383b11a98afc97f666231
 
-depends_lib-append      port:syck \
+if {${name} != ${subport}} {
+    depends_lib-append  port:syck \
                         port:re2c
+    
+    patchfiles          patch-phpext.c.diff
+    
+    configure.args      --with-syck=${prefix}
+}
 
-configure.args          --with-syck=${prefix}
-
-livecheck.regex         {>(\d+(?:\.\d+)*(?:p\d+)?)</a></th>}
+php.pecl_livecheck_stable no

Added: trunk/dports/php/php-syck/files/patch-phpext.c.diff
===================================================================
--- trunk/dports/php/php-syck/files/patch-phpext.c.diff	                        (rev 0)
+++ trunk/dports/php/php-syck/files/patch-phpext.c.diff	2012-05-14 22:37:51 UTC (rev 93080)
@@ -0,0 +1,39 @@
+https://github.com/indeyets/syck/pull/7
+--- phpext.c.orig
++++ phpext.c
+@@ -198,7 +198,7 @@ static int psex_determine_array_type(HashTable *myht TSRMLS_DC) /* {{{ */
+ 
+ 
+ 
+-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 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n)
+ 
+ 				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 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n)
+ 
+ 				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 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n)
+ 
+ 				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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120514/731e3421/attachment.html>