[93279] trunk/dports/php

[ryandesign at macports.org]

Revision: 93279
          https://trac.macports.org/changeset/93279
Author:   ryandesign at macports.org
Date:     2012-05-18 15:19:00 -0700 (Fri, 18 May 2012)
Log Message:
-----------
php-esmtp: unified port; add patches to fix build with php 5.4; add modeline

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

Added Paths:
-----------
    trunk/dports/php/php-esmtp/
    trunk/dports/php/php-esmtp/files/297236.diff
    trunk/dports/php/php-esmtp/files/309844.diff

Modified: trunk/dports/php/php-esmtp/Portfile
===================================================================
--- trunk/dports/php/php5-esmtp/Portfile	2012-05-18 00:30:40 UTC (rev 93229)
+++ trunk/dports/php/php-esmtp/Portfile	2012-05-18 22:19:00 UTC (rev 93279)
@@ -1,9 +1,11 @@
+# -*- 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
 
-php5extension.setup esmtp 0.3.1 pecl
+php.setup       esmtp 0.3.1 pecl
+php.branches    5.3 5.4
 license         PHP
 categories      php devel
 platforms       darwin
@@ -19,21 +21,23 @@
                 sha1    2c0c206decfd2e87e2731ca33ce55215ca713b92 \
                 rmd160  96dec77e466461d57bf3fe244be6adba08c08969
 
-patchfiles      309809.diff \
-                patch-tests-002.phpt.diff
-
-depends_lib-append \
-    port:libesmtp
-
-configure.args \
-    --with-esmtp=${prefix}
-
-test.run yes
-
-post-destroot {
-    set docdir ${prefix}/share/doc/${name}
-    xinstall -d ${destroot}${docdir}
-    xinstall -m 644 -W ${worksrcpath} CREDITS NOTES TODO ${destroot}${docdir}
+if {${name} != ${subport}} {
+    patchfiles          297236.diff \
+                        309809.diff \
+                        309844.diff \
+                        patch-tests-002.phpt.diff
+    
+    depends_lib-append  port:libesmtp
+    
+    configure.args      --with-esmtp=${prefix}
+    
+    test.run            yes
+    
+    post-destroot {
+        set docdir ${prefix}/share/doc/${subport}
+        xinstall -d ${destroot}${docdir}
+        xinstall -m 644 -W ${worksrcpath} CREDITS NOTES TODO ${destroot}${docdir}
+    }
 }
 
-livecheck.regex {(\d+(?:\.\d+)*)</a></th>}
+php.pecl_livecheck_stable no

Added: trunk/dports/php/php-esmtp/files/297236.diff
===================================================================
--- trunk/dports/php/php-esmtp/files/297236.diff	                        (rev 0)
+++ trunk/dports/php/php-esmtp/files/297236.diff	2012-05-18 22:19:00 UTC (rev 93279)
@@ -0,0 +1,12 @@
+http://svn.php.net/viewvc?view=revision&revision=297236
+--- esmtp.c	2010/03/31 20:39:12	297235
++++ esmtp.c	2010/03/31 20:39:48	297236
+@@ -141,7 +141,7 @@
+ }
+ /* }}} */
+ 
+-function_entry esmtp_functions[] = {
++zend_function_entry esmtp_functions[] = {
+     ZEND_FALIAS(esmtp_version,                  smtp_version,             NULL)
+     ZEND_FALIAS(esmtp_errno,                    smtp_errno,               NULL)
+     ZEND_FALIAS(esmtp_strerror,                 smtp_strerror,            NULL)

Added: trunk/dports/php/php-esmtp/files/309844.diff
===================================================================
--- trunk/dports/php/php-esmtp/files/309844.diff	                        (rev 0)
+++ trunk/dports/php/php-esmtp/files/309844.diff	2012-05-18 22:19:00 UTC (rev 93279)
@@ -0,0 +1,67 @@
+http://svn.php.net/viewvc?view=revision&revision=309844
+--- esmtp.c	2011/03/30 10:31:59	309843
++++ esmtp.c	2011/03/30 11:32:09	309844
+@@ -35,6 +35,10 @@
+ #include <auth-client.h>
+ #include <libesmtp.h>
+ 
++#ifndef Z_ADDREF_P
++# define Z_ADDREF_P ZVAL_ADDREF
++#endif
++
+ static const int do_serialize = 1;
+ 
+ static int le_esmtp_session;
+@@ -326,10 +330,10 @@
+     MAKE_STD_ZVAL(z_data);
+     array_init(z_data);
+ 
+-    ZVAL_ADDREF(cb);
++    Z_ADDREF_P(cb);
+     add_assoc_zval_ex(z_data, "funcname", sizeof("funcname"), cb);
+     if (arg) {
+-        ZVAL_ADDREF(arg);
++        Z_ADDREF_P(arg);
+         add_assoc_zval_ex(z_data, "userdata", sizeof("userdata"), arg);
+     }
+ 
+@@ -758,10 +762,10 @@
+     MAKE_STD_ZVAL(z_data);
+     array_init(z_data);
+ 
+-    ZVAL_ADDREF(cb);
++    Z_ADDREF_P(cb);
+     add_assoc_zval_ex(z_data, "funcname", sizeof("funcname"), cb);
+     if (arg) {
+-        ZVAL_ADDREF(arg);
++        Z_ADDREF_P(arg);
+         add_assoc_zval_ex(z_data, "userdata", sizeof("userdata"), arg);
+     }
+ 
+@@ -841,11 +845,11 @@
+     MAKE_STD_ZVAL(z_data);
+     array_init(z_data);
+ 
+-    ZVAL_ADDREF(cb);
++    Z_ADDREF_P(cb);
+     add_assoc_zval_ex(z_data, "funcname", sizeof("funcname"), cb);
+     add_property_zval(getThis(), "header_regex_funcname", cb);
+     if (arg) {
+-        ZVAL_ADDREF(arg);
++        Z_ADDREF_P(arg);
+         add_assoc_zval_ex(z_data, "userdata", sizeof("userdata"), arg);
+         add_property_zval(getThis(), "header_regex_userdata", arg);
+     }
+@@ -1189,10 +1193,10 @@
+     MAKE_STD_ZVAL(z_data);
+     array_init(z_data);
+ 
+-    ZVAL_ADDREF(cb);
++    Z_ADDREF_P(cb);
+     add_assoc_zval_ex(z_data, "funcname", sizeof("funcname"), cb);
+     if (arg) {
+-        ZVAL_ADDREF(arg);
++        Z_ADDREF_P(arg);
+         add_assoc_zval_ex(z_data, "userdata", sizeof("userdata"), arg);
+     }
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120518/ff8d2a9f/attachment-0001.html>