Initial import of octave-current (octave-2.1.33), a high-level language

primarily intended for numerical computations.

Submitted in PR 9851 by Adam Ciarcinski, updated by Adam and by myself.

11 files changed, 543 insertions, 0 deletions

diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa
new file mode 100644
index 00000000000..0545c9dee49
--- /dev/null
+++ b/math/octave-current/patches/patch-aa
@@ -0,0 +1,165 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+
+--- configure.orig	Fri Jan  5 18:37:51 2001
++++ configure	Mon Mar 26 16:05:52 2001
+@@ -798,9 +798,9 @@
+ ### Allow the user disable support for command line editing using GNU
+ ### readline.
+ 
+-READLINE_DIR=readline
++READLINE_DIR=""
+ USE_READLINE=true
+-LIBREADLINE='$(TOPDIR)/readline/libreadline.$(LIBEXT)'
++LIBREADLINE='${LOCALBASE}/lib/libreadline.so'
+ # Check whether --enable-readline or --disable-readline was given.
+ if test "${enable_readline+set}" = set; then
+   enableval="$enable_readline"
+@@ -820,7 +820,7 @@
+ 
+ 
+ 
+-LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.$(LIBEXT)'
++LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.a'
+ 
+ 
+ ### Make it possible to have Octave's array and matrix classes do bounds
+@@ -2434,7 +2434,7 @@
+   echo "$ac_t""defining F77 to be $F77" 1>&6
+ elif $use_g77; then
+   if test "$with_g77" = yes; then
+-    F77=g77
++    F77=${CC}
+   else
+     F77="$with_g77"
+   fi
+@@ -2724,13 +2724,8 @@
+ 
+ 
+ 
+-if test "$cross_compiling" = yes; then
++if true; then
+   octave_cv_f2c_f77_compat=yes
+-  if test "$octave_cv_f77_is_g77" = yes; then
+-    echo "$ac_t""assuming ${F77-f77} cross compiler is f2c compatible" 1>&6
+-  else
+-    echo "configure: warning: assuming ${F77-f77} cross compiler is f2c compatible" 1>&2
+-  fi
+ else
+   echo $ac_n "checking ${F77-f77}/f2c compatibility""... $ac_c" 1>&6
+ echo "configure:2737: checking ${F77-f77}/f2c compatibility" >&5
+@@ -2864,10 +2859,8 @@
+ %.c : %.f
+ 
+ %.o : %.f
+-	$(FC) -c $(ALL_FFLAGS) -o $@ $<
++	${LIBTOOL} --mode=compile $(FC) -c $(ALL_FFLAGS) $<
+ 
+-pic/%.o : %.f
+-	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
+ 
+ EOF
+ elif $have_f2c; then
+@@ -3046,11 +3039,11 @@
+ 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
+ fi
+@@ -5065,7 +5058,7 @@
+ 
+ GLOB_DIR=glob
+ LIBGLOB='$(TOPDIR)/glob/glob.o $(TOPDIR)/glob/fnmatch.o'
+-GLOB_INCFLAGS='-I$(top_srcdir)/glob -I$(TOPDIR)/glob'
++GLOB_INCFLAGS='-I$(top_srcdir)/glob -I$(TOPDIR)/glob -I${LOCALBASE}/include'
+ if test "$ac_cv_header_fnmatch_h" = yes \
+   && test "$ac_cv_header_glob_h" = yes; then
+   cat > conftest.$ac_ext <<EOF
+@@ -6225,7 +6218,7 @@
+ 
+ 
+ TERMLIBS=""
+-for termlib in ncurses curses termcap terminfo termlib; do
++for termlib in curses termcap termlib; do
+   echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6
+ echo "configure:6231: checking for tputs in -l${termlib}" >&5
+ ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'`
+@@ -6276,13 +6269,11 @@
+ 
+ 
+ if test "$ac_cv_lib_termcap_tputs" = yes \
+-    || test "$ac_cv_lib_terminfo_tputs" = yes \
+-    || test "$ac_cv_lib_ncurses_tputs" = yes \
+     || test "$ac_cv_lib_curses_tputs" = yes \
+     || test "$ac_cv_lib_termlib_tputs" = yes; then
+   true
+ else
+-  warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, or -ltermlib!"
++  warn_termlibs="I couldn't find -ltermcap, -lcurses, or -ltermlib!"
+   echo "configure: warning: $warn_termlibs" 1>&2
+ fi
+ 
+@@ -6989,19 +6980,19 @@
+     cat << \EOF > $bsd_gcc_kluge_targets_frag
+ 
+ lex.o: lex.cc 
+-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
++	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
+ 
+ pt-plot.o: pt-plot.cc
+-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
++	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
+ 
+ symtab.o: symtab.cc
+-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
++	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
+ 
+ toplev.o: toplev.cc
+-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
++	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
+ 
+ unwind-prot.o: unwind-prot.cc 
+-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
++	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
+ 
+ EOF
+   ;;
+@@ -7270,7 +7261,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:7273: checking for a BSD compatible install" >&5
+-if test -z "$INSTALL"; then
++if true; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7914,7 +7905,7 @@
+ done
+ 
+ ac_given_srcdir=$srcdir
+-ac_given_INSTALL="$INSTALL"
++ac_given_INSTALL="${INSTALL}"
+ 
+ trap 'rm -fr `echo "Makefile octMakefile Makeconf install-octave \
+   test/Makefile dlfcn/Makefile \
+@@ -8153,10 +8144,6 @@
+     top_srcdir="$ac_dots$ac_given_srcdir" ;;
+   esac
+ 
+-  case "$ac_given_INSTALL" in
+-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-  esac
+ 
+   echo creating "$ac_file"
+   rm -f "$ac_file"
diff --git a/math/octave-current/patches/patch-ab b/math/octave-current/patches/patch-ab
new file mode 100644
index 00000000000..927e831b047
--- /dev/null
+++ b/math/octave-current/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+
+--- liboctave/f2c-main.c.orig	Tue Sep 14 23:10:50 1999
++++ liboctave/f2c-main.c	Tue Sep 14 23:11:04 1999
+@@ -33,7 +33,7 @@
+   assert (0);
+   return 0;
+ }
+-#elif defined (__linux__)
++#elif defined (__m68k__)
+ int
+ MAIN__ ()
+ {
diff --git a/math/octave-current/patches/patch-ac b/math/octave-current/patches/patch-ac
new file mode 100644
index 00000000000..2df5f206991
--- /dev/null
+++ b/math/octave-current/patches/patch-ac
@@ -0,0 +1,50 @@
+$NetBSD: patch-ac,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+
+--- Makeconf.in.orig	Sat Dec  9 07:41:37 2000
++++ Makeconf.in	Fri Dec 29 21:03:25 2000
+@@ -39,7 +39,7 @@
+ 
+ RUNTEST = @RUNTEST@
+ 
+-TEXI2DVI = $(top_srcdir)/texi2dvi
++TEXI2DVI = /usr/bin/texi2dvi
+ 
+ DEFAULT_PAGER = @DEFAULT_PAGER@
+ 
+@@ -56,7 +56,7 @@
+ SHLEXT = @SHLEXT@
+ SHLEXT_VER = $(SHLEXT).$(version)
+ 
+-LIBEXT = a
++LIBEXT = la
+ 
+ # Fortran to C translator and associated flags.
+ 
+@@ -128,7 +128,7 @@
+ 	$(LD_STATIC_FLAG) $(CPICFLAG) $(LDFLAGS)
+ 
+ SH_LD = @SH_LD@
+-SH_LDFLAGS = @SH_LDFLAGS@
++SH_LDFLAGS = #@SH_LDFLAGS@
+ 
+ SONAME_FLAGS = @SONAME_FLAGS@
+ 
+@@ -284,16 +284,12 @@
+ # How to make .o files:
+ 
+ %.o : %.c
+-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -o $@
++	${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
+ 
+ %.o : %.cc
+-	$(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< -o $@
++	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $<
+ 
+-pic/%.o : %.c
+-	$(CC) -c $(CPPFLAGS) $(CPICFLAG) $(ALL_CFLAGS) $< -o $@
+ 
+-pic/%.o : %.cc
+-	$(CXX) -c $(CPPFLAGS) $(CXXPICFLAG) $(ALL_CXXFLAGS) $< -o $@
+ 
+ # Here is a rule for generating dependencies for .cc files:
+ 
diff --git a/math/octave-current/patches/patch-ad b/math/octave-current/patches/patch-ad
new file mode 100644
index 00000000000..67fb699ada0
--- /dev/null
+++ b/math/octave-current/patches/patch-ad
@@ -0,0 +1,68 @@
+$NetBSD: patch-ad,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+
+--- libcruft/Makefile.in.orig	Fri Apr  7 09:31:53 2000
++++ libcruft/Makefile.in	Fri Apr  7 14:44:03 2000
+@@ -54,39 +54,14 @@
+ CRUFT_OBJ1 := $(patsubst %.f, %.o, $(CRUFT_OBJ2))
+ CRUFT_OBJ := $(CRUFT_OBJ1) $(MISC_OBJ)
+ 
+-ifeq ($(SHARED_LIBS), true)
+-  ifdef FPICFLAG
+-    CRUFT_OBJ_DIR := $(dir $(CRUFT_OBJ))
+-    CRUFT_OBJ_PICDIR := $(addsuffix pic/, $(CRUFT_OBJ_DIR))
+-    CRUFT_OBJ_NOTDIR := $(notdir $(CRUFT_OBJ))
+-    CRUFT_PICOBJ := $(join $(CRUFT_OBJ_PICDIR), $(CRUFT_OBJ_NOTDIR))
+-  else
+-    CRUFT_PICOBJ := $(CRUFT_OBJ)
+-  endif
+-endif
+-
+-ifeq ($(SHARED_LIBS), true)
+-  ifeq ($(STATIC_LIBS), true)
+-    LIBRARIES = libcruft.$(LIBEXT) libcruft.$(SHLEXT)
+-  else
+-    LIBRARIES = libcruft.$(SHLEXT)
+-  endif
+-else
+-  ifeq ($(STATIC_LIBS), true)
+-    LIBRARIES = libcruft.$(LIBEXT)
+-  else
+-    LIBRARIES =
+-  endif
+-endif
++LIBRARIES = libcruft.$(LIBEXT)
+ 
+ libraries: $(SUBDIRS)
+ 	$(MAKE) $(LIBRARIES)
+ .PHONY: libraries
+ 
+ libcruft.$(LIBEXT): $(CRUFT_OBJ)
+-	rm -f $@
+-	$(AR) $(ARFLAGS) $@ $^
+-	$(RANLIB) $@
++	${LIBTOOL} --mode=link cc -o libcruft.${LIBEXT} ${CRUFT_OBJ:.o=.lo} -rpath ${PREFIX}/lib -version-info ${version:2.1.%=2:%}
+ 
+ libcruft.$(SHLEXT): libcruft.$(SHLEXT_VER)
+ 	rm -f $@
+@@ -106,20 +81,7 @@
+ 
+ install::
+ 	$(top_srcdir)/mkinstalldirs $(octlibdir)
+-	if $(STATIC_LIBS); then \
+-	  rm -f $(octlibdir)/libcruft.$(LIBEXT) ; \
+-	  $(INSTALL_DATA) libcruft.$(LIBEXT) \
+-	    $(octlibdir)/libcruft.$(LIBEXT) ; \
+-	  $(RANLIB) $(octlibdir)/libcruft.$(LIBEXT) ; \
+-	fi
+-	if $(SHARED_LIBS); then \
+-	  rm -f $(octlibdir)/libcruft.$(SHLEXT_VER); \
+-	  $(INSTALL_PROGRAM) \
+-	    libcruft.$(SHLEXT_VER) $(octlibdir)/libcruft.$(SHLEXT_VER); \
+-	  cd $(octlibdir); \
+-	  rm -f libcruft.$(SHLEXT); \
+-	  $(LN_S) libcruft.$(SHLEXT_VER) libcruft.$(SHLEXT); \
+-	fi
++	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libcruft.${LIBEXT} ${PREFIX}/lib
+ 	$(mk-libdir-link)
+ 
+ install-strip::
diff --git a/math/octave-current/patches/patch-ae b/math/octave-current/patches/patch-ae
new file mode 100644
index 00000000000..dd881ca716e
--- /dev/null
+++ b/math/octave-current/patches/patch-ae
@@ -0,0 +1,29 @@
+$NetBSD: patch-ae,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+
+--- libcruft/misc/Makefile.in.orig	Fri Apr  7 10:34:43 2000
++++ libcruft/misc/Makefile.in	Fri Apr  7 14:49:50 2000
+@@ -27,15 +27,6 @@
+ 
+ INCLUDES := f77-fcn.h lo-error.h
+ 
+-ifeq ($(SHARED_LIBS), true)
+-  ifdef CPICFLAG
+-    CPICDEP := pic/machar.o pic/dostop.o pic/f77-fcn.o
+-  endif
+-  ifdef CXXPICFLAG
+-    CXXPICDEP := pic/f77-extern.o pic/lo-error.o
+-  endif
+-  SPECIAL_PICDEPEND := $(CPICDEP) $(CXXPICDEP)
+-endif
+ 
+ include ../Makerules
+ 
+@@ -56,7 +47,5 @@
+ XALL_CFLAGS = $(patsubst -O%, , $(ALL_CFLAGS))
+ 
+ machar.o: $(srcdir)/machar.c
+-	$(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $<
++	${LIBTOOL} --mode=compile $(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $<
+ 
+-pic/machar.o: $(srcdir)/machar.c
+-	$(XCC) -c $(CPPFLAGS) $(CPICFLAG) $(XALL_CFLAGS) -DDP $< -o $@
diff --git a/math/octave-current/patches/patch-af b/math/octave-current/patches/patch-af
new file mode 100644
index 00000000000..98a7107af25
--- /dev/null
+++ b/math/octave-current/patches/patch-af
@@ -0,0 +1,63 @@
+$NetBSD: patch-af,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+
+--- liboctave/Makefile.in.orig	Tue Jul 18 07:33:02 2000
++++ liboctave/Makefile.in	Sat Dec 30 10:13:43 2000
+@@ -18,7 +18,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ 
+-LIBOCTAVE_LFLAGS = -L../libcruft -L../readline -L../kpathsea \
++LIBOCTAVE_LFLAGS = -L../libcruft -L${LOCALBASE}/lib -L../kpathsea \
+ 	-L../glob -L. $(RLD_FLAG)
+ 
+ LIBOCTAVE_LIBS = -lcruft -lreadline -lkpathsea -lglob
+@@ -146,25 +146,11 @@
+ 	  mkdir pic; \
+ 	fi
+ 
+-ifeq ($(SHARED_LIBS), true)
+-  ifeq ($(STATIC_LIBS), true)
+-    libraries: liboctave.$(LIBEXT) liboctave.$(SHLEXT)
+-  else
+-    libraries: liboctave.$(SHLEXT)
+-  endif
+-else
+-  ifeq ($(STATIC_LIBS), true)
+-    libraries: liboctave.$(LIBEXT)
+-  else
+-    libraries:
+-  endif
+-endif
++libraries: liboctave.$(LIBEXT)
+ .PHONY: libraries
+ 
+ liboctave.$(LIBEXT): $(OBJECTS)
+-	rm -f $@
+-	$(AR) $(ARFLAGS) $@ $^
+-	$(RANLIB) $@
++	${LIBTOOL} --mode=link cc -o liboctave.${LIBEXT} ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info ${version:2.1.%=2:%}
+ 
+ liboctave.$(SHLEXT): liboctave.$(SHLEXT_VER)
+ 	rm -f $@
+@@ -188,20 +174,7 @@
+ 
+ install-lib:
+ 	$(top_srcdir)/mkinstalldirs $(octlibdir)
+-	if $(STATIC_LIBS); then \
+-	  rm -f $(octlibdir)/liboctave.$(LIBEXT); \
+-	  $(INSTALL_DATA) liboctave.$(LIBEXT) \
+-	    $(octlibdir)/liboctave.$(LIBEXT); \
+-	  $(RANLIB) $(octlibdir)/liboctave.$(LIBEXT); \
+-	fi
+-	if $(SHARED_LIBS); then \
+-	  rm -f $(octlibdir)/liboctave.$(SHLEXT_VER); \
+-	  $(INSTALL_PROGRAM) \
+-	    liboctave.$(SHLEXT_VER) $(octlibdir)/liboctave.$(SHLEXT_VER); \
+-	  cd $(octlibdir); \
+-	  rm -f liboctave.$(SHLEXT); \
+-	  $(LN_S) liboctave.$(SHLEXT_VER) liboctave.$(SHLEXT); \
+-	fi
++	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} liboctave.${LIBEXT} ${PREFIX}/lib
+ 	$(mk-libdir-link)
+ .PHONY: install-lib
+ 
diff --git a/math/octave-current/patches/patch-ag b/math/octave-current/patches/patch-ag
new file mode 100644
index 00000000000..d183cc8dc8c
--- /dev/null
+++ b/math/octave-current/patches/patch-ag
@@ -0,0 +1,95 @@
+$NetBSD: patch-ag,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+
+--- src/Makefile.in.orig	Sat Dec  9 07:42:21 2000
++++ src/Makefile.in	Mon Mar 26 21:44:49 2001
+@@ -143,13 +143,7 @@
+ OBJECTS_1 := $(patsubst %.c, %.o, $(OBJECTS_2))
+ OBJECTS := $(patsubst %.cc, %.o, $(OBJECTS_1))
+ 
+-ifeq ($(SHARED_LIBS), true)
+-  ifdef CXXPICFLAG
+-    PICOBJ := $(addprefix pic/, $(OBJECTS))
+-  else
+-    PICOBJ := $(OBJECTS)
+-  endif
+-endif
++PICOBJ := $(OBJECTS)
+ 
+ # Ugh.
+ 
+@@ -184,8 +178,8 @@
+ 
+ DOC_FILES := $(sort $(DEF_FILES) $(patsubst %, %.df, $(VAR_FILES)))
+ 
+-OCTAVE_LFLAGS = -L$(TOPDIR)/liboctave -L$(TOPDIR)/libcruft \
+-  -L$(TOPDIR)/src $(RLD_FLAG)
++OCTAVE_LFLAGS = -L$(TOPDIR)/liboctave/.libs -L$(TOPDIR)/libcruft/.libs \
++  -L$(TOPDIR)/src/.libs $(RLD_FLAG)
+ 
+ OCTAVE_LIBS = $(LIBOCTINTERP) $(LIBOCTAVE) $(SPECIAL_MATH_LIB) $(LIBCRUFT) \
+   $(LIBPLPLOT) $(LIBREADLINE) $(LIBKPATHSEA) $(LIBGLOB) $(LIBDLFCN)
+@@ -210,30 +204,13 @@
+ 
+ XERBLA = ../libcruft/blas-xtra/xerbla.o
+ 
+-ifeq ($(SHARED_LIBS), true)
+-  ifeq ($(STATIC_LIBS), true)
+-    LIBRARIES = liboctinterp.$(LIBEXT) liboctinterp.$(SHLEXT)
+-  else
+-    LIBRARIES = liboctinterp.$(SHLEXT)
+-    XERBLA = ../libcruft/blas-xtra/pic/xerbla.o
+-  endif
+-else
+-  ifeq ($(STATIC_LIBS), true)
+-    LIBRARIES = liboctinterp.$(LIBEXT)
+-  else
+-    ## This is not going to work, but hey, you asked for it...
+-    LIBRARIES =
+-    XERBLA =
+-  endif
+-endif
++LIBRARIES = liboctinterp.$(LIBEXT)
+ 
+ libraries: $(LIBRARIES)
+ .PHONY: libraries
+ 
+ liboctinterp.$(LIBEXT): $(OBJECTS)
+-	rm -f $@
+-	$(AR) $(ARFLAGS) $@ $^
+-	$(RANLIB) $@
++	${LIBTOOL} --mode=link cc -o liboctinterp.la ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info ${version:2.1.%=2:%}
+ 
+ liboctinterp.$(SHLEXT): liboctinterp.$(SHLEXT_VER)
+ 	rm -f $@
+@@ -259,7 +236,7 @@
+ 	octave.o builtins.o ops.o $(XERBLA) $(DLD_STATIC_OBJ) \
+ 	$(OCTAVE_LFLAGS) \
+ 	$(OCTAVE_LIBS) \
+-	$(LEXLIB) $(TERMLIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS)
++	$(LEXLIB) $(TERMLIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) -lg2c
+ 
+ stmp-pic: pic
+ 	@if [ -f stmp-pic ]; then \
+@@ -343,21 +320,7 @@
+ .PHONY: install-oct
+ 
+ install-lib:
+-	$(top_srcdir)/mkinstalldirs $(octlibdir)
+-	if $(STATIC_LIBS); then \
+-	  rm -f $(octlibdir)/liboctinterp.$(LIBEXT); \
+-	  $(INSTALL_DATA) liboctinterp.$(LIBEXT) \
+-	    $(octlibdir)/liboctinterp.$(LIBEXT); \
+-	  $(RANLIB) $(octlibdir)/liboctinterp.$(LIBEXT); \
+-	fi
+-	if $(SHARED_LIBS); then \
+-	  rm -f $(octlibdir)/liboctinterp.$(SHLEXT_VER); \
+-	  $(INSTALL_PROGRAM) liboctinterp.$(SHLEXT_VER) \
+-	    $(octlibdir)/liboctinterp.$(SHLEXT_VER); \
+-	  cd $(octlibdir); \
+-	  rm -f liboctinterp.$(SHLEXT); \
+-	  $(LN_S) liboctinterp.$(SHLEXT_VER) liboctinterp.$(SHLEXT); \
+-	fi
++	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} liboctinterp.la ${PREFIX}/lib
+ 	$(mk-libdir-link)
+ .PHONY: install-lib
+ 
diff --git a/math/octave-current/patches/patch-ah b/math/octave-current/patches/patch-ah
new file mode 100644
index 00000000000..83d12bb0092
--- /dev/null
+++ b/math/octave-current/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+
+--- Makefile.in.orig	Fri Dec 29 22:06:34 2000
++++ Makefile.in	Fri Dec 29 22:05:51 2000
+@@ -7,7 +7,7 @@
+ # Department of Chemical Engineering
+ 
+ TARGETS = octave-bug mkoctfile libcruft liboctave kpathsea dlfcn \
+-	readline src scripts doc check octave.info INSTALL.OCTAVE BUGS \
++	src scripts doc check octave.info INSTALL.OCTAVE BUGS \
+ 	install install-strip uninstall tags TAGS dist conf-dist \
+ 	snapshot snapshot-version
+ 
diff --git a/math/octave-current/patches/patch-ai b/math/octave-current/patches/patch-ai
new file mode 100644
index 00000000000..2064cdc2764
--- /dev/null
+++ b/math/octave-current/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+
+--- Makefile.orig	Fri Dec 29 22:07:09 2000
++++ Makefile	Fri Dec 29 22:07:16 2000
+@@ -8,7 +8,7 @@
+ # Department of Chemical Engineering
+ 
+ TARGETS = octave-bug mkoctfile libcruft liboctave kpathsea dlfcn \
+-	readline src scripts doc check octave.info INSTALL.OCTAVE BUGS \
++	src scripts doc check octave.info INSTALL.OCTAVE BUGS \
+ 	install install-strip uninstall tags TAGS dist conf-dist \
+ 	snapshot snapshot-version
+ 
diff --git a/math/octave-current/patches/patch-aj b/math/octave-current/patches/patch-aj
new file mode 100644
index 00000000000..c805c88e1e2
--- /dev/null
+++ b/math/octave-current/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+
+--- octMakefile.in.orig	Fri Dec 29 22:08:42 2000
++++ octMakefile.in	Fri Dec 29 22:21:07 2000
+@@ -31,7 +31,7 @@
+ 	ChangeLog ChangeLog.[0-9]
+ 
+ # Complete directory trees to distribute.
+-DISTDIRS = glob kpathsea readline # plplot
++DISTDIRS = glob kpathsea # plplot
+ 
+ # Subdirectories in which to run `make all'.
+ SUBDIRS = @PLPLOT_DIR@ @READLINE_DIR@ @DLFCN_DIR@ @GLOB_DIR@ \
diff --git a/math/octave-current/patches/patch-ak b/math/octave-current/patches/patch-ak
new file mode 100644
index 00000000000..a34f35d33fa
--- /dev/null
+++ b/math/octave-current/patches/patch-ak
@@ -0,0 +1,21 @@
+$NetBSD: patch-ak,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+
+--- kpathsea/Makefile.in.orig	Thu Apr 27 10:05:26 2000
++++ kpathsea/Makefile.in	Thu Apr 27 10:08:11 2000
+@@ -148,6 +148,7 @@
+ INSTALL_SCRIPT = $(INSTALL_PROGRAM)
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_LIBTOOL_LIBS = INSTALL_DATA='$(INSTALL_DATA)' $(LIBTOOL) install-lib
++INSTALL_LIBTOOL_THISLIB = INSTALL_DATA='$(LN)' $(LIBTOOL) install-lib
+ INSTALL_LIBTOOL_PROG = INSTALL_PROGRAM='$(INSTALL_PROGRAM)' $(LIBTOOL) install-prog
+ 
+ # Creating (symbolic) links.
+@@ -253,7 +254,7 @@
+ 
+ $(kpathsea): $(objects) klibtool.version
+ 	$(LIBTOOL) archive $(AR) $(ARFLAGS) $@ $(objects)
+-	$(INSTALL_LIBTOOL_LIBS) . lib$(library).la
++	$(INSTALL_LIBTOOL_THISLIB) . lib$(library).la
+ 
+ # All the objects depend on the klibtool configuration file.
+ $(objects): klibtool.config