[93661] trunk/dports/php

[ryandesign at macports.org]

Revision: 93661
          https://trac.macports.org/changeset/93661
Author:   ryandesign at macports.org
Date:     2012-05-27 22:48:48 -0700 (Sun, 27 May 2012)
Log Message:
-----------
php-pdflib: unified port; add upstream patch for php 5.4

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

Added Paths:
-----------
    trunk/dports/php/php-pdflib/
    trunk/dports/php/php-pdflib/files/
    trunk/dports/php/php-pdflib/files/patch-php-5.4.diff

Modified: trunk/dports/php/php-pdflib/Portfile
===================================================================
--- trunk/dports/php/php5-pdflib/Portfile	2012-05-05 21:14:44 UTC (rev 92754)
+++ trunk/dports/php/php-pdflib/Portfile	2012-05-28 05:48:48 UTC (rev 93661)
@@ -2,22 +2,30 @@
 # $Id$
 
 PortSystem                  1.0
-PortGroup                   php5extension 1.0
+PortGroup                   php 1.1
 
-php5extension.setup         pdflib 2.1.8 pecl
-php5extension.extensions    pdf
+name                        php-pdflib
+version                     2.1.8
+revision                    1
 categories-append           print textproc
 platforms                   darwin
 maintainers                 ryandesign
 license                     PHP
 
-description                 PHP5 bindings for pdflib
+php.branches                5.3 5.4
+php.pecl                    yes
 
+description                 PHP bindings for pdflib
+
 long_description            ${description}
 
 checksums                   sha1    5d0b01dc6fe81a39e7832a4c719983ebd06f6174 \
                             rmd160  a74d2bba8985bd85fbd61589450c591665663906
 
-depends_lib-append          port:pdflib
-
-configure.args              --with-pdflib=${prefix}
+if {${name} != ${subport}} {
+    depends_lib-append      port:pdflib
+    
+    patchfiles              patch-php-5.4.diff
+    
+    configure.args          --with-pdflib=${prefix}
+}

Added: trunk/dports/php/php-pdflib/files/patch-php-5.4.diff
===================================================================
--- trunk/dports/php/php-pdflib/files/patch-php-5.4.diff	                        (rev 0)
+++ trunk/dports/php/php-pdflib/files/patch-php-5.4.diff	2012-05-28 05:48:48 UTC (rev 93661)
@@ -0,0 +1,35 @@
+http://svn.php.net/viewvc?view=revision&revision=322900
+--- pdf.c.orig	2012/01/28 02:43:31	322899
++++ pdf.c	2012/01/28 03:05:18	322900
+@@ -766,10 +766,14 @@
+ 
+     ALLOC_HASHTABLE(intern->std.properties);
+     zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
++#if PHP_VERSION_ID < 50399
+     zend_hash_copy(intern->std.properties,
+             &class_type->default_properties,
+             (copy_ctor_func_t) zval_add_ref,
+             (void *) &tmp, sizeof(zval *));
++#else
++    object_properties_init( (zend_object*)intern, class_type );
++#endif
+ 
+     retval.handle = zend_objects_store_put(intern,  NULL,
+             (zend_objects_free_object_storage_t)pdflib_object_dtor,
+--- pdf7.c.orig	2012/01/28 02:43:31	322899
++++ pdf7.c	2012/01/28 03:05:18	322900
+@@ -332,10 +332,14 @@
+ 
+     ALLOC_HASHTABLE(intern->std.properties);
+     zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
++#if PHP_VERSION_ID < 50399
+     zend_hash_copy(intern->std.properties,
+             &class_type->default_properties,
+             (copy_ctor_func_t) zval_add_ref,
+             (void *) &tmp, sizeof(zval *));
++#else
++    object_properties_init( (zend_object*)intern, class_type );
++#endif
+ 
+     retval.handle = zend_objects_store_put(intern,  NULL,
+             (zend_objects_free_object_storage_t)pdflib_object_dtor,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120527/7ddaf940/attachment.html>