[106054] trunk/dports/php

[ryandesign at macports.org]

Revision: 106054
          https://trac.macports.org/changeset/106054
Author:   ryandesign at macports.org
Date:     2013-05-13 19:35:37 -0700 (Mon, 13 May 2013)
Log Message:
-----------
php-imagick: revbump and patch to build with new ImageMagick library version

Modified Paths:
--------------
    trunk/dports/php/php-imagick/Portfile
    trunk/dports/php/php5-imagick/Portfile

Added Paths:
-----------
    trunk/dports/php/php-imagick/files/
    trunk/dports/php/php-imagick/files/patch-config.m4.diff
    trunk/dports/php/php5-imagick/files/
    trunk/dports/php/php5-imagick/files/patch-config.m4.diff

Modified: trunk/dports/php/php-imagick/Portfile
===================================================================
--- trunk/dports/php/php-imagick/Portfile	2013-05-14 02:33:38 UTC (rev 106053)
+++ trunk/dports/php/php-imagick/Portfile	2013-05-14 02:35:37 UTC (rev 106054)
@@ -6,7 +6,7 @@
 
 name                    php-imagick
 version                 3.1.0RC2
-revision                1
+revision                2
 categories-append       graphics
 platforms               darwin
 maintainers             ryandesign openmaintainer
@@ -26,7 +26,9 @@
                         sha256  0dbb7e5df61845f8eab68505711b9efcdc98cfaff96dcb982c7f8931dd9e8a31
 
 if {${name} != ${subport}} {
-    depends_lib-append  path:bin/MagickWand-config:ImageMagick
+    depends_lib-append  port:ImageMagick
+ 
+    patchfiles          patch-config.m4.diff
     
     configure.args      --with-imagick=${prefix}
     

Added: trunk/dports/php/php-imagick/files/patch-config.m4.diff
===================================================================
--- trunk/dports/php/php-imagick/files/patch-config.m4.diff	                        (rev 0)
+++ trunk/dports/php/php-imagick/files/patch-config.m4.diff	2013-05-14 02:35:37 UTC (rev 106054)
@@ -0,0 +1,14 @@
+--- config.m4.orig	2010-11-18 15:16:01.000000000 -0600
++++ config.m4	2013-03-07 15:20:08.000000000 -0600
+@@ -52,8 +52,9 @@
+   else	
+     AC_MSG_CHECKING(for MagickWand.h header file)
+ 
+-    if test -r $WAND_DIR/include/ImageMagick/wand/MagickWand.h; then
+-      AC_MSG_RESULT(found in $WAND_DIR/include/ImageMagick/wand/MagickWand.h)
++    WAND_INCLUDE_DIR=`pkg-config MagickWand --variable=includedir`
++    if test -r ${WAND_INCLUDE_DIR}/wand/MagickWand.h; then
++      AC_MSG_RESULT(found in ${WAND_INCLUDE_DIR}/wand/MagickWand.h)
+     else
+       AC_MSG_ERROR(Cannot locate header file MagickWand.h)
+     fi

Modified: trunk/dports/php/php5-imagick/Portfile
===================================================================
--- trunk/dports/php/php5-imagick/Portfile	2013-05-14 02:33:38 UTC (rev 106053)
+++ trunk/dports/php/php5-imagick/Portfile	2013-05-14 02:35:37 UTC (rev 106054)
@@ -5,7 +5,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     imagick 3.0.1 pecl
-revision                1
+revision                2
 categories-append       graphics
 platforms               darwin
 maintainers             ryandesign openmaintainer
@@ -20,8 +20,10 @@
 checksums               sha1    64dd5c8ff4d43d94e65c3b35ac0b439676ecc746 \
                         rmd160  854fafe039e85a43bc1e53c00147099620a0034a
 
-depends_lib-append      path:bin/MagickWand-config:ImageMagick
+depends_lib-append      port:ImageMagick
 
+patchfiles              patch-config.m4.diff
+
 configure.args          --with-imagick=${prefix}
 
 use_parallel_build      yes

Added: trunk/dports/php/php5-imagick/files/patch-config.m4.diff
===================================================================
--- trunk/dports/php/php5-imagick/files/patch-config.m4.diff	                        (rev 0)
+++ trunk/dports/php/php5-imagick/files/patch-config.m4.diff	2013-05-14 02:35:37 UTC (rev 106054)
@@ -0,0 +1,14 @@
+--- config.m4.orig	2010-11-18 15:16:01.000000000 -0600
++++ config.m4	2013-03-07 15:20:08.000000000 -0600
+@@ -52,8 +52,9 @@
+   else	
+     AC_MSG_CHECKING(for MagickWand.h header file)
+ 
+-    if test -r $WAND_DIR/include/ImageMagick/wand/MagickWand.h; then
+-      AC_MSG_RESULT(found in $WAND_DIR/include/ImageMagick/wand/MagickWand.h)
++    WAND_INCLUDE_DIR=`pkg-config MagickWand --variable=includedir`
++    if test -r ${WAND_INCLUDE_DIR}/wand/MagickWand.h; then
++      AC_MSG_RESULT(found in ${WAND_INCLUDE_DIR}/wand/MagickWand.h)
+     else
+       AC_MSG_ERROR(Cannot locate header file MagickWand.h)
+     fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130513/8ebd1f0d/attachment.html>