update to 3.4.0

PR:		156603
Submitted by:	Stephen Montgomery-Smith <stephen@missouri.edu>

5 files changed, 14 insertions, 62 deletions

diff --git a/math/octave/files/octave.in b/math/octave/files/octave.in
deleted file mode 100644
index c2455ab5082f..000000000000
--- a/math/octave/files/octave.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/math/octave/files/Attic/octave.in,v 1.3 2007-12-25 03:37:51 maho Exp $
-
-OCTAVE_EXEC=%%PREFIX%%/libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-%%OCTAVE_VERSION%%
-LD_LIBRARY_PATH=%%PREFIX%%/lib/octave-%%OCTAVE_VERSION%%; export LD_LIBRARY_PATH
-
-exec $OCTAVE_EXEC "$@"
diff --git a/math/octave/files/patch-configure.in b/math/octave/files/patch-configure.in
deleted file mode 100644
index 1548cc521dac..000000000000
--- a/math/octave/files/patch-configure.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.in	2009-05-26 20:38:48.000000000 +0900
-+++ configure.in	2009-08-07 13:12:41.000000000 +0900
-@@ -890,9 +890,10 @@
- ### Checks for BLAS and LAPACK libraries:
- # (Build subdirectories of libcruft if they aren't found on the system.)
- sinclude(acx_blas.m4)
--sinclude(acx_blas_f77_func.m4)
-+#sinclude(acx_blas_f77_func.m4)
- sinclude(acx_lapack.m4)
--ACX_BLAS_WITH_F77_FUNC([], [BLAS_DIR="blas"])
-+ACX_BLAS([], [BLAS_DIR="blas"])
-+#ACX_BLAS_WITH_F77_FUNC([], [BLAS_DIR="blas"])
- ACX_LAPACK([BLAS_LIBS="$LAPACK_LIBS $BLAS_LIBS"], [LAPACK_DIR="lapack"])
- AC_SUBST(BLAS_DIR)
- AC_SUBST(LAPACK_DIR)
-@@ -1120,7 +1121,7 @@
- warn_arpack="arpack not found. This will result in a lack of the eigs function."
- if test "$with_arpack" = yes; then
-   with_arpack=no
--  AC_CHECK_LIB(arpack, F77_FUNC(dseupd,DSEUPD), [ARPACK_LIBS="-larpack"; with_arpack=yes], , $LAPACK_LIBS $FLIBS)
-+  AC_CHECK_LIB(arpack, F77_FUNC(dseupd,DSEUPD), [ARPACK_LIBS="-larpack"; with_arpack=yes], , $BLAS_LIBS $LAPACK_LIBS $FLIBS)
-   if test "$with_arpack" = yes; then
-     AC_DEFINE(HAVE_ARPACK, 1, [Define if the ARPACK library is used.])
-     warn_arpack=
diff --git a/math/octave/files/patch-examples+Makefile.in b/math/octave/files/patch-examples+Makefile.in
deleted file mode 100644
index 177e7d8cc6c6..000000000000
--- a/math/octave/files/patch-examples+Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- examples/Makefile.in~	2008-07-22 00:59:03.000000000 +0900
-+++ examples/Makefile.in	2008-08-23 05:46:34.000000000 +0900
-@@ -95,10 +95,10 @@
- 	  rm -f $(DESTDIR)$(imagedir)/$$f; \
- 	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(imagedir)/$$f; \
- 	done
--	-if test -n "$(DESKTOP_FILE_INSTALL)"; then \
--	  $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \
--	    --vendor www.octave.org octave.desktop; \
--	fi
-+#	-if test -n "$(DESKTOP_FILE_INSTALL)"; then \
-+#	  $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \
-+#	    --vendor www.octave.org octave.desktop; \
-+#	fi
- .PHONY: install install-strip
- 
- uninstall:
diff --git a/math/octave/files/patch-libcruft+mkf77def.in b/math/octave/files/patch-libcruft+mkf77def.in
index baf35379b2b6..7383c372bf5d 100644
--- a/math/octave/files/patch-libcruft+mkf77def.in
+++ b/math/octave/files/patch-libcruft+mkf77def.in
@@ -1,10 +1,11 @@
---- libcruft/mkf77def.in~	Sat Oct 28 08:19:17 2006
-+++ libcruft/mkf77def.in	Wed Jun 27 16:17:36 2007
-@@ -1,6 +1,6 @@
- #! /bin/sh
+--- libcruft/mkf77def.in.orig	2011-02-08 04:00:51.000000000 -0600
++++ libcruft/mkf77def.in	2011-04-20 18:26:34.000000000 -0500
+@@ -18,7 +18,7 @@
+ # along with Octave; see the file COPYING.  If not, see
+ # <http://www.gnu.org/licenses/>.
  
 -SED=${SED:-'sed'}
 +SED=gsed
  AWK=${AWK:-'awk'}
  
- F77_TOLOWER=%F77_APPEND_UNDERSCORE%
+ F77_TOLOWER="@F77_APPEND_UNDERSCORE@"
diff --git a/math/octave/files/patch-scripts+pkg+pkg.m b/math/octave/files/patch-scripts+pkg+pkg.m
index ec414d29ebf6..a6387b96f962 100644
--- a/math/octave/files/patch-scripts+pkg+pkg.m
+++ b/math/octave/files/patch-scripts+pkg+pkg.m
@@ -1,11 +1,11 @@
---- scripts/pkg/pkg.m~	2009-07-27 18:31:53.000000000 +0900
-+++ scripts/pkg/pkg.m	2009-07-27 18:32:52.000000000 +0900
-@@ -1247,7 +1247,7 @@
+--- scripts/pkg/pkg.m.orig	2011-02-08 19:00:51.000000000 +0900
++++ scripts/pkg/pkg.m	2011-05-09 12:18:05.000000000 +0900
+@@ -1326,7 +1326,7 @@
+ 
      ## Make.
      if (exist (fullfile (src, "Makefile"), "file"))
-       [status, output] = shell (cstrcat ("export INSTALLDIR=\"", desc.dir,
--					 "\"; make -C '", src, "'"));
-+					 "\"; gmake -C '", src, "'"));
+-      [status, output] = shell (cstrcat (scenv, "make -C '", src, "'"));
++      [status, output] = shell (cstrcat (scenv, "gmake -C '", src, "'"));
        if (status != 0)
- 	rm_rf (desc.dir);
- 	error ("'make' returned the following error: %s", output);
+         rm_rf (desc.dir);
+         error ("'make' returned the following error: %s", output);