[93165] trunk/dports/php

[ryandesign at macports.org]

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

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

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

Modified: trunk/dports/php/php-imlib2/Portfile
===================================================================
--- trunk/dports/php/php5-imlib2/Portfile	2012-05-16 23:11:03 UTC (rev 93164)
+++ trunk/dports/php/php-imlib2/Portfile	2012-05-16 23:16:26 UTC (rev 93165)
@@ -2,9 +2,10 @@
 # $Id$
 
 PortSystem      1.0
-PortGroup       php5extension 1.0
+PortGroup       php 1.0
 
-php5extension.setup imlib2 0.1.00 pecl
+php.setup       imlib2 0.1.00 pecl
+php.branches    5.3 5.4
 license         PHP
 categories      php devel
 platforms       darwin
@@ -21,18 +22,19 @@
                 sha1    e4bbb37601cb6122624b66832dd11deba06656df \
                 rmd160  36ecf7b1d4f0872b0597db09c0410fa429e4bf21
 
-patchfiles      patch-imlib2.c.diff
-
-depends_lib-append \
-    port:imlib2
-
-test.run yes
-
-post-destroot {
-    set docdir ${prefix}/share/doc/${name}
-    xinstall -d ${destroot}${docdir}
-    xinstall -m 644 -W ${worksrcpath} CREDITS readme.txt docs/api.txt \
-        ${destroot}${docdir}
+if {${name} != ${subport}} {
+    depends_lib-append  port:imlib2
+    
+    patchfiles          patch-imlib2.c.diff
+    
+    test.run            yes
+    
+    post-destroot {
+        set docdir ${prefix}/share/doc/${subport}
+        xinstall -d ${destroot}${docdir}
+        xinstall -m 644 -W ${worksrcpath} CREDITS readme.txt docs/api.txt \
+            ${destroot}${docdir}
+    }
 }
 
-livecheck.regex {(\d+(?:\.\d+)*)</a></th>}
+php.pecl_livecheck_stable no

Modified: trunk/dports/php/php-imlib2/files/patch-imlib2.c.diff
===================================================================
--- trunk/dports/php/php5-imlib2/files/patch-imlib2.c.diff	2012-05-16 23:11:03 UTC (rev 93164)
+++ trunk/dports/php/php-imlib2/files/patch-imlib2.c.diff	2012-05-16 23:16:26 UTC (rev 93165)
@@ -1,14 +1,16 @@
---- imlib2.c.orig	2010-01-14 12:19:05.000000000 +0100
-+++ imlib2.c	2010-01-14 12:26:35.000000000 +0100
-@@ -48,6 +48,11 @@
+--- imlib2.c.orig	2004-01-01 17:57:55.000000000 -0600
++++ imlib2.c	2012-05-16 01:41:52.000000000 -0500
+@@ -48,7 +48,12 @@
  static int le_imlib2_poly;
  
  
+-function_entry imlib2_functions[] = {
 +ZEND_BEGIN_ARG_INFO(second_arg_force_ref, 0)
 +	ZEND_ARG_PASS_INFO(0)
 +	ZEND_ARG_PASS_INFO(1)
 +ZEND_END_ARG_INFO()
 +
- function_entry imlib2_functions[] = {
++zend_function_entry imlib2_functions[] = {
  	PHP_FE(imlib2_image_modify_gamma,NULL)
  	PHP_FE(imlib2_image_modify_contrast,NULL)
+ 	PHP_FE(imlib2_image_modify_brightness,NULL)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120516/39569124/attachment-0001.html>