[Midnightbsd-cvs] mports: lang/php5: Update php to 5.2.5

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update php to 5.2.5

Modified Files:
--------------
    mports/lang/php5:
        Makefile (r1.12 -> r1.13)
        distinfo (r1.6 -> r1.7)
    mports/lang/php5/files:
        patch-ext_standard_image.c (r1.1 -> r1.2)
        patch-scripts::phpize.in (r1.3 -> r1.4)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/php5/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -L lang/php5/Makefile -L lang/php5/Makefile -u -r1.12 -r1.13
--- lang/php5/Makefile
+++ lang/php5/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.2.4
-PORTREVISION?=	3
+PORTVERSION=	5.2.5
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/lang/php5/distinfo,v
retrieving revision 1.6
retrieving revision 1.7
diff -L lang/php5/distinfo -L lang/php5/distinfo -u -r1.6 -r1.7
--- lang/php5/distinfo
+++ lang/php5/distinfo
@@ -1,6 +1,6 @@
-MD5 (php-5.2.4.tar.bz2) = 55c97a671fdabf462cc7a82971a656d2
-SHA256 (php-5.2.4.tar.bz2) = 502f5259e4619ba3549cd9f9bdeb4152c7effa66672348f3b108fccc8e1ca1c0
-SIZE (php-5.2.4.tar.bz2) = 7608429
-MD5 (suhosin-patch-5.2.4-0.9.6.2.patch.gz) = 58b18d0db00bc52b004fc749190a958f
-SHA256 (suhosin-patch-5.2.4-0.9.6.2.patch.gz) = 08dc68e53188dec7f851e2bc5392eba4c2ccc70cfba91eab1ddbd41dde6bcc14
-SIZE (suhosin-patch-5.2.4-0.9.6.2.patch.gz) = 22736
+MD5 (php-5.2.5.tar.bz2) = 1fe14ca892460b09f06729941a1bb605
+SHA256 (php-5.2.5.tar.bz2) = 5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3
+SIZE (php-5.2.5.tar.bz2) = 7773024
+MD5 (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = a43f1a0ee9e7c41c4cb6890174f1f9d8
+SHA256 (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = fd77ccdeb90c83af7492876dda17518de95dd74a5b6feecc5a1bd2c8e322ab53
+SIZE (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = 23157
Index: patch-scripts::phpize.in
===================================================================
RCS file: /home/cvs/mports/lang/php5/files/patch-scripts::phpize.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -L lang/php5/files/patch-scripts::phpize.in -L lang/php5/files/patch-scripts::phpize.in -u -r1.3 -r1.4
--- lang/php5/files/patch-scripts::phpize.in
+++ lang/php5/files/patch-scripts::phpize.in
@@ -6,8 +6,8 @@
  {
 -  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
 -  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
-+  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf261
-+  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader261
++  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.61
++  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.61
    
    if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then
      cat <<EOF
Index: patch-ext_standard_image.c
===================================================================
RCS file: /home/cvs/mports/lang/php5/files/patch-ext_standard_image.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L lang/php5/files/patch-ext_standard_image.c -L lang/php5/files/patch-ext_standard_image.c -u -r1.1 -r1.2
--- lang/php5/files/patch-ext_standard_image.c
+++ lang/php5/files/patch-ext_standard_image.c
@@ -1,5 +1,5 @@
---- ext/standard/image.c.orig	Sun Apr  2 09:34:50 2006
-+++ ext/standard/image.c	Sun Apr  2 09:35:27 2006
+--- ext/standard/image.c.orig	2007-10-04 15:31:11.000000000 +0200
++++ ext/standard/image.c	2007-11-13 22:47:04.000000000 +0100
 @@ -31,9 +31,7 @@
  #endif
  #include "php_image.h"
@@ -36,15 +36,14 @@
  
  /* {{{ php_handle_swf
   */
-@@ -1310,12 +1304,7 @@
+@@ -1314,11 +1308,7 @@
  			result = php_handle_swf(stream TSRMLS_CC);
  			break;
  		case IMAGE_FILETYPE_SWC:
 -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
  			result = php_handle_swc(stream TSRMLS_CC);
 -#else
--			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled.");
--
+-			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled");
 -#endif
  			break;
  		case IMAGE_FILETYPE_PSD: