summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2001-04-19 03:03:24 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2001-04-19 03:03:24 +0000
commitf9f48957e4ff2a4ce7681e0d206e6cead13138d4 (patch)
treec86e92cab417058d354dd364d2e47a44431287b5 /math
parent83bb55975b38d55b8d7853fc3536c36e83a72eaa (diff)
downloadpkgsrc-f9f48957e4ff2a4ce7681e0d206e6cead13138d4.tar.gz
make sure this configures and builds correctly with either f77 or f2c.
Diffstat (limited to 'math')
-rw-r--r--math/octave/Makefile3
-rw-r--r--math/octave/distinfo8
-rw-r--r--math/octave/patches/patch-aa39
3 files changed, 35 insertions, 15 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile
index d38fa2c45de..ddd7ed33b46 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/03/29 21:21:36 wennmach Exp $
+# $NetBSD: Makefile,v 1.24 2001/04/19 03:03:24 dmcmahill Exp $
# FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
DISTNAME= octave-2.0.16
@@ -23,6 +23,7 @@ GNU_CONFIGURE= yes
USE_FORTRAN= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
+CONFIGURE_ENV+= FFLAGS="${CFLAGS}" OBJECT_FMT="${OBJECT_FMT}"
CONFIGURE_ENV+= CPPFLAGS=-I${WRKDIR}/include
LDFLAGS+= -Wl,-R${PREFIX}/lib -L${PREFIX}/lib
diff --git a/math/octave/distinfo b/math/octave/distinfo
index 871dfcf7271..9ae503dc154 100644
--- a/math/octave/distinfo
+++ b/math/octave/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1 2001/04/17 11:35:22 agc Exp $
-MD5 (octave-2.0.16.tar.gz) = 6ad6f87f762f3d313e6b6da8346e90d0
-SHA1 (patch-aa) = ee390a6f2c750a4c9ab01c753da0f7006bc4c0a8
+$NetBSD: distinfo,v 1.2 2001/04/19 03:03:24 dmcmahill Exp $
+
+SHA1 (octave-2.0.16.tar.gz) = 50db40d260e5294520af67d03c2933567cec31e0
+Size (octave-2.0.16.tar.gz) = 3840681 bytes
+SHA1 (patch-aa) = 11cd0497b1bcb2ad5b7e92712dcc803f3897b013
SHA1 (patch-ac) = 46f96166094821de179c7e8440503b9e11cc16d0
SHA1 (patch-ae) = 385d3b34764c245530378a04c42735b597c881e4
SHA1 (patch-af) = 8e1f3e3b4f18eeaa77c60ab887d9898b8e5936cc
diff --git a/math/octave/patches/patch-aa b/math/octave/patches/patch-aa
index 3e3c43f8dd0..9ef07dbee73 100644
--- a/math/octave/patches/patch-aa
+++ b/math/octave/patches/patch-aa
@@ -1,27 +1,45 @@
-$NetBSD: patch-aa,v 1.6 2000/08/15 21:01:52 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2001/04/19 03:03:24 dmcmahill Exp $
---- configure.orig Sun Jan 30 03:26:06 2000
-+++ configure Tue Aug 15 02:50:10 2000
-@@ -786,7 +786,7 @@
-
+--- configure.orig Sat Jan 29 21:26:06 2000
++++ configure Wed Apr 18 19:12:58 2001
+@@ -787,5 +787,5 @@
-LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.$(LIBEXT)'
+LIBKPATHSEA='$(TOPDIR)/kpathsea/STATIC/libkpathsea.$(LIBEXT)'
- ### Make it possible to have Octave's array and matrix classes do bounds
-@@ -5180,7 +5180,7 @@
+@@ -2439,5 +2439,5 @@
+ #if defined (sun)
+ int MAIN_ () { return 0; }
+-#elif defined (linux) && defined (__ELF__)
++#elif (defined (linux) && defined (__ELF__)) || defined(__NetBSD__)
+ int MAIN__ () { return 0; }
+ #endif
+@@ -2708,10 +2708,9 @@
+ fi
+-FORTRAN_MAIN_FLAG=
+-case "$canonical_host_type" in
+- *-linux-*)
+- FORTRAN_MAIN_FLAG="-u MAIN__"
+- ;;
+-esac
++if test "${OBJECT_FMT}" = "ELF"; then
++FORTRAN_MAIN_FLAG="-u MAIN__"
++else
++FORTRAN_MAIN_FLAG="-Wl,-u_MAIN__"
++fi
+ if test -n "$FORTRAN_MAIN_FLAG"; then
+ echo "$ac_t""defining FORTRAN_MAIN_FLAG to be $FORTRAN_MAIN_FLAG" 1>&6
+@@ -5181,5 +5180,5 @@
TERMLIBS=""
-for termlib in ncurses curses termcap terminfo termlib; do
+for termlib in termcap terminfo termlib; do
echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6
echo "configure:5186: checking for tputs in -l${termlib}" >&5
- ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'`
-@@ -5232,12 +5232,10 @@
-
+@@ -5233,10 +5232,8 @@
if test "$ac_cv_lib_termcap_tputs" = yes \
|| test "$ac_cv_lib_terminfo_tputs" = yes \
- || test "$ac_cv_lib_ncurses_tputs" = yes \
@@ -33,4 +51,3 @@ $NetBSD: patch-aa,v 1.6 2000/08/15 21:01:52 wiz Exp $
+ warn_termlibs="I couldn't find -ltermcap, -lterminfo, or -ltermlib!"
echo "configure: warning: $warn_termlibs" 1>&2
fi
-