From 9fb138929addf54f3c9ec73d4e7ef13eb2e00f83 Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill@pkgsrc.org>
Date: Thu, 19 Apr 2001 15:10:35 +0000
Subject: fix one more instance of __alpha__ being used as a test for OSF.

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

(limited to 'math')

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index 88e099e42b9..8f6334a1ed2 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/18 19:52:17 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2001/04/19 15:10:35 dmcmahill Exp $
 
 DISTNAME=	octave-2.1.33
 CATEGORIES=	math
@@ -20,9 +20,11 @@ DEPENDS+=	readline>=4.0:../../devel/readline
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
+USE_FORTRAN=	yes
 USE_GMAKE=	yes
 USE_GTEXINFO=	yes
-CONFIGURE_ARGS+=--with-g77 --enable-shared --enable-rpath
+CONFIGURE_ARGS+=--with-g77
+CONFIGURE_ARGS+=--enable-shared --enable-rpath
 CONFIGURE_ARGS+=-prefix=${PREFIX}
 
 CONFIGURE_ENV+=	FFLAGS="${CFLAGS}" OBJECT_FMT="${OBJECT_FMT}"
diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index 05c68880c75..ab61140c006 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/19 00:25:23 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2001/04/19 15:10:36 dmcmahill Exp $
 
 SHA1 (octave-2.1.33.tar.bz2) = 15a07d08647a2c2aeedb31917ac41ed3b7bb4245
 Size (octave-2.1.33.tar.bz2) = 3740256 bytes
@@ -13,4 +13,4 @@ SHA1 (patch-ah) = 3c5d82b3bd05766eb22987debe6fdb1447a92ae3
 SHA1 (patch-ai) = 248dbc97c2233c47dc532f86b0fb2fd3ebd18068
 SHA1 (patch-aj) = 8e2bbe9afde5567540b32fc183f58b87fbf9a547
 SHA1 (patch-ak) = b998dfe27accebec38cffa38555a3e32932c0c07
-SHA1 (patch-al) = 63e3a5931ff80e8758546ac8bb5579e23d96872b
+SHA1 (patch-al) = 7134c3cb12ce4fdd5cbe2a39c586aeac6dab2045
diff --git a/math/octave-current/patches/patch-al b/math/octave-current/patches/patch-al
index 1ad57046192..369d9e60824 100644
--- a/math/octave-current/patches/patch-al
+++ b/math/octave-current/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1 2001/04/19 00:13:14 dmcmahill Exp $
+$NetBSD: patch-al,v 1.2 2001/04/19 15:10:36 dmcmahill Exp $
 
 --- liboctave/lo-ieee.cc.orig	Tue Jan 25 16:23:09 2000
-+++ liboctave/lo-ieee.cc	Wed Apr 18 19:36:20 2001
++++ liboctave/lo-ieee.cc	Thu Apr 19 08:02:52 2001
 @@ -65,5 +65,5 @@
    double tmp = 1.0;
    octave_Inf = 1.0 / (tmp - tmp);
@@ -9,3 +9,10 @@ $NetBSD: patch-al,v 1.1 2001/04/19 00:13:14 dmcmahill Exp $
 +#elif defined (__alpha__) && defined (__osf__)
    extern unsigned int DINFINITY[2];
    octave_Inf =  (*(X_CAST(double *, DINFINITY)));
+@@ -84,5 +84,5 @@
+ #if defined (HAVE_ISNAN)
+ 
+-#if defined (__alpha__) && ! defined (linux)
++#if defined (__alpha__) && defined (__osf__)
+   extern unsigned int DQNAN[2];
+   octave_NaN = (*(X_CAST(double *, DQNAN)));
-- 
cgit v1.2.3