Update to 3.0.0, and grab maintainership.

9 files changed, 42 insertions, 69 deletions

diff --git a/math/octave/files/octave.in b/math/octave/files/octave.in
index 3137cfd614bd..c2455ab5082f 100644
--- a/math/octave/files/octave.in
+++ b/math/octave/files/octave.in
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/math/octave/files/Attic/octave.in,v 1.2 2006-07-09 02:02:27 maho Exp $
+# $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%%/octave-%%OCTAVE_VERSION%%
+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-aa b/math/octave/files/patch-aa
deleted file mode 100644
index d902a0ac32f5..000000000000
--- a/math/octave/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/liboctave/Makefile.in.orig	Tue Mar 21 06:10:52 2006
-+++ doc/liboctave/Makefile.in	Sat Jul  1 13:50:50 2006
-@@ -48,7 +48,7 @@
- .PHONY: all
- 
- liboctave.info: $(TEXINFO)
--	-$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $<
-+	-$(MAKEINFO) --force --no-split -I$(srcdir) -I$(srcdir)/.. $<
- 
- liboctave.dvi: $(TEXINFO)
- 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $<
diff --git a/math/octave/files/patch-ab b/math/octave/files/patch-ab
deleted file mode 100644
index 37667cf58d8c..000000000000
--- a/math/octave/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Wed May  7 04:08:03 2003
-+++ configure	Tue Jun 10 01:14:35 2003
-@@ -700,7 +700,6 @@
- fi
- 
- ac_tool_prefix=
--test -n "$host_alias" && ac_tool_prefix=$host_alias-
- 
- test "$silent" = yes && exec 6>/dev/null
- 
-@@ -18767,6 +18766,9 @@
- 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
- 
- unwind-prot.o: unwind-prot.cc
-+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-+
-+xdiv.o: xdiv.cc
- 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
- 
- EOF
diff --git a/math/octave/files/patch-ag b/math/octave/files/patch-ag
deleted file mode 100644
index dbabcbe42134..000000000000
--- a/math/octave/files/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/sysdep.cc.orig	Sat Jan  4 15:21:29 2003
-+++ src/sysdep.cc	Tue Jun 10 01:23:09 2003
-@@ -98,7 +98,11 @@
- #ifndef FP_X_DNML
- #define FP_X_DNML 0
- #endif
-+#if defined(__alpha__)
-+  fpsetmask (~(FP_X_OFL|FP_X_INV|FP_X_DZ|FP_X_UFL|FP_X_IMP));
-+#else
-   fpsetmask (~(FP_X_OFL|FP_X_INV|FP_X_DZ|FP_X_DNML|FP_X_UFL|FP_X_IMP));
-+#endif
- #endif
- }
- #endif
diff --git a/math/octave/files/patch-doc:interpreter:Makefile.in b/math/octave/files/patch-doc:interpreter:Makefile.in
deleted file mode 100644
index 26afc3096a99..000000000000
--- a/math/octave/files/patch-doc:interpreter:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/interpreter/Makefile.in.orig	Tue Mar 21 06:10:52 2006
-+++ doc/interpreter/Makefile.in	Sat Jul  1 13:52:37 2006
-@@ -89,7 +89,7 @@
- 	@$(top_srcdir)/move-if-change $@.t $@
- 
- octave.info: $(TEXINFO)
--	-$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $<
-+	-$(MAKEINFO) --no-split -I$(srcdir) -I$(srcdir)/.. $<
- 
- octave.dvi: $(TEXINFO)
- 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $<
diff --git a/math/octave/files/patch-examples+Makefile.in b/math/octave/files/patch-examples+Makefile.in
new file mode 100644
index 000000000000..8e1f7cf4dbdc
--- /dev/null
+++ b/math/octave/files/patch-examples+Makefile.in
@@ -0,0 +1,17 @@
+--- examples/Makefile.in~	Wed Dec 14 12:13:54 2005
++++ examples/Makefile.in	Wed Jul  5 12:59:06 2006
+@@ -51,10 +51,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
+ 
+ tags:
diff --git a/math/octave/files/patch-libcruft+mkf77def.in b/math/octave/files/patch-libcruft+mkf77def.in
new file mode 100644
index 000000000000..baf35379b2b6
--- /dev/null
+++ b/math/octave/files/patch-libcruft+mkf77def.in
@@ -0,0 +1,10 @@
+--- 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
+ 
+-SED=${SED:-'sed'}
++SED=gsed
+ AWK=${AWK:-'awk'}
+ 
+ F77_TOLOWER=%F77_APPEND_UNDERSCORE%
diff --git a/math/octave/files/patch-mkoctfile.in b/math/octave/files/patch-mkoctfile.in
deleted file mode 100644
index 23a1315142df..000000000000
--- a/math/octave/files/patch-mkoctfile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- mkoctfile.in.orig	Sun Mar 27 14:13:29 2005
-+++ mkoctfile.in	Wed May 25 23:00:43 2005
-@@ -184,7 +184,7 @@
-     -D*)
-       defs="$defs $1"
-     ;;
--    -[lLR]*)
-+    -[lLR]* | -pthread)
-       ldflags="$ldflags $1"
-     ;;
-     -M | --depend)
diff --git a/math/octave/files/patch-src+Makefile.in b/math/octave/files/patch-src+Makefile.in
new file mode 100644
index 000000000000..5da6b5d58a88
--- /dev/null
+++ b/math/octave/files/patch-src+Makefile.in
@@ -0,0 +1,13 @@
+for gendoc part, http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30423
+
+--- src/Makefile.in.orig	Sat Sep 30 03:20:15 2006
++++ src/Makefile.in	Wed Jan 10 19:26:54 2007
+@@ -313,7 +313,7 @@
+ 	$(OCTAVE_LIBS) \
+ 	$(LEXLIB) $(UMFPACK_LIBS) $(AMD_LIBS) $(COLAMD_LIBS) \
+ 	$(CHOLMOD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \
+-	$(FFTW_LIBS) $(LIBS) $(FLIBS)
++	$(FFTW_LIBS) $(LIBS) $(FLIBS) -lcamd
+ 
+ stmp-pic: pic
+ 	@if [ -f stmp-pic ]; then \