From e4398d330a1726835fe1b3787ab40c7ae505efe4 Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Tue, 30 Jan 2007 02:45:33 +0000
Subject: Disable auto detecting of ImageMagick. Pointed out in PR 35492.

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

(limited to 'math/octave-forge')

diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index 70fa74e440a..6fe7526262f 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/01/07 12:25:54 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/01/30 02:45:33 obache Exp $
 
 DISTNAME=	octave-forge-2006.03.17
 PKGREVISION=	1
@@ -15,6 +15,8 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 
+CONFIGURE_ENV+=		HAVE_MAGICKXX=no
+
 UNLIMIT_RESOURCES=	datasize
 
 BUILD_TARGET=	# empty
diff --git a/math/octave-forge/distinfo b/math/octave-forge/distinfo
index e6b0458103a..f2f0590903e 100644
--- a/math/octave-forge/distinfo
+++ b/math/octave-forge/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2006/10/24 13:54:40 pooka Exp $
+$NetBSD: distinfo,v 1.13 2007/01/30 02:45:33 obache 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 --git a/math/octave-forge/patches/patch-ag b/math/octave-forge/patches/patch-ag
index 6ae5739deac..c0b055dfcc6 100644
--- a/math/octave-forge/patches/patch-ag
+++ b/math/octave-forge/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.5 2006/04/20 18:16:47 adam Exp $
+$NetBSD: patch-ag,v 1.6 2007/01/30 02:45:33 obache Exp $
 
 --- configure.orig	2006-03-17 06:26:16.000000000 +0100
 +++ configure
@@ -441,6 +441,15 @@ $NetBSD: patch-ag,v 1.5 2006/04/20 18:16:47 adam Exp $
    { (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
-- 
cgit v1.2.3