ports/148009: [patch] port graphics/pear-Image_Graph fix php53 issues part2

[olli hauer]

>Number:         148009
>Category:       ports
>Synopsis:       [patch] port graphics/pear-Image_Graph fix php53 issues part2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 20 13:40:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     olli hauer <ohauer at gmx.de>
>Release:        
>Organization:
>Environment:
FreeBSD 7.3 (i386)
PHP 5.3.2


>Description:

I was ask by a view others to extend my last patch, since not
all Issues where fixed. I send them this patch and got positive
feedback so it seems the Issues are fixed.


Fix details:

Use DOS2UNIX_REGEX (do not modify images!)

Fix some issues with pear-Image_Graph in combination with php5.3
 PHP Deprecated messages
  - Assigning the return value of new by reference
  - Call-time pass-by-reference has been deprecated

  - In Graph.php 's|=& new|= new|g' (was overseen in last patch)
  - replace ereg with preg_match (extra-patch)
  - additional in all patched files 's|PHP versions 4 and 5|PHP version 5|'


>How-To-Repeat:


>Fix:

--- patch_pear-Image_Graph_2010-06-12.txt begins here ---
Index: files/extra-patch-Graph__Layout.php
===================================================================
--- files/extra-patch-Graph__Layout.php	(revision 0)
+++ files/extra-patch-Graph__Layout.php	(revision 2)
@@ -0,0 +1,11 @@
+--- ./Graph/Layout.php.orig	2010-06-14 17:05:41.000000000 +0200
++++ ./Graph/Layout.php	2010-06-14 17:06:24.000000000 +0200
+@@ -175,7 +175,7 @@
+     function _push($edge, $size = '100%')
+     {
+         $result = array();
+-        if (ereg("([0-9]*)\%", $size, $result)) {
++        if (preg_match("/([0-9]*)\%/", $size, $result)) {
+             $this->_alignSize[$edge] = array(
+                 'value' => min(100, max(0, $result[1])),
+                 'unit' => 'percentage'

Index: Makefile
===================================================================
--- Makefile	(revision 1)
+++ Makefile	(working copy)
@@ -7,7 +7,7 @@
 
 PORTNAME=	Image_Graph
 PORTVERSION=	0.7.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics www pear
 
 MAINTAINER=	miwi at FreeBSD.org
@@ -19,6 +19,7 @@
 
 USE_PHP=	yes
 USE_DOS2UNIX=	yes
+DOS2UNIX_REGEX=	.*php$$
 
 CATEGORY=	Image
 FILES=		Graph.php Graph/Axis.php Graph/Common.php Graph/Config.php \
@@ -182,6 +183,23 @@
 		${REINPLACE_CMD} -e 's|parent::Image[^(]*|parent::__construct|' ${WRKSRC}/${file}; \
 	fi
 .endfor
+# fix PHP Deprecated messages
+# - Assigning the return value of new by reference
+# - Call-time pass-by-reference has been deprecated
+.for file in ${DOCS}
+	@if ${ECHO_CMD} ${file} | ${GREP} -q -e "php$$" ; then \
+		${REINPLACE_CMD} -e 's|=& |= |g' -e 's| &\$$| \$$|g' \
+		${WRKSRC}/docs/${file}; \
+	fi
+.endfor
+.for file in ${TESTS}
+	@if ${ECHO_CMD} ${file} | ${GREP} -q -e "php$$" ; then \
+		${REINPLACE_CMD} -e 's|PHP versions 4 and 5|PHP version 5|' \
+		${WRKSRC}/tests/${file}; \
+	fi
+.endfor
+	@${REINPLACE_CMD} -e 's|=& new|= new|g' ${WRKSRC}/Graph.php
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Graph__Layout.php
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
--- patch_pear-Image_Graph_2010-06-12.txt ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: