Fix breaking in php-imagemagick
Ian McWilliam <[email protected]> Tue, 12 Mar 2013 01:17:34 +1100
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.wip.general |
|---|---|
| Message-ID | <[email protected]> |
The attached patch fixes breakage in wip/php-imagemagick Seems the ImageMagick include directory changed locations. Ian McWilliam ------------------------------------------------------------------------------ Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the endpoint security space. For insight on selecting the right partner to tackle endpoint security challenges, access the full report. http://p.sf.net/sfu/symantec-dev2dev _______________________________________________ pkgsrc-wip-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-discuss
wip-php-imagemagick.diff
(application/octet-stream, 1.9 KB)
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/php-imagick/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 18 Jun 2012 23:57:38 -0000 1.3
+++ distinfo 11 Mar 2013 14:12:40 -0000
@@ -3,3 +3,4 @@ $NetBSD$
SHA1 (php-imagick/imagick-3.1.0RC2.tgz) = 29b6dcd534cde6b37ebe3ee5077b71a9eed685c2
RMD160 (php-imagick/imagick-3.1.0RC2.tgz) = a5c13d1cfec2d6d89c352ce6a0be2c7062586339
Size (php-imagick/imagick-3.1.0RC2.tgz) = 93264 bytes
+SHA1 (patch-config.m4) = 75e31a869b372bb519d71be0d5a02caf8530eeef
Index: patches/patch-config.m4
===================================================================
RCS file: patches/patch-config.m4
diff -N patches/patch-config.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-config.m4 11 Mar 2013 14:12:40 -0000
@@ -0,0 +1,23 @@
+$NetBSD$
+
+--- config.m4.orig 2013-03-11 13:44:55.000000000 +0000
++++ config.m4
+@@ -32,6 +32,7 @@ if test $PHP_IMAGICK != "no"; then
+
+ IMAGEMAGICK_VERSION_ORIG=`$WAND_BINARY --version`
+ IMAGEMAGICK_VERSION_MASK=`echo ${IMAGEMAGICK_VERSION_ORIG} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
++ IMAGEMAGICK_VERSION_MAJOR=`echo ${IMAGEMAGICK_VERSION_ORIG} | awk 'BEGIN { FS = "."; } { printf "%d", $1}'`
+
+ AC_MSG_CHECKING(if ImageMagick version is at least 6.2.4)
+ if test "$IMAGEMAGICK_VERSION_MASK" -ge 6002004; then
+@@ -52,8 +53,8 @@ if test $PHP_IMAGICK != "no"; then
+ 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)
++ if test -r $WAND_DIR/include/ImageMagick-${IMAGEMAGICK_VERSION_MAJOR}/wand/MagickWand.h; then
++ AC_MSG_RESULT(found in $WAND_DIR/include/ImageMagick-${IMAGEMAGICK_VERSION_MAJOR}/wand/MagickWand.h)
+ else
+ AC_MSG_ERROR(Cannot locate header file MagickWand.h)
+ fi