[93077] trunk/dports/php

[ryandesign at macports.org]

Revision: 93077
          https://trac.macports.org/changeset/93077
Author:   ryandesign at macports.org
Date:     2012-05-14 15:14:28 -0700 (Mon, 14 May 2012)
Log Message:
-----------
php-ming: unified port; add typo-corrected debian patch to fix build with php 5.4

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

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

Modified: trunk/dports/php/php-ming/Portfile
===================================================================
--- trunk/dports/php/php5-ming/Portfile	2012-05-14 21:48:20 UTC (rev 93076)
+++ trunk/dports/php/php-ming/Portfile	2012-05-14 22:14:28 UTC (rev 93077)
@@ -2,11 +2,12 @@
 # $Id$
 
 PortSystem                  1.0
-PortGroup                   php5extension 1.0
+PortGroup                   php 1.0
 
 # Keep relevant lines in sync between ming and php5-ming.
 
-php5extension.setup         ming 0.4.4
+php.setup                   ming 0.4.4
+php.branches                5.3 5.4
 categories-append           multimedia graphics
 platforms                   darwin
 maintainers                 ryandesign
@@ -25,16 +26,19 @@
 checksums                   rmd160  2070cd694b9a1ff8dd0a577df2f551d5d810e4fe \
                             sha256  40e09d781741ac961338ed8dec7ba2ed06217de9da44dd67af6b881b95d2af7e
 
-depends_lib-append          port:ming
-
-post-extract {
-    # config.m4 is missing from the 0.4.4 distfile; see:
-    # https://github.com/libming/libming/issues/8
-    copy ${filespath}/config.m4 ${worksrcpath}
+if {${name} != ${subport}} {
+    depends_lib-append      port:ming
+    
+    post-extract {
+        # config.m4 is missing from the 0.4.4 distfile; see:
+        # https://github.com/libming/libming/issues/8
+        copy ${filespath}/config.m4 ${worksrcpath}
+    }
+    
+    patchfiles-append       patch-config.m4.diff \
+                            patch-ming.c.diff
+    
+    configure.args-append   --with-ming=${prefix}
 }
 
-patchfiles-append           patch-config.m4.diff
-
-configure.args-append       --with-ming=${prefix}
-
 livecheck.regex             /ming-(\[0-9.\]+)${extract.suffix}

Added: trunk/dports/php/php-ming/files/patch-ming.c.diff
===================================================================
--- trunk/dports/php/php-ming/files/patch-ming.c.diff	                        (rev 0)
+++ trunk/dports/php/php-ming/files/patch-ming.c.diff	2012-05-14 22:14:28 UTC (rev 93077)
@@ -0,0 +1,22 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662620
+--- ming.c.orig	2011-10-26 01:33:18.000000000 -0500
++++ ming.c	2012-05-14 17:06:09.000000000 -0500
+@@ -87,10 +87,17 @@
+ static SWFMatrix getMatrix(zval *id TSRMLS_DC);
+ #endif
+ 
++#if PHP_API_VERSION < 20100412
+ #define PHP_MING_FILE_CHK(file) \
+ 	if ((PG(safe_mode) && !php_checkuid((file), NULL, CHECKUID_CHECK_FILE_AND_DIR)) || php_check_open_basedir((file) TSRMLS_CC)) {	\
+ 		RETURN_FALSE;	\
+-	}	\
++	}
++#else
++#define PHP_MING_FILE_CHK(file) \
++	if (php_check_open_basedir((file) TSRMLS_CC)) {	\
++		RETURN_FALSE;	\
++	}
++#endif
+ 
+ /* {{{ proto void ming_setcubicthreshold (int threshold)
+    Set cubic threshold (?) */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120514/cb8f3b31/attachment.html>