[93631] trunk/dports/php

ryandesign at macports.org ryandesign at macports.org
Sun May 27 22:04:54 PDT 2012


Revision: 93631
          https://trac.macports.org/changeset/93631
Author:   ryandesign at macports.org
Date:     2012-05-27 22:04:53 -0700 (Sun, 27 May 2012)
Log Message:
-----------
php-amf: unified port; remake patch using upstream changes including php 5.4 compatibility

Modified Paths:
--------------
    trunk/dports/php/php-amf/Portfile
    trunk/dports/php/php-amf/files/patch-amf.c.diff

Added Paths:
-----------
    trunk/dports/php/php-amf/

Modified: trunk/dports/php/php-amf/Portfile
===================================================================
--- trunk/dports/php/php5-amf/Portfile	2012-05-25 21:53:07 UTC (rev 93529)
+++ trunk/dports/php/php-amf/Portfile	2012-05-28 05:04:53 UTC (rev 93631)
@@ -2,15 +2,21 @@
 # $Id$
 
 PortSystem      1.0
-PortGroup       php5extension 1.0
+PortGroup       php 1.1
 
-php5extension.setup amfext 0.9.2 pecl
-php5extension.extensions amf
-name            php5-amf
+name            php-amf
+version         0.9.2
+revision        1
 license         PHP
 categories      php devel
 platforms       darwin
 maintainers     nomaintainer
+
+php.branches    5.3 5.4
+php.pecl        yes
+php.pecl.name   amfext
+php.pecl.prerelease yes
+
 description     ActionScript Message Format extension
 
 long_description \
@@ -21,17 +27,22 @@
                 sha1    f2f40d4ddc4416fa09f17e94ed037f907fd87ec4 \
                 rmd160  d55426eb9da3513058fc58db51f5ba35cff831a9
 
-patchfiles      patch-amf.c.diff
-
-configure.args  --with-amf
-
-use_parallel_build yes
-
-post-destroot {
-    set docdir ${prefix}/share/doc/${name}
-    xinstall -d ${destroot}${docdir}
-    xinstall -m 644 -W ${worksrcpath} CREDITS ChangeLog LICENSE README \
-        ${destroot}${docdir}
+if {${name} != ${subport}} {
+    post-extract {
+       # DOS to UNIX line endings so we can patch.
+       reinplace "s|\r||g" ${worksrcpath}/amf.c
+    }
+    
+    patchfiles          patch-amf.c.diff
+    
+    configure.args      --with-amf
+    
+    use_parallel_build  yes
+    
+    post-destroot {
+        set docdir ${prefix}/share/doc/${subport}
+        xinstall -d ${destroot}${docdir}
+        xinstall -m 644 -W ${worksrcpath} CREDITS ChangeLog LICENSE README \
+            ${destroot}${docdir}
+    }
 }
-
-livecheck.regex {>(\d+(?:\.\d+)*)</a></th>}

Modified: trunk/dports/php/php-amf/files/patch-amf.c.diff
===================================================================
--- trunk/dports/php/php5-amf/files/patch-amf.c.diff	2012-05-25 21:53:07 UTC (rev 93529)
+++ trunk/dports/php/php-amf/files/patch-amf.c.diff	2012-05-28 05:04:53 UTC (rev 93631)
@@ -1,19 +1,40 @@
---- amf.c.orig	2010-01-05 04:23:23.000000000 +0100
-+++ amf.c	2010-01-05 04:29:37.000000000 +0100
-@@ -1185,7 +1185,6 @@
- 		int resultType = AMFC_TYPEDOBJECT;
- 		int resultValueLength = 0;
- 		zval** resultValue = struc;
--		int deallocResult = (*struc)->refcount;
- 
- 		resultType = amf_perform_serialize_callback(struc, &className,&classNameLen,&resultValue,var_hash TSRMLS_CC);
- 		
-@@ -2670,7 +2669,7 @@
- 		}
- 		else
- 		{
--			newval->refcount--;
-+			Z_DELREF_P(newval);
- 		}
- 		*rval = newval;
- 	}
+http://svn.php.net/viewvc?view=revision&revision=280732
+http://svn.php.net/viewvc?view=revision&revision=297236
+--- amf.c.orig	2008-07-18 05:28:36.000000000 -0500
++++ amf.c	2012-05-25 18:58:22.000000000 -0500
+@@ -32,7 +32,7 @@
+ 
+ /*  module Declarations {{{1*/
+ 
+-static function_entry amf_functions[] = {
++static zend_function_entry amf_functions[] = {
+     PHP_FE(amf_encode, NULL)
+     PHP_FE(amf_decode, NULL)
+     PHP_FE(amf_join_test, NULL)
+@@ -1185,7 +1185,7 @@
+ 		int resultType = AMFC_TYPEDOBJECT;
+ 		int resultValueLength = 0;
+ 		zval** resultValue = struc;
+-		int deallocResult = (*struc)->refcount;
++		int deallocResult = ZVAL_REFCOUNT(*struc);
+ 
+ 		resultType = amf_perform_serialize_callback(struc, &className,&classNameLen,&resultValue,var_hash TSRMLS_CC);
+ 		
+@@ -2632,7 +2632,7 @@
+ 			return SUCCESS;
+ 		}
+ 	}
+-	ZVAL_STRINGL(*rval, (char*)src, slength, 1)
++	ZVAL_STRINGL(*rval, (char*)src, slength, 1);
+ 	return SUCCESS;
+ }
+ 
+@@ -2670,7 +2670,7 @@
+ 		}
+ 		else
+ 		{
+-			newval->refcount--;
++			ZVAL_DELREF(newval);
+ 		}
+ 		*rval = newval;
+ 	}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120527/a27207c0/attachment.html>


More information about the macports-changes mailing list