[93171] trunk/dports/php

[ryandesign at macports.org]

Revision: 93171
          https://trac.macports.org/changeset/93171
Author:   ryandesign at macports.org
Date:     2012-05-16 18:58:56 -0700 (Wed, 16 May 2012)
Log Message:
-----------
php-pop3: unified port; add patch to fix build with php 5.4; put examples in the right place; add modeline

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

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

Modified: trunk/dports/php/php-pop3/Portfile
===================================================================
--- trunk/dports/php/php5-pop3/Portfile	2012-05-17 01:40:38 UTC (rev 93170)
+++ trunk/dports/php/php-pop3/Portfile	2012-05-17 01:58:56 UTC (rev 93171)
@@ -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 pop3 1.0.2 pecl
+php.setup       pop3 1.0.2 pecl
+php.branches    5.3 5.4
 license         PHP
 categories      php mail devel
 platforms       darwin
@@ -19,14 +21,15 @@
                 sha1    5d7d9754413fbd9563464ae82588c7770cc1ce90 \
                 rmd160  01bc065cdb0d2ff375bb1d70a7b91b1f809acf30
 
-patchfiles      patch-pop3.c.diff
-
-use_parallel_build yes
-
-post-destroot {
-    set docdir ${prefix}/share/doc/${name}
-    xinstall -d ${destroot}${docdir}
-    xinstall -m 644 -W ${worksrcpath} CREDITS README \
-        ${destroot}${docdir}
-    copy ${worksrcpath}/examples ${destroot}${docdir}
+if {${name} != ${subport}} {
+    patchfiles          patch-pop3.c.diff
+    
+    use_parallel_build  yes
+    
+    post-destroot {
+        set docdir ${prefix}/share/doc/${subport}
+        xinstall -d ${destroot}${docdir} ${destroot}${prefix}/share/examples
+        xinstall -m 644 -W ${worksrcpath} CREDITS README ${destroot}${docdir}
+        copy ${worksrcpath}/examples ${destroot}${prefix}/share/examples/${subport}
+    }
 }

Modified: trunk/dports/php/php-pop3/files/patch-pop3.c.diff
===================================================================
--- trunk/dports/php/php5-pop3/files/patch-pop3.c.diff	2012-05-17 01:40:38 UTC (rev 93170)
+++ trunk/dports/php/php-pop3/files/patch-pop3.c.diff	2012-05-17 01:58:56 UTC (rev 93171)
@@ -1,7 +1,6 @@
-See http://pecl.php.net/bugs/bug.php?id=7276
-
---- pop3.c.orig	2010-01-11 00:18:21.000000000 +0100
-+++ pop3.c	2010-01-11 00:18:31.000000000 +0100
+https://bugs.php.net/56932
+--- pop3.c.orig	2005-07-25 16:47:03.000000000 -0500
++++ pop3.c	2012-05-16 20:53:32.000000000 -0500
 @@ -172,8 +172,7 @@
  
  	intern = emalloc(sizeof(pop3_object));
@@ -12,3 +11,21 @@
  	intern->zo.properties = NULL;
  	intern->ptr = NULL;
  
+@@ -200,7 +199,7 @@
+  *
+  * Every user visible function must have an entry in pop3_functions[].
+  */
+-function_entry pop3_functions[] = {
++zend_function_entry pop3_functions[] = {
+ 	PHP_FE(pop3_open,	NULL)
+ 	PHP_FE(pop3_close, NULL)
+ 	PHP_FE(pop3_get_message_count, NULL)
+@@ -221,7 +220,7 @@
+ 
+ /* {{{ pop3_class_functions
+  */
+-function_entry pop3_class_functions[] = {
++zend_function_entry pop3_class_functions[] = {
+ 	POP3_ME_MAPPING(pop3, pop3_open, NULL)
+ 	POP3_ME_MAPPING(get_message_count, pop3_get_message_count, NULL)
+ 	POP3_ME_MAPPING(get_account_size, pop3_get_account_size, NULL)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120516/c10e6378/attachment.html>