[93630] trunk/dports/php

[ryandesign at macports.org]

Revision: 93630
          https://trac.macports.org/changeset/93630
Author:   ryandesign at macports.org
Date:     2012-05-27 22:02:16 -0700 (Sun, 27 May 2012)
Log Message:
-----------
php-SPL_Types: unified port; use upstream patches instead of reinplace

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

Added Paths:
-----------
    trunk/dports/php/php-SPL_Types/
    trunk/dports/php/php-SPL_Types/files/
    trunk/dports/php/php-SPL_Types/files/patch-spl_type.c.diff

Modified: trunk/dports/php/php-SPL_Types/Portfile
===================================================================
--- trunk/dports/php/php5-SPL_Types/Portfile	2012-05-25 21:53:07 UTC (rev 93529)
+++ trunk/dports/php/php-SPL_Types/Portfile	2012-05-28 05:02:16 UTC (rev 93630)
@@ -2,18 +2,20 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           php5extension 1.0
+PortGroup           php 1.1
 
-php5extension.setup spl_types 0.3.0 pecl
+name                php-SPL_Types
+version             0.3.0
 revision            1
-name                php5-SPL_Types
 license             PHP
 categories          php devel
 platforms           darwin
 maintainers         nomaintainer
 license				PHP-3.01
-homepage            http://pecl.php.net/package/SPL_Types
 
+php.branches        5.3 5.4
+php.pecl            yes
+
 description         Standard PHP Library, Types Addon
 
 long_description    SPL Types is a collection of special typehandling classes.
@@ -22,20 +24,16 @@
                     sha1    fcffb4e00c73b02caebc0ae4eb31473989e14f9f \
                     rmd160  3077ced1d56eeb6cca78ab50515d77245143c482
 
-distname            SPL_Types-${version}
+patchfiles          patch-spl_type.c.diff
 
 use_parallel_build  yes
 
 test.run            yes
 
-post-patch {
-    # error: duplicate 'static'
-    reinplace /ZEND_BEGIN_ARG_INFO_EX/s/static// ${worksrcpath}/spl_type.c
+if {${name} != ${subport}} {
+    post-destroot {
+        set docdir ${prefix}/share/doc/${subport}
+        xinstall -d ${destroot}${docdir}
+        xinstall -m 644 -W ${worksrcpath} CREDITS ${destroot}${docdir}
+    }
 }
-
-post-destroot {
-    set docdir ${prefix}/share/doc/${name}
-    xinstall -d ${destroot}${docdir}
-    xinstall -m 644 -W ${worksrcpath} CREDITS \
-        ${destroot}${docdir}
-}

Added: trunk/dports/php/php-SPL_Types/files/patch-spl_type.c.diff
===================================================================
--- trunk/dports/php/php-SPL_Types/files/patch-spl_type.c.diff	                        (rev 0)
+++ trunk/dports/php/php-SPL_Types/files/patch-spl_type.c.diff	2012-05-28 05:02:16 UTC (rev 93630)
@@ -0,0 +1,35 @@
+http://svn.php.net/viewvc?view=revision&revision=269162
+http://svn.php.net/viewvc?view=revision&revision=313528
+http://svn.php.net/viewvc?view=revision&revision=313585
+--- spl_type.c.orig	2008-01-13 11:06:28.000000000 -0600
++++ spl_type.c	2012-05-25 18:00:22.000000000 -0500
+@@ -90,7 +90,11 @@
+ 
+ 	ALLOC_HASHTABLE(object->std.properties);
+ 	zend_hash_init(object->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
++#if PHP_VERSION_ID >= 50400
++	object_properties_init(&object->std, class_type);
++#else
+ 	zend_hash_copy(object->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
++#endif
+ 
+ 	retval.handle = zend_objects_store_put(object, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) spl_type_object_free_storage, NULL TSRMLS_CC);
+ 	retval.handlers = &spl_handler_SplType;
+@@ -402,7 +402,7 @@
+ 	return spl_type_object_new_ex(class_type, 1, NULL, spl_type_set_float TSRMLS_CC);
+ }
+ /* {{{ Method and class definitions */
+-static ZEND_BEGIN_ARG_INFO_EX(arg_SplType___construct, 0, 0, 0)
++ZEND_BEGIN_ARG_INFO_EX(arg_SplType___construct, 0, 0, 0)
+ 	ZEND_ARG_INFO(0, initial_value)
+ 	ZEND_ARG_INFO(0, strict)
+ ZEND_END_ARG_INFO()
+@@ -412,7 +412,7 @@
+ 	{NULL, NULL, NULL}
+ };
+ 
+-static ZEND_BEGIN_ARG_INFO_EX(arg_SplEnum_getConstList, 0, 0, 0)
++ZEND_BEGIN_ARG_INFO_EX(arg_SplEnum_getConstList, 0, 0, 0)
+ 	ZEND_ARG_INFO(0, include_default)
+ ZEND_END_ARG_INFO()
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120527/8e60e81d/attachment-0001.html>