Bug 146453 - [patch] port graphics/pear-Image_Canvas update to 0.3.2
Summary: [patch] port graphics/pear-Image_Canvas update to 0.3.2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-05-10 06:10 UTC by Olli Hauer
Modified: 2010-06-02 17:30 UTC (History)
1 user (show)

See Also:


Attachments
patch_pear-Image_Canvas.txt (1.62 KB, text/plain)
2010-05-10 06:10 UTC, Olli Hauer
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Olli Hauer 2010-05-10 06:10:00 UTC
Update pear-Image_Canvas to 0.3.2
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2010-05-10 06:10:12 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this port PRs (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2010-05-10 06:10:14 UTC
Maintainer of graphics/pear-Image_Canvas,

Please note that PR ports/146453 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/146453

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2010-05-10 06:10:16 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Olli Hauer 2010-05-15 11:45:51 UTC
A reworked patch which fix the following warnings (php5x)
- PHP Deprecated:  Assigning the return value of new by reference is deprecated
- PHP Deprecated:  Function ereg() is deprecated

Additional use DOS2UNIX


>Fix:
--- patch_patch_pear-Image_Canvas.txt begins here ---
--- Makefile	2010/05/09 19:03:43	1.1
+++ Makefile	2010/05/15 10:22:32
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Image_Canvas
-PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTVERSION=	0.3.2
 CATEGORIES=	graphics www pear
 
 MAINTAINER=	numisemis@yahoo.com
@@ -17,16 +16,18 @@
 RUN_DEPENDS=	${PEARDIR}/Image/Color.php:${PORTSDIR}/graphics/pear-Image_Color
 
 USE_PHP=	gd
+USE_DOS2UNIX=	yes
 
-CATEGORY=	Image
-FILES=		Canvas.php Canvas/Color.php Canvas/GD.php \
-		Canvas/ImageMap.php Canvas/PDF.php Canvas/SVG.php \
-		Canvas/Tool.php Canvas/WithMap.php Canvas/Fonts/fontmap.txt \
-		Canvas/Fonts/README Canvas/GD/JPG.php Canvas/GD/PNG.php
+FILES=		Image/Canvas.php Image/Canvas/Color.php Image/Canvas/GD.php \
+		Image/Canvas/ImageMap.php Image/Canvas/PDF.php Image/Canvas/PS.php \
+		Image/Canvas/SVG.php Image/Canvas/SWF.php Image/Canvas/Tool.php \
+		Image/Canvas/WithMap.php Image/Canvas/Fonts/fontmap.txt \
+		Image/Canvas/Fonts/README Image/Canvas/GD/JPG.php \
+		Image/Canvas/GD/PNG.php
 TESTS=		canvas_body.php gradients.php imagemap.php jpg.php \
-		lineends.php pdf.php pear-icon.png png.php README svg.php \
-		text.php
-DOCS=		ChangeLog README
+		lineends.php pdf.php pear-icon.png png.php ps.php \
+		README svg.php text.php
+DOCS=		ChangeLog README TODO
 EXAMPLES=	canvas.php pear-icon.png
 _EXAMPLESDIR=	docs/examples
 
--- distinfo	2010/05/09 19:03:50	1.1
+++ distinfo	2010/05/09 19:04:24
@@ -1,3 +1,3 @@
-MD5 (PEAR/Image_Canvas-0.3.0.tgz) = 41dd36fb05436159fb6fccca02cb7aaa
-SHA256 (PEAR/Image_Canvas-0.3.0.tgz) = 1b3883e84553e04ee70c863671aebeee3499cbbb9a59c1889ce77a514ece24ca
-SIZE (PEAR/Image_Canvas-0.3.0.tgz) = 43423
+MD5 (PEAR/Image_Canvas-0.3.2.tgz) = 0ffb421ade2f9c8234861cc73550e503
+SHA256 (PEAR/Image_Canvas-0.3.2.tgz) = f0d6a82b5a8c0f82cb82c4c068862823d14da2fe07a48663dec666ddd1300264
+SIZE (PEAR/Image_Canvas-0.3.2.tgz) = 54698
--- /dev/null	2010-05-15 12:23:36.000000000 +0200
+++ files/patch-Image__Canvas.php	2010-05-15 11:53:57.000000000 +0200
@@ -0,0 +1,20 @@
+--- ./Image/Canvas.php.orig	2010-05-15 11:53:04.000000000 +0200
++++ ./Image/Canvas.php	2010-05-15 11:53:51.000000000 +0200
+@@ -730,7 +730,7 @@
+ 
+                 $error  = 'PHP extension ming is required for output in swf format.';
+                 $error .= 'Please install the ming extension (http://de.php.net/ming).';
+-                $error  =& new PEAR_Error($error);
++                $error  = new PEAR_Error($error);
+                 return $error;
+             }
+         }
+@@ -742,7 +742,7 @@
+         $class = 'Image_Canvas_'. $canvas;
+         include_once 'Image/Canvas/'. str_replace('_', '/', $canvas) . '.php';
+         
+-        $obj =& new $class($params);
++        $obj = new $class($params);
+         return $obj;
+     }
+ 
--- /dev/null	2010-05-15 12:23:36.000000000 +0200
+++ files/patch-Image__Canvas__GD.php	2010-05-15 11:53:57.000000000 +0200
@@ -0,0 +1,23 @@
+--- ./Image/Canvas/GD.php.orig	2010-05-15 11:53:04.000000000 +0200
++++ ./Image/Canvas/GD.php	2010-05-15 11:53:04.000000000 +0200
+@@ -1770,7 +1770,7 @@
+             $php_info = ob_get_contents();
+             ob_end_clean();
+ 
+-            if (ereg("<td[^>]*>GD Version *<\/td><td[^>]*>([^<]*)<\/td>",
++            if (preg_match("/<td[^>]*>GD Version *<\/td><td[^>]*>([^<]*)<\/td>/",
+                 $php_info, $result))
+             {
+                 $version = $result[1];
+@@ -1779,9 +1779,9 @@
+             }
+         }
+ 
+-        if (ereg('1\.[0-9]{1,2}', $version)) {
++        if (preg_match('/1\.[0-9]{1,2}/', $version)) {
+             return 1;
+-        } elseif (ereg('2\.[0-9]{1,2}', $version)) {
++        } elseif (preg_match('/2\.[0-9]{1,2}/', $version)) {
+             return 2;
+         } else {
+             return 0;
--- /dev/null	2010-05-15 12:23:36.000000000 +0200
+++ files/patch-Image__Canvas__PDF.php	2010-05-15 11:53:57.000000000 +0200
@@ -0,0 +1,19 @@
+--- ./Image/Canvas/PDF.php.orig	2010-05-15 11:53:04.000000000 +0200
++++ ./Image/Canvas/PDF.php	2010-05-15 11:53:04.000000000 +0200
+@@ -993,14 +993,14 @@
+             $php_info = ob_get_contents();
+             ob_end_clean();
+ 
+-            if (ereg("<td[^>]*>PDFlib GmbH Version *<\/td><td[^>]*>([^<]*)<\/td>",
++            if (preg_match("/<td[^>]*>PDFlib GmbH Version *<\/td><td[^>]*>([^<]*)<\/td>/",
+                 $php_info, $result))
+             {
+                 $version = $result[1];
+             }
+         }               
+         
+-        if (ereg('([0-9]{1,2})\.[0-9]{1,2}(\.[0-9]{1,2})?', trim($version), $result)) {
++        if (preg_match('/([0-9]{1,2})\.[0-9]{1,2}(\.[0-9]{1,2})?/', trim($version), $result)) {
+             return $result[1];
+         } else {
+             return $version;
--- /dev/null	2010-05-15 12:23:36.000000000 +0200
+++ files/patch-Image__Canvas__PS.php	2010-05-15 11:53:57.000000000 +0200
@@ -0,0 +1,19 @@
+--- ./Image/Canvas/PS.php.orig	2010-05-15 11:53:04.000000000 +0200
++++ ./Image/Canvas/PS.php	2010-05-15 11:53:04.000000000 +0200
+@@ -991,14 +991,14 @@
+             $php_info = ob_get_contents();
+             ob_end_clean();
+ 
+-            if (ereg("<td[^>]*>pslib Version *<\/td><td[^>]*>([^<]*)<\/td>",
++            if (preg_match("/<td[^>]*>pslib Version *<\/td><td[^>]*>([^<]*)<\/td>/",
+                 $php_info, $result))
+             {
+                 $version = $result[1];
+             }
+         }               
+         
+-        if (ereg('([0-9]{1,2})\.[0-9]{1,2}(\.[0-9]{1,2})?', trim($version), $result)) {
++        if (preg_match('/([0-9]{1,2})\.[0-9]{1,2}(\.[0-9]{1,2})?/', trim($version), $result)) {
+             return $result[1];
+         } else {
+             return $version;
--- patch_patch_pear-Image_Canvas.txt ends here ---
Comment 5 Šimun Mikecin 2010-06-02 15:08:18 UTC
Patch looks fine. Approved.=0A=0A=C5=A0imun Mikecin (maintainer)=0A=0A=0A=
=0A
Comment 6 dfilter service freebsd_committer freebsd_triage 2010-06-02 17:28:45 UTC
miwi        2010-06-02 16:28:38 UTC

  FreeBSD ports repository

  Modified files:
    graphics/pear-Image_Canvas Makefile distinfo 
  Added files:
    graphics/pear-Image_Canvas/files patch-Image__Canvas.php 
                                     patch-Image__Canvas__GD.php 
                                     patch-Image__Canvas__PDF.php 
                                     patch-Image__Canvas__PS.php 
  Log:
  - Update to 0.3.2
  
  PR:             146453
  Submitted by:   olli hauer <ohauer@gmx.de> (maintainer)
  
  Revision  Changes    Path
  1.8       +11 -10    ports/graphics/pear-Image_Canvas/Makefile
  1.5       +3 -3      ports/graphics/pear-Image_Canvas/distinfo
  1.1       +20 -0     ports/graphics/pear-Image_Canvas/files/patch-Image__Canvas.php (new)
  1.1       +23 -0     ports/graphics/pear-Image_Canvas/files/patch-Image__Canvas__GD.php (new)
  1.1       +19 -0     ports/graphics/pear-Image_Canvas/files/patch-Image__Canvas__PDF.php (new)
  1.1       +19 -0     ports/graphics/pear-Image_Canvas/files/patch-Image__Canvas__PS.php (new)
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 7 Martin Wilke freebsd_committer freebsd_triage 2010-06-02 17:28:47 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!