update to 2.9.14 (pre-release for 3.0)

too many changes to list here
pkgsrc changes:
-add use of pcre and qhull to options, and include
 both in the default configuration
-play dirty tricks to make sure GNU sed is used as sed -- there is
 something in the "mkf77def" script which doesn't work with NetBSD sed

7 files changed, 71 insertions, 77 deletions

diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa
index fd42d3b39d3..f1f3a2fd0ea 100644
--- a/math/octave-current/patches/patch-aa
+++ b/math/octave-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.16 2006/01/06 22:41:48 adam Exp $
+$NetBSD: patch-aa,v 1.17 2007/09/19 18:09:16 drochner Exp $
 
---- configure.orig	2005-11-11 20:57:06.000000000 +0100
+--- configure.orig	2007-09-17 22:49:11.000000000 +0200
 +++ configure
-@@ -10554,7 +10554,7 @@ if $have_fortran_compiler; then
+@@ -12339,7 +12339,7 @@ if $have_fortran_compiler; then
  %.c : %.f
  
  %.o : %.f
@@ -11,16 +11,16 @@ $NetBSD: patch-aa,v 1.16 2006/01/06 22:41:48 adam Exp $
  
  pic/%.o : %.f
  	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
-@@ -14680,7 +14680,7 @@ TEMPLATE_AR='$(AR)'
- TEMPLATE_ARFLAGS="$ARFLAGS"
+@@ -16736,7 +16736,7 @@ OCTAVE_DLL_DEFS=
+ OCTINTERP_DLL_DEFS=
  library_path_var=LD_LIBRARY_PATH
  case "$canonical_host_type" in
--  *-*-386bsd* | *-*-openbsd* | *-*-netbsd*)
-+  *-*-386bsd* | *-*-openbsd* )
+-  *-*-386bsd* | *-*-netbsd*)
++  *-*-386bsd*)
      SH_LD=ld
      SH_LDFLAGS=-Bshareable
    ;;
-@@ -24838,19 +24838,19 @@ case "$canonical_host_type" in
+@@ -27024,19 +27024,19 @@ case "$canonical_host_type" in
      cat << \EOF > $bsd_gcc_kluge_targets_frag
  
  lex.o: lex.cc
@@ -45,14 +45,3 @@ $NetBSD: patch-aa,v 1.16 2006/01/06 22:41:48 adam Exp $
  
  EOF
    ;;
-@@ -24978,9 +24978,9 @@ then
-   rm -rf "$tmp"
- 
- fi
-+SED=$octave_cv_path_sed
- 
- fi
--SED=$octave_cv_path_sed
- 
- echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6
diff --git a/math/octave-current/patches/patch-ab b/math/octave-current/patches/patch-ab
index 82619376c98..d48c7f177f6 100644
--- a/math/octave-current/patches/patch-ab
+++ b/math/octave-current/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2005/12/08 14:35:01 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2007/09/19 18:09:16 drochner Exp $
 
---- src/DLD-FUNCTIONS/__glpk__.cc.orig	2005-05-18 12:21:01.000000000 +0000
+--- src/DLD-FUNCTIONS/__glpk__.cc.orig	2007-04-04 05:22:17.000000000 +0200
 +++ src/DLD-FUNCTIONS/__glpk__.cc
 @@ -26,6 +26,7 @@ Software Foundation, Inc., 51 Franklin S
  #endif
@@ -20,4 +20,4 @@ $NetBSD: patch-ab,v 1.5 2005/12/08 14:35:01 joerg Exp $
 +
  #if defined (HAVE_GLPK)
  
- extern "C" {
+ extern "C"
diff --git a/math/octave-current/patches/patch-ac b/math/octave-current/patches/patch-ac
index 198102be793..879e114284f 100644
--- a/math/octave-current/patches/patch-ac
+++ b/math/octave-current/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.7 2006/01/06 22:41:48 adam Exp $
+$NetBSD: patch-ac,v 1.8 2007/09/19 18:09:17 drochner Exp $
 
---- Makeconf.in.orig	2005-11-11 20:47:12.000000000 +0100
+--- Makeconf.in.orig	2007-07-24 18:38:46.000000000 +0200
 +++ Makeconf.in
-@@ -78,7 +78,7 @@ SHLBIN = @SHLBIN@
+@@ -86,7 +86,7 @@ SHLBIN = @SHLBIN@
  SHLBIN_VER = @SHLBIN_VER@
  SHLLINKEXT=
  
 -LIBEXT = a
 +LIBEXT = la
+ LIBPRE = @LIBPRE@
  
  # Fortran to C translator and associated flags.
- 
-@@ -171,7 +171,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@
+@@ -188,7 +188,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@
  SH_LD = @SH_LD@
  SH_LDFLAGS = @SH_LDFLAGS@
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.7 2006/01/06 22:41:48 adam Exp $
  DL_LDFLAGS = @DL_LDFLAGS@
  
  SONAME_FLAGS = @SONAME_FLAGS@
-@@ -361,10 +361,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
+@@ -370,10 +370,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
  # How to make .o files:
  
  %.o : %.c
diff --git a/math/octave-current/patches/patch-ad b/math/octave-current/patches/patch-ad
index f9146a633b1..be05ea9da1a 100644
--- a/math/octave-current/patches/patch-ad
+++ b/math/octave-current/patches/patch-ad
@@ -1,27 +1,27 @@
-$NetBSD: patch-ad,v 1.6 2005/04/01 10:15:19 adam Exp $
+$NetBSD: patch-ad,v 1.7 2007/09/19 18:09:17 drochner Exp $
 
---- libcruft/Makefile.in.orig	2005-03-09 15:22:58.000000000 +0000
+--- libcruft/Makefile.in.orig	2007-07-25 17:49:17.000000000 +0200
 +++ libcruft/Makefile.in
-@@ -93,8 +93,8 @@ libraries: $(SUBDIRS)
+@@ -108,8 +108,8 @@ libraries: cruft.def
  
- libcruft.$(LIBEXT): $(CRUFT_OBJ)
+ $(LIBPRE)cruft.$(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.9.%=2:%}
  
- libcruft.$(SHLEXT_VER): libcruft.$(SHLEXT)
+ $(LIBPRE)cruft.$(SHLEXT_VER): $(LIBPRE)cruft.$(SHLEXT)
  	rm -f $@
-@@ -119,9 +119,8 @@ install::
+@@ -134,9 +134,8 @@ install::
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
- 	  rm -f $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
--	  $(INSTALL_DATA) libcruft.$(LIBEXT) \
--	    $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
--	  $(RANLIB) $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
+ 	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
+-	  $(INSTALL_DATA) $(LIBPRE)cruft.$(LIBEXT) \
+-	    $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
+-	  $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
 +	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcruft.$(LIBEXT) \
-+	    ${PREFIX}/lib; \
++		${PREFIX}/lib; \
  	fi
  	if $(SHARED_LIBS); then \
- 	  rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB_VER); \
+ 	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER); \
diff --git a/math/octave-current/patches/patch-ae b/math/octave-current/patches/patch-ae
index 06c7dbf343e..58072b0fd30 100644
--- a/math/octave-current/patches/patch-ae
+++ b/math/octave-current/patches/patch-ae
@@ -1,12 +1,12 @@
-$NetBSD: patch-ae,v 1.3 2003/12/04 11:15:37 adam Exp $
+$NetBSD: patch-ae,v 1.4 2007/09/19 18:09:17 drochner Exp $
 
---- libcruft/misc/Makefile.in.orig	2003-11-20 13:50:06.000000000 +0100
+--- libcruft/misc/Makefile.in.orig	2007-04-04 18:10:26.000000000 +0200
 +++ libcruft/misc/Makefile.in
-@@ -62,7 +62,7 @@ XCC = $(patsubst -O%, , $(CC))
+@@ -51,7 +51,7 @@ XCC = $(patsubst -O%, , $(CC))
  XALL_CFLAGS = $(patsubst -O%, , $(ALL_CFLAGS))
  
  machar.o: $(srcdir)/machar.c
--	$(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $<
+-	$(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $< -o $@
 +	${LIBTOOL} --mode=compile $(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $<
  
  pic/machar.o: $(srcdir)/machar.c
diff --git a/math/octave-current/patches/patch-af b/math/octave-current/patches/patch-af
index 81c48f98c6b..1b5a5607ca5 100644
--- a/math/octave-current/patches/patch-af
+++ b/math/octave-current/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.11 2006/01/06 22:41:48 adam Exp $
+$NetBSD: patch-af,v 1.12 2007/09/19 18:09:17 drochner Exp $
 
---- liboctave/Makefile.in.orig	2005-11-11 20:47:23.000000000 +0100
+--- liboctave/Makefile.in.orig	2007-07-25 17:45:05.000000000 +0200
 +++ liboctave/Makefile.in
-@@ -225,8 +225,9 @@ endif
+@@ -244,8 +244,9 @@ endif
  
- liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
+ $(LIBPRE)octave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
  	rm -f $@
 -	$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $(LIBOCTAVE_OBJECTS)
 -	$(RANLIB) $@
@@ -12,17 +12,17 @@ $NetBSD: patch-af,v 1.11 2006/01/06 22:41:48 adam Exp $
 +		$(LIBOCTAVE_OBJECTS:.o=.lo) -rpath ${PREFIX}/lib \
 +		-version-info ${version:2.9.%=2:%}
  
- liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT)
+ $(LIBPRE)octave.$(SHLEXT_VER): $(LIBPRE)octave.$(SHLEXT)
  	rm -f $@
-@@ -253,9 +254,8 @@ install-lib:
+@@ -272,9 +273,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); \
+ 	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
+-	  $(INSTALL_DATA) $(LIBPRE)octave.$(LIBEXT) \
+-	    $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
+-	  $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
 +	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctave.$(LIBEXT) \
-+	    ${PREFIX}/lib; \
++		${PREFIX}/lib; \
  	fi
  	if $(SHARED_LIBS); then \
- 	  rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER); \
+ 	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB_VER); \
diff --git a/math/octave-current/patches/patch-ag b/math/octave-current/patches/patch-ag
index 081ea44e0c8..1665737545d 100644
--- a/math/octave-current/patches/patch-ag
+++ b/math/octave-current/patches/patch-ag
@@ -1,10 +1,19 @@
-$NetBSD: patch-ag,v 1.15 2006/01/06 22:41:48 adam Exp $
+$NetBSD: patch-ag,v 1.16 2007/09/19 18:09:17 drochner Exp $
 
---- src/Makefile.in.orig	2005-11-11 20:48:04.000000000 +0100
+--- src/Makefile.in.orig	2007-09-17 22:47:41.000000000 +0200
 +++ src/Makefile.in
-@@ -291,8 +291,9 @@ libraries: $(LIBRARIES)
+@@ -191,7 +191,7 @@ BUILT_EXTRAS := graphics.h mxarray.h
  
- liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
+ EXTRAS := ov-base-int.cc ov-base-mat.cc ov-base-scalar.cc
+ 
+-EXTRA_OBJECTS := oct-errno.o octave.o builtins.o ops.o
++EXTRA_OBJECTS := oct-errno.o builtins.o ops.o
+ 
+ INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS) $(BUILT_EXTRAS)
+ 
+@@ -305,8 +305,9 @@ libraries: $(LIBRARIES)
+ 
+ $(LIBPRE)octinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
  	rm -f $@
 -	$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^
 -	$(RANLIB) $@
@@ -12,16 +21,16 @@ $NetBSD: patch-ag,v 1.15 2006/01/06 22:41:48 adam Exp $
 +		$(OBJECTS:.o=.lo) $(XERBLA:.o=.lo) -rpath ${PREFIX}/lib \
 +		-version-info ${version:2.9.%=2:%}
  
- liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT)
+ $(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBPRE)octinterp.$(SHLEXT)
  	rm -f $@
-@@ -300,12 +301,13 @@ liboctinterp.$(SHLEXT_VER): liboctinterp
+@@ -314,12 +315,13 @@ $(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBP
  
- liboctinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
+ $(LIBPRE)octinterp.$(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-prereq: defaults.h oct-conf.h oct-gperf.h parse.cc lex.cc gplot.cc $(OPT_HANDLERS)
+ stamp-prereq: defaults.h graphics.h oct-conf.h oct-gperf.h parse.cc lex.cc __gnuplot_raw__.cc $(OPT_HANDLERS)
  	touch stamp-prereq
  
  octave$(EXEEXT): stamp-prereq $(LIBRARIES) main.o $(DLD_STATIC_OBJ)
@@ -29,7 +38,7 @@ $NetBSD: patch-ag,v 1.15 2006/01/06 22:41:48 adam Exp $
  	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
  	$(ALL_LDFLAGS) -o $@ \
  	main.o $(DLD_STATIC_OBJ) \
-@@ -392,6 +394,7 @@ install-strip:
+@@ -410,6 +412,7 @@ install-strip:
  install-bin:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  	rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
@@ -37,27 +46,23 @@ $NetBSD: patch-ag,v 1.15 2006/01/06 22:41:48 adam Exp $
  	$(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
  	cd $(DESTDIR)$(bindir) ; $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT)
  .PHONY: install-bin
-@@ -401,9 +404,10 @@ install-oct:
+@@ -420,6 +423,7 @@ install-oct:
  	if [ -n "$(OCT_FILES)" ]; then \
  	  xfiles="$(OCT_FILES)"; \
  	  for f in $$xfiles; do \
 +	    ${LIBTOOL} --mode=install \
  	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \
  	  done; \
--	  $(srcdir)/mk-pkg-add --prefix $(octfiledir) $(DLD_DEF_FILES) > $(DESTDIR)$(octfiledir)/PKG_ADD
-+	  $(srcdir)/mk-pkg-add --prefix $(octfiledir) $(DLD_DEF_FILES) > $(DESTDIR)$(octfiledir)/PKG_ADD; \
  	fi
- .PHONY: install-oct
- 
-@@ -411,9 +415,8 @@ install-lib:
+@@ -429,9 +433,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); \
+ 	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
+-	  $(INSTALL_DATA) $(LIBPRE)octinterp.$(LIBEXT) \
+-	    $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
+-	  $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
 +	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctinterp.$(LIBEXT) \
-+	    ${PREFIX}/lib; \
++		${PREFIX}/lib; \
  	fi
  	if $(SHARED_LIBS); then \
- 	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLEXT_VER); \
+ 	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLEXT_VER); \