[pkgsrc/pkgsrc-2006Q4]: pkgsrc/math/octave-forge Pullup ticket 2009 - request...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b63169be76f6
branches:  pkgsrc-2006Q4
changeset: 523004:b63169be76f6
user:      salo <salo%pkgsrc.org@localhost>
date:      Wed Feb 07 23:39:56 2007 +0000

description:
Pullup ticket 2009 - requested by obache
build fix for octave-forge

Revisions pulled up:
- pkgsrc/math/octave-forge/Makefile                     1.24
- pkgsrc/math/octave-forge/distinfo                     1.13
- pkgsrc/math/octave-forge/patches/patch-ag             1.6

   Module Name:         pkgsrc
   Committed By:        obache
   Date:                Tue Jan 30 02:45:33 UTC 2007

   Modified Files:
        pkgsrc/math/octave-forge: Makefile distinfo
        pkgsrc/math/octave-forge/patches: patch-ag

   Log Message:
   Disable auto detecting of ImageMagick.
   Pointed out in PR 35492.

diffstat:

 math/octave-forge/Makefile         |   4 +++-
 math/octave-forge/distinfo         |   4 ++--
 math/octave-forge/patches/patch-ag |  11 ++++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diffs (60 lines):

diff -r 82bda8607b83 -r b63169be76f6 math/octave-forge/Makefile
--- a/math/octave-forge/Makefile        Wed Feb 07 16:38:27 2007 +0000
+++ b/math/octave-forge/Makefile        Wed Feb 07 23:39:56 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/10/04 21:47:57 wiz Exp $
+# $NetBSD: Makefile,v 1.22.2.1 2007/02/07 23:39:56 salo Exp $
 
 DISTNAME=      octave-forge-2006.03.17
 CATEGORIES=    math
@@ -14,6 +14,8 @@
 USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
 
+CONFIGURE_ENV+=                HAVE_MAGICKXX=no
+
 UNLIMIT_RESOURCES=     datasize
 
 BUILD_TARGET=  # empty
diff -r 82bda8607b83 -r b63169be76f6 math/octave-forge/distinfo
--- a/math/octave-forge/distinfo        Wed Feb 07 16:38:27 2007 +0000
+++ b/math/octave-forge/distinfo        Wed Feb 07 23:39:56 2007 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2006/10/24 13:54:40 pooka Exp $
+$NetBSD: distinfo,v 1.12.2.1 2007/02/07 23:39:56 salo Exp $
 
 SHA1 (octave-forge-2006.03.17.tar.gz) = fca78a6eee1a2d44d2441c9ed9d3ffe3c51689de
 RMD160 (octave-forge-2006.03.17.tar.gz) = 0875f4ea9c7d4f3b9b0834decdbf590fe5166fa6
 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
diff -r 82bda8607b83 -r b63169be76f6 math/octave-forge/patches/patch-ag
--- a/math/octave-forge/patches/patch-ag        Wed Feb 07 16:38:27 2007 +0000
+++ b/math/octave-forge/patches/patch-ag        Wed Feb 07 23:39:56 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.5 2006/04/20 18:16:47 adam Exp $
+$NetBSD: patch-ag,v 1.5.6.1 2007/02/07 23:39:56 salo Exp $
 
 --- configure.orig     2006-03-17 06:26:16.000000000 +0100
 +++ configure
@@ -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