[93164] trunk/dports/php

[ryandesign at macports.org]

Revision: 93164
          https://trac.macports.org/changeset/93164
Author:   ryandesign at macports.org
Date:     2012-05-16 16:11:03 -0700 (Wed, 16 May 2012)
Log Message:
-----------
php-peb: unified port; add patch to fix build with php 5.4

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

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

Modified: trunk/dports/php/php-peb/Portfile
===================================================================
--- trunk/dports/php/php5-peb/Portfile	2012-05-16 06:18:06 UTC (rev 93149)
+++ trunk/dports/php/php-peb/Portfile	2012-05-16 23:11:03 UTC (rev 93164)
@@ -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 peb 0.20b
+php.setup       peb 0.20b
+php.branches    5.3 5.4
 license         BSD
 categories      php devel
 platforms       darwin
@@ -21,26 +23,29 @@
                 sha1    c9c940b79d8b739af95a456a2ad90f93d8ef6982 \
                 rmd160  169f7d6bfcb855c45c132db1091fad428f739a30
 
-worksrcdir      peb_release
-
-depends_build-append \
-    port:erlang
-
-# erlang is not universal, but that doesn't need to prevent peb from being universal
-depends_skip_archcheck  erlang
-
-pre-configure {
-    set ei_dir [glob -directory ${prefix}/lib/erlang/lib/ erl_interface-*/]
-    configure.cppflags-append -I${ei_dir}/include
-    configure.ldflags-append -L${ei_dir}/lib
+if {${name} != ${subport}} {
+    depends_build-append    port:erlang
+    
+    # erlang is not universal, but that doesn't need to prevent peb from being universal
+    depends_skip_archcheck  erlang
+    
+    worksrcdir              peb_release
+    
+    patchfiles              patch-peb.c.diff
+    
+    pre-configure {
+        set ei_dir [glob -directory ${prefix}/lib/erlang/lib/ erl_interface-*/]
+        configure.cppflags-append -I${ei_dir}/include
+        configure.ldflags-append -L${ei_dir}/lib
+    }
+    
+    use_parallel_build      yes
+    
+    post-destroot {
+        set docdir ${prefix}/share/doc/${subport}
+        xinstall -d ${destroot}${docdir}
+        xinstall -m 644 -W ${worksrcpath} CREDITS EXPERIMENTAL LICENSE \
+            ${destroot}${docdir}
+        copy ${worksrcpath}/manual ${destroot}${docdir}/html
+    }
 }
-
-use_parallel_build yes
-
-post-destroot {
-    set docdir ${prefix}/share/doc/${name}
-    xinstall -d ${destroot}${docdir}
-    xinstall -m 644 -W ${worksrcpath} CREDITS EXPERIMENTAL LICENSE \
-        ${destroot}${docdir}
-    copy ${worksrcpath}/manual ${destroot}${docdir}/html
-}

Added: trunk/dports/php/php-peb/files/patch-peb.c.diff
===================================================================
--- trunk/dports/php/php-peb/files/patch-peb.c.diff	                        (rev 0)
+++ trunk/dports/php/php-peb/files/patch-peb.c.diff	2012-05-16 23:11:03 UTC (rev 93164)
@@ -0,0 +1,26 @@
+--- peb.c.orig	2010-03-08 20:12:02.000000000 -0600
++++ peb.c	2012-05-16 18:03:25.000000000 -0500
+@@ -297,8 +297,8 @@
+ 
+ 		peb_link * alink = NULL;
+ 		ei_cnode * ec = NULL;
+-		list_entry * le ;
+-		list_entry * newle;
++		zend_rsrc_list_entry * le ;
++		zend_rsrc_list_entry * newle;
+ 
+ 		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,"ss|l",&node,&node_len,&secret,&secret_len,&tmo)==FAILURE) {
+ 				RETURN_FALSE;
+@@ -368,10 +368,10 @@
+ 		if (persistent) {
+ 				PEB_G(num_link)++;
+ 				PEB_G(num_persistent)++;
+-				newle = pemalloc(sizeof(list_entry),persistent);
++				newle = pemalloc(sizeof(zend_rsrc_list_entry),persistent);
+ 				newle->ptr = alink;
+ 				newle->type = le_plink;
+-				zend_hash_update(&EG(persistent_list), key, key_len+1, newle,sizeof(list_entry), NULL );
++				zend_hash_update(&EG(persistent_list), key, key_len+1, newle,sizeof(zend_rsrc_list_entry), NULL );
+ 				PEB_G(default_link) = Z_LVAL_P(return_value TSRMLS_CC);
+ 				ZEND_REGISTER_RESOURCE(return_value, alink, le_plink);
+ 		}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120516/5b7737a7/attachment.html>