[92953] trunk/dports/php

[ryandesign at macports.org]

Revision: 92953
          https://trac.macports.org/changeset/92953
Author:   ryandesign at macports.org
Date:     2012-05-11 12:20:50 -0700 (Fri, 11 May 2012)
Log Message:
-----------
php-cairo_wrapper: unified port (patches fix build failure with php 5.4, and test failure with cairo 1.1x.x)

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

Added Paths:
-----------
    trunk/dports/php/php-cairo_wrapper/
    trunk/dports/php/php-cairo_wrapper/files/
    trunk/dports/php/php-cairo_wrapper/files/patch-cairo_wrapper.c.diff
    trunk/dports/php/php-cairo_wrapper/files/patch-tests-cairo_version_string.phpt.diff

Modified: trunk/dports/php/php-cairo_wrapper/Portfile
===================================================================
--- trunk/dports/php/php5-cairo_wrapper/Portfile	2012-05-07 21:30:18 UTC (rev 92824)
+++ trunk/dports/php/php-cairo_wrapper/Portfile	2012-05-11 19:20:50 UTC (rev 92953)
@@ -1,11 +1,12 @@
+# -*- 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 cairo_wrapper 0.2.4 pecl
+php.setup       cairo_wrapper 0.2.4 pecl
+php.branches    5.3 5.4
 license         PHP
-conflicts       php5-cairo
 categories      php devel
 platforms       darwin
 maintainers     nomaintainer
@@ -18,17 +19,23 @@
                 sha1    1ec2e0680f34c7e0f750ab44770d04d18d77207a \
                 rmd160  7e3dc07318001654afd1bc6bbcc33e6b489823ac
 
-depends_build \
-    port:pkgconfig
-depends_lib-append \
-    path:lib/libcairo.dylib:cairo
-
-test.run yes
-
-post-destroot {
-    set docdir ${prefix}/share/doc/${name}
-    xinstall -d ${destroot}${docdir}
-    xinstall -m 644 -W ${worksrcpath} CREDITS ${destroot}${docdir}
+if {${name} != ${subport}} {
+    conflicts   ${php}-cairo
+    
+    depends_build       port:pkgconfig
+    
+    depends_lib-append  path:lib/libcairo.dylib:cairo
+    
+    patchfiles          patch-cairo_wrapper.c.diff \
+                        patch-tests-cairo_version_string.phpt.diff
+    
+    test.run            yes
+    
+    post-destroot {
+        set docdir ${prefix}/share/doc/${subport}
+        xinstall -d ${destroot}${docdir}
+        xinstall -m 644 -W ${worksrcpath} CREDITS ${destroot}${docdir}
+    }
 }
 
-livecheck.regex {(\d+(?:\.\d+)*)</a></th>}
+php.pecl_livecheck_stable no

Added: trunk/dports/php/php-cairo_wrapper/files/patch-cairo_wrapper.c.diff
===================================================================
--- trunk/dports/php/php-cairo_wrapper/files/patch-cairo_wrapper.c.diff	                        (rev 0)
+++ trunk/dports/php/php-cairo_wrapper/files/patch-cairo_wrapper.c.diff	2012-05-11 19:20:50 UTC (rev 92953)
@@ -0,0 +1,11 @@
+--- cairo_wrapper.c.orig	2008-03-28 17:20:13.000000000 -0500
++++ cairo_wrapper.c	2012-05-11 14:01:27.000000000 -0500
+@@ -127,7 +127,7 @@
+ /* }}} */
+ 
+ /* {{{ cairo_wrapper_functions[] */
+-function_entry cairo_wrapper_functions[] = {
++zend_function_entry cairo_wrapper_functions[] = {
+ 	PHP_FE(cairo_image_surface_create, cairo_image_surface_create_arg_info)
+ 	PHP_FE(cairo_surface_destroy, cairo_surface_destroy_arg_info)
+ 	PHP_FE(cairo_create        , cairo_create_arg_info)

Added: trunk/dports/php/php-cairo_wrapper/files/patch-tests-cairo_version_string.phpt.diff
===================================================================
--- trunk/dports/php/php-cairo_wrapper/files/patch-tests-cairo_version_string.phpt.diff	                        (rev 0)
+++ trunk/dports/php/php-cairo_wrapper/files/patch-tests-cairo_version_string.phpt.diff	2012-05-11 19:20:50 UTC (rev 92953)
@@ -0,0 +1,9 @@
+--- tests/cairo_version_string.phpt.orig	2008-03-28 17:20:12.000000000 -0500
++++ tests/cairo_version_string.phpt	2012-05-11 14:15:15.000000000 -0500
+@@ -9,5 +9,5 @@
+ --FILE--
+ <?php
+-echo preg_match('|\d\.\d\.\d|', cairo_version_string()) ? "OK" : "ERROR";
++echo preg_match('|^\d+(\.\d+)+$|', cairo_version_string()) ? "OK" : "ERROR";
+ ?>
+ --EXPECT--
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120511/c39a3862/attachment.html>