[pkgsrc/trunk]: pkgsrc/math/octave Fix configure handling of Magick option

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f0bef2a3640
branches:  trunk
changeset: 577013:8f0bef2a3640
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jun 27 17:52:56 2010 +0000

description:
Fix configure handling of Magick option

diffstat:

 math/octave/distinfo         |   4 ++--
 math/octave/patches/patch-an |  28 +++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 9 deletions(-)

diffs (69 lines):

diff -r 1c5a942c583c -r 8f0bef2a3640 math/octave/distinfo
--- a/math/octave/distinfo      Sun Jun 27 17:51:07 2010 +0000
+++ b/math/octave/distinfo      Sun Jun 27 17:52:56 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2010/04/24 20:58:36 asau Exp $
+$NetBSD: distinfo,v 1.28 2010/06/27 17:52:56 joerg Exp $
 
 SHA1 (octave-3.2.4.tar.bz2) = 7de078564027108f3436f3ba7bf5993a6b411a67
 RMD160 (octave-3.2.4.tar.bz2) = 6dcdea7ef2431b8427da5e6b9d2113e0e5736f43
@@ -11,5 +11,5 @@
 SHA1 (patch-ah) = a2c6e3c6cb4c4570647edb4f484f514d75dda3ba
 SHA1 (patch-ai) = d7b4841238f7358bea50dd1b1b22cd94ab2af229
 SHA1 (patch-ak) = 98aa84ac66fac0b7b0dcdb69e911dc9d42fd6673
-SHA1 (patch-an) = c7069e1cbd9c0cacb4bec20ab0db39e00d78b518
+SHA1 (patch-an) = 4ce4be6b91fb61e76fe8a85d5120721d562b475a
 SHA1 (patch-ao) = 80be57d904d48cc48d8f3da0a3883309a343d084
diff -r 1c5a942c583c -r 8f0bef2a3640 math/octave/patches/patch-an
--- a/math/octave/patches/patch-an      Sun Jun 27 17:51:07 2010 +0000
+++ b/math/octave/patches/patch-an      Sun Jun 27 17:52:56 2010 +0000
@@ -1,16 +1,27 @@
-$NetBSD: patch-an,v 1.1 2009/10/08 16:43:13 dmcmahill Exp $
-
+$NetBSD: patch-an,v 1.2 2010/06/27 17:52:56 joerg Exp $
 
---- configure.in.orig  2009-05-26 11:38:48.000000000 +0000
-+++ configure.in       2009-10-08 11:40:07.000000000 +0000
-@@ -1212,5 +1212,5 @@
+--- configure.in.orig  2010-01-19 11:13:14.000000000 +0000
++++ configure.in
+@@ -672,7 +672,7 @@ fi
+ 
+ warn_magick=
+ AC_CHECK_PROGS(MAGICK_CONFIG, [GraphicsMagick++-config GraphicsMagick-config])
+-if test -z "$MAGICK_CONFIG"; then
++if test -z "$MAGICK_CONFIG" || test "$MAGICK_CONFIG" = "no"; then
+   warn_magick="GraphicsMagick++ config script not found.  Assuming GraphicsMagic++ library and header files are missing, so imread will not be fully functional"
+ else
+   AC_DEFINE(HAVE_MAGICK, 1, [Define if GraphicsMagick++ is available.])
+@@ -1214,7 +1214,7 @@ OCTGRAPHICS_DLL_DEFS=
+ library_path_var=LD_LIBRARY_PATH
  SCRIPTS_EXE_SUFFIX=
  case "$canonical_host_type" in
 -  *-*-386bsd* | *-*-netbsd*)
 +  *-*-386bsd*)
      SH_LD=ld
      SH_LDFLAGS=-Bshareable
-@@ -1597,6 +1597,6 @@
+   ;;
+@@ -1599,8 +1599,8 @@ AC_CHECK_FUNCS(atexit basename bcopy bze
+   _chmod _snprintf x_utime _utime32)
  
  AC_LANG_PUSH(C++)
 -AC_CHECK_DECLS([exp2, round, tgamma], [], [], [[#include <cmath>]])
@@ -19,7 +30,9 @@
 +AC_CHECK_FUNCS([exp2 round tgamma tgamma])
  AH_VERBATIM([Z_FUNCS_AND_DECLS], [
  #if defined (__cplusplus)
-@@ -1612,4 +1612,7 @@
+ extern "C" {
+@@ -1614,6 +1614,9 @@ double round (double);
+ #if HAVE_TGAMMA && ! HAVE_DECL_TGAMMA
  double tgamma (double);
  #endif
 +#if HAVE_TGAMMAF && ! HAVE_DECL_TGAMMAF
@@ -27,3 +40,4 @@
 +#endif
  #if defined (__cplusplus)
  }
+ #endif