Re: pkg/35492: math/octave-forge tries to use graphics/ImageMagick

[OBATA Akio <obache%NetBSD.org@localhost>]

The following reply was made to PR pkg/35492; it has been noted by GNATS.

From: OBATA Akio <obache%NetBSD.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: rosenfeld%grumpf.hope-2000.org@localhost
Subject: Re: pkg/35492: math/octave-forge tries to use graphics/ImageMagick
Date: Mon, 29 Jan 2007 20:57:53 +0900

 On Sun, 28 Jan 2007 15:35:02 +0000 (UTC), Hans Rosenfeld wrote:
 > The following reply was made to PR pkg/35492; it has been noted by GNATS.
 > 
 > From: Hans Rosenfeld <rosenfeld%grumpf.hope-2000.org@localhost>
 > To: gnats-bugs%NetBSD.org@localhost
 > Cc: 
 > Subject: Re: pkg/35492: math/octave-forge tries to use graphics/ImageMagick
 > Date: Sun, 28 Jan 2007 16:32:21 +0100
 > 
 >  On Sun, Jan 28, 2007 at 12:55:02PM +0000, OBATA Akio wrote:
 >  >  Dose adding following line to Makfile fix problem?
 >  >  CONFIGURE_ENV+=  ac_cv_prog_HAVE_MAGICKXX=no
 >  
 >  No, the problem still exists, the configure script tells it can't find
 >  Magick++-config but still enables ImageMagick support.
 
 Following patch should fix this problem.
 Please test with pkgsrc-2006Q4 branch.
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/math/octave-forge/Makefile,v
 retrieving revision 1.23
 diff -u -r1.23 Makefile
 --- Makefile   7 Jan 2007 12:25:54 -0000       1.23
 +++ Makefile   29 Jan 2007 11:48:35 -0000
 @@ -15,6 +15,8 @@
  USE_TOOLS+=           gmake
  GNU_CONFIGURE=                yes
  
 +CONFIGURE_ENV+=               HAVE_MAGICKXX=no
 +
  UNLIMIT_RESOURCES=    datasize
  
  BUILD_TARGET= # empty
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/math/octave-forge/distinfo,v
 retrieving revision 1.12
 diff -u -r1.12 distinfo
 --- distinfo   24 Oct 2006 13:54:40 -0000      1.12
 +++ distinfo   29 Jan 2007 11:48:35 -0000
 @@ -5,7 +5,7 @@
  Size (octave-forge-2006.03.17.tar.gz) = 3727272 bytes
  SHA1 (patch-aa) = 01a91d7e63d61f78b9fd391f62694e58bb68ccad
  SHA1 (patch-ab) = 5fa5009bd6e516d5ff8d611f92ac63d30326789c
 -SHA1 (patch-ag) = 79fa60ff62548aac9293bc5f040fd0145b85720c
 +SHA1 (patch-ag) = 6f25d2d6ce2a0132ae993d0765c3132940ece8d2
  SHA1 (patch-ak) = 49c63b4b2a92cb971410f325a077152d7b5ebcd8
  SHA1 (patch-al) = d6925ebcc11ea5ad0dfa9be0df614a74c7fa31d0
  SHA1 (patch-am) = b0d22c174963ed797c4c4753957f19959ee87469
 Index: patches/patch-ag
 ===================================================================
 RCS file: /cvsroot/pkgsrc/math/octave-forge/patches/patch-ag,v
 retrieving revision 1.5
 diff -u -r1.5 patch-ag
 --- patches/patch-ag   20 Apr 2006 18:16:47 -0000      1.5
 +++ patches/patch-ag   29 Jan 2007 11:48:35 -0000
 @@ -441,6 +441,15 @@
     { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     (eval $ac_try) 2>&5
     ac_status=$?
 +@@ -6715,7 +6783,7 @@ else
 + echo "${ECHO_T}no" >&6
 + fi
 + 
 +-     if test $HAVE_MAGICKXX ; then
 ++     if test $HAVE_MAGICKXX = yes ; then
 +              STATUS="$STATUS, ImageMagick++"
 + 
 +              DEFHAVE_MAGICKXX="HAVE_MAGICKXX=1"
  @@ -6771,7 +6839,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
     cat conftest.err >&5
     echo "$as_me:$LINENO: \$? = $ac_status" >&5