Changes 2.1.69:

* Bug fixes

7 files changed, 181 insertions, 201 deletions

diff --git a/math/octave/patches/egcs-patch-aa b/math/octave/patches/egcs-patch-aa
deleted file mode 100644
index aaf565cf5e1..00000000000
--- a/math/octave/patches/egcs-patch-aa
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: egcs-patch-aa,v 1.1 1998/11/29 23:36:29 tron Exp $
-
---- src/xdiv.cc.orig	Sat Oct 12 00:57:03 1996
-+++ src/xdiv.cc	Sat Nov 28 15:15:43 1998
-@@ -112,7 +112,7 @@
- Matrix
- xdiv (const Matrix& a, const Matrix& b)
- {
--  if (! mx_div_conform (a, b))
-+  if (! mx_div_conform<const Matrix&, const Matrix&>  (a, b))
-     return Matrix ();
- 
-   Matrix atmp = a.transpose ();
-@@ -137,7 +137,7 @@
- ComplexMatrix
- xdiv (const Matrix& a, const ComplexMatrix& b)
- {
--  if (! mx_div_conform (a, b))
-+  if (! mx_div_conform<const Matrix&, const ComplexMatrix&> (a, b))
-     return ComplexMatrix ();
- 
-   Matrix atmp = a.transpose ();
-@@ -162,7 +162,7 @@
- ComplexMatrix
- xdiv (const ComplexMatrix& a, const Matrix& b)
- {
--  if (! mx_div_conform (a, b))
-+  if (! mx_div_conform<const ComplexMatrix&, const Matrix&> (a, b))
-     return ComplexMatrix ();
- 
-   ComplexMatrix atmp = a.hermitian ();
-@@ -187,7 +187,7 @@
- ComplexMatrix
- xdiv (const ComplexMatrix& a, const ComplexMatrix& b)
- {
--  if (! mx_div_conform (a, b))
-+  if (! mx_div_conform<const ComplexMatrix&, const ComplexMatrix&>  (a, b))
-     return ComplexMatrix ();
- 
-   ComplexMatrix atmp = a.hermitian ();
-@@ -290,7 +290,7 @@
- Matrix
- xleftdiv (const Matrix& a, const Matrix& b)
- {
--  if (! mx_leftdiv_conform (a, b))
-+  if (! mx_leftdiv_conform<const Matrix&, const Matrix&> (a, b))
-     return Matrix ();
- 
-   int info;
-@@ -310,7 +310,7 @@
- ComplexMatrix
- xleftdiv (const Matrix& a, const ComplexMatrix& b)
- {
--  if (! mx_leftdiv_conform (a, b))
-+  if (! mx_leftdiv_conform<const Matrix&, const ComplexMatrix&>  (a, b))
-     return ComplexMatrix ();
- 
-   int info;
-@@ -330,7 +330,7 @@
- ComplexMatrix
- xleftdiv (const ComplexMatrix& a, const Matrix& b)
- {
--  if (! mx_leftdiv_conform (a, b))
-+  if (! mx_leftdiv_conform<const ComplexMatrix&, const Matrix&>  (a, b))
-     return ComplexMatrix ();
- 
-   int info;
-@@ -350,7 +350,7 @@
- ComplexMatrix
- xleftdiv (const ComplexMatrix& a, const ComplexMatrix& b)
- {
--  if (! mx_leftdiv_conform (a, b))
-+  if (! mx_leftdiv_conform<const ComplexMatrix&, const ComplexMatrix&> (a, b))
-     return ComplexMatrix ();
- 
-   int info;
diff --git a/math/octave/patches/patch-aa b/math/octave/patches/patch-aa
index d210a54898b..0ca46175467 100644
--- a/math/octave/patches/patch-aa
+++ b/math/octave/patches/patch-aa
@@ -1,59 +1,47 @@
-$NetBSD: patch-aa,v 1.8 2003/07/02 20:58:34 jtb Exp $
+$NetBSD: patch-aa,v 1.9 2005/04/01 10:15:47 adam Exp $
 
---- configure.orig
+--- configure.orig	2005-02-18 04:55:38.000000000 +0000
 +++ configure
-@@ -798,7 +798,7 @@
+@@ -8824,7 +8824,7 @@ if $have_fortran_compiler; then
+ %.c : %.f
+ 
+ %.o : %.f
+-	$(FC) -c $(ALL_FFLAGS) -o $@ $<
++	${LIBTOOL} --mode=compile --tag=CC $(FC) -c $(ALL_FFLAGS) $<
+ 
+ pic/%.o : %.f
+ 	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
+@@ -11034,7 +11034,7 @@ TEMPLATE_AR='$(AR)'
+ TEMPLATE_ARFLAGS="$ARFLAGS"
+ library_path_var=LD_LIBRARY_PATH
+ case "$canonical_host_type" in
+-  *-*-386bsd* | *-*-openbsd* | *-*-netbsd*)
++  *-*-386bsd* | *-*-openbsd* )
+     SH_LD=ld
+     SH_LDFLAGS=-Bshareable
+   ;;
+@@ -21138,19 +21138,19 @@ case "$canonical_host_type" in
+     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) $<
  
--LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.$(LIBEXT)'
-+LIBKPATHSEA='$(TOPDIR)/kpathsea/STATIC/libkpathsea.$(LIBEXT)'
+ 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) $<
  
- ### Make it possible to have Octave's array and matrix classes do bounds
-@@ -2561,7 +2561,7 @@
- }
- #if defined (sun)
- int MAIN_ () { return 0; }
--#elif defined (linux) && defined (__ELF__)
-+#elif (defined (linux) && defined (__ELF__)) || defined(__NetBSD__)
- int MAIN__ () { return 0; }
- #endif
- EOF
-@@ -2833,7 +2833,7 @@
+ unwind-prot.o: unwind-prot.cc
+-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
++	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
  
- FORTRAN_MAIN_FLAG=
- case "$canonical_host_type" in
--  *-linux-*)
-+  *-linux-*|*-netbsd*)
-     FORTRAN_MAIN_FLAG="-u MAIN__"
+ EOF
    ;;
- esac
-@@ -5312,7 +5312,7 @@
- 
- 
- 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:5318: checking for tputs in -l${termlib}" >&5
- ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'`
-@@ -5364,12 +5364,10 @@
- 
- 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, -lterminfo, or -ltermlib!"
-   echo "configure: warning: $warn_termlibs" 1>&2
- fi
- 
-@@ -7502,4 +7500,3 @@
- 
- ### End of configure.
- chmod +x install-octave
--
diff --git a/math/octave/patches/patch-ac b/math/octave/patches/patch-ac
index 3534a734271..a3f5ca2b7b3 100644
--- a/math/octave/patches/patch-ac
+++ b/math/octave/patches/patch-ac
@@ -1,12 +1,35 @@
-$NetBSD: patch-ac,v 1.3 2000/04/28 08:59:37 wennmach Exp $
---- Makeconf.in.orig	Sun Oct 18 16:04:22 1998
-+++ Makeconf.in	Sun Oct 18 16:07:37 1998
-@@ -63,7 +63,7 @@
- # cc and associated flags.
- 
- DLFCN_INCFLAGS = @DLFCN_INCFLAGS@
--GLOB_INCFLAGS = @GLOB_INCFLAGS@
-+GLOB_INCFLAGS = @GLOB_INCFLAGS@ -I ${PREFIX}/include
- 
- # Clean up INCFLAGS a bit if we are not compiling in a separate
- # directory.
+$NetBSD: patch-ac,v 1.4 2005/04/01 10:15:47 adam Exp $
+
+--- Makeconf.in.orig	2005-02-24 04:56:07.000000000 +0000
++++ Makeconf.in
+@@ -73,7 +73,7 @@ SHLBIN = @SHLBIN@
+ SHLBIN_VER = @SHLBIN_VER@
+ SHLLINKEXT=
+ 
+-LIBEXT = a
++LIBEXT = la
+ 
+ # Fortran to C translator and associated flags.
+ 
+@@ -158,7 +158,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@
+ SH_LD = @SH_LD@
+ SH_LDFLAGS = @SH_LDFLAGS@
+ 
+-DL_LD = @DL_LD@
++DL_LD = ${LIBTOOL} --mode=link @DL_LD@
+ DL_LDFLAGS = @DL_LDFLAGS@
+ 
+ SONAME_FLAGS = @SONAME_FLAGS@
+@@ -337,10 +337,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
+ # How to make .o files:
+ 
+ %.o : %.c
+-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -o $@
++	${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -o $@
+ 
+ %.o : %.cc
+-	$(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< -o $@
++	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< -o $@
+ 
+ pic/%.o : %.c
+ 	$(CC) -c $(CPPFLAGS) $(CPICFLAG) $(ALL_CFLAGS) $< -o $@
diff --git a/math/octave/patches/patch-ae b/math/octave/patches/patch-ae
index 74290332c11..9bbb9030f56 100644
--- a/math/octave/patches/patch-ae
+++ b/math/octave/patches/patch-ae
@@ -1,18 +1,13 @@
-$NetBSD: patch-ae,v 1.3 2000/04/28 08:59:37 wennmach Exp $
---- doc/liboctave/liboctave.texi.orig	Tue Aug 18 23:49:42 1998
-+++ doc/liboctave/liboctave.texi	Wed Apr 26 16:40:36 2000
-@@ -5,6 +5,14 @@
- \input texinfo  @c -*-texinfo-*-
- @setfilename liboctave.info
+$NetBSD: patch-ae,v 1.4 2005/04/01 10:15:47 adam Exp $
+
+--- libcruft/misc/Makefile.in.orig	2003-11-20 13:50:06.000000000 +0100
++++ libcruft/misc/Makefile.in
+@@ -62,7 +62,7 @@ XCC = $(patsubst -O%, , $(CC))
+ XALL_CFLAGS = $(patsubst -O%, , $(ALL_CFLAGS))
  
-+@ifinfo
-+@format
-+START-INFO-DIR-ENTRY
-+* LibOctave: (liboctave).     Octave library for numerical computations.
-+END-INFO-DIR-ENTRY
-+@end format
-+@end ifinfo
-+
- @c @smallbook
- @c @setchapternewpage odd
- @c @cropmarks
+ 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/patches/patch-af b/math/octave/patches/patch-af
index b7abdf9bc1a..7a2991fbe50 100644
--- a/math/octave/patches/patch-af
+++ b/math/octave/patches/patch-af
@@ -1,21 +1,28 @@
-$NetBSD: patch-af,v 1.2 2000/04/28 08:59:37 wennmach Exp $
---- liboctave/lo-ieee.cc.orig	Wed Apr 26 20:14:02 2000
-+++ liboctave/lo-ieee.cc	Wed Apr 26 20:18:16 2000
-@@ -64,7 +64,7 @@
- #if defined (SCO)
-   double tmp = 1.0;
-   octave_Inf = 1.0 / (tmp - tmp);
--#elif defined (__alpha__) && ! defined (linux)
-+#elif defined (__alpha__) && defined(__osf__)
-   extern unsigned int DINFINITY[2];
-   octave_Inf =  (*((double *) (DINFINITY)));
- #else
-@@ -83,7 +83,7 @@
+$NetBSD: patch-af,v 1.3 2005/04/01 10:15:47 adam Exp $
+
+--- liboctave/Makefile.in.orig	2004-11-12 05:34:57.000000000 +0000
++++ liboctave/Makefile.in
+@@ -208,8 +208,9 @@ endif
  
- #if defined (HAVE_ISNAN)
+ liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
+ 	rm -f $@
+-	$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $(LIBOCTAVE_OBJECTS)
+-	$(RANLIB) $@
++	${LIBTOOL} --mode=link ${CC} -o liboctave.$(LIBEXT) \
++		$(LIBOCTAVE_OBJECTS:.o=.lo) -rpath ${PREFIX}/lib \
++		-version-info ${version:2.1.%=2:%}
  
--#if defined (__alpha__) && ! defined (linux)
-+#if defined (__alpha__) && defined(__osf__)
-   extern unsigned int DQNAN[2];
-   octave_NaN = (*((double *) (DQNAN)));
- #else
+ liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT)
+ 	rm -f $@
+@@ -236,9 +237,8 @@ install-lib:
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
+ 	if $(STATIC_LIBS); then \
+ 	  rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
+-	  $(INSTALL_DATA) liboctave.$(LIBEXT) \
+-	    $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
+-	  $(RANLIB) $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
++	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctave.$(LIBEXT) \
++	    ${PREFIX}/lib; \
+ 	fi
+ 	if $(SHARED_LIBS); then \
+ 	  rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER); \
diff --git a/math/octave/patches/patch-ag b/math/octave/patches/patch-ag
index 7fe9abc1b3d..0a57be04e16 100644
--- a/math/octave/patches/patch-ag
+++ b/math/octave/patches/patch-ag
@@ -1,20 +1,61 @@
-$NetBSD: patch-ag,v 1.2 2000/09/09 02:44:34 wiz 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
+$NetBSD: patch-ag,v 1.3 2005/04/01 10:15:47 adam Exp $
+
+--- src/Makefile.in.orig	2004-11-12 05:34:58.000000000 +0000
++++ src/Makefile.in
+@@ -267,8 +267,9 @@ libraries: $(LIBRARIES)
  
- # Creating (symbolic) links.
-@@ -253,7 +254,7 @@
+ liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
+ 	rm -f $@
+-	$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^
+-	$(RANLIB) $@
++	${LIBTOOL} --mode=link ${CC} -o liboctinterp.$(LIBEXT) \
++		$(OBJECTS:.o=.lo) $(XERBLA:.o=.lo) -rpath ${PREFIX}/lib \
++		-version-info ${version:2.1.%=2:%}
  
- $(kpathsea): $(objects) klibtool.version
- 	$(LIBTOOL) archive $(AR) $(ARFLAGS) $@ $(objects)
--	$(INSTALL_LIBTOOL_LIBS) . lib$(library).la
-+	$(INSTALL_LIBTOOL_THISLIB) . lib$(library).la
+ liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT)
+ 	rm -f $@
+@@ -276,7 +277,7 @@ liboctinterp.$(SHLEXT_VER): liboctinterp
  
- # All the objects depend on the klibtool configuration file.
- $(objects): klibtool.config
+ liboctinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
+ 	rm -f $@
+-	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
++	${LIBTOOL} --mode=link $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
+ 
+ stamp-oct-links: $(OCT_FILES)
+ 	if [ -n "$(OCT_FILES)" ]; then \
+@@ -288,6 +289,7 @@ stamp-prereq: defaults.h oct-conf.h oct-
+ 	touch stamp-prereq
+ 
+ octave$(EXEEXT): stamp-prereq $(LIBRARIES) main.o $(DLD_STATIC_OBJ)
++	${LIBTOOL} --mode=link \
+ 	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
+ 	$(ALL_LDFLAGS) -o $@ \
+ 	main.o $(DLD_STATIC_OBJ) \
+@@ -368,6 +370,7 @@ install-strip:
+ install-bin:
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
++	${LIBTOOL} --mode=install \
+ 	$(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
+ 	$(LN_S) octave-$(version)$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT)
+ .PHONY: install-bin
+@@ -377,6 +380,7 @@ install-oct:
+ 	  $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octfiledir); \
+ 	  xfiles="$(OCT_FILES)"; \
+ 	  for f in $$xfiles; do \
++	    ${LIBTOOL} --mode=install \
+ 	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \
+ 	  done; \
+ 	  $(srcdir)/mk-oct-links $(DESTDIR)$(octfiledir) $(DLD_DEF_FILES); \
+@@ -387,9 +391,8 @@ install-lib:
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
+ 	if $(STATIC_LIBS); then \
+ 	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
+-	  $(INSTALL_DATA) liboctinterp.$(LIBEXT) \
+-	    $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
+-	  $(RANLIB) $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
++	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctinterp.$(LIBEXT) \
++	    ${PREFIX}/lib; \
+ 	fi
+ 	if $(SHARED_LIBS); then \
+ 	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLEXT_VER); \
diff --git a/math/octave/patches/patch-ah b/math/octave/patches/patch-ah
index 02acc408ce2..273a7c03635 100644
--- a/math/octave/patches/patch-ah
+++ b/math/octave/patches/patch-ah
@@ -1,13 +1,15 @@
-$NetBSD: patch-ah,v 1.1 2000/08/15 21:01:52 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2005/04/01 10:15:47 adam Exp $
 
---- configure.in.orig	Tue Aug 15 01:59:47 2000
-+++ configure.in	Tue Aug 15 01:59:30 2000
-@@ -143,7 +143,7 @@
- AC_SUBST(LIBREADLINE)
- AC_SUBST(READLINE_DIR)
+--- liboctave/f2c-main.c.orig	2002-04-03 19:44:22.000000000 -0500
++++ liboctave/f2c-main.c
+@@ -20,6 +20,10 @@ Software Foundation, 59 Temple Place - S
+ 
+ */
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <assert.h>
  
--LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.$(LIBEXT)'
-+LIBKPATHSEA='$(TOPDIR)/kpathsea/STATIC/libkpathsea.$(LIBEXT)'
- AC_SUBST(LIBKPATHSEA)
  
- ### Make it possible to have Octave's array and matrix classes do bounds